Passed
Pull Request — v3.0 (#169)
by
unknown
11:45
created
application/modules/rates/views/view_import_termination_rate_mapper.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -176,8 +176,7 @@
 block discarded – undo
176 176
 
177 177
                      				 echo "<th>".ucfirst($field_val)."</th>";
178 178
 
179
-                     			}
180
-                     			else {
179
+                     			} else {
181 180
                      				echo "<td class='portlet-content'>" . $field_val . "</td>";
182 181
                      				$cnt++;
183 182
                      			}
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/rates/controllers/rates.php 1 patch
Braces   +36 added lines, -42 removed lines patch added patch discarded remove patch
@@ -35,8 +35,9 @@  discard block
 block discarded – undo
35 35
 		ini_set("memory_limit", "2048M");
36 36
 		ini_set("max_execution_time", "259200");
37 37
 		ini_set("upload_max_filesize", "200M");
38
-		if ($this->session->userdata('user_login') == FALSE)
39
-			redirect(base_url() . '/astpp/login');
38
+		if ($this->session->userdata('user_login') == FALSE) {
39
+					redirect(base_url() . '/astpp/login');
40
+		}
40 41
 	}
41 42
 
42 43
 	function termination_rates_list() {
@@ -110,18 +111,17 @@  discard block
 block discarded – undo
110 111
 			  $data['check_header']=$check_header;
111 112
 			  $data['page_title'] = 'Termination Rates Preview';
112 113
 			  $this->session->set_userdata('import_termination_rate_csv',$actual_file_name);
113
-			}else{
114
+			} else{
114 115
 			  $data['error'] = "File Uploading Fail Please Try Again";
115 116
 			}
116 117
 					}
117
-				}
118
-				else{
118
+				} else{
119 119
 					$data['error']=="File Uploading Fail Please Try Again";
120 120
 				}
121
-			}else {
121
+			} else {
122 122
 				$data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)";
123 123
 			}
124
-		}else{
124
+		} else{
125 125
 		$invalid_flag=true;
126 126
 		}
127 127
 		if ($invalid_flag) {
@@ -164,8 +164,7 @@  discard block
 block discarded – undo
164 164
 		if($str != ""){
165 165
 		  $invalid_array[$i]=$csv_data;
166 166
 		  $invalid_array[$i]['error'] = $str;
167
-		}
168
-		else{
167
+		} else{
169 168
 		  $csv_data['trunk_id']=$trunkID;
170 169
 		  $csv_data['pattern'] = "^" . $csv_data['pattern'] . ".*";
171 170
 		  $new_final_arr[$i]=$csv_data;
@@ -253,19 +252,17 @@  discard block
 block discarded – undo
253 252
 						$data['page_title'] = "Origination Rates Preview";
254 253
 						$data['check_header']=$check_header;
255 254
 						$this->session->set_userdata('import_origination_rate_csv',$actual_file_name);
256
-					}else{
255
+					} else{
257 256
 						$data['error'] = "File Uploading Fail Please Try Again";
258 257
 					}
259 258
 				}
260
-			 }   
261
-			else{
259
+			 } else{
262 260
 					$data['error']=="File Uploading Fail Please Try Again";
263 261
 				}
264
-		   }
265
-		   else {
262
+		   } else {
266 263
 				$data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)";
267 264
 			}
268
-			}else{
265
+			} else{
269 266
 		$invalid_flag=true;
270 267
 			}
