From 32c4e96cbf49eca00fa0056b45b214ead15049dd Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 5 Aug 2024 21:39:39 +0200 Subject: [PATCH 1/4] disable password change for demo users --- application/models/User_model.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/application/models/User_model.php b/application/models/User_model.php index 4e3f0af46..fa3a8dd6c 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -305,11 +305,14 @@ class User_Model extends CI_Model { // Hash password if($fields['user_password'] != NULL) { - if ($fields['user_password'] !== $pwd_placeholder) { - $decoded_password = htmlspecialchars_decode($fields['user_password']); - $data['user_password'] = $this->_hash($decoded_password); - if($data['user_password'] == EPASSWORDINVALID) { - return EPASSWORDINVALID; + if (!file_exists('.demo') || (file_exists('.demo') && $this->session->userdata('user_type') == 99)) { + + if ($fields['user_password'] !== $pwd_placeholder) { + $decoded_password = htmlspecialchars_decode($fields['user_password']); + $data['user_password'] = $this->_hash($decoded_password); + if($data['user_password'] == EPASSWORDINVALID) { + return EPASSWORDINVALID; + } } } } From 9438bd16199d67675f8a9c719cbe45335c5f3354 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 5 Aug 2024 19:40:23 +0000 Subject: [PATCH 2/4] po/mo updates --- assets/lang_src/messages.pot | 2 +- install/includes/gettext/lang_src/installer.pot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/lang_src/messages.pot b/assets/lang_src/messages.pot index 19a4fca75..a35b0e17b 100644 --- a/assets/lang_src/messages.pot +++ b/assets/lang_src/messages.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-08-05 13:04+0000\n" +"POT-Creation-Date: 2024-08-05 19:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/install/includes/gettext/lang_src/installer.pot b/install/includes/gettext/lang_src/installer.pot index 5d5a2f372..43457884a 100644 --- a/install/includes/gettext/lang_src/installer.pot +++ b/install/includes/gettext/lang_src/installer.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-08-05 13:04+0000\n" +"POT-Creation-Date: 2024-08-05 19:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" From 1689eeba40a373281378330391d808e5fc6f02dc Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 5 Aug 2024 21:44:18 +0200 Subject: [PATCH 3/4] restore 664 --- update_wavelog.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 update_wavelog.sh diff --git a/update_wavelog.sh b/update_wavelog.sh old mode 100755 new mode 100644 From 8db68d251b7ebf12d80f13b87c9d43782c438842 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 5 Aug 2024 19:45:05 +0000 Subject: [PATCH 4/4] po/mo updates --- assets/lang_src/messages.pot | 2 +- install/includes/gettext/lang_src/installer.pot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/lang_src/messages.pot b/assets/lang_src/messages.pot index a35b0e17b..a731d798f 100644 --- a/assets/lang_src/messages.pot +++ b/assets/lang_src/messages.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-08-05 19:40+0000\n" +"POT-Creation-Date: 2024-08-05 19:45+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/install/includes/gettext/lang_src/installer.pot b/install/includes/gettext/lang_src/installer.pot index 43457884a..ffe2399b8 100644 --- a/install/includes/gettext/lang_src/installer.pot +++ b/install/includes/gettext/lang_src/installer.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-08-05 19:40+0000\n" +"POT-Creation-Date: 2024-08-05 19:45+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"