Passed
Push — master ( bd9fa9...1955b9 )
by Darío
07:55
created
module/Connections/source/Controller/Tools.php 2 patches
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -183,8 +183,8 @@  discard block
 block discarded – undo
183 183
         $data = [];
184 184
 
185 185
         # environment settings
186
-        $post = $this->getPost();           # catch $_POST
187
-        $this->setTerminal(true);           # set terminal
186
+        $post = $this->getPost(); # catch $_POST
187
+        $this->setTerminal(true); # set terminal
188 188
 
189 189
         # TRY-CATCH-BLOCK
190 190
         try {
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
                 $http = new Http();
196 196
                 $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
197 197
 
198
-                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
198
+                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
199 199
             }
200 200
 
201 201
             $idenfiers = $this->getIdentifiersEntity()->select([]);
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
                         $http = new Http();
213 213
                         $http->writeStatus($http::HTTP_BAD_REQUEST);
214 214
 
215
-                        die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
215
+                        die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
216 216
                     }
217 217
                 });
218 218
 
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
                         $http = new Http();
243 243
                         $http->writeStatus($http::HTTP_BAD_REQUEST);
244 244
 
245
-                        die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
245
+                        die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
246 246
                     }
247 247
                 });
248 248
 
@@ -361,14 +361,14 @@  discard block
 block discarded – undo
361 361
             $http = new Http();
362 362
             $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
363 363
 
364
-            die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
364
+            die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
365 365
         }
366 366
 
367 367
         # data to send
368 368
         $data = [];
369 369
 
370
-        $this->setTerminal(true);           # set terminal
371
-        $post = $this->getPost();           # catch $_POST
370
+        $this->setTerminal(true); # set terminal
371
+        $post = $this->getPost(); # catch $_POST
372 372
 
373 373
         $data["id"]   = $post["id"];
374 374
         $data["conn"] = $post["conn"];
@@ -390,8 +390,8 @@  discard block
 block discarded – undo
390 390
         $data = [];
391 391
 
392 392
         # environment settings
393
-        $post = $this->getPost();           # catch $_POST
394
-        $this->setTerminal(true);           # set terminal
393
+        $post = $this->getPost(); # catch $_POST
394
+        $this->setTerminal(true); # set terminal
395 395
 
396 396
         # TRY-CATCH-BLOCK
397 397
         try {
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
                 $http = new Http();
403 403
                 $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
404 404
 
405
-                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
405
+                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
406 406
             }
407 407
 
408 408
             # STANDARD VALIDATIONS [check needed arguments]
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
                     $http = new Http();
415 415
                     $http->writeStatus($http::HTTP_BAD_REQUEST);
416 416
 
417
-                    die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
417
+                    die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
418 418
                 }
419 419
             });
420 420
 
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
544 544
                         $http = new Http();
545 545
                         $http->writeStatus($http::HTTP_BAD_REQUEST);
546 546
 
547
-                        die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
547
+                        die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
548 548
                     }
549 549
 
550 550
                     $row_start = $post["row_start"] + $step;
@@ -697,11 +697,11 @@  discard block
 block discarded – undo
697 697
 
698 698
                             if (gettype($value) == 'object')
699 699
                             {
700
-                                if  (get_class($value) == 'OCI-Lob')
700
+                                if (get_class($value) == 'OCI-Lob')
701 701
                                 {
702 702
                                     if (($val = @$value->load()) === false)
703 703
                                     {
704
-                                        $val = null;   # only for default, this value is not used
704
+                                        $val = null; # only for default, this value is not used
705 705
                                         $column_errors[] = $column;
706 706
                                     }
707 707
 
@@ -778,8 +778,8 @@  discard block
 block discarded – undo
778 778
         $data = [];
779 779
 
780 780
         # environment settings
781
-        $post = $this->getPost();           # catch $_POST
782
-        $this->setTerminal(true);           # set terminal
781
+        $post = $this->getPost(); # catch $_POST
782
+        $this->setTerminal(true); # set terminal
783 783
 
784 784
         # TRY-CATCH-BLOCK
785 785
         try {
@@ -790,7 +790,7 @@  discard block
 block discarded – undo
790 790
                 $http = new Http();
791 791
                 $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
792 792
 
793
-                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
793
+                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
794 794
             }
795 795
 
796 796
             # STANDARD VALIDATIONS [check needed arguments]
@@ -802,7 +802,7 @@  discard block
 block discarded – undo
802 802
                     $http = new Http();
803 803
                     $http->writeStatus($http::HTTP_BAD_REQUEST);
804 804
 
805
-                    die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
805
+                    die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
806 806
                 }
807 807
             });
