From 1a75c3c3e188aecebbf1dd452632cc28ecb4257d Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Tue, 9 Mar 2021 13:25:16 +0800
Subject: [PATCH] * Finish task #36433.

---
 module/action/control.php            |   2 +
 module/action/view/trash.html.php    |  14 ++-
 module/admin/view/checkweak.html.php |  67 ++++++-----
 module/admin/view/safe.html.php      |  97 +++++++++-------
 module/backup/control.php            |   2 +
 module/backup/view/index.html.php    | 163 ++++++++++++++-------------
 module/common/lang/de.php            |  10 +-
 module/common/lang/en.php            |  10 +-
 module/common/lang/fr.php            |  10 +-
 module/common/lang/menuOrder.php     |  10 +-
 module/common/lang/vi.php            |  10 +-
 module/common/lang/zh-cn.php         |  10 +-
 module/common/lang/zh-tw.php         |  10 +-
 13 files changed, 219 insertions(+), 196 deletions(-)

diff --git a/module/action/control.php b/module/action/control.php
index 677c13c296..2d67b28ee0 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -24,6 +24,8 @@ class action extends control
      */
     public function trash($type = 'all', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
+        $this->loadModel('backup');
+
         /* Save session. */
         $uri = $this->app->getURI(true);
         $this->session->set('productList',     $uri);
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index aa52c3176e..9f41580d6d 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -12,14 +12,24 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <div id='mainMenu' class='clearfix'>
-  <div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('data');?></div>
+  <div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div>
   <div class='btn-toolbar pull-right'>
     <?php if($type == 'hidden') echo html::a(inLink('trash', "type=all"),    $lang->goback, '', "class='btn'");?>
     <?php if($type == 'all')    echo html::a(inLink('trash', "type=hidden"), "<i class='icon-eye-close'></i> " . $lang->action->dynamic->hidden, '', "class='btn btn-danger'");?>
   </div>
 </div>
 
-<div id='mainContent'>
+<div id='mainContent' class="main-row">
+  <div class='side-col' id='sidebar'>
+    <div class='cell'>
+      <div class='list-group'>
+        <?php
+        echo html::a($this->createLink('backup', 'index'), $lang->backup->common);
+        echo html::a($this->createLink('action', 'trash'), $lang->action->trash, '', "class='active'");
+        ?>
+      </div>
+    </div>
+  </div>
   <div class='main-table' data-ride='table'>
     <table class='table has-sort-head'>
       <?php $vars = "type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
diff --git a/module/admin/view/checkweak.html.php b/module/admin/view/checkweak.html.php
index 2b5f05ca65..3f8456d442 100644
--- a/module/admin/view/checkweak.html.php
+++ b/module/admin/view/checkweak.html.php
@@ -13,36 +13,47 @@
 <?php include '../../common/view/header.html.php';?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <?php common::printLink('admin', 'safe', '', "<span class='text'>{$lang->admin->safe->set}</span>", '', "class='btn btn-link'");?>
-    <?php common::printLink('admin', 'checkWeak', '', "<span class='text'>{$lang->admin->safe->checkWeak}</span>", '', "class='btn btn-link btn-active-text'");?></li>
+    <div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div>
   </div>
 </div>
-<div id='mainContent'>
-  <div class='main-table pd-0'>
-    <table class='table table-condensed table-hover table-striped table-fixed'>
-      <thead>
-        <th class='c-id-sm text-center'><?php echo $lang->idAB;?></th>
-        <th class='w-150px'><?php echo $lang->user->realname;?></th>
-        <th><?php echo $lang->user->account;?></th>
-        <th class='w-150px'><?php echo $lang->user->phone;?></th>
-        <th class='w-150px'><?php echo $lang->user->mobile;?></th>
-        <th class='w-200px'><?php echo $lang->admin->safe->reason;?></th>
-        <th class='c-actions-2'><?php echo $lang->actions;?></th>
-      </thead>
-      <tbody>
-        <?php foreach($weakUsers as $user):?>
-        <tr>
-          <td class='text-center'><?php echo $user->id?></td>
-          <td class='text-left'><?php echo $user->realname?></td>
-          <td class='text-left'><?php echo $user->account?></td>
-          <td><?php echo $user->phone?></td>
-          <td><?php echo $user->mobile?></td>
-          <td><?php echo $lang->admin->safe->reasonList[$user->weakReason];?></td>
-          <td class='c-actions text-center'><?php common::printIcon('user', 'edit', "userID=$user->id", '', 'list');?></td>
-        </tr>
-        <?php endforeach;?>
-      </tbody>
-    </table>
+<div class="main-row">
+  <div class='side-col' id='sidebar'>
+    <div class='cell'>
+      <div class='list-group'>
+        <?php
+        echo html::a($this->createLink('admin', 'safe'), $lang->admin->safe->set);
+        echo html::a($this->createLink('admin', 'checkWeak'), $lang->admin->safe->checkWeak, '', "class='active'");
+        ?>
+      </div>
+    </div>
+  </div>
+  <div id='mainContent' class="main-col main-content">
+    <div class='main-table pd-0'>
+      <table class='table table-condensed table-hover table-striped table-fixed'>
+        <thead>
+          <th class='c-id-sm text-center'><?php echo $lang->idAB;?></th>
+          <th class='w-150px'><?php echo $lang->user->realname;?></th>
+          <th><?php echo $lang->user->account;?></th>
+          <th class='w-150px'><?php echo $lang->user->phone;?></th>
+          <th class='w-150px'><?php echo $lang->user->mobile;?></th>
+          <th class='w-200px'><?php echo $lang->admin->safe->reason;?></th>
+          <th class='c-actions-2'><?php echo $lang->actions;?></th>
+        </thead>
+        <tbody>
+          <?php foreach($weakUsers as $user):?>
+          <tr>
+            <td class='text-center'><?php echo $user->id?></td>
+            <td class='text-left'><?php echo $user->realname?></td>
+            <td class='text-left'><?php echo $user->account?></td>
+            <td><?php echo $user->phone?></td>
+            <td><?php echo $user->mobile?></td>
+            <td><?php echo $lang->admin->safe->reasonList[$user->weakReason];?></td>
+            <td class='c-actions text-center'><?php common::printIcon('user', 'edit', "userID=$user->id", '', 'list');?></td>
+          </tr>
+          <?php endforeach;?>
+        </tbody>
+      </table>
+    </div>
   </div>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/admin/view/safe.html.php b/module/admin/view/safe.html.php
index 6abc597224..e020158c19 100644
--- a/module/admin/view/safe.html.php
+++ b/module/admin/view/safe.html.php
@@ -14,51 +14,62 @@
 <?php include '../../common/view/header.html.php';?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <?php common::printLink('admin', 'safe', '', "<span class='text'>{$lang->admin->safe->set}</span>", '', "class='btn btn-link btn-active-text'");?>
-    <?php common::printLink('admin', 'checkWeak', '', "<span class='text'>{$lang->admin->safe->checkWeak}</span>", '', "class='btn btn-link'");?></li>
+    <div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div>
   </div>
 </div>
-<div id='mainContent' class='main-content'>
-  <div class='center-block'>
-    <form class="load-indicator main-form form-ajax" method='post'>
-      <table class='table table-form'>
-        <tr>
-          <th class='thWidth'><?php echo $lang->admin->safe->password?></th>
-          <td class='w-250px'><?php echo html::radio('mode', $lang->admin->safe->modeList, isset($config->safe->mode) ? $config->safe->mode : 0, "onclick=showModeRule(this.value)")?></td>
-          <td><?php echo $lang->admin->safe->noticeMode?></td>
-        </tr>
-        <tr id='mode1Rule' class='hidden'>
-          <th></th>
-          <td colspan='2'><span style='color:#03b8cf;font-weight:bold;'><?php echo $lang->admin->safe->modeRuleList[1] . $lang->admin->safe->noticeStrong;?></span></td>
-        </tr>
-        <tr id='mode2Rule' class='hidden'>
-          <th></th>
-          <td colspan='2'><span style='color:#03b8cf;font-weight:bold;'><?php echo $lang->admin->safe->modeRuleList[2] . $lang->admin->safe->noticeStrong;?></span></td>
-        </tr>
-        <tr>
-          <th><?php echo $lang->admin->safe->weak?></th>
-          <td colspan='2'><?php echo html::textarea('weak', $config->safe->weak, "class='form-control' style='height:100px'")?></td>
-        </tr>
-        <tr>
-          <th><?php echo $lang->admin->safe->changeWeak?></th>
-          <td colspan='2'><?php echo html::radio('changeWeak', $lang->admin->safe->modifyPasswordList, isset($config->safe->changeWeak) ? $config->safe->changeWeak : 0)?></td>
-        </tr>
-        <tr>
-          <th><?php echo $lang->admin->safe->modifyPasswordFirstLogin?></th>
-          <td colspan='2'><?php echo html::radio('modifyPasswordFirstLogin', $lang->admin->safe->modifyPasswordList, isset($config->safe->modifyPasswordFirstLogin) ? $config->safe->modifyPasswordFirstLogin : 0)?></td>
-        </tr>
-        <tr>
-          <th><?php echo $lang->admin->safe->loginCaptcha?></th>
-          <td colspan='2'><?php echo html::radio('loginCaptcha', $lang->admin->safe->loginCaptchaList, isset($config->safe->loginCaptcha) ? $config->safe->loginCaptcha : 0)?></td>
-        </tr>
-        <tr>
-          <td colspan='3' class='text-center form-actions'>
-            <?php echo html::submitButton();?>
-            <?php echo html::backButton();?>
-          </td>
-        </tr>
-      </table>
-    </form>
+<div class="main-row">
+  <div class='side-col' id='sidebar'>
+    <div class='cell'>
+      <div class='list-group'>
+        <?php
+        echo html::a($this->createLink('admin', 'safe'), $lang->admin->safe->set, '', "class='active'");
+        echo html::a($this->createLink('admin', 'checkWeak'), $lang->admin->safe->checkWeak);
+        ?>
+      </div>
+    </div>
+  </div>
+  <div id='mainContent' class='main-col main-content'>
+    <div class='center-block'>
+      <form class="load-indicator main-form form-ajax" method='post'>
+        <table class='table table-form'>
+          <tr>
+            <th class='thWidth'><?php echo $lang->admin->safe->password?></th>
+            <td class='w-250px'><?php echo html::radio('mode', $lang->admin->safe->modeList, isset($config->safe->mode) ? $config->safe->mode : 0, "onclick=showModeRule(this.value)")?></td>
+            <td><?php echo $lang->admin->safe->noticeMode?></td>
+          </tr>
+          <tr id='mode1Rule' class='hidden'>
+            <th></th>
+            <td colspan='2'><span style='color:#03b8cf;font-weight:bold;'><?php echo $lang->admin->safe->modeRuleList[1] . $lang->admin->safe->noticeStrong;?></span></td>
+          </tr>
+          <tr id='mode2Rule' class='hidden'>
+            <th></th>
+            <td colspan='2'><span style='color:#03b8cf;font-weight:bold;'><?php echo $lang->admin->safe->modeRuleList[2] . $lang->admin->safe->noticeStrong;?></span></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->admin->safe->weak?></th>
+            <td colspan='2'><?php echo html::textarea('weak', $config->safe->weak, "class='form-control' style='height:100px'")?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->admin->safe->changeWeak?></th>
+            <td colspan='2'><?php echo html::radio('changeWeak', $lang->admin->safe->modifyPasswordList, isset($config->safe->changeWeak) ? $config->safe->changeWeak : 0)?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->admin->safe->modifyPasswordFirstLogin?></th>
+            <td colspan='2'><?php echo html::radio('modifyPasswordFirstLogin', $lang->admin->safe->modifyPasswordList, isset($config->safe->modifyPasswordFirstLogin) ? $config->safe->modifyPasswordFirstLogin : 0)?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->admin->safe->loginCaptcha?></th>
+            <td colspan='2'><?php echo html::radio('loginCaptcha', $lang->admin->safe->loginCaptchaList, isset($config->safe->loginCaptcha) ? $config->safe->loginCaptcha : 0)?></td>
+          </tr>
+          <tr>
+            <td colspan='3' class='text-center form-actions'>
+              <?php echo html::submitButton();?>
+              <?php echo html::backButton();?>
+            </td>
+          </tr>
+        </table>
+      </form>
+    </div>
   </div>
 </div>
 <script>
diff --git a/module/backup/control.php b/module/backup/control.php
index 1a93be7088..184519d4ed 100644
--- a/module/backup/control.php
+++ b/module/backup/control.php
@@ -41,6 +41,8 @@ class backup extends control
      */
     public function index()
     {
+        $this->loadModel('action');
+
         $backups = array();
         if(empty($this->view->error))
         {
diff --git a/module/backup/view/index.html.php b/module/backup/view/index.html.php
index 98ee6d49cf..34d3759544 100644
--- a/module/backup/view/index.html.php
+++ b/module/backup/view/index.html.php
@@ -17,87 +17,98 @@
 </div>
 <?php endif;?>
 <div id='mainMenu' class='clearfix'>
-  <div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('data');?></div>
+  <div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div>
 </div>
-
-<div id='mainContent' class='main-content'>
-  <div class='main-header'>
-    <h2>
-      <?php echo $lang->backup->history?>
-    </h2>
-    <div class='pull-right'>
-      <?php common::printLink('backup', 'setting', '', "<i class='icon icon-cog'></i>" . $lang->backup->setting, '', "data-width='500' class='iframe btn btn-primary'");?>
-      <?php common::printLink('backup', 'backup', 'reload=yes', "<i class='icon icon-copy'></i> " . $lang->backup->backup, 'hiddenwin', "class='btn btn-primary backup'");?>
+<div id='mainContent' class="main-row">
+  <div class='side-col' id='sidebar'>
+    <div class='cell'>
+      <div class='list-group'>
+        <?php
+        echo html::a($this->inLink('index'), $lang->backup->common, '', "class='active'");
+        echo html::a($this->createLink('action', 'trash'), $lang->action->trash);
+        ?>
+      </div>
     </div>
   </div>
-  <table class='table table-condensed table-bordered active-disabled table-fixed'>
-    <thead class="text-center">
-      <tr>
-        <th class='w-150px'><?php echo $lang->backup->time?></th>
-        <th><?php echo $lang->backup->files?></th>
-        <th class='w-100px'><?php echo $lang->backup->allCount?></th>
-        <th class='w-100px'><?php echo $lang->backup->count?></th>
-        <th class='w-100px'><?php echo $lang->backup->size?></th>
-        <th class='w-100px'><?php echo $lang->backup->status?></th>
-        <th class='actionWidth'><?php echo $lang->actions?></th>
-      </tr>
-    </thead>
-    <tbody class='text-center'>
-    <?php foreach($backups as $backupFile):?>
-      <?php $rowspan = count($backupFile->files);?>
-      <?php $i = 0;?>
-      <?php $isPHP = false;?>
-      <?php foreach($backupFile->files as $file => $summary):?>
-      <?php if(!$isPHP) $isPHP = strpos($file, '.php') !== false;?>
-      <tr>
-        <?php if($i == 0):?>
-        <td <?php if($rowspan > 1) echo "rowspan='$rowspan'"?>><?php echo date(DT_DATETIME1, $backupFile->time);?></td>
-        <?php endif;?>
-        <td class='text-left' style='padding-left:5px;'><?php echo $file;?></td>
-        <td><?php echo zget($summary, 'allCount', '');?></td>
-        <td><?php echo zget($summary, 'count', '');?></td>
-        <td>
-          <?php
-          $size = zget($summary, 'size', 0);
-          if(!empty($size)) echo $this->backup->processFileSize($size);
-          ?>
-        </td>
-        <td style='overflow:visible'>
-          <?php
-          $status = zget($summary, 'count', 0) == zget($summary, 'allCount', 0) ? 'success' : 'fail';
-          if(!empty($summary['errorFiles'])) $status = 'fail';
-          if(!empty($summary['errorFiles'])):
-          ?>
-          <div class="dropdown dropdown-hover"><?php echo $lang->backup->statusList[$status];?> <span class="caret"></span><div class="dropdown-menu pull-right errorFiles"><?php echo $lang->backup->copiedFail . '<br />' . join('<br />', $summary['errorFiles']);?></div></div>
-          <?php else:?>
-          <?php echo $lang->backup->statusList[$status];?>
+  <div class="main-col main-content">
+    <div class='main-header'>
+      <h2>
+        <?php echo $lang->backup->history?>
+      </h2>
+      <div class='pull-right'>
+        <?php common::printLink('backup', 'setting', '', "<i class='icon icon-cog'></i>" . $lang->backup->setting, '', "data-width='500' class='iframe btn btn-primary'");?>
+        <?php common::printLink('backup', 'backup', 'reload=yes', "<i class='icon icon-copy'></i> " . $lang->backup->backup, 'hiddenwin', "class='btn btn-primary backup'");?>
+      </div>
+    </div>
+    <table class='table table-condensed table-bordered active-disabled table-fixed'>
+      <thead class="text-center">
+        <tr>
+          <th class='w-150px'><?php echo $lang->backup->time?></th>
+          <th><?php echo $lang->backup->files?></th>
+          <th class='w-100px'><?php echo $lang->backup->allCount?></th>
+          <th class='w-100px'><?php echo $lang->backup->count?></th>
+          <th class='w-100px'><?php echo $lang->backup->size?></th>
+          <th class='w-100px'><?php echo $lang->backup->status?></th>
+          <th class='actionWidth'><?php echo $lang->actions?></th>
+        </tr>
+      </thead>
+      <tbody class='text-center'>
+      <?php foreach($backups as $backupFile):?>
+        <?php $rowspan = count($backupFile->files);?>
+        <?php $i = 0;?>
+        <?php $isPHP = false;?>
+        <?php foreach($backupFile->files as $file => $summary):?>
+        <?php if(!$isPHP) $isPHP = strpos($file, '.php') !== false;?>
+        <tr>
+          <?php if($i == 0):?>
+          <td <?php if($rowspan > 1) echo "rowspan='$rowspan'"?>><?php echo date(DT_DATETIME1, $backupFile->time);?></td>
           <?php endif;?>
-        </td>
-        <?php if($i == 0):?>
-        <td <?php if($rowspan > 1) echo "rowspan='$rowspan'"?>>
-          <?php
-          if(common::hasPriv('backup', 'rmPHPHeader') and $isPHP)
-          {
-              echo html::a(inlink('rmPHPHeader', "file={$backupFile->name}"), $lang->backup->rmPHPHeader, 'hiddenwin', "class='rmPHPHeader'");
-              echo "<br />";
-          }
-          if(common::hasPriv('backup', 'restore')) echo html::a(inlink('restore', "file={$backupFile->name}&confirm=yes"), $lang->backup->restore, 'hiddenwin', "class='restore'");
-          if(common::hasPriv('backup', 'delete')) echo html::a(inlink('delete', "file=$backupFile->name"), $lang->delete, 'hiddenwin');
-          ?>
-        </td>
-        <?php endif;?>
-      </tr>
-      <?php $i++;?>
+          <td class='text-left' style='padding-left:5px;'><?php echo $file;?></td>
+          <td><?php echo zget($summary, 'allCount', '');?></td>
+          <td><?php echo zget($summary, 'count', '');?></td>
+          <td>
+            <?php
+            $size = zget($summary, 'size', 0);
+            if(!empty($size)) echo $this->backup->processFileSize($size);
+            ?>
+          </td>
+          <td style='overflow:visible'>
+            <?php
+            $status = zget($summary, 'count', 0) == zget($summary, 'allCount', 0) ? 'success' : 'fail';
+            if(!empty($summary['errorFiles'])) $status = 'fail';
+            if(!empty($summary['errorFiles'])):
+            ?>
+            <div class="dropdown dropdown-hover"><?php echo $lang->backup->statusList[$status];?> <span class="caret"></span><div class="dropdown-menu pull-right errorFiles"><?php echo $lang->backup->copiedFail . '<br />' . join('<br />', $summary['errorFiles']);?></div></div>
+            <?php else:?>
+            <?php echo $lang->backup->statusList[$status];?>
+            <?php endif;?>
+          </td>
+          <?php if($i == 0):?>
+          <td <?php if($rowspan > 1) echo "rowspan='$rowspan'"?>>
+            <?php
+            if(common::hasPriv('backup', 'rmPHPHeader') and $isPHP)
+            {
+                echo html::a(inlink('rmPHPHeader', "file={$backupFile->name}"), $lang->backup->rmPHPHeader, 'hiddenwin', "class='rmPHPHeader'");
+                echo "<br />";
+            }
+            if(common::hasPriv('backup', 'restore')) echo html::a(inlink('restore', "file={$backupFile->name}&confirm=yes"), $lang->backup->restore, 'hiddenwin', "class='restore'");
+            if(common::hasPriv('backup', 'delete')) echo html::a(inlink('delete', "file=$backupFile->name"), $lang->delete, 'hiddenwin');
+            ?>
+          </td>
+          <?php endif;?>
+        </tr>
+        <?php $i++;?>
+        <?php endforeach;?>
       <?php endforeach;?>
-    <?php endforeach;?>
-    </tbody>
-  </table>
-  <h2>
-    <span class='label label-info'>
-    <?php echo $lang->backup->restoreTip;?>
-    <?php printf($lang->backup->holdDays, $config->backup->holdDays)?>
-    </span>
-  </h2>
+      </tbody>
+    </table>
+    <h2>
+      <span class='label label-info'>
+      <?php echo $lang->backup->restoreTip;?>
+      <?php printf($lang->backup->holdDays, $config->backup->holdDays)?>
+      </span>
+    </h2>
+  </div>
 </div>
 <div class="modal fade" id="waitting" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog w-400px">
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 03fb792584..2b4d6bc6f6 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -526,9 +526,7 @@ $lang->admin->menu->index   = array('link' => 'Home|admin|index', 'alias' => 're
 $lang->admin->menu->company = array('link' => 'Personnel|company|browse|', 'subModule' => ',user,dept,group,', 'alias' => ',dynamic,view,');
 $lang->admin->menu->message = array('link' => 'Notification|message|index', 'subModule' => 'message,mail,webhook');
 $lang->admin->menu->custom  = array('link' => 'Custom|custom|index', 'subModule' => 'custom');
-$lang->admin->menu->data    = array('link' => 'Data|backup|index', 'subModule' => 'backup,action');
-$lang->admin->menu->safe    = array('link' => 'Sicherheit|admin|safe', 'alias' => 'checkweak');
-$lang->admin->menu->system  = array('link' => 'System|cron|index', 'subModule' => 'cron');
+$lang->admin->menu->system  = array('link' => 'System|backup|index', 'subModule' => 'cron,admin,backup,action');
 
 $lang->company->menu = $lang->company->menu;
 $lang->dept->menu    = $lang->company->menu;
@@ -551,11 +549,9 @@ $lang->admin->subMenu->dev->db     = array('link' => 'Database|dev|db');
 $lang->admin->subMenu->dev->editor = array('link' => 'Editor|dev|editor');
 $lang->admin->subMenu->dev->entry  = array('link' => 'Application|entry|browse', 'subModule' => 'entry');
 
-$lang->admin->subMenu->data = new stdclass();
-$lang->admin->subMenu->data->backup = array('link' => 'Backup|backup|index', 'subModule' => 'backup');
-$lang->admin->subMenu->data->trash  = array('link' => 'Aufräumen|action|trash');
-
 $lang->admin->subMenu->system = new stdclass();
+$lang->admin->subMenu->system->data       = array('link' => 'Data|backup|index', 'subModule' => 'action');
+$lang->admin->subMenu->system->safe       = array('link' => 'Sicherheit|admin|safe', 'alias' => 'checkweak');
 $lang->admin->subMenu->system->cron       = array('link' => 'Cron|cron|index', 'subModule' => 'cron');
 $lang->admin->subMenu->system->timezone   = array('link' => 'Timezone|custom|timezone', 'subModule' => 'custom');
 $lang->admin->subMenu->system->buildIndex = array('link' => 'Full Text Search|search|buildindex|');
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index a48e81b4e0..393ae01cbc 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -526,9 +526,7 @@ $lang->admin->menu->index   = array('link' => 'Home|admin|index', 'alias' => 're
 $lang->admin->menu->company = array('link' => 'Personnel|company|browse|', 'subModule' => ',user,dept,group,', 'alias' => ',dynamic,view,');
 $lang->admin->menu->message = array('link' => 'Notification|message|index', 'subModule' => 'message,mail,webhook');
 $lang->admin->menu->custom  = array('link' => 'Custom|custom|index', 'subModule' => 'custom');
-$lang->admin->menu->data    = array('link' => 'Data|backup|index', 'subModule' => 'backup,action');
-$lang->admin->menu->safe    = array('link' => 'Security|admin|safe', 'alias' => 'checkweak');
-$lang->admin->menu->system  = array('link' => 'System|cron|index', 'subModule' => 'cron');
+$lang->admin->menu->system  = array('link' => 'System|backup|index', 'subModule' => 'cron,admin,backup,action');
 
 $lang->company->menu = $lang->company->menu;
 $lang->dept->menu    = $lang->company->menu;
@@ -551,11 +549,9 @@ $lang->admin->subMenu->dev->db     = array('link' => 'Database|dev|db');
 $lang->admin->subMenu->dev->editor = array('link' => 'Editor|dev|editor');
 $lang->admin->subMenu->dev->entry  = array('link' => 'Application|entry|browse', 'subModule' => 'entry');
 
-$lang->admin->subMenu->data = new stdclass();
-$lang->admin->subMenu->data->backup = array('link' => 'Backup|backup|index', 'subModule' => 'backup');
-$lang->admin->subMenu->data->trash  = 'Recycle|action|trash';
-
 $lang->admin->subMenu->system = new stdclass();
+$lang->admin->subMenu->system->data       = array('link' => 'Data|backup|index', 'subModule' => 'action');
+$lang->admin->subMenu->system->safe       = array('link' => 'Security|admin|safe', 'alias' => 'checkweak');
 $lang->admin->subMenu->system->cron       = array('link' => 'Cron|cron|index', 'subModule' => 'cron');
 $lang->admin->subMenu->system->timezone   = array('link' => 'Timezone|custom|timezone', 'subModule' => 'custom');
 $lang->admin->subMenu->system->buildIndex = array('link' => 'Full Text Search|search|buildindex|');
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 486a70e619..c897870701 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -526,9 +526,7 @@ $lang->admin->menu->index   = array('link' => 'Accueil|admin|index', 'alias' =>
 $lang->admin->menu->company = array('link' => 'Personnel|company|browse|', 'subModule' => ',user,dept,group,', 'alias' => ',dynamic,view,');
 $lang->admin->menu->message = array('link' => 'Notification|message|index', 'subModule' => 'message,mail,webhook');
 $lang->admin->menu->custom  = array('link' => 'Custom|custom|index', 'subModule' => 'custom');
-$lang->admin->menu->data    = array('link' => 'Données|backup|index', 'subModule' => 'backup,action');
-$lang->admin->menu->safe    = array('link' => 'Sécurité|admin|safe', 'alias' => 'checkweak');
-$lang->admin->menu->system  = array('link' => 'Système|cron|index', 'subModule' => 'cron');
+$lang->admin->menu->system  = array('link' => 'Système|backup|index', 'subModule' => 'cron,admin,backup,action');
 
 $lang->company->menu = $lang->company->menu;
 $lang->dept->menu    = $lang->company->menu;
@@ -551,11 +549,9 @@ $lang->admin->subMenu->dev->db     = array('link' => 'Database|dev|db');
 $lang->admin->subMenu->dev->editor = array('link' => 'Editor|dev|editor');
 $lang->admin->subMenu->dev->entry  = array('link' => 'Application|entry|browse', 'subModule' => 'entry');
 
-$lang->admin->subMenu->data = new stdclass();
-$lang->admin->subMenu->data->backup = array('link' => 'Backup|backup|index', 'subModule' => 'backup');
-$lang->admin->subMenu->data->trash  = 'Corbeille|action|trash';
-
 $lang->admin->subMenu->system = new stdclass();
+$lang->admin->subMenu->system->data       = array('link' => 'Données|backup|index', 'subModule' => 'action');
+$lang->admin->subMenu->system->safe       = array('link' => 'Sécurité|admin|safe', 'alias' => 'checkweak');
 $lang->admin->subMenu->system->cron       = array('link' => 'Cron|cron|index', 'subModule' => 'cron');
 $lang->admin->subMenu->system->timezone   = array('link' => 'Timezone|custom|timezone', 'subModule' => 'custom');
 $lang->admin->subMenu->system->buildIndex = array('link' => 'Full Text Search|search|buildindex|');
diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index b95ba40148..bc662eafcc 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -177,11 +177,11 @@ $lang->admin->subMenuOrder->dev[5]      = 'api';
 $lang->admin->subMenuOrder->dev[10]     = 'db';
 $lang->admin->subMenuOrder->dev[15]     = 'editor';
 $lang->admin->subMenuOrder->dev[20]     = 'entry';
-$lang->admin->subMenuOrder->data[5]     = 'backup';
-$lang->admin->subMenuOrder->data[10]    = 'trash';
-$lang->admin->subMenuOrder->system[5]   = 'cron';
-$lang->admin->subMenuOrder->system[10]  = 'timezone';
-$lang->admin->subMenuOrder->system[15]  = 'buildIndex';
+$lang->admin->subMenuOrder->system[5]   = 'data';
+$lang->admin->subMenuOrder->system[10]  = 'safe';
+$lang->admin->subMenuOrder->system[15]  = 'cron';
+$lang->admin->subMenuOrder->system[20]  = 'timezone';
+$lang->admin->subMenuOrder->system[25]  = 'buildIndex';
 
 $lang->convert->menuOrder   = $lang->admin->menuOrder;
 $lang->upgrade->menuOrder   = $lang->admin->menuOrder;
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 7104a75591..96dfe3d7d7 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -526,9 +526,7 @@ $lang->admin->menu->index   = array('link' => 'Home|admin|index', 'alias' => 're
 $lang->admin->menu->company = array('link' => 'Personnel|company|browse|', 'subModule' => ',user,dept,group,', 'alias' => ',dynamic,view,');
 $lang->admin->menu->message = array('link' => 'Thông báo|message|index', 'subModule' => 'message,mail,webhook');
 $lang->admin->menu->custom  = array('link' => 'Custom|custom|index', 'subModule' => 'custom');
-$lang->admin->menu->data    = array('link' => 'Data|backup|index', 'subModule' => 'backup,action');
-$lang->admin->menu->safe    = array('link' => 'Security|admin|safe', 'alias' => 'checkweak');
-$lang->admin->menu->system  = array('link' => 'System|cron|index', 'subModule' => 'cron');
+$lang->admin->menu->system  = array('link' => 'System|backup|index', 'subModule' => 'cron,admin,backup,action');
 
 $lang->company->menu = $lang->company->menu;
 $lang->dept->menu    = $lang->company->menu;
@@ -551,11 +549,9 @@ $lang->admin->subMenu->dev->db     = array('link' => 'Database|dev|db');
 $lang->admin->subMenu->dev->editor = array('link' => 'Sửa code|dev|editor');
 $lang->admin->subMenu->dev->entry  = array('link' => 'Ứng dụng|entry|browse', 'subModule' => 'entry');
 
-$lang->admin->subMenu->data = new stdclass();
-$lang->admin->subMenu->data->backup = array('link' => 'Backup|backup|index', 'subModule' => 'backup');
-$lang->admin->subMenu->data->trash  = 'Recycle|action|trash';
-
 $lang->admin->subMenu->system = new stdclass();
+$lang->admin->subMenu->system->data       = array('link' => 'Data|backup|index', 'subModule' => 'action');
+$lang->admin->subMenu->system->safe       = array('link' => 'Security|admin|safe', 'alias' => 'checkweak');
 $lang->admin->subMenu->system->cron       = array('link' => 'Cron|cron|index', 'subModule' => 'cron');
 $lang->admin->subMenu->system->timezone   = array('link' => 'Timezone|custom|timezone', 'subModule' => 'custom');
 $lang->admin->subMenu->system->buildIndex = array('link' => 'Full Text Search|search|buildindex|');
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 6ae050cf22..ee1b9e5ce1 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -526,9 +526,7 @@ $lang->admin->menu->index   = array('link' => '首页|admin|index', 'alias' => '
 $lang->admin->menu->company = array('link' => '人员|company|browse|', 'subModule' => ',user,dept,group,', 'alias' => ',dynamic,view,');
 $lang->admin->menu->message = array('link' => '通知|message|index', 'subModule' => 'message,mail,webhook');
 $lang->admin->menu->custom  = array('link' => '自定义|custom|index', 'subModule' => 'custom');
-$lang->admin->menu->data    = array('link' => '数据|backup|index', 'subModule' => 'backup,action');
-$lang->admin->menu->safe    = array('link' => '安全|admin|safe', 'alias' => 'checkweak');
-$lang->admin->menu->system  = array('link' => '系统|cron|index', 'subModule' => 'cron');
+$lang->admin->menu->system  = array('link' => '系统|backup|index', 'subModule' => 'cron,admin,backup,action');
 
 $lang->company->menu = $lang->company->menu;
 $lang->dept->menu    = $lang->company->menu;
@@ -551,11 +549,9 @@ $lang->admin->subMenu->dev->db     = array('link' => '数据库|dev|db');
 $lang->admin->subMenu->dev->editor = array('link' => '编辑器|dev|editor');
 $lang->admin->subMenu->dev->entry  = array('link' => '应用|entry|browse', 'subModule' => 'entry');
 
-$lang->admin->subMenu->data = new stdclass();
-$lang->admin->subMenu->data->backup = array('link' => '备份|backup|index', 'subModule' => 'backup');
-$lang->admin->subMenu->data->trash  = '回收站|action|trash';
-
 $lang->admin->subMenu->system = new stdclass();
+$lang->admin->subMenu->system->data       = array('link' => '数据|backup|index', 'subModule' => 'action');
+$lang->admin->subMenu->system->safe       = array('link' => '安全|admin|safe', 'alias' => 'checkweak');
 $lang->admin->subMenu->system->cron       = array('link' => '定时|cron|index', 'subModule' => 'cron');
 $lang->admin->subMenu->system->timezone   = array('link' => '时区|custom|timezone', 'subModule' => 'custom');
 $lang->admin->subMenu->system->buildIndex = array('link' => '重建索引|search|buildindex|');
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index 23c7bc25ba..21fefcf656 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -531,9 +531,7 @@ $lang->admin->menu->index   = array('link' => '首頁|admin|index', 'alias' => '
 $lang->admin->menu->company = array('link' => '人員|company|browse|', 'subModule' => ',user,dept,group,', 'alias' => ',dynamic,view,');
 $lang->admin->menu->message = array('link' => '通知|message|index', 'subModule' => 'message,mail,webhook');
 $lang->admin->menu->custom  = array('link' => '自定義|custom|index', 'subModule' => 'custom');
-$lang->admin->menu->data    = array('link' => '數據|backup|index', 'subModule' => 'backup,action');
-$lang->admin->menu->safe    = array('link' => '安全|admin|safe', 'alias' => 'checkweak');
-$lang->admin->menu->system  = array('link' => '系統|cron|index', 'subModule' => 'cron');
+$lang->admin->menu->system  = array('link' => '系統|backup|index', 'subModule' => 'cron,admin,backup,action');
 
 $lang->company->menu = $lang->company->menu;
 $lang->dept->menu    = $lang->company->menu;
@@ -556,11 +554,9 @@ $lang->admin->subMenu->dev->db     = array('link' => '資料庫|dev|db');
 $lang->admin->subMenu->dev->editor = array('link' => '編輯器|dev|editor');
 $lang->admin->subMenu->dev->entry  = array('link' => '應用|entry|browse', 'subModule' => 'entry');
 
-$lang->admin->subMenu->data = new stdclass();
-$lang->admin->subMenu->data->backup = array('link' => '備份|backup|index', 'subModule' => 'backup');
-$lang->admin->subMenu->data->trash  = '資源回收筒|action|trash';
-
 $lang->admin->subMenu->system = new stdclass();
+$lang->admin->subMenu->system->data       = array('link' => '數據|backup|index', 'subModule' => 'action');
+$lang->admin->subMenu->system->safe       = array('link' => '安全|admin|safe', 'alias' => 'checkweak');
 $lang->admin->subMenu->system->cron       = array('link' => '定時|cron|index', 'subModule' => 'cron');
 $lang->admin->subMenu->system->timezone   = array('link' => '時區|custom|timezone', 'subModule' => 'custom');
 $lang->admin->subMenu->system->buildIndex = array('link' => '重建索引|search|buildindex|');