Merge branch 'feature/2021-03-ui-logs' into main

web/templates/admin/edit_user.html

@@ -3,7 +3,7 @@
           <div class="l-unit-toolbar__buttonstrip">
             <a class="ui-button cancel" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
             <a href="/list/key/" id="btn-create" class="ui-button cancel" title="<?=_('Manage SSH keys');?>"><i class="fas fa-key status-icon orange"></i><?=_('Manage SSH keys')?></a>
-            <a href="/edit/user/log/?user=<?php echo $user; ?>" id="btn-list" class="ui-button cancel" title="<?=_('Login history');?>"><i class="fas fa-binoculars status-icon green"></i><?=_('Login history')?></a>
+            <a href="/list/log/" id="btn-create" class="ui-button cancel" title="<?=_('Logs');?>"><i class="fas fa-history status-icon maroon"></i><?=_('Logs')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
             <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=_('Save')?></a>

web/templates/admin/list_auth.html

@@ -1,23 +1,23 @@
 <div class="l-center">
-      <div class="l-sort clearfix noselect">
-        <div class="l-unit-toolbar__buttonstrip">
-          <a href="/edit/user/?user=<?php echo $user; ?>" id="btn-back" class="ui-button cancel"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
-          <a href="javascript:location.reload();" class="ui-button cancel"><i class="fas fa-redo status-icon green"></i> <?=_('Refresh')?></a>
-          <div class="actions-panel display-inline-block" key-action="js">
-            <a class="data-controls do_delete ui-button danger cancel">
-              <i class="do_delete fas fa-times-circle status-icon red"></i>
-              <?=_('Delete')?>
-              <input type="hidden" name="delete_url" value="/delete/user/log/?token=<?=$_SESSION['token']?>" />
-                <div class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                  <p class="confirmation"><?=_('Are you sure you want to delete the login history for this user?')?></p>
-                </div>
-            </a>
-          </div>
-        </div>
-        <div class="l-sort-toolbar clearfix">
-        </div>
+  <div class="l-sort clearfix noselect">
+    <div class="l-unit-toolbar__buttonstrip">
+      <a href="/list/log/" id="btn-back" class="ui-button cancel"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
+    </div>
+    <div class="l-unit-toolbar__buttonstrip float-right">
+      <a href="javascript:location.reload();" class="ui-button cancel"><i class="fas fa-redo status-icon green"></i> <?=_('Refresh')?></a>
+      <div class="actions-panel display-inline-block" key-action="js">
+        <a class="data-controls do_delete ui-button danger cancel">
+          <i class="do_delete fas fa-times-circle status-icon red"></i>
+          <?=_('Delete')?>
+          <input type="hidden" name="delete_url" value="/delete/user/log/?token=<?=$_SESSION['token']?>" />
+            <div class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
+              <p class="confirmation"><?=_('Are you sure you want to delete the login history for this user?')?></p>
+            </div>
+        </a>
       </div>
     </div>
+  </div>
+</div>
 
 <div class="l-separator"></div>
 

web/templates/admin/list_log.html

@@ -1,6 +1,11 @@
 <div class="l-center">
   <div class="l-sort clearfix noselect">
     <div class="l-unit-toolbar__buttonstrip">
+      <a href="/edit/user/?user=<?php echo $user; ?>" id="btn-back" class="ui-button cancel"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
+      <a href="/edit/user/log/?user=<?php echo $user; ?>" id="btn-list" class="ui-button cancel" title="<?=_('Login history');?>"><i class="fas fa-binoculars status-icon green"></i><?=_('Login history')?></a>
+
+    </div>
+    <div class="l-unit-toolbar__buttonstrip float-right">
       <a href="javascript:location.reload();" class="ui-button cancel"><i class="fas fa-redo status-icon green"></i> <?=_('Refresh')?></a>
       <div class="actions-panel display-inline-block" key-action="js">
         <a class="data-controls do_delete ui-button danger cancel">
@@ -13,8 +18,6 @@
         </a>
       </div>
     </div>
-    <div class="l-sort-toolbar clearfix">
-    </div>
   </div>
 </div>
 

web/templates/admin/panel.html

@@ -14,7 +14,6 @@
 			<?php if ((isset($_SESSION['FILE_MANAGER'])) && (!empty($_SESSION['FILE_MANAGER'])) && ($_SESSION['FILE_MANAGER'] == "true")) {?>
 				<div class="l-menu__item <?php if($TAB == 'FM' ) echo 'l-menu__item--active' ?>"><a href="/fm/"><i class="fas fa-folder-open panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=_('Files')?></a></div>
 			<?php } ?>
-			<div class="l-menu__item <?php if($TAB == 'LOG' ) echo 'l-menu__item--active' ?>"><a href="/list/log/"><i class="fas fa-history panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=_('Log')?></a></div>
 			<div class="l-menu__item <?php if($TAB == 'STATS' ) echo 'l-menu__item--active' ?>"><a href="/list/stats/"><i class="fas fa-chart-line panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=_('Statistics')?></a></div>
 		</div>
 		<div class="l-profile noselect">

web/templates/user/edit_user.html

@@ -3,7 +3,7 @@
           <div class="l-unit-toolbar__buttonstrip">
             <a class="ui-button cancel" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
             <a href="/list/key/" id="btn-create" class="ui-button cancel" title="<?=_('Manage SSH keys');?>"><i class="fas fa-key status-icon orange"></i><?=_('Manage SSH keys')?></a>