271 268
 		if ($invalid_flag) {
@@ -309,8 +306,7 @@  discard block
 block discarded – undo
309 306
 		if($str != ""){
310 307
 		  $invalid_array[$i]=$csv_data;
311 308
 		  $invalid_array[$i]['error'] = $str;
312
-		}
313
-		else{
309
+		} else{
314 310
 		  $csv_data['pricelist_id']=$pricelistID;
315 311
 		  $csv_data['trunk_id']=$trunkid;
316 312
 		  $csv_data['pattern'] = "^" . $csv_data['pattern'] . ".*";
@@ -372,12 +368,10 @@  discard block
 block discarded – undo
372 368
 		$count = count($error_field);
373 369
 		$str.= $count > 1 ? ' are not valid' : ' is not Valid';
374 370
 		return $str;
375
-		  }
376
-		  else{
371
+		  } else{
377 372
 		  return false;
378 373
 		  }
379
-	  }
380
-	  else{
374
+	  } else{
381 375
 	  $str=rtrim($str,',');
382 376
 		$error_field=explode(',',$str);
383 377
 		$count = count($error_field);
@@ -618,13 +612,15 @@  discard block
 block discarded – undo
618 612
 		$where = array('accountid' => $accountid);
619 613
 		$instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_pattern'); 
620 614
 		$like_str=!empty($instant_search) ? "(blocked_patterns like '%$instant_search%'  OR  destination like '%$instant_search%' )" :null;
621
-		if(!empty($like_str))
622
-		$this->db->where($like_str);
615
+		if(!empty($like_str)) {
616
+				$this->db->where($like_str);
617
+		}
623 618
 		$count_all = $this->db_model->countQuery("*", "block_patterns", $where);
624 619
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
625 620
 		$json_data = $paging_data["json_paging"];
626
-		if(!empty($like_str))
627
-		$this->db->where($like_str);
621
+		if(!empty($like_str)) {
622
+				$this->db->where($like_str);
623
+		}
628 624
 		$pattern_data = $this->db_model->getSelect("*", "block_patterns", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
629 625
 		$grid_fields = json_decode($this->rates_form->build_pattern_list_for_customer($accountid,$accounttype));
630 626
 		$json_data['rows'] = $this->form->build_grid($pattern_data, $grid_fields);
@@ -1059,15 +1055,20 @@  discard block
 block discarded – undo
1059 1055
 
1060 1056
 	function csv_to_array($filename = '', $delimiter = ',')
1061 1057
 	{
1062
-		if (!file_exists($filename) || !is_readable($filename)) return FALSE;
1058
+		if (!file_exists($filename) || !is_readable($filename)) {
1059
+			return FALSE;
1060
+		}
1063 1061
 		$header = NULL;
1064 1062
 		$data = array();
1065 1063
 		if (($handle = fopen($filename, 'r')) !== FALSE)
1066 1064
 		{
1067 1065
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1068 1066
 			{
1069
-				if (!$header) $header = $row;
1070
-				else $data[] = array_combine($header, $row);
1067
+				if (!$header) {
1068
+					$header = $row;
1069
+				} else {
1070
+					$data[] = array_combine($header, $row);
1071
+				}
1071 1072
 			}
1072 1073
 
1073 1074
 			fclose($handle);
@@ -1131,25 +1132,21 @@  discard block
 block discarded – undo
1131 1132
 							$data['check_header'] = $check_header;
1132 1133
 							$data['page_title'] = 'Map CSV to Termination Rates';
1133 1134
 							$this->session->set_userdata('import_termination_rate_mapper_csv', $actual_file_name);
1134
-						}
1135
-						else
1135
+						} else
1136 1136
 						{
1137 1137
 							$data['error'] = "File Uploading Fail Please Try Again";
1138 1138
 						}
1139 1139
 					}
1140
-				}
1141
-				else
1140
+				} else
1142 1141
 				{
1143 1142
 					$data['error'] == "File Uploading Fail Please Try Again";
1144 1143
 				}
1145
-			}
1146
-			else
1144
+			} else
1147 1145
 			{
1148 1146
 				$data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)";
1149 1147
 				$data['error'] = var_dump($_FILES);
1150 1148
 			}
1151
-		}
1152
-		else
1149
+		} else
1153 1150
 		{
1154 1151
 			$invalid_flag = true;
1155 1152
 		}
@@ -1229,8 +1226,7 @@  discard block
 block discarded – undo
1229 1226
 				{
1230 1227
 					$invalid_array[$i] = $csv_data;
1231 1228
 					$invalid_array[$i]['error'] = $str;
1232
-				}
1233
-				else
1229
+				} else
1234 1230
 				{
1235 1231
 					$new_final_arr[$i]['trunk_id'] = $trunkID;
1236 1232
 					$new_final_arr[$i]['pattern'] = "^" . $csv_data['pattern'] . ".*";
@@ -1252,8 +1248,7 @@  discard block
 block discarded – undo
1252 1248
 		if (!empty($new_final_arr))
1253 1249
 		{
1254 1250
 			$result = $this->rates_model->bulk_insert_termination_rate($new_final_arr);
1255
-		}
1256
-        		else
1251
+		} else
1257 1252
         {
1258 1253
 
1259 1254
            $this->session->set_flashdata('astpp_errormsg', 'Error - Nothing selected to import/process!');
@@ -1286,8 +1281,7 @@  discard block
 block discarded – undo
1286 1281
 			$data['failure_count'] = count($invalid_array) - 1;
1287 1282
 			$data['page_title'] = 'Termination Rates Import Error';
1288 1283
 			$this->load->view('view_import_error', $data);
1289
-		}
1290
-		else
1284
+		} else
1291 1285
 		{
1292 1286
 			$this->session->set_flashdata('astpp_errormsg', 'Total ' . count($new_final_arr) . ' Termination rates imported successfully!');
1293 1287
 			redirect(base_url() . "rates/termination_rate_list/");
Please login to merge, or discard this patch.