808 808
 
@@ -1085,11 +1085,11 @@  discard block
 block discarded – undo
1085 1085
 
1086 1086
                                 if (gettype($value) == 'object')
1087 1087
                                 {
1088
-                                    if  (get_class($value) == 'OCI-Lob')
1088
+                                    if (get_class($value) == 'OCI-Lob')
1089 1089
                                     {
1090 1090
                                         if (($val = @$value->load()) === false)
1091 1091
                                         {
1092
-                                            $val = null;   # only for default, this value is not used
1092
+                                            $val = null; # only for default, this value is not used
1093 1093
                                             $column_errors[] = $column;
1094 1094
                                         }
1095 1095
 
@@ -1111,7 +1111,7 @@  discard block
 block discarded – undo
1111 1111
 
1112 1112
                             foreach ($column_names as $column_name)
1113 1113
                             {
1114
-                                $table .= "\t\t\t<td>". $row[$column_name] ."</td>\r\n";
1114
+                                $table .= "\t\t\t<td>" . $row[$column_name] . "</td>\r\n";
1115 1115
                             }
1116 1116
 
1117 1117
                             $table .= "\t\t</tr>\r\n";
@@ -1153,11 +1153,11 @@  discard block
 block discarded – undo
1153 1153
 
1154 1154
                                 if (gettype($value) == 'object')
1155 1155
                                 {
1156
-                                    if  (get_class($value) == 'OCI-Lob')
1156
+                                    if (get_class($value) == 'OCI-Lob')
1157 1157
                                     {
1158 1158
                                         if (($val = @$value->load()) === false)
1159 1159
                                         {
1160
-                                            $val = null;   # only for default, this value is not used
1160
+                                            $val = null; # only for default, this value is not used
1161 1161
                                             $column_errors[] = $column;
1162 1162
                                         }
1163 1163
 
@@ -1258,7 +1258,7 @@  discard block
 block discarded – undo
1258 1258
             foreach ($errors as $errno => $error)
1259 1259
             {
1260 1260
                 $errorInformation .=
1261
-                    "<strong style='color: #a94442'>".
1261
+                    "<strong style='color: #a94442'>" .
1262 1262
                         $method
1263 1263
                             . "</strong>: <span style='color: #e24f4c'>{$error}</span> \n<br />";
1264 1264
             }
Please login to merge, or discard this patch.
Braces   +117 added lines, -98 removed lines patch added patch discarded remove patch
@@ -96,8 +96,9 @@  discard block
 block discarded – undo
96 96
      */
97 97
     private function getUsersEntity()
98 98
     {
99
-        if (!is_null($this->usersEntity))
100
-            return $this->usersEntity;
99
+        if (!is_null($this->usersEntity)) {
100
+                    return $this->usersEntity;
101
+        }
101 102
 
102 103
         $this->usersEntity = new EntityAdapter(new TableGateway(new UserModel()));
103 104
 
@@ -109,8 +110,9 @@  discard block
 block discarded – undo
109 110
      */
110 111
     private function getIdentifiersEntity()
111 112
     {
112
-        if (!is_null($this->identifiersEntity))
113
-            return $this->identifiersEntity;
113
+        if (!is_null($this->identifiersEntity)) {
114
+                    return $this->identifiersEntity;
115
+        }
114 116
 
115 117
         $this->identifiersEntity = new EntityAdapter(new TableGateway(new Identifiers()));
116 118
 
@@ -122,8 +124,9 @@  discard block
 block discarded – undo
122 124
      */
123 125
     private function getConnectionTypesEntity()
124 126
     {
125
-        if (!is_null($this->connectionTypesEntity))
126
-            return $this->connectionTypesEntity;
127
+        if (!is_null($this->connectionTypesEntity)) {
128
+                    return $this->connectionTypesEntity;
129
+        }
127 130
 
128 131
         $this->connectionTypesEntity = new EntityAdapter(new TableGateway(new ConnectionType()));
129 132
 
@@ -135,8 +138,9 @@  discard block
 block discarded – undo
135 138
      */
136 139
     private function getConnectionFieldsEntity()
137 140
     {
138
-        if (!is_null($this->connectionFieldsEntity))
139
-            return $this->connectionFieldsEntity;
141
+        if (!is_null($this->connectionFieldsEntity)) {
142
+                    return $this->connectionFieldsEntity;
143
+        }
140 144
 
141 145
         $this->connectionFieldsEntity = new EntityAdapter(new TableGateway(new ConnectionTypeField()));
142 146
 
@@ -148,8 +152,9 @@  discard block
 block discarded – undo
148 152
      */
149 153
     private function getUserConnectionEntity()
150 154
     {
151
-        if (!is_null($this->userConnectionEntity))
152
-            return $this->userConnectionEntity;
155
+        if (!is_null($this->userConnectionEntity)) {
156
+                    return $this->userConnectionEntity;
157
+        }
153 158
 
154 159
         $this->userConnectionEntity = new EntityAdapter(new UserConnectionsTable(new UserConnection()));
155 160
 
@@ -161,8 +166,9 @@  discard block
 block discarded – undo
161 166
      */
162 167
     private function getUserConnectionDetailsEntity()
163 168
     {
164
-        if (!is_null($this->userConnectionDetailsEntity))
165
-            return $this->userConnectionDetailsEntity;
169
+        if (!is_null($this->userConnectionDetailsEntity)) {
170
+                    return $this->userConnectionDetailsEntity;
171
+        }
166 172
 
167 173
         $this->userConnectionDetailsEntity = new EntityAdapter(new TableGateway(new UserConnectionDetails()));
168 174
 
@@ -226,12 +232,12 @@  discard block
 block discarded – undo
226 232
                 {
227 233
                     foreach ($idenfiers as $identifier)
228 234
                     {
229
-                        if ($field->CONN_IDENTI_ID == $identifier->CONN_IDENTI_ID)
230
-                            $dbconfig[$identifier->CONN_IDENTI_NAME] = $field->FIELD_VALUE;
235
+                        if ($field->CONN_IDENTI_ID == $identifier->CONN_IDENTI_ID) {
236
+                                                    $dbconfig[$identifier->CONN_IDENTI_NAME] = $field->FIELD_VALUE;
237
+                        }
231 238
                     }
232 239
                 }
233
-            }
234
-            else
240
+            } else
235 241
             {
236 242
                 # STANDARD VALIDATIONS [check needed arguments]
237 243
                 $needles = ['type', 'aliasname'];
@@ -287,8 +293,9 @@  discard block
 block discarded – undo
287 293
                 {
288 294
                     foreach ($idenfiers as $identifier)
289 295
                     {
290
-                        if ($field_number == $identifier->CONN_IDENTI_ID)
291
-                            $dbconfig[$identifier->CONN_IDENTI_NAME] = $field_value;
296
+                        if ($field_number == $identifier->CONN_IDENTI_ID) {
297
+                                                    $dbconfig[$identifier->CONN_IDENTI_NAME] = $field_value;
298
+                        }
292 299
                     }
293 300
                 }
294 301
             }
@@ -300,8 +307,7 @@  discard block
 block discarded – undo
300 307
 
301 308
                 $driverAdapter = new \Drone\Db\Driver\DriverAdapter($dbconfig, false);
302 309
                 $driverAdapter->getDb()->connect();
303
-            }
304
-            catch (\Exception $e)
310
+            } catch (\Exception $e)
305 311
             {
306 312
                 # SUCCESS-MESSAGE
307 313
                 $data["process"] = "error";
@@ -312,14 +318,12 @@  discard block
 block discarded – undo
312 318
 
313 319
             # SUCCESS-MESSAGE
314 320
             $data["process"] = "success";
315
-        }
316
-        catch (\Drone\Exception\Exception $e)
321
+        } catch (\Drone\Exception\Exception $e)
317 322
         {
318 323
             # ERROR-MESSAGE
319 324
             $data["process"] = "warning";
320 325
             $data["message"] = $e->getMessage();
321
-        }
322
-        catch (\Exception $e)
326
+        } catch (\Exception $e)
323 327
         {
324 328
             $file = str_replace('\\', '', __CLASS__);
325 329
             $storage = new \Drone\Exception\Storage("cache/$file.json");
@@ -427,13 +431,15 @@  discard block
 block discarded – undo
427 431
                 "USER_CONN_ID" => $id
428 432
             ]);
429 433
 
430
-            if (!count($connection))
431
-                throw new \Exception("The Connection does not exists");
434
+            if (!count($connection)) {
435
+                            throw new \Exception("The Connection does not exists");
436
+            }
432 437
 
433 438
             $connection = array_shift($connection);
434 439
 
435
-            if ($connection->STATE == 'I')
436
-                throw new \Drone\Exception\Exception("This connection was deleted", 300);
440
+            if ($connection->STATE == 'I') {
441
+                            throw new \Drone\Exception\Exception("This connection was deleted", 300);
442
+            }
437 443
 
438 444
             $details = $this->getUserConnectionDetailsEntity()->select([
439 445
                 "USER_CONN_ID" => $id
@@ -447,16 +453,18 @@  discard block
 block discarded – undo
447 453
             {
448 454
                 foreach ($idenfiers as $identifier)
449 455
                 {
450
-                    if ($field->CONN_IDENTI_ID == $identifier->CONN_IDENTI_ID)
451
-                        $dbconfig[$identifier->CONN_IDENTI_NAME] = $field->FIELD_VALUE;
456
+                    if ($field->CONN_IDENTI_ID == $identifier->CONN_IDENTI_ID) {
457
+                                            $dbconfig[$identifier->CONN_IDENTI_NAME] = $field->FIELD_VALUE;
458
+                    }
452 459
                 }
453 460
             }
454 461
 
455 462
             /* identifies if sql is base64 encoded */
456 463
             if (array_key_exists('base64', $post))
457 464
             {
458
-                if ((bool) $post["base64"])
459
-                    $post["sql"] = base64_decode($post["sql"]);
465
+                if ((bool) $post["base64"]) {
466
+                                    $post["sql"] = base64_decode($post["sql"]);
467
+                }
460 468
             }
461 469
 
462 470
             $data["sql"] = base64_encode($post["sql"]);
@@ -468,8 +476,9 @@  discard block
 block discarded – undo
468 476
              */
469 477
             $sql_text = trim($sql_text);
470 478
 
471
-            if (empty($sql_text))
472
-                throw new \Drone\Exception\Exception("Empty statement");
479
+            if (empty($sql_text)) {
480
+                            throw new \Drone\Exception\Exception("Empty statement");
481
+            }
473 482
 
474 483
             $pos = strpos($sql_text, ';');
475 484
 
@@ -477,8 +486,9 @@  discard block
 block discarded – undo
477 486
             {
478 487
                 $end_stament = strstr($sql_text, ';');
479 488
 
480
-                if ($end_stament == ';')
481
-                    $sql_text = strstr($sql_text, ';', true);
489
+                if ($end_stament == ';') {
490
+                                    $sql_text = strstr($sql_text, ';', true);
491
+                }
482 492
             }
483 493
 
484 494
              # clean comments and other characters
@@ -556,10 +566,11 @@  discard block
 block discarded – undo
556 566
                     case 'mysqli':
557 567
 
558 568
                         # show statement cannot be a subquery
559
-                        if (!$isShowStm)
560
-                            $sql_text = "SELECT (@ROW_NUM:=@ROW_NUM + 1) AS ROW_NUM, V.* FROM (
569
+                        if (!$isShowStm) {
570
+                                                    $sql_text = "SELECT (@ROW_NUM:=@ROW_NUM + 1) AS ROW_NUM, V.* FROM (
561 571
                                             " . $sql_text . "
562 572
                                         ) V LIMIT $row_start, $step";
573
+                        }
563 574
                         break;
564 575
 
565 576
                     case 'oci8':
@@ -636,8 +647,7 @@  discard block
 block discarded – undo
636 647
 
637 648
                 # redirect view
638 649
                 $this->setMethod('error');
639
-            }
640
-            catch (\Exception $e)
650
+            } catch (\Exception $e)
641 651
             {
642 652
                 # SUCCESS-MESSAGE
643 653
                 $data["process"] = "error";
@@ -692,8 +702,9 @@  discard block
 block discarded – undo
692 702
 
693 703
                         foreach ($row as $column => $value)
694 704
                         {
695
-                            if ($isShowStm)
696
-                                $column++;
705
+                            if ($isShowStm) {
706
+                                                            $column++;
707
+                            }
697 708
 
698 709
                             if (gettype($value) == 'object')
699 710
                             {
@@ -706,11 +717,10 @@  discard block
 block discarded – undo
706 717
                                     }
707 718
 
708 719
                                     $data["data"][$key][$column] = $val;
720
+                                } else {
721
+                                                                    $data["data"][$key][$column] = $value;
709 722
                                 }
710
-                                else
711
-                                    $data["data"][$key][$column] = $value;
712
-                            }
713
-                            else {
723
+                            } else {
714 724
                                 $data["data"][$key][$column] = $value;
715 725
                             }
716 726
                         }
@@ -718,24 +728,24 @@  discard block
 block discarded – undo
718 728
 
719 729
                     $data["column_errors"] = $column_errors;
720 730
 
721
-                    if ($row_start > 1)
722
-                        $this->setMethod('nextResults');
731
+                    if ($row_start > 1) {
732
+                                            $this->setMethod('nextResults');
733
+                    }
723 734
                 }
