X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=9ed9029b2232fc85bac0664a3fcda83bb3a737fb;hb=def1c791b52a6b8b5891539387525c3736f3c24c;hp=b580547dd3fe7d5132d4be92d97389428a628f40;hpb=56391f52928b7bafd0bf749437ff36a9823b52da;p=mailer.git

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index b580547dd3..9ed9029b22 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -52,7 +52,7 @@ function addAdminAccount ($adminLogin, $passHash, $adminEmail) {
 	// Is the entry there?
 	if (SQL_HASZERONUMS($result)) {
 		// Ok, let's create the admin login
-		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins` (`login`,`password`,`email`) VALUES ('%s', '%s', '%s')",
+		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins` (`login`, `password`, `email`) VALUES ('%s', '%s', '%s')",
 			array(
 				$adminLogin,
 				$passHash,
@@ -158,18 +158,18 @@ function doAdminAction () {
 	// Load welcome template
 	if (isExtensionActive('admins')) {
 		// @TODO This and the next getCurrentAdminId() call might be moved into the templates?
-		$content['welcome'] = loadTemplate('admin_welcome_admins', true, getCurrentAdminId());
+		$content['welcome'] = loadTemplate('admin_welcome_admins', TRUE, getCurrentAdminId());
 	} else {
-		$content['welcome'] = loadTemplate('admin_welcome', true, getCurrentAdminId());
+		$content['welcome'] = loadTemplate('admin_welcome', TRUE, getCurrentAdminId());
 	}
 
 	// Load header, footer, render menu
-	$content['header'] = loadTemplate('admin_header' , true, $content);
-	$content['footer'] = loadTemplate('admin_footer' , true, $content);
+	$content['header'] = loadTemplate('admin_header' , TRUE, $content);
+	$content['footer'] = loadTemplate('admin_footer' , TRUE, $content);
 	$content['menu']   = addAdminMenu($action, $what);
 
 	// Load main template
-	loadTemplate('admin_main', false, $content);
+	loadTemplate('admin_main', FALSE, $content);
 
 	// Check if action/what pair is valid
 	$result_action = SQL_QUERY_ESC("SELECT
@@ -200,26 +200,26 @@ LIMIT 1",
 	if (SQL_NUMROWS($result_action) == 1) {
 		// Is valid but does the inlcude file exists?
 		$inc = sprintf("inc/modules/admin/action-%s.php", $action);
-		if ((isIncludeReadable($inc)) && (isMenuActionValid('admin', $action, $what)) && ($GLOBALS['acl_allow'] === true)) {
+		if ((isIncludeReadable($inc)) && (isMenuActionValid('admin', $action, $what)) && ($GLOBALS['acl_allow'] === TRUE)) {
 			// Ok, we finally load the admin action module
 			loadInclude($inc);
-		} elseif ($GLOBALS['acl_allow'] === false) {
+		} elseif ($GLOBALS['acl_allow'] === FALSE) {
 			// Access denied
-			loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACCESS_DENIED=' . $what . '%}');
+			loadTemplate('admin_menu_failed', FALSE, '{%message,ADMIN_ACCESS_DENIED=' . $what . '%}');
 		} else {
 			// Include file not found :-(
-			loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACTION_404=' . $action . '%}');
+			loadTemplate('admin_menu_failed', FALSE, '{%message,ADMIN_ACTION_404=' . $action . '%}');
 		}
 	} else {
 		// Invalid action/what pair found
-		loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACTION_INVALID=' . $action . '/' . $what . '%}');
+		loadTemplate('admin_menu_failed', FALSE, '{%message,ADMIN_ACTION_INVALID=' . $action . '/' . $what . '%}');
 	}
 
 	// Free memory
 	SQL_FREERESULT($result_action);
 
 	// Tableset footer
-	loadTemplate('admin_main_footer', false, $content);
+	loadTemplate('admin_main_footer', FALSE, $content);
 }
 
 /**
@@ -241,7 +241,7 @@ function isAdminAllowedAccessMenu ($action, $what = NULL) {
 // Adds an admin menu
 function addAdminMenu ($action, $what) {
 	// Init variables
-	$SUB = false;
+	$SUB = FALSE;
 	$OUT = '';
 
 	// Menu descriptions
@@ -272,7 +272,7 @@ ORDER BY
 
 			// Is the current admin allowed to access this 'action' menu?
 			if (isAdminAllowedAccessMenu($mainContent['main_action'])) {
-				if ($SUB === false) {
+				if ($SUB === FALSE) {
 					// Insert compiled menu title and description
 					$GLOBALS['menu']['title'][$mainContent['main_action']]       = $mainContent['main_title'];
 					$GLOBALS['menu']['description'][$mainContent['main_action']] = $mainContent['main_descr'];
@@ -353,7 +353,7 @@ ORDER BY
 	// Are there entries?
 	if (ifAdminMenuHasEntries($mainContent['main_action'])) {
 		// Sub menu has been called
-		$SUB = true;
+		$SUB = TRUE;
 
 		// Are there entries?
 		if (!SQL_HASZERONUMS($result_what)) {
@@ -443,7 +443,7 @@ ORDER BY
 	// Load all entries
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Add the entry
-		$OUT .= loadTemplate('select_admins_option', true, $content);
+		$OUT .= loadTemplate('select_admins_option', TRUE, $content);
 	} // END - if
 
 	// Free memory
@@ -453,11 +453,11 @@ ORDER BY
 	$content['form_selection'] = $OUT;
 
 	// Output form
-	loadTemplate('select_admins_box', false, $content);
+	loadTemplate('select_admins_box', FALSE, $content);
 }
 
 // Create a member selection box
-function addMemberSelectionBox ($userid = NULL, $add_all = false, $return = false, $none = false, $field = 'userid', $whereStatement = " WHERE `surname` NOT LIKE '{?tester_user_surname_prefix?}%'") {
+function addMemberSelectionBox ($userid = NULL, $add_all = FALSE, $return = FALSE, $none = FALSE, $field = 'userid', $whereStatement = " WHERE `surname` NOT LIKE '{?tester_user_surname_prefix?}%'") {
 	// Output selection form with all confirmed user accounts listed
 	$result = SQL_QUERY('SELECT
 	`userid`,
@@ -473,9 +473,9 @@ ORDER BY
 	$OUT = '';
 
 	// USe this only for adding points (e.g. adding refs really makes no sence ;-) )
-	if ($add_all === true) {
+	if ($add_all === TRUE) {
 		$OUT = '      <option value="all">{--ALL_MEMBERS--}</option>';
-	} elseif ($none === true) {
+	} elseif ($none === TRUE) {
 		$OUT = '      <option value="0">{--SELECT_NONE--}</option>';
 	}
 
@@ -492,13 +492,13 @@ ORDER BY
 	// Free memory
 	SQL_FREERESULT($result);
 
-	if ($return === false) {
+	if ($return === FALSE) {
 		// Remeber options in constant
 		$content['form_selection'] = $OUT;
 		$content['what']           = '{%pipe,getWhat%}';
 
 		// Load template
-		loadTemplate('admin_form_selection_box', false, $content);
+		loadTemplate('admin_form_selection_box', FALSE, $content);
 	} else {
 		// Return content in selection frame
 		return '<select class="form_select" name="' . handleFieldWithBraces($field) . '" size="1">' . $OUT . '</select>';
@@ -512,7 +512,7 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
 	$what = "`what` != '' AND `what` IS NOT NULL";
 	if ($mode == 'action') $what = "(`what`='' OR `what` IS NULL) AND `action` != 'login'";
 
-	$result = SQL_QUERY_ESC("SELECT `%s` AS `menu`,`title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC",
+	$result = SQL_QUERY_ESC("SELECT `%s` AS `menu`, `title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC",
 		array($mode), __FUNCTION__, __LINE__);
 	if (!SQL_HASZERONUMS($result)) {
 		// Load menu as selection
@@ -544,7 +544,7 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
 }
 
 // Wrapper for $_POST and adminSaveSettings
-function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = false, $displayMessage = true) {
+function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = FALSE, $displayMessage = TRUE) {
 	// Get the array
 	$postData = postRequestArray();
 
@@ -553,12 +553,13 @@ function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement
 }
 
 // Save settings to the database
-function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = false, $displayMessage = true) {
+function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = FALSE, $displayMessage = TRUE) {
 	// Prepare all arrays, variables
 	$tableData = array();
-	$skip = false;
+	$skip = FALSE;
 
 	// Now, walk through all entries and prepare them for saving
+	//* BUG: */ reportBug(__FUNCTION__, __LINE__, '<pre>'.print_r(postRequestArray(), TRUE).'</pre>');
 	foreach ($postData as $id => $val) {
 		// Process only formular field but not submit buttons ;)
 		if ($id == 'ok') {
@@ -570,15 +571,20 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 		convertSelectionsToEpocheTime($postData, $tableData, $id, $skip);
 
 		// Shall we process this id? It muss not be empty, of course
-		if (($skip === false) && (!empty($id)) && ((!isset($GLOBALS['skip_config'][$id]))) || ($tableName != '_config')) {
+		if (($skip === FALSE) && (!empty($id)) && ((!isset($GLOBALS['skip_config'][$id]))) || ($tableName != '_config')) {
 			// Translate the value? (comma to dot!)
 			if ((is_array($translateComma)) && (in_array($id, $translateComma))) {
 				// Then do it here... :)
 				$val = convertCommaToDot($val);
 			} // END - if
 
-			// Shall we add numbers or strings?
+			// Test value on float
 			$test = (float) $val;
+
+			// Debug message
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'test=' . $test . ',val=' . $val . ',id=' . $id);
+
+			// Shall we add numbers or strings?
 			if ('' . $val . '' == '' . $test . '') {
 				// Add numbers
 				array_push($tableData, sprintf("`%s`=%s", $id, $test));
@@ -591,7 +597,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 			}
 
 			// Do not add a config entry twice
-			$GLOBALS['skip_config'][$id] = true;
+			$GLOBALS['skip_config'][$id] = TRUE;
 
 			// Update current configuration
 			setConfigEntry($id, $val);
@@ -599,8 +605,8 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 	} // END - foreach
 
 	// Check if entry does exist
-	$result = false;
-	if ($alwaysAdd === false) {
+	$result = FALSE;
+	if ($alwaysAdd === FALSE) {
 		if (!empty($whereStatement)) {
 			$result = SQL_QUERY("SELECT * FROM `{?_MYSQL_PREFIX?}" . $tableName . "` WHERE " . $whereStatement . " LIMIT 1", __FUNCTION__, __LINE__);
 		} else {
@@ -629,8 +635,8 @@ 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)",
@@ -653,7 +659,10 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 	rebuildCache('config', 'config');
 
 	// Settings saved, so display message?
-	if ($displayMessage === true) displayMessage('{--SETTINGS_SAVED--}');
+	if ($displayMessage === TRUE) {
+		// Display a message
+		displayMessage('{--SETTINGS_SAVED--}');
+	} // END - if
 
 	// Return affected rows
 	return $affected;
@@ -662,7 +671,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 // Generate a selection box
 function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
 	// Open the requested menu directory
-	$menuArray = getArrayFromDirectory(sprintf("inc/modules/%s/", $menu), $type . '-', false, false);
+	$menuArray = getArrayFromDirectory(sprintf("inc/modules/%s/", $menu), $type . '-', FALSE, FALSE);
 
 	// Init the selection box
 	$OUT = '<select name="' . $name . '" class="form_select" size="1"><option value="">{--ADMIN_IS_TOP_MENU--}</option>';
@@ -700,34 +709,47 @@ 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 == '') && (isValidUserId($userid))) {
-		// Set userid as title
-		$title = $userid;
-	} elseif (!isValidUserId($userid)) {
-		// User id zero is invalid
-		return '<strong>' . convertNullToZero($userid) . '</strong>';
-	}
-
-	if (($title == '0') && ($what == 'list_refs')) {
-		// Return title again
-		return $title;
-	} elseif (!empty($title)) {
-		// Not empty, so skip next one
-	} 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 {
+function generateUserProfileLink ($userid, $title = '', $what = '') {
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__][$userid][$title . '_' . $what])) {
+		// Is title empty and valid userid?
+		if (($title == '') && (isValidUserId($userid))) {
+			// Set userid as title
 			$title = $userid;
+		} elseif (!isValidUserId($userid)) {
+			// User id zero is invalid
+			return '<strong>' . convertNullToZero($userid) . '</strong>';
 		}
-	}
 
-	// Return link
-	return '[<a href="{%url=modules.php?module=admin&amp;what=' . $what . '&amp;userid=' . $userid . '%}" title="{--ADMIN_USER_PROFILE_TITLE--}">' . $title . '</a>]';
+		// Is what set?
+		if (empty($what)) {
+			// Then get it
+			$what = getWhat();
+		} // END - if
+
+		if (($title == '0') && ($what == 'list_refs')) {
+			// Return title again
+			return $title;
+		} elseif (!empty($title)) {
+			// Not empty, so skip next one
+		} 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;
+			}
+		}
+
+		// Set it in cache
+		$GLOBALS[__FUNCTION__][$userid][$title . '_' . $what] = '[<a href="{%url=modules.php?module=admin&amp;what=' . $what . '&amp;userid=' . $userid . '%}" title="{--ADMIN_USER_PROFILE_TITLE--}">' . $title . '</a>]';
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__][$userid][$title . '_' . $what];
 }
 
 // Check "logical-area-mode"
