X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=4542f84670a2b7e28dee17f6f708cc12e98049d4;hb=766fcb898d34d42249d75f6097d85296aa5f9196;hp=126e4dd5beff94265cf4f025fa1735d47e6d114d;hpb=46c1acbca83153bb96f76cc084d532069b88d96e;p=mailer.git

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 126e4dd5be..4542f84670 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -296,7 +296,7 @@ ORDER BY
 						$OUT .= '[<a href="{%url=modules.php?module=admin&amp;action=' . $menu . '%}">';
 					}
 				} else {
-					$OUT .= '<em style="cursor:help" class="notice" title="{%message,MENU_ACTION_404=' . $menu . '}">';
+					$OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_ACTION_404=' . $menu . '%}">';
 				}
 
 				$OUT .= $title;
@@ -358,7 +358,7 @@ ORDER BY
 									$OUT .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $what_sub . '%}">';
 								}
 							} else {
-								$OUT .= '<em style="cursor:help" class="notice" title="{%message,MENU_WHAT_404=' . $what_sub . '%}">';
+								$OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_WHAT_404=' . $what_sub . '%}">';
 							}
 
 							$OUT .= $title_what;
@@ -576,7 +576,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 	rebuildCache('config', 'config');
 
 	// Settings saved, so display message?
-	if ($displayMessage === true) loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
+	if ($displayMessage === true) displayMessage('{--SETTINGS_SAVED--}');
 
 	// Return affected rows
 	return $affected;
@@ -727,10 +727,10 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
 		} // END - foreach
 
 		// Output status
-		loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_STATUS_CHANGED'), $count, count($IDs)));
+		displayMessage(sprintf(getMessage('ADMIN_STATUS_CHANGED'), $count, count($IDs)));
 	} else {
 		// Nothing selected!
-		loadTemplate('admin_settings_saved', false, '{--ADMIN_NOTHING_SELECTED_CHANGE--}');
+		displayMessage('{--ADMIN_NOTHING_SELECTED_CHANGE--}');
 	}
 }
 
@@ -961,10 +961,10 @@ function adminDeleteEntriesConfirm ($IDs, $table, $columns = array(), $filterFun
 			// Was this fine?
 			if (SQL_AFFECTEDROWS() == count($IDs)) {
 				// All deleted
-				loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_ENTRIES_REMOVED--}');
+				displayMessage('{--ADMIN_ALL_ENTRIES_REMOVED--}');
 			} else {
 				// Some are still there :(
-				loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count($IDs)));
+				displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count($IDs)));
 			}
 		} else {
 			// List for deletion confirmation
@@ -1050,10 +1050,10 @@ function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunct
 			// Was this fine?
 			if ($affected == count($IDs)) {
 				// All deleted
-				loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_ENTRIES_EDITED--}');
+				displayMessage('{--ADMIN_ALL_ENTRIES_EDITED--}');
 			} else {
 				// Some are still there :(
-				loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count($IDs)));
+				displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count($IDs)));
 			}
 		} else {
 			// List for editing
@@ -1129,20 +1129,20 @@ function sendAdminPasswordResetLink ($email) {
 	SQL_FREERESULT($result);
 
 	// Generate hash for reset link
-	$content['hash'] = generateHash(getUrl() . ':' . $content['id'] . ':' . $content['login'] . ':' . $content['password'], substr($content['password'], 10));
+	$content['hash'] = generateHash(getUrl() . getEncryptSeperator() . $content['id'] . getEncryptSeperator() . $content['login'] . getEncryptSeperator() . $content['password'], substr($content['password'], getSaltLength()));
 
 	// Remove some data
 	unset($content['id']);
 	unset($content['password']);
 
 	// Prepare email
-	$mailText = loadEmailTemplate('form_reset_password', $content);
+	$mailText = loadEmailTemplate('admin_reset_password', $content);
 
 	// Send it out
-	sendEmail($email, '{--ADMIN_RESET_PASS_LINK_SUBJECT--}', $mailText);
+	sendEmail($email, '{--ADMIN_RESET_PASSWORD_LINK_SUBJECT--}', $mailText);
 
 	// Prepare output
-	return '{--ADMIN_RESET_LINK_SENT--}';
+	return '{--ADMIN_RESET_PASSWORD_LINK_SENT--}';
 }
 
 // Validate hash and login for password reset
@@ -1160,7 +1160,7 @@ function adminResetValidateHashLogin ($hash, $login) {
 		$content = SQL_FETCHARRAY($result);
 
 		// Generate hash again
-		$hashFromData = generateHash(getUrl() . ':' . $content['id'] . ':' . $login . ':' . $content['password'], substr($content['password'], 10));
+		$hashFromData = generateHash(getUrl() . getEncryptSeperator() . $content['id'] . getEncryptSeperator() . $login . getEncryptSeperator() . $content['password'], substr($content['password'], getSaltLength()));
 
 		// Does both match?
 		$valid = ($hash == $hashFromData);
@@ -1311,7 +1311,7 @@ function doVerifyExpertSettings () {
 		// Is he allowed?
 		if ($expertSettings == 'Y') {
 			// Okay, does he want to see them?
-			if (getAminsExpertWarning() == 'Y') {
+			if (isAdminsExpertWarningEnabled()) {
 				// Ask for them
 				if (isFormSent()) {
 					// Is the element set, then we need to change the admin
@@ -1352,7 +1352,7 @@ function doVerifyExpertSettings () {
 	// Output message for other status than ask/agreed
 	if (($return != 'ask') && ($return != 'agreed')) {
 		// Output message
-		loadTemplate('admin_settings_saved', false, '{--ADMIN_EXPERT_SETTINGS_STATUS_' . strtoupper($return) . '--}');
+		displayMessage('{--ADMIN_EXPERT_SETTINGS_STATUS_' . strtoupper($return) . '--}');
 	} // END - if
 
 	// Return status
@@ -1484,17 +1484,17 @@ function adminProcessMenuEditForm ($type, $subMenu) {
 
 			default: // Unexpected action
 				logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
-				loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
+				displayMessage(getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
 				break;
 		} // END - switch
 	} // END - foreach
 
 	// Load template
-	loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
+	displayMessage('{--SETTINGS_SAVED--}');
 }
 
 // Handle weightning
-function doAdminProcessMenuWeightning ($type) {
+function doAdminProcessMenuWeightning ($type, $AND) {
 	// Are there all required (generalized) GET parameter?
 	if ((isGetRequestParameterSet('act')) && (isGetRequestParameterSet('tid')) && (isGetRequestParameterSet('fid'))) {
 		// Init variables