724 735
 
725
-                if (array_key_exists('id', $post))
726
-                    $data["id"] = $post["id"];
736
+                if (array_key_exists('id', $post)) {
737
+                                    $data["id"] = $post["id"];
738
+                }
727 739
 
728 740
                 # SUCCESS-MESSAGE
729 741
                 $data["process"] = "success";
730 742
             }
731
-        }
732
-        catch (\Drone\Exception\Exception $e)
743
+        } catch (\Drone\Exception\Exception $e)
733 744
         {
734 745
             # ERROR-MESSAGE
735 746
             $data["process"] = "warning";
736 747
             $data["message"] = $e->getMessage();
737
-        }
738
-        catch (\Exception $e)
748
+        } catch (\Exception $e)
739 749
         {
740 750
             $file = str_replace('\\', '', __CLASS__);
741 751
             $storage = new \Drone\Exception\Storage("cache/$file.json");
@@ -869,13 +879,15 @@  discard block
 block discarded – undo
869 879
                 "USER_CONN_ID" => $id
870 880
             ]);
871 881
 
872
-            if (!count($connection))
873
-                throw new \Exception("The Connection does not exists");
882
+            if (!count($connection)) {
883
+                            throw new \Exception("The Connection does not exists");
884
+            }
874 885
 
875 886
             $connection = array_shift($connection);
