X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fnetwork_functions.php;h=b48456411f8c9a52864a54a5ddec0b6423d490af;hb=0f8b6618aeb5d92a372be12066c611c60ff86917;hp=535a9ec0656bca6afeb519f6d2f1b5e2e10f5d8a;hpb=ff9e8f739bd4b6e184b2a6bf427334196e501da8;p=mailer.git

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 535a9ec065..b48456411f 100644
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -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) . '');
 }
 
 //------------------------------------------------------------------------------
@@ -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 {
@@ -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.');
@@ -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.');
@@ -1140,7 +1146,6 @@ function doExpressionNetwork ($data) {
 	// Return it
 	return $code;
 }
-
 // [EOF]
 ?>