X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fnetwork_functions.php;h=0c71a5269b071282c9a52cb1054abee17311d5cf;hp=592ee41febc5161e9405d866df1f79ea32e96163;hb=465859de0e017d99130df209391fe0742fc24271;hpb=e3d32ba51d2faa9d771ba684520a7cfa87fbf577

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 592ee41feb..0c71a5269b 100644
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -404,7 +404,9 @@ function generateAdminNetworkList () {
 
 	// Query for all networks
 	$result = SQL_QUERY('SELECT
-	`network_id`,`network_short_name`,`network_title`
+	`network_id`,
+	`network_short_name`,
+	`network_title`
 FROM
 	`{?_MYSQL_PREFIX?}_network_data`
 ORDER BY
@@ -423,7 +425,7 @@ ORDER BY
 		} // END - while
 
 		// Generate the selection box
-		$content = generateSelectionBoxFromArray($rows, 'network', 'network_id');
+		$content = generateSelectionBoxFromArray($rows, 'network_id', 'network_id', '', '', 'network');
 	} else {
 		// Nothing selected
 		$content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
@@ -543,7 +545,7 @@ function generateNetworkTypeOptions ($networkId) {
 			'',
 			sprintf(
 				"WHERE `network_id`=%s",
-				bigintval(getRequestElement('network'))
+				bigintval(getRequestElement('network_id'))
 			),
 			'',
 			'translateNetworkTypeHandler'
@@ -887,7 +889,7 @@ function doAdminNetworkProcessHandleNetworkType () {
 	// Do we have selections?
 	if (ifPostContainsSelections()) {
 		// Load network data
-		$networkData = getNetworkDataById(getRequestElement('network'));
+		$networkData = getNetworkDataById(getRequestElement('network_id'));
 
 		// Something has been selected, so start displaying one by one
 		$OUT = '';
@@ -942,7 +944,7 @@ function doAdminNetworkProcessHandleRequestParams () {
 		$GLOBALS['network_params_disabled'] = array();
 
 		// Load network data
-		$networkData = getNetworkDataById(getRequestElement('network'));
+		$networkData = getNetworkDataById(getRequestElement('network_id'));
 
 		// Something has been selected, so start displaying one by one
 		$OUT = '';
@@ -1069,7 +1071,7 @@ function doAdminNetworkProcessRemoveNetwork () {
 // Add a network type handler if not yet found
 function doAdminNetworkProcessAddNetworkType () {
 	// Is the network type handle already used with given network?
-	if (isNetworkTypeHandleValid(postRequestElement('network_type_handle'), getRequestElement('network'))) {
+	if (isNetworkTypeHandleValid(postRequestElement('network_type_handle'), getRequestElement('network_id'))) {
 		// Already added
 		loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED=' . postRequestElement('network_type_handle') . '%}');
 
@@ -1081,7 +1083,7 @@ function doAdminNetworkProcessAddNetworkType () {
 	unsetPostRequestElement('ok');
 
 	// Add id
-	setPostRequestElement('network_id', bigintval(getRequestElement('network')));
+	setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
 
 	// Is network_type_banner_url set?
 	if (postRequestElement('network_type_banner_url') == '') {
@@ -1265,7 +1267,7 @@ function doAdminNetworkProcessRemoveNetworkParam () {
 // Adds a request parameter to given network and type
 function doAdminNetworkProcessAddNetworkParam () {
 	// Is the request parameter already used with given network?
-	if (isNetworkRequestElementValid(postRequestElement('network_request_param_key'), postRequestElement('network_type_id'), getRequestElement('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') . '%}');
 
@@ -1277,7 +1279,7 @@ function doAdminNetworkProcessAddNetworkParam () {
 	unsetPostRequestElement('ok');
 
 	// Add id
-	setPostRequestElement('network_id', bigintval(getRequestElement('network')));
+	setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
 
 	// Is network_request_param_default set?
 	if (postRequestElement('network_request_param_default') == '') {
@@ -1301,7 +1303,7 @@ function doAdminNetworkProcessAddNetworkParam () {
 // Adds a API response array entry
 function doAdminNetworkProcessAddNetworkApiTranslation () {
 	// Is the request parameter already used with given network?
-	if (isNetworkApiTranslationValid(postRequestElement('network_api_index'), postRequestElement('network_type_id'), getRequestElement('network'))) {
+	if (isNetworkApiTranslationValid(postRequestElement('network_api_index'), postRequestElement('network_type_id'), getRequestElement('network_id'))) {
 		// Already added
 		loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_API_TRANSLATION_ALREADY_ADDED=' . postRequestElement('network_api_index') . '%}');
 
@@ -1313,7 +1315,7 @@ function doAdminNetworkProcessAddNetworkApiTranslation () {
 	unsetPostRequestElement('ok');
 
 	// Add id
-	setPostRequestElement('network_id', bigintval(getRequestElement('network')));
+	setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
 
 	// Add sorting
 	setPostRequestElement('sort', (countSumTotalData(
@@ -1344,10 +1346,16 @@ function doAdminNetworkProcessNetworkApiConfig () {
 	unsetPostRequestElement('ok');
 
 	// Add id
-	setPostRequestElement('network_id', bigintval(getRequestElement('network')));
+	setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
+
+	// Is network_api_referral_button set?
+	if (postRequestElement('network_api_referral_button') == '') {
+		// Remove empty value to get a NULL for an optional entry
+		unsetPostRequestElement('network_api_referral_button');
+	} // END - if
 
 	// Is there already an entry?
-	if (isNetworkApiConfigured(getRequestElement('network'))) {
+	if (isNetworkApiConfigured(getRequestElement('network_id'))) {
 		// Generate SQL query
 		$SQL = getUpdateSqlFromArray(postRequestArray(), 'network_api_config', 'network_id', postRequestElement('network_id'), array('network_id'));
 	} else {