Minor gui fixes (jsuto#105)

Signed-off-by: Janos SUTO <sj@acts.hu>
dilyanpalauzov · Jul 24, 2024 · e8c4dda · e8c4dda
1 parent 66a1a71
commit e8c4dda
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/webui/controller/import/remove.php b/webui/controller/import/remove.php
@@ -30,7 +30,7 @@ public function index(){
       if($this->validate() == true) {
 
          if($this->data['confirmed'] == 1) {
-            $ret = $this->model_saas_import->delete($this->data['id'], $this->data['description']);
+            $ret = $this->model_saas_import->delete($this->data['id']);
             if($ret == 1){
                $this->data['x'] = $this->data['text_successfully_removed'];
                header('Location:' . SITE_URL . 'index.php?route=import/list');

diff --git a/webui/model/user/user.php b/webui/model/user/user.php
@@ -362,10 +362,6 @@ public function add_user($user) {
          if($ret == 0) { return -2; }
       }
 
-      $this->update_domains_settings((int)$user['uid'], $user['domains']);
-      $this->update_group_settings($emails[0], $user['group']);
-      $this->update_folder_settings((int)$user['uid'], $user['folder']);
-
       return 1;
    }
 
@@ -445,10 +441,6 @@ public function update_user($user) {
 
       }
 
-      $this->update_domains_settings((int)$user['uid'], $user['domains']);
-      $this->update_group_settings($emails[0], $user['group']);
-      $this->update_folder_settings((int)$user['uid'], $user['folder']);
-
       return 1;
    }
 

diff --git a/webui/templates/common/menu.tpl b/webui/templates/common/menu.tpl
@@ -32,7 +32,9 @@
             <li class="dropdown-item"><a class="dropdown-item" href="<?php print PATH_PREFIX; ?>index.php?route=import/list"><i class="bi bi-lightbulb"></i>&nbsp;<?php print $text_import; ?></a></li>
             <li class="dropdown-item"><a class="dropdown-item" href="<?php print PATH_PREFIX; ?>index.php?route=policy/archiving"><i class="bi bi-shield-exclamation"></i>&nbsp;<?php print $text_archiving_rules; ?></a></li>
             <li class="dropdown-item"><a class="dropdown-item" href="<?php print PATH_PREFIX; ?>index.php?route=policy/retention"><i class="bi bi-hourglass"></i>&nbsp;<?php print $text_retention_rules; ?></a></li>
+         <?php if(ENABLE_FOLDER_RESTRICTIONS) { ?>
             <li class="dropdown-item"><a class="dropdown-item" href="<?php print PATH_PREFIX; ?>index.php?route=policy/folder"><i class="bi bi-folder2-open"></i>&nbsp;<?php print $text_folder_rules; ?></a></li>
+         <?php } ?>
             <li class="dropdown-item"><a class="dropdown-item" href="<?php print PATH_PREFIX; ?>index.php?route=policy/legalhold"><i class="bi bi-hammer"></i>&nbsp;<?php print $text_legal_hold; ?></a></li>
             <li class="dropdown-item"><a class="dropdown-item" href="<?php print PATH_PREFIX; ?>index.php?route=search/autosearch"><i class="bi bi-search"></i>&nbsp;<?php print $text_automated_search; ?></a></li>
           </ul>

diff --git a/webui/templates/user/list.tpl b/webui/templates/user/list.tpl
@@ -53,7 +53,7 @@
             ?>
             </td>
             <td><a href="<?php print PATH_PREFIX; ?>index.php?route=user/edit&amp;uid=<?php print $user['uid']; ?>"><i class="bi bi-pencil-square" title="<?php print $text_edit_or_view; ?>"></i></a></td>
-            <td><a href="<?php print PATH_PREFIX; ?>index.php?route=user/remove&amp;id=<?php print $user['uid']; ?>&amp;user=<?php print $user['username']; ?>&amp'confirmed=1"><i class="bi bi-trash text-danger" title="<?php print $text_remove; ?>"></i></a></td>
+            <td><a href="<?php print PATH_PREFIX; ?>index.php?route=user/remove&amp;id=<?php print $user['uid']; ?>&amp;user=<?php print $user['username']; ?>&amp;confirmed=1"><i class="bi bi-trash text-danger" title="<?php print $text_remove; ?>"></i></a></td>
           </tr>
         <?php } ?>
       </table>