New naming convention applied to many functions, see #118 for details

[mailer.git] / inc / libs / rallye_functions.php

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index be5457cb612ef6583b562a5e7cddf0831762bb72..9183a06d0d7df44a3472cb5dcdffa2b3766f159d 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -53,17 +53,17 @@ function RALLYE_AUTOSTART_RALLYES ($result) {
        SQL_FREERESULT($result);
 
        // Set notified to Y
-       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET notified='Y' WHERE id=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET notified='Y' WHERE `id`=%s LIMIT 1",
                array(bigintval($id)), __FUNCTION__, __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", __FUNCTION__, __LINE__);
+       $result_user = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC", __FUNCTION__, __LINE__);
 
        // Transfer all neccessary data to the global $DATA array
        $DATA['uid_cnt']    = SQL_NUMROWS($result_user);
-       $DATA['start']      = MAKE_DATETIME($start, "2");
-       $DATA['end']        = MAKE_DATETIME($end  , "2");
-       $DATA['now_t']      = MAKE_DATETIME(time(), "2");
+       $DATA['start']      = generateDateTime($start, "2");
+       $DATA['end']        = generateDateTime($end  , "2");
+       $DATA['now_t']      = generateDateTime(time(), "2");
        $DATA['title']      = $title;
        $DATA['id']         = $id;  // ID for the rallye details link
 
@@ -83,7 +83,7 @@ function RALLYE_AUTOSTART_RALLYES ($result) {
                if (empty($cnt)) $cnt = 0; // Added prevent some unknown troubles... :-?
 
                // Check if line is already included...
-               $result_ref = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s AND userid=%s LIMIT 1",
+               $result_ref = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s AND `userid`=%s LIMIT 1",
                        array(bigintval($id), bigintval($content['userid'])), __FUNCTION__, __LINE__);
                if (SQL_NUMROWS($result_ref) == 0) {
                        // Free memory
@@ -115,7 +115,7 @@ VALUES ('%s','%s','%s','%s')",
                if (($notify == 'Y') && ($un)) {
                        // Load email template and send it to the user
                        $msg = LOAD_EMAIL_TEMPLATE("member_rallye_notify", array('prices' => $prices), $content['userid']);
-                       SEND_EMAIL($content['userid'], sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $msg);
+                       sendEmail($content['userid'], sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $msg);
                } // END - if
        } // END - while
 
@@ -124,7 +124,7 @@ VALUES ('%s','%s','%s','%s')",
        if ($notify == 'Y') $templ = "admin_rallye_notify";
 
        // Send email to admin
-       SEND_ADMIN_NOTIFICATION(sprintf(getMessage('RALLYE_ADMIN_NOTIFY'), $title), $templ, $prices, "0");
+       sendAdminNotification(sprintf(getMessage('RALLYE_ADMIN_NOTIFY'), $title), $templ, $prices, '0');
 
        // Free memory
        SQL_FREERESULT($result_user);
@@ -170,7 +170,7 @@ function RALLYE_ADD_PRICES ($rallye, $mode='email') {
 //
 function RALLYE_ADD_TOPUSERS ($rallye, $default=0) {
        // First check how many prices are set
-       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s ORDER BY price_level",
+       $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s ORDER BY price_level",
                array(bigintval($rallye)), __FUNCTION__, __LINE__);
        $prices = SQL_NUMROWS($result);
        SQL_FREERESULT($result);
@@ -207,7 +207,7 @@ LIMIT 1", array(bigintval($content['userid']), getConfig('ref_payout')), __FUNCT
                // Init userid for list
                $_uid = '---';
                // List only users with at least one ref!
-               //* DEBUG: */ echo "*".$cnt."/".$content['userid']."/".$content['curr_points']."/".$refpoints."*<br />\n";
+               //* DEBUG: */ echo "*".$cnt.'/'.$content['userid'].'/'.$content['curr_points'].'/'.$refpoints."*<br />\n";
                if (($cnt > 0) && ($refpoints > $content['curr_points'])) { $_uid = $content['userid']; } else { $cnt = ''; }
 
                // Save values to array
@@ -277,7 +277,7 @@ function RALLYE_AUTOADD_USER ($uid) {
                SQL_FREERESULT($result);
 
                // Check if line is already included...
-               $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s AND userid=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s AND `userid`=%s LIMIT 1",
                        array(bigintval($id), bigintval($uid)), __FUNCTION__, __LINE__);
 
                // Is this user added?
@@ -293,9 +293,9 @@ VALUES ('%s','%s','0')",
 
                if ($notify == 'Y') {
                        // Transfer all neccessary data to the global $DATA array
-                       $DATA['start'] = MAKE_DATETIME($start, "2");
-                       $DATA['end']   = MAKE_DATETIME($end  , "2");
-                       $DATA['now_t'] = MAKE_DATETIME(time(), "2");
+                       $DATA['start'] = generateDateTime($start, "2");
+                       $DATA['end']   = generateDateTime($end  , "2");
+                       $DATA['now_t'] = generateDateTime(time(), "2");
                        $DATA['title'] = $title;
                        $DATA['id']    = $id;  // ID for the rallye details link
                        $DATA['ref']   = 0;
@@ -310,7 +310,7 @@ VALUES ('%s','%s','0')",
 
                        // Send notification to member
                        $msg = LOAD_EMAIL_TEMPLATE("member_rallye_notify", array('prices' => $prices), $uid);
-                       SEND_EMAIL($uid, sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $msg);
+                       sendEmail($uid, sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $msg);
                } // END - if
        } // END - if
 }
