Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into miglock

Browse Source
This commit is contained in:
HB9HIL
2024-08-06 11:15:36 +02:00
committed by GitHub
parent 0d308e2e2a 8db68d251b
commit a9c2f2ed53
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
application/models/User_model.php
View File

@@ -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;
}
}
}
}

2
assets/lang_src/messages.pot
View File

@@ -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:45+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
install/includes/gettext/lang_src/installer.pot
View File

@@ -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:45+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

0
update_wavelog.sh Executable file → Normal file
View File