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

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 37af59ab4c..c43101826b 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/31/2003 *
- * ===============                              Last change: 11/23/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 08/31/2003 *
+ * ===================                          Last change: 11/23/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : admin-inc.php                                    *
@@ -51,7 +51,7 @@ function addAdminAccount ($user, $md5, $email) {
 		array($user), __FUNCTION__, __LINE__);
 
 	// Is the entry there?
-	if (SQL_NUMROWS($result) == 0) {
+	if (SQL_NUMROWS($result) == '0') {
 		// Ok, let's create the admin login
 		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins` (`login`, `password`, `email`) VALUES ('%s', '%s', '%s')",
 			array(
@@ -59,6 +59,8 @@ function addAdminAccount ($user, $md5, $email) {
 				$md5,
 				$email
 			), __FUNCTION__, __LINE__);
+
+		// All done
 		$ret = 'done';
 	} // END - if
 
@@ -114,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
@@ -133,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);
 
@@ -210,8 +213,6 @@ function doAdminLogin ($adminLogin, $passHash) {
 		setSession('admin_login', $adminLogin)
 	) && (
 		setSession('admin_last', time())
-	) && (
-		setSession('admin_to', bigintval(postRequestElement('timeout')))
 	));
 }
 
@@ -228,7 +229,7 @@ function ifAdminCookiesAreValid ($admin, $password) {
 	//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):".generatePassString($pass).'('.strlen($pass).")/".$password.'('.strlen($password).")<br />");
 
 	// Check if password matches
-	if (($ret == 'pass') && ((generatePassString($pass) == $password) || ($pass == $password) || ((strlen($pass) == 32) && (md5($password) == $pass)))) {
+	if (($ret == 'pass') && ((generatePassString($pass) == $password) || ($pass == $password) || ((strlen($pass) == 32) && (md5($password) == $pass))) && (isAdmin())) {
 		// Passwords matches!
 		$ret = 'done';
 	} // END - if
@@ -249,14 +250,14 @@ function doAdminAction () {
 		// Default admin action is the overview page
 		$what = 'overview';
 	} else {
-		// Compile out some chars
-		$what = compileCode($what, false, false, false);
+		// Secure it
+		$what = secureString($what);
 	}
 
 	// Get action value
 	$action = getModeAction(getModule(), $what);
 
-	// Define admin login name and ID number
+	// Define admin login name and id number
 	$content['login'] = getSession('admin_login');
 	$content['id']    = getCurrentAdminId();
 
@@ -272,12 +273,6 @@ function doAdminAction () {
 	// Tableset header
 	loadTemplate('admin_main_header', false, $content);
 
-	// Is sql_patches not yet installed?
-	if (!isExtensionInstalled('sql_patches')) {
-		// Output warning
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_WARNING_SQL_PATCHES_MISSING'));
-	} // END - if
-
 	// Check if action/what pair is valid
 	$result_action = SQL_QUERY_ESC("SELECT
 	`id`
@@ -297,7 +292,13 @@ WHERE
 		)
 	)
 LIMIT 1",
-		array($action, $what, $what), __FUNCTION__, __LINE__);
+		array(
+			$action,
+			$what,
+			$what
+		), __FUNCTION__, __LINE__);
+
+	// Do we have an entry?
 	if (SQL_NUMROWS($result_action) == 1) {
 		// Is valid but does the inlcude file exists?
 		$inc = sprintf("inc/modules/admin/action-%s.php", $action);
@@ -313,7 +314,7 @@ LIMIT 1",
 		}
 	} else {
 		// Invalid action/what pair found!
-		loadTemplate('admin_menu_failed', false, sprintf(getMessage('ADMIN_ACTION_INVALID'), $action.'/'.$what));
+		loadTemplate('admin_menu_failed', false, sprintf(getMessage('ADMIN_ACTION_INVALID'), $action . '/' . $what));
 	}
 
 	// Free memory
@@ -343,6 +344,8 @@ WHERE
 ORDER BY
 	`sort` ASC,
 	`id` DESC", __FUNCTION__, __LINE__);
+
+	// Do we have entries?
 	if (SQL_NUMROWS($result_main) > 0) {
 		$OUT = "<div style=\"height:7px\" class=\"seperator\">&nbsp;</div>\n";
 		$OUT .= "<ul class=\"admin_menu_main\">\n";
@@ -355,6 +358,12 @@ ORDER BY
 				$ACL = true;
 			}
 
+			// Filename
+			$inc = sprintf("inc/modules/admin/action-%s.php", $menu);
+
+			// Is the file readable?
+			$readable = isIncludeReadable($inc);
+
 			if ($ACL === true) {
 				if ($SUB === false) {
 					// Insert compiled menu title and description
@@ -364,18 +373,26 @@ ORDER BY
 				$OUT .= "<li class=\"admin_menu\">
 <div class=\"nobr\"><strong>&middot;</strong>&nbsp;";
 
-				if (($menu == $action) && (empty($what))) {
-					$OUT .= "<strong>";
+				if ($readable === true) {
+					if (($menu == $action) && (empty($what))) {
+						$OUT .= "<strong>";
+					} else {
+						$OUT .= "[<a href=\"{?URL?}/modules.php?module=admin&amp;action=".$menu."\">";
+					}
 				} else {
-					$OUT .= "[<a href=\"{?URL?}/modules.php?module=admin&amp;action=".$menu."\">";
+					$OUT .= "<em style=\"cursor:help\" class=\"admin_note\" title=\"{--MENU_ACTION_404--}\">";
 				}
 
 				$OUT .= $title;
 
-				if (($menu == $action) && (empty($what))) {
-					$OUT .= "</strong>";
+				if ($readable === true) {
+					if (($menu == $action) && (empty($what))) {
+						$OUT .= "</strong>";
+					} else {
+						$OUT .= "</a>]";
+					}
 				} else {
-					$OUT .= "</a>]";
+					$OUT .= "</em>";
 				}
 
 				$OUT .= "</div>
@@ -516,12 +533,12 @@ 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
 		$OUT = "<select name=\"".$mode."_menu";
-		if ((!empty($defid)) || ($defid == 0)) $OUT .= "[".$defid."]";
+		if ((!empty($defid)) || ($defid == '0')) $OUT .= "[".$defid."]";
 		$OUT .= "\" size=\"1\" class=\"admin_select\">
 	<option value=\"\">{--SELECT_NONE--}</option>\n";
 		// @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query
@@ -544,7 +561,7 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
 }
 
 // Wrapper for $_POST and adminSaveSettings
-function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement = 'config=0', $translateComma = array(), $alwaysAdd = false) {
+function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = false) {
 	// Get the array
 	$postData = postRequestArray();
 
@@ -553,7 +570,7 @@ function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement
 }
 
 // Save settings to the database
-function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement = 'config=0', $translateComma = array(), $alwaysAdd = false) {
+function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = false) {
 	// Prepare all arrays, variables
 	$DATA = array();
 	$skip = false;
@@ -565,11 +582,8 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 			// Do not save the ok value
 			convertSelectionsToTimestamp($postData, $DATA, $id, $skip);
 
-			// Shall we process this ID? It muss not be empty, of course
-			if (($skip === false) && (!empty($id))) {
-				// Save this entry
-				$val = compileCode($val);
-
+			// Shall we process this id? It muss not be empty, of course
+			if (($skip === false) && (!empty($id)) && (!isset($GLOBALS['skip_config'][$id]))) {
 				// Translate the value? (comma to dot!)
 				if ((is_array($translateComma)) && (in_array($id, $translateComma))) {
 					// Then do it here... :)
@@ -578,7 +592,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 
 				// Shall we add numbers or strings?
 				$test = (float)$val;
-				if ("".$val."" == ''.$test."") {
+				if ('' . $val . '' == '' . $test . '') {
 					// Add numbers
 					$DATA[] = sprintf("`%s`=%s", $id, $test);
 				} else {
@@ -586,6 +600,9 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 					$DATA[] = sprintf("`%s`='%s'", $id, trim($val));
 				}
 
+				// Do not add a config entry twice
+				$GLOBALS['skip_config'][$id] = true;
+
 				// Update current configuration
 				setConfigEntry($id, $val);
 			} // END - if
@@ -608,9 +625,9 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 
 		// Generate SQL string
 		$sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}%s` SET %s WHERE %s LIMIT 1",
-		$tableName,
-		$DATA_UPDATE,
-		$whereStatement
+			$tableName,
+			$DATA_UPDATE,
+			$whereStatement
 		);
 	} else {
 		// Add Line (does only work with auto_increment!
@@ -622,14 +639,14 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 		} // END - foreach
 
 		// Add both in one line
