X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=b13ac029d3e95a0ee58a9ef00c81120b666da03f;hp=23a57e582182a58258895cb6a94ecb91aa3dae20;hb=148d3a3e1641e350a708cc71e194349a09a8285f;hpb=185b046f093581351ebd2823c2028356f6a392be

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 23a57e5821..b13ac029d3 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -209,7 +209,7 @@ function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true) {
 			$MOD_CHECK = $GLOBALS['module'];
 			break;
 		}
-		$AND = " AND what=''";
+		$AND = " AND (what='' OR what IS NULL)";
 	} elseif (ereg("what-", $file)) {
 		// This is an admin what file!
 		$type = "what";
@@ -306,7 +306,7 @@ function ADD_MENU($MODE, $act, $wht) {
 	}
 
 	// Load SQL data and add the menu to the output stream...
-	$result_main = SQL_QUERY_ESC("SELECT title, action FROM "._MYSQL_PREFIX."_%s_menu WHERE what='' ".$AND." ORDER BY sort",
+	$result_main = SQL_QUERY_ESC("SELECT title, action FROM "._MYSQL_PREFIX."_%s_menu WHERE (what='' OR what IS NULL) ".$AND." ORDER BY sort",
 	 array($MODE), __FILE__, __LINE__);
 	//* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
 	if (SQL_NUMROWS($result_main) > 0) {
@@ -343,7 +343,7 @@ function ADD_MENU($MODE, $act, $wht) {
 					}
 
 					// Menu title
-					$content .= $_CONFIG['middot'].$sub_title;
+					$content .= $_CONFIG['menu_blur_spacer'].$sub_title;
 
 					if ($test) {
 						$content .= "</A>";
@@ -679,7 +679,7 @@ function VALIDATE_MENU_ACTION ($MODE, $act, $wht, $UPDATE=false)
 	 else
 	{
 		// Admin login overview
-		$SQL = SQL_QUERY_ESC("SELECT id, what FROM "._MYSQL_PREFIX."_%s_menu WHERE action='%s' AND what=''".$ADD." ORDER BY action DESC LIMIT 1",
+		$SQL = SQL_QUERY_ESC("SELECT id, what FROM "._MYSQL_PREFIX."_%s_menu WHERE action='%s' AND (what='' OR what IS NULL)".$ADD." ORDER BY action DESC LIMIT 1",
 		 array($MODE, $act), __FILE__, __LINE__, false);
 	}
 
@@ -1295,23 +1295,18 @@ function GET_ADMIN_HASH($login)
 	return $ret;
 }
 //
-function GET_ADMIN_LOGIN($aid)
-{
+function GET_ADMIN_LOGIN($aid) {
 	global $cacheArray;
 	$ret = "***";
-	if (!empty($cacheArray['admins']['login']['aid']))
-	{
+	if (!empty($cacheArray['admins']['login']['aid'])) {
 		// Check cache
 		if (!empty($cacheArray['admins']['login'][$aid]))	$ret = $cacheArray['admins']['login'][$aid];
 		if (empty($ret)) $ret = "***";
-	}
-	 else
-	{
+	} else {
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT login FROM "._MYSQL_PREFIX."_admins WHERE id=%d LIMIT 1",
 		 array(bigintval($aid)), __FILE__, __LINE__);
-		if (SQL_NUMROWS($result) == 1)
-		{
+		if (SQL_NUMROWS($result) == 1) {
 			// Fetch data
 			list($ret) = SQL_FETCHROW($result);
 		}
@@ -1322,25 +1317,19 @@ function GET_ADMIN_LOGIN($aid)
 	return $ret;
 }
 //
-function ADD_OPTION_LINES($table, $id, $name, $default="",$special="",$where="")
-{
+function ADD_OPTION_LINES($table, $id, $name, $default="",$special="",$where="") {
 	$ret = "";
-	if ($table == "/ARRAY/")
-	{
+	if ($table == "/ARRAY/") {
 		// Selection from array
-		if (is_array($id) && is_array($name) && sizeof($id) == sizeof($name))
-		{
+		if (is_array($id) && is_array($name) && sizeof($id) == sizeof($name)) {
 			// Both are arrays
-			foreach ($id as $idx=>$value)
-			{
+			foreach ($id as $idx=>$value) {
 				$ret .= "<OPTION value=\"".$value."\"";
 				if ($default == $value) $ret .= " selected checked";
 				$ret .= ">".$name[$idx]."</OPTION>\n";
 			}
 		}
-	}
-	 else
-	{
+	} else {
 		// Data from database
 		$SPEC = ", ".$id;
 		if (!empty($special)) $SPEC = ", ".$special;
@@ -1348,11 +1337,9 @@ function ADD_OPTION_LINES($table, $id, $name, $default="",$special="",$where="")
 		if ($table == "country") $ORDER = $special;
 		$result = SQL_QUERY_ESC("SELECT %s, %s".$SPEC." FROM "._MYSQL_PREFIX."_%s ".$where." ORDER BY %s",
 		 array($id, $ORDER, $table, $name), __FILE__, __LINE__);
-		if (SQL_NUMROWS($result) > 0)
-		{
+		if (SQL_NUMROWS($result) > 0) {
 			// Found data so add them as OPTION lines: $id is the value and $name is the "name" of the option
-			while (list($value, $title, $add) = SQL_FETCHROW($result))
-			{
+			while (list($value, $title, $add) = SQL_FETCHROW($result)) {
 				if (empty($special)) $add = "";
 				$ret .= "<OPTION value=\"".$value."\"";
 				if ($default == $value) $ret .= " selected checked";
@@ -1362,13 +1349,12 @@ function ADD_OPTION_LINES($table, $id, $name, $default="",$special="",$where="")
 
 			// Free memory
 			SQL_FREERESULT($result);
-		}
-		 else
-		{
+		} else {
 			// No data found
 			$ret = "<OPTION value=\"x\">".SELECT_NONE."</OPTION>\n";
 		}
 	}
+
 	// Return - hopefully - the requested data
 	return $ret;
 }