X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=a54357dafddb326f3689d6cec0ff06e5df95cffc;hp=003589d527ec4ce6d1ead84f961a2a90dfdb5fcf;hb=c317b059bf0a1acb3171c4e3255afcce48795947;hpb=e6e3183f794b385f5acc38b371c220cc35cdac38

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 003589d527..a54357dafd 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -101,7 +101,7 @@ function CHECK_MODULE($mod) {
 	$ret = "major";
 
 	// Check if script is installed if not return a "done" to prevent some errors
-	if ((!defined('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing')) || (!defined('admin_registered'))) return "done";
+	if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing')) || (!isBooleanConstantAndTrue('admin_registered'))) return "done";
 
 	// Check if cache is latest version
 	$locked = "Y"; $hidden = "N"; $admin = "N"; $mem = "N"; $found = false;
@@ -159,12 +159,12 @@ function CHECK_MODULE($mod) {
 				// to find a loop here... *sigh*
 				$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_mod_reg
 (module, locked, hidden, mem_only, admin_only, has_menu) VALUES
-('%s', 'Y', 'N', 'N', 'N', 'N')", array($mod_chk), __FILE__, __LINE__);
+('%s','Y','N','N','N','N')", array($mod_chk), __FILE__, __LINE__);
 			} else {
 				// Wrong/missing sql_patches!
 				$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_mod_reg
 (module, locked, hidden, mem_only, admin_only) VALUES
-('%s', 'Y', 'N', 'N', 'N')", array($mod_chk), __FILE__, __LINE__);
+('%s','Y','N','N','N')", array($mod_chk), __FILE__, __LINE__);
 			}
 
 			// Everthing is fine?
@@ -583,12 +583,18 @@ function WHAT_IS_VALID($act, $wht, $type="guest")
 //
 function IS_MEMBER()
 {
-	global $status, $LAST;
+	global $status, $LAST, $cacheArray;
 	if (!is_array($LAST)) $LAST = array();
 	$ret = false;
 
+	// is the cache entry there?
+	if (isset($cacheArray['is_member'])) {
+		// Then return it
+		return $cacheArray['is_member'];
+	} // END - if
+
 	// Fix "deleted" cookies first
-	FIX_DELETED_COOKIES(array('userid', 'u_hash', 'lifetime'));
+	FIX_DELETED_COOKIES(array('userid','u_hash','lifetime'));
 
 	// Are cookies set?
 	if ((!empty($GLOBALS['userid'])) && (isSessionVariableSet('u_hash')) && (isSessionVariableSet('lifetime')) && (defined('COOKIE_PATH')))
@@ -617,15 +623,15 @@ function IS_MEMBER()
 				//* DEBUG: */ echo __LINE__."!!!<br />";
 				destroy_user_session();
 
-				// Remove array elements to prevent errors
-				unset($GLOBALS['userid']);
+				// Reset userid
+				$GLOBALS['userid'] = 0;
 			}
 		} else {
 			// Cookie data is invalid!
 			//* DEBUG: */ echo __LINE__."***<br />";
 
-			// Remove array elements to prevent errors
-			unset($GLOBALS['userid']);
+			// Reset userid
+			$GLOBALS['userid'] = 0;
 		}
 
 		// Free memory
@@ -635,33 +641,30 @@ function IS_MEMBER()
 		//* DEBUG: */ echo __LINE__."///<br />";
 		destroy_user_session();
 
-		// Remove array elements to prevent errors
-		unset($GLOBALS['userid']);
+		// Reset userid
+		$GLOBALS['userid'] = 0;
 	}
 
+	// Cache status
+	$cacheArray['is_member'] = $ret;
+
 	// Return status
 	return $ret;
 }
 //