-            <a href="/edit/user/log/?user=<?php echo $user; ?>" id="btn-list" class="ui-button cancel" title="<?=_('Login history');?>"><i class="fas fa-binoculars status-icon green"></i><?=_('Login history')?></a>
+            <a href="/list/log/" id="btn-create" class="ui-button cancel" title="<?=_('Logs');?>"><i class="fas fa-history status-icon maroon"></i><?=_('Logs')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
             <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=_('Save')?></a>

web/templates/user/list_auth.html

@@ -1,14 +1,13 @@
 <div class="l-center">
-      <div class="l-sort clearfix noselect">
-        <div class="l-unit-toolbar__buttonstrip">
-          <a href="/edit/user/?user=<?php echo $user; ?>" id="btn-back" class="ui-button cancel"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
-          <a href="javascript:location.reload();" class="ui-button cancel"><i class="fas fa-redo status-icon green"></i> <?=_('Refresh')?></a>
-        </div>
-        <div class="l-sort-toolbar clearfix">
-        </div>
-      </div>
+  <div class="l-sort clearfix noselect">
+    <div class="l-unit-toolbar__buttonstrip">
+      <a href="/list/log/" id="btn-back" class="ui-button cancel"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
     </div>
-
+    <div class="l-unit-toolbar__buttonstrip float-right">
+      <a href="javascript:location.reload();" class="ui-button cancel"><i class="fas fa-redo status-icon green"></i> <?=_('Refresh')?></a>
+    </div>
+  </div>
+</div>
 <div class="l-separator"></div>
 
 <div class="l-center units animated fadeIn">

web/templates/user/list_log.html

@@ -0,0 +1,57 @@
+<div class="l-center">
+  <div class="l-sort clearfix noselect">
+    <div class="l-unit-toolbar__buttonstrip">
+      <a href="/edit/user/?user=<?php echo $user; ?>" id="btn-back" class="ui-button cancel"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
+      <a href="/edit/user/log/?user=<?php echo $user; ?>" id="btn-list" class="ui-button cancel" title="<?=_('Login history');?>"><i class="fas fa-binoculars status-icon green"></i><?=_('Login history')?></a>
+    </div>
+    <div class="l-unit-toolbar__buttonstrip float-right">
+      <a href="javascript:location.reload();" class="ui-button cancel"><i class="fas fa-redo status-icon green"></i> <?=_('Refresh')?></a>
+    </div>
+  </div>
+</div>
+
+<div class="l-separator"></div>
+
+<div class="l-center units animated fadeIn">
+
+  <div class="header table-header">     
+    <div class="l-unit__col l-unit__col--right">
+      <div class="clearfix l-unit__stat-col--left super-compact">
+        &nbsp;
+      </div>       
+      <div class="clearfix l-unit__stat-col--left"><b><?php print _('Date');?></b></div>
+      <div class="clearfix l-unit__stat-col--left"><b><?php print _('Time');?></b></div>
+      <div class="clearfix l-unit__stat-col--left"><b><?php print _('Value');?></b></div>
+    </div>
+  </div>
+
+  <?php
+      foreach ($data as $key => $value) {
+        ++$i;
+      ?>
+      <div class="l-unit header">
+        <div class="l-unit__col l-unit__col--right">
+          <div class="clearfix l-unit__stat-col--left super-compact">
+            <i class="fas fa-info-circle status-icon dim"></i>
+          </div>
+          <div class="clearfix l-unit__stat-col--left"><b><?=translate_date($data[$key]['DATE'])?></b></div>
+          <div class="clearfix l-unit__stat-col--left"><b><?=$data[$key]['TIME']?></b></div>
+          <div class="clearfix l-unit__stat-col--left wide-7"><?=htmlspecialchars($data[$key]['CMD'], ENT_QUOTES)?></div>
+        </div>
+      </div>
+  <?}?>
+</div>
+
+<div id="vstobjects">
+  <div class="l-separator"></div>
+  <div class="l-center">
+    <div class="l-unit-ft">
+      <table class='data'></table>
+      <div class="data-count l-unit__col l-unit__col--right clearfix">
+        <?
+          printf(ngettext('%d log record', '%d log records', $i),$i);
+        ?>
+      </div>
+    </div>
+  </div>
+</div>

web/templates/user/panel.html

@@ -14,7 +14,6 @@
 			<?php if ((isset($_SESSION['FILE_MANAGER'])) && (!empty($_SESSION['FILE_MANAGER'])) && ($_SESSION['FILE_MANAGER'] == "true")) {?>
 				<div class="l-menu__item <?php if($TAB == 'FM' ) echo 'l-menu__item--active' ?>"><a href="/fm/"><i class="fas fa-folder-open panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=_('Files')?></a></div>
 			<?php } ?>
-				<div class="l-menu__item <?php if($TAB == 'LOG' ) echo 'l-menu__item--active' ?>"><a href="/list/log/"><i class="fas fa-history panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=_('Log')?></a></div>
 			<div class="l-menu__item <?php if($TAB == 'STATS' ) echo 'l-menu__item--active' ?>"><a href="/list/stats/"><i class="fas fa-chart-line panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=_('Statistics')?></a></div>
 		</div>
 		<div class="l-profile noselect">