X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fnetwork_functions.php;h=735b1a53355d6e3e1b5bae80c70c1f00d42c2a1a;hb=7052cc3bd3ca07281078acbbce6ce595d753def1;hp=8312c16ea9f066878400b96ae1dcd27c2f505124;hpb=2df9f7a53f8b1dd5164f87824a324ccb3b6634cb;p=mailer.git

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 8312c16ea9..735b1a5335 100644
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -103,7 +103,7 @@ function doAdminNetworkProcessForm () {
 	// Is the function valid?
 	if (!function_exists($functionName)) {
 		// Invalid function name
-		reportBug(__FUNCTION__, __LINE__, 'Invalid do ' . getRequestElement('do') . ', function ' . $functionName .' does not exist.', false);
+		reportBug(__FUNCTION__, __LINE__, 'Invalid do ' . getRequestElement('do') . ', function ' . $functionName .' does not exist.', FALSE);
 	} // END - if
 
 	// Init global arrays
@@ -115,18 +115,56 @@ function doAdminNetworkProcessForm () {
 
 // Checks whether the (short) network name is already used (valid)
 function isNetworkNameValid ($name) {
-	// Query for it
-	$result = SQL_QUERY_ESC("SELECT `network_id` FROM `{?_MYSQL_PREFIX?}_network_data` WHERE `network_short_name`='%s' LIMIT 1",
-		array($name), __FUNCTION__, __LINE__);
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__][$name])) {
+		// Does it exist?
+		$GLOBALS[__FUNCTION__][$name] = (countSumTotalData($name, 'network_data', 'network_id', 'network_short_name', TRUE) == 1);
+	} // END - if
 
-	// Does it exist?
-	$isValid = (SQL_NUMROWS($result) == 1);
+	// Return result
+	return $GLOBALS[__FUNCTION__][$name];
+}
 
-	// Free result
-	SQL_FREERESULT($result);
+// Checks whether the (short) named network is activated
+function isNetworkActiveByShortName ($name) {
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__][$name])) {
+		// Does it exist?
+		$GLOBALS[__FUNCTION__][$name] = ((isNetworkNameValid($name)) && (countSumTotalData($name, 'network_data', 'network_id', 'network_short_name', TRUE, " AND `network_active`='Y'") == 1));
+	} // END - if
 
 	// Return result
-	return $isValid;
+	return $GLOBALS[__FUNCTION__][$name];
+}
+
+// Checks whether the network by given id is activated
+function isNetworkActiveById ($networkId) {
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__][$networkId])) {
+		// Does it exist?
+		$GLOBALS[__FUNCTION__][$networkId] = (countSumTotalData(bigintval($networkId), 'network_data', 'network_id', 'network_id', TRUE, " AND `network_active`='Y'") == 1);
+	} // END - if
+
+	// Return result
+	return $GLOBALS[__FUNCTION__][$networkId];
+}
+
+// "Getter" for 'network_activated' column depending on current administrator's expert setting
+function getNetworkActivatedColumn ($whereAnd = 'WHERE', $table = '') {
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__][$whereAnd][$table])) {
+		// Default is exclude deactivated networks
+		$GLOBALS[__FUNCTION__][$whereAnd][$table] = ' ' . $whereAnd . ' ' . $table . "`network_active`='Y'";
+
+		// Is the export setting on?
+		if (isAdminsExpertSettingEnabled()) {
+			// Then allow all networks
+			$GLOBALS[__FUNCTION__][$whereAnd][$table] = '';
+		} // END - if
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__][$whereAnd][$table];
 }
 
 // Checks whether the given network type is already used (valid)
@@ -213,7 +251,10 @@ function getNetworkDataById ($networkId, $column = '') {
 	if ($networkId < 1) {
 		// Not good, should be fixed
 		reportBug(__FUNCTION__, __LINE__, 'Network id ' . $networkId . ' is smaller than 1.');
-	} // END - if
+	} elseif ((!isNetworkActiveById($networkId)) && (!isAdminsExpertSettingEnabled())) {
+		// Do not load inactive network data
+		reportBug(__FUNCTION__, __LINE__, 'Network id ' . $networkId . ' is not active.');
+	}
 
 	// Set current network id
 	setCurrentNetworkId($networkId);
