3.0.9

Improvements on logs (#3759)
nilsteampassnet · Jul 3, 2023 · 88f7986 · 88f7986
1 parent d424149
commit 88f7986
Show file tree

Hide file tree

Showing 31 changed files with 216 additions and 14 deletions.
diff --git a/includes/language/bulgarian.php b/includes/language/bulgarian.php
@@ -1101,5 +1101,8 @@
     'day' => 'Day',
     'reset' => 'Reset',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/catalan.php b/includes/language/catalan.php
@@ -1101,5 +1101,8 @@
     'day' => 'Day',
     'reset' => 'Reset',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/chinese.php b/includes/language/chinese.php
@@ -1101,5 +1101,8 @@
     'day' => 'Day',
     'reset' => 'Reset',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/czech.php b/includes/language/czech.php
@@ -1101,5 +1101,8 @@
     'day' => 'Day',
     'reset' => 'Reset',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/dutch.php b/includes/language/dutch.php
@@ -1101,5 +1101,8 @@
     'day' => 'Day',
     'reset' => 'Reset',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/english.php b/includes/language/english.php
@@ -16,6 +16,9 @@
  * @see       https://www.teampass.net
  */
 return array(
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
     'error_while_creating_file' => 'Error while creating file',
     'field' => 'Field',
     'exceeds_maximum_length_of' => 'exceeds maximum length of',

diff --git a/includes/language/estonian.php b/includes/language/estonian.php
@@ -1101,5 +1101,8 @@
     'day' => 'Day',
     'reset' => 'Reset',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/french.php b/includes/language/french.php
@@ -1101,5 +1101,8 @@
     'day' => 'Jour',
     'reset' => 'Réinitialiser',
     'error_while_creating_file' => 'Création du fichier impossible',
+    'new_keys_generated' => 'Nouvelles clés générées',
+    'user_creation' => 'Utilisateur créé',
+    'user_deletion' => 'Utilisateur supprimé',
 
 );
diff --git a/includes/language/german.php b/includes/language/german.php
@@ -1101,5 +1101,8 @@
     'day' => 'Day',
     'reset' => 'Reset',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/greek.php b/includes/language/greek.php
@@ -1101,5 +1101,8 @@
     'day' => 'Day',
     'reset' => 'Reset',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/hungarian.php b/includes/language/hungarian.php
@@ -1101,5 +1101,8 @@
     'day' => 'Day',
     'reset' => 'Reset',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/italian.php b/includes/language/italian.php
@@ -1101,5 +1101,8 @@
     'day' => 'Day',
     'reset' => 'Reset',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/japanese.php b/includes/language/japanese.php
@@ -1101,5 +1101,8 @@
     'day' => 'Day',
     'reset' => 'Reset',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/norwegian.php b/includes/language/norwegian.php
@@ -1101,5 +1101,8 @@
     'day' => 'Day',
     'reset' => 'Reset',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/polish.php b/includes/language/polish.php
@@ -1101,5 +1101,8 @@
     'day' => 'Day',
     'reset' => 'Reset',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/portuguese.php b/includes/language/portuguese.php
@@ -1101,5 +1101,8 @@
     'day' => 'Day',
     'reset' => 'Reset',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/portuguese_br.php b/includes/language/portuguese_br.php
@@ -1101,5 +1101,8 @@
     'day' => 'Dia',
     'reset' => 'Redefinir',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/romanian.php b/includes/language/romanian.php
@@ -1101,5 +1101,8 @@
     'day' => 'Day',
     'reset' => 'Reset',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/russian.php b/includes/language/russian.php
@@ -1102,5 +1102,8 @@
     'day' => 'Day',
     'reset' => 'Reset',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/spanish.php b/includes/language/spanish.php
@@ -1101,5 +1101,8 @@
     'day' => 'Día',
     'reset' => 'Restablecer',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/swedish.php b/includes/language/swedish.php
@@ -1101,5 +1101,8 @@
     'day' => 'Day',
     'reset' => 'Reset',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/turkish.php b/includes/language/turkish.php
@@ -1101,5 +1101,8 @@
     'day' => 'Day',
     'reset' => 'Reset',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/ukrainian.php b/includes/language/ukrainian.php
@@ -1101,5 +1101,8 @@
     'day' => 'Day',
     'reset' => 'Reset',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/includes/language/vietnamese.php b/includes/language/vietnamese.php
@@ -1101,5 +1101,8 @@
     'day' => 'Day',
     'reset' => 'Reset',
     'error_while_creating_file' => 'Error while creating file',
+    'new_keys_generated' => 'New keys generated',
+    'user_creation' => 'User creation',
+    'user_deletion' => 'User deletion',
 
 );
