X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fnetwork_functions.php;h=b0c9552f8672a227ca20e74e19dc681ed09a9eb5;hp=5794a6f219fcbbf09bae3aabd88ec92d06ee385e;hb=c9b2e406d8e94ffcff8bac9d453e671f337552e4;hpb=fbdd6b3a1bd2559e3f5186f859f40e71eee45ccc

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 5794a6f219..b0c9552f86 100644
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -743,7 +743,7 @@ function translateNetworkTranslationName ($name) {
 // Translates the network type handler (e.g. banner, paidmail) for templates
 function translateNetworkTypeHandler ($type) {
 	// Get the message id
-	return '{--ADMIN_NETWORK_HANDLER_TYPES_' . strtoupper($type) . '--}';
+	return '{--ADMIN_NETWORK_TYPE_HANDLER_' . strtoupper($type) . '--}';
 }
 
 // Translates request type
@@ -973,7 +973,7 @@ function doAdminNetworkProcessHandleNetworkTypes () {
 			$GLOBALS['network_display'] = false;
 		} else {
 			// Nothing selected/found
-			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_HANDLER_TYPES_NOTHING_FOUND--}');
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_FOUND--}');
 		}
 	} // END - if
 }
@@ -1115,7 +1115,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_HANDLER_TYPES_HANDLE_ALREADY_ADDED=' . postRequestElement('network_type_handler') . '%}');
+		loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPE_HANDLER_ALREADY_ADDED=' . postRequestElement('network_type_handler') . '%}');
 
 		// ... so abort here
 		return false;
@@ -1142,7 +1142,7 @@ function doAdminNetworkProcessAddNetworkType () {
 		loadTemplate('admin_network_type_added', false, postRequestArray());
 	} else {
 		// Not added
-		loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_HANDLER_TYPES_NOT_ADDED=' . postRequestElement('network_type_handler') . '%}');
+		loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPE_HANDLER_NOT_ADDED=' . postRequestElement('network_type_handler') . '%}');
 	}
 }
 
@@ -1191,10 +1191,10 @@ function doAdminNetworkProcessChangeHandlerTypes () {
 		// Do we have updates?
 		if ($updated > 0) {
 			// Updates done
-			displayMessage('{%message,ADMIN_NETWORK_HANDLER_TYPES_UPDATED=' . $updated . '%}');
+			displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_UPDATED=' . $updated . '%}');
 		} else {
 			// Nothing changed
-			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_HANDLER_TYPES_NOTHING_CHANGED--}');
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_CHANGED--}');
 		}
 	} // END - if
 }
@@ -1271,10 +1271,10 @@ function doAdminNetworkProcessRemoveNetworkTypes () {
 		// Do we have removes?
 		if ($removed > 0) {
 			// Removals done
-			displayMessage('{%message,ADMIN_NETWORK_HANDLER_TYPES_REMOVED=' . $removed . '%}');
+			displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_REMOVED=' . $removed . '%}');
 		} else {
 			// Nothing removed
-			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_HANDLER_TYPES_NOTHING_REMOVED--}');
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_REMOVED--}');
 		}
 	} // END - if
 }
@@ -1307,7 +1307,7 @@ function doAdminNetworkProcessRemoveNetworkRequestParams () {
 }
 
 // Adds a request parameter to given network and type
-function doAdminNetworkProcessAddNetworkRequestParams () {
+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
@@ -1616,12 +1616,12 @@ ORDER BY
 		__FUNCTION__, __LINE__);
 
 	// Start an empty SQL query
-	$SQL = '';
+	$SQL = "<pre>INSERT INTO `&#123;&#63;_MYSQL_PREFIX&#63;&#125;_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`) VALUES\n";
 
 	// Load all entries
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Add row
-		$SQL .= "<pre>('" .
+		$SQL .= "('" .
 			$content['network_short_name'] . "', '" .
 			$content['network_title'] . "', '" .
 			$content['network_reflink'] . "', '" .
@@ -1630,11 +1630,11 @@ ORDER BY
 			$content['network_request_type'] . "', '" .
 			$content['network_charset'] . "', '" .
 			$content['network_require_id_card'] . "', " .
-			$content['network_query_amount'] . '),</pre>';
+			$content['network_query_amount'] . "),\n";
 	} // END - while
 
 	// Remove last commata and close braces
-	$SQL = substr($SQL, 0, -7) . '</pre>';
+	$SQL = substr($SQL, 0, -2) . '</pre>';
 
 	// Free result
 	SQL_FREERESULT($result);