@@ -224,7 +265,7 @@ function getNetworkDataById ($networkId, $column = '') {
 		$GLOBALS['network_data'][$networkId] = array();
 
 		// Query for the network data
-		$result = SQL_QUERY_ESC("SELECT
+		$result = SQL_QUERY_ESC('SELECT
 	`network_id`,
 	`network_short_name`,
 	`network_title`,
@@ -239,7 +280,7 @@ FROM
 	`{?_MYSQL_PREFIX?}_network_data`
 WHERE
 	`network_id`=%s
-LIMIT 1",
+LIMIT 1',
 			array(bigintval($networkId)), __FUNCTION__, __LINE__);
 
 		// Is there an entry?
@@ -253,13 +294,16 @@ LIMIT 1",
 	} // END - if
 
 	// Return result
-	if (empty($column)) {
+	if ((empty($column)) && (isset($GLOBALS['network_data'][$networkId]))) {
 		// Return array
 		return $GLOBALS['network_data'][$networkId];
-	} else {
+	} elseif (isset($GLOBALS['network_data'][$networkId][$column])) {
 		// Return column
 		return $GLOBALS['network_data'][$networkId][$column];
 	}
+
+	// Return NULL
+	return NULL;
 }
 
 // "Getter" for a network's data by provided type id number
@@ -268,7 +312,10 @@ function getNetworkDataByTypeId ($networkId, $column = '') {
 	if ($networkId < 1) {
 		// Not good, should be fixed
 		reportBug(__FUNCTION__, __LINE__, 'Network type id ' . $networkId . ' is smaller than 1.');
-	} // END - if
+	} elseif ((!isNetworkActiveById($networkId)) && (!isAdminsExpertSettingEnabled())) {
+		// Do not load inactive network data
+		reportBug(__FUNCTION__, __LINE__, 'Network id ' . $networkId . ' is not active.');
+	}
 
 	// Set current network id
 	setCurrentNetworkId($networkId);
@@ -279,7 +326,7 @@ function getNetworkDataByTypeId ($networkId, $column = '') {
 		$GLOBALS['network_data'][$networkId] = array();
 
 		// Query for the network data
-		$result = SQL_QUERY_ESC("SELECT
+		$result = SQL_QUERY_ESC('SELECT
 	d.`network_id`,
 	d.`network_short_name`,
 	d.`network_title`,
@@ -303,7 +350,7 @@ ON
 	d.`network_id`=t.`network_id`
 WHERE
 	t.`network_type_id`=%s
-LIMIT 1",
+LIMIT 1',
 			array(bigintval($networkId)), __FUNCTION__, __LINE__);
 
 		// Is there an entry?
@@ -327,15 +374,15 @@ LIMIT 1",
 }
 
 // "Getter" for a network type data by provided id number
-function getNetworkTypeDataById ($networkId) {
+function getNetworkTypeDataById ($networkTypeId) {
 	// Ids lower one are not accepted
-	if ($networkId < 1) {
+	if ($networkTypeId < 1) {
 		// Not good, should be fixed
-		reportBug(__FUNCTION__, __LINE__, 'Network type id ' . $networkId . ' is smaller than 1.');
+		reportBug(__FUNCTION__, __LINE__, 'Network type id ' . $networkTypeId . ' is smaller than 1.');
 	} // END - if
 
 	// By default we have no data
-	$GLOBALS['network_type_data'][$networkId] = array();
+	$GLOBALS['network_type_data'][$networkTypeId] = array();
 
 	// Query for the network data
 	$result = SQL_QUERY_ESC('SELECT
@@ -350,27 +397,27 @@ FROM
 WHERE
 	`network_type_id`=%s
 LIMIT 1',
-		array(bigintval($networkId)), __FUNCTION__, __LINE__);
+		array(bigintval($networkTypeId)), __FUNCTION__, __LINE__);
 
 	// Is there an entry?
 	if (SQL_NUMROWS($result) == 1) {
 		// Then get it
-		$GLOBALS['network_type_data'][$networkId] = SQL_FETCHARRAY($result);
+		$GLOBALS['network_type_data'][$networkTypeId] = SQL_FETCHARRAY($result);
 	} // END - if
 
 	// Free result
 	SQL_FREERESULT($result);
 
 	// Return result
-	return $GLOBALS['network_type_data'][$networkId];
+	return $GLOBALS['network_type_data'][$networkTypeId];
 }
 
 // "Getter" for a network request parameter data by provided id number
-function getNetworkRequestParamsDataById ($networkId) {
+function getNetworkRequestParamsDataById ($networkRequestId) {
 	// Ids lower one are not accepted
-	if ($networkId < 1) {
+	if ($networkRequestId < 1) {
 		// Not good, should be fixed
-		reportBug(__FUNCTION__, __LINE__, 'Network request parameter id ' . $networkId . ' is smaller than 1.');
+		reportBug(__FUNCTION__, __LINE__, 'Network request parameter id ' . $networkRequestId . ' is smaller than 1.');
 	} // END - if
 
 	// By default we have no data
@@ -389,7 +436,7 @@ FROM
 WHERE
 	`network_request_param_id`=%s
 LIMIT 1',
-		array(bigintval($networkId)), __FUNCTION__, __LINE__);
+		array(bigintval($networkRequestId)), __FUNCTION__, __LINE__);
 
 	// Is there an entry?
 	if (SQL_NUMROWS($result) == 1) {
@@ -404,6 +451,44 @@ LIMIT 1',
 	return $networkRequestData;
 }
 
+// "Getter" for a network array translation data by provided id number
+function getNetworkArrayTranslationsDataById ($networkTranslationId) {
+	// Ids lower one are not accepted
+	if ($networkTranslationId < 1) {
+		// Not good, should be fixed
+		reportBug(__FUNCTION__, __LINE__, 'Network array translation id ' . $networkTranslationId . ' is smaller than 1.');
+	} // END - if
+
+	// By default we have no data
+	$networkTranslationData = array();
+
+	// Query for the network data
+	$result = SQL_QUERY_ESC('SELECT
+	`network_array_id`,
+	`network_id`,
+	`network_type_id`,
+	`network_array_index`,
+	`network_array_sort`
+FROM
+	`{?_MYSQL_PREFIX?}_network_array_translation`
+WHERE
+	`network_array_id`=%s
+LIMIT 1',
+		array(bigintval($networkTranslationId)), __FUNCTION__, __LINE__);
+
+	// Is there an entry?
+	if (SQL_NUMROWS($result) == 1) {
+		// Then get it
+		$networkTranslationData = SQL_FETCHARRAY($result);
+	} // END - if
+
+	// Free result
+	SQL_FREERESULT($result);
+
+	// Return result
+	return $networkTranslationData;
+}
+
 // Updates given network (id) with data from array
 function doNetworkUpdateDataByArray ($networkId, $networkData) {
 	// Ids lower one are not accepted
@@ -413,41 +498,53 @@ function doNetworkUpdateDataByArray ($networkId, $networkData) {
 	} // END - if
 
 	// Just call our inner method
-	return adminSaveSettings($networkData, '_network_data', sprintf("`network_id`=%s", bigintval($networkId)), array(), false, false);
+	return adminSaveSettings($networkData, '_network_data', sprintf("`network_id`=%s", bigintval($networkId)), array(), FALSE, FALSE);
 }
 
 // Updates given network type handler (id) with data from array
-function doNetworkUpdateTypeByArray ($networkId, $networkTypeData) {
+function doNetworkUpdateTypeByArray ($networkTypeId, $networkTypeData) {
 	// Ids lower one are not accepted
-	if ($networkId < 1) {
+	if ($networkTypeId < 1) {
 		// Not good, should be fixed
-		reportBug(__FUNCTION__, __LINE__, 'Network type handler id ' . $networkId . ' is smaller than 1.');
+		reportBug(__FUNCTION__, __LINE__, 'Network type handler id ' . $networkTypeId . ' is smaller than 1.');
 	} // END - if
 
 	// Just call our inner method
-	return adminSaveSettings($networkTypeData, '_network_types', sprintf("`network_type_id`=%s", bigintval($networkId)), array(), false, false);
+	return adminSaveSettings($networkTypeData, '_network_types', sprintf("`network_type_id`=%s", bigintval($networkTypeId)), array(), FALSE, FALSE);
 }
 
 // Updates given network request parameters (id) with data from array
-function doNetworkUpdateParamsByArray ($networkId, $networkParamData) {
+function doNetworkUpdateParamsByArray ($networkParamsId, $networkParamsData) {
 	// Ids lower one are not accepted
-	if ($networkId < 1) {
+	if ($networkParamsId < 1) {
 		// Not good, should be fixed
-		reportBug(__FUNCTION__, __LINE__, 'Network request parameter id ' . $networkId . ' is smaller than 1.');
+		reportBug(__FUNCTION__, __LINE__, 'Network request parameter id ' . $networkParamsId . ' is smaller than 1.');
 	} // END - if
 
 	// Just call our inner method
-	return adminSaveSettings($networkParamData, '_network_request_params', sprintf("`network_request_param_id`=%s", bigintval($networkId)), array(), false, false);
+	return adminSaveSettings($networkParamsData, '_network_request_params', sprintf("`network_request_param_id`=%s", bigintval($networkParamsId)), array(), FALSE, FALSE);
+}
+
+// Updates given network array translations (id) with data from array
+function doNetworkUpdateArrayTranslationsByArray ($networkTranslationsId, $networkTranslationsData) {
+	// Ids lower one are not accepted
+	if ($networkTranslationsId < 1) {
+		// Not good, should be fixed
+		reportBug(__FUNCTION__, __LINE__, 'Network request parameter id ' . $networkTranslationsId . ' is smaller than 1.');
+	} // END - if
+
+	// Just call our inner method
+	return adminSaveSettings($networkTranslationsData, '_network_array_translation', sprintf("`network_array_id`=%s", bigintval($networkTranslationsId)), array(), FALSE, FALSE);
 }
 
 // Removes given network entry
-function doAdminRemoveNetworkEntry ($table, $column, $networkId, $limit = 1) {
+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",
 		array(
 			$table,
 			$column,
-			$networkId,
+			$id,
 			$limit
 		), __FUNCTION__, __LINE__);
 
@@ -461,16 +558,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`
-WHERE
-	`network_active`='Y'
+' . getNetworkActivatedColumn() . '
 ORDER BY
-	`network_short_name` ASC", __FUNCTION__, __LINE__);
+	`network_short_name` ASC', __FUNCTION__, __LINE__);
 
 	// Are there entries?
 	if (!SQL_HASZERONUMS($result)) {
@@ -488,7 +584,7 @@ ORDER BY
 		$content = generateSelectionBoxFromArray($rows, 'network_id', 'network_id', '', '', 'network');
 	} else {
 		// Nothing selected
-		$content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
+		$content = loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_ENTRIES_404--}');
 	}
 
 	// Free the result
@@ -511,6 +607,7 @@ FROM
 	`{?_MYSQL_PREFIX?}_network_types`
 WHERE
 	`network_id`=%s
+	' . getNetworkActivatedColumn('AND') . '
 ORDER BY
 	`network_type_handler` ASC',
 		array(
@@ -533,7 +630,7 @@ ORDER BY
 		$content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id');
 	} else {
 		// Nothing selected
-		$content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
+		$content = loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_ENTRIES_404--}');
 	}
 
 	// Free the result
@@ -549,7 +646,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_handler`,
 	d.`network_title`
@@ -559,11 +656,10 @@ LEFT JOIN
 	`{?_MYSQL_PREFIX?}_network_data` AS d
 ON
 	t.`network_id`=d.`network_id`
-WHERE
-	d.`network_active`='Y'
+' . getNetworkActivatedColumn('WHERE', 'd') . '
 ORDER BY
 	d.`network_short_name` ASC,
-	t.`network_type_handler` ASC", __FUNCTION__, __LINE__);
+	t.`network_type_handler` ASC', __FUNCTION__, __LINE__);
 
 	// Are there entries?
 	if (!SQL_HASZERONUMS($result)) {
@@ -581,7 +677,7 @@ ORDER BY
 		$content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id', '', '_title');
 	} else {
 		// Nothing selected
-		$content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
+		$content = loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_ENTRIES_404--}');
 	}
 
 	// Free the result
@@ -596,6 +692,7 @@ ORDER BY
 function generateNetworkTypeOptions ($networkId) {
 	// Is this an array, then we just came back from edit/delete actions
 	if (is_array($networkId)) {
+		// Set it as empty string
 		$networkId = '';
 	} // END - if
 
@@ -609,7 +706,7 @@ function generateNetworkTypeOptions ($networkId) {
 			$networkId,
 			'',
 			sprintf(
-				"WHERE `network_id`=%s",
+				"WHERE `network_id`=%s" . getNetworkActivatedColumn('AND'),
 				bigintval(getRequestElement('network_id'))
 			),
 			'',
@@ -646,6 +743,9 @@ function generateNetworkTypesAvailableOptions ($defaultType = NULL) {
 				'skybanner',
 				'skybanner_click',
 				'skybanner_view',
+				'halfbanner',
+				'halfbanner_click',
+				'halfbanner_view',
 				'layer',
 				'layer_click',
 				'layer_view',
@@ -655,9 +755,13 @@ function generateNetworkTypesAvailableOptions ($defaultType = NULL) {
 				'htmlmail',
 				'lead',
 				'sale',
+				'lead_sale',
 				'payperactive',
 				'pagepeel',
-				'traffic'
+				'traffic',
+				'signature',
+				'signature_click',
+				'signature_view',
 			),
 			array(),
 			$defaultType,
@@ -776,7 +880,7 @@ function generateNetworkTranslationOptions ($default = '') {
 			$default,
 			'',
 			'',
-			$GLOBALS['network_translation_disabled'],
+			$GLOBALS['network_array_translation_disabled'],
 			'translateNetworkTranslationName'
 		);
 	} // END - if
@@ -929,7 +1033,7 @@ INNER JOIN
 ON
 	`network_array_index`=`network_translation_id`
 ORDER BY
-	`sort` ASC', __FUNCTION__, __LINE__);
+	`network_array_sort` ASC', __FUNCTION__, __LINE__);
 
 		// Are there entries?
 		if (!SQL_HASZERONUMS($result)) {
@@ -965,7 +1069,10 @@ function translateNetworkApiConfiguredStatusById ($networkId) {
 		$GLOBALS[__FUNCTION__][$networkId] = '{--ADMIN_NETWORK_API_NOT_CONFIGURED--}';
 
 		// So is it configured?
-		if (isNetworkApiConfigured($networkId)) {
+		if (!isNetworkActiveById($networkId)) {
+			// Network is not active
+			$GLOBALS[__FUNCTION__][$networkId] = '{--ADMIN_NETWORK_API_NOT_ACTIVE--}';
+		} elseif (isNetworkApiConfigured($networkId)) {
 			// Yes, it is
 			$GLOBALS[__FUNCTION__][$networkId] = '{--ADMIN_NETWORK_API_CONFIGURED--}';
 		} // END - if
@@ -1027,8 +1134,8 @@ 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') . '%}');
-		return false;
+		loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_ALREADY_ADDED=' . postRequestElement('network_short_name') . '%}');
+		return FALSE;
 	} // END - if
 
 	// Remove the 'ok' part
@@ -1043,10 +1150,10 @@ function doAdminNetworkProcessAddNetwork () {
 	// Output message
 	if (!SQL_HASZEROAFFECTED()) {
 		// Successfully added
-		loadTemplate('admin_network_added', false, postRequestArray());
+		loadTemplate('admin_network_added', FALSE, postRequestArray());
 	} else {
 		// Not added
-		loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_DATA_NOT_ADDED=' . postRequestElement('network_short_name') . '%}');
+		loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_DATA_NOT_ADDED=' . postRequestElement('network_short_name') . '%}');
 	}
 }
 
@@ -1065,21 +1172,26 @@ function doAdminNetworkProcessHandleNetworks () {
 				// Is there found the network?
 				if (count($networkData) > 0) {
 					// Add row template with given form name
-					$OUT .= loadTemplate('admin_' . $GLOBALS['network_form_name'] . '_networks_row', true, $networkData);
+					$OUT .= loadTemplate('admin_' . $GLOBALS['network_form_name'] . '_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 (!empty($OUT)) {
+			// Init array with generic element
+			$content = array(
+				'rows' => $OUT
+			);
+
 			// Output main template
-			loadTemplate('admin_' . $GLOBALS['network_form_name'] . '_networks', false, $OUT);
+			loadTemplate('admin_' . $GLOBALS['network_form_name'] . '_networks', FALSE, $content);
 
 			// Don't display the list/add new form
-			$GLOBALS['network_display'] = false;
+			$GLOBALS['network_display'] = FALSE;
 		} else {
 			// Nothing selected/found
-			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_FOUND--}');
+			loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_NOTHING_FOUND--}');
 		}
 	} // END - if
 }
@@ -1103,13 +1215,13 @@ function doAdminNetworkProcessHandleNetworkTypes () {
 				if (count($networkTypeData) > 0) {
 					if (isFormSent('edit')) {
 						// Add row template for deleting
-						$OUT .= loadTemplate('admin_edit_network_types_row', true, $networkTypeData);
+						$OUT .= loadTemplate('admin_edit_network_types_row', TRUE, $networkTypeData);
 					} elseif (isFormSent('delete')) {
 						// Add row template for deleting
-						$OUT .= loadTemplate('admin_delete_network_types_row', true, $networkTypeData);
+						$OUT .= loadTemplate('admin_delete_network_types_row', TRUE, $networkTypeData);
 					} else {
 						// Problem!
-						reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
+						reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
 					}
 				} // END - if
 			} // END - if
@@ -1117,21 +1229,27 @@ function doAdminNetworkProcessHandleNetworkTypes () {
 
 		// If we have no rows, we don't need to display the edit form
 		if (!empty($OUT)) {
+			// Prepare array with generic elements
+			$content = array(
+				'rows'       => $OUT,
+				'network_id' => bigintval(getRequestElement('network_id'))
+			);
+
 			// Output main template
 			if (isFormSent('edit')) {
-				loadTemplate('admin_edit_network_types', false, $OUT);
+				loadTemplate('admin_edit_network_types', FALSE, $content);
 			} elseif (isFormSent('delete')) {
-				loadTemplate('admin_delete_network_types', false, $OUT);
+				loadTemplate('admin_delete_network_types', FALSE, $content);
 			} else {
 				// Problem!
-				reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
+				reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
 			}
 
 			// Don't display the list/add new form
-			$GLOBALS['network_display'] = false;
+			$GLOBALS['network_display'] = FALSE;
 		} else {
 			// Nothing selected/found
-			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_FOUND--}');
+			loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_FOUND--}');
 		}
 	} // END - if
 }
@@ -1158,16 +1276,16 @@ function doAdminNetworkProcessHandleRequestParams () {
 				if (count($networkRequestData) > 0) {
 					if (isFormSent('edit')) {
 						// Add row template for deleting
-						$OUT .= loadTemplate('admin_edit_network_request_params_row', true, $networkRequestData);
+						$OUT .= loadTemplate('admin_edit_network_request_params_row', TRUE, $networkRequestData);
 					} elseif (isFormSent('delete')) {
 						// Get type data
 						$networkRequestData['network_type_data'] = getNetworkTypeDataById($networkRequestData['network_type_id']);
 
 						// Add row template for deleting
-						$OUT .= loadTemplate('admin_delete_network_request_params_row', true, $networkRequestData);
+						$OUT .= loadTemplate('admin_delete_network_request_params_row', TRUE, $networkRequestData);
 					} else {
 						// Problem!
-						reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
+						reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
 					}
 				} // END - if
 			} // END - if
@@ -1175,21 +1293,27 @@ function doAdminNetworkProcessHandleRequestParams () {
 
 		// If we have no rows, we don't need to display the edit form
 		if (!empty($OUT)) {
+			// Prepare array with generic elements
+			$content = array(
+				'rows'       => $OUT,
+				'network_id' => bigintval(getRequestElement('network_id'))
+			);
+
 			// Output main template
 			if (isFormSent('edit')) {
-				loadTemplate('admin_edit_network_request_params', false, $OUT);
+				loadTemplate('admin_edit_network_request_params', FALSE, $content);
 			} elseif (isFormSent('delete')) {
-				loadTemplate('admin_delete_network_request_params', false, $OUT);
+				loadTemplate('admin_delete_network_request_params', FALSE, $content);
 			} else {
 				// Problem!
-				reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
+				reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
 			}
 
 			// Don't display the list/add new form
-			$GLOBALS['network_display'] = false;
+			$GLOBALS['network_display'] = FALSE;
 		} else {
 			// Nothing selected/found
-			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}');
+			loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}');
 		}
 	} // END - if
 }
