CC-4346: Prepared statements - part 2

- CRLF
- adding include in bootstrap

airtime_mvc/application/Bootstrap.php

@@ -19,6 +19,7 @@ require_once __DIR__."/configs/constants.php";
 require_once 'Preference.php';
 require_once "DateHelper.php";
 require_once "OsPath.php";
+require_once "Database.php";
 require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php';
 
 

airtime_mvc/application/common/Database.php

@@ -1,12 +1,12 @@
 <?php
 class Application_Common_Database{
     public static function prepareAndExcute($sql, $paramValueMap, $type='all'){
-        $con = Propel::getConnection();
+        $con = Propel::getConnection();
         $stmt = $con->prepare($sql);
         foreach ($paramValueMap as $param => $v) {
             $stmt->bindValue($param, $v);
         }
-        $rows = array();
+        $rows = array();
         if ($stmt->execute()) {
             if ($type == 'single') {
                 $rows = $stmt->fetch(PDO::FETCH_ASSOC);
@@ -14,10 +14,10 @@ class Application_Common_Database{
                 $rows = $stmt->fetchColumn();
             } else {
                 $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
-            }
-        } else {
-            $msg = implode(',', $stmt->errorInfo());
-            throw new Exception("Error: $msg");
+            }
+        } else {
+            $msg = implode(',', $stmt->errorInfo());
+            throw new Exception("Error: $msg");
         }
         return $rows;
     }