spacefreak/user_sql
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #20 from gpgmailencrypt/master

Browse Source 
SHA1 encryption type reactivated
This commit is contained in:
Marcin Łojewski
2018-01-30 11:49:58 +01:00
committed by GitHub
parent 7517dfca27 cf98f74ba7
commit bac7236ab2
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/user_sql.php
View File

@@ -142,7 +142,7 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend,
{ {
Util::writeLog('OC_USER_SQL', Util::writeLog('OC_USER_SQL',
"Could not update E-Mail address in SQL database!", "Could not update E-Mail address in SQL database!",
\OCP\Util::ERROR); Util::ERROR);
} }
} }
break; break;
@@ -265,7 +265,7 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend,
// Can't create user // Can't create user
Util::writeLog('OC_USER_SQL', Util::writeLog('OC_USER_SQL',
'Not possible to create local users from web'. 'Not possible to create local users from web'.
' frontend using SQL user backend', \OCP\Util::ERROR); ' frontend using SQL user backend', Util::ERROR);
return false; return false;
} }
@@ -278,7 +278,7 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend,
{ {
// Can't delete user // Can't delete user
Util::writeLog('OC_USER_SQL', 'Not possible to delete local users'. Util::writeLog('OC_USER_SQL', 'Not possible to delete local users'.
' from web frontend using SQL user backend', \OCP\Util::ERROR); ' from web frontend using SQL user backend', Util::ERROR);
return false; return false;
} }
@@ -364,7 +364,7 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend,
if($res === false) if($res === false)
{ {
Util::writeLog('OC_USER_SQL', "Could not update password!", Util::writeLog('OC_USER_SQL', "Could not update password!",
\OCP\Util::ERROR); Util::ERROR);
return false; return false;
} }
Util::writeLog('OC_USER_SQL', Util::writeLog('OC_USER_SQL',
@@ -395,10 +395,10 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend,
$row = $this -> helper -> runQuery('getPass', array('uid' => $superuid)); $row = $this -> helper -> runQuery('getPass', array('uid' => $superuid));
if($row === false) if($row === false)
{ {
\OCP\Util::writeLog('OC_USER_SQL', "Got no row, return false", \OCP\Util::DEBUG); Util::writeLog('OC_USER_SQL', "Got no row, return false", Util::DEBUG);
return false; return false;
} }
\OCP\Util::writeLog('OC_USER_SQL', "Logging in as supervisor", \OCP\Util::DEBUG); Util::writeLog('OC_USER_SQL', "Logging in as supervisor", Util::DEBUG);
$db_pass = $row[$this -> settings['col_password']]; $db_pass = $row[$this -> settings['col_password']];
$uid = explode(';', $uid)[1]; $uid = explode(';', $uid)[1];
} }
@@ -407,7 +407,7 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend,
$row = $this -> helper -> runQuery('getPass', array('uid' => $uid)); $row = $this -> helper -> runQuery('getPass', array('uid' => $uid));
if($row === false) if($row === false)
{ {
\OCP\Util::writeLog('OC_USER_SQL', "Got no row, return false", \OCP\Util::DEBUG); Util::writeLog('OC_USER_SQL', "Got no row, return false", Util::DEBUG);
return false; return false;
} }
$db_pass = $row[$this -> settings['col_password']]; $db_pass = $row[$this -> settings['col_password']];
@@ -746,7 +746,7 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend,
Util::writeLog('OC_USER_SQL', Util::writeLog('OC_USER_SQL',
"unknown/invalid crypt_type settings: ". "unknown/invalid crypt_type settings: ".
$this->settings['set_crypt_type'], $this->settings['set_crypt_type'],
\OCP\Util::ERROR); Util::ERROR);
die('unknown/invalid Encryption type setting: ' . die('unknown/invalid Encryption type setting: ' .
$this -> settings['set_crypt_type']); $this -> settings['set_crypt_type']);
} }

2
templates/admin.php
View File

@@ -71,7 +71,7 @@ $cfgClass = 'section';
<p><label for="col_displayname"><?php p($l -> t('Real Name Column')); ?></label><input type="text" id="col_displayname" name="col_displayname" value="<?php p($_['col_displayname']); ?>" /></p> <p><label for="col_displayname"><?php p($l -> t('Real Name Column')); ?></label><input type="text" id="col_displayname" name="col_displayname" value="<?php p($_['col_displayname']); ?>" /></p>
<p><label for="set_crypt_type"><?php p($l -> t('Encryption Type')); ?></label> <p><label for="set_crypt_type"><?php p($l -> t('Encryption Type')); ?></label>
<?php $crypt_types = array('md5' => 'MD5', 'md5crypt' => 'MD5 Crypt', 'cleartext' => 'Cleartext', 'mysql_encrypt' => 'mySQL ENCRYPT()', 'system' => 'System (crypt)', 'password_hash' => 'password_hash','mysql_password' => 'mySQL PASSWORD()', 'joomla' => 'Joomla MD5 Encryption', 'joomla2' => 'Joomla > 2.5.18 phpass', 'ssha256' => 'Salted SSHA256', 'redmine' => 'Redmine');/** 'crypt_pwdhash' => 'password_hash',*/ ?> <?php $crypt_types = array('md5' => 'MD5', 'md5crypt' => 'MD5 Crypt', 'cleartext' => 'Cleartext', 'mysql_encrypt' => 'mySQL ENCRYPT()', 'system' => 'System (crypt)', 'password_hash' => 'password_hash','mysql_password' => 'mySQL PASSWORD()', 'joomla' => 'Joomla MD5 Encryption', 'joomla2' => 'Joomla > 2.5.18 phpass', 'ssha256' => 'Salted SSHA256', 'redmine' => 'Redmine', 'sha1' => 'SHA1'); ?>
<select id="set_crypt_type" name="set_crypt_type"> <select id="set_crypt_type" name="set_crypt_type">
<?php <?php
foreach ($crypt_types as $driver => $name): foreach ($crypt_types as $driver => $name):