@@ -1236,7 +1360,7 @@ function doAdminNetworkProcessChangeNetworks () {
 			displayMessage('{%message,ADMIN_NETWORK_UPDATED=' . $updated . '%}');
 		} else {
 			// Nothing changed
-			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_CHANGED--}');
+			loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_NOTHING_CHANGED--}');
 		}
 	} // END - if
 }
@@ -1263,7 +1387,7 @@ function doAdminNetworkProcessRemoveNetworks () {
 			displayMessage('{%message,ADMIN_NETWORK_REMOVED=' . $removed . '%}');
 		} else {
 			// Nothing removed
-			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_REMOVED--}');
+			loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_NOTHING_REMOVED--}');
 		}
 	} // END - if
 }
@@ -1273,10 +1397,10 @@ 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') . '%}');
+		loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_TYPE_HANDLER_ALREADY_ADDED=' . postRequestElement('network_type_handler') . '%}');
 
 		// ... so abort here
-		return false;
+		return FALSE;
 	} // END - if
 
 	// Remove the 'ok' part
@@ -1297,10 +1421,10 @@ function doAdminNetworkProcessAddNetworkType () {
 	// Output message
 	if (!SQL_HASZEROAFFECTED()) {
 		// Successfully added
-		loadTemplate('admin_network_type_added', false, postRequestArray());
+		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') . '%}');
+		loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_TYPE_HANDLER_NOT_ADDED=' . postRequestElement('network_type_handler') . '%}');
 	}
 }
 
