projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Happy New Year
[squirrelmail.git]
/
plugins
/
change_password
/
backend
/
ldap.php
diff --git
a/plugins/change_password/backend/ldap.php
b/plugins/change_password/backend/ldap.php
index fcfd30c9beae741dec0bb53e34ddd3c37b043c92..f0ff7419255932f0f1a24ccb6c3aae716951d9b0 100644
(file)
--- a/
plugins/change_password/backend/ldap.php
+++ b/
plugins/change_password/backend/ldap.php
@@
-3,7
+3,7
@@
/**
* Change password LDAP backend
*
/**
* Change password LDAP backend
*
- * @copyright
© 2005-2006
The SquirrelMail Project Team
+ * @copyright
2005-2020
The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package plugins
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package plugins
@@
-13,8
+13,7
@@
/**
* do not allow to call this file directly
*/
/**
* do not allow to call this file directly
*/
-if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
- (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) {
header("Location: ../../../src/login.php");
die();
}
header("Location: ../../../src/login.php");
die();
}
@@
-22,7
+21,7
@@
if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE
/** load required functions */
/** sqimap_get_user_server() function */
/** load required functions */
/** sqimap_get_user_server() function */
-include_once(SM_PATH . '
../
functions/imap_general.php');
+include_once(SM_PATH . 'functions/imap_general.php');
/** get imap server and username globals */
global $imapServerAddress, $username;
/** get imap server and username globals */
global $imapServerAddress, $username;
@@
-551,7
+550,6
@@
function cpw_ldap_password_hash($pass,$crypto,&$msgs,$forced_salt='') {
case 'smd5':
// minimal requirement = mhash extension with md5 support and php 4.0.4.
if( function_exists( 'mhash' ) && function_exists( 'mhash_keygen_s2k' ) && defined('MHASH_MD5')) {
case 'smd5':
// minimal requirement = mhash extension with md5 support and php 4.0.4.
if( function_exists( 'mhash' ) && function_exists( 'mhash_keygen_s2k' ) && defined('MHASH_MD5')) {
- sq_mt_seed( (double) microtime() * 1000000 );
if ($forced_salt!='') {
$salt=$forced_salt;
} else {
if ($forced_salt!='') {
$salt=$forced_salt;
} else {
@@
-591,7
+589,6
@@
function cpw_ldap_password_hash($pass,$crypto,&$msgs,$forced_salt='') {
case 'ssha':
// minimal requirement = mhash extension and php 4.0.4
if( function_exists( 'mhash' ) && function_exists( 'mhash_keygen_s2k' ) && defined('MHASH_SHA1')) {
case 'ssha':
// minimal requirement = mhash extension and php 4.0.4
if( function_exists( 'mhash' ) && function_exists( 'mhash_keygen_s2k' ) && defined('MHASH_SHA1')) {
- sq_mt_seed( (double) microtime() * 1000000 );
if ($forced_salt!='') {
$salt=$forced_salt;
} else {
if ($forced_salt!='') {
$salt=$forced_salt;
} else {
@@
-649,7
+646,7
@@
function cpw_ldap_password_hash($pass,$crypto,&$msgs,$forced_salt='') {
break;
default:
array_push($msgs,sprintf(_("Unsupported crypto: %s"),
break;
default:
array_push($msgs,sprintf(_("Unsupported crypto: %s"),
- (is_string($ldap_crypto) ?
htmlspecial
chars($ldap_crypto) : _("unknown"))));
+ (is_string($ldap_crypto) ?
sm_encode_html_special_
chars($ldap_crypto) : _("unknown"))));
}
return $ret;
}
}
return $ret;
}