@@ -330,9 +330,9 @@ function RALLYE_EXPIRE_RALLYES ($result) {
        $DATA = array(); $cnt = 0;
        $users = array();
        $DATA['title']  = $title;
-       $DATA['start']  = MAKE_DATETIME($start, "1");
-       $DATA['end']    = MAKE_DATETIME($end  , "1");
-       $DATA['now_t']  = MAKE_DATETIME(time(), "1");
+       $DATA['start']  = generateDateTime($start, "1");
+       $DATA['end']    = generateDateTime($end  , "1");
+       $DATA['now_t']  = generateDateTime(time(), "1");
 
        // Just count...
        $total = 0;
@@ -362,7 +362,7 @@ LIMIT 1", array(bigintval($uid)), __FUNCTION__, __LINE__);
        } // END - if
 
        // Expire rallye
-       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET expired='Y' WHERE id=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET expired='Y' WHERE `id`=%s LIMIT 1",
                array(bigintval($id)), __FUNCTION__, __LINE__);
 
        // Run array through (by uid is the most important 2nd-level-array)
@@ -392,7 +392,7 @@ LIMIT 1", array(bigintval($uid)), __FUNCTION__, __LINE__);
 
                        if ($DATA['points'] > 0) {
                                // Add points directly to user's account
-                               ADD_POINTS_REFSYSTEM("rallye_winner" . $winnerLevel, $uid, $DATA['points'], false, "0", false, "direct");
+                               ADD_POINTS_REFSYSTEM_DIRECT('rallye_winner' . $winnerLevel, $uid, $DATA['points']);
                        } // END - if
 
                        if ($notify == 'Y') {
@@ -410,7 +410,7 @@ LIMIT 1", array(bigintval($uid)), __FUNCTION__, __LINE__);
 
                                // Load template
                                $msg = LOAD_EMAIL_TEMPLATE($template, $DATA, $uid);
-                               SEND_EMAIL($uid, sprintf(getMessage('RALLYE_MEMBER_EXPIRED_SUBJ'), $DATA['level']), $msg);
+                               sendEmail($uid, sprintf(getMessage('RALLYE_MEMBER_EXPIRED_SUBJ'), $DATA['level']), $msg);
                        } // END - if
 
                        // Count userid
