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 remote-tracking branch 'upstream/dev' into dl250cdf_master

Browse Source
This commit is contained in:
HB9HIL
2024-08-07 09:32:53 +02:00
parent 66854a8511 83689e1644
commit cccf596ed9
47 changed files with 6009 additions and 3953 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;
}
}
}
}