Bladeren bron

fixed if/elseif/else formatting to be standard

Tony Fernandez 1 jaar geleden
bovenliggende
commit
087989fc25
2 gewijzigde bestanden met toevoegingen van 20 en 13 verwijderingen
  1. 9 6
      index.php
  2. 11 7
      resources/service/message_send_outbound.php

+ 9 - 6
index.php

@@ -125,13 +125,15 @@
 	// Used for Providers that send HTTP requests with mixed http method and http variables
 	// For example, a Provider that sends a POST with a query string would populate $_GET, not $_POST
 	elseif ($content_type == 'mixed') {
-		if(!empty($_GET)){
+		if(!empty($_GET)) {
 			$message_json = json_encode($_GET);
 			$content_type = 'get';
-		}elseif(!empty($_POST)){
+		}
+		elseif (!empty($_POST)) {
 			$message_json = json_encode($_POST);
 			$content_type = 'post';
-		}else{
+		}
+		else {
 			$message_json = file_get_contents("php://input");
 			$content_type = 'json';
 		}
@@ -265,7 +267,7 @@ if (count($message_content) == 3) {
 		}
 	}
 	elseif ($content_type == 'post') {
-		if(!empty($setting['message_media_array']) && isset($_POST[$setting['message_media_array']])){
+		if (!empty($setting['message_media_array']) && isset($_POST[$setting['message_media_array']])){
 			$message_media_array = $_POST[$setting['message_media_array']] ;
 		}
 		else {
@@ -286,7 +288,7 @@ if (count($message_content) == 3) {
 
 	}
 	elseif ($content_type == 'get') {
-		if(!empty($setting['message_media_array']) && isset($_GET[$setting['message_media_array']])){
+		if (!empty($setting['message_media_array']) && isset($_GET[$setting['message_media_array']])){
 			$message_media_array = $_GET[$setting['message_media_array']] ;
 		}
 		else {
@@ -328,7 +330,8 @@ if (count($message_content) == 3) {
 				if ($row['provider_setting_name'] == 'message_to') {
 					$message_to = format_string($row['provider_setting_value'], $message_to);
 				}
-			}else{
+			}
+			else {
 				if ($row['provider_setting_name'] == 'message_media_message_from') {
 					$message_from = format_string($row['provider_setting_value'], $message_from);
 				}

+ 11 - 7
resources/service/message_send_outbound.php

@@ -206,7 +206,7 @@
 	foreach ($provider_settings as $row) {
 		//format the phone numbers
 		if ($row['provider_setting_subcategory'] == 'format') {
-			if($message_type == 'sms'){
+			if ($message_type == 'sms'){
 				if ($row['provider_setting_name'] == 'message_from') {
 					$message_from = format_string($row['provider_setting_value'], $message_from);
 				}
@@ -219,7 +219,8 @@
 						$message_to_type = 'text';
 					}
 				}
-			}else{
+			}
+			else {
 				if ($row['provider_setting_name'] == 'message_media_message_from') {
 					$message_from = format_string($row['provider_setting_value'], $message_from);
 				}
@@ -250,11 +251,12 @@
 		$content_type = strtolower($setting['type']);
 	}
 	
-	if($message_type == 'sms'){
+	if ($message_type == 'sms'){
 		if (isset($setting['content_type'])) {
 			$content_type = strtolower($setting['content_type']);
 		}
-	}else{
+	}
+	else {
 		if (isset($setting['message_media_content_type'])) {
 			$content_type = strtolower($setting['message_media_content_type']);
 		}
@@ -326,7 +328,8 @@
 				if ($row['provider_setting_name'] == 'message_content') { 
 					$outbound_array = build_array($outbound_array ?? [], $row['provider_setting_value'], $message_text);
 				}
-			}else{
+			}
+			else {
 				if ($row['provider_setting_name'] == 'message_media_message_content') { 
 					$outbound_array = build_array($outbound_array ?? [], $row['provider_setting_value'], $message_text);
 				}
@@ -378,14 +381,15 @@
 		$query_string = '';
 		foreach ($outbound_array as $key => $value) {
 			if ($x != 0) { $query_string .= '&'; }
-			if(is_array($value)){
+			if (is_array($value)){
 				$y = 0;
 				foreach($value as $v){
 					if ($y != 0) { $query_string .= '&'; }
 					$query_string .= $key.'='. urlencode($v);	
 					$y++;
 				}
-			}else{
+			}
+			else {
 				$query_string .= $key.'='. urlencode($value);
 			}
 			$x++;