Fixes for wrong tewmplate names, new network added:

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

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index b9554d66640b86977a6fd5c4bfad273389e72980..ae47871fa8b25d058b8dfc3603d721258facfe6f 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -502,9 +502,9 @@ function generateNetworkTypeOptions ($id) {
        if (is_array($id)) $id = '';
 
        // Is this cached?
-       if (!isset($GLOBALS['network_type_options'][$id])) {
+       if (!isset($GLOBALS[__FUNCTION__][$id])) {
                // Generate output and cache it
-               $GLOBALS['network_type_options'][$id] = generateOptionList(
+               $GLOBALS[__FUNCTION__][$id] = generateOptionList(
                        'network_types',
                        'network_type_id',
                        'network_type_handle',
@@ -520,15 +520,65 @@ function generateNetworkTypeOptions ($id) {
        } // END - if
 
        // Return content
-       return $GLOBALS['network_type_options'][$id];
+       return $GLOBALS[__FUNCTION__][$id];
 }
 
-// Generator (somewhat getter) for request key options
-function generateNetworkRequestKeyOptions ($key) {
+// Generates an options list of all available (hard-coded) handlers
+function generateNetworkTypesAvailableOptions () {
        // Is it cached?
-       if (!isset($GLOBALS['network_request_param_key'][$key])) {
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Generate list
+               $GLOBALS[__FUNCTION__] = generateOptionList(
+                       '/ARRAY/',
+                       array(
+                               'banner',
+                               'banner_click',
+                               'banner_view',
+                               'button',
+                               'button_click',
+                               'button_view',
+                               'surfbar',
+                               'surfbar_click',
+                               'surfbar_view',
+                               'forcedbanner',
+                               'forcedtextlink',
+                               'textlink',
+                               'textlink_click',
+                               'textlink_view',
+                               'skybanner',
+                               'skybanner_click',
+                               'skybanner_view',
+                               'layer',
+                               'layer_click',
+                               'layer_view',
+                               'popup',
+                               'popdown',
+                               'textmail',
+                               'htmlmail',
+                               'lead',
+                               'sale',
+                               'payperactive',
+                               'pagepeel',
+                               'traffic'
+                       ),
+                       array(),
+                       '',
+                       '', '',
+                       $GLOBALS['network_types_disabled'],
+                       'translateNetworkTypeHandler'
+               );
+       } // END - if
+
+       // Return content
+       return $GLOBALS[__FUNCTION__];
+}
+
+// Generates an options list (somewhat getter) ofr request keys
+function generateNetworkRequestKeyOptions () {
+       // Is it cached?
+       if (!isset($GLOBALS[__FUNCTION__])) {
                // Generate and cache it
-               $GLOBALS['network_request_param_key'][$key] = generateOptionList(
+               $GLOBALS[__FUNCTION__] = generateOptionList(
                        '/ARRAY/',
                        array(
                                'id',
@@ -544,40 +594,27 @@ function generateNetworkRequestKeyOptions ($key) {
                                'reward',
                                'size',
                                'erotic',
-                               'extra'
+                               'extra',
+                               'country'
                        ),
-                       array(
-                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_ID--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_SID--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_HASH--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_PASSWORD--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_RELOAD--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_MAXIMUM_STAY--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_MINIMUM_STAY--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_CURRENCY--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_TYPE--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_REMAIN--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_REWARD--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_SIZE--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_EROTIC--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_EXTRA--}'
-                       ),
-                       $key,
+                       array(),
+                       '',
                        '', '',
-                       $GLOBALS['network_params_disabled']
+                       $GLOBALS['network_params_disabled'],
+                       'translateNetworkRequestParameter'
                );
        } // END - if
 
        // Return content
-       return $GLOBALS['network_request_param_key'][$key];
+       return $GLOBALS[__FUNCTION__];
 }
 
 // Generator (somewhat getter) for (return) array translation
 function generateNetworkTranslationOptions ($default = '') {
        // Is it cached?
-       if (!isset($GLOBALS['network_translation'][$default])) {
+       if (!isset($GLOBALS[__FUNCTION__][$default])) {
                // Generate and cache it
-               $GLOBALS['network_translation'][$default] = generateOptionList(
+               $GLOBALS[__FUNCTION__][$default] = generateOptionList(
                        'network_translations',
                        'network_translation_id',
                        'network_translation_name',
@@ -590,15 +627,15 @@ function generateNetworkTranslationOptions ($default = '') {
        } // END - if
 
        // Return content
-       return $GLOBALS['network_translation'][$default];
+       return $GLOBALS[__FUNCTION__][$default];
 }
 
 // Generates an option list of request types
 function generateNetworkRequestTypeOptions ($default = '') {
        // Do we have cache?
-       if (!isset($GLOBALS['network_request_type'][$default])) {
+       if (!isset($GLOBALS[__FUNCTION__][$default])) {
                // Generate the list
-               $GLOBALS['network_request_type'][$default] = generateOptionList(
+               $GLOBALS[__FUNCTION__][$default] = generateOptionList(
                        '/ARRAY/',
                        array(
                                'GET',
@@ -613,7 +650,7 @@ function generateNetworkRequestTypeOptions ($default = '') {
        } // END - if
 
        // Return cache
-       return $GLOBALS['network_request_type'][$default];
+       return $GLOBALS[__FUNCTION__][$default];
 }
 
 // Translates 'translate_name' for e.g. templates
@@ -629,9 +666,15 @@ function translateNetworkTypeHandler ($type) {
 }
 
 // Translates request type
-function translateNetworkRequestType ($name) {
+function translateNetworkRequestType ($type) {
        // Get the message id
-       return getMessage('ADMIN_NETWORK_REQUEST_TYPE_' . strtoupper($name) . '');
+       return getMessage('ADMIN_NETWORK_REQUEST_TYPE_' . strtoupper($type) . '');
+}
+
+// Translates request parameter
+function translateNetworkRequestParameter ($param) {
+       // Get the message id
+       return getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_' . strtoupper($param) . '');
 }
 
 // Translates API index
@@ -1193,7 +1236,7 @@ function doAdminNetworkProcessAddNetworkApiTranslation () {
        // Is the request parameter already used with given network?
        if (isNetworkApiTranslationValid(postRequestParameter('network_api_index'), postRequestParameter('network_type_id'), getRequestParameter('network'))) {
                // Already added
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_API_TRANSLATION_ALREADY_ADDED', postRequestParameter('request_param_key')));
+               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_API_TRANSLATION_ALREADY_ADDED', postRequestParameter('network_api_index')));
 
                // ... so abort here
                return false;
@@ -1206,14 +1249,14 @@ function doAdminNetworkProcessAddNetworkApiTranslation () {
        setPostRequestParameter('network_id', bigintval(getRequestParameter('network')));
 
        // Add sorting
-       setPostRequestParameter('sort', countSumTotalData(
+       setPostRequestParameter('sort', (countSumTotalData(
                postRequestParameter('network_id'),
                'network_api_translation',
                'network_api_id',
                'network_id',
                true,
                sprintf(" AND `network_type_id`=%s", bigintval(postRequestParameter('network_type_id')))
-       ));
+       ) + 1));
 
        // Add the whole request to database
        SQL_QUERY('INSERT INTO
@@ -1253,6 +1296,6 @@ function doExpressionNetwork ($data) {
        // Return it
        return $code;
 }
+
 // [EOF]
 ?>
-