X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fnetwork_functions.php;h=db096e9b0d7645e59dd872252f387c01316b9898;hb=56931cd9321119dd37372bd16d6c552857e40066;hp=f28386f9a7c29533dba0ddc44643d3ace76a56a2;hpb=6914ebaaae909093df86d010e4c754a43d1a1aed;p=mailer.git

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index f28386f9a7..db096e9b0d 100644
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -14,11 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -55,7 +53,7 @@ function getCurrentNetworkId () {
 // Handle a (maybe) sent form here
 function doNetworkHandleForm () {
 	// Was the form sent?
-	if ((isFormSent()) || (isFormSent('edit')) || (isFormSent('del')) || (isFormSent('change')) || (isFormSent('remove'))) {
+	if ((isFormSent()) || (isFormSent('edit')) || (isFormSent('delete')) || (isFormSent('do_edit')) || (isFormSent('do_delete'))) {
 		// Do we have a 'do'?
 		if (isGetRequestParameterSet('do')) {
 			// Process the request
@@ -70,7 +68,7 @@ function doNetworkHandleForm () {
 // Processes an admin form
 function doAdminNetworkProcessForm () {
 	// Form really sent?
-	if ((!isFormSent()) && (!isFormSent('edit')) && (!isFormSent('del')) && (!isFormSent('change')) && (!isFormSent('remove'))) {
+	if ((!isFormSent()) && (!isFormSent('edit')) && (!isFormSent('delete')) && (!isFormSent('do_edit')) && (!isFormSent('do_delete'))) {
 		// Abort here
 		loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_FORM_NOT_SENT--}');
 		return;
@@ -653,28 +651,40 @@ function generateNetworkRequestTypeOptions ($default = '') {
 	return $GLOBALS[__FUNCTION__][$default];
 }
 
+// Generates an option list of network_active
+function generateNetworkActiveOptions ($default = '') {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__][$default])) {
+		// Generate the list
+		$GLOBALS[__FUNCTION__][$default] = generateYesNoOptionList($default);
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__][$default];
+}
+
 // Translates 'translate_name' for e.g. templates
 function translateNetworkTranslationName ($name) {
 	// Get the message id
-	return getMessage('ADMIN_NETWORK_TRANSLATE_' . strtoupper($name) . '_NAME');
+	return '{--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) . '');
+	return '{--ADMIN_NETWORK_TYPES_' . strtoupper($type) . '--}';
 }
 
 // Translates request type
 function translateNetworkRequestType ($type) {
 	// Get the message id
-	return getMessage('ADMIN_NETWORK_REQUEST_TYPE_' . strtoupper($type) . '');
+	return '{--ADMIN_NETWORK_REQUEST_TYPE_' . strtoupper($type) . '--}';
 }
 
 // Translates request parameter
 function translateNetworkRequestParameter ($param) {
 	// Get the message id
-	return getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_' . strtoupper($param) . '');
+	return '{--ADMIN_NETWORK_REQUEST_PARAMETER_' . strtoupper($param) . '--}';
 }
 
 // Translates API index
@@ -697,7 +707,7 @@ ORDER BY
 	`sort` ASC', __FUNCTION__, __LINE__);
 
 		// Do we have entries?
-		if (SQL_NUMROWS($result) > 0) {
+		if (!SQL_HASZERONUMS($result)) {
 			// Get all entries
 			while ($row = SQL_FETCHARRAY($result)) {
 				// Add it to our global array
@@ -731,7 +741,7 @@ function doAdminNetworkProcessAddNetwork () {
 	// We can say here, the form is sent, so check if the network is already added
 	if (isNetworkNameValid(postRequestParameter('network_short_name'))) {
 		// Already there
-		loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_ALREADY_ADDED', postRequestParameter('network_short_name')));
+		loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_ALREADY_ADDED=' . postRequestParameter('network_short_name') . '%}');
 		return false;
 	} // END - if
 
@@ -742,7 +752,7 @@ function doAdminNetworkProcessAddNetwork () {
 	SQL_QUERY('INSERT INTO
 	`{?_MYSQL_PREFIX?}_network_data`
 (
-	`' . implode('`,`', array_keys(postRequestArray())) . "`
+	`' . implode('`, `', array_keys(postRequestArray())) . "`
 ) VALUES (
 	'" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);
@@ -751,12 +761,12 @@ function doAdminNetworkProcessAddNetwork () {
 	setPostRequestParameter('network_id', SQL_INSERTID());
 
 	// Output message
-	if (SQL_AFFECTEDROWS() == 1) {
+	if (!SQL_HASZEROAFFECTED()) {
 		// Successfully added
 		loadTemplate('admin_network_added', false, postRequestArray());
 	} else {
 		// Not added
-		loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_DATA_NOT_ADDED', postRequestParameter('network_short_name')));
+		loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_DATA_NOT_ADDED=' . postRequestParameter('network_short_name') . '%}');
 	}
 }
 
@@ -776,10 +786,10 @@ function doAdminNetworkProcessHandleNetwork () {
 				if (count($networkData) > 0) {
 					if (isFormSent('edit')) {
 						// Add row template for editing
-						$OUT .= loadTemplate('form_submit_networks_row', true, $networkData);
-					} elseif (isFormSent('del')) {
+						$OUT .= loadTemplate('admin_edit_networks_row', true, $networkData);
+					} elseif (isFormSent('delete')) {
 						// Add row template for deleting
-						$OUT .= loadTemplate('admin_del_networks_row', true, $networkData);
+						$OUT .= loadTemplate('admin_delete_networks_row', true, $networkData);
 					} else {
 						// Problem!
 						debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
@@ -792,9 +802,9 @@ function doAdminNetworkProcessHandleNetwork () {
 		if (!empty($OUT)) {
 			// Output main template
 			if (isFormSent('edit')) {
-				loadTemplate('form_submit_networks', false, $OUT);
-			} elseif (isFormSent('del')) {
-				loadTemplate('admin_del_networks', false, $OUT);
+				loadTemplate('admin_edit_networks', false, $OUT);
+			} elseif (isFormSent('delete')) {
+				loadTemplate('admin_delete_networks', false, $OUT);
 			} else {
 				// Problem!
 				debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
@@ -828,10 +838,10 @@ function doAdminNetworkProcessHandleNetworkType () {
 				if (count($networkTypeData) > 0) {
 					if (isFormSent('edit')) {
 						// Add row template for deleting
-						$OUT .= loadTemplate('form_submit_network_types_row', true, $networkTypeData);
-					} elseif (isFormSent('del')) {
+						$OUT .= loadTemplate('admin_edit_network_types_row', true, $networkTypeData);
+					} elseif (isFormSent('delete')) {
 						// Add row template for deleting
-						$OUT .= loadTemplate('admin_del_network_types_row', true, $networkTypeData);
+						$OUT .= loadTemplate('admin_delete_network_types_row', true, $networkTypeData);
 					} else {
 						// Problem!
 						debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
@@ -844,9 +854,9 @@ function doAdminNetworkProcessHandleNetworkType () {
 		if (!empty($OUT)) {
 			// Output main template
 			if (isFormSent('edit')) {
-				loadTemplate('form_submit_network_types', false, $OUT);
-			} elseif (isFormSent('del')) {
-				loadTemplate('admin_del_network_types', false, $OUT);
+				loadTemplate('admin_edit_network_types', false, $OUT);
+			} elseif (isFormSent('delete')) {
+				loadTemplate('admin_delete_network_types', false, $OUT);
 			} else {
 				// Problem!
 				debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
@@ -883,13 +893,13 @@ function doAdminNetworkProcessHandleRequestParams () {
 				if (count($networkRequestData) > 0) {
 					if (isFormSent('edit')) {
 						// Add row template for deleting
-						$OUT .= loadTemplate('form_submit_network_params_row', true, $networkRequestData);
-					} elseif (isFormSent('del')) {
+						$OUT .= loadTemplate('admin_edit_network_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_del_network_params_row', true, $networkRequestData);
+						$OUT .= loadTemplate('admin_delete_network_params_row', true, $networkRequestData);
 					} else {
 						// Problem!
 						debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
@@ -902,9 +912,9 @@ function doAdminNetworkProcessHandleRequestParams () {
 		if (!empty($OUT)) {
 			// Output main template
 			if (isFormSent('edit')) {
-				loadTemplate('form_submit_network_params', false, $OUT);
-			} elseif (isFormSent('del')) {
-				loadTemplate('admin_del_network_params', false, $OUT);
+				loadTemplate('admin_edit_network_params', false, $OUT);
+			} elseif (isFormSent('delete')) {
+				loadTemplate('admin_delete_network_params', false, $OUT);
 			} else {
 				// Problem!
 				debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
@@ -956,7 +966,7 @@ function doAdminNetworkProcessChangeNetwork () {
 		// Do we have updates?
 		if ($updated > 0) {
 			// Updates done
-			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_UPDATED', $updated));
+			displayMessage('{%message,ADMIN_NETWORK_UPDATED=' . $updated . '%}');
 		} else {
 			// Nothing changed
 			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_CHANGED--}');
@@ -983,7 +993,7 @@ function doAdminNetworkProcessRemoveNetwork () {
 		// Do we have removes?
 		if ($removed > 0) {
 			// Removals done
-			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REMOVED', $removed));
+			displayMessage('{%message,ADMIN_NETWORK_REMOVED=' . $removed . '%}');
 		} else {
 			// Nothing removed
 			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_REMOVED--}');
@@ -996,7 +1006,7 @@ function doAdminNetworkProcessAddNetworkType () {
 	// Is the network type handle already used with given network?
 	if (isNetworkTypeHandleValid(postRequestParameter('network_type_handle'), getRequestParameter('network'))) {
 		// Already added
-		loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED', postRequestParameter('network_type_handle')));
+		loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED=' . postRequestParameter('network_type_handle') . '%}');
 
 		// ... so abort here
 		return false;
@@ -1018,18 +1028,18 @@ function doAdminNetworkProcessAddNetworkType () {
 	SQL_QUERY('INSERT INTO
 	`{?_MYSQL_PREFIX?}_network_types`
 (
-	`' . implode('`,`', array_keys(postRequestArray())) . "`
+	`' . implode('`, `', array_keys(postRequestArray())) . "`
 ) VALUES (
 	'" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);
 
 	// Output message
-	if (SQL_AFFECTEDROWS() == 1) {
+	if (!SQL_HASZEROAFFECTED()) {
 		// Successfully added
 		loadTemplate('admin_network_type_added', false, postRequestArray());
 	} else {
 		// Not added
-		loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_NOT_ADDED', postRequestParameter('network_type_handle')));
+		loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPES_NOT_ADDED=' . postRequestParameter('network_type_handle') . '%}');
 	}
 }
 
@@ -1076,7 +1086,7 @@ function doAdminNetworkProcessChangeNetworkType () {
 		// Do we have updates?
 		if ($updated > 0) {
 			// Updates done
-			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_UPDATED', $updated));
+			displayMessage('{%message,ADMIN_NETWORK_TYPES_UPDATED=' . $updated . '%}');
 		} else {
 			// Nothing changed
 			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPES_NOTHING_CHANGED--}');
@@ -1127,7 +1137,7 @@ function doAdminNetworkProcessChangeNetworkParam () {
 		// Do we have updates?
 		if ($updated > 0) {
 			// Updates done
-			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED', $updated));
+			displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED=' . $updated . '%}');
 		} else {
 			// Nothing changed
 			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED--}');
@@ -1154,7 +1164,7 @@ function doAdminNetworkProcessRemoveNetworkType () {
 		// Do we have removes?
 		if ($removed > 0) {
 			// Removals done
-			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_REMOVED', $removed));
+			displayMessage('{%message,ADMIN_NETWORK_TYPES_REMOVED=' . $removed . '%}');
 		} else {
 			// Nothing removed
 			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPES_NOTHING_REMOVED--}');
@@ -1181,7 +1191,7 @@ function doAdminNetworkProcessRemoveNetworkParam () {
 		// Do we have removes?
 		if ($removed > 0) {
 			// Removals done
-			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED', $removed));
+			displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED=' . $removed . '%}');
 		} else {
 			// Nothing removed
 			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED--}');
@@ -1194,7 +1204,7 @@ function doAdminNetworkProcessAddNetworkParam () {
 	// Is the request parameter already used with given network?
 	if (isNetworkRequestParameterValid(postRequestParameter('request_param_key'), postRequestParameter('network_type_id'), getRequestParameter('network'))) {
 		// Already added
-		loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED', postRequestParameter('request_param_key')));
+		loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED=' . postRequestParameter('request_param_key') . '%}');
 
 		// ... so abort here
 		return false;
@@ -1216,18 +1226,18 @@ function doAdminNetworkProcessAddNetworkParam () {
 	SQL_QUERY('INSERT INTO
 	`{?_MYSQL_PREFIX?}_network_request_params`
 (
-	`' . implode('`,`', array_keys(postRequestArray())) . "`
+	`' . implode('`, `', array_keys(postRequestArray())) . "`
 ) VALUES (
 	'" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);
 
 	// Output message
-	if (SQL_AFFECTEDROWS() == 1) {
+	if (!SQL_HASZEROAFFECTED()) {
 		// Successfully added
 		loadTemplate('admin_network_request_param_added', false, postRequestArray());
 	} else {
 		// Not added
-		loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED', postRequestParameter('request_param_key')));
+		loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED=' . postRequestParameter('request_param_key') . '%}');
 	}
 }
 
@@ -1236,7 +1246,7 @@ function doAdminNetworkProcessAddNetworkApiTranslation () {
 	// Is the request parameter already used with given network?
 	if (isNetworkApiTranslationValid(postRequestParameter('network_api_index'), postRequestParameter('network_type_id'), getRequestParameter('network'))) {
 		// Already added
-		loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_API_TRANSLATION_ALREADY_ADDED', postRequestParameter('network_api_index')));
+		loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_API_TRANSLATION_ALREADY_ADDED=' . postRequestParameter('network_api_index') . '%}');
 
 		// ... so abort here
 		return false;
@@ -1262,18 +1272,18 @@ function doAdminNetworkProcessAddNetworkApiTranslation () {
 	SQL_QUERY('INSERT INTO
 	`{?_MYSQL_PREFIX?}_network_api_translation`
 (
-	`' . implode('`,`', array_keys(postRequestArray())) . "`
+	`' . implode('`, `', array_keys(postRequestArray())) . "`
 ) VALUES (
 	'" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);
 
 	// Output message
-	if (SQL_AFFECTEDROWS() == 1) {
+	if (!SQL_HASZEROAFFECTED()) {
 		// Successfully added
 		loadTemplate('admin_network_api_translation_added', false, postRequestArray());
 	} else {
 		// Not added
-		loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_API_TRANSLATION_NOT_ADDED', postRequestParameter('network_api_index')));
+		loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_API_TRANSLATION_NOT_ADDED=' . postRequestParameter('network_api_index') . '%}');
 	}
 }