@@ -429,7 +429,7 @@ LIMIT 1", array(bigintval($uid)), __FUNCTION__, __LINE__);
        }
 
        // Send mail to admin
-       SEND_ADMIN_NOTIFICATION(sprintf(getMessage('RALLYE_ADMIN_EXPIRED_SUBJ'), $title), $templ, $cnt, 0);
+       sendAdminNotification(sprintf(getMessage('RALLYE_ADMIN_EXPIRED_SUBJ'), $title), $templ, $cnt, 0);
 
        // Add task
        SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (status, task_type, subject, text, task_created)
@@ -453,7 +453,7 @@ function RALLYE_LOAD_USER_DATA ($uids_array) {
        while ($content = SQL_FETCHARRAY($result)) {
                // Construct the message masked and add it
                $ret .= sprintf("%s %s %s (%s) - %s\n",
-                       TRANSLATE_GENDER($content['gender']),
+                       translateGender($content['gender']),
                        $content['surname'],
                        $content['family'],
                        $content['email'],
@@ -495,7 +495,7 @@ function RALLYE_LOAD_PRICES_ARRAY ($rallye) {
 //
 function RALLYE_LOAD_USERS_ARRAY ($rallye) {
        // Fix zero points to 0.00000
-       if (getConfig('ref_payout') == "0") setConfigEntry('ref_payout', "0.00000");
+       if (getConfig('ref_payout') == '0') setConfigEntry('ref_payout', "0.00000");
 
        // Init multi array
        $users = array(
@@ -505,7 +505,7 @@ function RALLYE_LOAD_USERS_ARRAY ($rallye) {
        );
 
        // Load users                          uid    old  points earned
-       $result_user = SQL_QUERY_ESC("SELECT userid, refs, curr_points FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s ORDER BY userid",
+       $result_user = SQL_QUERY_ESC("SELECT userid, refs, curr_points FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s ORDER BY `userid` ASC",
                array(bigintval($rallye)), __FUNCTION__, __LINE__);
        while ($content = SQL_FETCHARRAY($result_user)) {
                // Load current ref count
@@ -558,7 +558,7 @@ WHERE d.`status`='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND
 //
 function RALLYE_LIST_WINNERS ($rallye, $default=0) {
        // First check how many prices are set
-       $result_prices = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s ORDER BY price_level",
+       $result_prices = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s ORDER BY price_level",
                array(bigintval($rallye)), __FUNCTION__, __LINE__);
        $prices = SQL_NUMROWS($result_prices);
        SQL_FREERESULT($result_prices);
@@ -579,7 +579,7 @@ function RALLYE_LIST_WINNERS ($rallye, $default=0) {
                SQL_FREERESULT($result_active);
 
                if (empty($DATA['uid'][$idx])) $DATA['uid'][$idx] = '---';
-               if ((empty($DATA['ref'][$idx])) || ($DATA['ref'][$idx] == 0) || ($active == 0) || ("".round($DATA['cpoints'][$idx])."" == "0") || (empty($DATA['cpoints'][$idx]))) {
+               if ((empty($DATA['ref'][$idx])) || ($DATA['ref'][$idx] == 0) || ($active == 0) || ("".round($DATA['cpoints'][$idx])."" == '0') || (empty($DATA['cpoints'][$idx]))) {
                        // Allow valid and active users with at least one ref to get points
                        $DATA['ref'][$idx]   = '---';
                        $DATA['uid'][$idx]   = '---';
@@ -642,15 +642,15 @@ WHERE end_time <= (UNIX_TIMESTAMP() - %s) AND expired='Y'",
                while ($content = SQL_FETCHARRAY($result_rallye)) {
                        // Prepare data for mail template
                        $DATA['title']  = $content['title'];
-                       $DATA['start']  = MAKE_DATETIME($content['start_time'], "1");
-                       $DATA['end']    = MAKE_DATETIME($content['end_time']  , "1");
-                       $DATA['now_t']  = MAKE_DATETIME(time(), "1");
+                       $DATA['start']  = generateDateTime($content['start_time'], "1");
+                       $DATA['end']    = generateDateTime($content['end_time']  , "1");
+                       $DATA['now_t']  = generateDateTime(time(), "1");
 
                        // Send mail to admin
-                       SEND_ADMIN_NOTIFICATION(sprintf(getMessage('RALLYE_ADMIN_PURGED_SUBJ'), $content['title']), "admin_rallye_purged", '', 0);
+                       sendAdminNotification(sprintf(getMessage('RALLYE_ADMIN_PURGED_SUBJ'), $content['title']), "admin_rallye_purged", '', 0);
 
                        // Purge whole rallye
-                       ADD_SQL(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_data` WHERE id=%s LIMIT 1",
+                       ADD_SQL(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_data` WHERE `id`=%s LIMIT 1",
                                array(bigintval($content['id'])), __FUNCTION__, __LINE__, false));
                        ADD_SQL(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s LIMIT 1",
                                array(bigintval($content['id'])), __FUNCTION__, __LINE__, false));
@@ -673,17 +673,17 @@ VALUES ('NEW','RALLYE_PURGED','{--RALLYE_ADMIN_PURGED--}: %s','{--RALLYE_ADMIN_P
 }
 
 //
-function RALLYE_TEMPLATE_SELECTION ($name="template", $default="") {
+function RALLYE_TEMPLATE_SELECTION ($name="template", $default = '') {
        // Check templates directory
        $OUT = ''; $ral = array();
-       $basePath = sprintf("%stemplates/%s/html/rallye/", constant('PATH'), GET_LANGUAGE());
+       $basePath = sprintf("%stemplates/%s/html/rallye/", constant('PATH'), getLanguage());
        $dir = opendir($basePath) or mxchange_die(sprintf("Cannot open dir %s.", $basePath));
        while ($read = readdir($dir)) {
                // If it is no dir (so a file)
                if (!isDirectory($basePath.$read)) {
                        // Accept only templates matching with rallye_????.tpl.xx
                        if (eregi("^rallye_.*\.tpl", $read)) {
-                               $read = substr($read, 7, strpos($read, ".") - 7);
+                               $read = substr($read, 7, strpos($read, '.') - 7);
                                // Accept only template names between 1 and 255 chars length
                                if ((strlen($read) < 256) && (!empty($read))) $ral[] = $read;
                        } // END - if
@@ -727,7 +727,7 @@ function RALLYE_GET_REFCOUNT ($uid, $old=0) {
                                        if (($level == $GLOBALS['cache_array']['refsystem']['level'][$id]) && ($level == 1)) {
                                                // Level does exist so abort here
                                                $cnt = $GLOBALS['cache_array']['refsystem']['counter'][$id];
-                                               //* DEBUG: */ echo "*".$uid."/".$cnt."*<br />";
+                                               //* DEBUG: */ echo "*".$uid.'/'.$cnt."*<br />";
                                                break;
                                        } elseif ($level > 1) {
                                                // Not interesting here...
@@ -750,7 +750,7 @@ function RALLYE_GET_REFCOUNT ($uid, $old=0) {
                        incrementConfigEntry('cache_hits');
 
                        // Remove old refs
-                       //* DEBUG: */ echo "+".$cnt."/".$old."+<br />";
+                       //* DEBUG: */ echo '+'.$cnt.'/'.$old."+<br />";
                        $cnt -= $old;
                } // END - if
        } else {
@@ -770,7 +770,7 @@ WHERE s.userid=%s AND s.level=1", array(bigintval($uid)), __FUNCTION__, __LINE__
        }
 
        // Return count
-       //* DEBUG: */ echo "*".$uid."/".$old."/".$cnt."*<br />";
+       //* DEBUG: */ echo "*".$uid.'/'.$old.'/'.$cnt."*<br />";
        return $cnt;
 }