X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fnetwork_functions.php;h=b3800e9a69310d549ea39c5e1fca4d6c7ee27e1f;hb=62d8f6d89c35bebe15b8f716a5629f14d95f3078;hp=f28386f9a7c29533dba0ddc44643d3ace76a56a2;hpb=5ab494ec65f8d912c075480312b15b15a5076ea4;p=mailer.git

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index f28386f9a7..b3800e9a69 100644
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -14,8 +14,6 @@
  * $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                    *
@@ -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('change')) || (isFormSent('remove'))) {
 		// 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('change')) && (!isFormSent('remove'))) {
 		// Abort here
 		loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_FORM_NOT_SENT--}');
 		return;
@@ -653,6 +651,29 @@ 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] = generateOptionList(
+			'/ARRAY/',
+			array(
+				'Y',
+				'N'
+			),
+			array(
+				'{--YES--}',
+				'{--NO--}'
+			),
+			$default
+		);
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__][$default];
+}
+
 // Translates 'translate_name' for e.g. templates
 function translateNetworkTranslationName ($name) {
 	// Get the message id
@@ -751,7 +772,7 @@ 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 {
@@ -776,10 +797,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 +813,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 +849,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 +865,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 +904,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 +923,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.');
@@ -1024,7 +1045,7 @@ function doAdminNetworkProcessAddNetworkType () {
 )", __FUNCTION__, __LINE__);
 
 	// Output message
-	if (SQL_AFFECTEDROWS() == 1) {
+	if (!SQL_HASZEROAFFECTED()) {
 		// Successfully added
 		loadTemplate('admin_network_type_added', false, postRequestArray());
 	} else {
@@ -1222,7 +1243,7 @@ function doAdminNetworkProcessAddNetworkParam () {
 )", __FUNCTION__, __LINE__);
 
 	// Output message
-	if (SQL_AFFECTEDROWS() == 1) {
+	if (!SQL_HASZEROAFFECTED()) {
 		// Successfully added
 		loadTemplate('admin_network_request_param_added', false, postRequestArray());
 	} else {
@@ -1268,7 +1289,7 @@ function doAdminNetworkProcessAddNetworkApiTranslation () {
 )", __FUNCTION__, __LINE__);
 
 	// Output message
-	if (SQL_AFFECTEDROWS() == 1) {
+	if (!SQL_HASZEROAFFECTED()) {
 		// Successfully added
 		loadTemplate('admin_network_api_translation_added', false, postRequestArray());
 	} else {