projects / mailer.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Rewrite from stelzi implemented, variable and function name renamed to match with...
[mailer.git] / inc / libs / sponsor_functions.php
diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index 3b639ad7657b4b26b6f95eff57799f81331fee0f..bc7a15d08f85b598a5bc87c367608cfe6b57321c 100644 (file)
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -37,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
@@ -69,12 +69,12 @@ function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $messageArray=array()
                        {
                        case 'email':
                                $ALREADY = false;
-                               if (!VALIDATE_EMAIL($v)) {
+                               if (!isEmailValid($v)) {
                                        // Email address is not valid
                                        $SAVE = false;
                                } else {
                                        // Do we want to add a new sponsor or update his data?
-                                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE email='%s' LIMIT 1",
+                                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE email='%s' LIMIT 1",
                                                array($POST['email']), __FUNCTION__, __LINE__);
 
                                        // Is a sponsor alread in the db?
@@ -103,12 +103,12 @@ function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $messageArray=array()
                                break;
 
                        case "url":
-                               if (!VALIDATE_URL($v)) $SAVE = false;
+                               if (!isUrlValid($v)) $SAVE = false;
                                break;
 
                        default:
                                // Test if there is are time selections
-                               CONVERT_SELECTIONS_TO_TIMESTAMP($POST, $DATA, $k, $skip);
+                               convertSelectionsToTimestamp($POST, $DATA, $k, $skip);
                                break;
                        }
 
@@ -136,16 +136,16 @@ function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $messageArray=array()
                        }
 
                        // Remove last ", " from SQL string
-                       $sql = substr($sql, 0, -2)." WHERE id='%s' LIMIT 1";
+                       $sql = substr($sql, 0, -2)." WHERE `id`='%s' LIMIT 1";
                        $DATA['values'][] = bigintval(REQUEST_GET('id'));
 
                        // Generate message
                        $message = SPONSOR_GET_MESSAGE(ADMIN_SPONSOR_UPDATED, "updated", $messageArray);
                        $ret = "updated";
-               } elseif ((!$ALREADY) || (($POST['force'] == "1") && (IS_ADMIN()))) {
+               } elseif ((!$ALREADY) || (($POST['force'] == '1') && (IS_ADMIN()))) {
                        // Add new sponsor, first add more data
                        $DATA['keys'][] = "sponsor_created"; $DATA['values'][] = time();
-                       $DATA['keys'][] = "status";
+                       $DATA['keys'][] = 'status';
                        if ((!$NO_UPDATE) && (IS_ADMIN()) && ($GLOBALS['what'] == "add_sponsor")) {
                                // Only allowed for admin
                                $DATA['values'][] = "PENDING";
@@ -155,17 +155,17 @@ function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $messageArray=array()
 
                                // Generate hash code
                                $DATA['keys'][] = "hash";
-                               $DATA['values'][] = md5(session_id().":".$POST['email'].":".GET_REMOTE_ADDR().":".GET_USER_AGENT().":".time());
+                               $DATA['values'][] = md5(session_id().':'.$POST['email'].':'.detectRemoteAddr().':'.detectUserAgent().':'.time());
                                $DATA['keys'][] = "remote_addr";
-                               $DATA['values'][] = GET_REMOTE_ADDR();
+                               $DATA['values'][] = detectRemoteAddr();
                        }
 
                        // Implode all data into strings
                        $KEYS   = implode(", "  , $DATA['keys']);
-                       $VALUES = str_repeat("%s', '", count($DATA['values']) - 1);
+                       $valueS = str_repeat("%s', '", count($DATA['values']) - 1);
 
                        // Generate string
-                       $sql = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_data` (".$KEYS.") VALUES ('".$VALUES."%s')";
+                       $sql = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_data` (".$KEYS.") VALUES ('".$valueS."%s')";
 
                        // Generate message
                        $message = SPONSOR_GET_MESSAGE(getMessage('ADMIN_SPONSOR_ADDED'), "added", $messageArray);
@@ -210,7 +210,7 @@ function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $messageArray=array()
        if ($RET_STATUS) return $ret;
 }
 //