diff --git a/install/install.queries.php b/install/install.queries.php
@@ -787,6 +787,9 @@ function encryptFollowingDefuse($message, $ascii_key)
                             `roles_from_ad_groups` varchar(1000) NULL,
                             `ongoing_process_id` VARCHAR(100) NULL,
                             `mfa_enabled` tinyint(1) NOT null DEFAULT '1',
+                            `created_at` varchar(30) NULL,
+                            `updated_at` varchar(30) NULL,
+                            `deleted_at` varchar(30) NULL,
                             PRIMARY KEY (`id`),
                             UNIQUE KEY `login` (`login`)
                             ) CHARSET=utf8;"

diff --git a/install/upgrade_run_3.0.0.php b/install/upgrade_run_3.0.0.php
@@ -1195,7 +1195,6 @@
 mysqli_query(
     $db_link,
     "ALTER TABLE `" . $pre . "export`
-        MODIFY COLUMN `id` int(12) NOT NULL,
         MODIFY COLUMN `label` VARCHAR(500) NOT NULL,
         MODIFY COLUMN `path` VARCHAR(500) NOT NULL;"
 );

diff --git a/install/upgrade_run_3.0.php b/install/upgrade_run_3.0.php
@@ -314,6 +314,51 @@
     "int(12) NOT NULL"
 );
 
+// Add field created_at to USERS table
+$res = addColumnIfNotExist(
+    $pre . 'users',
+    'created_at',
+    "varchar(30) NULL;"
+);
+if ($res === false) {
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field created_at to table USERS! ' . mysqli_error($db_link) . '!"}]';
+    mysqli_close($db_link);
+    exit();
+}
+
+// Add field updated_at to USERS table
+$res = addColumnIfNotExist(
+    $pre . 'users',
+    'updated_at',
+    "varchar(30) NULL;"
+);
+if ($res === false) {
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field updated_at to table USERS! ' . mysqli_error($db_link) . '!"}]';
+    mysqli_close($db_link);
+    exit();
+}
+
+// Add field deleted_at to USERS table
+$res = addColumnIfNotExist(
+    $pre . 'users',
+    'deleted_at',
+    "varchar(30) NULL;"
+);
+if ($res === false) {
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field deleted_at to table USERS! ' . mysqli_error($db_link) . '!"}]';
+    mysqli_close($db_link);
+    exit();
+}
+
+//
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "users` WHERE created_at IS NOT NULL"));
+if (intval($tmp) === 0) {
+    populateUsersTable($pre);
+}
+
+
+// populate created_at, updated_at and deleted_at fields in USERS table
+
 //---<END 3.0.9
 
 // Save timestamp
@@ -336,4 +381,44 @@
 mysqli_close($db_link);
 
 // Finished
