Mailer project continued:

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

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index f89979e68dc8e36e5f900a4003d438967c70bdaf..8312c16ea9f066878400b96ae1dcd27c2f505124 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -293,7 +293,8 @@ function getNetworkDataByTypeId ($networkId, $column = '') {
        t.`network_type_handler`,
        t.`network_type_api_url`,
        t.`network_type_click_url`,
-       t.`network_type_banner_url`
+       t.`network_type_banner_url`,
+       t.`network_text_encoding`
 FROM
        `{?_MYSQL_PREFIX?}_network_data` AS d
 LEFT JOIN
@@ -670,6 +671,29 @@ function generateNetworkTypesAvailableOptions ($defaultType = NULL) {
        return $GLOBALS[__FUNCTION__][$defaultType];
 }
 
+// Generates an options list of all available (hard-coded) text encoders
+function generateNetworkTextEncodingAvailableOptions ($defaultEncoding = NULL) {
+       // Is it cached?
+       if (!isset($GLOBALS[__FUNCTION__][$defaultEncoding])) {
+               // Generate list
+               $GLOBALS[__FUNCTION__][$defaultEncoding] = generateOptions(
+                       '/ARRAY/',
+                       array(
+                               'NONE',
+                               'BASE64',
+                       ),
+                       array(),
+                       $defaultEncoding,
+                       '', '',
+                       array(),
+                       'translateNetworkTextEncoding'
+               );
+       } // END - if
+
+       // Return content
+       return $GLOBALS[__FUNCTION__][$defaultEncoding];
+}
+
 // Generates an options list (somewhat getter) for request keys
 function generateNetworkRequestKeyOptions () {
        // Is it cached?
@@ -678,7 +702,7 @@ function generateNetworkRequestKeyOptions () {
                $GLOBALS[__FUNCTION__] = generateOptions(
                        '/ARRAY/',
                        array(
-                               'id',
+                               'affiliate_id',
                                'sid',
                                'hash',
                                'password',
@@ -803,8 +827,8 @@ function translateNetworkTranslationName ($name) {
 
        // Is the message id there?
        if (!isMessageIdValid($messageId)) {
-               // Not valid type
-               reportBug(__FUNCTION__, __LINE__, 'type=' . $type . ' is invalid.');
+               // Not valid name
+               reportBug(__FUNCTION__, __LINE__, 'name=' . $name . ' is invalid.');
        } // END - if
 
        // Return message id
@@ -871,6 +895,21 @@ function translateNetworkVcheckParameterKey ($param) {
        return '{--' . $messageId . '--}';
 }
 
+// Translate text-encoding
+function translateNetworkTextEncoding ($encoding) {
+       // Generate id
+       $messageId = 'ADMIN_NETWORK_TYPE_TEXT_ENCODING_' . strtoupper($encoding) . '';
+
+       // Is the message id there?
+       if (!isMessageIdValid($messageId)) {
+               // Not valid encoding
+               reportBug(__FUNCTION__, __LINE__, 'encoding=' . $encoding . ' is invalid.');
+       } // END - if
+
+       // Return message id
+       return '{--' . $messageId . '--}';
+}
+
 // Translates API index
 function translateNetworkApiIndex ($index) {
        // Is there cache?
@@ -1788,7 +1827,7 @@ function doAdminNetworkProcessExport () {
        // Init table with all valid what->table entries
        $validExports = array(
                // General network data
-               'list_networks'                  => 'data',
+               'list_network_data'              => 'data',
                // Network type handler
                'list_network_types'             => 'types',
                // Network request parameter
@@ -1848,7 +1887,7 @@ ORDER BY
                __FUNCTION__, __LINE__);
 
        // Start an empty SQL query
-       $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_data` (`network_short_name`,`network_title`,`network_reflink`,`network_data_separator`,`network_row_separator`,`network_request_type`,`network_charset`,`network_require_id_card`,`network_query_amount`,`network_active`) VALUES\n";
+       $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_data` (`network_short_name`, `network_title`, `network_reflink`, `network_data_separator`, `network_row_separator`, `network_request_type`, `network_charset`, `network_require_id_card`, `network_query_amount`, `network_active`) VALUES\n";
 
        // Load all entries
        while ($content = SQL_FETCHARRAY($result)) {
@@ -1892,7 +1931,8 @@ function doAdminNetworkExportTypes () {
        `network_type_api_url`,
        `network_type_click_url`,
        `network_type_banner_url`,
-       `network_type_reload_time_unit`
+       `network_type_reload_time_unit`,
+       `network_text_encoding`
 FROM
        `{?_MYSQL_PREFIX?}_network_types`
 WHERE
@@ -1904,7 +1944,7 @@ ORDER BY
                ), __FUNCTION__, __LINE__);
 
        // Start an empty SQL query
-       $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`,`network_id`,`network_type_handler`,`network_type_api_url`,`network_type_click_url`,`network_type_banner_url`,`network_type_reload_time_unit`) VALUES\n";
+       $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`, `network_id`, `network_type_handler`, `network_type_api_url`, `network_type_click_url`, `network_type_banner_url`, `network_type_reload_time_unit`, `network_text_encoding`) VALUES\n";
 
        // Load all entries
        while ($content = SQL_FETCHARRAY($result)) {
@@ -1926,7 +1966,7 @@ ORDER BY
                }
 
                // Add more
-               $SQL .= ",'" . $content['network_type_reload_time_unit'] . "'),\n";
+               $SQL .= ",'" . $content['network_type_reload_time_unit'] . "','" . $content['network_text_encoding'] . "'),\n";
        } // END - while
 
        // Remove last commata and close braces
@@ -1966,7 +2006,7 @@ ORDER BY
                ), __FUNCTION__, __LINE__);
 
        // Start an empty SQL query
-       $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`network_request_param_key`,`network_request_param_value`,`network_request_param_default`) VALUES\n";
+       $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `network_request_param_key`, `network_request_param_value`, `network_request_param_default`) VALUES\n";
 
        // Load all entries
        while ($content = SQL_FETCHARRAY($result)) {
@@ -2022,7 +2062,7 @@ ORDER BY
                ), __FUNCTION__, __LINE__);
 
        // Start an empty SQL query
-       $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_vcheck_params` (`network_id`,`network_vcheck_param_key`,`network_vcheck_param_value`,`network_vcheck_param_default`) VALUES\n";
+       $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_vcheck_params` (`network_id`, `network_vcheck_param_key`, `network_vcheck_param_value`, `network_vcheck_param_default`) VALUES\n";
 
        // Load all entries
        while ($content = SQL_FETCHARRAY($result)) {
@@ -2078,7 +2118,7 @@ ORDER BY
                ), __FUNCTION__, __LINE__);
 
        // Start an empty SQL query
-       $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`,`network_type_id`,`network_array_index`,`sort`) VALUES\n";
+       $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES\n";
 
        // Load all entries
        while ($content = SQL_FETCHARRAY($result)) {