X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fnetwork_functions.php;h=ad261c9aa045e27ec573a809acdd1f944d11e36b;hb=cf3765c38cf0a76f396aca291f71858936e92956;hp=001d5b26be213cdd4f12b02829fa863ed8d957cc;hpb=f2aeaab0cd313b2eeb151642455ed558f6b186dc;p=mailer.git

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 001d5b26be..ad261c9aa0 100644
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -62,7 +62,7 @@ function doNetworkHandleForm () {
 			doAdminNetworkProcessForm();
 		} else {
 			// No 'do' found
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_DO_404'));
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_DO_404--}');
 		}
 	} // END - if
 }
@@ -72,11 +72,11 @@ function doAdminNetworkProcessForm () {
 	// Form really sent?
 	if ((!isFormSent()) && (!isFormSent('edit')) && (!isFormSent('del')) && (!isFormSent('change')) && (!isFormSent('remove'))) {
 		// Abort here
-		loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_FORM_NOT_SENT'));
+		loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_FORM_NOT_SENT--}');
 		return;
 	} elseif (!isGetRequestParameterSet('do')) {
 		// No 'do' found
-		loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_DO_404'));
+		loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_DO_404--}');
 		return;
 	}
 
@@ -381,7 +381,7 @@ ORDER BY
 		$content = generateSelectionBoxFromArray($rows, 'network', 'network_id');
 	} else {
 		// Nothing selected
-		$content = loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_ENTRIES_404'));
+		$content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
 	}
 
 	// Free the result
@@ -425,7 +425,7 @@ ORDER BY
 		$content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id');
 	} else {
 		// Nothing selected
-		$content = loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_ENTRIES_404'));
+		$content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
 	}
 
 	// Free the result
@@ -469,12 +469,12 @@ ORDER BY
 		$content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id', '', '_title');
 	} else {
 		// Nothing selected
-		$content = loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_ENTRIES_404'));
+		$content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
 	}
 
 	// Free the result
 	SQL_FREERESULT($result);
-	//* DEBUG: */ die('<pre>'.htmlentities($content).'</pre>');
+	//* DEBUG: */ die('<pre>'.encodeEntities($content).'</pre>');
 
 	// Return content
 	return $content;