-function UPDATE_LOGIN_DATA ($UPDATE=true) {
+function UPDATE_LOGIN_DATA () {
 	global $LAST, $_CONFIG;
 	if (!is_array($LAST)) $LAST = array();
 
-	// Are the required cookies set?
-	if ((!isset($GLOBALS['userid'])) || (!isSessionVariableSet('u_hash')) || (!isSessionVariableSet('lifetime'))) {
-		// Nope, then return here to caller function
-		return false;
-	} else {
-		// Secure user ID
-		$GLOBALS['userid'] = bigintval(get_session('userid'));
-	}
+	// Recheck if logged in
+	if (!IS_MEMBER()) return false;
+
+	// Secure user ID
+	$GLOBALS['userid'] = bigintval(get_session('userid'));
 
 	// Extract last online time (life) and how long is auto-login valid (time)
 	$newl = time() + bigintval(get_session('lifetime'));
 
-	// Recheck if logged in
-	if (!IS_MEMBER()) return false;
-
 	// Load last module and last online time
 	$result = SQL_QUERY_ESC("SELECT last_module, last_online FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
@@ -1039,7 +1042,7 @@ function REMOVE_RECEIVER(&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=fal
 			if (SQL_NUMROWS($result) == 0)
 			{
 				// No, so we add one!
-				$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_links (%s, userid, link_type) VALUES ('%s', '%s', '%s')",
+				$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_links (%s, userid, link_type) VALUES ('%s','%s','%s')",
 				 array($rowName, $stats_id, bigintval($uid), $type), __FILE__, __LINE__);
 				$ret = "done";
 			}
@@ -1057,8 +1060,7 @@ function REMOVE_RECEIVER(&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=fal
 	return $ret;
 }
 //
-function GET_TOTAL_DATA($search, $tableName, $lookFor, $whereStatement="userid", $onlyRows=false)
-{
+function GET_TOTAL_DATA($search, $tableName, $lookFor, $whereStatement="userid", $onlyRows=false) {
 	$ret = 0;
 	if ($onlyRows) {
 		// Count rows
@@ -1072,15 +1074,16 @@ function GET_TOTAL_DATA($search, $tableName, $lookFor, $whereStatement="userid",
 
 	// Load row
 	list($ret) = SQL_FETCHROW($result);
-	//* DEBUG: */ echo __LINE__."*".$DATA."/".$search."/".$tableName."/".$ret."*<br />\n";
+
+	// Free result
 	SQL_FREERESULT($result);
-	if (empty($ret)) {
-		if (($lookFor == "counter") || ($lookFor == "id")) {
-			$ret = 0;
-		} else {
-			$ret = "0.00000";
-		}
-	}
+
+	// Fix empty values
+	if ((empty($ret)) && ($lookFor != "counter") && ($lookFor != "id") && ($lookFor != "userid")) {
+		$ret = "0.00000";
+	} // END - if
+
+	// Return value
 	return $ret;
 }
 /**
@@ -1095,10 +1098,12 @@ function GET_TOTAL_DATA($search, $tableName, $lookFor, $whereStatement="userid",
  * add_mode    = Add points only to $uid or also refs? (WARNING! Changing "ref" to "direct"
  *               for default value will cause no referral will get points ever!!!)
  */
-function ADD_POINTS_REFSYSTEM($uid, $points, $send_notify=false, $rid="0", $locked=false, $add_mode="ref")
-{
+function ADD_POINTS_REFSYSTEM($uid, $points, $send_notify=false, $rid="0", $locked=false, $add_mode="ref") {
 	global $DEPTH, $_CONFIG, $DATA;
 
+	// Convert mode to lower-case
+	$add_mode = strtolower($add_mode);
+
 	// Debug message
 	//DEBUG_LOG(__FUNCTION__.": uid={$uid},points={$points}");
 
@@ -1239,7 +1244,7 @@ function UPDATE_REF_COUNTER($uid)
 	if (SQL_AFFECTEDROWS() == 0)
 	{
 		// First count!
-		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_refsystem (userid, level, counter) VALUES ('%s', '%s', '1')",
+		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_refsystem (userid, level, counter) VALUES ('%s','%s','1')",
 		 array(bigintval($uid), $REF_LVL), __FILE__, __LINE__);
 	}
 
@@ -1320,7 +1325,7 @@ WHERE sid='%s' LIMIT 1",
 		);
 	} else {
 		// No entry does exists so we simply add it!
-		SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_online (module, action, what, userid, refid, is_member, is_admin, timestamp, sid, ip) VALUES ('%s', '%s', '%s', %s, %s, '%s', '%s', UNIX_TIMESTAMP(), '%s', '%s')",
+		SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_online (module, action, what, userid, refid, is_member, is_admin, timestamp, sid, ip) VALUES ('%s','%s','%s', %s, %s, '%s','%s', UNIX_TIMESTAMP(), '%s','%s')",
 			array($mod, $act, $wht, $uid, $rid, $MEM, $ADMIN, $SID, getenv('REMOTE_ADDR')), __FILE__, __LINE__
 		);
 	}
@@ -1348,13 +1353,15 @@ function SEND_ADMIN_EMAILS($subj, $msg) {
 }
 // Get ID number from administrator's login name
 function GET_ADMIN_ID($login) {
-	global $cacheArray;
+	global $cacheArray, $_CONFIG;
 	$ret = "-1";
 	if (!empty($cacheArray['admins']['aid'][$login])) {
 		// Check cache
 		$ret = $cacheArray['admins']['aid'][$login];
-		if (empty($ret)) $ret = "-1";
-	} else {
+
+		// Update cache hits
+		$_CONFIG['cache_hits']++;
+	} elseif (!EXT_IS_ACTIVE("cache")) {
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
 		 array($login), __FILE__, __LINE__);
@@ -1371,54 +1378,118 @@ function GET_ADMIN_ID($login) {
 // Get password hash from administrator's login name
 function GET_ADMIN_HASH($login)
 {
-	global $cacheArray;
+	global $cacheArray, $_CONFIG;
 	$ret = "-1";
-	if (!empty($cacheArray['admins']['password'][$login]))
-	{
+	if (!empty($cacheArray['admins']['password'][$login])) {
 		// Check cache
 		$ret = $cacheArray['admins']['password'][$login];
-		if (empty($ret)) $ret = "-1";
-	}
-	 else
-	{
+
+		// Update cache hits
+		$_CONFIG['cache_hits']++;
+	} elseif (!EXT_IS_ACTIVE("cache")) {
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT password FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
 		 array($login), __FILE__, __LINE__);
-		if (SQL_NUMROWS($result) == 1)
-		{
+		if (SQL_NUMROWS($result) == 1) {
+			// Fetch data
 			list($ret) = SQL_FETCHROW($result);
-			SQL_FREERESULT($result);
+
+			// Set cache
+			$cacheArray['admins']['password'][$login] = $ret;
 		}
+
+		// Free result
+		SQL_FREERESULT($result);
 	}
 	return $ret;
 }
 //
 function GET_ADMIN_LOGIN ($aid) {
-	global $cacheArray;
+	global $cacheArray, $_CONFIG;
 	$ret = "***";
-	if (!empty($cacheArray['admins']['login'])) {
-		// Check cache
-		if (!empty($cacheArray['admins']['login'][$aid])) {
-			$ret = $cacheArray['admins']['login'][$aid];
-		} // END - if
-		if (empty($ret)) $ret = "***";
-	} else {
+	if (!empty($cacheArray['admins']['login'][$aid])) {
+		// Get cache
+		$ret = $cacheArray['admins']['login'][$aid];
+
+		// Update cache hits
+		$_CONFIG['cache_hits']++;
+	} elseif (!EXT_IS_ACTIVE("cache")) {
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT login FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
-		 array(bigintval($aid)), __FILE__, __LINE__);
+			array(bigintval($aid)), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Fetch data
 			list($ret) = SQL_FETCHROW($result);
 
 			// Set cache
 			$cacheArray['admins']['login'][$aid] = $ret;
-		}
+		} // END - if
 
 		// Free memory
 		SQL_FREERESULT($result);
 	}
 	return $ret;
 }
+// Get email address of admin id
+function GET_ADMIN_EMAIL ($aid) {
+	global $cacheArray, $_CONFIG;
+
+	$ret = "***";
+	if (!empty($cacheArray['admins']['email'])) {
+		// Get cache
+		$ret = $cacheArray['admins']['email'][$aid];
+
+		// Update cache hits
+		$_CONFIG['cache_hits']++;
+	} elseif (!EXT_IS_ACTIVE("cache")) {
+		// Load from database
+		$result_aid = SQL_QUERY_ESC("SELECT email FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
+			array(bigintval($ret)), __FILE__, __LINE__);
+		if (SQL_NUMROWS($result) == 1) {
+			// Get data
+			list($ret) = SQL_FETCHROW($result_aid);
+
+			// Set cache
+			$cacheArray['admins']['email'][$aid] = $ret;
+			} // END - if
+
+		// Free result
+		SQL_FREERESULT($result_aid);
+	}
+
+	// Return email
+	return $ret;
+}
+// Get default ACL  of admin id
+function GET_ADMIN_DEFAULT_ACL ($aid) {
+	global $cacheArray, $_CONFIG;
+
+	$ret = "***";
+	if (!empty($cacheArray['admins']['def_acl'])) {
+		// Use cache
+		$ret = $cacheArray['admins']['def_acl'][$aid];
+
+		// Update cache hits
+		$_CONFIG['cache_hits']++;
+	} else {
+		// Load from database
+		$result_aid = SQL_QUERY_ESC("SELECT default_acl FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
+			array(bigintval($ret)), __FILE__, __LINE__);
+		if (SQL_NUMROWS($result) == 1) {
+			// Fetch data
+			list($ret) = SQL_FETCHROW($result_aid);
+
+			// Set cache
+			$cacheArray['admins']['def_acl'][$aid] = $ret;
+		}
+
+		// Free result
+		SQL_FREERESULT($result_aid);
+	}
+
+	// Return email
+	return $ret;
+}
 //
 function ADD_OPTION_LINES($table, $id, $name, $default="",$special="",$where="") {
 	$ret = "";
@@ -1430,8 +1501,8 @@ function ADD_OPTION_LINES($table, $id, $name, $default="",$special="",$where="")
 				$ret .= "<OPTION value=\"".$value."\"";
 				if ($default == $value) $ret .= " selected checked";
 				$ret .= ">".$name[$idx]."</OPTION>\n";
-			}
-		}
+			} // END - foreach
+		} // END - if
 	} else {
 		// Data from database
 		$SPEC = ", ".$id;
@@ -1448,7 +1519,7 @@ function ADD_OPTION_LINES($table, $id, $name, $default="",$special="",$where="")
 				if ($default == $value) $ret .= " selected checked";
 				if (!empty($add)) $add = " (".$add.")";
 				$ret .= ">".$title.$add."</OPTION>\n";
-			}
+			} // END - while
 
 			// Free memory
 			SQL_FREERESULT($result);