@@ -1352,7 +1476,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--}');
+			loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_CHANGED--}');
 		}
 	} // END - if
 }
@@ -1405,7 +1529,60 @@ function doAdminNetworkProcessChangeRequestParams () {
 			displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED=' . $updated . '%}');
 		} else {
 			// Nothing changed
-			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED--}');
+			loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED--}');
+		}
+	} // END - if
+}
+
+// Changes given network array translations
+function doAdminNetworkProcessChangeArrayTranslations () {
+	// Is there selections?
+	if (ifPostContainsSelections()) {
+		// By default nothing is updated
+		$updated = 0;
+
+		// Something has been selected, so start updating them
+		foreach (postRequestElement('sel') as $networkId => $sel) {
+			// Update this entry?
+			if ($sel == 1) {
+				// Init data array
+				$networkTranslationsData = array();
+
+				// Transfer whole array, except 'sel'
+				foreach (postRequestArray() as $key => $entry) {
+					// Skip 'sel' and submit button
+					if (in_array($key, array('sel', 'do_edit'))) {
+						continue;
+					} // END - if
+
+					// Is there this enty?
+					if (!isset($entry[$networkId])) {
+						// Not found, needs fixing
+						reportBug(__FUNCTION__, __LINE__, 'No entry in key=' . $key . ', id=' . $networkId . ' found.');
+					} // END - if
+
+					// Fix empty network_request_param_default to NULL
+					if (($key == 'network_request_param_default') && (trim($entry[$networkId]) == '')) {
+						// Set it to NULL
+						$entry[$networkId] = NULL;
+					} // END - if
+
+					// Add this entry
+					$networkTranslationsData[$key] = $entry[$networkId];
+				} // END - foreach
+
+				// Update the network data
+				$updated += doNetworkUpdateArrayTranslationsByArray($networkId, $networkTranslationsData);
+			} // END - if
+		} // END - foreach
+
+		// Is there updates?
+		if ($updated > 0) {
+			// Updates done
+			displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_UPDATED=' . $updated . '%}');
+		} else {
+			// Nothing changed
+			loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_CHANGED--}');
 		}
 	} // END - if
 }
