X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=c43101826b69b249db598a5e4fd66fa428a6d43c;hb=c1671a3b6c02326b471916a28f4177c453871f51;hp=b61077330aeb92fc765ba5ed331f4b7016474033;hpb=110c8e34f37715c3394e33974f47965c24dff87e;p=mailer.git

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index b61077330a..c43101826b 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -116,12 +116,13 @@ function ifAdminLoginDataIsValid ($admin, $password) {
 		SQL_FREERESULT($result);
 	}
 
-	//* DEBUG: */ outputHtml("*".$data['password'].'/'.md5($password).'/'.$ret."<br />");
+	//* DEBUG: */ outputHtml('*' . $data['password'] . '/' . md5($password) .'/' . $ret . '*<br />');
 	if ((isset($data['password'])) && (strlen($data['password']) == 32) && ($data['password'] == md5($password))) {
 		// Generate new hash
 		$data['password'] = generateHash($password);
 
 		// Is the sql_patches not installed, than we cannot have a valid hashed password here!
+		//* DEBUG: */ outputHtml($ret . ',' . intval(isExtensionInstalledAndOlder('sql_patches', '0.3.6')) . '/' . intval(!isExtensionInstalled('sql_patches')).'<br />');
 		if (($ret == 'pass') && ((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) || (!isExtensionInstalled('sql_patches')))) $ret = 'done';
 	} elseif ((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) || (!isExtensionInstalled('sql_patches'))) {
 		// Old hashing way
@@ -135,8 +136,8 @@ function ifAdminLoginDataIsValid ($admin, $password) {
 	$salt = substr($data['password'], 0, -40);
 
 	// Check if password is same
-	//* DEBUG: */ outputHtml("*".$ret.','.$data['password'].','.$password.','.$salt."*<br />");
-	if (($ret == 'pass') && ($data['password'] == generateHash($password, $salt)) && ((!empty($salt))) || ($data['password'] == $password)) {
+	//* DEBUG: */ outputHtml('*' . $ret . ',' . $data['password'] . ',' . $password . ',' . $salt . '*<br />');
+	if (($ret == 'pass') && ($data['password'] == generateHash($password, $salt)) && ((!empty($salt))) || ($data['password'] == md5($password))) {
 		// Re-hash the plain passord with new random salt
 		$data['password'] = generateHash($password);
 
@@ -532,7 +533,7 @@ function addMemberSelectionBox ($def=0, $add_all=false, $return=false, $none=fal
 function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
 	$what = "`what` != ''";
 	if ($mode == 'action') $what = "(`what`='' OR `what` IS NULL) AND action !='login'";
-	$result = SQL_QUERY_ESC("SELECT %s, title FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort`",
+	$result = SQL_QUERY_ESC("SELECT %s, `title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC",
 		array($mode), __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result) > 0) {
 		// Load menu as selection