X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fnetwork_functions.php;h=d8fbacec8ce99412d202b9083ce45e655847bd12;hb=139c6a53f8564dcb92e228f0561323836555362b;hp=da20b81374de623e09200c14277b09daa030a084;hpb=968b5160ae624519f1a9491f00e0aeadf25729fb;p=mailer.git diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php index da20b81374..d8fbacec8c 100644 --- a/inc/libs/network_functions.php +++ b/inc/libs/network_functions.php @@ -81,7 +81,7 @@ function doAdminNetworkProcessForm () { } // Create function name - $functionName = sprintf("doAdminNetworkProcess%sForm", ucfirst(strtolower(getRequestParameter('do')))); + $functionName = sprintf("doAdminNetworkProcess%sForm", capitalizeUnderscoreString(getRequestParameter('do'))); // Is the function valid? if (!function_exists($functionName)) { @@ -358,15 +358,15 @@ function generateAdminNetworkList () { $content = ''; // Query for all networks - $result = SQL_QUERY("SELECT + $result = SQL_QUERY('SELECT `network_id`, `network_short_name`, `network_title` FROM `{?_MYSQL_PREFIX?}_network_data` ORDER BY - `network_short_name` ASC", __FUNCTION__, __LINE__); + `network_short_name` ASC', __FUNCTION__, __LINE__); // Do we have entries? - if (SQL_NUMROWS($result) > 0) { + if (!SQL_HASZERONUMS($result)) { // List all entries $rows = array(); while ($row = SQL_FETCHARRAY($result)) { @@ -410,7 +410,7 @@ ORDER BY ), __FUNCTION__, __LINE__); // Do we have entries? - if (SQL_NUMROWS($result) > 0) { + if (!SQL_HASZERONUMS($result)) { // List all entries $rows = array(); while ($row = SQL_FETCHARRAY($result)) { @@ -441,7 +441,7 @@ function generateAdminDistinctNetworkTypeList () { $content = ''; // Query all types of this network - $result = SQL_QUERY("SELECT + $result = SQL_QUERY('SELECT t.`network_type_id`, t.`network_type_handle`, d.`network_title` FROM `{?_MYSQL_PREFIX?}_network_types` AS t @@ -451,10 +451,10 @@ ON t.`network_id`=d.`network_id` ORDER BY d.`network_short_name` ASC, - t.`network_type_handle` ASC", __FUNCTION__, __LINE__); + t.`network_type_handle` ASC', __FUNCTION__, __LINE__); // Do we have entries? - if (SQL_NUMROWS($result) > 0) { + if (!SQL_HASZERONUMS($result)) { // List all entries $rows = array(); while ($row = SQL_FETCHARRAY($result)) { @@ -497,7 +497,9 @@ function generateNetworkTypeOptions ($id) { sprintf( "WHERE `network_id`=%s", bigintval(getRequestParameter('network')) - ) + ), + '', + 'translateNetworkTypeHandler' ); } // END - if @@ -555,26 +557,65 @@ function generateNetworkRequestKeyOptions ($key) { } // Generator (somewhat getter) for (return) array translation -function generateNetworkArrayTranslationOptions ($default) { +function generateNetworkTranslationOptions ($default = '') { // Is it cached? - if (!isset($GLOBALS['network_array_translation'][$default])) { + if (!isset($GLOBALS['network_translation'][$default])) { // Generate and cache it - $GLOBALS['network_array_translation'][$default] = generateOptionList( + $GLOBALS['network_translation'][$default] = generateOptionList( 'network_translations', - 'network_translation', - 'network_translation', + 'network_translation_id', + 'network_translation_name', $default, '', - sprintf("WHERE `network_type_id`=%s", - bigintval(getRequestParameter('network_type')) - ), - $GLOBALS['network_array_translation_disabled'], - 'ADMIN_NETWORK_ARRAY_TRANSLATION_' + '', + $GLOBALS['network_translation_disabled'], + 'translateNetworkTranslationName' ); } // END - if // Return content - return $GLOBALS['network_array_translation'][$default]; + return $GLOBALS['network_translation'][$default]; +} + +// Generates an option list of request types +function generateNetworkRequestTypeOptions ($default = '') { + // Do we have cache? + if (!isset($GLOBALS['network_request_type'][$default])) { + // Generate the list + $GLOBALS['network_request_type'][$default] = generateOptionList( + '/ARRAY/', + array( + 'GET', + 'POST' + ), + array( + '{--ADMIN_NETWORK_REQUEST_TYPE_GET--}', + '{--ADMIN_NETWORK_REQUEST_TYPE_POST--}' + ), + $default + ); + } // END - if + + // Return cache + return $GLOBALS['network_request_type'][$default]; +} + +// Translates 'translate_name' for e.g. templates +function translateNetworkTranslationName ($name) { + // Get the message id + return getMessage('ADMIN_NETWORK_TRANSLATE_' . strtoupper($name) . '_NAME'); +} + +// Translates the network type handler (e.g. banner, paidmail) for templates +function translateNetworkTypeHandler ($type) { + // Get the message id + return getMessage('ADMIN_NETWORK_TYPES_' . strtoupper($type) . ''); +} + +// Translates request type +function translateNetworkRequestType ($name) { + // Get the message id + return getMessage('ADMIN_NETWORK_REQUEST_TYPE_' . strtoupper($name) . ''); } //------------------------------------------------------------------------------ @@ -582,7 +623,7 @@ function generateNetworkArrayTranslationOptions ($default) { //------------------------------------------------------------------------------ // Callback function to add new network -function doAdminNetworkProcessAddnetworkForm () { +function doAdminNetworkProcessAddNetworkForm () { // We can say here, the form is sent, so check if the network is already added if (isNetworkNameValid(postRequestParameter('network_short_name'))) { // Already there @@ -594,10 +635,10 @@ function doAdminNetworkProcessAddnetworkForm () { unsetPostRequestParameter('ok'); // Add the whole request to database - SQL_QUERY("INSERT INTO + SQL_QUERY('INSERT INTO `{?_MYSQL_PREFIX?}_network_data` ( - `" . implode('`,`', array_keys(postRequestArray())) . "` + `' . implode('`,`', array_keys(postRequestArray())) . "` ) VALUES ( '" . implode("','", array_values(postRequestArray())) . "' )", __FUNCTION__, __LINE__); @@ -616,9 +657,9 @@ function doAdminNetworkProcessAddnetworkForm () { } // Displays selected networks for editing -function doAdminNetworkProcessHandlenetworkForm () { +function doAdminNetworkProcessHandleNetworkForm () { // Do we have selections? - if (countPostSelection() > 0) { + if (ifPostContainsSelections()) { // Something has been selected, so start displaying one by one $OUT = ''; foreach (postRequestParameter('sel') as $id => $sel) { @@ -630,26 +671,9 @@ function doAdminNetworkProcessHandlenetworkForm () { // Do we have found the network? if (count($networkData) > 0) { if (isFormSent('edit')) { - // Make selection box for network_request_type - $networkData['network_request_type'] = generateOptionList( - '/ARRAY/', - array( - 'GET', - 'POST' - ), - array( - '{--ADMIN_NETWORK_REQUEST_TYPE_GET--}', - '{--ADMIN_NETWORK_REQUEST_TYPE_POST--}' - ), - $networkData['network_request_type'] - ); - // Add row template for editing $OUT .= loadTemplate('admin_edit_networks_row', true, $networkData); } elseif (isFormSent('del')) { - // Translate the request type - $networkData['network_request_type'] = '{--ADMIN_NETWORK_REQUEST_TYPE_' . $networkData['network_request_type'] . '--}'; - // Add row template for deleting $OUT .= loadTemplate('admin_del_networks_row', true, $networkData); } else { @@ -682,9 +706,9 @@ function doAdminNetworkProcessHandlenetworkForm () { } // Handle network type form -function doAdminNetworkProcessHandlenetworktypeForm () { +function doAdminNetworkProcessHandleNetworkTypeForm () { // Do we have selections? - if (countPostSelection() > 0) { + if (ifPostContainsSelections()) { // Load network data $networkData = getNetworkDataById(getRequestParameter('network')); @@ -714,17 +738,11 @@ function doAdminNetworkProcessHandlenetworktypeForm () { // If we have no rows, we don't need to display the edit form if (!empty($OUT)) { - // Prepare content for template - $content = array( - 'rows' => $OUT, - 'network_data' => getNetworkDataById(getRequestParameter('network')) - ); - // Output main template if (isFormSent('edit')) { - loadTemplate('admin_edit_network_types', false, $content); + loadTemplate('admin_edit_network_types', false, $OUT); } elseif (isFormSent('del')) { - loadTemplate('admin_del_network_types', false, $content); + loadTemplate('admin_del_network_types', false, $OUT); } else { // Problem! debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.'); @@ -740,9 +758,9 @@ function doAdminNetworkProcessHandlenetworktypeForm () { } // Handle network request parameter form -function doAdminNetworkProcessHandlerequestparamsForm () { +function doAdminNetworkProcessHandleRequestParamsForm () { // Do we have selections? - if (countPostSelection() > 0) { + if (ifPostContainsSelections()) { // Init cache array $GLOBALS['network_params_disabled'] = array(); @@ -760,12 +778,6 @@ function doAdminNetworkProcessHandlerequestparamsForm () { // Do we have found the network? if (count($networkRequestData) > 0) { if (isFormSent('edit')) { - // Add options list for network type - $networkRequestData['type_options'] = generateNetworkTypeOptions($networkRequestData['network_type_id']); - - // Add options list for request key - $networkRequestData['key_options'] = generateNetworkRequestKeyOptions($networkRequestData['request_param_key']); - // Add row template for deleting $OUT .= loadTemplate('admin_edit_network_params_row', true, $networkRequestData); } elseif (isFormSent('del')) { @@ -784,17 +796,11 @@ function doAdminNetworkProcessHandlerequestparamsForm () { // If we have no rows, we don't need to display the edit form if (!empty($OUT)) { - // Prepare content for template - $content = array( - 'rows' => $OUT, - 'network_data' => getNetworkDataById(getRequestParameter('network')) - ); - // Output main template if (isFormSent('edit')) { - loadTemplate('admin_edit_network_params', false, $content); + loadTemplate('admin_edit_network_params', false, $OUT); } elseif (isFormSent('del')) { - loadTemplate('admin_del_network_params', false, $content); + loadTemplate('admin_del_network_params', false, $OUT); } else { // Problem! debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.'); @@ -810,9 +816,9 @@ function doAdminNetworkProcessHandlerequestparamsForm () { } // Changes given networks -function doAdminNetworkProcessChangenetworkForm () { +function doAdminNetworkProcessChangeNetworkForm () { // Do we have selections? - if (countPostSelection() > 0) { + if (ifPostContainsSelections()) { // By default nothing is updated $updated = 0; @@ -855,9 +861,9 @@ function doAdminNetworkProcessChangenetworkForm () { } // Removes given networks -function doAdminNetworkProcessRemovenetworkForm () { +function doAdminNetworkProcessRemoveNetworkForm () { // Do we have selections? - if (countPostSelection() > 0) { + if (ifPostContainsSelections()) { // By default nothing is removed $removed = 0; @@ -882,7 +888,7 @@ function doAdminNetworkProcessRemovenetworkForm () { } // Add a network type handler if not yet found -function doAdminNetworkProcessAddnetworktypeForm () { +function doAdminNetworkProcessAddNetworkTypeForm () { // Is the network type handle already used with given network? if (isNetworkTypeHandleValid(postRequestParameter('network_type_handle'), getRequestParameter('network'))) { // Already added @@ -924,9 +930,9 @@ function doAdminNetworkProcessAddnetworktypeForm () { } // Changes given network type handlers -function doAdminNetworkProcessChangenetworktypeForm () { +function doAdminNetworkProcessChangeNetworkTypeForm () { // Do we have selections? - if (countPostSelection() > 0) { + if (ifPostContainsSelections()) { // By default nothing is updated $updated = 0; @@ -975,9 +981,9 @@ function doAdminNetworkProcessChangenetworktypeForm () { } // Changes given network request parameters -function doAdminNetworkProcessChangenetworkparamForm () { +function doAdminNetworkProcessChangeNetworkParamForm () { // Do we have selections? - if (countPostSelection() > 0) { + if (ifPostContainsSelections()) { // By default nothing is updated $updated = 0; @@ -1026,9 +1032,9 @@ function doAdminNetworkProcessChangenetworkparamForm () { } // Removes given network type handlers -function doAdminNetworkProcessRemovenetworktypeForm () { +function doAdminNetworkProcessRemoveNetworkTypeForm () { // Do we have selections? - if (countPostSelection() > 0) { + if (ifPostContainsSelections()) { // By default nothing is removed $removed = 0; @@ -1053,9 +1059,9 @@ function doAdminNetworkProcessRemovenetworktypeForm () { } // Removes given network request parameters -function doAdminNetworkProcessRemovenetworkparamForm () { +function doAdminNetworkProcessRemoveNetworkParamForm () { // Do we have selections? - if (countPostSelection() > 0) { + if (ifPostContainsSelections()) { // By default nothing is removed $removed = 0; @@ -1080,7 +1086,7 @@ function doAdminNetworkProcessRemovenetworkparamForm () { } // Adds a request parameter to given network and type -function doAdminNetworkProcessAddnetworkparamForm () { +function doAdminNetworkProcessAddNetworkParamForm () { // Is the request parameter already used with given network? if (isNetworkRequestParameterValid(postRequestParameter('request_param_key'), postRequestParameter('network_type_id'), getRequestParameter('network'))) { // Already added @@ -1103,10 +1109,10 @@ function doAdminNetworkProcessAddnetworkparamForm () { } // END - if // Add the whole request to database - SQL_QUERY("INSERT INTO + SQL_QUERY('INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` ( - `" . implode('`,`', array_keys(postRequestArray())) . "` + `' . implode('`,`', array_keys(postRequestArray())) . "` ) VALUES ( '" . implode("','", array_values(postRequestArray())) . "' )", __FUNCTION__, __LINE__); @@ -1140,7 +1146,6 @@ function doExpressionNetwork ($data) { // Return it return $code; } - // [EOF] ?>