@@ -735,7 +757,7 @@ function adminGetMenuMode () {
 	// Set the default menu mode as the mode for all admins
 	$mode = 'global';
 
-	// If sql_patches is up-to-date enough, use the configuration
+	// If ext-sql_patches is up-to-date enough, use the configuration
 	if (isExtensionInstalledAndNewer('sql_patches', '0.3.2')) {
 		$mode = getAdminMenu();
 	} // END - if
@@ -830,50 +852,6 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
 	}
 }
 
-// Send mails for del/edit/lock build modes
-function sendAdminBuildMails ($mode, $tableName, $content, $id, $subjectPart = '', $userIdColumn = array('userid')) {
-	// $tableName must be an array
-	if ((!is_array($tableName)) || (count($tableName) != 1)) {
-		// $tableName is no array
-		reportBug(__FUNCTION__, __LINE__, 'tableName[]=' . gettype($tableName) . '!=array: userIdColumn=' . $userIdColumn);
-	} elseif ((!is_array($userIdColumn)) || (count($userIdColumn) != 1)) {
-		// $tableName is no array
-		reportBug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array: userIdColumn=' . $userIdColumn);
-	} // END - if
-
-	// Default subject is the subject part
-	$subject = $subjectPart;
-
-	// Is the subject part not set?
-	if (empty($subjectPart)) {
-		// Then use it from the mode
-		$subject = strtoupper($mode);
-	} // END - if
-
-	// Is the raw userid set?
-	if (postRequestElement($userIdColumn[0], $id) > 0) {
-		// Load email template
-		if (!empty($subjectPart)) {
-			$mail = loadEmailTemplate('member_' . $mode . '_' . strtolower($subjectPart) . '_' . $tableName[0], $content);
-		} else {
-			$mail = loadEmailTemplate('member_' . $mode . '_' . $tableName[0], $content);
-		}
-
-		// Send email out
-		sendEmail(postRequestElement($userIdColumn[0], $id), strtoupper('{--MEMBER_' . $subject . '_' . $tableName[0] . '_SUBJECT--}'), $mail);
-	} // END - if
-
-	// Generate subject
-	$subject = strtoupper('{--ADMIN_' . $subject . '_' . $tableName[0] . '_SUBJECT--}');
-
-	// Send admin notification out
-	if (!empty($subjectPart)) {
-		sendAdminNotification($subject, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $tableName[0], $content, postRequestElement($userIdColumn[0], $id));
-	} else {
-		sendAdminNotification($subject, 'admin_' . $mode . '_' . $tableName[0], $content, postRequestElement($userIdColumn[0], $id));
-	}
-}
-
 // Build a special template list
 function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid')) {
 	// Call inner (general) function
