New method generateExtensionInactiveMessage() introduced

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

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index 97e3ba3b41e26df8ff4c7d77247addce58c94682..e236335de6ee403bcc76b168824ebc13e3999e67 100644 (file)
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -38,7 +38,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);
 }
 
@@ -86,24 +86,24 @@ function YOOMEDIA_QUERY_API ($script, $countQuery = true) {
        if ((getConfig('yoomedia_requests_remain') > 0) || (!$countQuery)) {
                // Prepare the low-level request
                $requestString = sprintf("http://www.yoomedia.de/interface_2.0/%s?id=%s&sid=%s&pw=%s&reload=%s&ma=%s&uebrig=%s&verguetung=%s&erotik=%s",
-                       $script,
-                       getConfig(('yoomedia_id')),
-                       getConfig(('yoomedia_sid')),
-                       getConfig('yoomedia_passwd'),
-                       getConfig(('yoomedia_tm_max_reload')),
-                       getConfig(('yoomedia_tm_min_wait')),
-                       getConfig(('yoomedia_tm_clicks_remain')),
-                       getConfig(('yoomedia_tm_min_pay')),
-                       getConfig(('yoomedia_erotic_allowed'))
+               $script,
+               getConfig(('yoomedia_id')),
+               getConfig(('yoomedia_sid')),
+               getConfig('yoomedia_passwd'),
+               getConfig(('yoomedia_tm_max_reload')),
+               getConfig(('yoomedia_tm_min_wait')),
+               getConfig(('yoomedia_tm_clicks_remain')),
+               getConfig(('yoomedia_tm_min_pay')),
+               getConfig(('yoomedia_erotic_allowed'))
                );
 
                // Run the query
-               $response = GET_URL($requestString);
+               $response = sendGetRequest($requestString);
 
                // Shall we count the query as used?
                if ($countQuery) {
                        // Then update the config!
-                       UPDATE_CONFIG("yoomedia_requests_remain", 1, "-");
+                       updateConfiguration('yoomedia_requests_remain', 1, '-');
                } // END - if
        } // END - if
 
@@ -155,7 +155,7 @@ function YOOMEDIA_PARSE_RESPONSE ($response, $type) {
        $cnt = 0; $entry = 0;
        foreach ($dataArray as $line) {
                // Add the line
-               $result[$entry][YOOMEDIA_TRANSLATE_INDEX($type, $cnt)] = $line;
+               $result[$entry][yoomediaTranslateIndex($type, $cnt)] = $line;
 
                // End of data of first entry reached?
                if ($cnt == 6) {
@@ -172,13 +172,13 @@ function YOOMEDIA_PARSE_RESPONSE ($response, $type) {
        return $result;
 }
 
-// Prepares a bonus mail for delivery. Works only if extension "bonus" is active
+// Prepares a bonus mail for delivery. Works only if extension 'bonus' is active
 function YOOMEDIA_PREPARE_MAIL_DELIVERY ($data) {
        // Is this an admin?
        if (!IS_ADMIN()) {
                // Abort here
                return false;
-       } elseif (!EXT_IS_ACTIVE("bonus")) {
+       } elseif (!EXT_IS_ACTIVE('bonus')) {
                // Abort here
                return false;
        }
@@ -196,10 +196,10 @@ function YOOMEDIA_PREPARE_MAIL_DELIVERY ($data) {
        $data['sid'] = getConfig('yoomedia_sid');
 
        // Add total receivers
-       $data['all'] = TRANSLATE_COMMA(GET_TOTAL_RECEIVERS());
+       $data['all'] = translateComma(getTotalReceivers());
 
        // Add categories
-       $data['categories'] = ADD_CATEGORY_OPTIONS("normal");
+       $data['categories'] = generateCategoryOptionsList('normal');
 
        // Load template
        LOAD_TEMPLATE("admin_send_yoomedia", false, $data);
@@ -211,7 +211,7 @@ function YOOMEDIA_SEND_BONUS_MAIL ($data, $mode) {
        if (!IS_ADMIN()) {
                // Abort here
                return false;
-       } elseif (!EXT_IS_ACTIVE("bonus")) {
+       } elseif (!EXT_IS_ACTIVE('bonus')) {
                // Abort here
                return false;
        }
@@ -220,21 +220,21 @@ function YOOMEDIA_SEND_BONUS_MAIL ($data, $mode) {
        $data['receiver'] = 0;
 
        // HTML or normal? (normal is default...)
-       $type = "t";
-       if (($mode == "html") && (EXT_IS_ACTIVE("html"))) $type = "h";
+       $type = 't';
+       if (($mode == 'html') && (EXT_IS_ACTIVE('html_mail'))) $type = 'h';
 
        // Auto-generate URL
        $data['url'] = sprintf("http://www.yoomedia.de/code/%s-mail.php?id=%s&sid=%s",
-               $type,
-               $data['id'],
-               $data['sid']
+       $type,
+       $data['id'],
+       $data['sid']
        );
 
        // Lock this mail for new delivery
        YOOMEDIA_RELOAD_LOCK($data, $mode);
 
        // Call the lower function
-       ADD_NEW_BONUS_MAIL($data, $mode);
+       addNewBonusMail($data, $mode);
 }
 
 // Lockdown given id
@@ -246,7 +246,7 @@ function YOOMEDIA_EXCLUDE_MAIL ($data, $mode) {
 
                // Add the entry
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_yoomedia_reload` (`type`,`y_id`,`y_reload`,`inserted`) VALUES ('%s',%s,%s,'0000-00-00 00:00')",
-                       array($mode, bigintval($data['id']), bigintval($data['reload'])), __FUNCTION__, __LINE__);
+               array($mode, bigintval($data['id']), bigintval($data['reload'])), __FUNCTION__, __LINE__);
        } // END - if
 }
 
@@ -257,20 +257,18 @@ function YOOMEDIA_UNLIST_MAIL ($data, $mode) {
 
        // Add the entry
        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",
-               array($mode, bigintval($data['id'])), __FUNCTION__, __LINE__);
+       array($mode, bigintval($data['id'])), __FUNCTION__, __LINE__);
 }
 
 // "Translates" the index number into an assosiative value
-function YOOMEDIA_TRANSLATE_INDEX ($type, $index) {
-       global $yoomediaTranslationTable;
-
+function yoomediaTranslateIndex ($type, $index) {
        // Default is the index
        $return = $index;
 
        // Is the element there?
-       if (isset($yoomediaTranslationTable[$type][$index])) {
+       if (isset($GLOBALS['translation_tables']['yoomedia'][$type][$index])) {
                // Use this element
-               $return = $yoomediaTranslationTable[$type][$index];
+               $return = $GLOBALS['translation_tables']['yoomedia'][$type][$index];
        } else {
                // Not found!
                DEBUG_LOG(__FUNCTION__, __LINE__, " type={$type},index={$index} not found.");
@@ -281,16 +279,14 @@ function YOOMEDIA_TRANSLATE_INDEX ($type, $index) {
 }
 
 // "Translate" error code
-function YOOMEDIA_TRANSLATE_ERROR ($errorCode) {
-       global $yoomediaTranslationTable;
-
+function yoomediaTranslateError ($errorCode) {
        // Default is "failed"
        $return = "failed";
 
        // Is the entry there?
-       if (isset($yoomediaTranslationTable['error_codes'][$errorCode])) {
+       if (isset($GLOBALS['translation_tables']['yoomedia']['error_codes'][$errorCode])) {
                // Entry found!
-               $return = $yoomediaTranslationTable['error_codes'][$errorCode];
+               $return = $GLOBALS['translation_tables']['yoomedia']['error_codes'][$errorCode];
        } else {
                // Log missing entries
                DEBUG_LOG(__FUNCTION__, __LINE__, " errorCode={$errorCode}");
@@ -307,7 +303,7 @@ function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
 
        // Query database
        $result = SQL_QUERY_ESC("SELECT `id`, UNIX_TIMESTAMP(`inserted`) AS inserted FROM `{!_MYSQL_PREFIX!}_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",
-               array($type, bigintval($id)), __FUNCTION__, __LINE__);
+       array($type, bigintval($id)), __FUNCTION__, __LINE__);
 
        // Entry found?
        if (SQL_NUMROWS($result) == 1) {
@@ -317,8 +313,8 @@ function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
                // Are we ready to sent again?
                if (((time() - $time) >= ($reload * 60*60)) && ($time > 0)) {
                        // Remove entry
-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_yoomedia_reload` WHERE id=%s LIMIT 1",
-                               array($id), __FUNCTION__, __LINE__);
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_yoomedia_reload` WHERE `id`=%s LIMIT 1",
+                       array($id), __FUNCTION__, __LINE__);
                } else {
                        // Dont' sent again this mail
                        $reloaded = $time;
@@ -341,7 +337,7 @@ function YOOMEDIA_RELOAD_LOCK ($data, $mode) {
 
                // Add the entry
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_yoomedia_reload` (`type`,`y_id`,`y_reload`) VALUES ('%s',%s,%s)",
-                       array($mode, bigintval($data['id']), bigintval($data['reload'])), __FUNCTION__, __LINE__);
+               array($mode, bigintval($data['id']), bigintval($data['reload'])), __FUNCTION__, __LINE__);
        } // END - if
 }
 
@@ -349,11 +345,11 @@ function YOOMEDIA_RELOAD_LOCK ($data, $mode) {
 function YOOMEDIA_CONVERT_MODE ($mode) {
        // Convert mode for normal/html
        switch ($mode) {
-               case "normal":
+               case 'normal':
                        $mode = "textmail";
                        break;
 
-               case "html":
+               case 'html':
                        $mode = "htmlmail";
                        break;
        } // END - switch