X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fnetwork_functions.php;h=8312c16ea9f066878400b96ae1dcd27c2f505124;hp=c6c5981b83c5180218d55876960c803a0bb6caa0;hb=2df9f7a53f8b1dd5164f87824a324ccb3b6634cb;hpb=89a0d1fa9b12aca7eaec782aa932bd397f8a70c8 diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php index c6c5981b83..8312c16ea9 100644 --- a/inc/libs/network_functions.php +++ b/inc/libs/network_functions.php @@ -82,7 +82,7 @@ function detectNetworkProcessForm () { // 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(); @@ -242,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); @@ -293,7 +293,8 @@ function getNetworkDataByTypeId ($networkId, $column = '') { t.`network_type_handler`, t.`network_type_api_url`, t.`network_type_click_url`, - t.`network_type_banner_url` + t.`network_type_banner_url`, + t.`network_text_encoding` FROM `{?_MYSQL_PREFIX?}_network_data` AS d LEFT JOIN @@ -305,7 +306,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); @@ -351,7 +352,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); @@ -390,7 +391,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); @@ -471,7 +472,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(); @@ -516,7 +517,7 @@ ORDER BY bigintval($networkId) ), __FUNCTION__, __LINE__); - // Do we have entries? + // Are there entries? if (!SQL_HASZERONUMS($result)) { // List all entries $rows = array(); @@ -564,7 +565,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(); @@ -670,6 +671,29 @@ function generateNetworkTypesAvailableOptions ($defaultType = NULL) { return $GLOBALS[__FUNCTION__][$defaultType]; } +// Generates an options list of all available (hard-coded) text encoders +function generateNetworkTextEncodingAvailableOptions ($defaultEncoding = NULL) { + // Is it cached? + if (!isset($GLOBALS[__FUNCTION__][$defaultEncoding])) { + // Generate list + $GLOBALS[__FUNCTION__][$defaultEncoding] = generateOptions( + '/ARRAY/', + array( + 'NONE', + 'BASE64', + ), + array(), + $defaultEncoding, + '', '', + array(), + 'translateNetworkTextEncoding' + ); + } // END - if + + // Return content + return $GLOBALS[__FUNCTION__][$defaultEncoding]; +} + // Generates an options list (somewhat getter) for request keys function generateNetworkRequestKeyOptions () { // Is it cached? @@ -678,7 +702,7 @@ function generateNetworkRequestKeyOptions () { $GLOBALS[__FUNCTION__] = generateOptions( '/ARRAY/', array( - 'id', + 'affiliate_id', 'sid', 'hash', 'password', @@ -763,7 +787,7 @@ 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] = generateOptions( @@ -786,7 +810,7 @@ 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] = generateYesNoOptions($default); @@ -803,8 +827,8 @@ function translateNetworkTranslationName ($name) { // Is the message id there? if (!isMessageIdValid($messageId)) { - // Not valid type - reportBug(__FUNCTION__, __LINE__, 'type=' . $type . ' is invalid.'); + // Not valid name + reportBug(__FUNCTION__, __LINE__, 'name=' . $name . ' is invalid.'); } // END - if // Return message id @@ -871,9 +895,24 @@ function translateNetworkVcheckParameterKey ($param) { return '{--' . $messageId . '--}'; } +// Translate text-encoding +function translateNetworkTextEncoding ($encoding) { + // Generate id + $messageId = 'ADMIN_NETWORK_TYPE_TEXT_ENCODING_' . strtoupper($encoding) . ''; + + // Is the message id there? + if (!isMessageIdValid($messageId)) { + // Not valid encoding + reportBug(__FUNCTION__, __LINE__, 'encoding=' . $encoding . ' is invalid.'); + } // END - if + + // Return message id + return '{--' . $messageId . '--}'; +} + // Translates API index function translateNetworkApiIndex ($index) { - // 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(); @@ -892,7 +931,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)) { @@ -920,7 +959,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--}'; @@ -938,7 +977,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( @@ -956,7 +995,7 @@ function isNetworkApiConfigured ($networkId) { // 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( @@ -1013,7 +1052,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 = ''; @@ -1023,7 +1062,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); @@ -1047,7 +1086,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')); @@ -1060,7 +1099,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 @@ -1099,7 +1138,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(); @@ -1115,7 +1154,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 @@ -1157,7 +1196,7 @@ function doAdminNetworkProcessHandleRequestParams () { // Changes given networks function doAdminNetworkProcessChangeNetworks () { - // Do we have selections? + // Is there selections? if (ifPostContainsSelections()) { // By default nothing is updated $updated = 0; @@ -1176,7 +1215,7 @@ function doAdminNetworkProcessChangeNetworks () { continue; } // END - if - // Do we have this enty? + // Is there this enty? if (!isset($entry[$networkId])) { // Not found, needs fixing reportBug(__FUNCTION__, __LINE__, 'No entry in key=' . $key . ', id=' . $networkId . ' found.'); @@ -1191,7 +1230,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 . '%}'); @@ -1204,7 +1243,7 @@ function doAdminNetworkProcessChangeNetworks () { // Removes given networks function doAdminNetworkProcessRemoveNetworks () { - // Do we have selections? + // Is there selections? if (ifPostContainsSelections()) { // By default nothing is removed $removed = 0; @@ -1218,7 +1257,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 . '%}'); @@ -1267,7 +1306,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; @@ -1286,7 +1325,7 @@ function doAdminNetworkProcessChangeHandlerTypes () { continue; } // END - if - // Do we have this enty? + // Is there this enty? if (!isset($entry[$networkId])) { // Not found, needs fixing reportBug(__FUNCTION__, __LINE__, 'No entry in key=' . $key . ', id=' . $networkId . ' found.'); @@ -1307,7 +1346,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 . '%}'); @@ -1320,7 +1359,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; @@ -1339,7 +1378,7 @@ function doAdminNetworkProcessChangeRequestParams () { continue; } // END - if - // Do we have this enty? + // Is there this enty? if (!isset($entry[$networkId])) { // Not found, needs fixing reportBug(__FUNCTION__, __LINE__, 'No entry in key=' . $key . ', id=' . $networkId . ' found.'); @@ -1360,7 +1399,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 . '%}'); @@ -1373,7 +1412,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; @@ -1387,7 +1426,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 . '%}'); @@ -1400,7 +1439,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; @@ -1414,7 +1453,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 . '%}'); @@ -1614,7 +1653,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--}'); @@ -1705,7 +1744,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--}'); @@ -1788,7 +1827,7 @@ function doAdminNetworkProcessExport () { // Init table with all valid what->table entries $validExports = array( // General network data - 'list_networks' => 'data', + 'list_network_data' => 'data', // Network type handler 'list_network_types' => 'types', // Network request parameter @@ -1848,7 +1887,7 @@ ORDER BY __FUNCTION__, __LINE__); // Start an empty SQL query - $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_data` (`network_short_name`,`network_title`,`network_reflink`,`network_data_separator`,`network_row_separator`,`network_request_type`,`network_charset`,`network_require_id_card`,`network_query_amount`,`network_active`) VALUES\n"; + $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_data` (`network_short_name`, `network_title`, `network_reflink`, `network_data_separator`, `network_row_separator`, `network_request_type`, `network_charset`, `network_require_id_card`, `network_query_amount`, `network_active`) VALUES\n"; // Load all entries while ($content = SQL_FETCHARRAY($result)) { @@ -1892,7 +1931,8 @@ function doAdminNetworkExportTypes () { `network_type_api_url`, `network_type_click_url`, `network_type_banner_url`, - `network_type_reload_time_unit` + `network_type_reload_time_unit`, + `network_text_encoding` FROM `{?_MYSQL_PREFIX?}_network_types` WHERE @@ -1904,7 +1944,7 @@ ORDER BY ), __FUNCTION__, __LINE__); // Start an empty SQL query - $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`,`network_id`,`network_type_handler`,`network_type_api_url`,`network_type_click_url`,`network_type_banner_url`,`network_type_reload_time_unit`) VALUES\n"; + $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`, `network_id`, `network_type_handler`, `network_type_api_url`, `network_type_click_url`, `network_type_banner_url`, `network_type_reload_time_unit`, `network_text_encoding`) VALUES\n"; // Load all entries while ($content = SQL_FETCHARRAY($result)) { @@ -1926,7 +1966,7 @@ ORDER BY } // Add more - $SQL .= ",'" . $content['network_type_reload_time_unit'] . "'),\n"; + $SQL .= ",'" . $content['network_type_reload_time_unit'] . "','" . $content['network_text_encoding'] . "'),\n"; } // END - while // Remove last commata and close braces @@ -1966,7 +2006,7 @@ ORDER BY ), __FUNCTION__, __LINE__); // Start an empty SQL query - $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`network_request_param_key`,`network_request_param_value`,`network_request_param_default`) VALUES\n"; + $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `network_request_param_key`, `network_request_param_value`, `network_request_param_default`) VALUES\n"; // Load all entries while ($content = SQL_FETCHARRAY($result)) { @@ -2022,7 +2062,7 @@ ORDER BY ), __FUNCTION__, __LINE__); // Start an empty SQL query - $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_vcheck_params` (`network_id`,`network_vcheck_param_key`,`network_vcheck_param_value`,`network_vcheck_param_default`) VALUES\n"; + $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_vcheck_params` (`network_id`, `network_vcheck_param_key`, `network_vcheck_param_value`, `network_vcheck_param_default`) VALUES\n"; // Load all entries while ($content = SQL_FETCHARRAY($result)) { @@ -2078,7 +2118,7 @@ ORDER BY ), __FUNCTION__, __LINE__); // Start an empty SQL query - $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`,`network_type_id`,`network_array_index`,`sort`) VALUES\n"; + $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES\n"; // Load all entries while ($content = SQL_FETCHARRAY($result)) {