Fix "last login" meta and display on PanelUsers page

diff --git a/login/index.php b/login/index.php
index ea24e29596bf8bb469c4acc187e9f27c7df4a764..4c625e2e4072976b145e461a4d342288ef409993 100644 (file)
--- a/login/index.php
+++ b/login/index.php
@@ -28,7 +28,7 @@ if (!empty($_POST))
                {
                        $_SESSION['id'] = $user->id;
                        header('Location: ' . $redirect);
-                       $user->add_meta("last_login", date("Y-m-d m:i:s"));
+                       $user->add_meta("last_login", date("Y-m-d H:i:s"));
                        Hook::run(HOOKTYPE_USER_LOGIN, $user);
                        die();
                }

diff --git a/misc/strings.php b/misc/strings.php
index b6f7d24ed25a254676ecd73dc7f146fbc7f1a215..8ba9b2153c482a1f3aa6fec08a789567ea7c6f6a 100644 (file)
--- a/misc/strings.php
+++ b/misc/strings.php
@@ -70,7 +70,6 @@ function how_long_ago($timestamp)
 {
        $now = time();
        $diff = $now - strtotime($timestamp);
-
        $units = array(
                31536000 => 'year',
                2592000 => 'month',

diff --git a/settings/index.php b/settings/index.php
index 540d04bbe7b43fd2c92b0b5632be76b51a16b47c..ba3427d0a7f4643cbed9e5f30455b081cc2c408b 100644 (file)
--- a/settings/index.php
+++ b/settings/index.php
@@ -146,11 +146,14 @@ Click on a username to view more information.
                        echo "<td scope=\"col\">".$user->bio."</td>";
                        $last = (isset($user->user_meta['last_login'])) ? "<code>".$user->user_meta['last_login'] . "</code> <span class=\"badge rounded-pill badge-dark\">".how_long_ago($user->user_meta['last_login'])."</span>" : "none";
                        echo "<td scope=\"col\">$last</td>";
-                       echo "</tr>";
+                       echo "</tr>\n";
                }
-       ?></tbody></table><p><button type="button" class="btn btn-danger" data-toggle="modal" data-target="#myModal2">
+       ?></tbody></table>
+       <?php if (current_user_can(PERMISSION_MANAGE_USERS)) { ?>
+               <p><button type="button" class="btn btn-danger" data-toggle="modal" data-target="#myModal2">
        Delete selected
        </button></p>
+       <?php } ?>
        <div class="modal fade" id="myModal2" tabindex="-1" role="dialog" aria-labelledby="confirmModalCenterTitle" aria-hidden="true">
        <div class="modal-dialog modal-dialog-centered" role="document">
                <div class="modal-content">