-echo '[{"finish":"1" , "next":"", "error":""}]';
+echo '[{"finish":"1" , "next":"", "error":""}]';
+
+
+//---< FUNCTIONS
+
+function populateUsersTable($pre)
+{
+    global $db_link;
+    // loop on users - created_at
+    $users = mysqli_query(
+        $db_link,
+        "select u.id as uid, ls.date as datetime
+        from `" . $pre . "users` as u
+        inner join `" . $pre . "log_system` as ls on ls.field_1 = u.id
+        WHERE ls.type = 'user_mngt' AND ls.label = 'at_user_added'"
+    );
+    while ($user = mysqli_fetch_assoc($users)) {
+        if (empty((string) $user['datetime']) === false && is_null($user['datetime']) === false) {
+            // update created_at field
+            mysqli_query(
+                $db_link,
+                "UPDATE `" . $pre . "users` SET created_at = '".$user['datetime']."' WHERE id = ".$user['uid']
+            );
+        }
+    }
+
+    // loop on users - updated_at
+    $users = mysqli_query(
+        $db_link,
+        "select u.id as uid, (select date from " . $pre . "log_system where type = 'user_mngt' and field_1=uid order by date DESC limit 1) as datetime from `" . $pre . "users` as u;"
+    );
+    while ($user = mysqli_fetch_assoc($users)) {
+        if (empty((string) $user['datetime']) === false && is_null($user['datetime']) === false) {
+            // update updated_at field
+            mysqli_query(
+                $db_link,
+                "UPDATE `" . $pre . "users` SET updated_at = '".$user['datetime']."' WHERE id = ".$user['uid']
+            );
+        }
+    }
+}
diff --git a/pages/utilities.logs.php b/pages/utilities.logs.php
@@ -98,7 +98,7 @@
 
                         <div class="tab-content mt-1" id="myTabContent">
                             <div class="tab-pane fade show active" id="connections" role="tabpanel" aria-labelledby="connections-tab">
-                                <table class="table table-striped table-responsive" id="table-connections" style="width:100%;">
+                                <table class="table table-striped nowrap table-responsive-sm" id="table-connections" style="width:100%;">
                                     <thead>
                                         <tr>
                                             <th style=""><?php echo langHdl('date'); ?></th>
@@ -109,7 +109,7 @@
                                 </table>
                             </div>
                             <div class="tab-pane fade" id="errors" role="tabpanel" aria-labelledby="errors-tab">
-                                <table class="table table-striped table-responsive" table-responsive id="table-errors" style="width:100%;">
+                                <table class="table table-striped nowrap table-responsive-sm" id="table-errors" style="width:100%;">
                                     <thead>
                                         <tr>
                                             <th style=""><?php echo langHdl('date'); ?></th>
@@ -120,7 +120,7 @@
                                 </table>
                             </div>
                             <div class="tab-pane fade" id="copy" role="tabpanel" aria-labelledby="copy-tab">
-                                <table class="table table-striped table-responsive" id="table-copy" style="width:100%;">
+                                <table class="table table-striped nowrap table-responsive-sm" id="table-copy" style="width:100%;">
                                     <thead>
                                         <tr>
                                             <th style=""><?php echo langHdl('date'); ?></th>
@@ -131,18 +131,19 @@
                                 </table>
                             </div>
                             <div class="tab-pane fade" id="admin" role="tabpanel" aria-labelledby="admin-tab">
-                                <table class="table table-striped table-responsive" id="table-admin" style="width:100%;">
+                                <table class="table table-striped nowrap table-responsive-sm" id="table-admin" style="width:100%;">
                                     <thead>
                                         <tr>
                                             <th style=""><?php echo langHdl('date'); ?></th>
-                                            <th style=""><?php echo langHdl('user'); ?></th>
+                                            <th style=""><?php echo langHdl('author'); ?></th>
                                             <th style=""><?php echo langHdl('action'); ?></th>
+                                            <th style=""><?php echo langHdl('who'); ?></th>
                                         </tr>
                                     </thead>
                                 </table>
                             </div>
                             <div class="tab-pane fade" id="items" role="tabpanel" aria-labelledby="items-tab">
-                                <table class="table table-striped table-responsive" id="table-items" style="width:100%;">
+                                <table class="table table-striped nowrap table-responsive-sm" id="table-items" style="width:100%;">
                                     <thead>
                                         <tr>
                                             <th style=""><?php echo langHdl('date'); ?></th>
@@ -157,7 +158,7 @@
                                 </table>
                             </div>
                             <div class="tab-pane fade" id="failed" role="tabpanel" aria-labelledby="failed-tab">
-                                <table class="table table-striped table-responsive" id="table-failed" style="width:100%;">
+                                <table class="table table-striped nowrap table-responsive-sm" id="table-failed">
                                     <thead>
                                         <tr>
                                             <th style=""><?php echo langHdl('date'); ?></th>