X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=3304a5f7242b5bef5973438f4ef55d949f633c77;hb=1cf72a9c1a5e737509af79d49f0731da2eb6a218;hp=fb4fa4a8a52d3e76189db83dbd50a156b8e595b7;hpb=397eb5dee2611cfaa1ff494d73e6785b88109cd6;p=mailer.git

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index fb4fa4a8a5..3304a5f724 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -53,7 +53,7 @@ function RALLYE_AUTOSTART_RALLYES($result)
 		array(bigintval($id)), __FILE__, __LINE__);
 
 	// Do a snapshot off all user refs
-	$result_user = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);
+	$result_user = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);
 
 	// Transfer all neccessary data to the global $DATA array
 	$DATA['uid_cnt']    = SQL_NUMROWS($result_user);
@@ -102,7 +102,7 @@ function RALLYE_AUTOSTART_RALLYES($result)
 FROM `{!_MYSQL_PREFIX!}_user_points` AS p
 LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d
 ON p.userid=d.userid
-WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s",
+WHERE d.`status`='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s",
  array(getConfig('ref_payout'), bigintval($uid)), __FILE__, __LINE__);
 			list($cpoints) = SQL_FETCHROW($result_ref);
 			SQL_FREERESULT($result_ref);
@@ -213,7 +213,7 @@ WHERE u.rallye_id=%s AND r.counter > 0 ORDER BY u.refs DESC",
 		$result_ref = SQL_QUERY_ESC("SELECT DISTINCT p.points FROM `{!_MYSQL_PREFIX!}_user_points` AS p
 LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d
 ON p.userid=d.userid
-WHERE d.userid=%s AND d.status='CONFIRMED' AND p.ref_depth=1 AND d.max_mails > 0 AND d.mails_confirmed >= %s
+WHERE d.userid=%s AND d.`status`='CONFIRMED' AND p.ref_depth=1 AND d.max_mails > 0 AND d.mails_confirmed >= %s
 LIMIT 1", array(bigintval($uid), getConfig('ref_payout')), __FILE__, __LINE__);
 		list($refpoints) = SQL_FETCHROW($result_ref);
 		SQL_FREERESULT($result_ref);
@@ -371,7 +371,7 @@ function RALLYE_EXPIRE_RALLYES($result)
 		//   active = 0: account is deleted or locked
 		$result = SQL_QUERY_ESC("SELECT COUNT(userid) AS active
 FROM `{!_MYSQL_PREFIX!}_user_data`
-WHERE userid=%s AND status='CONFIRMED'
+WHERE userid=%s AND `status`='CONFIRMED'
 LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
 		list($active) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
@@ -474,7 +474,7 @@ function RALLYE_LOAD_USER_DATA($uids_array)
 	$uid_string = implode(",", $uids_array['uid']);
 
 	// Load users
-	$result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid IN(%s) AND status='CONFIRMED' ORDER BY userid LIMIT %s",
+	$result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid IN(%s) AND `status`='CONFIRMED' ORDER BY userid LIMIT %s",
 	 array($uid_string, count($uids_array)), __FILE__, __LINE__);
 	$ret = "";
 	while (list($u, $gender, $surname, $family, $email) = SQL_FETCHROW($result))
@@ -517,7 +517,7 @@ function RALLYE_LOAD_USERS_ARRAY ($rallye) {
 	global $_CONFIG;
 
 	// Fix zero points to 0.00000
-	if (getConfig('ref_payout') == "0") $_CONFIG['ref_payout'] = "0.00000";
+	if (getConfig('ref_payout') == "0") setConfigEntry('ref_payout', "0.00000");
 
 	// Init multi array
 	$users = array(
@@ -538,7 +538,7 @@ function RALLYE_LOAD_USERS_ARRAY ($rallye) {
 FROM `{!_MYSQL_PREFIX!}_user_points` AS p
 LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d
 ON p.userid=d.userid
-WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s",
+WHERE d.`status`='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s",
 			array(getConfig('ref_payout'), bigintval($uid)), __FILE__, __LINE__);
 		list($refpoints) = SQL_FETCHROW($result_ref);
 		SQL_FREERESULT($result_ref);
@@ -595,7 +595,7 @@ function RALLYE_LIST_WINNERS ($rallye, $default=0) {
 		// Check status
 		//   active = 1: account is still confirmed
 		//   active = 0: account is deleted or locked
-		$result_active = SQL_QUERY_ESC("SELECT COUNT(userid) FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+		$result_active = SQL_QUERY_ESC("SELECT COUNT(userid) FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
 		 array(bigintval($DATA['uid'][$idx])), __FILE__, __LINE__);
 		list($active) = SQL_FETCHROW($result_active);
 		SQL_FREERESULT($result_active);
@@ -714,23 +714,20 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
 	closedir($dir);
 
 	// Do we have found templates which we can link with the new rallye?
-	if (!empty($ral[0]))
-	{
+	if (!empty($ral[0])) {
 		// Generate selection box for all found templates
+		// @TODO Rewrite this to our API function
 		$OUT  = "<select name=\"".$name."\" size=\"1\" class=\"admin_select\">
-  <option value=\"\">".SELECT_NONE."</option>\n";
-		foreach ($ral as $rallye)
-		{
+  <option value=\"\">{--SELECT_NONE--}</option>\n";
+		foreach ($ral as $rallye) {
 		     $OUT .= "  <option value=\"".$rallye."\"";
-			if ($default == $rallye) $OUT .= " selected default";
+			if ($default == $rallye) $OUT .= " selected=\"selected\"";
 			$OUT .= ">".$rallye."</option>\n";
 		}
 		$OUT .= "</select>\n";
-	}
-	 else
-	{
+	} else {
 		// No rallye templates found
-		$OUT = RALLYE_NO_TEMPLATES_FOUND;
+		$OUT = getMessage('RALLYE_NO_TEMPLATES_FOUND');
 	}
 
 	// Return selection