X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmysql-manager.php;h=bd453fac30a4aa7c3b1f44fd84a53c971608df86;hb=a28637f0eb7975f2240c42d349e5f08a9722d9bb;hp=96785ed9d3b7b746b68c3822398bfd1e27ea0204;hpb=57227d33e870ec5cd271209c4a978a52b45c2dd6;p=mailer.git

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 96785ed9d3..bd453fac30 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -326,7 +326,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false) {
 		if (isAdmin()) $ADD = '';
 
 		$dummy = substr($search, 0, -4);
-		$ADD .= " AND `action`='".getModeAction($accessLevel, $dummy)."'";
+		$ADD .= " AND `action`='".getActionFromModuleWhat($accessLevel, $dummy)."'";
 	} elseif (($accessLevel == 'sponsor') || ($accessLevel == 'engine')) {
 		// Sponsor / engine menu
 		$type     = 'what';
@@ -695,7 +695,9 @@ function fetchUserData ($userid, $column = 'userid') {
 // This patched function will reduce many SELECT queries for the specified or current admin login
 function isAdmin ($admin = '') {
 	// Init variables
-	$ret = false; $passCookie = ''; $valPass = '';
+	$ret = false;
+	$passCookie = '';
+	$valPass = '';
 	//* DEBUG: */ print(__FUNCTION__.':'.$admin.'<br />');
 
 	// If admin login is not given take current from cookies...
@@ -724,9 +726,12 @@ function isAdmin ($admin = '') {
 
 			// Count cache hits
 			incrementStatsEntry('cache_hits');
-		} elseif ((!empty($admin)) && ((!isExtensionActive('cache'))) || (isAdminHashSet($admin) === false)) {
+		} elseif ((!empty($admin)) && ((!isExtensionActive('cache')) || (isAdminHashSet($admin) === false))) {
 			// Get admin hash and hash it
 			$valPass = generatePassString(getAdminHash($admin));
+
+			// Cache it away
+			$GLOBALS['admin_hash'] = $valPass;
 		}
 
 		if (!empty($valPass)) {
@@ -865,29 +870,29 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
 }
 
 // Get action value from mode (admin/guest/member) and what-value
-function getModeAction ($mode, $what) {
+function getActionFromModuleWhat ($module, $what) {
 	// Init status
 	$data['action'] = '';
 
-	//* DEBUG: */ print(__LINE__.'='.$mode.'/'.$what.'/'.getAction()."=<br />");
+	//* DEBUG: */ print(__LINE__.'='.$module.'/'.$what.'/'.getAction()."=<br />");
 	if (!isExtensionInstalledAndNewer('sql_patches', '0.0.5')) {
 		// sql_patches is missing so choose depending on mode
 		if (isWhatSet()) {
 			// Use setted what
 			$what = getWhat();
-		} elseif ($mode == 'admin') {
+		} elseif ($module == 'admin') {
 			// Admin area
 			$what = 'overview';
 		} else {
 			// Everywhere else
 			$what = 'welcome';
 		}
-	} elseif ((empty($what)) && ($mode != 'admin')) {
+	} elseif ((empty($what)) && ($module != 'admin')) {
 		// Use configured 'home'
 		$what = getConfig('index_home');
 	} // END - if
 
-	if ($mode == 'admin') {
+	if ($module == 'admin') {
 		// Action value for admin area
 		if (isGetRequestParameterSet('action')) {
 			// Use from request!
@@ -903,19 +908,19 @@ function getModeAction ($mode, $what) {
 		// Get it directly from URL
 		return getAction();
 	}
-	//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): ret=".$data['action'].'<br />');
+	//* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>): ret=' . $data['action'] . '<br />');
 
 	// Does the module have a menu?
-	if (ifModuleHasMenu($mode)) {
+	if (ifModuleHasMenu($module)) {
 		// Rewriting modules to menu
-		$mode = mapModuleToTable($mode);
+		$module = mapModuleToTable($module);
 
 		// Guest and member menu is 'main' as the default
 		if (empty($data['action'])) $data['action'] = 'main';
 
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT `action` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `what`='%s' LIMIT 1",
-			array($mode, $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);
@@ -923,7 +928,7 @@ function getModeAction ($mode, $what) {
 
 		// Free memory
 		SQL_FREERESULT($result);
-	} elseif ((!isExtensionInstalled('sql_patches')) && (($mode != 'admin') && ($mode != 'unknown'))) {
+	} elseif ((!isExtensionInstalled('sql_patches')) && ($module != 'admin') && ($module != 'unknown')) {
 		// No sql_patches installed, but maybe we need to register an admin?
 		if (isAdminRegistered()) {
 			// Redirect to admin area
@@ -1176,12 +1181,12 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 	// Count up referal depth
 	if (!isset($GLOBALS['ref_level'])) {
 		// Initialialize referal system
-		//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): Referal system initialized!<br />");
+		//* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>): Referal system initialized!<br />");
 		$GLOBALS['ref_level'] = '0';
 	} else {
 		// Increase referal level
 		$GLOBALS['ref_level']++;
-		//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): Referal level increased. DEPTH={$GLOBALS['ref_level']}<br />");
+		//* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>): Referal level increased. DEPTH={$GLOBALS['ref_level']}<br />");
 	}
 
 	// Default is 'normal' points
@@ -1191,39 +1196,39 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 	if ($locked === true) $data = 'locked_points';
 
 	// Check user account
-	//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):userid={$userid},points={$points}<br />");
+	//* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):userid={$userid},points={$points}<br />");
 	if (fetchUserData($userid)) {
 		// This is the user and his ref
 		$GLOBALS['cache_array']['add_userid'][getUserData('refid')] = $userid;
 
 		// Get percents
 		$per = getReferalLevelPercents($GLOBALS['ref_level']);
-		//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):userid={$userid},points={$points},depth={$GLOBALS['ref_level']},per={$per},mode={$add_mode}<br />");
+		//* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):userid={$userid},points={$points},depth={$GLOBALS['ref_level']},per={$per},mode={$add_mode}<br />");
 
 		// Some percents found?
 		if ($per > 0) {
 			// Calculate new points
-			//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):userid={$userid},points={$points},per={$per},depth={$GLOBALS['ref_level']}<br />");
+			//* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):userid={$userid},points={$points},per={$per},depth={$GLOBALS['ref_level']}<br />");
 			$ref_points = $points * $per / 100;
 
 			// Pay refback here if level > 0 and in ref-mode
 			if ((isExtensionActive('refback')) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($add_mode == "ref") && (isset($GLOBALS['cache_array']['add_userid'][$userid]))) {
-				//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):userid={$userid},data={$GLOBALS['cache_array']['add_userid'][$userid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - BEFORE!<br />");
+				//* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):userid={$userid},data={$GLOBALS['cache_array']['add_userid'][$userid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - BEFORE!<br />");
 				$ref_points = addRefbackPoints($GLOBALS['cache_array']['add_userid'][$userid], $userid, $points, $ref_points);
-				//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):userid={$userid},data={$GLOBALS['cache_array']['add_userid'][$userid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - AFTER!<br />");
+				//* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):userid={$userid},data={$GLOBALS['cache_array']['add_userid'][$userid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - AFTER!<br />");
 			} // END - if
 
 			// Update points...
 			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_points` SET `%s`=`%s`+%s WHERE `userid`=%s AND `ref_depth`='%s' LIMIT 1",
 				array($data, $data, $ref_points, bigintval($userid), bigintval($GLOBALS['ref_level'])), __FUNCTION__, __LINE__);
-			//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):data={$data},ref_points={$ref_points},userid={$userid},depth={$GLOBALS['ref_level']},mode={$add_mode} - UPDATE! (".SQL_AFFECTEDROWS().")<br />");
+			//* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):data={$data},ref_points={$ref_points},userid={$userid},depth={$GLOBALS['ref_level']},mode={$add_mode} - UPDATE! (".SQL_AFFECTEDROWS().")<br />");
 
 			// No entry updated?
 			if (SQL_AFFECTEDROWS() < 1) {
 				// First ref in this level! :-)
 				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`,`ref_depth`,`%s`) VALUES (%s,'%s',%s)",
 					array($data, bigintval($userid), bigintval($GLOBALS['ref_level']), $ref_points), __FUNCTION__, __LINE__);
-				//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):data={$data},ref_points={$ref_points},userid={$userid},depth={$GLOBALS['ref_level']},mode={$add_mode} - INSERTED! (".SQL_AFFECTEDROWS().")<br />");
+				//* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):data={$data},ref_points={$ref_points},userid={$userid},depth={$GLOBALS['ref_level']},mode={$add_mode} - INSERTED! (".SQL_AFFECTEDROWS().")<br />");
 			} // END - if
 
 			// Points updated, maybe I shall send him an email?
@@ -1259,7 +1264,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 			// Maybe there's another ref?
 			if ((getUserData('refid') > 0) && ($points > 0) && (getUserData('refid') != $userid) && ($add_mode == 'ref')) {
 				// Then let's credit him here...
-				//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):userid={$userid},ref=".getUserData('refid').",points={$points} - ADVANCE!<br />");
+				//* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):userid={$userid},ref=".getUserData('refid').",points={$points} - ADVANCE!<br />");
 				addPointsThroughReferalSystem(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), getUserData('refid'), $points, $sendNotify, getUserData('refid'), $locked);
 			} // END - if
 		} // END - if
@@ -1272,19 +1277,19 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 function updateReferalCounter ($userid) {
 	// Make it sure referal level zero (member him-/herself) is at least selected
 	if (empty($GLOBALS['cache_array']['ref_level'][$userid])) $GLOBALS['cache_array']['ref_level'][$userid] = 1;
-	//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):userid={$userid},level={$GLOBALS['cache_array']['ref_level'][$userid]}<br />");
+	//* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):userid={$userid},level={$GLOBALS['cache_array']['ref_level'][$userid]}<br />");
 
 	// Update counter
 	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refsystem` SET `counter`=`counter`+1 WHERE `userid`=%s AND `level`='%s' LIMIT 1",
 		array(bigintval($userid), $GLOBALS['cache_array']['ref_level'][$userid]), __FUNCTION__, __LINE__);
 
 	// When no entry was updated then we have to create it here
-	//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):updated=".SQL_AFFECTEDROWS().'<br />');
+	//* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):updated=".SQL_AFFECTEDROWS().'<br />');
 	if (SQL_AFFECTEDROWS() < 1) {
 		// First count!
 		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_refsystem` (`userid`, `level`, `counter`) VALUES (%s,%s,1)",
 			array(bigintval($userid), $GLOBALS['cache_array']['ref_level'][$userid]), __FUNCTION__, __LINE__);
-		//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):userid={$userid}<br />");
+		//* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):userid={$userid}<br />");
 	} // END - if
 
 	// Init referal id
@@ -1296,17 +1301,17 @@ function updateReferalCounter ($userid) {
 		$ref = getUserData('refid');
 	} // END - if
 
-	//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):userid={$userid},ref={$ref}<br />");
+	//* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):userid={$userid},ref={$ref}<br />");
 
 	// When he has a referal...
 	if (($ref > 0) && ($ref != $userid)) {
 		// Move to next referal level and count his counter one up!
-		//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):ref={$ref} - ADVANCE!<br />");
+		//* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):ref={$ref} - ADVANCE!<br />");
 		$GLOBALS['cache_array']['ref_level'][$userid]++;
 		updateReferalCounter($ref);
 	} elseif ((($ref == $userid) || ($ref == '0')) && (isExtensionInstalledAndNewer('cache', '0.1.2'))) {
 		// Remove cache here
-		//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):ref={$ref} - CACHE!<br />");
+		//* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):ref={$ref} - CACHE!<br />");
 		rebuildCacheFile('refsystem', 'refsystem');
 	}
 
@@ -1673,21 +1678,6 @@ WHERE
 	SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", array(bigintval($userid)), __FUNCTION__, __LINE__);
 }
 
-// Generates meta description for given module and 'what' value
-function generateMetaDescriptionCode ($module, $what) {
-	// Exclude admin and member's area
-	if (($module != 'admin') && ($module != 'login')) {
-		// Construct dynamic description
-		$DESCR = '{?MAIN_TITLE?} '.trim(getConfig('title_middle')) . ' ' . getTitleFromMenu('guest', $what);
-
-		// Output it directly
-		outputHtml('<meta name="description" content="' . $DESCR . '" />');
-	} // END - if
-
-	// Remove depth
-	unset($GLOBALS['ref_level']);
-}
-
 // Gets the matching what name from module
 function getWhatFromModule ($modCheck) {
 	// Is the request element set?