-		$KEYs = implode(', ', $KEYs);
+		$KEYs = implode('`, `', $KEYs);
 		$values = implode(', ', $values);
 
 		// Generate SQL string
-		$sql = sprintf("INSERT INTO {?_MYSQL_PREFIX?}%s (%s) VALUES (%s)",
-		$tableName,
-		$KEYs,
-		$values
+		$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}%s` (%s) VALUES (%s)",
+			$tableName,
+			$KEYs,
+			$values
 		);
 	}
 
@@ -692,7 +709,7 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
 		$title = $userid;
 	} // END - if
 
-	if (($title == 0) && ($what == 'list_refs')) {
+	if (($title == '0') && ($what == 'list_refs')) {
 		// Return title again
 		return $title;
 	} elseif (isExtensionActive('nickname')) {
@@ -743,11 +760,11 @@ function adminGetMenuMode () {
 
 // Change activation status
 function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
-	$cnt = 0; $newStatus = 'Y';
+	$cnt = '0'; $newStatus = 'Y';
 	if ((is_array($IDs)) && (count($IDs) > 0)) {
 		// "Walk" all through and count them
 		foreach ($IDs as $id => $selected) {
-			// Secure the ID number
+			// Secure the id number
 			$id = bigintval($id);
 
 			// Should always be set... ;-)
@@ -829,7 +846,7 @@ function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions,
 
 	// "Walk" through all entries
 	foreach ($IDs as $id => $selected) {
-		// Secure ID number
+		// Secure id number
 		$id = bigintval($id);
 
 		// Get result from a given column array and table name
@@ -964,7 +981,7 @@ function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFuncti
 	} // END - if
 }
 
-// Delete rows by given ID numbers
+// Delete rows by given id numbers
 function adminDeleteEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $deleteNow=false, $idColumn='id', $userIdColumn='userid') {
 	// All valid entries? (We hope so here!)
 	if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
@@ -1014,14 +1031,14 @@ function adminDeleteEntriesConfirm ($IDs, $table, $columns=array(), $filterFunct
 	} // END - if
 }
 
-// Edit rows by given ID numbers
+// Edit rows by given id numbers
 function adminEditEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $editNow=false, $idColumn='id', $userIdColumn='userid') {
 	// All valid entries? (We hope so here!)
 	if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
 		// Shall we change here or list for editing?
 		if ($editNow === true) {
 			// Change them all
-			$affected = 0;
+			$affected = '0';
 			foreach ($IDs as $id => $sel) {
 				// Prepare content array (new values)
 				$content = array();
@@ -1103,7 +1120,7 @@ function adminEditEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctio
 	} // END - if
 }
 
-// Un-/lock rows by given ID numbers
+// Un-/lock rows by given id numbers
 function adminLockEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $lockNow=false, $idColumn='id', $userIdColumn='userid') {
 	// All valid entries? (We hope so here!)
 	if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (($lockNow === false) || (count($statusArray) == 1))) {
@@ -1118,7 +1135,7 @@ function adminLockEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctio
 	} // END - if
 }
 
-// Undelete rows by given ID numbers
+// Undelete rows by given id numbers
 function adminUndeleteEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $undeleteNow=false, $idColumn='id', $userIdColumn='userid') {
 	// All valid entries? (We hope so here!)
 	if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (($undeleteNow === false) || (count($statusArray) == 1))) {
@@ -1153,15 +1170,12 @@ function sendAdminPasswordResetLink ($email) {
 	// Init output
 	$OUT = '';
 
-	// Compile out security characters (must be for looking up!)
-	$email = compileCode($email);
-
 	// Look up administator login
 	$result = SQL_QUERY_ESC("SELECT `id`, `login`, `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `email`='%s' LIMIT 1",
 		array($email), __FUNCTION__, __LINE__);
 
 	// Is there an account?