876 887
 
877
-            if ($connection->STATE == 'I')
878
-                throw new \Drone\Exception\Exception("This connection was deleted", 300);
888
+            if ($connection->STATE == 'I') {
889
+                            throw new \Drone\Exception\Exception("This connection was deleted", 300);
890
+            }
879 891
 
880 892
             $details = $this->getUserConnectionDetailsEntity()->select([
881 893
                 "USER_CONN_ID" => $id
@@ -889,16 +901,18 @@  discard block
 block discarded – undo
889 901
             {
890 902
                 foreach ($idenfiers as $identifier)
891 903
                 {
892
-                    if ($field->CONN_IDENTI_ID == $identifier->CONN_IDENTI_ID)
893
-                        $dbconfig[$identifier->CONN_IDENTI_NAME] = $field->FIELD_VALUE;
904
+                    if ($field->CONN_IDENTI_ID == $identifier->CONN_IDENTI_ID) {
905
+                                            $dbconfig[$identifier->CONN_IDENTI_NAME] = $field->FIELD_VALUE;
906
+                    }
894 907
                 }
895 908
             }
896 909
 
897 910
             /* identifies if sql is base64 encoded */
898 911
             if (array_key_exists('base64', $post))
899 912
             {
900
-                if ((bool) $post["base64"])
901
-                    $post["sql"] = base64_decode($post["sql"]);
913
+                if ((bool) $post["base64"]) {
914
+                                    $post["sql"] = base64_decode($post["sql"]);
915
+                }
902 916
             }
903 917
 
904 918
             $data["sql"] = base64_encode($post["sql"]);
@@ -910,8 +924,9 @@  discard block
 block discarded – undo
910 924
              */
911 925
             $sql_text = trim($sql_text);
912 926
 
913
-            if (empty($sql_text))
914
-                throw new \Drone\Exception\Exception("Empty statement");
927
+            if (empty($sql_text)) {
928
+                            throw new \Drone\Exception\Exception("Empty statement");
929
+            }
915 930
 
916 931
             $pos = strpos($sql_text, ';');
917 932
 
@@ -919,8 +934,9 @@  discard block
 block discarded – undo
919 934
             {
920 935
                 $end_stament = strstr($sql_text, ';');
921 936
 
922
-                if ($end_stament == ';')
923
-                    $sql_text = strstr($sql_text, ';', true);
937
+                if ($end_stament == ';') {
938
+                                    $sql_text = strstr($sql_text, ';', true);
939
+                }
924 940
             }
925 941
 
926 942
              # clean comments and other characters
@@ -941,8 +957,9 @@  discard block
 block discarded – undo
941 957
             $isShowStm   = $data["showStm"]   = (preg_match('/^SHOW/i', $clean_code));
942 958
 
943 959
             # detect selection
944
-            if (!$isSelectStm && !$isShowStm)
945
-                throw new \Exception("You can't export a non-selection statement!");
960
+            if (!$isSelectStm && !$isShowStm) {
961
+                            throw new \Exception("You can't export a non-selection statement!");
962
+            }
946 963
 
947 964
             try {
948 965
 
@@ -988,8 +1005,7 @@  discard block
 block discarded – undo
988 1005
 
989 1006
                 # redirect view
990 1007
                 $this->setMethod('error');
991
-            }
992
-            catch (\Exception $e)
1008
+            } catch (\Exception $e)
993 1009
             {
994 1010
                 # SUCCESS-MESSAGE
995 1011
                 $data["process"] = "error";
@@ -1060,8 +1076,9 @@  discard block
 block discarded – undo
1060 1076
 
1061 1077
                         foreach ($rows[0] as $column_name => $row)
1062 1078
                         {
1063
-                            if (!is_numeric($column_name))
1064
-                                $column_names[] = $column_name;
1079
+                            if (!is_numeric($column_name)) {
1080
+                                                            $column_names[] = $column_name;
1081
+                            }
1065 1082
                         }
1066 1083
 
1067 1084
                         $table .= "\t<thead>\r\n\t\t<tr>\r\n";
@@ -1080,8 +1097,9 @@  discard block
 block discarded – undo
1080 1097
 
1081 1098
                             foreach ($row as $column => $value)
1082 1099
                             {
1083
-                                if ($isShowStm)
1084
-                                    $column++;
1100
+                                if ($isShowStm) {
1101
+                                                                    $column++;
1102
+                                }
1085 1103
 
1086 1104
                                 if (gettype($value) == 'object')
1087 1105
                                 {
@@ -1094,11 +1112,10 @@  discard block
 block discarded – undo
1094 1112
                                         }
1095 1113
 
1096 1114
                                         $data["data"][$key][$column] = $val;
1115
+                                    } else {
1116
+                                                                            $data["data"][$key][$column] = $value;
1097 1117
                                     }
1098
-                                    else
1099
-                                        $data["data"][$key][$column] = $value;
1100
-                                }
1101
-                                else {
1118
+                                } else {
1102 1119
                                     $data["data"][$key][$column] = $value;
1103 1120
                                 }
1104 1121
                             }
