injitools / cms-Inji

system/modules/Db/objects/Mysql/Mysql.php

Indentation +39 added lines, -39 removed lines

@@ -13,30 +13,30 @@ 
 
 class Mysql extends \Object {
 
-  public $config = [];       // настройки подключения выбраной базы
-  public $connect = FALSE;        // ярлык соединения с MySQL
-  public $encoding = 'utf-8';        // установленная кодировка
-  public $db_name = 'test';         // выбраная в данный момент база
-  public $table_prefix = 'inji_';   // префикс названий таблиц
-  public $pdo = NULL;
-  public $lastQuery = '';
-  public $last_error = '';
-  public $noConnectAbort = false;
-  public $dbInstance = null;
+    public $config = [];       // настройки подключения выбраной базы
+    public $connect = FALSE;        // ярлык соединения с MySQL
+    public $encoding = 'utf-8';        // установленная кодировка
+    public $db_name = 'test';         // выбраная в данный момент база
+    public $table_prefix = 'inji_';   // префикс названий таблиц
+    public $pdo = NULL;
+    public $lastQuery = '';
+    public $last_error = '';
+    public $noConnectAbort = false;
+    public $dbInstance = null;
 
-  /**
-   * Подключение к MySQL
-   */
-  public function init($connect_options) {
+    /**
+     * Подключение к MySQL
+     */
+    public function init($connect_options) {
     extract($connect_options);
     if (isset($db_name))
-      $this->db_name = $db_name;
+        $this->db_name = $db_name;
     if (isset($encoding))
-      $this->encoding = $encoding;
+        $this->encoding = $encoding;
     if (isset($table_prefix))
-      $this->table_prefix = $table_prefix;
+        $this->table_prefix = $table_prefix;
     if (isset($noConnectAbort))
-      $this->noConnectAbort = $noConnectAbort;
+        $this->noConnectAbort = $noConnectAbort;
 
     $dsn = "mysql:host=$host;port=$port;dbname=$db_name;charset=$encoding";
     $dt = new \DateTime();
@@ -50,20 +50,20 @@ 
     $this->pdo = new \PDO($dsn, $user, $pass, $opt);
     $error = $this->pdo->errorInfo();
     if ((int) $error[0]) {
-      if ($this->noConnectAbort) {
+        if ($this->noConnectAbort) {
         return false;
-      } else {
+        } else {
         INJI_SYSTEM_ERROR($error[2], true);
-      }
+        }
     } else {
-      $this->connect = true;
-      $query = new Mysql\Query($this);
-      $query->query("SET SQL_BIG_SELECTS=1");
-      return true;
+        $this->connect = true;
+        $query = new Mysql\Query($this);
+        $query->query("SET SQL_BIG_SELECTS=1");
+        return true;
+    }
     }
-  }
 
-  public function getTableCols($table_name) {
+    public function getTableCols($table_name) {
     $query = new Mysql\Query($this);
     $old_db = $this->db_name;
     $old_prefix = $this->table_prefix;
@@ -76,35 +76,35 @@ 
     $this->db_name = $old_db;
     $this->table_prefix = $old_prefix;
     return $result->getArray('COLUMN_NAME');
-  }
+    }
 
-  public function tableExist($tableName) {
+    public function tableExist($tableName) {
     $query = new Mysql\Query($this);
     return (bool) $query->query("SHOW TABLES FROM `{$this->db_name}` LIKE '{$this->table_prefix}{$tableName}'")->getArray();
-  }
+    }
 
-  public function addCol($table = false, $name = false, $param = 'TEXT NOT NULL') {
+    public function addCol($table = false, $name = false, $param = 'TEXT NOT NULL') {
     if (!$table || !$name) {
-      return false;
+        return false;
     }
     if ($param == 'pk') {
-      $param = "int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`{$name}`)";
+        $param = "int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`{$name}`)";
     }
     $query = new Mysql\Query($this);
     return $query->query("ALTER TABLE `{$this->db_name}`.`{$this->table_prefix}{$table}` ADD `{$name}` {$param}");
-  }
+    }
 
-  public function delCol($table = false, $name = false) {
+    public function delCol($table = false, $name = false) {
     if (!$table || !$name) {
-      return false;
+        return false;
     }
     $query = new Mysql\Query($this);
     return $query->query("ALTER TABLE `{$this->db_name}`.`{$this->table_prefix}{$table}` DROP `{$name}`");
-  }
+    }
 
-  public function getTables() {
+    public function getTables() {
     $query = new Mysql\Query($this);
     return $query->query("SHOW TABLES")->getArray();
-  }
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -13,11 +13,11 @@ 
 
 class Mysql extends \Object {
 
-  public $config = [];       // настройки подключения выбраной базы
-  public $connect = FALSE;        // ярлык соединения с MySQL
-  public $encoding = 'utf-8';        // установленная кодировка
-  public $db_name = 'test';         // выбраная в данный момент база
-  public $table_prefix = 'inji_';   // префикс названий таблиц
+  public $config = []; // настройки подключения выбраной базы
+  public $connect = FALSE; // ярлык соединения с MySQL
+  public $encoding = 'utf-8'; // установленная кодировка
+  public $db_name = 'test'; // выбраная в данный момент база
+  public $table_prefix = 'inji_'; // префикс названий таблиц
   public $pdo = NULL;
   public $lastQuery = '';
   public $last_error = '';
@@ -71,7 +71,7 @@ 
     $this->table_prefix = '';
 
     $query->where('TABLE_SCHEMA', $old_db);
-    $query->where('TABLE_NAME', $old_prefix . $table_name);
+    $query->where('TABLE_NAME', $old_prefix.$table_name);
     $result = $query->select('COLUMNS');
     $this->db_name = $old_db;
     $this->table_prefix = $old_prefix;

Braces +12 added lines, -8 removed lines

@@ -29,14 +29,18 @@
    */
   public function init($connect_options) {
     extract($connect_options);
-    if (isset($db_name))
-      $this->db_name = $db_name;
-    if (isset($encoding))
-      $this->encoding = $encoding;
-    if (isset($table_prefix))
-      $this->table_prefix = $table_prefix;
-    if (isset($noConnectAbort))
-      $this->noConnectAbort = $noConnectAbort;
+    if (isset($db_name)) {
+          $this->db_name = $db_name;
+    }
+    if (isset($encoding)) {
+          $this->encoding = $encoding;
+    }
+    if (isset($table_prefix)) {
+          $this->table_prefix = $table_prefix;
+    }
+    if (isset($noConnectAbort)) {
+          $this->noConnectAbort = $noConnectAbort;
+    }
 
     $dsn = "mysql:host=$host;port=$port;dbname=$db_name;charset=$encoding";
     $dt = new \DateTime();