Passed
Pull Request — v3.0 (#165)
by
unknown
12:17
created
web_interface/astpp/system/database/DB_active_rec.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2132,7 +2132,7 @@
 block discarded – undo
2132 2132
 	 */
2133 2133
 		 function _insert_on_duplicate_update_batch($table, $keys, $values)
2134 2134
 		 {
2135
-				  foreach($keys as $key)
2135
+				  foreach ($keys as $key)
2136 2136
 				  $update_fields[] = $key.'=VALUES('.$key.')';
2137 2137
            
2138 2138
 				  return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES ".implode(', ', $values)." ON DUPLICATE KEY UPDATE ".implode(', ', $update_fields);
Please login to merge, or discard this patch.
web_interface/astpp/system/helpers/template_inheritance_helper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
 
237 237
 That's it for now. If you have questions, ideas or problems, please write me at daniel AT dornhardt.com.
238 238
 */
239
-	if (! defined('TI_VIEWS_DIR') ) {
239
+	if ( ! defined('TI_VIEWS_DIR')) {
240 240
 		if (defined('APPPATH')) {
241 241
 			define('TI_VIEWS_DIR', APPPATH.'views/');
242 242
 		} else {
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
 			$GLOBALS['CI']->load->view($GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
286 286
 		}
287 287
 		else {
288
-			include realpath( TI_VIEWS_DIR . $GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
288
+			include realpath(TI_VIEWS_DIR.$GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
289 289
 		}
290 290
 	}
291 291
 
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
 	 */
372 372
 	function block_rendering_neccessary() {
373 373
 		// check if no child did override this block
374
-		if (!array_key_exists($GLOBALS['TI_CURRENT_BLOCKNAME'], $GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'] )) {
374
+		if ( ! array_key_exists($GLOBALS['TI_CURRENT_BLOCKNAME'], $GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'])) {
375 375
 			return true;
376 376
 		}
377 377
 		// check if there is an extension marker in the child blocks data. If so, the
Please login to merge, or discard this patch.
web_interface/astpp/system/helpers/form_helper.php 1 patch
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -80,11 +80,11 @@  discard block
 block discarded – undo
80 80
 		return $form;
81 81
 	}
82 82
 }
83
-if(!function_exists('form_breadcrumb')){
84
-	function form_breadcrumb($info=''){
85
-	 $form=false;
86
-	 if(!empty($info))
87
- 	$form.="<div class='breadcrumb'>
83
+if ( ! function_exists('form_breadcrumb')) {
84
+	function form_breadcrumb($info = '') {
85
+	 $form = false;
86
+	 if ( ! empty($info))
87
+ 	$form .= "<div class='breadcrumb'>
88 88
 	        <a href='".$info['url']."'>".$info['name']."</a>
89 89
 		</div>";
90 90
 	return $form;
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
                    		</span>
213 213
                    </div>
214 214
                </div>';
215
-		}else{
215
+		} else {
216 216
 			return "<div class='col-md-5 no-padding'><image "._parse_form_attributes($data, $defaults).$extra." /></div>";
217 217
 		}	
218 218
 		
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 	{
227 227
 				//  echo '<pre>'; print_r($data); exit;
228 228
 			//$data["class"] = "col-md-5 form-control";
229
-			$data['value']='Delete';
229
+			$data['value'] = 'Delete';
230 230
 		$defaults = array('type' => 'button', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => 'Delete');
231 231
 
232 232
 		return "<div class='col-md-5 no-padding'><input "._parse_form_attributes($data, $defaults).$extra." /></div>";
@@ -377,21 +377,21 @@  discard block
 block discarded – undo
377 377
 
378 378
 		if ($extra != '') $extra = ' '.$extra;
379 379
 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';
380
-				if(is_array($name)){
381
-					 $str=null;
382
-					 foreach($name as $key=>$value){
383
-					  if($key !='class' && $key!='disabled')
384
-					  $str.=$key."='$value' ";
380
+				if (is_array($name)) {
381
+					 $str = null;
382
+					 foreach ($name as $key=>$value) {
383
+					  if ($key != 'class' && $key != 'disabled')
384
+					  $str .= $key."='$value' ";
385 385
 					 }
386
-					 if(isset($name['disabled']) && $name['disabled']== 'disabled'){
387
-					  $str.='disabled = "disabled"';
386
+					 if (isset($name['disabled']) && $name['disabled'] == 'disabled') {
387
+					  $str .= 'disabled = "disabled"';
388 388
 					 }
389 389
 							   $form = '<select '.$str." class='col-md-5 form-control selectpicker ".$name['class'].$extra."' data-live-search='true'>\n";
390
-				}else{
391
-					if(!empty($extra)){
392
-						$form = '<select  name="'.$name.'"' .$multiple." class='col-md-5 form-control selectpicker ".$extra."' data-live-search='true'>\n";
393
-					}else{
394
-						$form = '<select  name="'.$name.'"' .$multiple." class='col-md-5 form-control selectpicker' data-live-search='true'>\n";
390
+				} else {
391
+					if ( ! empty($extra)) {
392
+						$form = '<select  name="'.$name.'"'.$multiple." class='col-md-5 form-control selectpicker ".$extra."' data-live-search='true'>\n";
393
+					} else {
394
+						$form = '<select  name="'.$name.'"'.$multiple." class='col-md-5 form-control selectpicker' data-live-search='true'>\n";
395 395
 					}
396 396
 				}
397 397
 //                if($extra != '' ){
@@ -418,12 +418,12 @@  discard block
 block discarded – undo
418 418
 			{
419 419
 				$sel = (in_array($key, $selected)) ? ' selected="selected"' : '';
420 420
 
421
-				$form .= '<option value="'.$key.'"'.$sel.'>'.(string) $val."</option>\n";
421
+				$form .= '<option value="'.$key.'"'.$sel.'>'.(string)$val."</option>\n";
422 422
 			}
423 423
 		}
424
-				if(isset($name['option_value']) && isset($name['option_text'])){
425
-		  $sel= isset($name['value']) && $name['value']==$name['option_value']?'selected ="selected"':'';
426
-		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string) $name['option_text']."</option>\n";
424
+				if (isset($name['option_value']) && isset($name['option_text'])) {
425
+		  $sel = isset($name['value']) && $name['value'] == $name['option_value'] ? 'selected ="selected"' : '';
426
+		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string)$name['option_text']."</option>\n";
427 427
 				}
428 428
 		$form .= '</select>';
429 429
 //echo $form; exit;
@@ -449,21 +449,21 @@  discard block
 block discarded – undo
449 449
 			}
450 450
 		}
451 451
 		if ($extra != '') $extra = ' '.$extra;
452
-				$class= isset($name['class']) && !empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" :"col-md-5 form-control selectpicker";
452
+				$class = isset($name['class']) && ! empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" : "col-md-5 form-control selectpicker";
453 453
 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';
454
-		if(is_array($name) && !isset($name["id"])){
454
+		if (is_array($name) && ! isset($name["id"])) {
455 455
 					$form = '<select name="'.$name['name'].'"'." class='$class' data-live-search='true'>\n";
456
-				}else if(is_array($name) && isset($name["id"])){
456
+				} else if (is_array($name) && isset($name["id"])) {
457 457
 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='$class' data-live-search='true'>\n";
458 458
 				}
459
-				else{
460
-					$form = '<select name="'.$name.'"' .$multiple." class='$class' data-live-search='true'>\n";
459
+				else {
460
+					$form = '<select name="'.$name.'"'.$multiple." class='$class' data-live-search='true'>\n";
461 461
 				}   
462 462
 
463 463
 		$form .= '<option value=""> --Select-- </option>';
464 464
 		foreach ($options as $key => $val)
465 465
 		{
466
-			$key = (string) $key;
466
+			$key = (string)$key;
467 467
 
468 468
 			if (is_array($val) && ! empty($val))
469 469
 			{
@@ -481,12 +481,12 @@  discard block
 block discarded – undo
481 481
 			{
482 482
 				$sel = (in_array($key, $selected)) ? ' selected="selected"' : '';
483 483
 
484
-				$form .= '<option value="'.$key.'"'.$sel.'>'.(string) $val."</option>\n";
484
+				$form .= '<option value="'.$key.'"'.$sel.'>'.(string)$val."</option>\n";
485 485
 			}
486 486
 		}
487
-				if(isset($name['option_value']) && isset($name['option_text'])){
488
-		  $sel= isset($name['value']) && $name['value']==$name['option_value']?'selected ="selected"':'';
489
-		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string) $name['option_text']."</option>\n";
487
+				if (isset($name['option_value']) && isset($name['option_text'])) {
488
+		  $sel = isset($name['value']) && $name['value'] == $name['option_value'] ? 'selected ="selected"' : '';
489
+		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string)$name['option_text']."</option>\n";
490 490
 				}
491 491
 		$form .= '</select>';
492 492
 
@@ -517,35 +517,35 @@  discard block
 block discarded – undo
517 517
 		/*
518 518
 		  ASTPP  3.0  For Search Display In
519 519
 		*/
520
-		if ($extra != '' && !is_array($extra)) $extra = ' '.$extra;
520
+		if ($extra != '' && ! is_array($extra)) $extra = ' '.$extra;
521 521
 			/**********************************************************/
522 522
 
523
-		$class= isset($name['class']) && !empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" :"col-md-5 form-control selectpicker";
523
+		$class = isset($name['class']) && ! empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" : "col-md-5 form-control selectpicker";
524 524
 
525 525
 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';
526 526
 				/*
527 527
 		  ASTPP  3.0  For Search Display In
528 528
 		*/
529
-				if(empty($extra)){
529
+				if (empty($extra)) {
530 530
 				/*********************************/
531
-		if(is_array($name) && !isset($name["id"])){
531
+		if (is_array($name) && ! isset($name["id"])) {
532 532
 					$form = '<select name="'.$name['name'].'"'." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";
533
-				}else if(is_array($name) && isset($name["id"])){
533
+				} else if (is_array($name) && isset($name["id"])) {
534 534
 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";
535
-				}else{
536
-					$form = '<select name="'.$name.'"' .$multiple." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";
535
+				} else {
536
+					$form = '<select name="'.$name.'"'.$multiple." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";
537 537
 				}   
538 538
  /*
539 539
 		  ASTPP  3.0  For Search Display In
540 540
 		*/
541
-				}else{
541
+				} else {
542 542
 
543 543
 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='".$extra['class']." $class' style='".$extra['style']."' data-live-search='true'>\n";
544 544
 				 }
545 545
 		//$form .= '<option value=""> --Select-- </option>';
546 546
 		foreach ($options as $key => $val)
547 547
 		{
548
-			$key = (string) $key;
548
+			$key = (string)$key;
549 549
 
550 550
 			if (is_array($val) && ! empty($val))
551 551
 			{
@@ -685,13 +685,13 @@  discard block
 block discarded – undo
685 685
 		{
686 686
 			unset($defaults['checked']);
687 687
 		}
688
-		$class=NULL;
688
+		$class = NULL;
689 689
 
690 690
 //echo "<pre>".$value; print_r($extra); exit;
691
-		if(isset($extra[$value]) && !empty($extra) && $extra[$value] == '0'){
692
-		$class='onoffswitch-inner';
693
-		}else{
694
-		$class='onoffswitch-inner';
691
+		if (isset($extra[$value]) && ! empty($extra) && $extra[$value] == '0') {
692
+		$class = 'onoffswitch-inner';
693
+		} else {
694
+		$class = 'onoffswitch-inner';
695 695
  		}
696 696
 /*            if(isset($extra) && $extra != ''){
697 697
 	      if(isset($extra[0])){
Please login to merge, or discard this patch.
freeswitch/fs/lib/astpp.logger.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -30,15 +30,15 @@
 block discarded – undo
30 30
 		$this->config = $lib->config;
31 31
 		$this->config['log_path'] = "/var/log/astpp/";
32 32
 		if ($this->config['debug'] == '0')
33
-			$this->fp = fopen($this->config['log_path'] . 'astpp_' . date('Y-m-d') . '.txt', 'a');
33
+			$this->fp = fopen($this->config['log_path'].'astpp_'.date('Y-m-d').'.txt', 'a');
34 34
 	}
35 35
 
36 36
 	function log($log) {
37 37
 		if ($this->config['debug'] == '0') {
38 38
 			if (is_array($log))
39
-				fwrite($this->fp, "[" . date('Y-m-d H:i:s') . "] " . print_r($log, TRUE));
39
+				fwrite($this->fp, "[".date('Y-m-d H:i:s')."] ".print_r($log, TRUE));
40 40
 			else
41
-				fwrite($this->fp, "[" . date('Y-m-d H:i:s') . "] " . $log . "\n");
41
+				fwrite($this->fp, "[".date('Y-m-d H:i:s')."] ".$log."\n");
42 42
 		}
43 43
 	}
44 44
 
Please login to merge, or discard this patch.
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/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.