X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fnetwork_functions.php;h=f89979e68dc8e36e5f900a4003d438967c70bdaf;hp=1dad40cf32c0fe98b82e04eea97a16b82f498f50;hb=8fad776382e63b3f73f8dbe289f229d79cfc2c22;hpb=c0492f72cb322af878f09f745dfd6a65b45da555 diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php index 1dad40cf32..f89979e68d 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,7 +113,7 @@ 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", @@ -129,7 +129,7 @@ function isNetworkNameValid ($name) { return $isValid; } -// Checks wether the given network type is already used (valid) +// 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 +148,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 +168,26 @@ function isNetworkRequestElementValid ($key, $type, $networkId) { return $isValid; } -// Checks wether the given network API array translation +// 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", + array( + $networkId, + $key + ), __FUNCTION__, __LINE__); + + // Does it exist? + $isValid = (SQL_NUMROWS($result) == 1); + + // Free result + SQL_FREERESULT($result); + + // Return result + return $isValid; +} + +// 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", @@ -193,7 +212,7 @@ 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.'); + reportBug(__FUNCTION__, __LINE__, 'Network id ' . $networkId . ' is smaller than 1.'); } // END - if // Set current network id @@ -223,7 +242,7 @@ WHERE 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); @@ -248,7 +267,7 @@ 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.'); + reportBug(__FUNCTION__, __LINE__, 'Network type id ' . $networkId . ' is smaller than 1.'); } // END - if // Set current network id @@ -286,7 +305,7 @@ WHERE 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); @@ -311,7 +330,7 @@ function getNetworkTypeDataById ($networkId) { // 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.'); + reportBug(__FUNCTION__, __LINE__, 'Network type id ' . $networkId . ' is smaller than 1.'); } // END - if // By default we have no data @@ -332,7 +351,7 @@ WHERE 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_type_data'][$networkId] = SQL_FETCHARRAY($result); @@ -350,7 +369,7 @@ function getNetworkRequestParamsDataById ($networkId) { // Ids lower one are not accepted if ($networkId < 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 ' . $networkId . ' is smaller than 1.'); } // END - if // By default we have no data @@ -371,7 +390,7 @@ WHERE LIMIT 1', array(bigintval($networkId)), __FUNCTION__, __LINE__); - // Do we have an entry? + // Is there an entry? if (SQL_NUMROWS($result) == 1) { // Then get it $networkRequestData = SQL_FETCHARRAY($result); @@ -389,7 +408,7 @@ 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 @@ -401,7 +420,7 @@ function doNetworkUpdateTypeByArray ($networkId, $networkTypeData) { // Ids lower one are not accepted if ($networkId < 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 ' . $networkId . ' is smaller than 1.'); } // END - if // Just call our inner method @@ -413,7 +432,7 @@ function doNetworkUpdateParamsByArray ($networkId, $networkParamData) { // Ids lower one are not accepted if ($networkId < 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 ' . $networkId . ' is smaller than 1.'); } // END - if // Just call our inner method @@ -452,7 +471,7 @@ WHERE ORDER BY `network_short_name` ASC", __FUNCTION__, __LINE__); - // Do we have entries? + // Are there entries? if (!SQL_HASZERONUMS($result)) { // List all entries $rows = array(); @@ -497,7 +516,7 @@ ORDER BY bigintval($networkId) ), __FUNCTION__, __LINE__); - // Do we have entries? + // Are there entries? if (!SQL_HASZERONUMS($result)) { // List all entries $rows = array(); @@ -545,7 +564,7 @@ ORDER BY d.`network_short_name` ASC, t.`network_type_handler` ASC", __FUNCTION__, __LINE__); - // Do we have entries? + // Are there entries? if (!SQL_HASZERONUMS($result)) { // List all entries $rows = array(); @@ -582,7 +601,7 @@ function generateNetworkTypeOptions ($networkId) { // 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', @@ -606,7 +625,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', @@ -651,12 +670,12 @@ function generateNetworkTypesAvailableOptions ($defaultType = NULL) { return $GLOBALS[__FUNCTION__][$defaultType]; } -// Generates an options list (somewhat getter) ofr request keys +// 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', @@ -679,7 +698,41 @@ function generateNetworkRequestKeyOptions () { '', '', '', $GLOBALS['network_request_params_disabled'], - 'translateNetworkRequestParamKey' + 'translateNetworkRequestParameterKey' + ); + } // END - if + + // Return content + return $GLOBALS[__FUNCTION__]; +} + +// Generates an options list for vcheck request keys +function generateNetworkVcheckKeyOptions () { + // Is it cached? + if (!isset($GLOBALS[__FUNCTION__])) { + // Generate and cache it + $GLOBALS[__FUNCTION__] = generateOptions( + '/ARRAY/', + array( + 'network_key', + 'sid', + 'payment', + 'remote_address', + 'campaign_id', + 'status', + 'reason', + 'type', + 'network_name', + 'extra_value1', + 'extra_value2', + 'extra_value3', + 'extra_value4', + ), + array(), + '', + '', '', + $GLOBALS['network_vcheck_params_disabled'], + 'translateNetworkVcheckParameterKey' ); } // END - if @@ -692,7 +745,7 @@ 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', @@ -710,10 +763,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', @@ -733,10 +786,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 @@ -751,7 +804,7 @@ function translateNetworkTranslationName ($name) { // 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 @@ -766,7 +819,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 @@ -781,7 +834,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 @@ -789,14 +842,29 @@ function translateNetworkRequestType ($type) { } // Translates request parameter -function translateNetworkRequestParamKey ($param) { +function translateNetworkRequestParameterKey ($param) { // Generate id $messageId = 'ADMIN_NETWORK_REQUEST_PARAMETER_' . strtoupper($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 . '--}'; +} + +// Translates vheck request parameter +function translateNetworkVcheckParameterKey ($param) { + // Generate id + $messageId = 'ADMIN_NETWORK_VCHECK_PARAMETER_' . strtoupper($param) . ''; + + // Is the message id there? + if (!isMessageIdValid($messageId)) { + // Not valid param + reportBug(__FUNCTION__, __LINE__, 'param=' . $param . ' is invalid.'); } // END - if // Return message id @@ -805,7 +873,7 @@ function translateNetworkRequestParamKey ($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(); @@ -824,7 +892,7 @@ ON ORDER BY `sort` ASC', __FUNCTION__, __LINE__); - // Do we have entries? + // Are there entries? if (!SQL_HASZERONUMS($result)) { // Get all entries while ($row = SQL_FETCHARRAY($result)) { @@ -852,7 +920,7 @@ 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--}'; @@ -870,7 +938,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( @@ -886,9 +954,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( @@ -907,8 +975,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.'); } //------------------------------------------------------------------------------ @@ -945,7 +1013,7 @@ function doAdminNetworkProcessAddNetwork () { // 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 = ''; @@ -955,7 +1023,7 @@ 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); @@ -979,7 +1047,7 @@ function doAdminNetworkProcessHandleNetworks () { // Handle network type form function doAdminNetworkProcessHandleNetworkTypes () { - // Do we have selections? + // Is there selections? if (ifPostContainsSelections()) { // Load network data $networkData = getNetworkDataById(getRequestElement('network_id')); @@ -992,7 +1060,7 @@ 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 @@ -1002,7 +1070,7 @@ function doAdminNetworkProcessHandleNetworkTypes () { $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/del.'); } } // END - if } // END - if @@ -1017,7 +1085,7 @@ function doAdminNetworkProcessHandleNetworkTypes () { loadTemplate('admin_delete_network_types', false, $OUT); } else { // Problem! - debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.'); + reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.'); } // Don't display the list/add new form @@ -1031,7 +1099,7 @@ function doAdminNetworkProcessHandleNetworkTypes () { // 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(); @@ -1047,7 +1115,7 @@ 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 @@ -1060,7 +1128,7 @@ function doAdminNetworkProcessHandleRequestParams () { $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/del.'); } } // END - if } // END - if @@ -1075,7 +1143,7 @@ function doAdminNetworkProcessHandleRequestParams () { 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/del.'); } // Don't display the list/add new form @@ -1089,7 +1157,7 @@ function doAdminNetworkProcessHandleRequestParams () { // Changes given networks function doAdminNetworkProcessChangeNetworks () { - // Do we have selections? + // Is there selections? if (ifPostContainsSelections()) { // By default nothing is updated $updated = 0; @@ -1108,10 +1176,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 @@ -1123,7 +1191,7 @@ function doAdminNetworkProcessChangeNetworks () { } // END - if } // END - foreach - // Do we have updates? + // Is there updates? if ($updated > 0) { // Updates done displayMessage('{%message,ADMIN_NETWORK_UPDATED=' . $updated . '%}'); @@ -1136,7 +1204,7 @@ function doAdminNetworkProcessChangeNetworks () { // Removes given networks function doAdminNetworkProcessRemoveNetworks () { - // Do we have selections? + // Is there selections? if (ifPostContainsSelections()) { // By default nothing is removed $removed = 0; @@ -1150,7 +1218,7 @@ function doAdminNetworkProcessRemoveNetworks () { } // END - if } // END - foreach - // Do we have removes? + // Is there removes? if ($removed > 0) { // Removals done displayMessage('{%message,ADMIN_NETWORK_REMOVED=' . $removed . '%}'); @@ -1199,7 +1267,7 @@ function doAdminNetworkProcessAddNetworkType () { // Changes given network type handlers function doAdminNetworkProcessChangeHandlerTypes () { - // Do we have selections? + // Is there selections? if (ifPostContainsSelections()) { // By default nothing is updated $updated = 0; @@ -1218,10 +1286,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 @@ -1239,7 +1307,7 @@ 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 . '%}'); @@ -1252,7 +1320,7 @@ function doAdminNetworkProcessChangeHandlerTypes () { // Changes given network request parameters function doAdminNetworkProcessChangeRequestParams () { - // Do we have selections? + // Is there selections? if (ifPostContainsSelections()) { // By default nothing is updated $updated = 0; @@ -1271,10 +1339,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 @@ -1292,7 +1360,7 @@ 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 . '%}'); @@ -1305,7 +1373,7 @@ function doAdminNetworkProcessChangeRequestParams () { // Removes given network type handlers function doAdminNetworkProcessRemoveNetworkTypes () { - // Do we have selections? + // Is there selections? if (ifPostContainsSelections()) { // By default nothing is removed $removed = 0; @@ -1319,7 +1387,7 @@ 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 . '%}'); @@ -1332,7 +1400,7 @@ function doAdminNetworkProcessRemoveNetworkTypes () { // Removes given network request parameters function doAdminNetworkProcessRemoveNetworkRequestParams () { - // Do we have selections? + // Is there selections? if (ifPostContainsSelections()) { // By default nothing is removed $removed = 0; @@ -1346,7 +1414,7 @@ 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 . '%}'); @@ -1393,6 +1461,42 @@ function doAdminNetworkProcessAddRequestParam () { } } +// Adds a vheck request parameter to given network +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') . '%}'); + + // ... so abort here + return false; + } // END - if + + // Remove the 'ok' part + unsetPostRequestElement('ok'); + + // Add id + setPostRequestElement('network_id', bigintval(getRequestElement('network_id'))); + + // Is network_vcheck_param_default set? + if (postRequestElement('network_vcheck_param_default') == '') { + // Remove empty value to get a NULL for an optional entry + unsetPostRequestElement('network_vcheck_param_default'); + } // END - if + + // Add the whole vcheck to database + SQL_QUERY(getInsertSqlFromArray(postRequestArray(), 'network_vcheck_params'), __FUNCTION__, __LINE__); + + // Output message + if (!SQL_HASZEROAFFECTED()) { + // Successfully added + 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') . '%}'); + } +} + // Adds a API response array entry function doAdminNetworkProcessAddNetworkArrayTranslation () { // Is the request parameter already used with given network? @@ -1490,19 +1594,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'))) { @@ -1521,7 +1614,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) { $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--}'); @@ -1592,17 +1685,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 + convertSelectionsToEpocheTimeInPostArray('network_max_reload_time_ye'); // Is there already an entry? if (!isNetworkTypeHandlerConfigured(getRequestElement('network_id'), getRequestElement('network_type_id'))) { @@ -1621,7 +1705,7 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) { $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--}'); @@ -1704,19 +1788,21 @@ function doAdminNetworkProcessExport () { // Init table with all valid what->table entries $validExports = array( // General network data - 'list_networks' => 'network_data', + 'list_networks' => 'data', // Network type handler - 'list_network_types' => 'network_types', + 'list_network_types' => 'types', // Network request parameter - 'list_network_request_params' => 'network_request_params', + 'list_network_request_params' => 'request_params', + // Vcheck request parameter + 'list_network_vcheck_params' => 'vcheck_params', // Network API response array index translation - 'list_network_array_translation' => 'network_array_translation', + 'list_network_array_translation' => 'array_translation', ); // 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 @@ -1725,10 +1811,10 @@ 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 @@ -1742,7 +1828,7 @@ function doAdminNetworkProcessExport () { } // Exports (and displays) the table 'network_data' -function doAdminNetworkExportNetworkData () { +function doAdminNetworkExportData () { // Query for all networks $result = SQL_QUERY('SELECT `network_short_name`, @@ -1791,11 +1877,11 @@ ORDER BY } // Exports (and displays) the table 'network_types' -function doAdminNetworkExportNetworkTypes () { +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 @@ -1836,7 +1922,7 @@ 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 @@ -1854,11 +1940,11 @@ ORDER BY } // Exports (and displays) the table 'network_request_params' -function doAdminNetworkExportNetworkRequestParams () { +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 @@ -1897,7 +1983,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 @@ -1911,12 +1997,67 @@ ORDER BY loadTemplate('admin_export_network_request_params', false, $SQL); } +// Exports (and displays) the table 'network_vcheck_params' +function doAdminNetworkExportVcheckParams () { + // 'network_id' must be set + if (!isGetRequestElementSet('network_id')) { + // Only network vcheck parameters of one network will be exported per time + reportBug(__FUNCTION__, __LINE__, 'network_id not provided, please fix your links.'); + } // END - if + + // Get all network types of given network + $result = SQL_QUERY_ESC('SELECT + `network_id`, + `network_vcheck_param_key`, + `network_vcheck_param_value`, + `network_vcheck_param_default` +FROM + `{?_MYSQL_PREFIX?}_network_vcheck_params` +WHERE + `network_id`=%s +ORDER BY + `network_vcheck_param_id` ASC', + array( + bigintval(getRequestElement('network_id')) + ), __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"; + + // Load all entries + while ($content = SQL_FETCHARRAY($result)) { + // Add row + $SQL .= '(' . + $content['network_id'] . ", '" . + $content['network_vcheck_param_key'] . "', '" . + $content['network_vcheck_param_value'] . "', "; + + // Is the column NULL? + if (is_null($content['network_vcheck_param_default'])) { + // Column is NULL + $SQL .= "NULL),\n"; + } else { + // Column is set + $SQL .= chr(39) . $content['network_vcheck_param_default'] . "'),\n"; + } + } // END - while + + // Remove last commata and close braces + $SQL = substr($SQL, 0, -2); + + // Free result + SQL_FREERESULT($result); + + // Output the SQL query + loadTemplate('admin_export_network_vcheck_params', false, $SQL); +} + // Exports (and displays) the table 'network_array_translation' -function doAdminNetworkExportNetworkArrayTranslation () { +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