X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=8f9d7bb7a9d8113e9597e7862f29f18126223f74;hb=7638ed2cdac53be2f20153011b8093aaf7349f79;hp=51fb3de99dcbfb4adc2dd805352f6d3091c57088;hpb=0f3a135204757cc8750262871c8e62c42300acb4;p=mailer.git

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 51fb3de99d..8f9d7bb7a9 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -46,7 +46,7 @@ function getTitleFromMenu ($mode, $what, $column = 'what', $ADD='') {
 	// Fix empty 'what'
 	if (empty($what)) {
 		$what = getIndexHome();
-	} elseif ((isGetRequestParameterSet('action')) && ($column == 'what')) {
+	} elseif ((isGetRequestElementSet('action')) && ($column == 'what')) {
 		// Get it from action
 		return getTitleFromMenu($mode, getAction(), 'action', $ADD);
 	} elseif ($what == 'overview') {
@@ -340,16 +340,16 @@ ORDER BY
 
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',getWhat()=' . getWhat());
 			if (SQL_NUMROWS($result_main) > $main_cnt) {
-				// Add seperator
-				$GLOBALS['rows'] .= loadTemplate('menu_seperator', true, $mode);
+				// Add separator
+				$GLOBALS['rows'] .= loadTemplate('menu_separator', true, $mode);
 
 				// Should we display adverts in this menu?
 				if ((isExtensionInstalledAndNewer('menu', '0.0.1')) && (getConfig($mode . '_menu_advert_enabled') == 'Y') && ($action != 'admin')) {
 					// Display advert template
 					$GLOBALS['rows'] .= loadTemplate('menu_' . $mode . '_advert_' . $action, true);
 
-					// Add seperator again
-					$GLOBALS['rows'] .= loadTemplate('menu_seperator', true, $mode);
+					// Add separator again
+					$GLOBALS['rows'] .= loadTemplate('menu_separator', true, $mode);
 				} // END - if
 			} // END - if
 		} // END - while
