diff options
Diffstat (limited to 'www/admin')
| -rw-r--r-- | www/admin/administrator/admin.php.in | 4 | ||||
| -rw-r--r-- | www/admin/domainmaintainer/domainmaintainer.php.in | 4 | ||||
| -rw-r--r-- | www/admin/maintainer/maintainer.php.in | 4 | ||||
| -rw-r--r-- | www/admin/user/user.php.in | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/www/admin/administrator/admin.php.in b/www/admin/administrator/admin.php.in index ec5de31..1e89b57 100644 --- a/www/admin/administrator/admin.php.in +++ b/www/admin/administrator/admin.php.in @@ -23,6 +23,7 @@ require_once('@kolab_php_module_prefix@admin/include/headers.php'); require_once('@kolab_php_module_prefix@admin/include/locale.php'); require_once('@kolab_php_module_prefix@admin/include/authenticate.php'); require_once('@kolab_php_module_prefix@admin/include/form.class.php'); +require_once('@kolab_php_module_prefix@admin/include/passwd.php'); /**** Functions ***/ function comment( $s ) { @@ -205,8 +206,7 @@ switch( $action ) { $ldap_object['sn'] = trim($_POST['lastname']); $ldap_object['cn'] = trim($_POST['firstname']).' '.$ldap_object['sn']; if( !empty( $_POST['password_0'] ) ) { - $ldap_object['userPassword'] = '{sha}'.base64_encode( pack('H*', - sha1( $_POST['password_0']))); + $ldap_object['userPassword'] = ssha( $_POST['password_0'], gensalt()); } if( $action == 'firstsave' ) $ldap_object['uid'] = trim( strtolower( $_POST['uid'] ) ); diff --git a/www/admin/domainmaintainer/domainmaintainer.php.in b/www/admin/domainmaintainer/domainmaintainer.php.in index 715445b..f03cc30 100644 --- a/www/admin/domainmaintainer/domainmaintainer.php.in +++ b/www/admin/domainmaintainer/domainmaintainer.php.in @@ -23,6 +23,7 @@ require_once('@kolab_php_module_prefix@admin/include/headers.php'); require_once('@kolab_php_module_prefix@admin/include/locale.php'); require_once('@kolab_php_module_prefix@admin/include/authenticate.php'); require_once('@kolab_php_module_prefix@admin/include/form.class.php'); +require_once('@kolab_php_module_prefix@admin/include/passwd.php'); /**** Functions ***/ function comment( $s ) { @@ -186,8 +187,7 @@ switch( $action ) { $ldap_object['sn'] = trim($_POST['lastname']); $ldap_object['cn'] = trim($_POST['firstname']).' '.$ldap_object['sn']; if( !empty( $_POST['password_0'] ) ) { - $ldap_object['userPassword'] = '{sha}'.base64_encode( pack('H*', - sha1( $_POST['password_0']))); + $ldap_object['userPassword'] = ssha( $_POST['password_0'], gensalt()); } if( $action == 'firstsave' ) $ldap_object['uid'] = trim( strtolower( $_POST['uid'] ) ); diff --git a/www/admin/maintainer/maintainer.php.in b/www/admin/maintainer/maintainer.php.in index 298a6e8..28cc461 100644 --- a/www/admin/maintainer/maintainer.php.in +++ b/www/admin/maintainer/maintainer.php.in @@ -23,6 +23,7 @@ require_once('@kolab_php_module_prefix@admin/include/headers.php'); require_once('@kolab_php_module_prefix@admin/include/locale.php'); require_once('@kolab_php_module_prefix@admin/include/authenticate.php'); require_once('@kolab_php_module_prefix@admin/include/form.class.php'); +require_once('@kolab_php_module_prefix@admin/include/passwd.php'); /**** Functions ***/ function comment( $s ) { @@ -202,8 +203,7 @@ switch( $action ) { $ldap_object['sn'] = trim($_POST['lastname']); $ldap_object['cn'] = trim($_POST['firstname']).' '.$ldap_object['sn']; if( !empty( $_POST['password_0'] ) ) { - $ldap_object['userPassword'] = '{sha}'.base64_encode( pack('H*', - sha1( $_POST['password_0']))); + $ldap_object['userPassword'] = ssha( $_POST['password_0'], gensalt()); } if( $action == 'firstsave' ) $ldap_object['uid'] = trim( strtolower( $_POST['uid'] ) ); diff --git a/www/admin/user/user.php.in b/www/admin/user/user.php.in index 994fc76..ed7eda6 100644 --- a/www/admin/user/user.php.in +++ b/www/admin/user/user.php.in @@ -11,6 +11,7 @@ require_once('@kolab_php_module_prefix@admin/include/headers.php'); require_once('@kolab_php_module_prefix@admin/include/locale.php'); require_once('@kolab_php_module_prefix@admin/include/authenticate.php'); require_once('@kolab_php_module_prefix@admin/include/form.class.php'); +require_once('@kolab_php_module_prefix@admin/include/passwd.php'); /**** Functions ***/ function comment( $s ) { @@ -491,8 +492,7 @@ switch( $action ) { $ldap_object['cn'] = trim($_POST['givenname']).' '.$ldap_object['sn']; $ldap_object['givenName'] = trim($_POST['givenname']); if( !empty( $_POST['password_0'] ) ) { - $ldap_object['userPassword'] = '{sha}'.base64_encode( pack('H*', - sha1( $_POST['password_0']))); + $ldap_object['userPassword'] = ssha( $_POST['password_0'], gensalt()); if( $action == 'save' && $auth->dn() == $dn ) { // We are editing our own password, let's update the session! $auth->setPassword($_POST['password_0']); |