X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fmysql-manager.php;h=4be52eb6d64ad6284509abd822d8a45170a6ad60;hb=19cd0d37b2bcbf9dd4f3c38a9cecd7f5011d6b66;hp=88c5f62138298de9fb1466e1a2ce294f7d211f23;hpb=0a7e0faba4feaf17432cbdcaf17eb7d2f3812a1e;p=mailer.git

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 88c5f62138..4be52eb6d6 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -827,11 +827,7 @@ function SEND_MODE_MAILS($mod, $modes)
 	if (empty($content)) {
 		if ((!empty($sub_adm)) && (!empty($msg_admin))) {
 			// Send admin mail
-			if (GET_EXT_VERSION("admins") >= "0.4.1") {
-				SEND_ADMIN_EMAILS_PRO($sub_adm, $msg_admin, $content, $GLOBALS['userid']);
-			} else {
-				SEND_ADMIN_EMAILS($sub_adm, LOAD_EMAIL_TEMPLATE($msg_admin, $content, $GLOBALS['userid']));
-			}
+			SEND_ADMIN_NOTIFICATION($sub_adm, $msg_admin, $content, $GLOBALS['userid']);
 		} elseif ($_CONFIG['admin_notify'] == "Y") {
 			// Cannot send mails to admin!
 			$content = CANNOT_SEND_ADMIN_MAILS;
@@ -919,39 +915,48 @@ function GET_ACTION ($MODE, &$wht)
 	return $ret;
 }
 //
-function GET_CATEGORY ($cid)
-{
+function GET_CATEGORY ($cid) {
+	// Default is not found
 	$ret = _CATEGORY_404;
-	$result = SQL_QUERY_ESC("SELECT cat FROM "._MYSQL_PREFIX."_cats WHERE id=%d LIMIT 1", array($cid), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == 1)
-	{
+
+	// Lookup the category
+	$result = SQL_QUERY_ESC("SELECT cat FROM "._MYSQL_PREFIX."_cats WHERE id=%d LIMIT 1",
+		array(bigintval($cid)), __FILE__, __LINE__);
+	if (SQL_NUMROWS($result) == 1) {
 		// Category found... :-)
 		list($ret) = SQL_FETCHROW($result);
-		SQL_FREERESULT($result);
-	}
+	} // END - if
+
+	// Free result
+	SQL_FREERESULT($result);
+
+	// Return result
 	return $ret;
 }
 //
-function GET_PAYMENT ($pid, $full=false)
-{
+function GET_PAYMENT ($pid, $full=false) {
+	// Default is not found
 	$ret = _PAYMENT_404;
-	$result = SQL_QUERY_ESC("SELECT mail_title, price FROM "._MYSQL_PREFIX."_payments WHERE id=%d LIMIT 1", array($pid), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == 1)
-	{
+
+	// Load payment data
+	$result = SQL_QUERY_ESC("SELECT mail_title, price FROM "._MYSQL_PREFIX."_payments WHERE id=%d LIMIT 1",
+		array(bigintval($pid)), __FILE__, __LINE__);
+	if (SQL_NUMROWS($result) == 1) {
 		// Payment type found... :-)
-		if (!$full)
-		{
+		if (!$full) {
 			// Return only title
 			list($ret) = SQL_FETCHROW($result);
-			SQL_FREERESULT($result);
-		}
-		 else
-		{
+		} else {
 			// Return title and price
 			list($t, $p) = SQL_FETCHROW($result);
 			$ret = $t." / ".TRANSLATE_COMMA($p)." ".POINTS;
 		}
 	}
+
+	// Free result
+	SQL_FREERESULT($result);
+
+	// Return result
 	return $ret;
 }
 //