Passed
Pull Request — v3.0 (#146)
by
unknown
11:54
created
web_interface/astpp/application/modules/invoices/views/view_invoiceconf.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.
astpp/application/modules/invoices/views/view_invoice_payment.php 2 patches
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -100,13 +100,13 @@  discard block
 block discarded – undo
100 100
 	        </tr>
101 101
 	<tr>
102 102
 		<td>
103
-		 		<b>From Date : </b><span style="color:#a09d9d;"> <?php echo date('Y-m-d', strtotime($from_date)) ; ?></span>
103
+		 		<b>From Date : </b><span style="color:#a09d9d;"> <?php echo date('Y-m-d', strtotime($from_date)); ?></span>
104 104
 		 </td>
105 105
 	</tr>
106 106
 	<tr>
107 107
 		<td>
108 108
  		<b>Due Date : </b><span style="color:#a09d9d;"><?php 
109
-				echo date('Y-m-d', strtotime($payment_due_date)) ;
109
+				echo date('Y-m-d', strtotime($payment_due_date));
110 110
 		?></span>
111 111
 		 </td>
112 112
 	</tr>
@@ -140,24 +140,24 @@  discard block
 block discarded – undo
140 140
 	   </th>
141 141
 	 </tr> 
142 142
 	 <?php
143
-$paypal=0;
144
- foreach($invoice_final_query as $value){
143
+$paypal = 0;
144
+ foreach ($invoice_final_query as $value) {
145 145
  
146
-	if($value['item_type'] != 'INVPAY' && $value['item_type'] != 'PAYMENT')    {
147
-	   $debit=$value['debit'];
148
-	   $credit=$value['credit'];
149
-	   $paypal+=$credit;
150
-	   $created_date=$value['created_date'];
151
-	   $paypalid=$value['item_id'];
152
-	   $outstanding=$amount-$paypal;
153
-	   $amount_visible='0000';
146
+	if ($value['item_type'] != 'INVPAY' && $value['item_type'] != 'PAYMENT') {
147
+	   $debit = $value['debit'];
148
+	   $credit = $value['credit'];
149
+	   $paypal += $credit;
150
+	   $created_date = $value['created_date'];
151
+	   $paypalid = $value['item_id'];
152
+	   $outstanding = $amount - $paypal;
153
+	   $amount_visible = '0000';
154 154
       
155 155
       
156 156
      
157 157
 ?>	
158 158
  	 <tr style="height:20px;">
159 159
 			 <td><?php echo $value['description']; ?>  </td>
160
-			 <td><div class="pull-right"><?php echo $this->common->currency_decimal($this->common_model->calculate_currency($debit)); ?> <?php  echo $to_currency;  ?></div></td>
160
+			 <td><div class="pull-right"><?php echo $this->common->currency_decimal($this->common_model->calculate_currency($debit)); ?> <?php  echo $to_currency; ?></div></td>
161 161
 			 <input type="hidden" name="new_amount" value="<?php echo $this->common->currency_decimal($this->common_model->calculate_currency($debit)); ?>">
162 162
 			 
163 163
 			
@@ -196,18 +196,18 @@  discard block
 block discarded – undo
196 196
 			
197 197
 	 </tr> 
198 198
 	 <?php
199
-$paypal=0;
200
-if($invoice_date){
201
- foreach($invoice_total_query as $value){
199
+$paypal = 0;
200
+if ($invoice_date) {
201
+ foreach ($invoice_total_query as $value) {
202 202
  
203 203
      
204
-	   $debit=$value['debit'];
205
-	   $credit=$value['credit'];
206
-	   $paypal+=$credit;
207
-	   $created_date=$value['created_date'];
208
-	   $paypalid=$value['item_id'];
209
-	   $outstanding=$amount-$paypal;
210
-	   $amount_visible='0000';
204
+	   $debit = $value['debit'];
205
+	   $credit = $value['credit'];
206
+	   $paypal += $credit;
207
+	   $created_date = $value['created_date'];
208
+	   $paypalid = $value['item_id'];
209
+	   $outstanding = $amount - $paypal;
210
+	   $amount_visible = '0000';
211 211
       
212 212
       
213 213
      
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -298,7 +298,7 @@
 block discarded – undo
298 298
 		</td>
299 299
 	     </tr>
300 300
 	</table>
301
-<?php }elseif ($logintype == 1) {?>
301
+<?php } elseif ($logintype == 1) {?>
302 302
 	  <table class="invoice_table1  pull-right">
303 303
 	    <tr style="border-bottom:2px solid #dfdfe1; color:#474747;"><th colspan="2">Payment Amount :</th></tr>
304 304
 	      <tr>
Please login to merge, or discard this patch.
web_interface/astpp/application/language/english/footer_lang.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1
+<?php if ( ! defined('BASEPATH')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 
3 5
 $_doctypes = array(
4 6
 					'xhtml11'		=> '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
Please login to merge, or discard this patch.
web_interface/astpp/application/language/english/menu_lang.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1
+<?php if ( ! defined('BASEPATH')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 
3 5
 $_doctypes = array(
4 6
 					'xhtml11'		=> '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
Please login to merge, or discard this patch.
web_interface/astpp/application/language/spanish/footer_lang.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1
+<?php if ( ! defined('BASEPATH')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 
3 5
 $_doctypes = array(
4 6
 					'xhtml11'		=> '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
Please login to merge, or discard this patch.
web_interface/astpp/application/language/spanish/menu_lang.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1
+<?php if ( ! defined('BASEPATH')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 
3 5
 $_doctypes = array(
4 6
 					'xhtml11'		=> '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
Please login to merge, or discard this patch.
web_interface/astpp/cron/cron.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 		unset($argv[1]);
23 23
 //        $argv = array_merge($argv, $config["argv"][$path]);
24 24
 		$argv[0] = $argv[0];
25
-		$argv[1] =$config["argv"][$path];
25
+		$argv[1] = $config["argv"][$path];
26 26
 		$_SERVER['argv'] = $argv;
27 27
 	} else
28 28
 		die('Use: php cron.php controller/method');
@@ -41,11 +41,11 @@  discard block
 block discarded – undo
41 41
 ob_start();
42 42
 
43 43
 // 	chdir( dirname( CRON_CI_INDEX ) );
44
-require( CRON_CI_INDEX );           // main CI index.php file
44
+require(CRON_CI_INDEX); // main CI index.php file
45 45
 $output = ob_get_contents();
46 46
 
47 47
 if (CRON_FLUSH_BUFFERS === TRUE)
48
-	while (@ob_end_flush());          // display buffer contents
48
+	while (@ob_end_flush()); // display buffer contents
49 49
 		else
50 50
 	ob_end_clean();
51 51
 
Please login to merge, or discard this patch.
Braces   +15 added lines, -9 removed lines patch added patch discarded remove patch
@@ -11,21 +11,24 @@  discard block
 block discarded – undo
11 11
 define('CRON_BETA_MODE', $config['CRON_BETA_MODE']);
12 12
 
13 13
 // Set index.php location
14
-if (isset($config['CRON_CI_INDEX']) && $config['CRON_CI_INDEX'])
14
+if (isset($config['CRON_CI_INDEX']) && $config['CRON_CI_INDEX']) {
15 15
 	define('CRON_CI_INDEX', $config['CRON_CI_INDEX']);
16
-else
16
+} else {
17 17
 	define('CRON_CI_INDEX', '../index.php');
18
+}
18 19
 
19
-if (count($argv) <= 2)
20
+if (count($argv) <= 2) {
20 21
 	if (count($config['argv'])) {
21 22
 		$path = $argv[1];
23
+}
22 24
 		unset($argv[1]);
23 25
 //        $argv = array_merge($argv, $config["argv"][$path]);
24 26
 		$argv[0] = $argv[0];
25 27
 		$argv[1] =$config["argv"][$path];
26 28
 		$_SERVER['argv'] = $argv;
27
-	} else
28
-		die('Use: php cron.php controller/method');
29
+	} else {
30
+			die('Use: php cron.php controller/method');
31
+	}
29 32
 
30 33
 // Simulate an HTTP request
31 34
 $_SERVER['PATH_INFO'] = $argv[1];
@@ -44,10 +47,13 @@  discard block
 block discarded – undo
44 47
 require( CRON_CI_INDEX );           // main CI index.php file
45 48
 $output = ob_get_contents();
46 49
 
47
-if (CRON_FLUSH_BUFFERS === TRUE)
48
-	while (@ob_end_flush());          // display buffer contents
49
-		else
50
-	ob_end_clean();
50
+if (CRON_FLUSH_BUFFERS === TRUE) {
51
+	while (@ob_end_flush());
52
+}
53
+// display buffer contents
54
+		else {
55
+			ob_end_clean();
56
+		}
51 57
 
52 58
 echo "\n";
53 59
 ?>
Please login to merge, or discard this patch.
web_interface/astpp/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
  * as this file.
69 69
  *
70 70
  */
71
-	   $assets_path='assets';
71
+	   $assets_path = 'assets';
72 72
 /*
73 73
  *---------------------------------------------------------------
74 74
  * APPLICATION FOLDER NAME
Please login to merge, or discard this patch.
web_interface/astpp/system/core/Loader.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1025,18 +1025,15 @@
 block discarded – undo
1025 1025
 					{
1026 1026
 						include($path.'config/'.ENVIRONMENT.'/'.strtolower($class).'.php');
1027 1027
 						break;
1028
-					}
1029
-					elseif (defined('ENVIRONMENT') AND file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
1028
+					} elseif (defined('ENVIRONMENT') AND file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
1030 1029
 					{
1031 1030
 						include($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php');
1032 1031
 						break;
1033
-					}
1034
-					elseif (file_exists($path.'config/'.strtolower($class).'.php'))
1032
+					} elseif (file_exists($path.'config/'.strtolower($class).'.php'))
1035 1033
 					{
1036 1034
 						include($path.'config/'.strtolower($class).'.php');
1037 1035
 						break;
1038
-					}
1039
-					elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
1036
+					} elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
1040 1037
 					{
1041 1038
 						include($path.'config/'.ucfirst(strtolower($class)).'.php');
1042 1039
 						break;
Please login to merge, or discard this patch.