@@ -1461,7 +1532,7 @@ function ADD_OPTION_LINES($table, $id, $name, $default="",$special="",$where="")
 	// Return - hopefully - the requested data
 	return $ret;
 }
-// Aiut
+// Activate exchange (DEPERECATED???)
 function activateExchange() {
 	global $_CONFIG;
 	$result = SQL_QUERY("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE status='CONFIRMED' AND max_mails > 0", __FILE__, __LINE__);
@@ -1548,7 +1619,7 @@ function ADD_JACKPOT($points)
 	if (SQL_NUMROWS($result) == 0)
 	{
 		// Create line
-		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_jackpot (ok, points) VALUES ('ok', '%s')", array($points), __FILE__, __LINE__);
+		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_jackpot (ok, points) VALUES ('ok','%s')", array($points), __FILE__, __LINE__);
 	}
 	 else
 	{
@@ -1760,7 +1831,7 @@ function CREATE_EXTENSION_UPDATE_TASK ($admin_id, $subject, $notes) {
 		array($subject), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 0) {
 		// Task not created so it's a brand-new extension which we need to register and create a task for!
-		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, userid, status, task_type, subject, text, task_created) VALUES ('%s', '0', 'NEW', 'EXTENSION_UPDATE', '%s', '%s', UNIX_TIMESTAMP())",
+		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, userid, status, task_type, subject, text, task_created) VALUES ('%s','0','NEW','EXTENSION_UPDATE','%s','%s', UNIX_TIMESTAMP())",
 			array($admin_id, $subject, $notes), __FILE__, __LINE__);
 	} // END - if
 
@@ -1791,7 +1862,7 @@ function CREATE_NEW_EXTENSION_TASK ($admin_id, $subject, $ext) {
 
 		// Task not created so it's a brand-new extension which we need to register and create a task for!
 		$result_insert = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, userid, status, task_type, subject, text, task_created)
-VALUES (%s, 0, 'NEW', 'EXTENSION', '%s', '%s', UNIX_TIMESTAMP())",
+VALUES (%s,0,'NEW','EXTENSION','%s','%s',UNIX_TIMESTAMP())",
 			array(
 				$admin_id,
 				$subject,