@@ -1432,7 +1609,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--}');
+			loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_REMOVED--}');
 		}
 	} // END - if
 }
@@ -1459,7 +1636,34 @@ function doAdminNetworkProcessRemoveNetworkRequestParams () {
 			displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED=' . $removed . '%}');
 		} else {
 			// Nothing removed
-			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED--}');
+			loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED--}');
+		}
+	} // END - if
+}
+
+// Removes given network array translations
+function doAdminNetworkProcessRemoveNetworkArrayTranslation () {
+	// Is there selections?
+	if (ifPostContainsSelections()) {
+		// By default nothing is removed
+		$removed = 0;
+
+		// Something has been selected, so start updating them
+		foreach (postRequestElement('sel') as $networkId => $sel) {
+			// Update this entry?
+			if ($sel == 1) {
+				// Remove this entry
+				$removed += doAdminRemoveNetworkEntry('array_translation', 'network_array_id', $networkId);
+			} // END - if
+		} // END - foreach
+
+		// Is there removes?
+		if ($removed > 0) {
+			// Removals done
+			displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_REMOVED=' . $removed . '%}');
+		} else {
+			// Nothing removed
+			loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_REMOVED--}');
 		}
 	} // END - if
 }
@@ -1469,10 +1673,10 @@ 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') . '%}');
+		loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED=' . postRequestElement('network_request_param_key') . '%}');
 
 		// ... so abort here