@@ -972,12 +950,12 @@ function adminBuilderStatusHandler ($mode, $tableName, $columns, $filterFunction
 		SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
 		// Send "build mails" out
-		sendAdminBuildMails($mode, $tableName, $content, $id, $statusInfo[$content[$column]], $userIdColumn);
+		sendGenericBuildMails($mode, $tableName, $content, $id, $statusInfo[$content[$column]], $userIdColumn);
 	} // END - foreach
 }
 
 // Delete rows by given id numbers
-function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
 	// $tableName must be an array
 	if ((!is_array($tableName)) || (count($tableName) != 1)) {
 		// No tableName specified
@@ -994,42 +972,12 @@ function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunct
 	} // END - if
 
 	// Shall we delete here or list for deletion?
-	if ($deleteNow[0] === true) {
-		// The base SQL command:
-		$sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s` IN (%s)";
-
-		// Delete them all
-		$idList = '';
-		foreach (postRequestElement($idColumn[0]) as $id => $sel) {
-			// Is there a userid?
-			if (isPostRequestElementSet($rawUserId[0], $id)) {
-				// Load all data from that id
-				$result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
-					array(
-						$tableName[0],
-						$idColumn[0],
-						$id
-					), __FUNCTION__, __LINE__);
-
-				// Fetch the data
-				$content = SQL_FETCHARRAY($result);
-
-				// Free the result
-				SQL_FREERESULT($result);
-
-				// Send "build mails" out
-				sendAdminBuildMails('delete', $tableName, $content, $id, '', $userIdColumn);
-			} // END - if
-
-			// Add id number
-			$idList .= $id . ',';
-		} // END - foreach
-
-		// Run the query
-		SQL_QUERY_ESC($sql, array($tableName[0], $idColumn[0], substr($idList, 0, -1)), __FUNCTION__, __LINE__);
+	if ($deleteNow[0] === TRUE) {
+		// Call generic function
+		$affected = doGenericDeleteEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $deleteNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles);
 
 		// Was this fine?
-		if (SQL_AFFECTEDROWS() == countPostSelection($idColumn[0])) {
+		if ($affected == countPostSelection($idColumn[0])) {
 			// All deleted
 			displayMessage('{--ADMIN_ALL_ENTRIES_REMOVED--}');
 		} else {
@@ -1043,7 +991,7 @@ function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunct
 }
 
 // Edit rows by given id numbers
-function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
 	// $tableName must be an array
 	if ((!is_array($tableName)) || (count($tableName) != 1)) {
 		// No tableName specified
@@ -1060,7 +1008,7 @@ function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctio
 	} // END - if
 
 	// Shall we change here or list for editing?
-	if ($editNow[0] === true) {
+	if ($editNow[0] === TRUE) {
 		// Call generic change method
 		$affected = doGenericEditEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $editNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles);
 
@@ -1079,7 +1027,7 @@ function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctio
 }
 
 // Un-/lock rows by given id numbers
-function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $lockNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid')) {
+function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $lockNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid')) {
 	// $tableName must be an array
 	if ((!is_array($tableName)) || (count($tableName) != 1)) {
 		// No tableName specified
@@ -1093,7 +1041,7 @@ function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctio
 	} // END - if
 
 	// Shall we un-/lock here or list for locking?
-	if ($lockNow[0] === true) {
+	if ($lockNow[0] === TRUE) {
 		// Un-/lock entries
 		adminBuilderStatusHandler('lock', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
 	} else {
@@ -1103,7 +1051,7 @@ function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctio
 }
 
 // Undelete rows by given id numbers
-function adminUndeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $undeleteNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid')) {
+function adminUndeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $undeleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid')) {
 	// $tableName must be an array
 	if ((!is_array($tableName)) || (count($tableName) != 1)) {
 		// No tableName specified
@@ -1117,7 +1065,7 @@ function adminUndeleteEntriesConfirm ($tableName, $columns = array(), $filterFun
 	} // END - if
 
 	// Shall we un-/lock here or list for locking?
-	if ($undeleteNow[0] === true) {
+	if ($undeleteNow[0] === TRUE) {
 		// Undelete entries
 		adminBuilderStatusHandler('undelete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
 	} else {
@@ -1128,11 +1076,17 @@ function adminUndeleteEntriesConfirm ($tableName, $columns = array(), $filterFun
 
 // Adds a given entry to the database
 function adminAddEntries ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $columnIndex = NULL) {
+	// Is the userid set?
+	if (!isPostRequestElementSet('userid')) {
+		// Then set NULL here
+		setPostRequestElement('userid', NULL);
+	} // END - if
+
 	// Call inner function
 	doGenericAddEntries($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $columnIndex);
 
 	// Entry has been added?
-	if ((!SQL_HASZEROAFFECTED()) && ($GLOBALS['__XML_PARSE_RESULT'] === true)) {
+	if ((!SQL_HASZEROAFFECTED()) && ($GLOBALS['__XML_PARSE_RESULT'] === TRUE)) {
 		// Display success message
 		displayMessage('{--ADMIN_ENTRY_ADDED--}');
 	} else {
@@ -1162,7 +1116,7 @@ function sendAdminPasswordResetLink ($email) {
 	$OUT = '';
 
 	// Look up administator login
-	$result = SQL_QUERY_ESC("SELECT `id`,`login`,`password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE '%s' REGEXP `email` LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT `id`, `login`, `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE '%s' REGEXP `email` LIMIT 1",
 		array($email), __FUNCTION__, __LINE__);
 
 	// Is there an account?
@@ -1197,10 +1151,10 @@ function sendAdminPasswordResetLink ($email) {
 // Validate hash and login for password reset
 function adminResetValidateHashLogin ($hash, $login) {
 	// By default nothing validates... ;)
-	$valid = false;
+	$valid = FALSE;
 
 	// Then try to find that user
-	$result = SQL_QUERY_ESC("SELECT `id`,`password`,`email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT `id`, `password`, `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
 		array($login), __FUNCTION__, __LINE__);
 
 	// Is an account here?
@@ -1224,7 +1178,7 @@ function adminResetValidateHashLogin ($hash, $login) {
 
 // Reset the password for the login. Do NOT call this function without calling above function first!
 function doResetAdminPassword ($login, $password) {
-	// Generate hash (we already check for sql_patches in generateHash())
+	// Generate hash (we already check for ext-sql_patches in generateHash())
 	$passHash = generateHash($password);
 
 	// Prepare fake POST data
@@ -1234,7 +1188,7 @@ function doResetAdminPassword ($login, $password) {
 	);
 
 	// Update database
-	$message = adminsChangeAdminAccount($postData, '', false);
+	$message = adminsChangeAdminAccount($postData, '', FALSE);
 
 	// Run filters
 	runFilterChain('post_form_reset_pass', array('login' => $login, 'hash' => $passHash, 'message' => $message));
@@ -1287,7 +1241,7 @@ function ifAdminMenuHasEntries ($action) {
 			isset($GLOBALS['admin_menu_has_entries'][$action])
 		) && (
 			// And do we have a menu for this action?
-			$GLOBALS['admin_menu_has_entries'][$action] === true
+			$GLOBALS['admin_menu_has_entries'][$action] === TRUE
 		)) || (
 			// Login has always a menu
 			$action == 'login'
@@ -1373,9 +1327,6 @@ function doVerifyExpertSettings () {
 
 						// Change it in the admin
 						adminsChangeAdminAccount($postData, 'expert_warning');
-
-						// Clear form
-						unsetPostRequestElement('ok');
 					} // END - if
 
 					// All fine!
@@ -1391,6 +1342,13 @@ function doVerifyExpertSettings () {
 				// Do not display
 				$return = 'agreed';
 			}
+
+			// Is a form sent?
+			if ((isFormSent()) && (isPostRequestElementSet('expert_settings'))) {
+				// Clear form
+				unsetPostRequestElement('ok');
+				unsetPostRequestElement('expert_settings');
+			} // END - if
 		} else {
 			// Forbidden
 			$return = 'forbidden';
@@ -1434,7 +1392,7 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
 	} // END - if
 
 	$TOP = '';
-	if ($show_form === false) {
+	if ($show_form === FALSE) {
 		$TOP = ' top';
 	} // END - if
 
@@ -1476,9 +1434,9 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
 	$content['top']  = $TOP;
 
 	// Load navigation template
-	$OUT = loadTemplate('admin_email_nav_row', true, $content);
+	$OUT = loadTemplate('admin_email_nav_row', TRUE, $content);
 
-	if ($return === true) {
+	if ($return === TRUE) {
 		// Return generated HTML-Code
 		return $OUT;
 	} else {