X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fnetwork_functions.php;h=b33bfea63ba7edea3f7d49082ede2fad9a7fb682;hp=2dbcda200fdfbefa79d3cd5e9e60b6708e0416de;hb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e;hpb=c544e11e6c117f1a1757bbc98b19e9675dc9b3cb

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 2dbcda200f..b33bfea63b 100644
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 // Handle a (maybe) sent form here
 function doNetworkHandleForm () {
 	// Was the form sent?
-	if ((isFormSent()) || (isPostRequestParameterSet('edit')) || (isPostRequestParameterSet('del')) || (isPostRequestParameterSet('change')) || (isPostRequestParameterSet('remove'))) {
+	if ((isFormSent()) || (isFormSent('edit')) || (isFormSent('del')) || (isFormSent('change')) || (isFormSent('remove'))) {
 		// Do we have a 'do'?
 		if (isGetRequestParameterSet('do')) {
 			// Process the request
@@ -60,7 +60,7 @@ function doNetworkHandleForm () {
 // Processes an admin form
 function doAdminNetworkProcessForm () {
 	// Form really sent?
-	if ((!isFormSent()) && (!isPostRequestParameterSet('edit')) && (!isPostRequestParameterSet('del')) && (!isPostRequestParameterSet('change')) && (!isPostRequestParameterSet('remove'))) {
+	if ((!isFormSent()) && (!isFormSent('edit')) && (!isFormSent('del')) && (!isFormSent('change')) && (!isFormSent('remove'))) {
 		// Abort here
 		loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_FORM_NOT_SENT'));
 		return;
@@ -132,39 +132,46 @@ function isNetworkRequestParameterValid ($key, $type, $networkId) {
 }
 
 // "Getter" for a network's data by provided id number
-function getNetworkDataById ($id) {
+function getNetworkDataById ($id, $column = '') {
 	// Ids lower one are not accepted
 	if ($id < 1) {
 		// Not good, should be fixed
 		debug_report_bug('Network id ' . $id . ' is smaller than 1.');
 	} // END - if
 
-	// By default we have no data
-	$networkData = array();
+	// Is it cached?
+	if (!isset($GLOBALS['network_data'][$id])) {
+		// By default we have no data
+		$GLOBALS['network_data'][$id] = array();
 
-	// Query for the network data
-	$result = SQL_QUERY_ESC("SELECT
+		// Query for the network data
+		$result = SQL_QUERY_ESC("SELECT
 	`network_id`, `network_short_name`, `network_title`, `network_reflink`, `network_data_seperator`, `network_row_seperator`, `network_request_type`, `network_charset`
 FROM
 	`{?_MYSQL_PREFIX?}_network_data`
 WHERE
 	`network_id`=%s
 LIMIT 1",
-		array(bigintval($id)), __FUNCTION__, __LINE__);
+			array(bigintval($id)), __FUNCTION__, __LINE__);
 
-	// Do we have an entry?
-	if (SQL_NUMROWS($result) == 1) {
-		// Then get it
-		$networkData = SQL_FETCHARRAY($result);
+		// Do we have an entry?
+		if (SQL_NUMROWS($result) == 1) {
+			// Then get it
+			$GLOBALS['network_data'][$id] = SQL_FETCHARRAY($result);
+		} // END - if
 
-		// Solve disabled
+		// Free result
+		SQL_FREERESULT($result);
 	} // END - if
 
-	// Free result
-	SQL_FREERESULT($result);
-
 	// Return result
-	return $networkData;
+	if (empty($column)) {
+		// Return array
+		return $GLOBALS['network_data'][$id];
+	} else {
+		// Return column
+		return $GLOBALS['network_data'][$id][$column];
+	}
 }
 
 // "Getter" for a network type data by provided id number
@@ -176,7 +183,7 @@ function getNetworkTypeDataById ($id) {
 	} // END - if
 
 	// By default we have no data
-	$networkTypeData = array();
+	$GLOBALS['network_type_data'][$id] = array();
 
 	// Query for the network data
 	$result = SQL_QUERY_ESC("SELECT
@@ -191,14 +198,14 @@ LIMIT 1",
 	// Do we have an entry?
 	if (SQL_NUMROWS($result) == 1) {
 		// Then get it
-		$networkTypeData = SQL_FETCHARRAY($result);
+		$GLOBALS['network_type_data'][$id] = SQL_FETCHARRAY($result);
 	} // END - if
 
 	// Free result
 	SQL_FREERESULT($result);
 
 	// Return result
-	return $networkTypeData;
+	return $GLOBALS['network_type_data'][$id];
 }
 
 // "Getter" for a network request parameter data by provided id number
@@ -300,7 +307,10 @@ ORDER BY
 		$rows = array();
 		while ($row = SQL_FETCHARRAY($result)) {
 			// Is this valid, then add it
-			if ((is_array($row)) && (isset($row['network_id']))) $rows[] = $row;
+			if ((is_array($row)) && (isset($row['network_id']))) {
+				// Add entry
+				$rows[$row['network_id']] = $row;
+			} // END - if
 		} // END - while
 
 		// Generate the selection box
@@ -317,6 +327,50 @@ ORDER BY
 	return $content;
 }
 
+// Generator (somewhat getter) for a list of network types for given network id
+function generateAdminNetworkTypeList ($networkId) {
+	// Init content
+	$content = '';
+
+	// Query all types of this network
+	$result = SQL_QUERY_ESC("SELECT
+	`network_type_id`, `network_type_handle`
+FROM
+	`{?_MYSQL_PREFIX?}_network_types`
+WHERE
+	`network_id`=%s
+ORDER BY
+	`network_type_handle` ASC",
+		array(
+			bigintval($networkId)
+		), __FILE__, __LINE__);
+
+	// Do we have entries?
+	if (SQL_NUMROWS($result) > 0) {
+		// List all entries
+		$rows = array();
+		while ($row = SQL_FETCHARRAY($result)) {
+			// Is this valid, then add it
+			if ((is_array($row)) && (isset($row['network_type_id']))) {
+				// Add entry
+				$rows[$row['network_type_id']] = $row;
+			} // END - if
+		} // END - while
+
+		// Generate the selection box
+		$content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id');
+	} else {
+		// Nothing selected
+		$content = loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_ENTRIES_404'));
+	}
+
+	// Free the result
+	SQL_FREERESULT($result);
+
+	// Return content
+	return $content;
+}
+
 // Generator (somewhat getter) for network type options
 function generateNetworkTypeOptions ($id) {
 	// Is this an array, then we just came back from edit/delete actions
@@ -331,7 +385,10 @@ function generateNetworkTypeOptions ($id) {
 			'network_type_handle',
 			$id,
 			'',
-			sprintf("WHERE `network_id`=%s", getRequestParameter('network'))
+			sprintf(
+				"WHERE `network_id`=%s",
+				bigintval(getRequestParameter('network'))
+			)
 		);
 	} // END - if
 
@@ -352,8 +409,8 @@ function generateNetworkRequestKeyOptions ($key) {
 				'hash',
 				'password',
 				'reload',
-				'max_stay',
-				'min_stay',
+				'maximum_stay',
+				'minimum_stay',
 				'currency',
 				'type',
 				'remain',
@@ -363,20 +420,20 @@ function generateNetworkRequestKeyOptions ($key) {
 				'extra'
 			),
 			array(
-				'{--ADMIN_NETWORK_REQUEST_PARAMS_ID--}',
-				'{--ADMIN_NETWORK_REQUEST_PARAMS_SID--}',
-				'{--ADMIN_NETWORK_REQUEST_PARAMS_HASH--}',
-				'{--ADMIN_NETWORK_REQUEST_PARAMS_PASSWORD--}',
-				'{--ADMIN_NETWORK_REQUEST_PARAMS_RELOAD--}',
-				'{--ADMIN_NETWORK_REQUEST_PARAMS_MAXIMUM_STAY--}',
-				'{--ADMIN_NETWORK_REQUEST_PARAMS_MINIMUM_STAY--}',
-				'{--ADMIN_NETWORK_REQUEST_PARAMS_CURRENCY--}',
-				'{--ADMIN_NETWORK_REQUEST_PARAMS_TYPE--}',
-				'{--ADMIN_NETWORK_REQUEST_PARAMS_REMAIN--}',
-				'{--ADMIN_NETWORK_REQUEST_PARAMS_REWARD--}',
-				'{--ADMIN_NETWORK_REQUEST_PARAMS_SIZE--}',
-				'{--ADMIN_NETWORK_REQUEST_PARAMS_EROTIC--}',
-				'{--ADMIN_NETWORK_REQUEST_PARAMS_EXTRA--}'
+				'{--ADMIN_NETWORK_REQUEST_PARAMETER_ID--}',
+				'{--ADMIN_NETWORK_REQUEST_PARAMETER_SID--}',
+				'{--ADMIN_NETWORK_REQUEST_PARAMETER_HASH--}',
+				'{--ADMIN_NETWORK_REQUEST_PARAMETER_PASSWORD--}',
+				'{--ADMIN_NETWORK_REQUEST_PARAMETER_RELOAD--}',
+				'{--ADMIN_NETWORK_REQUEST_PARAMETER_MAXIMUM_STAY--}',
+				'{--ADMIN_NETWORK_REQUEST_PARAMETER_MINIMUM_STAY--}',
+				'{--ADMIN_NETWORK_REQUEST_PARAMETER_CURRENCY--}',
+				'{--ADMIN_NETWORK_REQUEST_PARAMETER_TYPE--}',
+				'{--ADMIN_NETWORK_REQUEST_PARAMETER_REMAIN--}',
+				'{--ADMIN_NETWORK_REQUEST_PARAMETER_REWARD--}',
+				'{--ADMIN_NETWORK_REQUEST_PARAMETER_SIZE--}',
+				'{--ADMIN_NETWORK_REQUEST_PARAMETER_EROTIC--}',
+				'{--ADMIN_NETWORK_REQUEST_PARAMETER_EXTRA--}'
 			),
 			$key,
 			'', '',
@@ -388,6 +445,27 @@ function generateNetworkRequestKeyOptions ($key) {
 	return $GLOBALS['network_request_param_key'][$key];
 }
 
+// Generator (somewhat getter) for (return) array translation
+function generateNetworkArrayTranslationOptions ($default) {
+	// Is it cached?
+	if (!isset($GLOBALS['network_array_translation'][$default])) {
+		// Generate and cache it
+		$GLOBALS['network_array_translation'][$default] = generateOptionList(
+			'network_request_params',
+			'network_param_id',
+			'request_param_key',
+			$default,
+			'',
+			sprintf("WHERE `network_id`='%s'", bigintval(getRequestParameter('network'))),
+			$GLOBALS['network_array_translation_disabled'],
+			'ADMIN_NETWORK_REQUEST_PARAMETER_'
+		);
+	} // END - if
+
+	// Return content
+	return $GLOBALS['network_array_translation'][$default];
+}
+
 //------------------------------------------------------------------------------
 //                             Call-back functions
 //------------------------------------------------------------------------------
@@ -443,11 +521,14 @@ function doAdminNetworkProcessHandlenetworkForm () {
 					// Add color
 					$networkData['sw'] = $SW;
 
-					if (isPostRequestParameterSet('edit')) {
+					if (isFormSent('edit')) {
 						// Make selection box for network_request_type
 						$networkData['network_request_type'] = generateOptionList(
 							'/ARRAY/',
-							array('GET','POST'),
+							array(
+								'GET',
+								'POST'
+							),
 							array(
 								getMessage('ADMIN_NETWORK_REQUEST_TYPE_GET'),
 								getMessage('ADMIN_NETWORK_REQUEST_TYPE_POST')
@@ -457,7 +538,7 @@ function doAdminNetworkProcessHandlenetworkForm () {
 
 						// Add row template for editing
 						$OUT .= loadTemplate('admin_edit_networks_row', true, $networkData);
-					} elseif (isPostRequestParameterSet('del')) {
+					} elseif (isFormSent('del')) {
 						// Translate the request type
 						$networkData['network_request_type'] = getMessage('ADMIN_NETWORK_REQUEST_TYPE_' . $networkData['network_request_type']);
 
@@ -477,9 +558,9 @@ function doAdminNetworkProcessHandlenetworkForm () {
 		// If we have no rows, we don't need to display the edit form
 		if (!empty($OUT)) {
 			// Output main template
-			if (isPostRequestParameterSet('edit')) {
+			if (isFormSent('edit')) {
 				loadTemplate('admin_edit_networks', false, $OUT);
-			} elseif (isPostRequestParameterSet('del')) {
+			} elseif (isFormSent('del')) {
 				loadTemplate('admin_del_networks', false, $OUT);
 			} else {
 				// Problem!
@@ -515,10 +596,10 @@ function doAdminNetworkProcessHandlenetworktypeForm () {
 					// Add color
 					$networkTypeData['sw'] = $SW;
 
-					if (isPostRequestParameterSet('edit')) {
+					if (isFormSent('edit')) {
 						// Add row template for deleting
 						$OUT .= loadTemplate('admin_edit_network_types_row', true, $networkTypeData);
-					} elseif (isPostRequestParameterSet('del')) {
+					} elseif (isFormSent('del')) {
 						// Fix empty banner URL
 						if (trim($networkTypeData['network_type_banner_url']) == '') $networkTypeData['network_type_banner_url'] = '---';
 
@@ -544,9 +625,9 @@ function doAdminNetworkProcessHandlenetworktypeForm () {
 			);
 
 			// Output main template
-			if (isPostRequestParameterSet('edit')) {
+			if (isFormSent('edit')) {
 				loadTemplate('admin_edit_network_types', false, $content);
-			} elseif (isPostRequestParameterSet('del')) {
+			} elseif (isFormSent('del')) {
 				loadTemplate('admin_del_network_types', false, $content);
 			} else {
 				// Problem!
@@ -585,7 +666,7 @@ function doAdminNetworkProcessHandlerequestparamsForm () {
 					// Add color
 					$networkRequestData['sw'] = $SW;
 
-					if (isPostRequestParameterSet('edit')) {
+					if (isFormSent('edit')) {
 						// Add options list for network type
 						$networkRequestData['type_options'] = generateNetworkTypeOptions($networkRequestData['network_type_id']);
 
@@ -594,7 +675,7 @@ function doAdminNetworkProcessHandlerequestparamsForm () {
 
 						// Add row template for deleting
 						$OUT .= loadTemplate('admin_edit_network_params_row', true, $networkRequestData);
-					} elseif (isPostRequestParameterSet('del')) {
+					} elseif (isFormSent('del')) {
 						// Fix empty banner URL
 						if (trim($networkRequestData['request_param_default']) == '') $networkRequestData['request_param_default'] = '---';
 
@@ -623,9 +704,9 @@ function doAdminNetworkProcessHandlerequestparamsForm () {
 			);
 
 			// Output main template
-			if (isPostRequestParameterSet('edit')) {
+			if (isFormSent('edit')) {
 				loadTemplate('admin_edit_network_params', false, $content);
-			} elseif (isPostRequestParameterSet('del')) {
+			} elseif (isFormSent('del')) {
 				loadTemplate('admin_del_network_params', false, $content);
 			} else {
 				// Problem!
@@ -636,7 +717,7 @@ function doAdminNetworkProcessHandlerequestparamsForm () {
 			$GLOBALS['network_display'] = false;
 		} else {
 			// Nothing selected/found
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMS_NOTHING_FOUND'));
+			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND'));
 		}
 	} // END - if
 }
@@ -728,7 +809,7 @@ function doAdminNetworkProcessAddnetworktypeForm () {
 	unsetPostRequestParameter('ok');
 
 	// Add id
-	setPostRequestParameter('network_id', getRequestParameter('network'));
+	setPostRequestParameter('network_id', bigintval(getRequestParameter('network')));
 
 	// Is network_type_banner_url set?
 	if (postRequestParameter('network_type_banner_url') == '') {
@@ -849,10 +930,10 @@ function doAdminNetworkProcessChangenetworkparamForm () {
 		// Do we have updates?
 		if ($updated > 0) {
 			// Updates done
-			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMS_UPDATED', $updated));
+			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED', $updated));
 		} else {
 			// Nothing changed
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMS_NOTHING_CHANGED'));
+			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED'));
 		}
 	} // END - if
 }
@@ -903,10 +984,10 @@ function doAdminNetworkProcessRemovenetworkparamForm () {
 		// Do we have removes?
 		if ($removed > 0) {
 			// Removals done
-			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMS_REMOVED', $removed));
+			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED', $removed));
 		} else {
 			// Nothing removed
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMS_NOTHING_REMOVED'));
+			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED'));
 		}
 	} // END - if
 }
@@ -926,7 +1007,7 @@ function doAdminNetworkProcessAddnetworkparamForm () {
 	unsetPostRequestParameter('ok');
 
 	// Add id
-	setPostRequestParameter('network_id', getRequestParameter('network'));
+	setPostRequestParameter('network_id', bigintval(getRequestParameter('network')));
 
 	// Is request_param_default set?
 	if (postRequestParameter('request_param_default') == '') {
@@ -953,5 +1034,22 @@ function doAdminNetworkProcessAddnetworkparamForm () {
 	}
 }
 
+// Do expression code for this extension
+function doExpressionNetwork ($data) {
+	// Construct replacer
+	$replacer = sprintf(
+		"\" . %s(%s, '%s') . \"",
+		$data['callback'],
+		$data['matches'][4][$data['key']],
+		$data['extra_func']
+	);
+
+	// Replace the code
+	$code = replaceExpressionCode($data, $replacer);
+
+	// Return it
+	return $code;
+}
+
 // [EOF]
 ?>