-		return false;
+		return FALSE;
 	} // END - if
 
 	// Remove the 'ok' part
@@ -1493,10 +1697,10 @@ function doAdminNetworkProcessAddRequestParam () {
 	// Output message
 	if (!SQL_HASZEROAFFECTED()) {
 		// Successfully added
-		loadTemplate('admin_network_request_param_added', false, postRequestArray());
+		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') . '%}');
+		loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED=' . postRequestElement('network_request_param_key') . '%}');
 	}
 }
 
@@ -1505,10 +1709,10 @@ function doAdminNetworkProcessAddVcheckParam () {
 	// Is the request parameter already used with given network?
 	if (isNetworkVcheckElementValid(postRequestElement('network_vcheck_param_key'), getRequestElement('network_id'))) {
 		// Already added
-		loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_VCHECK_PARAMETER_ALREADY_ADDED=' . postRequestElement('network_vcheck_param_key') . '%}');
+		loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_VCHECK_PARAMETER_ALREADY_ADDED=' . postRequestElement('network_vcheck_param_key') . '%}');
 
 		// ... so abort here
-		return false;
+		return FALSE;
 	} // END - if
 
 	// Remove the 'ok' part
@@ -1529,10 +1733,10 @@ function doAdminNetworkProcessAddVcheckParam () {
 	// Output message
 	if (!SQL_HASZEROAFFECTED()) {
 		// Successfully added
-		loadTemplate('admin_network_vcheck_param_added', false, postRequestArray());
+		loadTemplate('admin_network_vcheck_param_added', FALSE, postRequestArray());
 	} else {
 		// Not added
-		loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_VCHECK_PARAMETER_NOT_ADDED=' . postRequestElement('network_vcheck_param_key') . '%}');
+		loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_VCHECK_PARAMETER_NOT_ADDED=' . postRequestElement('network_vcheck_param_key') . '%}');
 	}
 }
 
