X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=2f2d9bb0fc3bb9b1f4de3e7aea4385ae4aab0017;hp=0d06e5fbfde55875e011fd4fd359fced8c054b84;hb=0e269568bd666186509e98594e83bac199ac26da;hpb=7fabfadce30a7bea7ce3ad1f1e2e7e5e616f2669

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 0d06e5fbfd..2f2d9bb0fc 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -51,10 +51,16 @@ 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($user, $md5, $email), __FUNCTION__, __LINE__);
+		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins` (`login`, `password`, `email`) VALUES ('%s', '%s', '%s')",
+			array(
+				$user,
+				$md5,
+				$email
+			), __FUNCTION__, __LINE__);
+
+		// All done
 		$ret = 'done';
 	} // END - if
 
@@ -175,15 +181,15 @@ function ifAdminLoginDataIsValid ($admin, $password) {
 	// Count login failure if admins extension version is 0.7.0+
 	if (($ret == 'pass') && (getExtensionVersion('admins') >= '0.7.0')) {
 		// Update counter
-		SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins` SET login_failures=login_failures+1,last_failure=NOW() WHERE `id`=%s LIMIT 1",
-		array($adminId), __FUNCTION__, __LINE__);
+		SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins` SET login_failures`=`login_failures`+1,`last_failure`=NOW() WHERE `id`=%s LIMIT 1",
+			array($adminId), __FUNCTION__, __LINE__);
 
 		// Rebuild cache
 		rebuildCacheFile('admin', 'admin');
 	} // END - if
 
 	// Return the result
-	//* DEBUG: */ die("RETURN=".$ret);
+	//* DEBUG: */ die('RETURN=' . $ret);
 	return $ret;
 }
 
@@ -206,8 +212,6 @@ function doAdminLogin ($adminLogin, $passHash) {
 		setSession('admin_login', $adminLogin)
 	) && (
 		setSession('admin_last', time())
-	) && (
-		setSession('admin_to', bigintval(postRequestElement('timeout')))
 	));
 }
 
@@ -224,7 +228,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
@@ -234,7 +238,10 @@ function ifAdminCookiesAreValid ($admin, $password) {
 }
 
 // Do an admin action
-function doAdminAction ($what) {
+function doAdminAction () {
+	// Get default what
+	$what = getWhat();
+
 	//* DEBUG: */ outputHtml(__LINE__."*".$what.'/'.getModule().'/'.getAction().'/'.getWhat()."*<br />");
 
 	// Remove any spaces from variable
@@ -242,14 +249,14 @@ function doAdminAction ($what) {
 		// 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();
 
@@ -283,7 +290,14 @@ WHERE
 			)
 		)
 	)
-LIMIT 1", array($action, $what, $what), __FUNCTION__, __LINE__);
+LIMIT 1",
+		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);
@@ -329,6 +343,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";
@@ -341,6 +357,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
@@ -350,18 +372,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>
@@ -463,7 +493,7 @@ ORDER BY
 }
 
 // Create member selection box
-function addMemberSelectionBox ($def='0', $add_all=false, $return=false, $none=false, $field='userid') {
+function addMemberSelectionBox ($def=0, $add_all=false, $return=false, $none=false, $field='userid') {
 	// Output selection form with all confirmed user accounts listed
 	$result = SQL_QUERY("SELECT `userid`, `surname`, `family` FROM `{?_MYSQL_PREFIX?}_user_data` ORDER BY `userid` ASC", __FUNCTION__, __LINE__);
 
@@ -530,7 +560,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();
 
@@ -539,7 +569,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;
@@ -551,11 +581,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... :)
@@ -564,7 +591,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 {
@@ -572,6 +599,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
@@ -590,13 +620,13 @@ function adminSaveSettings (&$postData, $tableName = "_config", $whereStatement
 
 	if (SQL_NUMROWS($result) == 1) {
 		// "Implode" all data to single string
-		$DATA_UPDATE = implode(", ", $DATA);
+		$DATA_UPDATE = implode(', ', $DATA);
 
 		// 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!
@@ -608,14 +638,14 @@ function adminSaveSettings (&$postData, $tableName = "_config", $whereStatement
 		} // END - foreach
 
 		// Add both in one line
-		$KEYs = implode(", ", $KEYs);
-		$values = implode(", ", $values);
+		$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
 		);
 	}
 
@@ -673,7 +703,7 @@ function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
 
 // Creates a user-profile link for the admin. This function can also be used for many other purposes
 function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
-	if (($title == '') && ($title != '0')) {
+	if (($title == '') && ($userid > 0)) {
 		// Set userid as title
 		$title = $userid;
 	} // END - if
@@ -681,10 +711,15 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
 	if (($title == '0') && ($what == 'list_refs')) {
 		// Return title again
 		return $title;
-	} // END - if
+	} elseif (isExtensionActive('nickname')) {
+		// Get nickname
+		$nick = getNickname($userid);
+
+		// Is it not empty, use it as title else the userid
+		if (!empty($nick)) $title = $nick . '(' . $userid . ')'; else $title = $userid;
+	}
 
 	// Return link
-	//* DEBUG: */ outputHtml("a:".$title."<br />");
 	return '[<a href="{?URL?}/modules.php?module=admin&amp;what=' . $what . '&amp;userid=' . $userid . '" title="{--ADMIN_USER_PROFILE_TITLE--}">' . $title . '</a>]';
 }
 
@@ -724,11 +759,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... ;-)
@@ -810,7 +845,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
@@ -945,7 +980,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))) {
@@ -995,14 +1030,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();
@@ -1084,7 +1119,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))) {
@@ -1099,7 +1134,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))) {
@@ -1134,15 +1169,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
@@ -1175,12 +1207,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) {
@@ -1188,7 +1217,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);
@@ -1207,7 +1236,7 @@ function doResetAdminPassword ($login, $password) {
 	$passHash = '';
 
 	// Now check if we have sql_patches installed
-	if (getExtensionVersion('sql_patches') >= '0.3.6') {
+	if (isExtensionInstalledAndNewer('sql_patches', '0.3.6')) {
 		// Use new way of hashing
 		$passHash = generateHash($password);
 	} else {
@@ -1291,30 +1320,34 @@ function adminCreateUserLink ($userid) {
 	return '{?URL?}/modules.php?module=admin&amp;what=list_user';
 }
 
-// -----------------------------------------------------------------------------
-// ---                           Filter functions                            ---
-// -----------------------------------------------------------------------------
-
-// Filter for checking admin ACL
-function FILTER_CHECK_ADMIN_ACL () {
-	// Extension not installed so it's always allowed to access everywhere!
-	$ret = true;
-
-	// Ok, Cookie-Update done
-	if ((isExtensionInstalledAndNewer('admins', '0.3.0')) && (isExtensionActive('admins'))) {
-		// Check if action GET variable was set
-		$action = getAction();
-		if (isWhatSet()) {
-			// Get action value by what-value
-			$action = getModeAction('admin', getWhat());
-		} // END - if
-
-		// Check for access control line of current menu entry
-		$ret = adminsCheckAdminAcl($action, getWhat());
+// 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
 
-	// Set it here
-	$GLOBALS['acl_allow'] = $ret;
+	// Return result
+	return $adminLink;
 }
 
 // [EOF]