-	if (SQL_NUMROWS($result) == 0) {
+	if (SQL_NUMROWS($result) == '0') {
 		// No account found!
 		return getMessage('ADMIN_NO_LOGIN_WITH_EMAIL');
 	} // END - if
@@ -1194,12 +1208,9 @@ function adminResetValidateHashLogin ($hash, $login) {
 	// By default nothing validates... ;)
 	$valid = false;
 
-	// Compile the login for lookup
-	$login = compileCode($login);
-
 	// Then try to find that user
 	$result = SQL_QUERY_ESC("SELECT `id`, `password`, `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
-	array($login), __FUNCTION__, __LINE__);
+		array($login), __FUNCTION__, __LINE__);
 
 	// Is an account here?
 	if (SQL_NUMROWS($result) == 1) {
@@ -1207,7 +1218,7 @@ function adminResetValidateHashLogin ($hash, $login) {
 		$content = SQL_FETCHARRAY($result);
 
 		// Generate hash again
-		$hashFromData = generateHash(getConfig('URL').':'.$content['id'].':'.$login.':'.$content['password'], substr($content['password'], 10));
+		$hashFromData = generateHash(getConfig('URL') . ':' . $content['id'] . ':' . $login . ':' . $content['password'], substr($content['password'], 10));
 
 		// Does both match?
 		$valid = ($hash == $hashFromData);
@@ -1310,5 +1321,35 @@ function adminCreateUserLink ($userid) {
 	return '{?URL?}/modules.php?module=admin&amp;what=list_user';
 }
 
+// Generate a "link" for the given admin id (admin_id)
+function generateAdminLink ($adminId) {
+	// No assigned admin is default
+	$adminLink = "<span class=\"admin_note\">{--ADMIN_NO_ADMIN_ASSIGNED--}</span>";
+
+	// Zero? = Not assigned
+	if (bigintval($adminId) > 0) {
+		// Load admin's login
+		$login = getAdminLogin($adminId);
+
+		// Is the login valid?
+		if ($login != '***') {
+			// Is the extension there?
+			if (isExtensionActive('admins')) {
+				// Admin found
+				$adminLink = "<a href=\"".generateEmailLink(getAdminEmail($adminId), 'admins')."\">" . $login."</a>";
+			} else {
+				// Extension not found
+				$adminLink = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'admins');
+			}
+		} else {
+			// Maybe deleted?
+			$adminLink = "<div class=\"admin_note\">".sprintf(getMessage('ADMIN_ID_404'), $adminId)."</div>";
+		}
+	} // END - if
+
+	// Return result
+	return $adminLink;
+}
+
 // [EOF]
 ?>