@@ -1541,10 +1745,10 @@ 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') . '%}');
+		loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_ALREADY_ADDED=' . postRequestElement('network_array_index') . '%}');
 
 		// ... so abort here
-		return false;
+		return FALSE;
 	} // END - if
 
 	// Remove the 'ok' part
@@ -1554,7 +1758,7 @@ function doAdminNetworkProcessAddNetworkArrayTranslation () {
 	setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
 
 	// Add sorting
-	setPostRequestElement('sort', (countSumTotalData(
+	setPostRequestElement('network_array_sort', (countSumTotalData(
 		bigintval(postRequestElement('network_id')),
 		'network_array_translation',
 		'network_array_id',
@@ -1569,13 +1773,77 @@ function doAdminNetworkProcessAddNetworkArrayTranslation () {
 	// Output message
 	if (!SQL_HASZEROAFFECTED()) {
 		// Successfully added
-		loadTemplate('admin_network_array_translation_added', false, postRequestArray());
+		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') . '%}');
+		loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_NOT_ADDED=' . postRequestElement('network_array_index') . '%}');
 	}
 }
 
+// Handle network array translation form
+function doAdminNetworkProcessHandleArrayTranslations () {
+	// Is there selections?
+	if (ifPostContainsSelections()) {
+		// Init cache array
+		$GLOBALS['network_array_translation_disabled'] = array();
+
+		// Load network data
+		$networkData = getNetworkDataById(getRequestElement('network_id'));
+
+		// Something has been selected, so start displaying one by one
+		$OUT = '';
+		foreach (postRequestElement('sel') as $networkId => $sel) {
+			// Is this selected?
+			if ($sel == 1) {
+				// Load this network's data
+				$networkTranslationsData = getNetworkArrayTranslationsDataById($networkId);
+
+				// Is there found the network?
+				if (count($networkTranslationsData) > 0) {
+					if (isFormSent('edit')) {
+						// Add row template for deleting
+						$OUT .= loadTemplate('admin_edit_network_array_translation_row', TRUE, $networkTranslationsData);
+					} elseif (isFormSent('delete')) {
+						// Get type data
+						$networkTranslationsData['network_type_data'] = getNetworkTypeDataById($networkTranslationsData['network_type_id']);
+
+						// Add row template for deleting
+						$OUT .= loadTemplate('admin_delete_network_array_translation_row', TRUE, $networkTranslationsData);
+					} else {
+						// Problem!
+						reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
+					}
+				} // END - if
+			} // END - if
+		} // END - foreach
+
+		// If we have no rows, we don't need to display the edit form
+		if (!empty($OUT)) {
+			// Prepare array with generic elements
+			$content = array(
+				'rows'       => $OUT,
+				'network_id' => bigintval(getRequestElement('network_id'))
+			);
+
+			// Output main template
+			if (isFormSent('edit')) {
+				loadTemplate('admin_edit_network_array_translation', FALSE, $content);
+			} elseif (isFormSent('delete')) {
+				loadTemplate('admin_delete_network_array_translation', FALSE, $content);
+			} else {
+				// Problem!
+				reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
+			}
+
+			// Don't display the list/add new form
+			$GLOBALS['network_display'] = FALSE;
+		} else {
+			// Nothing selected/found
+			loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}');
+		}
+	} // END - if
+}
+
 // Adds/update network API configuration
 function doAdminNetworkProcessNetworkApiConfig () {
 	// Remove the 'ok' part
@@ -1608,12 +1876,12 @@ function doAdminNetworkProcessNetworkApiConfig () {
 		displayMessage('{--ADMIN_CONFIG_NETWORK_API_SAVED--}');
 	} else {
 		// Not added
-		loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_API_NOT_SAVED--}');
+		loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_API_NOT_SAVED--}');
 	}
 }
 
 // Only adds network type configuration if not yet present
-function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) {
+function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = TRUE) {
 	// Remove the 'ok' part
 	unsetPostRequestElement('ok');
 
@@ -1648,7 +1916,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) {
 	unsetPostRequestElement('set_all');
 
 	// Shall we set for all?
-	if ($setAll === true) {
+	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',
 			array(bigintval(getRequestElement('network_id'))), __FUNCTION__, __LINE__);
@@ -1669,7 +1937,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) {
 			setGetRequestElement('network_type_id', $typeId);
 
 			// Call this function again
-			$numRows += doAdminNetworkProcessAddHandlerTypesConfig(false);
+			$numRows += doAdminNetworkProcessAddHandlerTypesConfig(FALSE);
 		} // END - while
 
 		// Free result
@@ -1681,7 +1949,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) {
 			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--}');
+			loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}');
 		}
 	} else {
 		// Get SQL query for new entry
@@ -1691,14 +1959,14 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) {
 		SQL_QUERY($SQL, __FUNCTION__, __LINE__);
 
 		// Shall we display the message?
-		if ($displayMessage === true) {
+		if ($displayMessage === TRUE) {
 			// Output message
 			if (!SQL_HASZEROAFFECTED()) {
 				// 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--}');
+				loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_SAVED--}');
 			}
 		} else {
 			// Return amount of affected rows (1 or 2)
@@ -1708,7 +1976,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) {
 }
 
 // Only changes network type configuration if not yet present
-function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) {
+function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = TRUE) {
 	// Remove the 'ok' part
 	unsetPostRequestElement('ok');
 
@@ -1725,7 +1993,7 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) {
 	} // END - foreach
 
 	// Convert time selections in POST data
