From 1c29b84932a210bbb29746447316898f032be485 Mon Sep 17 00:00:00 2001
From: Matthieu Leproux <leproux.matthieu@gmail.com>
Date: Wed, 23 Jun 2021 13:57:06 +0200
Subject: [PATCH] related to #1378 language mistakes + csv error + changed
 logout icon

---
 admin/themes/default/template/user_activity.tpl | 15 ++++++++-------
 include/ws_functions/pwg.php                    |  1 -
 language/en_UK/admin.lang.php                   |  3 ++-
 language/fr_FR/admin.lang.php                   |  3 ++-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/admin/themes/default/template/user_activity.tpl b/admin/themes/default/template/user_activity.tpl
index 1432228f9..5c6fe9739 100644
--- a/admin/themes/default/template/user_activity.tpl
+++ b/admin/themes/default/template/user_activity.tpl
@@ -29,7 +29,8 @@ var actionType_add = "{'add'|translate}";
 var actionType_delete = "{'deletion'|translate}";
 var actionType_move = "{'move'|translate}";
 var actionType_edit = "{'edit'|translate}";
-var actionType_log = "{'log'|translate}";
+var actionType_login = "{'login'|translate}";
+var actionType_logout = "{'logout'|translate}";
 
 {* Album keys *}
 
@@ -299,7 +300,7 @@ function lineConstructor(line) {
             newLine.find(".action-icon").addClass("icon-key");
             newLine.find(".action-section").addClass("icon-user-1");
 
-            newLine.find(".action-name").html(actionType_log);
+            newLine.find(".action-name").html(actionType_login);
 
             console.log("userS Logged in");
             final_albumInfos = actionInfos_users_logged_in.replace('%d', line.counter);
@@ -309,10 +310,10 @@ function lineConstructor(line) {
             case "logout":
             newLine.find(".action-type").addClass("icon-purple");
             newLine.find(".user-pic").addClass(color_icons[line.user_id % 5]);
-            newLine.find(".action-icon").addClass("icon-key");
+            newLine.find(".action-icon").addClass("icon-logout");
             newLine.find(".action-section").addClass("icon-user-1");
 
-            newLine.find(".action-name").html(actionType_log);
+            newLine.find(".action-name").html(actionType_logout);
 
             console.log("userS Logged in");
             final_albumInfos = actionInfos_users_logged_out.replace('%d', line.counter);
@@ -482,7 +483,7 @@ function lineConstructor(line) {
             newLine.find(".action-icon").addClass("icon-key");
             newLine.find(".action-section").addClass("icon-user-1");
 
-            newLine.find(".action-name").html(actionType_log);
+            newLine.find(".action-name").html(actionType_login);
 
             final_albumInfos = actionInfos_user_logged_in.replace('%d', line.counter);
 
@@ -490,10 +491,10 @@ function lineConstructor(line) {
             case "logout":
             newLine.find(".action-type").addClass("icon-purple");
             newLine.find(".user-pic").addClass(color_icons[line.user_id % 5]);
-            newLine.find(".action-icon").addClass("icon-key");
+            newLine.find(".action-icon").addClass("icon-logout");
             newLine.find(".action-section").addClass("icon-user-1");
 
-            newLine.find(".action-name").html(actionType_log);
+            newLine.find(".action-name").html(actionType_logout);
           
             final_albumInfos = actionInfos_user_logged_out.replace('%d', line.counter);
 
diff --git a/include/ws_functions/pwg.php b/include/ws_functions/pwg.php
index e304fd5ea..7d970d0b8 100644
--- a/include/ws_functions/pwg.php
+++ b/include/ws_functions/pwg.php
@@ -466,7 +466,6 @@ function ws_activity_downloadLog($param, &$service) {
       'ip_address' => $row['ip_address'],
       'details' => $row['details'],
     );
-    $line_id++;
   }
 
   header('Content-type: application/csv');
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index a17e22e1c..80f634e3d 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -1180,7 +1180,8 @@ $lang['add'] = 'add';
 $lang['deletion'] = 'deletion';
 $lang['move'] = 'move';
 $lang['edit'] = 'edit';
-$lang['log'] = 'log';
+$lang['logout'] = 'logout';
+$lang['login'] = 'login';
 $lang['%d album added'] = '%d album added';
 $lang['%d album deleted'] = '%d album deleted';
 $lang['%d album edited'] = '%d album edited';
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index afb75225e..ba0ae6ce6 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -1182,7 +1182,8 @@ $lang['add'] = 'ajout';
 $lang['deletion'] = 'suppression';
 $lang['move'] = 'déplacement';
 $lang['edit'] = 'édition';
-$lang['log'] = 'connexion';
+$lang['logout'] = 'déconnexion';
+$lang['login'] = 'connection';
 $lang['%d album added'] = '%d album ajouté';
 $lang['%d album deleted'] = '%d album supprimé';
 $lang['%d album edited'] = '%d album édité';