@@ -620,7 +620,7 @@ function doAdminNetworkProcessHandlenetworkForm () {
 	// Do we have selections?
 	if (countPostSelection() > 0) {
 		// Something has been selected, so start displaying one by one
-		$SW = 2; $OUT = '';
+		$OUT = '';
 		foreach (postRequestParameter('sel') as $id => $sel) {
 			// Is this selected?
 			if ($sel == 1) {
@@ -629,9 +629,6 @@ function doAdminNetworkProcessHandlenetworkForm () {
 
 				// Do we have found the network?
 				if (count($networkData) > 0) {
-					// Add color
-					$networkData['sw'] = $SW;
-
 					if (isFormSent('edit')) {
 						// Make selection box for network_request_type
 						$networkData['network_request_type'] = generateOptionList(
@@ -659,9 +656,6 @@ function doAdminNetworkProcessHandlenetworkForm () {
 						// Problem!
 						debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
 					}
-
-					// Switch colors
-					$SW = 3 - $SW;
 				} // END - if
 			} // END - if
 		} // END - foreach
@@ -682,7 +676,7 @@ function doAdminNetworkProcessHandlenetworkForm () {
 			$GLOBALS['network_display'] = false;
 		} else {
 			// Nothing selected/found
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_NOTHING_FOUND'));
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_FOUND--}');
 		}
 	} // END - if
 }
@@ -695,7 +689,7 @@ function doAdminNetworkProcessHandlenetworktypeForm () {
 		$networkData = getNetworkDataById(getRequestParameter('network'));
 
 		// Something has been selected, so start displaying one by one
-		$SW = 2; $OUT = '';
+		$OUT = '';
 		foreach (postRequestParameter('sel') as $id => $sel) {
 			// Is this selected?
 			if ($sel == 1) {
@@ -704,25 +698,16 @@ function doAdminNetworkProcessHandlenetworktypeForm () {
 
 				// Do we have found the network?
 				if (count($networkTypeData) > 0) {
-					// Add color
-					$networkTypeData['sw'] = $SW;
-
 					if (isFormSent('edit')) {
 						// Add row template for deleting
 						$OUT .= loadTemplate('admin_edit_network_types_row', true, $networkTypeData);
 					} elseif (isFormSent('del')) {
-						// Fix empty banner URL
-						if (trim($networkTypeData['network_type_banner_url']) == '') $networkTypeData['network_type_banner_url'] = '---';
-
 						// Add row template for deleting
 						$OUT .= loadTemplate('admin_del_network_types_row', true, $networkTypeData);
 					} else {
 						// Problem!
 						debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
 					}
-
-					// Switch colors
-					$SW = 3 - $SW;
 				} // END - if
 			} // END - if
 		} // END - foreach
@@ -749,7 +734,7 @@ function doAdminNetworkProcessHandlenetworktypeForm () {
 			$GLOBALS['network_display'] = false;
 		} else {
 			// Nothing selected/found
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_FOUND'));
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPES_NOTHING_FOUND--}');
 		}
 	} // END - if
 }
@@ -765,7 +750,7 @@ function doAdminNetworkProcessHandlerequestparamsForm () {
 		$networkData = getNetworkDataById(getRequestParameter('network'));
 
 		// Something has been selected, so start displaying one by one
-		$SW = 2; $OUT = '';
+		$OUT = '';
 		foreach (postRequestParameter('sel') as $id => $sel) {
 			// Is this selected?
 			if ($sel == 1) {
@@ -774,9 +759,6 @@ function doAdminNetworkProcessHandlerequestparamsForm () {
 
 				// Do we have found the network?
 				if (count($networkRequestData) > 0) {
-					// Add color
-					$networkRequestData['sw'] = $SW;
-
 					if (isFormSent('edit')) {
 						// Add options list for network type
 						$networkRequestData['type_options'] = generateNetworkTypeOptions($networkRequestData['network_type_id']);
@@ -787,9 +769,6 @@ function doAdminNetworkProcessHandlerequestparamsForm () {
 						// Add row template for deleting
 						$OUT .= loadTemplate('admin_edit_network_params_row', true, $networkRequestData);
 					} elseif (isFormSent('del')) {
-						// Fix empty banner URL
-						if (trim($networkRequestData['request_param_default']) == '') $networkRequestData['request_param_default'] = '---';
-
 						// Get type data
 						$networkRequestData['network_type_data'] = getNetworkTypeDataById($networkRequestData['network_type_id']);
 
@@ -799,9 +778,6 @@ function doAdminNetworkProcessHandlerequestparamsForm () {
 						// Problem!
 						debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
 					}
-
-					// Switch colors
-					$SW = 3 - $SW;
 				} // END - if
 			} // END - if
 		} // END - foreach
@@ -828,7 +804,7 @@ function doAdminNetworkProcessHandlerequestparamsForm () {
 			$GLOBALS['network_display'] = false;
 		} else {
 			// Nothing selected/found
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND'));
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}');
 		}
 	} // END - if
 }
@@ -873,7 +849,7 @@ function doAdminNetworkProcessChangenetworkForm () {
 			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_UPDATED', $updated));
 		} else {
 			// Nothing changed
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_NOTHING_CHANGED'));
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_CHANGED--}');
 		}
 	} // END - if
 }
@@ -900,7 +876,7 @@ function doAdminNetworkProcessRemovenetworkForm () {
 			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REMOVED', $removed));
 		} else {
 			// Nothing removed
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_NOTHING_REMOVED'));
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_REMOVED--}');
 		}
 	} // END - if
 }
@@ -993,7 +969,7 @@ function doAdminNetworkProcessChangenetworktypeForm () {
 			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_UPDATED', $updated));
 		} else {
 			// Nothing changed
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_CHANGED'));
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPES_NOTHING_CHANGED--}');
 		}
 	} // END - if
 }
@@ -1044,7 +1020,7 @@ function doAdminNetworkProcessChangenetworkparamForm () {
 			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED', $updated));
 		} else {
 			// Nothing changed
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED'));
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED--}');
 		}
 	} // END - if
 }
@@ -1071,7 +1047,7 @@ function doAdminNetworkProcessRemovenetworktypeForm () {
 			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_REMOVED', $removed));
 		} else {
 			// Nothing removed
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_REMOVED'));
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPES_NOTHING_REMOVED--}');
 		}
 	} // END - if
 }
@@ -1098,7 +1074,7 @@ function doAdminNetworkProcessRemovenetworkparamForm () {
 			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED', $removed));
 		} else {
 			// Nothing removed
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED'));
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED--}');
 		}
 	} // END - if
 }