X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=003589d527ec4ce6d1ead84f961a2a90dfdb5fcf;hb=1ae27b893dd19a4992beb49fa904cb2bc18578b3;hp=c4803ae00bd7d0d40acc5bb3457978d65a50a505;hpb=3819d37a11c5a1c29745fd1139ab07cefbb5ecd6;p=mailer.git

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index c4803ae00b..003589d527 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 ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing')) || (!isBooleanConstantAndTrue('admin_registered'))) return "done";
+	if ((!defined('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing')) || (!defined('admin_registered'))) return "done";
 
 	// Check if cache is latest version
 	$locked = "Y"; $hidden = "N"; $admin = "N"; $mem = "N"; $found = false;
@@ -926,20 +926,15 @@ function GET_ACTION ($MODE, &$wht)
 	} elseif (!empty($GLOBALS['action'])) {
 		// Get it directly from URL
 		return $GLOBALS['action'];
-	} else {
-		// Everything else will be touched after checking the module has a menu assigned
 	}
 	//* DEBUG: */ echo __LINE__."*".$ret."*<br />\n";
 
-	if (MODULE_HAS_MENU($MODE))
-	{
+	if (MODULE_HAS_MENU($MODE)) {
 		// Rewriting modules to menu
-		switch ($MODE)
-		{
+		switch ($MODE) {
 			case "index": $MODE = "guest";  break;
 			case "login": $MODE = "member"; break;
-				break;
-		}
+		} // END - switch
 
 		// Guest and member menu is "main" as the default
 		if (empty($ret)) $ret = "main";
@@ -950,11 +945,11 @@ function GET_ACTION ($MODE, &$wht)
 		if (SQL_NUMROWS($result) == 1) {
 			// Load action value and pray that this one is the right you want... ;-)
 			list($ret) = SQL_FETCHROW($result);
-		}
+		} // END - if
 
 		// Free memory
 		SQL_FREERESULT($result);
-	}
+	} // END - if
 
 	// Return action value
 	return $ret;
@@ -965,9 +960,11 @@ function GET_CATEGORY ($cid) {
 	$ret = _CATEGORY_404;
 
 	// Is the category id set?
-	if (!empty($cid)) {
-
-		// Lookup the category
+	if ($cid == "0") {
+		// No category
+		$ret = _CATEGORY_NONE;
+	} elseif ($cid > 0) {
+		// Lookup the category in database
 		$result = SQL_QUERY_ESC("SELECT cat FROM "._MYSQL_PREFIX."_cats WHERE id=%s LIMIT 1",
 			array(bigintval($cid)), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
@@ -1198,8 +1195,14 @@ function ADD_POINTS_REFSYSTEM($uid, $points, $send_notify=false, $rid="0", $lock
 				// Direct payment shall be notified about
 				define('__POINTS_VALUE', $ref_points);
 
+				// Prepare content
+				$content = array(
+					'text'   => REASON_DIRECT_PAYMENT,
+					'points' => TRANSLATE_COMMA($ref_points)
+				);
+
 				// Load message
-				$msg = LOAD_EMAIL_TEMPLATE("add-points", REASON_DIRECT_PAYMENT, $uid);
+				$msg = LOAD_EMAIL_TEMPLATE("add-points", $content, $uid);
 
 				// And sent it away
 				SEND_EMAIL($email, SUBJECT_DIRECT_PAYMENT, $msg);
@@ -1520,7 +1523,7 @@ WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
 	}
 
 	// Now a mail to the user and that's all...
-	$msg = LOAD_EMAIL_TEMPLATE("del-user", $reason, $uid);
+	$msg = LOAD_EMAIL_TEMPLATE("del-user", array('text' => $reason), $uid);
 	SEND_EMAIL($uid, ADMIN_DEL_ACCOUNT, $msg);
 
 	// Ok, delete the account!