Completed
Pull Request — v3.0 (#140)
by Samir
21:15
created
freeswitch/fs/scripts/astpp.configuration.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 	header('Content-Type: text/xml');
30 30
 	echo $xml;
31 31
 } elseif ($_REQUEST['key_value'] == 'acl.conf') {
32
-	$xml = load_acl($logger, $db,$config);
32
+	$xml = load_acl($logger, $db, $config);
33 33
 	header('Content-Type: text/xml');
34 34
 	echo $xml;
35 35
 } else {
Please login to merge, or discard this patch.
freeswitch/fs/cdr.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	{
29 29
 		case 'development':
30 30
 //			error_reporting(E_ALL);
31
-			error_reporting(E_ERROR|E_WARNING|E_PARSE);
31
+			error_reporting(E_ERROR | E_WARNING | E_PARSE);
32 32
 		break;
33 33
 	
34 34
 		case 'testing':
@@ -55,18 +55,18 @@  discard block
 block discarded – undo
55 55
 $config = $lib->get_configurations($db);
56 56
 
57 57
 //Set default decimal points 
58
-$decimal_points = ($config['decimal_points'] <= 0)?4:$config['decimal_points'];
58
+$decimal_points = ($config['decimal_points'] <= 0) ? 4 : $config['decimal_points'];
59 59
 
60 60
 //Define logger object
61 61
 $logger = new logger($lib);
62 62
 
63
-if(isset($_SERVER["CONTENT_TYPE"]) && $_SERVER["CONTENT_TYPE"] == "application/json") {
63
+if (isset($_SERVER["CONTENT_TYPE"]) && $_SERVER["CONTENT_TYPE"] == "application/json") {
64 64
 
65 65
 	$db->run("SET NAMES utf8");
66
-	$data = json_decode(file_get_contents("php://input"),true);
66
+	$data = json_decode(file_get_contents("php://input"), true);
67 67
 	//error_log(print_r($data,true));
68
-	$logger->log(print_r($data,true));
69
-	process_cdr($data,$db,$logger,$decimal_points);
68
+	$logger->log(print_r($data, true));
69
+	process_cdr($data, $db, $logger, $decimal_points);
70 70
 }
71 71
 
72 72
 //$db->cleanup();
Please login to merge, or discard this patch.
astpp/application/modules/signup/views/view_forgot_success.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,9 +35,9 @@
 block discarded – undo
35 35
             <div class="row">
36 36
 
37 37
 			<div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
38
-                        <?php if (isset($astpp_notification)){ ?>
38
+                        <?php if (isset($astpp_notification)) { ?>
39 39
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
40
-                    <?php }else{
40
+                    <?php } else {
41 41
 						 echo "&nbsp;";
42 42
 					} 
43 43
 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/login/views/view_login.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,9 +35,9 @@
 block discarded – undo
35 35
             <div class="row">
36 36
 
37 37
 			<div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
38
-                        <?php if (isset($astpp_notification)){ ?>
38
+                        <?php if (isset($astpp_notification)) { ?>
39 39
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
40
-                    <?php }else{
40
+                    <?php } else {
41 41
 						 echo "&nbsp;";
42 42
 					} 
43 43
 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');
Please login to merge, or discard this patch.
astpp/application/modules/accounts/views/view_customer_speed_dial.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -119,7 +119,7 @@
 block discarded – undo
119 119
                                             </label>
120 120
                                             </div>
121 121
                                                <div class="col-md-3">
122
-                                            <input class="col-md-2 form-control" name="speed_dial_<?php echo $i; ?>" id="speed_dial_<?php echo $i; ?>" size="16" type="text"  value="<?php if (isset($speeddial[$i]) && !empty($speeddial[$i])) {
122
+                                            <input class="col-md-2 form-control" name="speed_dial_<?php echo $i; ?>" id="speed_dial_<?php echo $i; ?>" size="16" type="text"  value="<?php if (isset($speeddial[$i]) && ! empty($speeddial[$i])) {
123 123
 		echo $speeddial[$i];
124 124
 	} ?>">
125 125
                                                </div>
Please login to merge, or discard this patch.
astpp/application/modules/accounts/views/view_reseller_invoices_config.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -198,13 +198,13 @@
 block discarded – undo
198 198
 				</div>
199 199
 		</div>	
200 200
 <?php
201
-	if($account_data['logo']  != ''){
202
-		 $logo=$account_data['file'];
203
-	}else{
204
-		 $logo=$account_data['logo'];
201
+	if ($account_data['logo'] != '') {
202
+		 $logo = $account_data['file'];
203
+	} else {
204
+		 $logo = $account_data['logo'];
205 205
 	}
206
-		  if($logo != ''){        
207
-			 $file_name= base_url()."upload/$logo";
206
+		  if ($logo != '') {        
207
+			 $file_name = base_url()."upload/$logo";
208 208
 ?>
209 209
 
210 210
 		<div class='col-md-12 no-padding'>
Please login to merge, or discard this patch.
astpp/application/modules/user/views/view_user_fund_transfer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
         <div class="w-section inverse no-padding">
15 15
             <?php echo $form; ?>
16 16
             <?php
17
-			if(isset($validation_errors) && $validation_errors != ''){ ?>
17
+			if (isset($validation_errors) && $validation_errors != '') { ?>
18 18
                 <script>
19 19
                 var ERR_STR = '<?php echo $validation_errors; ?>';
20 20
                 print_error(ERR_STR);
Please login to merge, or discard this patch.