X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fnetwork_functions.php;h=535a9ec0656bca6afeb519f6d2f1b5e2e10f5d8a;hb=ad85ea5a3690e65e3509d4e4e8c63083b2b71b0c;hp=1a1247eb834b7186e66fe75be2693c66d9eb98b1;hpb=29385a0483bbcbbe940a32a49d488b1d5add15c5;p=mailer.git

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 1a1247eb83..535a9ec065 100644
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -358,15 +358,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`
 ORDER BY
-	`network_short_name` ASC", __FUNCTION__, __LINE__);
+	`network_short_name` ASC', __FUNCTION__, __LINE__);
 
 	// Do we have entries?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List all entries
 		$rows = array();
 		while ($row = SQL_FETCHARRAY($result)) {
@@ -410,7 +410,7 @@ ORDER BY
 		), __FUNCTION__, __LINE__);
 
 	// Do we have entries?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List all entries
 		$rows = array();
 		while ($row = SQL_FETCHARRAY($result)) {
@@ -441,7 +441,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_handle`, d.`network_title`
 FROM
 	`{?_MYSQL_PREFIX?}_network_types` AS t
@@ -451,10 +451,10 @@ ON
 	t.`network_id`=d.`network_id`
 ORDER BY
 	d.`network_short_name` ASC,
-	t.`network_type_handle` ASC", __FUNCTION__, __LINE__);
+	t.`network_type_handle` ASC', __FUNCTION__, __LINE__);
 
 	// Do we have entries?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List all entries
 		$rows = array();
 		while ($row = SQL_FETCHARRAY($result)) {
@@ -594,10 +594,10 @@ function doAdminNetworkProcessAddnetworkForm () {
 	unsetPostRequestParameter('ok');
 
 	// Add the whole request to database
-	SQL_QUERY("INSERT INTO
+	SQL_QUERY('INSERT INTO
 	`{?_MYSQL_PREFIX?}_network_data`
 (
-	`" . implode('`,`', array_keys(postRequestArray())) . "`
+	`' . implode('`,`', array_keys(postRequestArray())) . "`
 ) VALUES (
 	'" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);
@@ -618,9 +618,9 @@ function doAdminNetworkProcessAddnetworkForm () {
 // Displays selected networks for editing
 function doAdminNetworkProcessHandlenetworkForm () {
 	// Do we have selections?
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// 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(
@@ -641,8 +638,8 @@ function doAdminNetworkProcessHandlenetworkForm () {
 								'POST'
 							),
 							array(
-								getMessage('ADMIN_NETWORK_REQUEST_TYPE_GET'),
-								getMessage('ADMIN_NETWORK_REQUEST_TYPE_POST')
+								'{--ADMIN_NETWORK_REQUEST_TYPE_GET--}',
+								'{--ADMIN_NETWORK_REQUEST_TYPE_POST--}'
 							),
 							$networkData['network_request_type']
 						);
@@ -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
@@ -690,12 +684,12 @@ function doAdminNetworkProcessHandlenetworkForm () {
 // Handle network type form
 function doAdminNetworkProcessHandlenetworktypeForm () {
 	// Do we have selections?
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// Load network data
 		$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,9 +698,6 @@ 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);
@@ -717,9 +708,6 @@ function doAdminNetworkProcessHandlenetworktypeForm () {
 						// Problem!
 						debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
 					}
-
-					// Switch colors
-					$SW = 3 - $SW;
 				} // END - if
 			} // END - if
 		} // END - foreach
@@ -754,7 +742,7 @@ function doAdminNetworkProcessHandlenetworktypeForm () {
 // Handle network request parameter form
 function doAdminNetworkProcessHandlerequestparamsForm () {
 	// Do we have selections?
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// Init cache array
 		$GLOBALS['network_params_disabled'] = array();
 
@@ -762,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) {
@@ -771,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']);
@@ -793,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
@@ -830,7 +812,7 @@ function doAdminNetworkProcessHandlerequestparamsForm () {
 // Changes given networks
 function doAdminNetworkProcessChangenetworkForm () {
 	// Do we have selections?
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// By default nothing is updated
 		$updated = 0;
 
@@ -875,7 +857,7 @@ function doAdminNetworkProcessChangenetworkForm () {
 // Removes given networks
 function doAdminNetworkProcessRemovenetworkForm () {
 	// Do we have selections?
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// By default nothing is removed
 		$removed = 0;
 
@@ -944,7 +926,7 @@ function doAdminNetworkProcessAddnetworktypeForm () {
 // Changes given network type handlers
 function doAdminNetworkProcessChangenetworktypeForm () {
 	// Do we have selections?
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// By default nothing is updated
 		$updated = 0;
 
@@ -995,7 +977,7 @@ function doAdminNetworkProcessChangenetworktypeForm () {
 // Changes given network request parameters
 function doAdminNetworkProcessChangenetworkparamForm () {
 	// Do we have selections?
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// By default nothing is updated
 		$updated = 0;
 
@@ -1046,7 +1028,7 @@ function doAdminNetworkProcessChangenetworkparamForm () {
 // Removes given network type handlers
 function doAdminNetworkProcessRemovenetworktypeForm () {
 	// Do we have selections?
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// By default nothing is removed
 		$removed = 0;
 
@@ -1073,7 +1055,7 @@ function doAdminNetworkProcessRemovenetworktypeForm () {
 // Removes given network request parameters
 function doAdminNetworkProcessRemovenetworkparamForm () {
 	// Do we have selections?
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// By default nothing is removed
 		$removed = 0;
 
@@ -1121,10 +1103,10 @@ function doAdminNetworkProcessAddnetworkparamForm () {
 	} // END - if
 
 	// Add the whole request to database
-	SQL_QUERY("INSERT INTO
+	SQL_QUERY('INSERT INTO
 	`{?_MYSQL_PREFIX?}_network_request_params`
 (
-	`" . implode('`,`', array_keys(postRequestArray())) . "`
+	`' . implode('`,`', array_keys(postRequestArray())) . "`
 ) VALUES (
 	'" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);