@@ -1130,8 +1147,9 @@  discard block
 block discarded – undo
1130 1147
 
1131 1148
                         foreach ($rows[0] as $column_name => $row)
1132 1149
                         {
1133
-                            if (!is_numeric($column_name))
1134
-                                $column_names[] = $column_name;
1150
+                            if (!is_numeric($column_name)) {
1151
+                                                            $column_names[] = $column_name;
1152
+                            }
1135 1153
                         }
1136 1154
 
1137 1155
                         foreach ($column_names as $column_name)
@@ -1148,8 +1166,9 @@  discard block
 block discarded – undo
1148 1166
 
1149 1167
                             foreach ($row as $column => $value)
1150 1168
                             {
1151
-                                if ($isShowStm)
1152
-                                    $column++;
1169
+                                if ($isShowStm) {
1170
+                                                                    $column++;
1171
+                                }
1153 1172
 
1154 1173
                                 if (gettype($value) == 'object')
1155 1174
                                 {
@@ -1162,11 +1181,10 @@  discard block
 block discarded – undo
1162 1181
                                         }
1163 1182
 
1164 1183
                                         $data["data"][$key][$column] = $val;
1184
+                                    } else {
1185
+                                                                            $data["data"][$key][$column] = $value;
1165 1186
                                     }