-function SPONSOR_TRANSLATE_STATUS ($status) {
+function sponsorTranslateUserStatus ($status) {
        // Construct constant name
        $constantName = sprintf("ACCOUNT_%s", $status);
 
@@ -254,9 +254,9 @@ function IS_SPONSOR () {
        $ret = false;
        if ((isSessionVariableSet('sponsorid')) && (isSessionVariableSet('sponsorpass'))) {
                // Check cookies against database records...
-               $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data`
-WHERE id='%s' AND password='%s' AND `status`='CONFIRMED' LIMIT 1",
-                       array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FUNCTION__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_sponsor_data`
+WHERE `id`='%s' AND password='%s' AND `status`='CONFIRMED' LIMIT 1",
+                       array(bigintval(getSession('sponsorid')), getSession('sponsorpass')), __FUNCTION__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // All is fine
                        $ret = true;
@@ -340,9 +340,9 @@ ORDER BY `sort`",
 function GENERATE_SPONSOR_CONTENT ($what) {
        $OUT = '';
        $INC = sprintf("inc/modules/sponsor/%s.php", $what);
-       if (INCLUDE_READABLE($INC)) {
+       if (isIncludeReadable($INC)) {
                // Every sponsor action will output nothing directly. It will be written into $OUT!
-               LOAD_INC_ONCE($INC);
+               loadIncludeOnce($INC);
        } else {
                // File not found!
                $OUT .= LOAD_TEMPLATE('admin_settings_saved', true, sprintf(getMessage('SPONSOR_CONTENT_404'), $what));
@@ -362,8 +362,8 @@ function UPDATE_SPONSOR_LOGIN () {
                // Update last online timestamp
                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data`
 SET last_online=UNIX_TIMESTAMP()
-WHERE id='%s' AND password='%s' LIMIT 1",
-                       array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FUNCTION__, __LINE__);
+WHERE `id`='%s' AND password='%s' LIMIT 1",
+                       array(bigintval(getSession('sponsorid')), getSession('sponsorpass')), __FUNCTION__, __LINE__);
 
                // This update went fine?
                $login = (SQL_AFFECTEDROWS() == 1);
@@ -425,7 +425,7 @@ function SPONSOR_SAVE_DATA ($POST, $content) {
                        $sql .= " `status`='EMAIL', hash='%s',";
 
                        // Generate hash code
-                       $HASH = md5(session_id().":".$POST['email'].":".GET_REMOTE_ADDR().":".GET_USER_AGENT().":".time());
+                       $HASH = md5(session_id().':'.$POST['email'].':'.detectRemoteAddr().':'.detectUserAgent().':'.time());
                        $DATA[] = $HASH;
                } // END - if
        } // END - if
@@ -434,9 +434,9 @@ function SPONSOR_SAVE_DATA ($POST, $content) {
        $sql = substr($sql, 0, -1);
 
        // Add SQL tail data
-       $sql .= " WHERE id='%s' AND password='%s' LIMIT 1";
-       $DATA[] = bigintval(get_session('sponsorid'));
-       $DATA[] = get_session('sponsorpass');
+       $sql .= " WHERE `id`='%s' AND password='%s' LIMIT 1";
+       $DATA[] = bigintval(getSession('sponsorid'));
+       $DATA[] = getSession('sponsorpass');
 
        // Saving data was completed... ufff...
        switch ($GLOBALS['what'])
@@ -455,8 +455,8 @@ function SPONSOR_SAVE_DATA ($POST, $content) {
 
        case "settings": // Change settings
                // Translate some data
-               $content['receive']  = TRANSLATE_YESNO($content['receive_warnings']);
-               $content['interval'] = CREATE_FANCY_TIME($content['warning_interval']);
+               $content['receive']  = translateYesNo($content['receive_warnings']);
+               $content['interval'] = createFancyTime($content['warning_interval']);
 
                // Set message template and subject for admin
                $message   = getMessage('SPONSOR_SETTINGS_SAVED');
@@ -481,13 +481,13 @@ function SPONSOR_SAVE_DATA ($POST, $content) {
                        $DATA = $POST;
 
                        // Change some data
-                       if (isset($content['gender'])) $content['gender'] = TRANSLATE_GENDER($content['gender']);
-                       if (isset($DATA['gender']))    $DATA['gender']    = TRANSLATE_GENDER($DATA['gender']);
-                       if (isset($content['receive_warnings'])) $DATA['receive']     = TRANSLATE_YESNO($POST['receive_warnings']);
-                       if (isset($content['warning_interval'])) $DATA['interval']    = CREATE_FANCY_TIME($POST['warning_interval']);
+                       if (isset($content['gender'])) $content['gender'] = translateGender($content['gender']);
+                       if (isset($DATA['gender']))    $DATA['gender']    = translateGender($DATA['gender']);
+                       if (isset($content['receive_warnings'])) $DATA['receive']     = translateYesNo($POST['receive_warnings']);
+                       if (isset($content['warning_interval'])) $DATA['interval']    = createFancyTime($POST['warning_interval']);
 
                        // Send email to admins
-                       SEND_ADMIN_NOTIFICATION($subj, $templ, $content);
+                       sendAdminNotification($subj, $templ, $content);
 
                        // Shall we send mail to the sponsor's new email address?
                        if ($content['receive_warnings'] == 'Y') {
@@ -499,7 +499,7 @@ function SPONSOR_SAVE_DATA ($POST, $content) {
                                {
                                case "account": // Change account data
                                        $email_msg = LOAD_EMAIL_TEMPLATE("sponsor_change_data", $content);
-                                       SEND_EMAIL($content['email'], getMessage('SPONSOR_ACC_DATA_SUBJ'), $email_msg);
+                                       sendEmail($content['email'], getMessage('SPONSOR_ACC_DATA_SUBJ'), $email_msg);
 
                                        if ($EMAIL === true) {
                                                // Add hash code to content array
@@ -507,14 +507,14 @@ function SPONSOR_SAVE_DATA ($POST, $content) {
 
                                                // Second mail goes to the new address
                                                $email_msg = LOAD_EMAIL_TEMPLATE("sponsor_change_email", $content);
-                                               SEND_EMAIL($content['email'], getMessage('SPONSOR_ACC_EMAIL_SUBJ'), $email_msg);
+                                               sendEmail($content['email'], getMessage('SPONSOR_ACC_EMAIL_SUBJ'), $email_msg);
                                        }
                                        break;
 
                                case "settings": // Change settings
                                        // Send email
                                        $email_msg = LOAD_EMAIL_TEMPLATE("sponsor_settings", $content);
-                                       SEND_EMAIL($content['email'], getMessage('SPONSOR_SETTINGS_SUBJ'), $email_msg);
+                                       sendEmail($content['email'], getMessage('SPONSOR_SETTINGS_SUBJ'), $email_msg);
                                        break;
                                }
                        } // END - if
Mailer-Project repository