Completed
Push — v3.0 ( 300813...495b61 )
by Samir
13:52
created
astpp/application/modules/invoices/views/view_invoice_edit_manually.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -158,13 +158,13 @@
 block discarded – undo
158 158
 	        </tr>
159 159
 	<tr>
160 160
 		<td>
161
-		 		<b>From Date : </b><span style="color:#a09d9d;"> <?php echo date('Y-m-d', strtotime($from_date)) ; ?></span>
161
+		 		<b>From Date : </b><span style="color:#a09d9d;"> <?php echo date('Y-m-d', strtotime($from_date)); ?></span>
162 162
 		 </td>
163 163
 	</tr>
164 164
 	<tr>
165 165
 		<td>
166 166
  		<b>Due Date : </b><span style="color:#a09d9d;"><?php 
167
-				echo date('Y-m-d', strtotime($payment_due_date)) ;
167
+				echo date('Y-m-d', strtotime($payment_due_date));
168 168
 		?></span>
169 169
 		 </td>
170 170
 	</tr>
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/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.
web_interface/astpp/system/core/Input.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -136,14 +136,14 @@  discard block
 block discarded – undo
136 136
 	// --------------------------------------------------------------------
137 137
 
138 138
 	/**
139
-	* Fetch an item from the GET array
140
-	*
141
-	* @access	public
142
-	* @param	string
143
-	* @param	bool
144
-	* @param string $index
145
-	* @return	string
146
-	*/
139
+	 * Fetch an item from the GET array
140
+	 *
141
+	 * @access	public
142
+	 * @param	string
143
+	 * @param	bool
144
+	 * @param string $index
145
+	 * @return	string
146
+	 */
147 147
 	function get($index = NULL, $xss_clean = FALSE)
148 148
 	{
149 149
 		// Check if a field has been provided
@@ -165,14 +165,14 @@  discard block
 block discarded – undo
165 165
 	// --------------------------------------------------------------------
166 166
 
167 167
 	/**
168
-	* Fetch an item from the POST array
169
-	*
170
-	* @access	public
171
-	* @param	string
172
-	* @param	bool
173
-	* @param string $index
174
-	* @return	string
175
-	*/
168
+	 * Fetch an item from the POST array
169
+	 *
170
+	 * @access	public
171
+	 * @param	string
172
+	 * @param	bool
173
+	 * @param string $index
174
+	 * @return	string
175
+	 */
176 176
 	function post($index = NULL, $xss_clean = FALSE)
177 177
 	{
178 178
 		// Check if a field has been provided
@@ -361,14 +361,14 @@  discard block
 block discarded – undo
361 361
 	// --------------------------------------------------------------------
362 362
 
363 363
 	/**
364
-	* Validate IP Address
365
-	*
366
-	* Updated version suggested by Geert De Deckere
367
-	*
368
-	* @access	public
369
-	* @param	string
370
-	* @return	boolean
371
-	*/
364
+	 * Validate IP Address
365
+	 *
366
+	 * Updated version suggested by Geert De Deckere
367
+	 *
368
+	 * @access	public
369
+	 * @param	string
370
+	 * @return	boolean
371
+	 */
372 372
 	function valid_ip($ip)
373 373
 	{
374 374
 		$ip_segments = explode('.', $ip);
Please login to merge, or discard this patch.
web_interface/astpp/system/core/Output.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -99,8 +99,7 @@
 block discarded – undo
99 99
 		if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
100 100
 		{
101 101
 			include APPPATH.'config/'.ENVIRONMENT.'/mimes.php';
102
-		}
103
-		else
102
+		} else
104 103
 		{
105 104
 			include APPPATH.'config/mimes.php';
106 105
 		}
Please login to merge, or discard this patch.
web_interface/astpp/system/core/URI.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -162,9 +162,9 @@
 block discarded – undo
162 162
 		$str = remove_invisible_characters($str, FALSE);
163 163
 //================ITPL=======================
164 164
   $pos = strpos($str, "_json");
165
- if($pos > 0 && !isset($_SERVER['HTTP_X_REQUESTED_WITH'])){
165
+ if ($pos > 0 && ! isset($_SERVER['HTTP_X_REQUESTED_WITH'])) {
166 166
 	   $this->uri_string = str_replace('_json', '', trim($str, '/'));
167
- }else{
167
+ } else {
168 168
 		// If the URI contains only a slash we'll kill it
169 169
 		$this->uri_string = ($str == '/') ? '' : $str;
170 170
 }
Please login to merge, or discard this patch.
Braces   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
   $pos = strpos($str, "_json");
165 165
  if($pos > 0 && !isset($_SERVER['HTTP_X_REQUESTED_WITH'])){
166 166
 	   $this->uri_string = str_replace('_json', '', trim($str, '/'));
167
- }else{
167
+ } else{
168 168
 		// If the URI contains only a slash we'll kill it
169 169
 		$this->uri_string = ($str == '/') ? '' : $str;
170 170
 }
@@ -562,8 +562,7 @@  discard block
 block discarded – undo
562 562
 		if ($where == 'trailing')
563 563
 		{
564 564
 			$leading = '';
565
-		}
566
-		elseif ($where == 'leading')
565
+		} elseif ($where == 'leading')
567 566
 		{
568 567
 			$trailing = '';
569 568
 		}
Please login to merge, or discard this patch.
web_interface/astpp/system/core/Common.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -254,7 +254,7 @@
 block discarded – undo
254 254
 				}
255 255
 			}
256 256
 		}
257
-		$_config[0] =& $config;
257
+		$_config[0] = & $config;
258 258
 				return $_config[0];
259 259
 
260 260
 	}
Please login to merge, or discard this patch.