1166
-                                    else
1167
-                                        $data["data"][$key][$column] = $value;
1168
-                                }
1169
-                                else {
1187
+                                } else {
1170 1188
                                     $data["data"][$key][$column] = $value;
1171 1189
                                 }
1172 1190
                             }
@@ -1203,20 +1221,19 @@  discard block
 block discarded – undo
1203 1221
 
1204 1222
                 $data["filename"] = $filename;
1205 1223
 
1206
-                if (array_key_exists('id', $post))
1207
-                    $data["id"] = $post["id"];
1224
+                if (array_key_exists('id', $post)) {
1225
+                                    $data["id"] = $post["id"];
1226
+                }
1208 1227
 
1209 1228
                 # SUCCESS-MESSAGE
1210 1229
                 $data["process"] = "success";
1211 1230
             }
1212
-        }
1213
-        catch (\Drone\Exception\Exception $e)
1231
+        } catch (\Drone\Exception\Exception $e)
1214 1232
         {
1215 1233
             # ERROR-MESSAGE
1216 1234
             $data["process"] = "warning";
1217 1235
             $data["message"] = $e->getMessage();
1218
-        }
1219
-        catch (\Exception $e)
1236
+        } catch (\Exception $e)
1220 1237
         {
1221 1238
             $file = str_replace('\\', '', __CLASS__);
1222 1239
             $storage = new \Drone\Exception\Storage("cache/$file.json");
@@ -1231,8 +1248,9 @@  discard block
 block discarded – undo
1231 1248
             }