@@ -359,8 +359,8 @@ ORDER BY
 
 		// Should we display adverts in this menu?
 		if ((isExtensionInstalledAndNewer('menu', '0.0.1')) && (getConfig($mode . '_menu_advert_enabled') == 'Y')) {
-			// Add seperator again
-			$GLOBALS['rows'] .= loadTemplate('menu_seperator', true, $mode);
+			// Add separator again
+			$GLOBALS['rows'] .= loadTemplate('menu_separator', true, $mode);
 
 			// Display advert template
 			$GLOBALS['rows'] .= loadTemplate('menu_' . $mode . '_advert_end', true);
@@ -451,7 +451,10 @@ function fetchUserData ($value, $column = 'userid') {
 	if (!isExtensionActive('user')) {
 		// Absent ext-user is really not good
 		return false;
-	} // END - if
+	} elseif (is_null($value)) {
+		// This shall never happen, so please report it
+		debug_report_bug(__FUNCTION__, __LINE__, 'value=NULL,column=' . $column . ' - value can never be NULL');
+	}
 
 	// If we should look for userid secure&set it here
 	if (substr($column, -2, 2) == 'id') {
@@ -630,7 +633,7 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
 		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
 			$OUT .= '      <option value="' . $content['value'] . '"';
-			if (postRequestParameter('max_mails') == $content['value']) $OUT .= ' selected="selected"';
+			if (postRequestElement('max_mails') == $content['value']) $OUT .= ' selected="selected"';
 			$OUT .= '>' . $content['value'] . ' {--PER_DAY--}';
 			if (!empty($content['comment'])) $OUT .= '(' . $content['comment'] . ')';
 			$OUT .= '</option>';
@@ -765,9 +768,9 @@ function getActionFromModuleWhat ($module, $what) {
 
 	if ($module == 'admin') {
 		// Action value for admin area
-		if (isGetRequestParameterSet('action')) {
+		if (isGetRequestElementSet('action')) {
 			// Use from request!
-			return getRequestParameter('action');
+			return getRequestElement('action');
 		} elseif (isActionSet()) {
 			// Get it directly from URL
 			return getAction();
@@ -787,11 +790,16 @@ function getActionFromModuleWhat ($module, $what) {
 		$module = mapModuleToTable($module);
 
 		// Guest and member menu is 'main' as the default
-		if (empty($data['action'])) $data['action'] = 'main';
+		if (empty($data['action'])) {
+			$data['action'] = 'main';
+		} // END - if
 
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT `action` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `what`='%s' LIMIT 1",
-			array($module, $what), __FUNCTION__, __LINE__);
+			array(
+				$module,
+				$what
+			), __FUNCTION__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Load action value and pray that this one is the right you want... ;-)
 			$data = SQL_FETCHARRAY($result);
@@ -951,14 +959,14 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
 		// Count or sum whole table?
 		if ($countRows === true) {
 			// Count whole table
-			$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`".$add,
+			$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`" . $add . ' LIMIT 1',
 				array(
 					$lookFor,
 					$tableName
 				), __FUNCTION__, __LINE__);
 		} else {
 			// Sum whole table
-			$result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`".$add,
+			$result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`" . $add . ' LIMIT 1',
 				array(
 					$lookFor,
 					$tableName
@@ -967,7 +975,7 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
 	} elseif (($countRows === true) || ($lookFor == 'userid')) {
 		// Count rows
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'COUNT!');
-		$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`%s'%s'".$add,
+		$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`%s'%s'" . $add . ' LIMIT 1',
 			array(
 				$lookFor,
 				$tableName,
@@ -978,7 +986,7 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
 	} else {
 		// Add all rows
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SUM!');
-		$result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`%s'%s'".$add,
+		$result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`%s'%s'" . $add . ' LIMIT 1',
 			array(
 				$lookFor,
 				$tableName,
@@ -1178,7 +1186,7 @@ function getAdminEmail ($adminId) {
 	return $data['email'];
 }
 
-// Get default ACL  of admin id
+// Get default ACL of admin id
 function getAdminDefaultAcl ($adminId) {
 	// By default an invalid ACL value is returned
 	$data['default_acl'] = 'NO-ACL';
@@ -1187,9 +1195,9 @@ function getAdminDefaultAcl ($adminId) {
 	if (!isExtensionActive('sql_patches')) {
 		// Not found, which is bad, so we need to allow all
 		$data['default_acl'] =  'allow';
-	} elseif (isset($GLOBALS['cache_array']['admin']['def_acl'][$adminId])) {
+	} elseif (isset($GLOBALS['cache_array']['admin']['default_acl'][$adminId])) {
 		// Use cache
-		$data['default_acl'] = $GLOBALS['cache_array']['admin']['def_acl'][$adminId];
+		$data['default_acl'] = $GLOBALS['cache_array']['admin']['default_acl'][$adminId];
 
 		// Update cache hits
 		incrementStatsEntry('cache_hits');
@@ -1204,7 +1212,7 @@ function getAdminDefaultAcl ($adminId) {
 			$data = SQL_FETCHARRAY($result_admin_id);
 
 			// Set cache
-			$GLOBALS['cache_array']['admin']['def_acl'][$adminId] = $data['default_acl'];
+			$GLOBALS['cache_array']['admin']['default_acl'][$adminId] = $data['default_acl'];
 		}
 
 		// Free result
@@ -1215,8 +1223,45 @@ function getAdminDefaultAcl ($adminId) {
 	return $data['default_acl'];
 }
 
+// Get menu mode (la_mode) of admin id
+function getAdminMenuMode ($adminId) {
+	// By default an invalid mode
+	$data['la_mode'] = 'INVALID';
+
+	// Is sql_patches there and was it found in cache?
+	if (!isExtensionActive('sql_patches')) {
+		// Not found, which is bad, so we need to allow all
+		$data['la_mode'] =  'global';
+	} elseif (isset($GLOBALS['cache_array']['admin']['la_mode'][$adminId])) {
+		// Use cache
+		$data['la_mode'] = $GLOBALS['cache_array']['admin']['la_mode'][$adminId];
+
+		// Update cache hits
+		incrementStatsEntry('cache_hits');
+	} elseif (!isExtensionActive('cache')) {
+		// Load from database
+		$result_admin_id = SQL_QUERY_ESC("SELECT `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+			array(bigintval($adminId)), __FUNCTION__, __LINE__);
+
+		// Do we have an entry?
+		if (SQL_NUMROWS($result_admin_id) == 1) {
+			// Fetch data
+			$data = SQL_FETCHARRAY($result_admin_id);
+
+			// Set cache
+			$GLOBALS['cache_array']['admin']['la_mode'][$adminId] = $data['la_mode'];
+		}
+
+		// Free result
+		SQL_FREERESULT($result_admin_id);
+	}
+
+	// Return default ACL
+	return $data['la_mode'];
+}
+
 // Generates an option list from various parameters
-function generateOptionList ($table, $id, $name, $default = '', $special = '', $where = '', $disabled = array(), $callback = '') {
+function generateOptionList ($table, $id, $name, $default = '', $special = '', $whereStatement = '', $disabled = array(), $callback = '') {
 	$ret = '';
 	if ($table == '/ARRAY/') {
 		// Selection from array
@@ -1247,13 +1292,13 @@ function generateOptionList ($table, $id, $name, $default = '', $special = '', $
 		}
 	} else {
 		// Data from database
-		$SPEC = ', `' . $id . '`';
+		$SPEC = ',`' . $id . '`';
 		if (!empty($special)) {
-			$SPEC = ', `' . $special . '`';
+			$SPEC = ',`' . $special . '` AS `special`';
 		} // END - if
 
 		// Query the database
-		$result = SQL_QUERY_ESC("SELECT `%s`,`%s`".$SPEC." FROM `{?_MYSQL_PREFIX?}_%s` ".$where." ORDER BY `%s` ASC",
+		$result = SQL_QUERY_ESC("SELECT `%s` AS `id`,`%s` AS `name`".$SPEC." FROM `{?_MYSQL_PREFIX?}_%s` ".$whereStatement." ORDER BY `%s` ASC",
 			array(
 				$id,
 				$name,
@@ -1263,32 +1308,37 @@ function generateOptionList ($table, $id, $name, $default = '', $special = '', $
 
 		// Do we have rows?
 		if (!SQL_HASZERONUMS($result)) {
-			// Found data so add them as OPTION lines: $id is the value and $name is the "name" of the option
-			// @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
-			while (list($value, $title, $add) = SQL_FETCHROW($result)) {
-				if (empty($special)) $add = '';
-				$ret .= '<option value="' . $value . '"';
-				if ($default == $value) {
+			// Found data so add them as OPTION lines
+			while ($content = SQL_FETCHARRAY($result)) {
+				// Is special set?
+				if (!isset($content['special'])) {
+					// Set it to empty
+					$content['special'] = '';
+				} // END - if
+
+				$ret .= '<option value="' . $content['id'] . '"';
+
+				if ($default == $content['id']) {
 					// Selected by default
 					$ret .= ' selected="selected"';
-				} elseif (isset($disabled[$value])) {
+				} elseif (isset($disabled[$content['id']])) {
 					// Disabled!
 					$ret .= ' disabled="disabled"';
 				}
 
 				// Add it, if set
-				if (!empty($add)) {
-					$add = ' ('.$add.')';
+				if (!empty($content['special'])) {
+					$content['special'] = ' (' . $content['special'] . ')';
 				} // END - if
 
 				// Is the call-back function set?
 				if (!empty($callback)) {
 					// Call it
-					$title = call_user_func_array($callback, array($title));
+					$content['name'] = call_user_func_array($callback, array($content['name']));
 				} // END - if
 
 				// Finish option list
-				$ret .= '>' . $title . $add . '</option>';
+				$ret .= '>' . $content['name'] . $content['special'] . '</option>';
 			} // END - while
 		} else {
 			// No data found
@@ -1372,9 +1422,9 @@ LIMIT 1",
 // Gets the matching what name from module
 function getWhatFromModule ($modCheck) {
 	// Is the request element set?
-	if (isGetRequestParameterSet('what')) {
+	if (isGetRequestElementSet('what')) {
 		// Then return this!
-		return getRequestParameter('what');
+		return getRequestElement('what');
 	} // END - if
 
 	// Default is empty
@@ -1641,12 +1691,12 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
 }
 
 // Creates a new task
-function createNewTask ($subject, $notes, $taskType, $userid = NULL, $adminId = '0', $strip = true) {
+function createNewTask ($subject, $notes, $taskType, $userid = NULL, $adminId = NULL, $strip = true) {
 	// Insert the task data into the database
 	SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_task_system` (`assigned_admin`,`userid`,`status`,`task_type`,`subject`,`text`,`task_created`) VALUES (%s,%s,'NEW','%s','%s','%s', UNIX_TIMESTAMP())",
 		array(
-			$adminId,
-			$userid,
+			makeZeroToNull($adminId),
+			makeZeroToNull($userid),
 			$taskType,
 			$subject,
 			$notes