X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fnetwork_functions.php;h=aa1667045a23d72904d2b6315eada49954b812ad;hb=4373e155854012d687fdfcae4c69d1a940883fab;hp=a5cec2ca0043d04386fa69cc9776dd77729bf774;hpb=a760d4ab54a64a3eb4bd7e88e828c7247f8d126c;p=mailer.git diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php index a5cec2ca00..aa1667045a 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 - 2012 by Mailer Developer Team * + * Copyright (c) 2009 - 2013 by Mailer Developer Team * * For more information visit: http://mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -102,7 +102,7 @@ function detectNetworkProcessForm () { // Handle a (maybe) sent form here function doNetworkHandleForm () { // Is there a form sent? - if (countRequestPost() > 0) { + if ((!isPostRequestElementSet('save_expert')) && (countRequestPost() > 0)) { // Detect sent POST form detectNetworkProcessForm(); } elseif (!isGetRequestElementSet('do')) { @@ -120,7 +120,7 @@ function doNetworkHandleForm () { // Processes an admin form function doAdminNetworkProcessForm () { // Create function name - $functionName = sprintf("doAdminNetworkProcess%s", capitalizeUnderscoreString(getRequestElement('do'))); + $functionName = sprintf('doAdminNetworkProcess%s', capitalizeUnderscoreString(getRequestElement('do'))); // Is the function valid? if (!function_exists($functionName)) { @@ -194,7 +194,7 @@ function isNetworkTypeHandleValid ($type, $networkId) { // Is there cache? if (!isset($GLOBALS[__FUNCTION__][$networkId][$type])) { // Does it exist? - $GLOBALS[__FUNCTION__][$networkId][$type] = (countSumTotalData(bigintval($networkid), 'network_types', 'network_type_id', 'network_id', TRUE, sprintf(" AND `network_type_handler`='%s'", SQL_ESCAPE($type))) == 1); + $GLOBALS[__FUNCTION__][$networkId][$type] = (countSumTotalData(bigintval($networkId), 'network_types', 'network_type_id', 'network_id', TRUE, sprintf(" AND `network_type_handler`='%s'", sqlEscapeString($type))) == 1); } // END - if // Return result @@ -206,7 +206,7 @@ function isNetworkRequestElementValid ($key, $networkTypeId, $networkId) { // Is there cache? if (!isset($GLOBALS[__FUNCTION__][$networkId][$networkTypeId][$key])) { // Does it exist? - $GLOBALS[__FUNCTION__][$networkId][$networkTypeId][$key] = (countSumTotalData(bigintval($networkId), 'network_request_params', 'network_id', 'network_request_param_id', 'network_id', TRUE, sprintf(" AND `network_type_id`=%s AND `network_request_param_key`='%s'", bigintval($networkTypeId), SQL_ESCAPE($key))) == 1); + $GLOBALS[__FUNCTION__][$networkId][$networkTypeId][$key] = (countSumTotalData(bigintval($networkId), 'network_request_params', 'network_request_param_id', 'network_id', TRUE, sprintf(" AND `network_type_id`=%s AND `network_request_param_key`='%s'", bigintval($networkTypeId), sqlEscapeString($key))) == 1); } // END - if // Return result @@ -218,7 +218,7 @@ function isNetworkArrayTranslationValid ($key, $networkTypeId, $networkId) { // Is there cache? if (!isset($GLOBALS[__FUNCTION__][$networkId][$networkTypeId][$key])) { // Does it exist? - $GLOBALS[__FUNCTION__][$networkId][$networkTypeId][$key] = (countSumTotalData(bigintval($networkId), 'network_array_translation', 'network_array_id', 'network_id', TRUE, sprintf(" AND `network_type_id`=%s AND `network_array_index`='%s'", bigintval($networkTypeId), SQL_ESCAPE($key))) == 1); + $GLOBALS[__FUNCTION__][$networkId][$networkTypeId][$key] = (countSumTotalData(bigintval($networkId), 'network_array_translation', 'network_array_id', 'network_id', TRUE, sprintf(" AND `network_type_id`=%s AND `network_array_index`='%s'", bigintval($networkTypeId), sqlEscapeString($key))) == 1); } // END - if // Return result @@ -226,7 +226,7 @@ function isNetworkArrayTranslationValid ($key, $networkTypeId, $networkId) { } // "Getter" for a network's data by provided id number -function getNetworkDataById ($networkId, $column = '') { +function getNetworkDataFromId ($networkId, $column = '') { // Ids lower one are not accepted if (!isValidId($networkId)) { // Not good, should be fixed @@ -245,7 +245,7 @@ function getNetworkDataById ($networkId, $column = '') { $GLOBALS['network_data'][$networkId] = array(); // Query for the network data - $result = SQL_QUERY_ESC('SELECT + $result = sqlQueryEscaped('SELECT `network_id`, `network_short_name`, `network_title`, @@ -264,13 +264,13 @@ LIMIT 1', array(bigintval($networkId)), __FUNCTION__, __LINE__); // Is there an entry? - if (SQL_NUMROWS($result) == 1) { + if (sqlNumRows($result) == 1) { // Then get it - $GLOBALS['network_data'][$networkId] = SQL_FETCHARRAY($result); + $GLOBALS['network_data'][$networkId] = sqlFetchArray($result); } // END - if // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); } // END - if // Return result @@ -300,7 +300,7 @@ function getNetworkDataByTypeId ($networkTypeId, $column = '') { $GLOBALS['network_type_data'][$networkTypeId] = array(); // Query for the network data - $result = SQL_QUERY_ESC('SELECT + $result = sqlQueryEscaped('SELECT `d`.`network_id`, `d`.`network_short_name`, `d`.`network_title`, @@ -330,13 +330,13 @@ LIMIT 1', array(bigintval($networkTypeId)), __FUNCTION__, __LINE__); // Is there an entry? - if (SQL_NUMROWS($result) == 1) { + if (sqlNumRows($result) == 1) { // Then get it - $GLOBALS['network_type_data'][$networkTypeId] = SQL_FETCHARRAY($result); + $GLOBALS['network_type_data'][$networkTypeId] = sqlFetchArray($result); } // END - if // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); } // END - if // Return result @@ -366,7 +366,7 @@ function getNetworkTypeDataByTypeId ($networkTypeId) { $GLOBALS['network_type_data'][$networkTypeId] = array(); // Query for the network data - $result = SQL_QUERY_ESC('SELECT + $result = sqlQueryEscaped('SELECT `network_type_id`, `network_id`, `network_type_handler`, @@ -381,13 +381,13 @@ LIMIT 1', array(bigintval($networkTypeId)), __FUNCTION__, __LINE__); // Is there an entry? - if (SQL_NUMROWS($result) == 1) { + if (sqlNumRows($result) == 1) { // Then get it - $GLOBALS['network_type_data'][$networkTypeId] = SQL_FETCHARRAY($result); + $GLOBALS['network_type_data'][$networkTypeId] = sqlFetchArray($result); } // END - if // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); } // END - if // Return result @@ -395,7 +395,7 @@ LIMIT 1', } // "Getter" for all network type data by provided id number -function getNetworkTypeDataById ($networkId) { +function getNetworkTypeDataFromId ($networkId) { // Ids lower one are not accepted if (!isValidId($networkId)) { // Not good, should be fixed @@ -408,7 +408,7 @@ function getNetworkTypeDataById ($networkId) { $GLOBALS['network_types'][$networkId] = array(); // Query for the network data - $result = SQL_QUERY_ESC('SELECT + $result = sqlQueryEscaped('SELECT `network_type_id`, `network_id`, `network_type_handler`, @@ -424,16 +424,16 @@ ORDER BY array(bigintval($networkId)), __FUNCTION__, __LINE__); // Is there an entry? - if (!SQL_HASZERONUMS($result)) { + if (!ifSqlHasZeroNums($result)) { // Then add all - while ($row = SQL_FETCHARRAY($result)) { + while ($row = sqlFetchArray($result)) { // Add it with new index as it is no longer required $GLOBALS['network_types'][$networkId][] = $row; } // END - if } // END - if // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); } // END - if // Return result @@ -441,7 +441,7 @@ ORDER BY } // "Getter" for a network request parameter data by provided id number -function getNetworkRequestParamsDataById ($networkRequestId) { +function getNetworkRequestParamsDataFromId ($networkRequestId) { // Ids lower one are not accepted if (!isValidId($networkRequestId)) { // Not good, should be fixed @@ -452,7 +452,7 @@ function getNetworkRequestParamsDataById ($networkRequestId) { $networkRequestData = array(); // Query for the network data - $result = SQL_QUERY_ESC('SELECT + $result = sqlQueryEscaped('SELECT `network_request_param_id`, `network_id`, `network_type_id`, @@ -467,20 +467,20 @@ LIMIT 1', array(bigintval($networkRequestId)), __FUNCTION__, __LINE__); // Is there an entry? - if (SQL_NUMROWS($result) == 1) { + if (sqlNumRows($result) == 1) { // Then get it - $networkRequestData = SQL_FETCHARRAY($result); + $networkRequestData = sqlFetchArray($result); } // END - if // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); // Return result return $networkRequestData; } // "Getter" for a network array translation data by provided id number -function getNetworkArrayTranslationsDataById ($networkTranslationId) { +function getNetworkArrayTranslationsDataFromId ($networkTranslationId) { // Ids lower one are not accepted if (!isValidId($networkTranslationId)) { // Not good, should be fixed @@ -491,7 +491,7 @@ function getNetworkArrayTranslationsDataById ($networkTranslationId) { $networkTranslationData = array(); // Query for the network data - $result = SQL_QUERY_ESC('SELECT + $result = sqlQueryEscaped('SELECT `network_array_id`, `network_id`, `network_type_id`, @@ -505,13 +505,13 @@ LIMIT 1', array(bigintval($networkTranslationId)), __FUNCTION__, __LINE__); // Is there an entry? - if (SQL_NUMROWS($result) == 1) { + if (sqlNumRows($result) == 1) { // Then get it - $networkTranslationData = SQL_FETCHARRAY($result); + $networkTranslationData = sqlFetchArray($result); } // END - if // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); // Return result return $networkTranslationData; @@ -531,7 +531,7 @@ function getNetworkRequestParametersByTypeId ($networkTypeId) { $GLOBALS['network_request_parameters'][$networkTypeId] = array(); // Search for all - $result = SQL_QUERY_ESC('SELECT + $result = sqlQueryEscaped('SELECT `network_id`, `network_type_id`, `network_request_param_key`, @@ -548,16 +548,16 @@ ORDER BY ), __FUNCTION__, __LINE__); // Are there records? - if (!SQL_HASZERONUMS($result)) { + if (!ifSqlHasZeroNums($result)) { // Load all but make new indexes as the old are not required - while ($row = SQL_FETCHARRAY($result)) { + while ($row = sqlFetchArray($result)) { // Add it $GLOBALS['network_request_parameters'][$networkTypeId][] = $row; } // END - while } // END - if // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); } // END - if // Return "cached" values @@ -578,7 +578,7 @@ function getFullNetworkConfigurationByTypeId ($networkTypeId) { $GLOBALS['network_full_config'][$networkTypeId] = array(); // Search for all - $result = SQL_QUERY_ESC('SELECT + $result = sqlQueryEscaped('SELECT `nac`.`network_id`, `ntc`.`network_type_id`, `nac`.`network_api_affiliate_id`, @@ -617,13 +617,13 @@ LIMIT 1', ), __FUNCTION__, __LINE__); // Is there one entry? - if (SQL_NUMROWS($result) == 1) { + if (sqlNumRows($result) == 1) { // Load it - $GLOBALS['network_full_config'][$networkTypeId] = SQL_FETCHARRAY($result); + $GLOBALS['network_full_config'][$networkTypeId] = sqlFetchArray($result); } // END - if // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); } // END - if // Return "cached" values @@ -633,7 +633,7 @@ LIMIT 1', // Removes given network entry 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", + sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_network_%s` WHERE `%s`=%s LIMIT %s", array( $table, $column, @@ -642,7 +642,7 @@ function doAdminRemoveNetworkEntry ($table, $column, $id, $limit = 1) { ), __FUNCTION__, __LINE__); // Return affected rows - return SQL_AFFECTEDROWS(); + return sqlAffectedRows(); } // Generates a list of networks for given script and returns it @@ -651,7 +651,7 @@ function generateAdminNetworkList ($separated = FALSE, $includeConfigured = TRUE $content = ''; // Query for all networks - $result = SQL_QUERY('SELECT + $result = sqlQuery('SELECT `network_id`, `network_short_name`, `network_title`, @@ -667,17 +667,18 @@ ORDER BY `network_short_name` ASC', __FUNCTION__, __LINE__); // Are there entries? - if (!SQL_HASZERONUMS($result)) { + if (!ifSqlHasZeroNums($result)) { // List all entries $rows = array(); - while ($row = SQL_FETCHARRAY($result)) { + while ($row = sqlFetchArray($result)) { // Is this valid, then add it if ((is_array($row)) && (isset($row['network_id']))) { // Exclude configured and is it configured or same for unconfired but only if not separated lists? if (((($includeConfigured === FALSE) && (isNetworkApiConfigured($row['network_id']))) || (($includeUnconfigured === FALSE) && (!isNetworkApiConfigured($row['network_id'])))) && ($separated === FALSE)) { // Skip this entry continue; - } elseif ((!empty($addSql)) && ( + // @TODO Unfinished: } elseif ((!empty($addSql)) && ( + } // END - if // Add entry $rows[$row['network_id']] = $row; @@ -685,7 +686,7 @@ ORDER BY } // END - while // Nothing found? - if (count($rows) == 0) { + if (!isFilledArray($rows)) { // Then return nothing ... ;-) return ''; } // END - if @@ -712,11 +713,11 @@ ORDER BY } } else { // Nothing selected - $content = loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_ENTRIES_404--}'); + $content = returnErrorMessage('{--ADMIN_ENTRIES_404--}'); } // Free the result - SQL_FREERESULT($result); + sqlFreeResult($result); // Return the list return $content; @@ -728,7 +729,7 @@ function generateAdminNetworkTypeList ($networkId) { $content = ''; // Query all types of this network - $result = SQL_QUERY_ESC('SELECT + $result = sqlQueryEscaped('SELECT `network_type_id`, `network_type_handler` FROM @@ -743,10 +744,10 @@ ORDER BY ), __FUNCTION__, __LINE__); // Are there entries? - if (!SQL_HASZERONUMS($result)) { + if (!ifSqlHasZeroNums($result)) { // List all entries $rows = array(); - while ($row = SQL_FETCHARRAY($result)) { + while ($row = sqlFetchArray($result)) { // Is this valid, then add it if ((is_array($row)) && (isset($row['network_type_id']))) { // Add entry @@ -758,11 +759,11 @@ ORDER BY $content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id'); } else { // Nothing selected - $content = loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_ENTRIES_404--}'); + $content = returnErrorMessage('{--ADMIN_ENTRIES_404--}'); } // Free the result - SQL_FREERESULT($result); + sqlFreeResult($result); // Return content return $content; @@ -774,7 +775,7 @@ function generateAdminDistinctNetworkTypeList () { $content = ''; // Query all types of this network - $result = SQL_QUERY('SELECT + $result = sqlQuery('SELECT `t`.`network_type_id`, `t`.`network_type_handler`, `d`.`network_title` @@ -790,10 +791,10 @@ ORDER BY `t`.`network_type_handler` ASC', __FUNCTION__, __LINE__); // Are there entries? - if (!SQL_HASZERONUMS($result)) { + if (!ifSqlHasZeroNums($result)) { // List all entries $rows = array(); - while ($row = SQL_FETCHARRAY($result)) { + while ($row = sqlFetchArray($result)) { // Is this valid, then add it if ((is_array($row)) && (isset($row['network_type_id']))) { // Add entry @@ -805,11 +806,11 @@ ORDER BY $content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id', '', '_title'); } else { // Nothing selected - $content = loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_ENTRIES_404--}'); + $content = returnErrorMessage('{--ADMIN_ENTRIES_404--}'); } // Free the result - SQL_FREERESULT($result); + sqlFreeResult($result); //* DEBUG: */ die('
'.encodeEntities($content).'
'); // Return content @@ -874,9 +875,9 @@ function generateNetworkTypesAvailableOptions ($defaultType = NULL) { 'skyscraper', 'skyscraper_click', 'skyscraper_view', - 'halfbanner', - 'halfbanner_click', - 'halfbanner_view', + 'half_banner', + 'half_banner_click', + 'half_banner_view', 'layer', 'layer_click', 'layer_view', @@ -1096,7 +1097,7 @@ function isNetworkTypeHandlerConfigured ($networkId, $networkTypeId) { 'network_handler_config', 'network_data_id', 'network_type_id', - true, + TRUE, sprintf(' AND `network_id`=%s', bigintval($networkId)) ) == 1); } // END - if @@ -1163,7 +1164,7 @@ function logNetworkResponseHeaders ($networkId, $networkTypeId, $headers, $type) // Is debug logging enabled or status code not 200 OK? if ((getConfig('network_logging_debug') == 'Y') || (!isHttpStatusOkay($headers[0]))) { // Add entry - SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_network_header_logging` (`network_id`, `network_type_id`, `network_http_status_code`, `network_http_headers`, `network_logging_type`) VALUES(%s, %s, '%s', '%s', '%s')", + sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_network_header_logging` (`network_id`, `network_type_id`, `network_http_status_code`, `network_http_headers`, `network_logging_type`) VALUES(%s, %s, '%s', '%s', '%s')", array( bigintval($networkId), bigintval($networkTypeId), @@ -1194,7 +1195,7 @@ function saveNetworkResponseBodyInCache ($networkId, $networkTypeId, $responseBo // So is there cache? if (countSumTotalData($networkId, 'network_cache', 'network_cache_id', 'network_id', TRUE, ' AND `network_type_id`=' . bigintval($networkTypeId)) == 1) { // Entry found, so update it - SQL_QUERY_ESC("UPDATE + sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_network_cache` SET `network_cache_data`='%s', @@ -1216,7 +1217,7 @@ LIMIT 1", ), __FUNCTION__, __LINE__); } else { // Add entry - SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_network_cache` (`network_id`, `network_type_id`, `network_cache_data`, `network_cache_body`, `network_cache_type`, `network_cache_admin_id`) VALUES(%s, %s, '%s', '%s', '%s', %s)", + sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_network_cache` (`network_id`, `network_type_id`, `network_cache_data`, `network_cache_body`, `network_cache_type`, `network_cache_admin_id`) VALUES(%s, %s, '%s', '%s', '%s', %s)", array( bigintval($networkId), bigintval($networkTypeId), @@ -1275,13 +1276,13 @@ function countNetworkApiRequest ($networkData) { } // END - if // Okay, so update database - $result = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_network_api_config` SET `network_api_remaining_requests`=`network_api_remaining_requests`-1 WHERE `network_id`=%s LIMIT 1", + $result = sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_network_api_config` SET `network_api_remaining_requests`=`network_api_remaining_requests`-1 WHERE `network_id`=%s LIMIT 1", array( bigintval($networkData['network_id']) ), __FUNCTION__, __LINE__); // Return affected rows - return SQL_AFFECTEDROWS(); + return sqlAffectedRows(); } /** @@ -1292,7 +1293,7 @@ function countNetworkApiRequest ($networkData) { */ function generateMetworkReferralLinkById ($networkId) { // Simple output (no need for template!) - $output = '{%network,getNetworkDataById,network_title=' . $networkId . '%}'; + $output = '{%network,getNetworkDataFromId,network_title=' . $networkId . '%}'; // Return it return $output; @@ -1397,7 +1398,7 @@ function translateNetworkApiIndex ($index) { $GLOBALS['network_array_index'] = array(); // Get all entries - $result = SQL_QUERY('SELECT + $result = sqlQuery('SELECT `network_array_id`, `network_array_index`, `network_translation_name` @@ -1411,16 +1412,16 @@ ORDER BY `network_array_sort` ASC', __FUNCTION__, __LINE__); // Are there entries? - if (!SQL_HASZERONUMS($result)) { + if (!ifSqlHasZeroNums($result)) { // Get all entries - while ($row = SQL_FETCHARRAY($result)) { + while ($row = sqlFetchArray($result)) { // Add it to our global array $GLOBALS['network_array_index'][$row['network_array_index']] = $row; } // END - while } // END - if // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); } // END - if // Default name is unknown @@ -1818,23 +1819,23 @@ 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') . '%}'); + displayErrorMessage('{%message,ADMIN_NETWORK_ALREADY_ADDED=' . postRequestElement('network_short_name') . '%}'); return FALSE; } // END - if // Add the whole request to database - SQL_QUERY(getInsertSqlFromArray(postRequestArray(), 'network_data'), __FUNCTION__, __LINE__); + sqlQuery(getInsertSqlFromArray(postRequestArray(), 'network_data'), __FUNCTION__, __LINE__); // Add the id for output only - setPostRequestElement('network_id', SQL_INSERTID()); + setPostRequestElement('network_id', getSqlInsertId()); // Output message - if (!SQL_HASZEROAFFECTED()) { + if (!ifSqlHasZeroAffectedRows()) { // Successfully added loadTemplate('admin_network_added', FALSE, postRequestArray()); } else { // Not added - loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_DATA_NOT_ADDED=' . postRequestElement('network_short_name') . '%}'); + displayErrorMessage('{%message,ADMIN_NETWORK_DATA_NOT_ADDED=' . postRequestElement('network_short_name') . '%}'); } } @@ -1848,17 +1849,17 @@ function doAdminNetworkProcessHandleNetworks () { // Is this selected? if ($sel == 1) { // Load this network's data - $networkData = getNetworkDataById($networkId); + $networkData = getNetworkDataFromId($networkId); // Is there found the network? - if (count($networkData) > 0) { + if (isFilledArray($networkData)) { // Add row template with given form name $OUT .= loadTemplate('admin_' . getNetworkFormName() . '_networks_row', TRUE, $networkData); } // END - if } // END - if } // END - foreach - // If we have no rows, we don't need to display the edit form + // If there are no rows, we don't need to display the edit form if (!empty($OUT)) { // Init array with generic element $content = array( @@ -1872,7 +1873,7 @@ function doAdminNetworkProcessHandleNetworks () { $GLOBALS['network_display'] = FALSE; } else { // Nothing selected/found - loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_NOTHING_FOUND--}'); + displayErrorMessage('{--ADMIN_NETWORK_NOTHING_FOUND--}'); } } // END - if } @@ -1882,7 +1883,7 @@ function doAdminNetworkProcessHandleNetworkTypes () { // Is there selections? if (ifPostContainsSelections()) { // Load network data - $networkData = getNetworkDataById(getRequestElement('network_id')); + $networkData = getNetworkDataFromId(getRequestElement('network_id')); // Something has been selected, so start displaying one by one $OUT = ''; @@ -1893,7 +1894,7 @@ function doAdminNetworkProcessHandleNetworkTypes () { $networkTypeData = getNetworkTypeDataByTypeId($networkId); // Is there found the network? - if (count($networkTypeData) > 0) { + if (isFilledArray($networkTypeData)) { if (getNetworkFormName() == 'edit') { // Add row template for deleting $OUT .= loadTemplate('admin_edit_network_types_row', TRUE, $networkTypeData); @@ -1908,7 +1909,7 @@ function doAdminNetworkProcessHandleNetworkTypes () { } // END - if } // END - foreach - // If we have no rows, we don't need to display the edit form + // If there are no rows, we don't need to display the edit form if (!empty($OUT)) { // Prepare array with generic elements $content = array( @@ -1930,7 +1931,7 @@ function doAdminNetworkProcessHandleNetworkTypes () { $GLOBALS['network_display'] = FALSE; } else { // Nothing selected/found - loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_FOUND--}'); + displayErrorMessage('{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_FOUND--}'); } } // END - if } @@ -1943,7 +1944,7 @@ function doAdminNetworkProcessHandleRequestParams () { $GLOBALS['network_request_params_disabled'] = array(); // Load network data - $networkData = getNetworkDataById(getRequestElement('network_id')); + $networkData = getNetworkDataFromId(getRequestElement('network_id')); // Something has been selected, so start displaying one by one $OUT = ''; @@ -1951,10 +1952,10 @@ function doAdminNetworkProcessHandleRequestParams () { // Is this selected? if ($sel == 1) { // Load this network's data - $networkRequestData = getNetworkRequestParamsDataById($networkId); + $networkRequestData = getNetworkRequestParamsDataFromId($networkId); // Is there found the network? - if (count($networkRequestData) > 0) { + if (isFilledArray($networkRequestData)) { if (getNetworkFormName() == 'edit') { // Add row template for deleting $OUT .= loadTemplate('admin_edit_network_request_params_row', TRUE, $networkRequestData); @@ -1972,7 +1973,7 @@ function doAdminNetworkProcessHandleRequestParams () { } // END - if } // END - foreach - // If we have no rows, we don't need to display the edit form + // If there are no rows, we don't need to display the edit form if (!empty($OUT)) { // Prepare array with generic elements $content = array( @@ -1994,7 +1995,7 @@ function doAdminNetworkProcessHandleRequestParams () { $GLOBALS['network_display'] = FALSE; } else { // Nothing selected/found - loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}'); + displayErrorMessage('{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}'); } } // END - if } @@ -2041,7 +2042,7 @@ function doAdminNetworkProcessChangeNetworks () { displayMessage('{%message,ADMIN_NETWORK_UPDATED=' . $updated . '%}'); } else { // Nothing changed - loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_NOTHING_CHANGED--}'); + displayErrorMessage('{--ADMIN_NETWORK_NOTHING_CHANGED--}'); } } // END - if } @@ -2068,7 +2069,7 @@ function doAdminNetworkProcessRemoveNetworks () { displayMessage('{%message,ADMIN_NETWORK_REMOVED=' . $removed . '%}'); } else { // Nothing removed - loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_NOTHING_REMOVED--}'); + displayErrorMessage('{--ADMIN_NETWORK_NOTHING_REMOVED--}'); } } // END - if } @@ -2078,7 +2079,7 @@ 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') . '%}'); + displayErrorMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_ALREADY_ADDED=' . postRequestElement('network_type_handler') . '%}'); // ... so abort here return FALSE; @@ -2100,15 +2101,15 @@ function doAdminNetworkProcessAddNetworkType () { } // END - if // Add the whole request to database - SQL_QUERY(getInsertSqlFromArray(postRequestArray(), 'network_types'), __FUNCTION__, __LINE__); + sqlQuery(getInsertSqlFromArray(postRequestArray(), 'network_types'), __FUNCTION__, __LINE__); // Output message - if (!SQL_HASZEROAFFECTED()) { + if (!ifSqlHasZeroAffectedRows()) { // Successfully added 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') . '%}'); + displayErrorMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_NOT_ADDED=' . postRequestElement('network_type_handler') . '%}'); } } @@ -2160,7 +2161,7 @@ function doAdminNetworkProcessChangeHandlerTypes () { displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_UPDATED=' . $updated . '%}'); } else { // Nothing changed - loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_CHANGED--}'); + displayErrorMessage('{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_CHANGED--}'); } } // END - if } @@ -2213,7 +2214,7 @@ function doAdminNetworkProcessChangeRequestParams () { displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED=' . $updated . '%}'); } else { // Nothing changed - loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED--}'); + displayErrorMessage('{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED--}'); } } // END - if } @@ -2266,7 +2267,7 @@ function doAdminNetworkProcessChangeArrayTranslation () { displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_UPDATED=' . $updated . '%}'); } else { // Nothing changed - loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_CHANGED--}'); + displayErrorMessage('{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_CHANGED--}'); } } // END - if } @@ -2293,7 +2294,7 @@ function doAdminNetworkProcessRemoveNetworkTypes () { displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_REMOVED=' . $removed . '%}'); } else { // Nothing removed - loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_REMOVED--}'); + displayErrorMessage('{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_REMOVED--}'); } } // END - if } @@ -2320,7 +2321,7 @@ function doAdminNetworkProcessRemoveNetworkRequestParams () { displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED=' . $removed . '%}'); } else { // Nothing removed - loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED--}'); + displayErrorMessage('{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED--}'); } } // END - if } @@ -2347,7 +2348,7 @@ function doAdminNetworkProcessRemoveNetworkArrayTranslation () { displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_REMOVED=' . $removed . '%}'); } else { // Nothing removed - loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_REMOVED--}'); + displayErrorMessage('{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_REMOVED--}'); } } // END - if } @@ -2357,7 +2358,7 @@ 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') . '%}'); + displayErrorMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED=' . postRequestElement('network_request_param_key') . '%}'); // ... so abort here return FALSE; @@ -2373,15 +2374,15 @@ function doAdminNetworkProcessAddRequestParam () { } // END - if // Add the whole request to database - SQL_QUERY(getInsertSqlFromArray(postRequestArray(), 'network_request_params'), __FUNCTION__, __LINE__); + sqlQuery(getInsertSqlFromArray(postRequestArray(), 'network_request_params'), __FUNCTION__, __LINE__); // Output message - if (!SQL_HASZEROAFFECTED()) { + if (!ifSqlHasZeroAffectedRows()) { // Successfully added 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') . '%}'); + displayErrorMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED=' . postRequestElement('network_request_param_key') . '%}'); } } @@ -2390,7 +2391,7 @@ 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') . '%}'); + displayErrorMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_ALREADY_ADDED=' . postRequestElement('network_array_index') . '%}'); // ... so abort here return FALSE; @@ -2405,20 +2406,20 @@ function doAdminNetworkProcessAddNetworkArrayTranslation () { 'network_array_translation', 'network_array_id', 'network_id', - true, - sprintf(" AND `network_type_id`=%s", bigintval(postRequestElement('network_type_id'))) + TRUE, + sprintf(' AND `network_type_id`=%s', bigintval(postRequestElement('network_type_id'))) ) + 1)); // Add the whole request to database - SQL_QUERY(getInsertSqlFromArray(postRequestArray(), 'network_array_translation'), __FUNCTION__, __LINE__); + sqlQuery(getInsertSqlFromArray(postRequestArray(), 'network_array_translation'), __FUNCTION__, __LINE__); // Output message - if (!SQL_HASZEROAFFECTED()) { + if (!ifSqlHasZeroAffectedRows()) { // Successfully added 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') . '%}'); + displayErrorMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_NOT_ADDED=' . postRequestElement('network_array_index') . '%}'); } } @@ -2430,7 +2431,7 @@ function doAdminNetworkProcessHandleArrayTranslations () { $GLOBALS['network_array_translation_disabled'] = array(); // Load network data - $networkData = getNetworkDataById(getRequestElement('network_id')); + $networkData = getNetworkDataFromId(getRequestElement('network_id')); // Something has been selected, so start displaying one by one $OUT = ''; @@ -2438,10 +2439,10 @@ function doAdminNetworkProcessHandleArrayTranslations () { // Is this selected? if ($sel == 1) { // Load this network's data - $networkTranslationsData = getNetworkArrayTranslationsDataById($networkId); + $networkTranslationsData = getNetworkArrayTranslationsDataFromId($networkId); // Is there found the network? - if (count($networkTranslationsData) > 0) { + if (isFilledArray($networkTranslationsData)) { if (getNetworkFormName() == 'edit') { // Add row template for deleting $OUT .= loadTemplate('admin_edit_network_array_translation_row', TRUE, $networkTranslationsData); @@ -2459,7 +2460,7 @@ function doAdminNetworkProcessHandleArrayTranslations () { } // END - if } // END - foreach - // If we have no rows, we don't need to display the edit form + // If there are no rows, we don't need to display the edit form if (!empty($OUT)) { // Prepare array with generic elements $content = array( @@ -2481,7 +2482,7 @@ function doAdminNetworkProcessHandleArrayTranslations () { $GLOBALS['network_display'] = FALSE; } else { // Nothing selected/found - loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}'); + displayErrorMessage('{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}'); } } // END - if } @@ -2492,7 +2493,7 @@ function doAdminNetworkProcessNetworkApiConfig () { setPostRequestElement('network_id', bigintval(getRequestElement('network_id'))); // NULL empty values - foreach (array('network_api_referral_button', 'network_api_visual_pay_check') as $key) { + foreach (array('network_api_site_id', 'network_api_referral_button', 'network_api_visual_pay_check') as $key) { // Is it set? if (!isPostRequestElementSet($key)) { // Remove empty value to get a NULL for an optional entry @@ -2510,15 +2511,15 @@ function doAdminNetworkProcessNetworkApiConfig () { } // Run the query - SQL_QUERY($SQL, __FUNCTION__, __LINE__); + sqlQuery($SQL, __FUNCTION__, __LINE__); // Output message - if (!SQL_HASZEROAFFECTED()) { + if (!ifSqlHasZeroAffectedRows()) { // Successfully added displayMessage('{--ADMIN_CONFIG_NETWORK_API_SAVED--}'); } else { // Not added - loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_API_NOT_SAVED--}'); + displayErrorMessage('{--ADMIN_CONFIG_NETWORK_API_NOT_SAVED--}'); } } @@ -2565,11 +2566,11 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = TRUE, $co // Shall we set for all? 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', + $result = sqlQueryEscaped('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__); // Are there entries? - if (SQL_HASZERONUMS($result)) { + if (ifSqlHasZeroNums($result)) { // No, then abort here displayMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_SET_ALL_404--}'); return; @@ -2579,7 +2580,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = TRUE, $co $numRows = 0; // Fetch all ids - while (list($typeId) = SQL_FETCHROW($result)) { + while (list($typeId) = sqlFetchRow($result)) { // Set it in GET data setGetRequestElement('network_type_id', $typeId); @@ -2588,7 +2589,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = TRUE, $co } // END - while // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); // Output message if ($numRows > 0) { @@ -2596,28 +2597,28 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = TRUE, $co 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--}'); + displayErrorMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}'); } } else { // Get SQL query for new entry $SQL = getInsertSqlFromArray(postRequestArray(), 'network_handler_config'); // Run the query - SQL_QUERY($SQL, __FUNCTION__, __LINE__); + sqlQuery($SQL, __FUNCTION__, __LINE__); // Shall we display the message? if ($displayMessage === TRUE) { // Output message - if (!SQL_HASZEROAFFECTED()) { + if (!ifSqlHasZeroAffectedRows()) { // 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--}'); + displayErrorMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_SAVED--}'); } } else { // Return amount of affected rows (1 or 2) - return SQL_AFFECTEDROWS(); + return sqlAffectedRows(); } } } @@ -2661,11 +2662,11 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = TRUE, $c // Shall we set for all? if ($setAll === TRUE) { // Get all data entries - $result = SQL_QUERY_ESC('SELECT `network_data_id` FROM `{?_MYSQL_PREFIX?}_network_handler_config` WHERE `network_id`=%s ORDER BY `network_type_id` ASC', + $result = sqlQueryEscaped('SELECT `network_data_id` FROM `{?_MYSQL_PREFIX?}_network_handler_config` WHERE `network_id`=%s ORDER BY `network_type_id` ASC', array(bigintval(getRequestElement('network_id'))), __FUNCTION__, __LINE__); // Are there entries? - if (SQL_HASZERONUMS($result)) { + if (ifSqlHasZeroNums($result)) { // No, then abort here displayMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_SET_ALL_404--}'); return; @@ -2675,7 +2676,7 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = TRUE, $c $numRows = 0; // Fetch all ids - while (list($dataId) = SQL_FETCHROW($result)) { + while (list($dataId) = sqlFetchRow($result)) { // Set it in GET data setPostRequestElement('network_data_id', $dataId); @@ -2684,7 +2685,7 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = TRUE, $c } // END - while // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); // Output message if ($numRows > 0) { @@ -2692,28 +2693,28 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = TRUE, $c 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--}'); + displayErrorMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}'); } } else { // Get SQL query for new entry $SQL = getUpdateSqlFromArray(postRequestArray(), 'network_handler_config', 'network_data_id', postRequestElement('network_data_id'), array('network_data_id')); // Run the query - SQL_QUERY($SQL, __FUNCTION__, __LINE__); + sqlQuery($SQL, __FUNCTION__, __LINE__); // Shall we display the message? if ($displayMessage === TRUE) { // Output message - if (!SQL_HASZEROAFFECTED()) { + if (!ifSqlHasZeroAffectedRows()) { // 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--}'); + displayErrorMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}'); } } else { // Return amount of affected rows (1 or 2) - return SQL_AFFECTEDROWS(); + return sqlAffectedRows(); } } } @@ -2802,7 +2803,7 @@ function doAdminNetworkProcessExport () { // Exports (and displays) the table 'network_data' function doAdminNetworkExportData () { // Query for all networks - $result = SQL_QUERY('SELECT + $result = sqlQuery('SELECT `network_short_name`, `network_title`, `network_reflink`, @@ -2823,7 +2824,7 @@ ORDER BY $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' . PHP_EOL; // Load all entries - while ($content = SQL_FETCHARRAY($result)) { + while ($content = sqlFetchArray($result)) { // Add row $SQL .= "('" . $content['network_short_name'] . "', '" . @@ -2842,7 +2843,7 @@ ORDER BY $SQL = substr($SQL, 0, -2); // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); // Output the SQL query loadTemplate('admin_export_network_data', FALSE, $SQL); @@ -2857,7 +2858,7 @@ function doAdminNetworkExportTypes () { } // END - if // Get all network types of given network - $result = SQL_QUERY_ESC('SELECT + $result = sqlQueryEscaped('SELECT `network_type_id`, `network_id`, `network_type_handler`, @@ -2880,7 +2881,7 @@ ORDER BY $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' . PHP_EOL; // Load all entries - while ($content = SQL_FETCHARRAY($result)) { + while ($content = sqlFetchArray($result)) { // Add row $SQL .= '(' . $content['network_type_id'] . ', ' . @@ -2914,7 +2915,7 @@ ORDER BY $SQL = substr($SQL, 0, -2); // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); // Output the SQL query loadTemplate('admin_export_network_types', FALSE, $SQL); @@ -2929,7 +2930,7 @@ function doAdminNetworkExportRequestParams () { } // END - if // Get all network types of given network - $result = SQL_QUERY_ESC('SELECT + $result = sqlQueryEscaped('SELECT `network_id`, `network_type_id`, `network_request_param_key`, @@ -2950,14 +2951,14 @@ ORDER BY $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' . PHP_EOL; // Load all entries - while ($content = SQL_FETCHARRAY($result)) { + while ($content = sqlFetchArray($result)) { // Add row $SQL .= '(' . $content['network_id'] . ', ' . $content['network_type_id'] . ", '" . $content['network_request_param_key'] . "', '" . $content['network_request_param_value'] . "', "; - + // Is the column NULL? if (is_null($content['network_request_param_default'])) { // Column is NULL @@ -2972,7 +2973,7 @@ ORDER BY $SQL = substr($SQL, 0, -2); // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); // Output the SQL query loadTemplate('admin_export_network_request_params', FALSE, $SQL); @@ -2987,7 +2988,7 @@ function doAdminNetworkExportArrayTranslation () { } // END - if // Get all network types of given network - $result = SQL_QUERY_ESC('SELECT + $result = sqlQueryEscaped('SELECT `network_id`, `network_type_id`, `network_array_index`, @@ -3007,7 +3008,7 @@ ORDER BY $SQL = 'INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES' . PHP_EOL; // Load all entries - while ($content = SQL_FETCHARRAY($result)) { + while ($content = sqlFetchArray($result)) { // Add row $SQL .= '(' . $content['network_id'] . ', ' . @@ -3020,7 +3021,7 @@ ORDER BY $SQL = substr($SQL, 0, -2); // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); // Output the SQL query loadTemplate('admin_export_network_array_translation', FALSE, $SQL); @@ -3063,7 +3064,7 @@ function doAjaxAdminNetworkQuerySingleApi () { $requestParams = getNetworkRequestParametersByTypeId(postRequestElement('network_type_id')); // Is there at least one entry? - if (count($requestParams) == 0) { + if (!isFilledArray($requestParams)) { // No entry found, please setup some first reportBug(__FUNCTION__, __LINE__, 'Network ' . $networkData['network_title'] . ' with id ' . $networkData['network_id'] . ' has no request parameters.'); } // END - if @@ -3110,7 +3111,7 @@ function doAjaxAdminNetworkListById () { } // Load all network type handlers by given network id and extract only network_type_id - $networkTypes = getArrayFromArrayIndex(getNetworkTypeDataById(postRequestElement('network_id')), 'network_type_id'); + $networkTypes = getArrayFromArrayIndex(getNetworkTypeDataFromId(postRequestElement('network_id')), 'network_type_id'); // Set generated array setAjaxReplyContent(encodeJson($networkTypes));