1232 1249
 
1233 1250
             # errors retrived by the use of ErrorTrait
1234
-            if (count($this->getErrors()))
1235
-                $this->handleErrors($this->getErrors(), __METHOD__);
1251
+            if (count($this->getErrors())) {
1252
+                            $this->handleErrors($this->getErrors(), __METHOD__);
1253
+            }
1236 1254
 
1237 1255
             $data["code"]    = $errorCode;
1238 1256
             $data["message"] = $e->getMessage();
@@ -1268,15 +1286,16 @@  discard block
 block discarded – undo
1268 1286
             if (!$hd || !@fwrite($hd, $errorInformation))
1269 1287
             {
1270 1288
                 # error storing are not mandatory!
1289
+            } else {
1290
+                            @fclose($hd);
1271 1291
             }
1272
-            else
1273
-                @fclose($hd);
1274 1292
 
1275 1293
             $config = include 'config/application.config.php';
1276 1294
             $dev = $config["environment"]["dev_mode"];
1277 1295
 
1278
-            if ($dev)
1279
-                echo $errorInformation;
1296
+            if ($dev) {
1297
+                            echo $errorInformation;
1298
+            }
1280 1299
         }
1281 1300
     }
1282 1301
 }
1283 1302
\ No newline at end of file
Please login to merge, or discard this patch.