-	convertSelectionsToEpocheTimeInPostArray('network_max_reload_time_ye');
+	convertSelectionsToEpocheTimeInPostData('network_max_reload_time_ye');
 
 	// Is there already an entry?
 	if (!isNetworkTypeHandlerConfigured(getRequestElement('network_id'), getRequestElement('network_type_id'))) {
@@ -1739,7 +2007,7 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) {
 	unsetPostRequestElement('set_all');
 
 	// Shall we set for all?
-	if ($setAll === true) {
+	if ($setAll === TRUE) {
 		// Get all data entries
 		$result = SQL_QUERY_ESC('SELECT `network_data_id` FROM `{?_MYSQL_PREFIX?}_network_types_config` WHERE `network_id`=%s ORDER BY `network_type_id` ASC',
 			array(bigintval(getRequestElement('network_id'))), __FUNCTION__, __LINE__);
@@ -1760,7 +2028,7 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) {
 			setPostRequestElement('network_data_id', $dataId);
 
 			// Call this function again
-			$numRows += doAdminNetworkProcessEditHandlerTypesConfig(false);
+			$numRows += doAdminNetworkProcessEditHandlerTypesConfig(FALSE);
 		} // END - while
 
 		// Free result
@@ -1772,7 +2040,7 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) {
 			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--}');
+			loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}');
 		}
 	} else {
 		// Get SQL query for new entry
@@ -1782,14 +2050,14 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) {
 		SQL_QUERY($SQL, __FUNCTION__, __LINE__);
 
 		// Shall we display the message?
-		if ($displayMessage === true) {
+		if ($displayMessage === TRUE) {
 			// Output message
 			if (!SQL_HASZEROAFFECTED()) {
 				// 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--}');
+				loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}');
 			}
 		} else {
 			// Return amount of affected rows (1 or 2)
@@ -1860,10 +2128,10 @@ function doAdminNetworkProcessExport () {
 	call_user_func($callbackName);
 
 	// Mark it as called
-	$GLOBALS[__FUNCTION__][$callbackName] = true;
+	$GLOBALS[__FUNCTION__][$callbackName] = TRUE;
 
 	// Don't display the list/add new form
-	$GLOBALS['network_display'] = false;
+	$GLOBALS['network_display'] = FALSE;
 }
 
 // Exports (and displays) the table 'network_data'
@@ -1912,7 +2180,7 @@ ORDER BY
 	SQL_FREERESULT($result);
 
 	// Output the SQL query
-	loadTemplate('admin_export_network_data', false, $SQL);
+	loadTemplate('admin_export_network_data', FALSE, $SQL);
 }
 
 // Exports (and displays) the table 'network_types'
@@ -1976,7 +2244,7 @@ ORDER BY
 	SQL_FREERESULT($result);
 
 	// Output the SQL query
-	loadTemplate('admin_export_network_types', false, $SQL);
+	loadTemplate('admin_export_network_types', FALSE, $SQL);
 }
 
 // Exports (and displays) the table 'network_request_params'
@@ -2034,7 +2302,7 @@ ORDER BY
 	SQL_FREERESULT($result);
 
 	// Output the SQL query
-	loadTemplate('admin_export_network_request_params', false, $SQL);
+	loadTemplate('admin_export_network_request_params', FALSE, $SQL);
 }
 
 // Exports (and displays) the table 'network_vcheck_params'
@@ -2089,7 +2357,7 @@ ORDER BY
 	SQL_FREERESULT($result);
 
 	// Output the SQL query
-	loadTemplate('admin_export_network_vcheck_params', false, $SQL);
+	loadTemplate('admin_export_network_vcheck_params', FALSE, $SQL);
 }
 
 // Exports (and displays) the table 'network_array_translation'
@@ -2105,20 +2373,20 @@ function doAdminNetworkExportArrayTranslation () {
 	`network_id`,
 	`network_type_id`,
 	`network_array_index`,
-	`sort`
+	`network_array_sort`
 FROM
 	`{?_MYSQL_PREFIX?}_network_array_translation`
 WHERE
 	`network_id`=%s
 ORDER BY
 	`network_type_id` ASC,
-	`sort` ASC',
+	`network_array_sort` ASC',
 		array(
 			bigintval(getRequestElement('network_id'))
 		), __FUNCTION__, __LINE__);
 
 	// Start an empty SQL query
-	$SQL = "INSERT INTO `&#123;&#63;_MYSQL_PREFIX&#63;&#125;_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES\n";
+	$SQL = "INSERT INTO `&#123;&#63;_MYSQL_PREFIX&#63;&#125;_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES\n";
 
 	// Load all entries
 	while ($content = SQL_FETCHARRAY($result)) {
@@ -2127,7 +2395,7 @@ ORDER BY
 			$content['network_id'] . ', ' .
 			$content['network_type_id'] . ', ' .
 			$content['network_array_index'] . ', ' .
-			$content['sort'] . "),\n";
+			$content['network_array_sort'] . "),\n";
 	} // END - while
 
 	// Remove last commata and close braces
@@ -2137,7 +2405,7 @@ ORDER BY
 	SQL_FREERESULT($result);
 
 	// Output the SQL query
-	loadTemplate('admin_export_network_array_translation', false, $SQL);
+	loadTemplate('admin_export_network_array_translation', FALSE, $SQL);
 }
 
 // [EOF]