X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fnetwork_functions.php;h=2a52309768c51b950fef9e855b15ce58e1e3fa72;hb=f2edf32502b2774dc17ef419a2e6a1c60e361c0a;hp=d90c329cae84e79d3be7237aaa22a45c677d5ccc;hpb=87874b31f053d626431da0d3602c41bca8870811;p=mailer.git diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php index d90c329cae..2a52309768 100644 --- a/inc/libs/network_functions.php +++ b/inc/libs/network_functions.php @@ -16,7 +16,7 @@ * $Author:: $ * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009 - 2011 by Mailer Developer Team * + * Copyright (c) 2009 - 2012 by Mailer Developer Team * * For more information visit: http://mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -55,7 +55,7 @@ function detectNetworkProcessForm () { // 'do' must be provided in URL if (!isGetRequestElementSet('do')) { // Not provided! - debug_report_bug(__FUNCTION__, __LINE__, 'No "do" has been provided. Please fix your templates.'); + reportBug(__FUNCTION__, __LINE__, 'No "do" has been provided. Please fix your templates.'); } // END - if // Default is invalid @@ -76,13 +76,13 @@ function detectNetworkProcessForm () { // Has the form being detected? if ($GLOBALS['network_form_name'] == 'invalid') { // Not supported - debug_report_bug(__FUNCTION__, __LINE__, 'POST form could not be detected.'); + reportBug(__FUNCTION__, __LINE__, 'POST form could not be detected.'); } // END - if } // Handle a (maybe) sent form here function doNetworkHandleForm () { - // Do we have a form sent? + // Is there a form sent? if (countRequestPost() > 0) { // Detect sent POST form detectNetworkProcessForm(); @@ -103,7 +103,7 @@ function doAdminNetworkProcessForm () { // Is the function valid? if (!function_exists($functionName)) { // Invalid function name - debug_report_bug(__FUNCTION__, __LINE__, 'Invalid do ' . getRequestElement('do') . ', function ' . $functionName .' does not exist.', false); + reportBug(__FUNCTION__, __LINE__, 'Invalid do ' . getRequestElement('do') . ', function ' . $functionName .' does not exist.', FALSE); } // END - if // Init global arrays @@ -113,23 +113,61 @@ function doAdminNetworkProcessForm () { call_user_func($functionName); } -// Checks wether the (short) network name is already used (valid) +// Checks whether the (short) network name is already used (valid) function isNetworkNameValid ($name) { - // Query for it - $result = SQL_QUERY_ESC("SELECT `network_id` FROM `{?_MYSQL_PREFIX?}_network_data` WHERE `network_short_name`='%s' LIMIT 1", - array($name), __FUNCTION__, __LINE__); + // Is there cache? + if (!isset($GLOBALS[__FUNCTION__][$name])) { + // Does it exist? + $GLOBALS[__FUNCTION__][$name] = (countSumTotalData($name, 'network_data', 'network_id', 'network_short_name', TRUE) == 1); + } // END - if - // Does it exist? - $isValid = (SQL_NUMROWS($result) == 1); + // Return result + return $GLOBALS[__FUNCTION__][$name]; +} - // Free result - SQL_FREERESULT($result); +// Checks whether the (short) named network is activated +function isNetworkActiveByShortName ($name) { + // Is there cache? + if (!isset($GLOBALS[__FUNCTION__][$name])) { + // Does it exist? + $GLOBALS[__FUNCTION__][$name] = ((isNetworkNameValid($name)) && (countSumTotalData($name, 'network_data', 'network_id', 'network_short_name', TRUE, " AND `network_active`='Y'") == 1)); + } // END - if // Return result - return $isValid; + return $GLOBALS[__FUNCTION__][$name]; } -// Checks wether the given network type is already used (valid) +// Checks whether the network by given id is activated +function isNetworkActiveById ($networkId) { + // Is there cache? + if (!isset($GLOBALS[__FUNCTION__][$networkId])) { + // Does it exist? + $GLOBALS[__FUNCTION__][$networkId] = (countSumTotalData(bigintval($networkId), 'network_data', 'network_id', 'network_id', TRUE, " AND `network_active`='Y'") == 1); + } // END - if + + // Return result + return $GLOBALS[__FUNCTION__][$networkId]; +} + +// "Getter" for 'network_activated' column depending on current administrator's expert setting +function getNetworkActivatedColumn ($whereAnd = 'WHERE', $table = '') { + // Is there cache? + if (!isset($GLOBALS[__FUNCTION__][$whereAnd][$table])) { + // Default is exclude deactivated networks + $GLOBALS[__FUNCTION__][$whereAnd][$table] = ' ' . $whereAnd . ' ' . $table . "`network_active`='Y'"; + + // Is the export setting on? + if (isAdminsExpertSettingEnabled()) { + // Then allow all networks + $GLOBALS[__FUNCTION__][$whereAnd][$table] = ''; + } // END - if + } // END - if + + // Return cache + return $GLOBALS[__FUNCTION__][$whereAnd][$table]; +} + +// Checks whether the given network type is already used (valid) function isNetworkTypeHandleValid ($type, $networkId) { // Query for it $result = SQL_QUERY_ESC("SELECT `network_type_id` FROM `{?_MYSQL_PREFIX?}_network_types` WHERE `network_id`=%s AND `network_type_handler`='%s' LIMIT 1", @@ -148,7 +186,7 @@ function isNetworkTypeHandleValid ($type, $networkId) { return $isValid; } -// Checks wether the given network request parameter is already used (valid) +// Checks whether the given network request parameter is already used (valid) function isNetworkRequestElementValid ($key, $type, $networkId) { // Query for it $result = SQL_QUERY_ESC("SELECT `network_request_param_id` FROM `{?_MYSQL_PREFIX?}_network_request_params` WHERE `network_id`=%s AND `network_type_id`=%s AND `network_request_param_key`='%s' LIMIT 1", @@ -168,7 +206,7 @@ function isNetworkRequestElementValid ($key, $type, $networkId) { return $isValid; } -// Checks wether the given vcheck request parameter is already used (valid) +// Checks whether the given vcheck request parameter is already used (valid) function isNetworkVcheckElementValid ($key, $networkId) { // Query for it $result = SQL_QUERY_ESC("SELECT `network_vcheck_param_id` FROM `{?_MYSQL_PREFIX?}_network_vcheck_params` WHERE `network_id`=%s AND `network_vcheck_param_key`='%s' LIMIT 1", @@ -187,7 +225,7 @@ function isNetworkVcheckElementValid ($key, $networkId) { return $isValid; } -// Checks wether the given network API array translation +// Checks whether the given network API array translation function isNetworkArrayTranslationValid ($key, $type, $networkId) { // Query for it $result = SQL_QUERY_ESC("SELECT `network_array_id` FROM `{?_MYSQL_PREFIX?}_network_array_translation` WHERE `network_id`=%s AND `network_type_id`=%s AND `network_array_index`='%s' LIMIT 1", @@ -212,8 +250,11 @@ function getNetworkDataById ($networkId, $column = '') { // Ids lower one are not accepted if ($networkId < 1) { // Not good, should be fixed - debug_report_bug(__FUNCTION__, __LINE__, 'Network id ' . $networkId . ' is smaller than 1.'); - } // END - if + reportBug(__FUNCTION__, __LINE__, 'Network id ' . $networkId . ' is smaller than 1.'); + } elseif ((!isNetworkActiveById($networkId)) && (!isAdminsExpertSettingEnabled())) { + // Do not load inactive network data + reportBug(__FUNCTION__, __LINE__, 'Network id ' . $networkId . ' is not active.'); + } // Set current network id setCurrentNetworkId($networkId); @@ -224,7 +265,7 @@ function getNetworkDataById ($networkId, $column = '') { $GLOBALS['network_data'][$networkId] = array(); // Query for the network data - $result = SQL_QUERY_ESC("SELECT + $result = SQL_QUERY_ESC('SELECT `network_id`, `network_short_name`, `network_title`, @@ -239,10 +280,10 @@ FROM `{?_MYSQL_PREFIX?}_network_data` WHERE `network_id`=%s -LIMIT 1", +LIMIT 1', array(bigintval($networkId)), __FUNCTION__, __LINE__); - // Do we have an entry? + // Is there an entry? if (SQL_NUMROWS($result) == 1) { // Then get it $GLOBALS['network_data'][$networkId] = SQL_FETCHARRAY($result); @@ -253,13 +294,16 @@ LIMIT 1", } // END - if // Return result - if (empty($column)) { + if ((empty($column)) && (isset($GLOBALS['network_data'][$networkId]))) { // Return array return $GLOBALS['network_data'][$networkId]; - } else { + } elseif (isset($GLOBALS['network_data'][$networkId][$column])) { // Return column return $GLOBALS['network_data'][$networkId][$column]; } + + // Return NULL + return NULL; } // "Getter" for a network's data by provided type id number @@ -267,8 +311,11 @@ function getNetworkDataByTypeId ($networkId, $column = '') { // Ids lower one are not accepted if ($networkId < 1) { // Not good, should be fixed - debug_report_bug(__FUNCTION__, __LINE__, 'Network type id ' . $networkId . ' is smaller than 1.'); - } // END - if + reportBug(__FUNCTION__, __LINE__, 'Network type id ' . $networkId . ' is smaller than 1.'); + } elseif ((!isNetworkActiveById($networkId)) && (!isAdminsExpertSettingEnabled())) { + // Do not load inactive network data + reportBug(__FUNCTION__, __LINE__, 'Network id ' . $networkId . ' is not active.'); + } // Set current network id setCurrentNetworkId($networkId); @@ -279,7 +326,7 @@ function getNetworkDataByTypeId ($networkId, $column = '') { $GLOBALS['network_data'][$networkId] = array(); // Query for the network data - $result = SQL_QUERY_ESC("SELECT + $result = SQL_QUERY_ESC('SELECT d.`network_id`, d.`network_short_name`, d.`network_title`, @@ -293,7 +340,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 @@ -302,10 +350,10 @@ ON d.`network_id`=t.`network_id` WHERE t.`network_type_id`=%s -LIMIT 1", +LIMIT 1', array(bigintval($networkId)), __FUNCTION__, __LINE__); - // Do we have an entry? + // Is there an entry? if (SQL_NUMROWS($result) == 1) { // Then get it $GLOBALS['network_data'][$networkId] = SQL_FETCHARRAY($result); @@ -326,15 +374,15 @@ LIMIT 1", } // "Getter" for a network type data by provided id number -function getNetworkTypeDataById ($networkId) { +function getNetworkTypeDataById ($networkTypeId) { // Ids lower one are not accepted - if ($networkId < 1) { + if ($networkTypeId < 1) { // Not good, should be fixed - debug_report_bug(__FUNCTION__, __LINE__, 'Network type id ' . $networkId . ' is smaller than 1.'); + reportBug(__FUNCTION__, __LINE__, 'Network type id ' . $networkTypeId . ' is smaller than 1.'); } // END - if // By default we have no data - $GLOBALS['network_type_data'][$networkId] = array(); + $GLOBALS['network_type_data'][$networkTypeId] = array(); // Query for the network data $result = SQL_QUERY_ESC('SELECT @@ -349,27 +397,27 @@ FROM WHERE `network_type_id`=%s LIMIT 1', - array(bigintval($networkId)), __FUNCTION__, __LINE__); + array(bigintval($networkTypeId)), __FUNCTION__, __LINE__); - // Do we have an entry? + // Is there an entry? if (SQL_NUMROWS($result) == 1) { // Then get it - $GLOBALS['network_type_data'][$networkId] = SQL_FETCHARRAY($result); + $GLOBALS['network_type_data'][$networkTypeId] = SQL_FETCHARRAY($result); } // END - if // Free result SQL_FREERESULT($result); // Return result - return $GLOBALS['network_type_data'][$networkId]; + return $GLOBALS['network_type_data'][$networkTypeId]; } // "Getter" for a network request parameter data by provided id number -function getNetworkRequestParamsDataById ($networkId) { +function getNetworkRequestParamsDataById ($networkRequestId) { // Ids lower one are not accepted - if ($networkId < 1) { + if ($networkRequestId < 1) { // Not good, should be fixed - debug_report_bug(__FUNCTION__, __LINE__, 'Network request parameter id ' . $networkId . ' is smaller than 1.'); + reportBug(__FUNCTION__, __LINE__, 'Network request parameter id ' . $networkRequestId . ' is smaller than 1.'); } // END - if // By default we have no data @@ -388,9 +436,9 @@ FROM WHERE `network_request_param_id`=%s LIMIT 1', - array(bigintval($networkId)), __FUNCTION__, __LINE__); + array(bigintval($networkRequestId)), __FUNCTION__, __LINE__); - // Do we have an entry? + // Is there an entry? if (SQL_NUMROWS($result) == 1) { // Then get it $networkRequestData = SQL_FETCHARRAY($result); @@ -403,50 +451,100 @@ LIMIT 1', return $networkRequestData; } +// "Getter" for a network array translation data by provided id number +function getNetworkArrayTranslationsDataById ($networkTranslationId) { + // Ids lower one are not accepted + if ($networkTranslationId < 1) { + // Not good, should be fixed + reportBug(__FUNCTION__, __LINE__, 'Network array translation id ' . $networkTranslationId . ' is smaller than 1.'); + } // END - if + + // By default we have no data + $networkTranslationData = array(); + + // Query for the network data + $result = SQL_QUERY_ESC('SELECT + `network_array_id`, + `network_id`, + `network_type_id`, + `network_array_index`, + `network_array_sort` +FROM + `{?_MYSQL_PREFIX?}_network_array_translation` +WHERE + `network_array_id`=%s +LIMIT 1', + array(bigintval($networkTranslationId)), __FUNCTION__, __LINE__); + + // Is there an entry? + if (SQL_NUMROWS($result) == 1) { + // Then get it + $networkTranslationData = SQL_FETCHARRAY($result); + } // END - if + + // Free result + SQL_FREERESULT($result); + + // Return result + return $networkTranslationData; +} + // Updates given network (id) with data from array function doNetworkUpdateDataByArray ($networkId, $networkData) { // Ids lower one are not accepted if ($networkId < 1) { // Not good, should be fixed - debug_report_bug(__FUNCTION__, __LINE__, 'Network id ' . $networkId . ' is smaller than 1.'); + reportBug(__FUNCTION__, __LINE__, 'Network id ' . $networkId . ' is smaller than 1.'); } // END - if // Just call our inner method - return adminSaveSettings($networkData, '_network_data', sprintf("`network_id`=%s", bigintval($networkId)), array(), false, false); + return adminSaveSettings($networkData, '_network_data', sprintf("`network_id`=%s", bigintval($networkId)), array(), FALSE, FALSE); } // Updates given network type handler (id) with data from array -function doNetworkUpdateTypeByArray ($networkId, $networkTypeData) { +function doNetworkUpdateTypeByArray ($networkTypeId, $networkTypeData) { // Ids lower one are not accepted - if ($networkId < 1) { + if ($networkTypeId < 1) { // Not good, should be fixed - debug_report_bug(__FUNCTION__, __LINE__, 'Network type handler id ' . $networkId . ' is smaller than 1.'); + reportBug(__FUNCTION__, __LINE__, 'Network type handler id ' . $networkTypeId . ' is smaller than 1.'); } // END - if // Just call our inner method - return adminSaveSettings($networkTypeData, '_network_types', sprintf("`network_type_id`=%s", bigintval($networkId)), array(), false, false); + return adminSaveSettings($networkTypeData, '_network_types', sprintf("`network_type_id`=%s", bigintval($networkTypeId)), array(), FALSE, FALSE); } // Updates given network request parameters (id) with data from array -function doNetworkUpdateParamsByArray ($networkId, $networkParamData) { +function doNetworkUpdateParamsByArray ($networkParamsId, $networkParamsData) { // Ids lower one are not accepted - if ($networkId < 1) { + if ($networkParamsId < 1) { // Not good, should be fixed - debug_report_bug(__FUNCTION__, __LINE__, 'Network request parameter id ' . $networkId . ' is smaller than 1.'); + reportBug(__FUNCTION__, __LINE__, 'Network request parameter id ' . $networkParamsId . ' is smaller than 1.'); } // END - if // Just call our inner method - return adminSaveSettings($networkParamData, '_network_request_params', sprintf("`network_request_param_id`=%s", bigintval($networkId)), array(), false, false); + return adminSaveSettings($networkParamsData, '_network_request_params', sprintf("`network_request_param_id`=%s", bigintval($networkParamsId)), array(), FALSE, FALSE); +} + +// Updates given network array translations (id) with data from array +function doNetworkUpdateArrayTranslationsByArray ($networkTranslationsId, $networkTranslationsData) { + // Ids lower one are not accepted + if ($networkTranslationsId < 1) { + // Not good, should be fixed + reportBug(__FUNCTION__, __LINE__, 'Network request parameter id ' . $networkTranslationsId . ' is smaller than 1.'); + } // END - if + + // Just call our inner method + return adminSaveSettings($networkTranslationsData, '_network_array_translation', sprintf("`network_array_id`=%s", bigintval($networkTranslationsId)), array(), FALSE, FALSE); } // Removes given network entry -function doAdminRemoveNetworkEntry ($table, $column, $networkId, $limit = 1) { +function doAdminRemoveNetworkEntry ($table, $column, $id, $limit = 1) { // Remove the entry SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_network_%s` WHERE `%s`=%s LIMIT %s", array( $table, $column, - $networkId, + $id, $limit ), __FUNCTION__, __LINE__); @@ -460,18 +558,17 @@ function generateAdminNetworkList () { $content = ''; // Query for all networks - $result = SQL_QUERY("SELECT + $result = SQL_QUERY('SELECT `network_id`, `network_short_name`, `network_title` FROM `{?_MYSQL_PREFIX?}_network_data` -WHERE - `network_active`='Y' +' . getNetworkActivatedColumn() . ' ORDER BY - `network_short_name` ASC", __FUNCTION__, __LINE__); + `network_short_name` ASC', __FUNCTION__, __LINE__); - // Do we have entries? + // Are there entries? if (!SQL_HASZERONUMS($result)) { // List all entries $rows = array(); @@ -487,7 +584,7 @@ ORDER BY $content = generateSelectionBoxFromArray($rows, 'network_id', 'network_id', '', '', 'network'); } else { // Nothing selected - $content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}'); + $content = loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_ENTRIES_404--}'); } // Free the result @@ -510,13 +607,14 @@ FROM `{?_MYSQL_PREFIX?}_network_types` WHERE `network_id`=%s + ' . getNetworkActivatedColumn('AND') . ' ORDER BY `network_type_handler` ASC', array( bigintval($networkId) ), __FUNCTION__, __LINE__); - // Do we have entries? + // Are there entries? if (!SQL_HASZERONUMS($result)) { // List all entries $rows = array(); @@ -532,7 +630,7 @@ ORDER BY $content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id'); } else { // Nothing selected - $content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}'); + $content = loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_ENTRIES_404--}'); } // Free the result @@ -548,7 +646,7 @@ function generateAdminDistinctNetworkTypeList () { $content = ''; // Query all types of this network - $result = SQL_QUERY("SELECT + $result = SQL_QUERY('SELECT t.`network_type_id`, t.`network_type_handler`, d.`network_title` @@ -558,13 +656,12 @@ LEFT JOIN `{?_MYSQL_PREFIX?}_network_data` AS d ON t.`network_id`=d.`network_id` -WHERE - d.`network_active`='Y' +' . getNetworkActivatedColumn('WHERE', 'd') . ' ORDER BY d.`network_short_name` ASC, - t.`network_type_handler` ASC", __FUNCTION__, __LINE__); + t.`network_type_handler` ASC', __FUNCTION__, __LINE__); - // Do we have entries? + // Are there entries? if (!SQL_HASZERONUMS($result)) { // List all entries $rows = array(); @@ -580,7 +677,7 @@ ORDER BY $content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id', '', '_title'); } else { // Nothing selected - $content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}'); + $content = loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_ENTRIES_404--}'); } // Free the result @@ -595,20 +692,21 @@ ORDER BY function generateNetworkTypeOptions ($networkId) { // Is this an array, then we just came back from edit/delete actions if (is_array($networkId)) { + // Set it as empty string $networkId = ''; } // END - if // Is this cached? if (!isset($GLOBALS[__FUNCTION__][$networkId])) { // Generate output and cache it - $GLOBALS[__FUNCTION__][$networkId] = generateOptionList( + $GLOBALS[__FUNCTION__][$networkId] = generateOptions( 'network_types', 'network_type_id', 'network_type_handler', $networkId, '', sprintf( - "WHERE `network_id`=%s", + "WHERE `network_id`=%s" . getNetworkActivatedColumn('AND'), bigintval(getRequestElement('network_id')) ), '', @@ -625,7 +723,7 @@ function generateNetworkTypesAvailableOptions ($defaultType = NULL) { // Is it cached? if (!isset($GLOBALS[__FUNCTION__][$defaultType])) { // Generate list - $GLOBALS[__FUNCTION__][$defaultType] = generateOptionList( + $GLOBALS[__FUNCTION__][$defaultType] = generateOptions( '/ARRAY/', array( 'banner', @@ -656,7 +754,10 @@ function generateNetworkTypesAvailableOptions ($defaultType = NULL) { 'sale', 'payperactive', 'pagepeel', - 'traffic' + 'traffic', + 'signature', + 'signature_click', + 'signature_view', ), array(), $defaultType, @@ -670,15 +771,38 @@ 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? if (!isset($GLOBALS[__FUNCTION__])) { // Generate and cache it - $GLOBALS[__FUNCTION__] = generateOptionList( + $GLOBALS[__FUNCTION__] = generateOptions( '/ARRAY/', array( - 'id', + 'affiliate_id', 'sid', 'hash', 'password', @@ -711,7 +835,7 @@ function generateNetworkVcheckKeyOptions () { // Is it cached? if (!isset($GLOBALS[__FUNCTION__])) { // Generate and cache it - $GLOBALS[__FUNCTION__] = generateOptionList( + $GLOBALS[__FUNCTION__] = generateOptions( '/ARRAY/', array( 'network_key', @@ -745,14 +869,14 @@ function generateNetworkTranslationOptions ($default = '') { // Is it cached? if (!isset($GLOBALS[__FUNCTION__][$default])) { // Generate and cache it - $GLOBALS[__FUNCTION__][$default] = generateOptionList( + $GLOBALS[__FUNCTION__][$default] = generateOptions( 'network_translations', 'network_translation_id', 'network_translation_name', $default, '', '', - $GLOBALS['network_translation_disabled'], + $GLOBALS['network_array_translation_disabled'], 'translateNetworkTranslationName' ); } // END - if @@ -763,10 +887,10 @@ function generateNetworkTranslationOptions ($default = '') { // Generates an option list of request types function generateNetworkRequestTypeOptions ($default = '') { - // Do we have cache? + // Is there cache? if (!isset($GLOBALS[__FUNCTION__][$default])) { // Generate the list - $GLOBALS[__FUNCTION__][$default] = generateOptionList( + $GLOBALS[__FUNCTION__][$default] = generateOptions( '/ARRAY/', array( 'GET', @@ -786,10 +910,10 @@ function generateNetworkRequestTypeOptions ($default = '') { // Generates an option list of network_api_active function generateNetworkApiActiveOptions ($default = '') { - // Do we have cache? + // Is there cache? if (!isset($GLOBALS[__FUNCTION__][$default])) { // Generate the list - $GLOBALS[__FUNCTION__][$default] = generateYesNoOptionList($default); + $GLOBALS[__FUNCTION__][$default] = generateYesNoOptions($default); } // END - if // Return cache @@ -803,8 +927,8 @@ function translateNetworkTranslationName ($name) { // Is the message id there? if (!isMessageIdValid($messageId)) { - // Not valid type - debug_report_bug(__FUNCTION__, __LINE__, 'type=' . $type . ' is invalid.'); + // Not valid name + reportBug(__FUNCTION__, __LINE__, 'name=' . $name . ' is invalid.'); } // END - if // Return message id @@ -819,7 +943,7 @@ function translateNetworkTypeHandler ($type) { // Is the message id there? if (!isMessageIdValid($messageId)) { // Not valid type - debug_report_bug(__FUNCTION__, __LINE__, 'type=' . $type . ' is invalid.'); + reportBug(__FUNCTION__, __LINE__, 'type=' . $type . ' is invalid.'); } // END - if // Return message id @@ -834,7 +958,7 @@ function translateNetworkRequestType ($type) { // Is the message id there? if (!isMessageIdValid($messageId)) { // Not valid type - debug_report_bug(__FUNCTION__, __LINE__, 'type=' . $type . ' is invalid.'); + reportBug(__FUNCTION__, __LINE__, 'type=' . $type . ' is invalid.'); } // END - if // Return message id @@ -849,7 +973,7 @@ function translateNetworkRequestParameterKey ($param) { // Is the message id there? if (!isMessageIdValid($messageId)) { // Not valid param - debug_report_bug(__FUNCTION__, __LINE__, 'param=' . $param . ' is invalid.'); + reportBug(__FUNCTION__, __LINE__, 'param=' . $param . ' is invalid.'); } // END - if // Return message id @@ -864,7 +988,22 @@ function translateNetworkVcheckParameterKey ($param) { // Is the message id there? if (!isMessageIdValid($messageId)) { // Not valid param - debug_report_bug(__FUNCTION__, __LINE__, 'param=' . $param . ' is invalid.'); + reportBug(__FUNCTION__, __LINE__, 'param=' . $param . ' is invalid.'); + } // END - if + + // Return message id + 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 @@ -873,7 +1012,7 @@ function translateNetworkVcheckParameterKey ($param) { // Translates API index function translateNetworkApiIndex ($index) { - // Do we have cache? + // Is there cache? if (!isset($GLOBALS['network_array_index'])) { // Get an array of all API array indexes $GLOBALS['network_array_index'] = array(); @@ -890,9 +1029,9 @@ INNER JOIN ON `network_array_index`=`network_translation_id` ORDER BY - `sort` ASC', __FUNCTION__, __LINE__); + `network_array_sort` ASC', __FUNCTION__, __LINE__); - // Do we have entries? + // Are there entries? if (!SQL_HASZERONUMS($result)) { // Get all entries while ($row = SQL_FETCHARRAY($result)) { @@ -920,13 +1059,16 @@ ORDER BY // Translates network API configuration status (see function isNetworkApiConfigured()) by given id function translateNetworkApiConfiguredStatusById ($networkId) { - // Do we have cache? + // Is there cache? if (!isset($GLOBALS[__FUNCTION__][$networkId])) { // By default it is not configured $GLOBALS[__FUNCTION__][$networkId] = '{--ADMIN_NETWORK_API_NOT_CONFIGURED--}'; // So is it configured? - if (isNetworkApiConfigured($networkId)) { + if (!isNetworkActiveById($networkId)) { + // Network is not active + $GLOBALS[__FUNCTION__][$networkId] = '{--ADMIN_NETWORK_API_NOT_ACTIVE--}'; + } elseif (isNetworkApiConfigured($networkId)) { // Yes, it is $GLOBALS[__FUNCTION__][$networkId] = '{--ADMIN_NETWORK_API_CONFIGURED--}'; } // END - if @@ -938,7 +1080,7 @@ function translateNetworkApiConfiguredStatusById ($networkId) { // Checks if the given network is configured by looking its API configuration entry up function isNetworkApiConfigured ($networkId) { - // Do we have cache? + // Is there cache? if (!isset($GLOBALS[__FUNCTION__][$networkId])) { // Check for an entry in network_api_config $GLOBALS[__FUNCTION__][$networkId] = (countSumTotalData( @@ -954,9 +1096,9 @@ function isNetworkApiConfigured ($networkId) { return $GLOBALS[__FUNCTION__][$networkId]; } -// Checks wether the given network type handler is configured +// Checks whether the given network type handler is configured function isNetworkTypeHandlerConfigured ($networkId, $networkTypeId) { - // Do we have cache? + // Is there cache? if (!isset($GLOBALS[__FUNCTION__][$networkId][$networkTypeId])) { // Determine it $GLOBALS[__FUNCTION__][$networkId][$networkTypeId] = (countSumTotalData( @@ -975,8 +1117,8 @@ function isNetworkTypeHandlerConfigured ($networkId, $networkTypeId) { // Handles the network-payment-check request function handleNetworkPaymentCheckRequest () { - // @TODO Implement this function - debug_report_bug(__FUNCTION__, __LINE__, 'Not yet implemented.'); + // @TODO Implement this function, don't forget to set HTTP status back to '200 OK' if everything went fine + reportBug(__FUNCTION__, __LINE__, 'Not yet implemented.'); } //------------------------------------------------------------------------------ @@ -988,9 +1130,13 @@ function doAdminNetworkProcessAddNetwork () { // We can say here, the form is sent, so check if the network is already added if (isNetworkNameValid(postRequestElement('network_short_name'))) { // Already there - loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_ALREADY_ADDED=' . postRequestElement('network_short_name') . '%}'); - return false; - } // END - if + loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_ALREADY_ADDED=' . postRequestElement('network_short_name') . '%}'); + return FALSE; + } elseif (!isNetworkActiveByShortName(postRequestElement('network_short_name'))) { + // Network is not active + loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_NOT_ACTIVE=' . postRequestElement('network_short_name') . '%}'); + return FALSE; + } // Remove the 'ok' part unsetPostRequestElement('ok'); @@ -1004,16 +1150,16 @@ function doAdminNetworkProcessAddNetwork () { // Output message if (!SQL_HASZEROAFFECTED()) { // Successfully added - loadTemplate('admin_network_added', false, postRequestArray()); + loadTemplate('admin_network_added', FALSE, postRequestArray()); } else { // Not added - loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_DATA_NOT_ADDED=' . postRequestElement('network_short_name') . '%}'); + loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_DATA_NOT_ADDED=' . postRequestElement('network_short_name') . '%}'); } } // Displays selected networks for editing function doAdminNetworkProcessHandleNetworks () { - // Do we have selections? + // Is there selections? if (ifPostContainsSelections()) { // Something has been selected, so start displaying one by one $OUT = ''; @@ -1023,10 +1169,10 @@ function doAdminNetworkProcessHandleNetworks () { // Load this network's data $networkData = getNetworkDataById($networkId); - // Do we have found the network? + // Is there found the network? if (count($networkData) > 0) { // Add row template with given form name - $OUT .= loadTemplate('admin_' . $GLOBALS['network_form_name'] . '_networks_row', true, $networkData); + $OUT .= loadTemplate('admin_' . $GLOBALS['network_form_name'] . '_networks_row', TRUE, $networkData); } // END - if } // END - if } // END - foreach @@ -1034,20 +1180,20 @@ function doAdminNetworkProcessHandleNetworks () { // If we have no rows, we don't need to display the edit form if (!empty($OUT)) { // Output main template - loadTemplate('admin_' . $GLOBALS['network_form_name'] . '_networks', false, $OUT); + loadTemplate('admin_' . $GLOBALS['network_form_name'] . '_networks', FALSE, $OUT); // Don't display the list/add new form - $GLOBALS['network_display'] = false; + $GLOBALS['network_display'] = FALSE; } else { // Nothing selected/found - loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_FOUND--}'); + loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_NOTHING_FOUND--}'); } } // END - if } // Handle network type form function doAdminNetworkProcessHandleNetworkTypes () { - // Do we have selections? + // Is there selections? if (ifPostContainsSelections()) { // Load network data $networkData = getNetworkDataById(getRequestElement('network_id')); @@ -1060,17 +1206,17 @@ function doAdminNetworkProcessHandleNetworkTypes () { // Load this network's data $networkTypeData = getNetworkTypeDataById($networkId); - // Do we have found the network? + // Is there found the network? if (count($networkTypeData) > 0) { if (isFormSent('edit')) { // Add row template for deleting - $OUT .= loadTemplate('admin_edit_network_types_row', true, $networkTypeData); + $OUT .= loadTemplate('admin_edit_network_types_row', TRUE, $networkTypeData); } elseif (isFormSent('delete')) { // Add row template for deleting - $OUT .= loadTemplate('admin_delete_network_types_row', true, $networkTypeData); + $OUT .= loadTemplate('admin_delete_network_types_row', TRUE, $networkTypeData); } else { // Problem! - debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.'); + reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.'); } } // END - if } // END - if @@ -1080,26 +1226,26 @@ function doAdminNetworkProcessHandleNetworkTypes () { if (!empty($OUT)) { // Output main template if (isFormSent('edit')) { - loadTemplate('admin_edit_network_types', false, $OUT); + loadTemplate('admin_edit_network_types', FALSE, $OUT); } elseif (isFormSent('delete')) { - loadTemplate('admin_delete_network_types', false, $OUT); + loadTemplate('admin_delete_network_types', FALSE, $OUT); } else { // Problem! - debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.'); + reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.'); } // Don't display the list/add new form - $GLOBALS['network_display'] = false; + $GLOBALS['network_display'] = FALSE; } else { // Nothing selected/found - loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_FOUND--}'); + loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_FOUND--}'); } } // END - if } // Handle network request parameter form function doAdminNetworkProcessHandleRequestParams () { - // Do we have selections? + // Is there selections? if (ifPostContainsSelections()) { // Init cache array $GLOBALS['network_request_params_disabled'] = array(); @@ -1115,20 +1261,20 @@ function doAdminNetworkProcessHandleRequestParams () { // Load this network's data $networkRequestData = getNetworkRequestParamsDataById($networkId); - // Do we have found the network? + // Is there found the network? if (count($networkRequestData) > 0) { if (isFormSent('edit')) { // Add row template for deleting - $OUT .= loadTemplate('admin_edit_network_request_params_row', true, $networkRequestData); + $OUT .= loadTemplate('admin_edit_network_request_params_row', TRUE, $networkRequestData); } elseif (isFormSent('delete')) { // Get type data $networkRequestData['network_type_data'] = getNetworkTypeDataById($networkRequestData['network_type_id']); // Add row template for deleting - $OUT .= loadTemplate('admin_delete_network_request_params_row', true, $networkRequestData); + $OUT .= loadTemplate('admin_delete_network_request_params_row', TRUE, $networkRequestData); } else { // Problem! - debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.'); + reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.'); } } // END - if } // END - if @@ -1138,26 +1284,26 @@ function doAdminNetworkProcessHandleRequestParams () { if (!empty($OUT)) { // Output main template if (isFormSent('edit')) { - loadTemplate('admin_edit_network_request_params', false, $OUT); + loadTemplate('admin_edit_network_request_params', FALSE, $OUT); } elseif (isFormSent('delete')) { - loadTemplate('admin_delete_network_request_params', false, $OUT); + loadTemplate('admin_delete_network_request_params', FALSE, $OUT); } else { // Problem! - debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.'); + reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.'); } // Don't display the list/add new form - $GLOBALS['network_display'] = false; + $GLOBALS['network_display'] = FALSE; } else { // Nothing selected/found - loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}'); + loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}'); } } // END - if } // Changes given networks function doAdminNetworkProcessChangeNetworks () { - // Do we have selections? + // Is there selections? if (ifPostContainsSelections()) { // By default nothing is updated $updated = 0; @@ -1176,10 +1322,10 @@ function doAdminNetworkProcessChangeNetworks () { continue; } // END - if - // Do we have this enty? + // Is there this enty? if (!isset($entry[$networkId])) { // Not found, needs fixing - debug_report_bug(__FUNCTION__, __LINE__, 'No entry in key=' . $key . ', id=' . $networkId . ' found.'); + reportBug(__FUNCTION__, __LINE__, 'No entry in key=' . $key . ', id=' . $networkId . ' found.'); } // END - if // Add this entry @@ -1191,20 +1337,20 @@ function doAdminNetworkProcessChangeNetworks () { } // END - if } // END - foreach - // Do we have updates? + // Is there updates? if ($updated > 0) { // Updates done displayMessage('{%message,ADMIN_NETWORK_UPDATED=' . $updated . '%}'); } else { // Nothing changed - loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_CHANGED--}'); + loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_NOTHING_CHANGED--}'); } } // END - if } // Removes given networks function doAdminNetworkProcessRemoveNetworks () { - // Do we have selections? + // Is there selections? if (ifPostContainsSelections()) { // By default nothing is removed $removed = 0; @@ -1218,13 +1364,13 @@ function doAdminNetworkProcessRemoveNetworks () { } // END - if } // END - foreach - // Do we have removes? + // Is there removes? if ($removed > 0) { // Removals done displayMessage('{%message,ADMIN_NETWORK_REMOVED=' . $removed . '%}'); } else { // Nothing removed - loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_REMOVED--}'); + loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_NOTHING_REMOVED--}'); } } // END - if } @@ -1234,10 +1380,10 @@ function doAdminNetworkProcessAddNetworkType () { // Is the network type handle already used with given network? if (isNetworkTypeHandleValid(postRequestElement('network_type_handler'), getRequestElement('network_id'))) { // Already added - loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPE_HANDLER_ALREADY_ADDED=' . postRequestElement('network_type_handler') . '%}'); + loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_TYPE_HANDLER_ALREADY_ADDED=' . postRequestElement('network_type_handler') . '%}'); // ... so abort here - return false; + return FALSE; } // END - if // Remove the 'ok' part @@ -1258,16 +1404,16 @@ function doAdminNetworkProcessAddNetworkType () { // Output message if (!SQL_HASZEROAFFECTED()) { // Successfully added - loadTemplate('admin_network_type_added', false, postRequestArray()); + loadTemplate('admin_network_type_added', FALSE, postRequestArray()); } else { // Not added - loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPE_HANDLER_NOT_ADDED=' . postRequestElement('network_type_handler') . '%}'); + loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_TYPE_HANDLER_NOT_ADDED=' . postRequestElement('network_type_handler') . '%}'); } } // Changes given network type handlers function doAdminNetworkProcessChangeHandlerTypes () { - // Do we have selections? + // Is there selections? if (ifPostContainsSelections()) { // By default nothing is updated $updated = 0; @@ -1286,10 +1432,10 @@ function doAdminNetworkProcessChangeHandlerTypes () { continue; } // END - if - // Do we have this enty? + // Is there this enty? if (!isset($entry[$networkId])) { // Not found, needs fixing - debug_report_bug(__FUNCTION__, __LINE__, 'No entry in key=' . $key . ', id=' . $networkId . ' found.'); + reportBug(__FUNCTION__, __LINE__, 'No entry in key=' . $key . ', id=' . $networkId . ' found.'); } // END - if // Fix empty network_type_banner_url to NULL @@ -1307,20 +1453,20 @@ function doAdminNetworkProcessChangeHandlerTypes () { } // END - if } // END - foreach - // Do we have updates? + // Is there updates? if ($updated > 0) { // Updates done displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_UPDATED=' . $updated . '%}'); } else { // Nothing changed - loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_CHANGED--}'); + loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_CHANGED--}'); } } // END - if } // Changes given network request parameters function doAdminNetworkProcessChangeRequestParams () { - // Do we have selections? + // Is there selections? if (ifPostContainsSelections()) { // By default nothing is updated $updated = 0; @@ -1339,10 +1485,10 @@ function doAdminNetworkProcessChangeRequestParams () { continue; } // END - if - // Do we have this enty? + // Is there this enty? if (!isset($entry[$networkId])) { // Not found, needs fixing - debug_report_bug(__FUNCTION__, __LINE__, 'No entry in key=' . $key . ', id=' . $networkId . ' found.'); + reportBug(__FUNCTION__, __LINE__, 'No entry in key=' . $key . ', id=' . $networkId . ' found.'); } // END - if // Fix empty network_request_param_default to NULL @@ -1360,20 +1506,73 @@ function doAdminNetworkProcessChangeRequestParams () { } // END - if } // END - foreach - // Do we have updates? + // Is there updates? if ($updated > 0) { // Updates done displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED=' . $updated . '%}'); } else { // Nothing changed - loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED--}'); + loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED--}'); + } + } // END - if +} + +// Changes given network array translations +function doAdminNetworkProcessChangeArrayTranslations () { + // Is there selections? + if (ifPostContainsSelections()) { + // By default nothing is updated + $updated = 0; + + // Something has been selected, so start updating them + foreach (postRequestElement('sel') as $networkId => $sel) { + // Update this entry? + if ($sel == 1) { + // Init data array + $networkTranslationsData = array(); + + // Transfer whole array, except 'sel' + foreach (postRequestArray() as $key => $entry) { + // Skip 'sel' and submit button + if (in_array($key, array('sel', 'do_edit'))) { + continue; + } // END - if + + // Is there this enty? + if (!isset($entry[$networkId])) { + // Not found, needs fixing + reportBug(__FUNCTION__, __LINE__, 'No entry in key=' . $key . ', id=' . $networkId . ' found.'); + } // END - if + + // Fix empty network_request_param_default to NULL + if (($key == 'network_request_param_default') && (trim($entry[$networkId]) == '')) { + // Set it to NULL + $entry[$networkId] = NULL; + } // END - if + + // Add this entry + $networkTranslationsData[$key] = $entry[$networkId]; + } // END - foreach + + // Update the network data + $updated += doNetworkUpdateArrayTranslationsByArray($networkId, $networkTranslationsData); + } // END - if + } // END - foreach + + // Is there updates? + if ($updated > 0) { + // Updates done + displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_UPDATED=' . $updated . '%}'); + } else { + // Nothing changed + loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_CHANGED--}'); } } // END - if } // Removes given network type handlers function doAdminNetworkProcessRemoveNetworkTypes () { - // Do we have selections? + // Is there selections? if (ifPostContainsSelections()) { // By default nothing is removed $removed = 0; @@ -1387,20 +1586,20 @@ function doAdminNetworkProcessRemoveNetworkTypes () { } // END - if } // END - foreach - // Do we have removes? + // Is there removes? if ($removed > 0) { // Removals done displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_REMOVED=' . $removed . '%}'); } else { // Nothing removed - loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_REMOVED--}'); + loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_REMOVED--}'); } } // END - if } // Removes given network request parameters function doAdminNetworkProcessRemoveNetworkRequestParams () { - // Do we have selections? + // Is there selections? if (ifPostContainsSelections()) { // By default nothing is removed $removed = 0; @@ -1414,13 +1613,40 @@ function doAdminNetworkProcessRemoveNetworkRequestParams () { } // END - if } // END - foreach - // Do we have removes? + // Is there removes? if ($removed > 0) { // Removals done displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED=' . $removed . '%}'); } else { // Nothing removed - loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED--}'); + loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED--}'); + } + } // END - if +} + +// Removes given network array translations +function doAdminNetworkProcessRemoveNetworkArrayTranslation () { + // Is there selections? + if (ifPostContainsSelections()) { + // By default nothing is removed + $removed = 0; + + // Something has been selected, so start updating them + foreach (postRequestElement('sel') as $networkId => $sel) { + // Update this entry? + if ($sel == 1) { + // Remove this entry + $removed += doAdminRemoveNetworkEntry('array_translation', 'network_array_id', $networkId); + } // END - if + } // END - foreach + + // Is there removes? + if ($removed > 0) { + // Removals done + displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_REMOVED=' . $removed . '%}'); + } else { + // Nothing removed + loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_REMOVED--}'); } } // END - if } @@ -1430,10 +1656,10 @@ function doAdminNetworkProcessAddRequestParam () { // Is the request parameter already used with given network? if (isNetworkRequestElementValid(postRequestElement('network_request_param_key'), postRequestElement('network_type_id'), getRequestElement('network_id'))) { // Already added - loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED=' . postRequestElement('network_request_param_key') . '%}'); + loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED=' . postRequestElement('network_request_param_key') . '%}'); // ... so abort here - return false; + return FALSE; } // END - if // Remove the 'ok' part @@ -1454,10 +1680,10 @@ function doAdminNetworkProcessAddRequestParam () { // Output message if (!SQL_HASZEROAFFECTED()) { // Successfully added - loadTemplate('admin_network_request_param_added', false, postRequestArray()); + loadTemplate('admin_network_request_param_added', FALSE, postRequestArray()); } else { // Not added - loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED=' . postRequestElement('network_request_param_key') . '%}'); + loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED=' . postRequestElement('network_request_param_key') . '%}'); } } @@ -1466,10 +1692,10 @@ function doAdminNetworkProcessAddVcheckParam () { // Is the request parameter already used with given network? if (isNetworkVcheckElementValid(postRequestElement('network_vcheck_param_key'), getRequestElement('network_id'))) { // Already added - loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_VCHECK_PARAMETER_ALREADY_ADDED=' . postRequestElement('network_vcheck_param_key') . '%}'); + loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_VCHECK_PARAMETER_ALREADY_ADDED=' . postRequestElement('network_vcheck_param_key') . '%}'); // ... so abort here - return false; + return FALSE; } // END - if // Remove the 'ok' part @@ -1490,10 +1716,10 @@ function doAdminNetworkProcessAddVcheckParam () { // Output message if (!SQL_HASZEROAFFECTED()) { // Successfully added - loadTemplate('admin_network_vcheck_param_added', false, postRequestArray()); + loadTemplate('admin_network_vcheck_param_added', FALSE, postRequestArray()); } else { // Not added - loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_VCHECK_PARAMETER_NOT_ADDED=' . postRequestElement('network_vcheck_param_key') . '%}'); + loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_VCHECK_PARAMETER_NOT_ADDED=' . postRequestElement('network_vcheck_param_key') . '%}'); } } @@ -1502,10 +1728,10 @@ function doAdminNetworkProcessAddNetworkArrayTranslation () { // Is the request parameter already used with given network? if (isNetworkArrayTranslationValid(postRequestElement('network_array_index'), postRequestElement('network_type_id'), getRequestElement('network_id'))) { // Already added - loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_ALREADY_ADDED=' . postRequestElement('network_array_index') . '%}'); + loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_ALREADY_ADDED=' . postRequestElement('network_array_index') . '%}'); // ... so abort here - return false; + return FALSE; } // END - if // Remove the 'ok' part @@ -1515,7 +1741,7 @@ function doAdminNetworkProcessAddNetworkArrayTranslation () { setPostRequestElement('network_id', bigintval(getRequestElement('network_id'))); // Add sorting - setPostRequestElement('sort', (countSumTotalData( + setPostRequestElement('network_array_sort', (countSumTotalData( bigintval(postRequestElement('network_id')), 'network_array_translation', 'network_array_id', @@ -1530,13 +1756,71 @@ function doAdminNetworkProcessAddNetworkArrayTranslation () { // Output message if (!SQL_HASZEROAFFECTED()) { // Successfully added - loadTemplate('admin_network_array_translation_added', false, postRequestArray()); + loadTemplate('admin_network_array_translation_added', FALSE, postRequestArray()); } else { // Not added - loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_NOT_ADDED=' . postRequestElement('network_array_index') . '%}'); + loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_NOT_ADDED=' . postRequestElement('network_array_index') . '%}'); } } +// Handle network array translation form +function doAdminNetworkProcessHandleArrayTranslations () { + // Is there selections? + if (ifPostContainsSelections()) { + // Init cache array + $GLOBALS['network_array_translation_disabled'] = array(); + + // Load network data + $networkData = getNetworkDataById(getRequestElement('network_id')); + + // Something has been selected, so start displaying one by one + $OUT = ''; + foreach (postRequestElement('sel') as $networkId => $sel) { + // Is this selected? + if ($sel == 1) { + // Load this network's data + $networkTranslationsData = getNetworkArrayTranslationsDataById($networkId); + + // Is there found the network? + if (count($networkTranslationsData) > 0) { + if (isFormSent('edit')) { + // Add row template for deleting + $OUT .= loadTemplate('admin_edit_network_array_translation_row', TRUE, $networkTranslationsData); + } elseif (isFormSent('delete')) { + // Get type data + $networkTranslationsData['network_type_data'] = getNetworkTypeDataById($networkTranslationsData['network_type_id']); + + // Add row template for deleting + $OUT .= loadTemplate('admin_delete_network_array_translation_row', TRUE, $networkTranslationsData); + } else { + // Problem! + reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.'); + } + } // END - if + } // END - if + } // END - foreach + + // If we have no rows, we don't need to display the edit form + if (!empty($OUT)) { + // Output main template + if (isFormSent('edit')) { + loadTemplate('admin_edit_network_array_translation', FALSE, $OUT); + } elseif (isFormSent('delete')) { + loadTemplate('admin_delete_network_array_translation', FALSE, $OUT); + } else { + // Problem! + reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.'); + } + + // Don't display the list/add new form + $GLOBALS['network_display'] = FALSE; + } else { + // Nothing selected/found + loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}'); + } + } // END - if +} + // Adds/update network API configuration function doAdminNetworkProcessNetworkApiConfig () { // Remove the 'ok' part @@ -1569,12 +1853,12 @@ function doAdminNetworkProcessNetworkApiConfig () { displayMessage('{--ADMIN_CONFIG_NETWORK_API_SAVED--}'); } else { // Not added - loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_API_NOT_SAVED--}'); + loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_API_NOT_SAVED--}'); } } // Only adds network type configuration if not yet present -function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) { +function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = TRUE) { // Remove the 'ok' part unsetPostRequestElement('ok'); @@ -1594,19 +1878,8 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) { } // END - if } // END - foreach - // Initialize variables - $content = array(); - $id = 'network_max_reload_time_ye'; - $skip = false; - - // Get all POST data - $postData = postRequestArray(); - - // Convert "reload time selections" - convertSelectionsToEpocheTime($postData, $content, $id, $skip); - - // Set the POST array back - setPostRequestArray($postData); + // Convert data in POST array + convertSelectionsToEpocheTimeInPostData($content, 'network_max_reload_time_ye', $skip); // Is there already an entry? if (isNetworkTypeHandlerConfigured(getRequestElement('network_id'), getRequestElement('network_type_id'))) { @@ -1620,12 +1893,12 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) { unsetPostRequestElement('set_all'); // Shall we set for all? - if ($setAll === true) { + if ($setAll === TRUE) { // Get all handlers $result = SQL_QUERY_ESC('SELECT `network_type_id` FROM `{?_MYSQL_PREFIX?}_network_types` WHERE `network_id`=%s ORDER BY `network_type_id` ASC', array(bigintval(getRequestElement('network_id'))), __FUNCTION__, __LINE__); - // Do we have entries? + // Are there entries? if (SQL_HASZERONUMS($result)) { // No, then abort here displayMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_SET_ALL_404--}'); @@ -1641,7 +1914,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) { setGetRequestElement('network_type_id', $typeId); // Call this function again - $numRows += doAdminNetworkProcessAddHandlerTypesConfig(false); + $numRows += doAdminNetworkProcessAddHandlerTypesConfig(FALSE); } // END - while // Free result @@ -1653,7 +1926,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) { displayMessage('{%message,ADMIN_CONFIG_NETWORK_HANDLER_TYPE_ALL_HANDLER_SAVED=' . bigintval($numRows) . '%}'); } else { // Nothing has been saved - loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}'); + loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}'); } } else { // Get SQL query for new entry @@ -1663,14 +1936,14 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) { SQL_QUERY($SQL, __FUNCTION__, __LINE__); // Shall we display the message? - if ($displayMessage === true) { + if ($displayMessage === TRUE) { // Output message if (!SQL_HASZEROAFFECTED()) { // Successfully added displayMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_SAVED--}'); } else { // Not added - loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_SAVED--}'); + loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_SAVED--}'); } } else { // Return amount of affected rows (1 or 2) @@ -1680,7 +1953,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) { } // Only changes network type configuration if not yet present -function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) { +function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = TRUE) { // Remove the 'ok' part unsetPostRequestElement('ok'); @@ -1696,17 +1969,8 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) { } // END - if } // END - foreach - // Initialize variables - $content = array(); - $id = 'network_max_reload_time_ye'; - $skip = false; - $postData = postRequestArray(); - - // Convert "reload time selections" - convertSelectionsToEpocheTime($postData, $content, $id, $skip); - - // Set the POST array back - setPostRequestArray($postData); + // Convert time selections in POST data + convertSelectionsToEpocheTimeInPostData('network_max_reload_time_ye'); // Is there already an entry? if (!isNetworkTypeHandlerConfigured(getRequestElement('network_id'), getRequestElement('network_type_id'))) { @@ -1720,12 +1984,12 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) { unsetPostRequestElement('set_all'); // Shall we set for all? - if ($setAll === true) { + if ($setAll === TRUE) { // Get all data entries $result = SQL_QUERY_ESC('SELECT `network_data_id` FROM `{?_MYSQL_PREFIX?}_network_types_config` WHERE `network_id`=%s ORDER BY `network_type_id` ASC', array(bigintval(getRequestElement('network_id'))), __FUNCTION__, __LINE__); - // Do we have entries? + // Are there entries? if (SQL_HASZERONUMS($result)) { // No, then abort here displayMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_SET_ALL_404--}'); @@ -1741,7 +2005,7 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) { setPostRequestElement('network_data_id', $dataId); // Call this function again - $numRows += doAdminNetworkProcessEditHandlerTypesConfig(false); + $numRows += doAdminNetworkProcessEditHandlerTypesConfig(FALSE); } // END - while // Free result @@ -1753,7 +2017,7 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) { displayMessage('{%message,ADMIN_CONFIG_NETWORK_HANDLER_TYPE_ALL_HANDLER_SAVED=' . bigintval($numRows) . '%}'); } else { // Nothing has been saved - loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}'); + loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}'); } } else { // Get SQL query for new entry @@ -1763,14 +2027,14 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) { SQL_QUERY($SQL, __FUNCTION__, __LINE__); // Shall we display the message? - if ($displayMessage === true) { + if ($displayMessage === TRUE) { // Output message if (!SQL_HASZEROAFFECTED()) { // Successfully added displayMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_SAVED--}'); } else { // Not added - loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}'); + loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}'); } } else { // Return amount of affected rows (1 or 2) @@ -1808,7 +2072,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 @@ -1822,7 +2086,7 @@ function doAdminNetworkProcessExport () { // Is the 'what' key valid? if (!isset($validExports[getWhat()])) { // Not valid - debug_report_bug(__FUNCTION__, __LINE__, 'what=' . getWhat() . ' - not supported'); + reportBug(__FUNCTION__, __LINE__, 'what=' . getWhat() . ' - not supported'); } // END - if // Generate call-back, some tables require to export not all columns @@ -1831,20 +2095,20 @@ function doAdminNetworkProcessExport () { // Is the call-back function there? if (!function_exists($callbackName)) { // No, this is really bad - debug_report_bug(__FUNCTION__, __LINE__, 'Invalid call-back function ' . $callbackName . ' detected.'); + reportBug(__FUNCTION__, __LINE__, 'Invalid call-back function ' . $callbackName . ' detected.'); } elseif (isset($GLOBALS[__FUNCTION__][$callbackName])) { // Already called! - debug_report_bug(__FUNCTION__, __LINE__, 'Double-call of export function ' . $callbackName . ' detected.'); + reportBug(__FUNCTION__, __LINE__, 'Double-call of export function ' . $callbackName . ' detected.'); } // Call the function call_user_func($callbackName); // Mark it as called - $GLOBALS[__FUNCTION__][$callbackName] = true; + $GLOBALS[__FUNCTION__][$callbackName] = TRUE; // Don't display the list/add new form - $GLOBALS['network_display'] = false; + $GLOBALS['network_display'] = FALSE; } // Exports (and displays) the table 'network_data' @@ -1868,7 +2132,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)) { @@ -1893,7 +2157,7 @@ ORDER BY SQL_FREERESULT($result); // Output the SQL query - loadTemplate('admin_export_network_data', false, $SQL); + loadTemplate('admin_export_network_data', FALSE, $SQL); } // Exports (and displays) the table 'network_types' @@ -1901,7 +2165,7 @@ function doAdminNetworkExportTypes () { // 'network_id' must be set if (!isGetRequestElementSet('network_id')) { // Only network handlers of one network will be exported per time - debug_report_bug(__FUNCTION__, __LINE__, 'network_id not provided, please fix your links.'); + reportBug(__FUNCTION__, __LINE__, 'network_id not provided, please fix your links.'); } // END - if // Get all network types of given network @@ -1912,7 +2176,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 @@ -1924,7 +2189,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)) { @@ -1942,11 +2207,11 @@ ORDER BY $SQL .= 'NULL'; } else { // Column is set - $SQL .= "'" . $content['network_type_banner_url'] . "'"; + $SQL .= chr(39) . $content['network_type_banner_url'] . chr(39); } // 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 @@ -1956,7 +2221,7 @@ ORDER BY SQL_FREERESULT($result); // Output the SQL query - loadTemplate('admin_export_network_types', false, $SQL); + loadTemplate('admin_export_network_types', FALSE, $SQL); } // Exports (and displays) the table 'network_request_params' @@ -1964,7 +2229,7 @@ function doAdminNetworkExportRequestParams () { // 'network_id' must be set if (!isGetRequestElementSet('network_id')) { // Only network request parameters of one network will be exported per time - debug_report_bug(__FUNCTION__, __LINE__, 'network_id not provided, please fix your links.'); + reportBug(__FUNCTION__, __LINE__, 'network_id not provided, please fix your links.'); } // END - if // Get all network types of given network @@ -1986,7 +2251,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)) { @@ -2003,7 +2268,7 @@ ORDER BY $SQL .= "NULL),\n"; } else { // Column is set - $SQL .= "'" . $content['network_request_param_default'] . "'),\n"; + $SQL .= chr(39) . $content['network_request_param_default'] . "'),\n"; } } // END - while @@ -2014,7 +2279,7 @@ ORDER BY SQL_FREERESULT($result); // Output the SQL query - loadTemplate('admin_export_network_request_params', false, $SQL); + loadTemplate('admin_export_network_request_params', FALSE, $SQL); } // Exports (and displays) the table 'network_vcheck_params' @@ -2022,7 +2287,7 @@ function doAdminNetworkExportVcheckParams () { // 'network_id' must be set if (!isGetRequestElementSet('network_id')) { // Only network vcheck parameters of one network will be exported per time - debug_report_bug(__FUNCTION__, __LINE__, 'network_id not provided, please fix your links.'); + reportBug(__FUNCTION__, __LINE__, 'network_id not provided, please fix your links.'); } // END - if // Get all network types of given network @@ -2042,7 +2307,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)) { @@ -2058,7 +2323,7 @@ ORDER BY $SQL .= "NULL),\n"; } else { // Column is set - $SQL .= "'" . $content['network_vcheck_param_default'] . "'),\n"; + $SQL .= chr(39) . $content['network_vcheck_param_default'] . "'),\n"; } } // END - while @@ -2069,7 +2334,7 @@ ORDER BY SQL_FREERESULT($result); // Output the SQL query - loadTemplate('admin_export_network_vcheck_params', false, $SQL); + loadTemplate('admin_export_network_vcheck_params', FALSE, $SQL); } // Exports (and displays) the table 'network_array_translation' @@ -2077,7 +2342,7 @@ function doAdminNetworkExportArrayTranslation () { // 'network_id' must be set if (!isGetRequestElementSet('network_id')) { // Only network API array index translations of one network will be exported per time - debug_report_bug(__FUNCTION__, __LINE__, 'network_id not provided, please fix your links.'); + reportBug(__FUNCTION__, __LINE__, 'network_id not provided, please fix your links.'); } // END - if // Get all network types of given network @@ -2085,20 +2350,20 @@ function doAdminNetworkExportArrayTranslation () { `network_id`, `network_type_id`, `network_array_index`, - `sort` + `network_array_sort` FROM `{?_MYSQL_PREFIX?}_network_array_translation` WHERE `network_id`=%s ORDER BY `network_type_id` ASC, - `sort` ASC', + `network_array_sort` ASC', array( bigintval(getRequestElement('network_id')) ), __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`, `network_array_sort`) VALUES\n"; // Load all entries while ($content = SQL_FETCHARRAY($result)) { @@ -2107,7 +2372,7 @@ ORDER BY $content['network_id'] . ', ' . $content['network_type_id'] . ', ' . $content['network_array_index'] . ', ' . - $content['sort'] . "),\n"; + $content['network_array_sort'] . "),\n"; } // END - while // Remove last commata and close braces @@ -2117,7 +2382,7 @@ ORDER BY SQL_FREERESULT($result); // Output the SQL query - loadTemplate('admin_export_network_array_translation', false, $SQL); + loadTemplate('admin_export_network_array_translation', FALSE, $SQL); } // [EOF]