Piou-piou / ribs-framework

core/save/Mysqldump.class.php

Indentation +1427 added lines, -1427 removed lines

@@ -1,17 +1,17 @@ 
 <?php
 /**
- * Mysqldump File Doc Comment
- *
- * PHP version 5
- *
- * @category Library
- * @package  Ifsnop\Mysqldump
- * @author   Michael J. Calkins <clouddueling@github.com>
- * @author   Diego Torres <ifsnop@github.com>
- * @license  http://www.gnu.org/copyleft/gpl.html GNU General Public License
- * @link     https://github.com/ifsnop/mysqldump-php
- *
- */
+	 * Mysqldump File Doc Comment
+	 *
+	 * PHP version 5
+	 *
+	 * @category Library
+	 * @package  Ifsnop\Mysqldump
+	 * @author   Michael J. Calkins <clouddueling@github.com>
+	 * @author   Diego Torres <ifsnop@github.com>
+	 * @license  http://www.gnu.org/copyleft/gpl.html GNU General Public License
+	 * @link     https://github.com/ifsnop/mysqldump-php
+	 *
+	 */
 
 namespace core\save;
 
@@ -33,696 +33,696 @@ 
 class Mysqldump
 {
 
-    // Same as mysqldump
-    const MAXLINESIZE = 1000000;
-
-    // Available compression methods as constants
-    const GZIP = 'Gzip';
-    const BZIP2 = 'Bzip2';
-    const NONE = 'None';
-
-    // Available connection strings
-    const UTF8 = 'utf8';
-    const UTF8MB4 = 'utf8mb4';
-
-    // This can be set both on constructor or manually
-    public $host;
-    public $port;
-    public $user;
-    public $pass;
-    public $db;
-    public $fileName;
-
-    // Internal stuff
-    private $tables = array();
-    private $views = array();
-    private $triggers = array();
-    private $dbHandler;
-    private $dbType;
-    private $compressManager;
-    private $typeAdapter;
-    private $dumpSettings = array();
-    private $pdoSettings = array();
-    private $version;
-    private $tableColumnTypes = array();
-
-    /**
-     * Constructor of Mysqldump. Note that in the case of an SQLite database
-     * connection, the filename must be in the $db parameter.
-     *
-     * @param string $db         Database name
-     * @param string $user       SQL account username
-     * @param string $pass       SQL account password
-     * @param string $host       SQL server to connect to
-     * @param string $type       SQL database type
-     * @param array  $dumpSettings SQL database settings
-     * @param array  $pdoSettings  PDO configured attributes
-     */
-    public function __construct(
-        $db = '',
-        $user = '',
-        $pass = '',
-        $host = 'localhost',
-        $type = 'mysql',
-        $dumpSettings = array(),
-        $pdoSettings = array()
-    ) {
-        $dumpSettingsDefault = array(
-            'include-tables' => array(),
-            'exclude-tables' => array(),
-            'compress' => Mysqldump::NONE,
-            'no-data' => false,
-            'add-drop-table' => false,
-            'single-transaction' => true,
-            'lock-tables' => true,
-            'add-locks' => true,
-            'extended-insert' => true,
-            'disable-keys' => true,
-            'where' => '',
-            'no-create-info' => false,
-            'skip-triggers' => false,
-            'add-drop-trigger' => true,
-            'hex-blob' => true,
-            'databases' => false,
-            'add-drop-database' => false,
-            'skip-tz-utz' => false,
-            'no-autocommit' => true,
-            'default-character-set' => Mysqldump::UTF8,
-            'skip-comments' => false,
-            'skip-dump-date' => false,
-            /* deprecated */
-            'disable-foreign-keys-check' => true
-        );
-
-        $pdoSettingsDefault = array(
-            PDO::ATTR_PERSISTENT => true,
-            PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
-            PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => false
-        );
-
-        $this->db = $db;
-        $this->user = $user;
-        $this->pass = $pass;
-
-        $colonPos = strpos($host, ':');
-        if (false !== $colonPos) {
-            $this->port = substr($host, $colonPos + 1);
-            $this->host = substr($host, 0, $colonPos);
-        } else {
-            $this->port = null;
-            $this->host = $host;
-        }
-
-        $this->dbType = strtolower($type);
-        $this->pdoSettings = self::array_replace_recursive($pdoSettingsDefault, $pdoSettings);
-        $this->dumpSettings = self::array_replace_recursive($dumpSettingsDefault, $dumpSettings);
-
-        if (!isset($this->pdoSettings[PDO::MYSQL_ATTR_INIT_COMMAND])) {
-            $this->pdoSettings[PDO::MYSQL_ATTR_INIT_COMMAND] = "SET NAMES " . $this->dumpSettings['default-character-set'];
-        }
-
-        $diff = array_diff(array_keys($this->dumpSettings), array_keys($dumpSettingsDefault));
-        if (count($diff)>0) {
-            throw new Exception("Unexpected value in dumpSettings: (" . implode(",", $diff) . ")");
-        }
-
-        // Create a new compressManager to manage compressed output
-        $this->compressManager = CompressManagerFactory::create($this->dumpSettings['compress']);
-    }
-
-    /**
-     * Custom array_replace_recursive to be used if PHP < 5.3
-     * Replaces elements from passed arrays into the first array recursively
-     *
-     * @param array $array1 The array in which elements are replaced
-     * @param array $array2 The array from which elements will be extracted
-     *
-     * @return array Returns an array, or NULL if an error occurs.
-     */
-    public static function array_replace_recursive($array1, $array2)
-    {
-        if (function_exists('array_replace_recursive')) {
-            return array_replace_recursive($array1, $array2);
-        }
-
-        foreach ($array2 as $key => $value) {
-            if (is_array($value)) {
-                $array1[$key] = self::array_replace_recursive($array1[$key], $value);
-            } else {
-                $array1[$key] = $value;
-            }
-        }
-        return $array1;
-    }
-
-    /**
-     * Connect with PDO
-     *
-     * @return null
-     */
-    private function connect()
-    {
-        // Connecting with PDO
-        try {
-            switch ($this->dbType) {
-                case 'sqlite':
-                    $this->dbHandler = @new PDO("sqlite:" . $this->db, null, null, $this->pdoSettings);
-                    break;
-                case 'mysql':
-                case 'pgsql':
-                case 'dblib':
-                    $dsn =  $this->dbType .
-                        ":host=" . $this->host .
-                         (isset($this->port) ? ";port=" . $this->port : "") .
-                        ";dbname=" . $this->db;
-                    $this->dbHandler = @new PDO(
-                        $dsn,
-                        $this->user,
-                        $this->pass,
-                        $this->pdoSettings
-                    );
-                    // Fix for always-unicode output
-                    $this->dbHandler->exec("SET NAMES " . $this->dumpSettings['default-character-set']);
-                    // Store server version
-                    $this->version = $this->dbHandler->getAttribute(PDO::ATTR_SERVER_VERSION);
-                    break;
-                default:
-                    throw new Exception("Unsupported database type (" . $this->dbType . ")");
-            }
-        } catch (PDOException $e) {
-            throw new Exception(
-                "Connection to " . $this->dbType . " failed with message: " .
-                $e->getMessage()
-            );
-        }
-
-        $this->dbHandler->setAttribute(PDO::ATTR_ORACLE_NULLS, PDO::NULL_NATURAL);
-        $this->typeAdapter = TypeAdapterFactory::create($this->dbType, $this->dbHandler);
-    }
-
-    /**
-     * Main call
-     *
-     * @param string $filename  Name of file to write sql dump to
-     * @return null
-     */
-    public function start($filename = '')
-    {
-        // Output file can be redefined here
-        if (!empty($filename)) {
-            $this->fileName = $filename;
-        }
-        // We must set a name to continue
-        if (empty($this->fileName)) {
-            throw new Exception("Output file name is not set");
-        }
-
-        // Connect to database
-        $this->connect();
-
-        // Create output file
-        $this->compressManager->open($this->fileName);
-
-        // Write some basic info to output file
-        $this->compressManager->write($this->getDumpFileHeader());
-
-        // Store server settings and use sanner defaults to dump
-        $this->compressManager->write(
-            $this->typeAdapter->backup_parameters($this->dumpSettings)
-        );
-
-        if ($this->dumpSettings['databases']) {
-            $this->compressManager->write(
-                $this->typeAdapter->getDatabaseHeader($this->db)
-            );
-            if ($this->dumpSettings['add-drop-database']) {
-                $this->compressManager->write(
-                    $this->typeAdapter->add_drop_database($this->db)
-                );
-            }
-        }
-
-        // Get table, view and trigger structures from database
-        $this->getDatabaseStructure();
-
-        if ($this->dumpSettings['databases']) {
-            $this->compressManager->write(
-                $this->typeAdapter->databases($this->db)
-            );
-        }
-
-        // If there still are some tables/views in include-tables array,
-        // that means that some tables or views weren't found.
-        // Give proper error and exit.
-        if (0 < count($this->dumpSettings['include-tables'])) {
-            $name = implode(",", $this->dumpSettings['include-tables']);
-            throw new Exception("Table or View (" . $name . ") not found in database");
-        }
-
-        $this->exportTables();
-        $this->exportViews();
-        $this->exportTriggers();
-
-        // Restore saved parameters
-        $this->compressManager->write(
-            $this->typeAdapter->restore_parameters($this->dumpSettings)
-        );
-        // Write some stats to output file
-        $this->compressManager->write($this->getDumpFileFooter());
-        // Close output file
-        $this->compressManager->close();
-    }
-
-    /**
-     * Returns header for dump file
-     *
-     * @return string
-     */
-    private function getDumpFileHeader()
-    {
-        $header = '';
-        if (!$this->dumpSettings['skip-comments']) {
-            // Some info about software, source and time
-            $header = "-- mysqldump-php https://github.com/ifsnop/mysqldump-php" . PHP_EOL .
-                    "--" . PHP_EOL .
-                    "-- Host: {$this->host}\tDatabase: {$this->db}" . PHP_EOL .
-                    "-- ------------------------------------------------------" . PHP_EOL;
-
-            if (!empty($this->version)) {
-                $header .= "-- Server version \t" . $this->version . PHP_EOL;
-            }
-
-            $header .= "-- Date: " . date('r') . PHP_EOL . PHP_EOL;
-        }
-        return $header;
-    }
-
-    /**
-     * Returns footer for dump file
-     *
-     * @return string
-     */
-    private function getDumpFileFooter()
-    {
-        $footer = '';
-        if (!$this->dumpSettings['skip-comments']) {
-            $footer .= '-- Dump completed';
-            if (!$this->dumpSettings['skip-dump-date']) {
-                $footer .= ' on: ' . date('r');
-            }
-            $footer .= PHP_EOL;
-        }
-
-        return $footer;
-    }
-
-    /**
-     * Reads table and views names from database.
-     * Fills $this->tables array so they will be dumped later.
-     *
-     * @return null
-     */
-    private function getDatabaseStructure()
-    {
-        // Listing all tables from database
-        if (empty($this->dumpSettings['include-tables'])) {
-            // include all tables for now, blacklisting happens later
-            foreach ($this->dbHandler->query($this->typeAdapter->show_tables($this->db)) as $row) {
-                array_push($this->tables, current($row));
-            }
-        } else {
-            // include only the tables mentioned in include-tables
-            foreach ($this->dbHandler->query($this->typeAdapter->show_tables($this->db)) as $row) {
-                if (in_array(current($row), $this->dumpSettings['include-tables'], true)) {
-                    array_push($this->tables, current($row));
-                    $elem = array_search(
-                        current($row),
-                        $this->dumpSettings['include-tables']
-                    );
-                    unset($this->dumpSettings['include-tables'][$elem]);
-                }
-            }
-        }
-
-        // Listing all views from database
-        if (empty($this->dumpSettings['include-tables'])) {
-            // include all views for now, blacklisting happens later
-            foreach ($this->dbHandler->query($this->typeAdapter->show_views($this->db)) as $row) {
-                array_push($this->views, current($row));
-            }
-        } else {
-            // include only the tables mentioned in include-tables
-            foreach ($this->dbHandler->query($this->typeAdapter->show_views($this->db)) as $row) {
-                if (in_array(current($row), $this->dumpSettings['include-tables'], true)) {
-                    array_push($this->views, current($row));
-                    $elem = array_search(
-                        current($row),
-                        $this->dumpSettings['include-tables']
-                    );
-                    unset($this->dumpSettings['include-tables'][$elem]);
-                }
-            }
-        }
-
-        // Listing all triggers from database
-        if (false === $this->dumpSettings['skip-triggers']) {
-            foreach ($this->dbHandler->query($this->typeAdapter->show_triggers($this->db)) as $row) {
-                array_push($this->triggers, $row['Trigger']);
-            }
-        }
-    }
-
-    /**
-     * Exports all the tables selected from database
-     *
-     * @return null
-     */
-    private function exportTables()
-    {
-        // Exporting tables one by one
-        foreach ($this->tables as $table) {
-            if (in_array($table, $this->dumpSettings['exclude-tables'], true)) {
-                continue;
-            }
-            $this->getTableStructure($table);
-            if (false === $this->dumpSettings['no-data']) {
-                $this->listValues($table);
-            }
-        }
-    }
-
-    /**
-     * Exports all the views found in database
-     *
-     * @return null
-     */
-    private function exportViews()
-    {
-        if (false === $this->dumpSettings['no-create-info']) {
-            // Exporting views one by one
-            foreach ($this->views as $view) {
-                if (in_array($view, $this->dumpSettings['exclude-tables'], true)) {
-                    continue;
-                }
-                $this->getViewStructure($view);
-            }
-        }
-    }
-
-    /**
-     * Exports all the triggers found in database
-     *
-     * @return null
-     */
-    private function exportTriggers()
-    {
-        // Exporting triggers one by one
-        foreach ($this->triggers as $trigger) {
-            $this->getTriggerStructure($trigger);
-        }
-    }
-
-
-    private function getTableStructure($tableName)
-    {
-        if (!$this->dumpSettings['no-create-info']) {
-            $ret = '';
-            if (!$this->dumpSettings['skip-comments']) {
-                $ret = "--" . PHP_EOL .
-                    "-- Table structure for table `$tableName`" . PHP_EOL .
-                    "--" . PHP_EOL . PHP_EOL;
-            }
-            $stmt = $this->typeAdapter->show_create_table($tableName);
-            foreach ($this->dbHandler->query($stmt) as $r) {
-                $this->compressManager->write($ret);
-                if ($this->dumpSettings['add-drop-table']) {
-                    $this->compressManager->write(
-                        $this->typeAdapter->drop_table($tableName)
-                    );
-                }
-                $this->compressManager->write(
-                    $this->typeAdapter->create_table($r, $this->dumpSettings)
-                );
-                break;
-            }
-        }
-
-        $columnTypes = array();
-        $columns = $this->dbHandler->query(
-            $this->typeAdapter->show_columns($tableName)
-        );
-        $columns->setFetchMode(PDO::FETCH_ASSOC);
-
-        foreach($columns as $key => $col) {
-            $types = $this->typeAdapter->parseColumnType($col);
-            $columnTypes[$col['Field']] = array(
-                'is_numeric'=> $types['is_numeric'],
-                'is_blob' => $types['is_blob'],
-                'type' => $types['type']
-            );
-        }
-        $this->tableColumnTypes[$tableName] = $columnTypes;
-        return;
-    }
-
-
-    private function getViewStructure($viewName)
-    {
-        $ret = '';
-        if (!$this->dumpSettings['skip-comments']) {
-            $ret = "--" . PHP_EOL .
-                "-- Table structure for view `${viewName}`" . PHP_EOL .
-                "--" . PHP_EOL . PHP_EOL;
-        }
-        $this->compressManager->write($ret);
-        $stmt = $this->typeAdapter->show_create_view($viewName);
-        foreach ($this->dbHandler->query($stmt) as $r) {
-            if ($this->dumpSettings['add-drop-table']) {
-                $this->compressManager->write(
-                    $this->typeAdapter->drop_view($viewName)
-                );
-            }
-            $this->compressManager->write(
-                $this->typeAdapter->create_view($r)
-            );
-            break;
-        }
-    }
-
-    /**
-     * Trigger structure extractor
-     *
-     * @param string $triggerName  Name of trigger to export
-     * @return null
-     */
-    private function getTriggerStructure($triggerName)
-    {
-        $stmt = $this->typeAdapter->show_create_trigger($triggerName);
-        foreach ($this->dbHandler->query($stmt) as $r) {
-            if ($this->dumpSettings['add-drop-trigger']) {
-                $this->compressManager->write(
-                    $this->typeAdapter->add_drop_trigger($triggerName)
-                );
-            }
-            $this->compressManager->write(
-                $this->typeAdapter->create_trigger($r)
-            );
-            return;
-        }
-
-    }
-
-
-    /**
-     * Escape values with quotes when needed
-     *
-     * @param string $tableName Name of table which contains rows
-     * @param array $row Associative array of column names and values to be quoted
-     *
-     * @return string
-     */
-    private function escape($tableName, $row)
-    {
-        $ret = array();
-        $columnTypes = $this->tableColumnTypes[$tableName];
-        foreach ($row as $colName => $colValue) {
-            if (is_null($colValue)) {
-                $ret[] = "NULL";
-            } elseif ($this->dumpSettings['hex-blob'] && $columnTypes[$colName]['is_blob']) {
-                if ($columnTypes[$colName]['type'] == 'bit' || !empty($colValue)) {
-                    $ret[] = "0x${colValue}";
-                } else {
-                    $ret[] = "''";
-                }
-            } elseif ($columnTypes[$colName]['is_numeric']) {
-                $ret[] = $colValue;
-            } else {
-                $ret[] = $this->dbHandler->quote($colValue);
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Table rows extractor
-     *
-     * @param string $tableName  Name of table to export
-     *
-     * @return null
-     */
-    private function listValues($tableName)
-    {
-        $this->prepareListValues($tableName);
-
-        $onlyOnce = true;
-        $lineSize = 0;
-
-        $colStmt = $this->getColumnStmt($tableName);
-        $stmt = "SELECT $colStmt FROM `$tableName`";
-
-        if ($this->dumpSettings['where']) {
-            $stmt .= " WHERE {$this->dumpSettings['where']}";
-        }
-        $resultSet = $this->dbHandler->query($stmt);
-        $resultSet->setFetchMode(PDO::FETCH_ASSOC);
-
-        foreach ($resultSet as $row) {
-            $vals = $this->escape($tableName, $row);
-            if ($onlyOnce || !$this->dumpSettings['extended-insert']) {
-                $lineSize += $this->compressManager->write(
-                    "INSERT INTO `$tableName` VALUES (" . implode(",", $vals) . ")"
-                );
-                $onlyOnce = false;
-            } else {
-                $lineSize += $this->compressManager->write(",(" . implode(",", $vals) . ")");
-            }
-            if (($lineSize > self::MAXLINESIZE) ||
-                    !$this->dumpSettings['extended-insert']) {
-                $onlyOnce = true;
-                $lineSize = $this->compressManager->write(";" . PHP_EOL);
-            }
-        }
-        $resultSet->closeCursor();
-
-        if (!$onlyOnce) {
-            $this->compressManager->write(";" . PHP_EOL);
-        }
-
-        $this->endListValues($tableName);
-    }
-
-    /**
-     * Table rows extractor, append information prior to dump
-     *
-     * @param string $tableName  Name of table to export
-     *
-     * @return null
-     */
-    function prepareListValues($tableName)
-    {
-        if (!$this->dumpSettings['skip-comments']) {
-            $this->compressManager->write(
-                "--" . PHP_EOL .
-                "-- Dumping data for table `$tableName`" .  PHP_EOL .
-                "--" . PHP_EOL . PHP_EOL
-            );
-        }
-
-        if ($this->dumpSettings['single-transaction']) {
-            $this->dbHandler->exec($this->typeAdapter->setup_transaction());
-            $this->dbHandler->exec($this->typeAdapter->start_transaction());
-        }
-
-        if ($this->dumpSettings['lock-tables']) {
-            $this->typeAdapter->lock_table($tableName);
-        }
-
-        if ($this->dumpSettings['add-locks']) {
-            $this->compressManager->write(
-                $this->typeAdapter->start_add_lock_table($tableName)
-            );
-        }
-
-        if ($this->dumpSettings['disable-keys']) {
-            $this->compressManager->write(
-                $this->typeAdapter->start_add_disable_keys($tableName)
-            );
-        }
-
-        // Disable autocommit for faster reload
-        if ($this->dumpSettings['no-autocommit']) {
-            $this->compressManager->write(
-                $this->typeAdapter->start_disable_autocommit()
-            );
-        }
-
-        return;
-    }
-
-    /**
-     * Table rows extractor, close locks and commits after dump
-     *
-     * @param string $tableName  Name of table to export
-     *
-     * @return null
-     */
-    function endListValues($tableName)
-    {
-        if ($this->dumpSettings['disable-keys']) {
-            $this->compressManager->write(
-                $this->typeAdapter->end_add_disable_keys($tableName)
-            );
-        }
-
-        if ($this->dumpSettings['add-locks']) {
-            $this->compressManager->write(
-                $this->typeAdapter->end_add_lock_table($tableName)
-            );
-        }
-
-        if ($this->dumpSettings['single-transaction']) {
-            $this->dbHandler->exec($this->typeAdapter->commit_transaction());
-        }
-
-        if ($this->dumpSettings['lock-tables']) {
-            $this->typeAdapter->unlock_table($tableName);
-        }
-
-        // Commit to enable autocommit
-        if ($this->dumpSettings['no-autocommit']) {
-            $this->compressManager->write(
-                $this->typeAdapter->end_disable_autocommit()
-            );
-        }
-
-        $this->compressManager->write(PHP_EOL);
-
-        return;
-    }
-
-    /**
-     * Build SQL List of all columns on current table
-     *
-     * @param string $tableName  Name of table to get columns
-     *
-     * @return string SQL sentence with columns
-     */
-    function getColumnStmt($tableName)
-    {
-        $colStmt = array();
-        foreach($this->tableColumnTypes[$tableName] as $colName => $colType) {
-            if ($colType['type'] == 'bit' && $this->dumpSettings['hex-blob']) {
-                $colStmt[] = "LPAD(HEX(`${colName}`),2,'0') AS `${colName}`";
-            } else if ($colType['is_blob'] && $this->dumpSettings['hex-blob']) {
-                $colStmt[] = "HEX(`${colName}`) AS `${colName}`";
-            } else {
-                $colStmt[] = "`${colName}`";
-            }
-        }
-        $colStmt = implode($colStmt, ",");
-
-        return $colStmt;
-    }
+	// Same as mysqldump
+	const MAXLINESIZE = 1000000;
+
+	// Available compression methods as constants
+	const GZIP = 'Gzip';
+	const BZIP2 = 'Bzip2';
+	const NONE = 'None';
+
+	// Available connection strings
+	const UTF8 = 'utf8';
+	const UTF8MB4 = 'utf8mb4';
+
+	// This can be set both on constructor or manually
+	public $host;
+	public $port;
+	public $user;
+	public $pass;
+	public $db;
+	public $fileName;
+
+	// Internal stuff
+	private $tables = array();
+	private $views = array();
+	private $triggers = array();
+	private $dbHandler;
+	private $dbType;
+	private $compressManager;
+	private $typeAdapter;
+	private $dumpSettings = array();
+	private $pdoSettings = array();
+	private $version;
+	private $tableColumnTypes = array();
+
+	/**
+	 * Constructor of Mysqldump. Note that in the case of an SQLite database
+	 * connection, the filename must be in the $db parameter.
+	 *
+	 * @param string $db         Database name
+	 * @param string $user       SQL account username
+	 * @param string $pass       SQL account password
+	 * @param string $host       SQL server to connect to
+	 * @param string $type       SQL database type
+	 * @param array  $dumpSettings SQL database settings
+	 * @param array  $pdoSettings  PDO configured attributes
+	 */
+	public function __construct(
+		$db = '',
+		$user = '',
+		$pass = '',
+		$host = 'localhost',
+		$type = 'mysql',
+		$dumpSettings = array(),
+		$pdoSettings = array()
+	) {
+		$dumpSettingsDefault = array(
+			'include-tables' => array(),
+			'exclude-tables' => array(),
+			'compress' => Mysqldump::NONE,
+			'no-data' => false,
+			'add-drop-table' => false,
+			'single-transaction' => true,
+			'lock-tables' => true,
+			'add-locks' => true,
+			'extended-insert' => true,
+			'disable-keys' => true,
+			'where' => '',
+			'no-create-info' => false,
+			'skip-triggers' => false,
+			'add-drop-trigger' => true,
+			'hex-blob' => true,
+			'databases' => false,
+			'add-drop-database' => false,
+			'skip-tz-utz' => false,
+			'no-autocommit' => true,
+			'default-character-set' => Mysqldump::UTF8,
+			'skip-comments' => false,
+			'skip-dump-date' => false,
+			/* deprecated */
+			'disable-foreign-keys-check' => true
+		);
+
+		$pdoSettingsDefault = array(
+			PDO::ATTR_PERSISTENT => true,
+			PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+			PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => false
+		);
+
+		$this->db = $db;
+		$this->user = $user;
+		$this->pass = $pass;
+
+		$colonPos = strpos($host, ':');
+		if (false !== $colonPos) {
+			$this->port = substr($host, $colonPos + 1);
+			$this->host = substr($host, 0, $colonPos);
+		} else {
+			$this->port = null;
+			$this->host = $host;
+		}
+
+		$this->dbType = strtolower($type);
+		$this->pdoSettings = self::array_replace_recursive($pdoSettingsDefault, $pdoSettings);
+		$this->dumpSettings = self::array_replace_recursive($dumpSettingsDefault, $dumpSettings);
+
+		if (!isset($this->pdoSettings[PDO::MYSQL_ATTR_INIT_COMMAND])) {
+			$this->pdoSettings[PDO::MYSQL_ATTR_INIT_COMMAND] = "SET NAMES " . $this->dumpSettings['default-character-set'];
+		}
+
+		$diff = array_diff(array_keys($this->dumpSettings), array_keys($dumpSettingsDefault));
+		if (count($diff)>0) {
+			throw new Exception("Unexpected value in dumpSettings: (" . implode(",", $diff) . ")");
+		}
+
+		// Create a new compressManager to manage compressed output
+		$this->compressManager = CompressManagerFactory::create($this->dumpSettings['compress']);
+	}
+
+	/**
+	 * Custom array_replace_recursive to be used if PHP < 5.3
+	 * Replaces elements from passed arrays into the first array recursively
+	 *
+	 * @param array $array1 The array in which elements are replaced
+	 * @param array $array2 The array from which elements will be extracted
+	 *
+	 * @return array Returns an array, or NULL if an error occurs.
+	 */
+	public static function array_replace_recursive($array1, $array2)
+	{
+		if (function_exists('array_replace_recursive')) {
+			return array_replace_recursive($array1, $array2);
+		}
+
+		foreach ($array2 as $key => $value) {
+			if (is_array($value)) {
+				$array1[$key] = self::array_replace_recursive($array1[$key], $value);
+			} else {
+				$array1[$key] = $value;
+			}
+		}
+		return $array1;
+	}
+
+	/**
+	 * Connect with PDO
+	 *
+	 * @return null
+	 */
+	private function connect()
+	{
+		// Connecting with PDO
+		try {
+			switch ($this->dbType) {
+				case 'sqlite':
+					$this->dbHandler = @new PDO("sqlite:" . $this->db, null, null, $this->pdoSettings);
+					break;
+				case 'mysql':
+				case 'pgsql':
+				case 'dblib':
+					$dsn =  $this->dbType .
+						":host=" . $this->host .
+						 (isset($this->port) ? ";port=" . $this->port : "") .
+						";dbname=" . $this->db;
+					$this->dbHandler = @new PDO(
+						$dsn,
+						$this->user,
+						$this->pass,
+						$this->pdoSettings
+					);
+					// Fix for always-unicode output
+					$this->dbHandler->exec("SET NAMES " . $this->dumpSettings['default-character-set']);
+					// Store server version
+					$this->version = $this->dbHandler->getAttribute(PDO::ATTR_SERVER_VERSION);
+					break;
+				default:
+					throw new Exception("Unsupported database type (" . $this->dbType . ")");
+			}
+		} catch (PDOException $e) {
+			throw new Exception(
+				"Connection to " . $this->dbType . " failed with message: " .
+				$e->getMessage()
+			);
+		}
+
+		$this->dbHandler->setAttribute(PDO::ATTR_ORACLE_NULLS, PDO::NULL_NATURAL);
+		$this->typeAdapter = TypeAdapterFactory::create($this->dbType, $this->dbHandler);
+	}
+
+	/**
+	 * Main call
+	 *
+	 * @param string $filename  Name of file to write sql dump to
+	 * @return null
+	 */
+	public function start($filename = '')
+	{
+		// Output file can be redefined here
+		if (!empty($filename)) {
+			$this->fileName = $filename;
+		}
+		// We must set a name to continue
+		if (empty($this->fileName)) {
+			throw new Exception("Output file name is not set");
+		}
+
+		// Connect to database
+		$this->connect();
+
+		// Create output file
+		$this->compressManager->open($this->fileName);
+
+		// Write some basic info to output file
+		$this->compressManager->write($this->getDumpFileHeader());
+
+		// Store server settings and use sanner defaults to dump
+		$this->compressManager->write(
+			$this->typeAdapter->backup_parameters($this->dumpSettings)
+		);
+
+		if ($this->dumpSettings['databases']) {
+			$this->compressManager->write(
+				$this->typeAdapter->getDatabaseHeader($this->db)
+			);
+			if ($this->dumpSettings['add-drop-database']) {
+				$this->compressManager->write(
+					$this->typeAdapter->add_drop_database($this->db)
+				);
+			}
+		}
+
+		// Get table, view and trigger structures from database
+		$this->getDatabaseStructure();
+
+		if ($this->dumpSettings['databases']) {
+			$this->compressManager->write(
+				$this->typeAdapter->databases($this->db)
+			);
+		}
+
+		// If there still are some tables/views in include-tables array,
+		// that means that some tables or views weren't found.
+		// Give proper error and exit.
+		if (0 < count($this->dumpSettings['include-tables'])) {
+			$name = implode(",", $this->dumpSettings['include-tables']);
+			throw new Exception("Table or View (" . $name . ") not found in database");
+		}
+
+		$this->exportTables();
+		$this->exportViews();
+		$this->exportTriggers();
+
+		// Restore saved parameters
+		$this->compressManager->write(
+			$this->typeAdapter->restore_parameters($this->dumpSettings)
+		);
+		// Write some stats to output file
+		$this->compressManager->write($this->getDumpFileFooter());
+		// Close output file
+		$this->compressManager->close();
+	}
+
+	/**
+	 * Returns header for dump file
+	 *
+	 * @return string
+	 */
+	private function getDumpFileHeader()
+	{
+		$header = '';
+		if (!$this->dumpSettings['skip-comments']) {
+			// Some info about software, source and time
+			$header = "-- mysqldump-php https://github.com/ifsnop/mysqldump-php" . PHP_EOL .
+					"--" . PHP_EOL .
+					"-- Host: {$this->host}\tDatabase: {$this->db}" . PHP_EOL .
+					"-- ------------------------------------------------------" . PHP_EOL;
+
+			if (!empty($this->version)) {
+				$header .= "-- Server version \t" . $this->version . PHP_EOL;
+			}
+
+			$header .= "-- Date: " . date('r') . PHP_EOL . PHP_EOL;
+		}
+		return $header;
+	}
+
+	/**
+	 * Returns footer for dump file
+	 *
+	 * @return string
+	 */
+	private function getDumpFileFooter()
+	{
+		$footer = '';
+		if (!$this->dumpSettings['skip-comments']) {
+			$footer .= '-- Dump completed';
+			if (!$this->dumpSettings['skip-dump-date']) {
+				$footer .= ' on: ' . date('r');
+			}
+			$footer .= PHP_EOL;
+		}
+
+		return $footer;
+	}
+
+	/**
+	 * Reads table and views names from database.
+	 * Fills $this->tables array so they will be dumped later.
+	 *
+	 * @return null
+	 */
+	private function getDatabaseStructure()
+	{
+		// Listing all tables from database
+		if (empty($this->dumpSettings['include-tables'])) {
+			// include all tables for now, blacklisting happens later
+			foreach ($this->dbHandler->query($this->typeAdapter->show_tables($this->db)) as $row) {
+				array_push($this->tables, current($row));
+			}
+		} else {
+			// include only the tables mentioned in include-tables
+			foreach ($this->dbHandler->query($this->typeAdapter->show_tables($this->db)) as $row) {
+				if (in_array(current($row), $this->dumpSettings['include-tables'], true)) {
+					array_push($this->tables, current($row));
+					$elem = array_search(
+						current($row),
+						$this->dumpSettings['include-tables']
+					);
+					unset($this->dumpSettings['include-tables'][$elem]);
+				}
+			}
+		}
+
+		// Listing all views from database
+		if (empty($this->dumpSettings['include-tables'])) {
+			// include all views for now, blacklisting happens later
+			foreach ($this->dbHandler->query($this->typeAdapter->show_views($this->db)) as $row) {
+				array_push($this->views, current($row));
+			}
+		} else {
+			// include only the tables mentioned in include-tables
+			foreach ($this->dbHandler->query($this->typeAdapter->show_views($this->db)) as $row) {
+				if (in_array(current($row), $this->dumpSettings['include-tables'], true)) {
+					array_push($this->views, current($row));
+					$elem = array_search(
+						current($row),
+						$this->dumpSettings['include-tables']
+					);
+					unset($this->dumpSettings['include-tables'][$elem]);
+				}
+			}
+		}
+
+		// Listing all triggers from database
+		if (false === $this->dumpSettings['skip-triggers']) {
+			foreach ($this->dbHandler->query($this->typeAdapter->show_triggers($this->db)) as $row) {
+				array_push($this->triggers, $row['Trigger']);
+			}
+		}
+	}
+
+	/**
+	 * Exports all the tables selected from database
+	 *
+	 * @return null
+	 */
+	private function exportTables()
+	{
+		// Exporting tables one by one
+		foreach ($this->tables as $table) {
+			if (in_array($table, $this->dumpSettings['exclude-tables'], true)) {
+				continue;
+			}
+			$this->getTableStructure($table);
+			if (false === $this->dumpSettings['no-data']) {
+				$this->listValues($table);
+			}
+		}
+	}
+
+	/**
+	 * Exports all the views found in database
+	 *
+	 * @return null
+	 */
+	private function exportViews()
+	{
+		if (false === $this->dumpSettings['no-create-info']) {
+			// Exporting views one by one
+			foreach ($this->views as $view) {
+				if (in_array($view, $this->dumpSettings['exclude-tables'], true)) {
+					continue;
+				}
+				$this->getViewStructure($view);
+			}
+		}
+	}
+
+	/**
+	 * Exports all the triggers found in database
+	 *
+	 * @return null
+	 */
+	private function exportTriggers()
+	{
+		// Exporting triggers one by one
+		foreach ($this->triggers as $trigger) {
+			$this->getTriggerStructure($trigger);
+		}
+	}
+
+
+	private function getTableStructure($tableName)
+	{
+		if (!$this->dumpSettings['no-create-info']) {
+			$ret = '';
+			if (!$this->dumpSettings['skip-comments']) {
+				$ret = "--" . PHP_EOL .
+					"-- Table structure for table `$tableName`" . PHP_EOL .
+					"--" . PHP_EOL . PHP_EOL;
+			}
+			$stmt = $this->typeAdapter->show_create_table($tableName);
+			foreach ($this->dbHandler->query($stmt) as $r) {
+				$this->compressManager->write($ret);
+				if ($this->dumpSettings['add-drop-table']) {
+					$this->compressManager->write(
+						$this->typeAdapter->drop_table($tableName)
+					);
+				}
+				$this->compressManager->write(
+					$this->typeAdapter->create_table($r, $this->dumpSettings)
+				);
+				break;
+			}
+		}
+
+		$columnTypes = array();
+		$columns = $this->dbHandler->query(
+			$this->typeAdapter->show_columns($tableName)
+		);
+		$columns->setFetchMode(PDO::FETCH_ASSOC);
+
+		foreach($columns as $key => $col) {
+			$types = $this->typeAdapter->parseColumnType($col);
+			$columnTypes[$col['Field']] = array(
+				'is_numeric'=> $types['is_numeric'],
+				'is_blob' => $types['is_blob'],
+				'type' => $types['type']
+			);
+		}
+		$this->tableColumnTypes[$tableName] = $columnTypes;
+		return;
+	}
+
+
+	private function getViewStructure($viewName)
+	{
+		$ret = '';
+		if (!$this->dumpSettings['skip-comments']) {
+			$ret = "--" . PHP_EOL .
+				"-- Table structure for view `${viewName}`" . PHP_EOL .
+				"--" . PHP_EOL . PHP_EOL;
+		}
+		$this->compressManager->write($ret);
+		$stmt = $this->typeAdapter->show_create_view($viewName);
+		foreach ($this->dbHandler->query($stmt) as $r) {
+			if ($this->dumpSettings['add-drop-table']) {
+				$this->compressManager->write(
+					$this->typeAdapter->drop_view($viewName)
+				);
+			}
+			$this->compressManager->write(
+				$this->typeAdapter->create_view($r)
+			);
+			break;
+		}
+	}
+
+	/**
+	 * Trigger structure extractor
+	 *
+	 * @param string $triggerName  Name of trigger to export
+	 * @return null
+	 */
+	private function getTriggerStructure($triggerName)
+	{
+		$stmt = $this->typeAdapter->show_create_trigger($triggerName);
+		foreach ($this->dbHandler->query($stmt) as $r) {
+			if ($this->dumpSettings['add-drop-trigger']) {
+				$this->compressManager->write(
+					$this->typeAdapter->add_drop_trigger($triggerName)
+				);
+			}
+			$this->compressManager->write(
+				$this->typeAdapter->create_trigger($r)
+			);
+			return;
+		}
+
+	}
+
+
+	/**
+	 * Escape values with quotes when needed
+	 *
+	 * @param string $tableName Name of table which contains rows
+	 * @param array $row Associative array of column names and values to be quoted
+	 *
+	 * @return string
+	 */
+	private function escape($tableName, $row)
+	{
+		$ret = array();
+		$columnTypes = $this->tableColumnTypes[$tableName];
+		foreach ($row as $colName => $colValue) {
+			if (is_null($colValue)) {
+				$ret[] = "NULL";
+			} elseif ($this->dumpSettings['hex-blob'] && $columnTypes[$colName]['is_blob']) {
+				if ($columnTypes[$colName]['type'] == 'bit' || !empty($colValue)) {
+					$ret[] = "0x${colValue}";
+				} else {
+					$ret[] = "''";
+				}
+			} elseif ($columnTypes[$colName]['is_numeric']) {
+				$ret[] = $colValue;
+			} else {
+				$ret[] = $this->dbHandler->quote($colValue);
+			}
+		}
+		return $ret;
+	}
+
+	/**
+	 * Table rows extractor
+	 *
+	 * @param string $tableName  Name of table to export
+	 *
+	 * @return null
+	 */
+	private function listValues($tableName)
+	{
+		$this->prepareListValues($tableName);
+
+		$onlyOnce = true;
+		$lineSize = 0;
+
+		$colStmt = $this->getColumnStmt($tableName);
+		$stmt = "SELECT $colStmt FROM `$tableName`";
+
+		if ($this->dumpSettings['where']) {
+			$stmt .= " WHERE {$this->dumpSettings['where']}";
+		}
+		$resultSet = $this->dbHandler->query($stmt);
+		$resultSet->setFetchMode(PDO::FETCH_ASSOC);
+
+		foreach ($resultSet as $row) {
+			$vals = $this->escape($tableName, $row);
+			if ($onlyOnce || !$this->dumpSettings['extended-insert']) {
+				$lineSize += $this->compressManager->write(
+					"INSERT INTO `$tableName` VALUES (" . implode(",", $vals) . ")"
+				);
+				$onlyOnce = false;
+			} else {
+				$lineSize += $this->compressManager->write(",(" . implode(",", $vals) . ")");
+			}
+			if (($lineSize > self::MAXLINESIZE) ||
+					!$this->dumpSettings['extended-insert']) {
+				$onlyOnce = true;
+				$lineSize = $this->compressManager->write(";" . PHP_EOL);
+			}
+		}
+		$resultSet->closeCursor();
+
+		if (!$onlyOnce) {
+			$this->compressManager->write(";" . PHP_EOL);
+		}
+
+		$this->endListValues($tableName);
+	}
+
+	/**
+	 * Table rows extractor, append information prior to dump
+	 *
+	 * @param string $tableName  Name of table to export
+	 *
+	 * @return null
+	 */
+	function prepareListValues($tableName)
+	{
+		if (!$this->dumpSettings['skip-comments']) {
+			$this->compressManager->write(
+				"--" . PHP_EOL .
+				"-- Dumping data for table `$tableName`" .  PHP_EOL .
+				"--" . PHP_EOL . PHP_EOL
+			);
+		}
+
+		if ($this->dumpSettings['single-transaction']) {
+			$this->dbHandler->exec($this->typeAdapter->setup_transaction());
+			$this->dbHandler->exec($this->typeAdapter->start_transaction());
+		}
+
+		if ($this->dumpSettings['lock-tables']) {
+			$this->typeAdapter->lock_table($tableName);
+		}
+
+		if ($this->dumpSettings['add-locks']) {
+			$this->compressManager->write(
+				$this->typeAdapter->start_add_lock_table($tableName)
+			);
+		}
+
+		if ($this->dumpSettings['disable-keys']) {
+			$this->compressManager->write(
+				$this->typeAdapter->start_add_disable_keys($tableName)
+			);
+		}
+
+		// Disable autocommit for faster reload
+		if ($this->dumpSettings['no-autocommit']) {
+			$this->compressManager->write(
+				$this->typeAdapter->start_disable_autocommit()
+			);
+		}
+
+		return;
+	}
+
+	/**
+	 * Table rows extractor, close locks and commits after dump
+	 *
+	 * @param string $tableName  Name of table to export
+	 *
+	 * @return null
+	 */
+	function endListValues($tableName)
+	{
+		if ($this->dumpSettings['disable-keys']) {
+			$this->compressManager->write(
+				$this->typeAdapter->end_add_disable_keys($tableName)
+			);
+		}
+
+		if ($this->dumpSettings['add-locks']) {
+			$this->compressManager->write(
+				$this->typeAdapter->end_add_lock_table($tableName)
+			);
+		}
+
+		if ($this->dumpSettings['single-transaction']) {
+			$this->dbHandler->exec($this->typeAdapter->commit_transaction());
+		}
+
+		if ($this->dumpSettings['lock-tables']) {
+			$this->typeAdapter->unlock_table($tableName);
+		}
+
+		// Commit to enable autocommit
+		if ($this->dumpSettings['no-autocommit']) {
+			$this->compressManager->write(
+				$this->typeAdapter->end_disable_autocommit()
+			);
+		}
+
+		$this->compressManager->write(PHP_EOL);
+
+		return;
+	}
+
+	/**
+	 * Build SQL List of all columns on current table
+	 *
+	 * @param string $tableName  Name of table to get columns
+	 *
+	 * @return string SQL sentence with columns
+	 */
+	function getColumnStmt($tableName)
+	{
+		$colStmt = array();
+		foreach($this->tableColumnTypes[$tableName] as $colName => $colType) {
+			if ($colType['type'] == 'bit' && $this->dumpSettings['hex-blob']) {
+				$colStmt[] = "LPAD(HEX(`${colName}`),2,'0') AS `${colName}`";
+			} else if ($colType['is_blob'] && $this->dumpSettings['hex-blob']) {
+				$colStmt[] = "HEX(`${colName}`) AS `${colName}`";
+			} else {
+				$colStmt[] = "`${colName}`";
+			}
+		}
+		$colStmt = implode($colStmt, ",");
+
+		return $colStmt;
+	}
 }
 
 /**
@@ -731,137 +731,137 @@ 
  */
 abstract class CompressMethod
 {
-    public static $enums = array(
-        "None",
-        "Gzip",
-        "Bzip2"
-    );
-
-    /**
-     * @param string $c
-     * @return boolean
-     */
-    public static function isValid($c)
-    {
-        return in_array($c, self::$enums);
-    }
+	public static $enums = array(
+		"None",
+		"Gzip",
+		"Bzip2"
+	);
+
+	/**
+	 * @param string $c
+	 * @return boolean
+	 */
+	public static function isValid($c)
+	{
+		return in_array($c, self::$enums);
+	}
 }
 
 abstract class CompressManagerFactory
 {
-    /**
-     * @param string $c
-     * @return CompressBzip2|CompressGzip|CompressNone
-     */
-    public static function create($c)
-    {
-        $c = ucfirst(strtolower($c));
-        if (! CompressMethod::isValid($c)) {
-            throw new Exception("Compression method ($c) is not defined yet");
-        }
-
-        $method =  __NAMESPACE__ . "\\" . "Compress" . $c;
-
-        return new $method;
-    }
+	/**
+	 * @param string $c
+	 * @return CompressBzip2|CompressGzip|CompressNone
+	 */
+	public static function create($c)
+	{
+		$c = ucfirst(strtolower($c));
+		if (! CompressMethod::isValid($c)) {
+			throw new Exception("Compression method ($c) is not defined yet");
+		}
+
+		$method =  __NAMESPACE__ . "\\" . "Compress" . $c;
+
+		return new $method;
+	}
 }
 
 class CompressBzip2 extends CompressManagerFactory
 {
-    private $fileHandler = null;
-
-    public function __construct()
-    {
-        if (! function_exists("bzopen")) {
-            throw new Exception("Compression is enabled, but bzip2 lib is not installed or configured properly");
-        }
-    }
-
-    public function open($filename)
-    {
-        $this->fileHandler = bzopen($filename, "w");
-        if (false === $this->fileHandler) {
-            throw new Exception("Output file is not writable");
-        }
-
-        return true;
-    }
-
-    public function write($str)
-    {
-        if (false === ($bytesWritten = bzwrite($this->fileHandler, $str))) {
-            throw new Exception("Writting to file failed! Probably, there is no more free space left?");
-        }
-        return $bytesWritten;
-    }
-
-    public function close()
-    {
-        return bzclose($this->fileHandler);
-    }
+	private $fileHandler = null;
+
+	public function __construct()
+	{
+		if (! function_exists("bzopen")) {
+			throw new Exception("Compression is enabled, but bzip2 lib is not installed or configured properly");
+		}
+	}
+
+	public function open($filename)
+	{
+		$this->fileHandler = bzopen($filename, "w");
+		if (false === $this->fileHandler) {
+			throw new Exception("Output file is not writable");
+		}
+
+		return true;
+	}
+
+	public function write($str)
+	{
+		if (false === ($bytesWritten = bzwrite($this->fileHandler, $str))) {
+			throw new Exception("Writting to file failed! Probably, there is no more free space left?");
+		}
+		return $bytesWritten;
+	}
+
+	public function close()
+	{
+		return bzclose($this->fileHandler);
+	}
 }
 
 class CompressGzip extends CompressManagerFactory
 {
-    private $fileHandler = null;
-
-    public function __construct()
-    {
-        if (! function_exists("gzopen")) {
-            throw new Exception("Compression is enabled, but gzip lib is not installed or configured properly");
-        }
-    }
-
-    public function open($filename)
-    {
-        $this->fileHandler = gzopen($filename, "wb");
-        if (false === $this->fileHandler) {
-            throw new Exception("Output file is not writable");
-        }
-
-        return true;
-    }
-
-    public function write($str)
-    {
-        if (false === ($bytesWritten = gzwrite($this->fileHandler, $str))) {
-            throw new Exception("Writting to file failed! Probably, there is no more free space left?");
-        }
-        return $bytesWritten;
-    }
-
-    public function close()
-    {
-        return gzclose($this->fileHandler);
-    }
+	private $fileHandler = null;
+
+	public function __construct()
+	{
+		if (! function_exists("gzopen")) {
+			throw new Exception("Compression is enabled, but gzip lib is not installed or configured properly");
+		}
+	}
+
+	public function open($filename)
+	{
+		$this->fileHandler = gzopen($filename, "wb");
+		if (false === $this->fileHandler) {
+			throw new Exception("Output file is not writable");
+		}
+
+		return true;
+	}
+
+	public function write($str)
+	{
+		if (false === ($bytesWritten = gzwrite($this->fileHandler, $str))) {
+			throw new Exception("Writting to file failed! Probably, there is no more free space left?");
+		}
+		return $bytesWritten;
+	}
+
+	public function close()
+	{
+		return gzclose($this->fileHandler);
+	}
 }
 
 class CompressNone extends CompressManagerFactory
 {
-    private $fileHandler = null;
-
-    public function open($filename)
-    {
-        $this->fileHandler = fopen($filename, "wb");
-        if (false === $this->fileHandler) {
-            throw new Exception("Output file is not writable");
-        }
-
-        return true;
-    }
-
-    public function write($str)
-    {
-        if (false === ($bytesWritten = fwrite($this->fileHandler, $str))) {
-            throw new Exception("Writting to file failed! Probably, there is no more free space left?");
-        }
-        return $bytesWritten;
-    }
-
-    public function close()
-    {
-        return fclose($this->fileHandler);
-    }
+	private $fileHandler = null;
+
+	public function open($filename)
+	{
+		$this->fileHandler = fopen($filename, "wb");
+		if (false === $this->fileHandler) {
+			throw new Exception("Output file is not writable");
+		}
+
+		return true;
+	}
+
+	public function write($str)
+	{
+		if (false === ($bytesWritten = fwrite($this->fileHandler, $str))) {
+			throw new Exception("Writting to file failed! Probably, there is no more free space left?");
+		}
+		return $bytesWritten;
+	}
+
+	public function close()
+	{
+		return fclose($this->fileHandler);
+	}
 }
 
 /**
@@ -870,19 +870,19 @@ 
  */
 abstract class TypeAdapter
 {
-    public static $enums = array(
-        "Sqlite",
-        "Mysql"
-    );
-
-    /**
-     * @param string $c
-     * @return boolean
-     */
-    public static function isValid($c)
-    {
-        return in_array($c, self::$enums);
-    }
+	public static $enums = array(
+		"Sqlite",
+		"Mysql"
+	);
+
+	/**
+	 * @param string $c
+	 * @return boolean
+	 */
+	public static function isValid($c)
+	{
+		return in_array($c, self::$enums);
+	}
 }
 
 /**
@@ -891,186 +891,186 @@ 
  */
 abstract class TypeAdapterFactory
 {
-    /**
-     * @param string $c Type of database factory to create (Mysql, Sqlite,...)
-     * @param PDO $dbHandler
-     */
-    public static function create($c, $dbHandler = null)
-    {
-        $c = ucfirst(strtolower($c));
-        if (! TypeAdapter::isValid($c)) {
-            throw new Exception("Database type support for ($c) not yet available");
-        }
-        $method =  __NAMESPACE__ . "\\" . "TypeAdapter" . $c;
-        return new $method($dbHandler);
-    }
-
-
-    public function databases()
-    {
-        return "";
-    }
-
-    public function show_create_table($tableName)
-    {
-        return "SELECT tbl_name as 'Table', sql as 'Create Table' " .
-            "FROM sqlite_master " .
-            "WHERE type='table' AND tbl_name='$tableName'";
-    }
-
-
-    public function create_table($row, $dumpSettings)
-    {
-        return "";
-    }
-
-    public function show_create_view($viewName)
-    {
-        return "SELECT tbl_name as 'View', sql as 'Create View' " .
-            "FROM sqlite_master " .
-            "WHERE type='view' AND tbl_name='$viewName'";
-    }
-
-
-    public function create_view($row)
-    {
-        return "";
-    }
-
-
-    public function show_create_trigger($triggerName)
-    {
-        return "";
-    }
-
-
-    public function create_trigger($triggerName)
-    {
-        return "";
-    }
-
-    public function show_tables()
-    {
-        return "SELECT tbl_name FROM sqlite_master WHERE type='table'";
-    }
-
-    public function show_views()
-    {
-        return "SELECT tbl_name FROM sqlite_master WHERE type='view'";
-    }
-
-    public function show_triggers()
-    {
-        return "SELECT name FROM sqlite_master WHERE type='trigger'";
-    }
-
-    public function show_columns()
-    {
-        if (func_num_args() != 1) {
-            return "";
-        }
-
-        $args = func_get_args();
-
-        return "pragma table_info(${args[0]})";
-    }
-
-    public function setup_transaction()
-    {
-        return "";
-    }
-
-    public function start_transaction()
-    {
-        return "BEGIN EXCLUSIVE";
-    }
-
-    public function commit_transaction()
-    {
-        return "COMMIT";
-    }
-
-    public function lock_table()
-    {
-        return "";
-    }
-
-    public function unlock_table()
-    {
-        return "";
-    }
-
-    public function start_add_lock_table()
-    {
-        return PHP_EOL;
-    }
-
-    public function end_add_lock_table()
-    {
-        return PHP_EOL;
-    }
-
-    public function start_add_disable_keys()
-    {
-        return PHP_EOL;
-    }
-
-    public function end_add_disable_keys()
-    {
-        return PHP_EOL;
-    }
-
-    public function start_disable_foreign_keys_check()
-    {
-        return PHP_EOL;
-    }
-
-    public function end_disable_foreign_keys_check()
-    {
-        return PHP_EOL;
-    }
-
-    public function add_drop_database()
-    {
-        return PHP_EOL;
-    }
-
-    public function add_drop_trigger()
-    {
-        return PHP_EOL;
-    }
-
-    public function drop_table()
-    {
-        return PHP_EOL;
-    }
-
-    public function drop_view()
-    {
-        return PHP_EOL;
-    }
-
-    /**
-     * Decode column metadata and fill info structure.
-     * type, is_numeric and is_blob will always be available.
-     *
-     * @param array $colType Array returned from "SHOW COLUMNS FROM tableName"
-     * @return array
-     */
-    public function parseColumnType($colType)
-    {
-        return array();
-    }
-
-    public function backup_parameters()
-    {
-        return PHP_EOL;
-    }
-
-    public function restore_parameters()
-    {
-        return PHP_EOL;
-    }
+	/**
+	 * @param string $c Type of database factory to create (Mysql, Sqlite,...)
+	 * @param PDO $dbHandler
+	 */
+	public static function create($c, $dbHandler = null)
+	{
+		$c = ucfirst(strtolower($c));
+		if (! TypeAdapter::isValid($c)) {
+			throw new Exception("Database type support for ($c) not yet available");
+		}
+		$method =  __NAMESPACE__ . "\\" . "TypeAdapter" . $c;
+		return new $method($dbHandler);
+	}
+
+
+	public function databases()
+	{
+		return "";
+	}
+
+	public function show_create_table($tableName)
+	{
+		return "SELECT tbl_name as 'Table', sql as 'Create Table' " .
+			"FROM sqlite_master " .
+			"WHERE type='table' AND tbl_name='$tableName'";
+	}
+
+
+	public function create_table($row, $dumpSettings)
+	{
+		return "";
+	}
+
+	public function show_create_view($viewName)
+	{
+		return "SELECT tbl_name as 'View', sql as 'Create View' " .
+			"FROM sqlite_master " .
+			"WHERE type='view' AND tbl_name='$viewName'";
+	}
+
+
+	public function create_view($row)
+	{
+		return "";
+	}
+
+
+	public function show_create_trigger($triggerName)
+	{
+		return "";
+	}
+
+
+	public function create_trigger($triggerName)
+	{
+		return "";
+	}
+
+	public function show_tables()
+	{
+		return "SELECT tbl_name FROM sqlite_master WHERE type='table'";
+	}
+
+	public function show_views()
+	{
+		return "SELECT tbl_name FROM sqlite_master WHERE type='view'";
+	}
+
+	public function show_triggers()
+	{
+		return "SELECT name FROM sqlite_master WHERE type='trigger'";
+	}
+
+	public function show_columns()
+	{
+		if (func_num_args() != 1) {
+			return "";
+		}
+
+		$args = func_get_args();
+
+		return "pragma table_info(${args[0]})";
+	}
+
+	public function setup_transaction()
+	{
+		return "";
+	}
+
+	public function start_transaction()
+	{
+		return "BEGIN EXCLUSIVE";
+	}
+
+	public function commit_transaction()
+	{
+		return "COMMIT";
+	}
+
+	public function lock_table()
+	{
+		return "";
+	}
+
+	public function unlock_table()
+	{
+		return "";
+	}
+
+	public function start_add_lock_table()
+	{
+		return PHP_EOL;
+	}
+
+	public function end_add_lock_table()
+	{
+		return PHP_EOL;
+	}
+
+	public function start_add_disable_keys()
+	{
+		return PHP_EOL;
+	}
+
+	public function end_add_disable_keys()
+	{
+		return PHP_EOL;
+	}
+
+	public function start_disable_foreign_keys_check()
+	{
+		return PHP_EOL;
+	}
+
+	public function end_disable_foreign_keys_check()
+	{
+		return PHP_EOL;
+	}
+
+	public function add_drop_database()
+	{
+		return PHP_EOL;
+	}
+
+	public function add_drop_trigger()
+	{
+		return PHP_EOL;
+	}
+
+	public function drop_table()
+	{
+		return PHP_EOL;
+	}
+
+	public function drop_view()
+	{
+		return PHP_EOL;
+	}
+
+	/**
+	 * Decode column metadata and fill info structure.
+	 * type, is_numeric and is_blob will always be available.
+	 *
+	 * @param array $colType Array returned from "SHOW COLUMNS FROM tableName"
+	 * @return array
+	 */
+	public function parseColumnType($colType)
+	{
+		return array();
+	}
+
+	public function backup_parameters()
+	{
+		return PHP_EOL;
+	}
+
+	public function restore_parameters()
+	{
+		return PHP_EOL;
+	}
 }
 
 class TypeAdapterPgsql extends TypeAdapterFactory
@@ -1088,421 +1088,421 @@ 
 class TypeAdapterMysql extends TypeAdapterFactory
 {
 
-    private $dbHandler = null;
-
-    // Numerical Mysql types
-    public $mysqlTypes = array(
-        'numerical' => array(
-            'bit',
-            'tinyint',
-            'smallint',
-            'mediumint',
-            'int',
-            'integer',
-            'bigint',
-            'real',
-            'double',
-            'float',
-            'decimal',
-            'numeric'
-        ),
-        'blob' => array(
-            'tinyblob',
-            'blob',
-            'mediumblob',
-            'longblob',
-            'binary',
-            'varbinary',
-            'bit'
-        )
-    );
-
-    public function __construct ($dbHandler)
-    {
-        $this->dbHandler = $dbHandler;
-    }
-
-    public function databases()
-    {
-        if (func_num_args() != 1) {
-            throw new Exception("Unexpected parameter passed to " . __METHOD__);
-        }
-
-        $args = func_get_args();
-        $databaseName = $args[0];
-
-        $resultSet = $this->dbHandler->query("SHOW VARIABLES LIKE 'character_set_database';");
-        $characterSet = $resultSet->fetchColumn(1);
-        $resultSet->closeCursor();
-
-        $resultSet = $this->dbHandler->query("SHOW VARIABLES LIKE 'collation_database';");
-        $collationDb = $resultSet->fetchColumn(1);
-        $resultSet->closeCursor();
-        $ret = "";
-
-        $ret .= "CREATE DATABASE /*!32312 IF NOT EXISTS*/ `${databaseName}`".
-            " /*!40100 DEFAULT CHARACTER SET ${characterSet} " .
-            " COLLATE ${collationDb} */;" . PHP_EOL . PHP_EOL .
-            "USE `${databaseName}`;" . PHP_EOL . PHP_EOL;
-
-        return $ret;
-    }
-
-    public function show_create_table($tableName)
-    {
-        return "SHOW CREATE TABLE `$tableName`";
-    }
-
-    public function show_create_view($viewName)
-    {
-        return "SHOW CREATE VIEW `$viewName`";
-    }
-
-    public function show_create_trigger($triggerName)
-    {
-        return "SHOW CREATE TRIGGER `$triggerName`";
-    }
-
-    public function create_table($row, $dumpSettings)
-    {
-        if (!isset($row['Create Table'])) {
-            throw new Exception("Error getting table code, unknown output");
-        }
-
-        $ret = "/*!40101 SET @saved_cs_client     = @@character_set_client */;" . PHP_EOL .
-            "/*!40101 SET character_set_client = " . $dumpSettings['default-character-set'] . " */;" . PHP_EOL .
-            $row['Create Table'] . ";" . PHP_EOL .
-            "/*!40101 SET character_set_client = @saved_cs_client */;" . PHP_EOL .
-            PHP_EOL;
-        return $ret;
-    }
-
-    public function create_view($row)
-    {
-        $ret = "";
-        if (!isset($row['Create View'])) {
-                throw new Exception("Error getting view structure, unknown output");
-        }
-
-        $triggerStmt = $row['Create View'];
-        $triggerStmtReplaced1 = str_replace(
-            "CREATE ALGORITHM",
-            "/*!50001 CREATE ALGORITHM",
-            $triggerStmt
-        );
-        $triggerStmtReplaced2 = str_replace(
-            " DEFINER=",
-            " */" . PHP_EOL . "/*!50013 DEFINER=",
-            $triggerStmtReplaced1
-        );
-        $triggerStmtReplaced3 = str_replace(
-            " VIEW ",
-            " */" . PHP_EOL . "/*!50001 VIEW ",
-            $triggerStmtReplaced2
-        );
-        if (false === $triggerStmtReplaced1 ||
-            false === $triggerStmtReplaced2 ||
-            false === $triggerStmtReplaced3) {
-            $triggerStmtReplaced = $triggerStmt;
-        } else {
-            $triggerStmtReplaced = $triggerStmtReplaced3 . " */;";
-        }
-
-        $ret .= $triggerStmtReplaced . PHP_EOL . PHP_EOL;
-        return $ret;
-    }
-
-    public function create_trigger($row)
-    {
-        $ret = "";
-        if (!isset($row['SQL Original Statement'])) {
-            throw new Exception("Error getting trigger code, unknown output");
-        }
-
-        $triggerStmt = $row['SQL Original Statement'];
-        $triggerStmtReplaced = str_replace(
-            "CREATE DEFINER",
-            "/*!50003 CREATE*/ /*!50017 DEFINER",
-            $triggerStmt
-        );
-        $triggerStmtReplaced = str_replace(
-            " TRIGGER",
-            "*/ /*!50003 TRIGGER",
-            $triggerStmtReplaced
-        );
-        if ( false === $triggerStmtReplaced ) {
-            $triggerStmtReplaced = $triggerStmt;
-        }
-
-        $ret .= "DELIMITER ;;" . PHP_EOL .
-            $triggerStmtReplaced . "*/;;" . PHP_EOL .
-            "DELIMITER ;" . PHP_EOL . PHP_EOL;
-        return $ret;
-    }
-
-    public function show_tables()
-    {
-        if (func_num_args() != 1) {
-            return "";
-        }
-
-        $args = func_get_args();
-
-        return "SELECT TABLE_NAME AS tbl_name " .
-            "FROM INFORMATION_SCHEMA.TABLES " .
-            "WHERE TABLE_TYPE='BASE TABLE' AND TABLE_SCHEMA='${args[0]}'";
-    }
-
-    public function show_views()
-    {
-        if (func_num_args() != 1) {
-            return "";
-        }
-
-        $args = func_get_args();
-
-        return "SELECT TABLE_NAME AS tbl_name " .
-            "FROM INFORMATION_SCHEMA.TABLES " .
-            "WHERE TABLE_TYPE='VIEW' AND TABLE_SCHEMA='${args[0]}'";
-    }
-
-    public function show_triggers()
-    {
-        if (func_num_args() != 1) {
-            return "";
-        }
-
-        $args = func_get_args();
-
-        return "SHOW TRIGGERS FROM `${args[0]}`;";
-    }
-
-
-    public function show_columns()
-    {
-        if (func_num_args() != 1) {
-            return "";
-        }
-
-        $args = func_get_args();
-
-        return "SHOW COLUMNS FROM `${args[0]}`;";
-    }
-
-    public function setup_transaction()
-    {
-        return "SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ";
-    }
-
-    public function start_transaction()
-    {
-        return "START TRANSACTION";
-    }
-
-    public function commit_transaction()
-    {
-        return "COMMIT";
-    }
-
-    public function lock_table()
-    {
-        if (func_num_args() != 1) {
-            return "";
-        }
-
-        $args = func_get_args();
-        //$tableName = $args[0];
-        //return "LOCK TABLES `$tableName` READ LOCAL";
-        return $this->dbHandler->exec("LOCK TABLES `${args[0]}` READ LOCAL");
-
-    }
-
-    public function unlock_table()
-    {
-        return $this->dbHandler->exec("UNLOCK TABLES");
-    }
-
-    public function start_add_lock_table()
-    {
-        if (func_num_args() != 1) {
-            return "";
-        }
-
-        $args = func_get_args();
-
-        return "LOCK TABLES `${args[0]}` WRITE;" . PHP_EOL;
-    }
-
-    public function end_add_lock_table()
-    {
-        return "UNLOCK TABLES;" . PHP_EOL;
-    }
-
-    public function start_add_disable_keys()
-    {
-        if (func_num_args() != 1) {
-            return "";
-        }
-        $args = func_get_args();
-        return "/*!40000 ALTER TABLE `${args[0]}` DISABLE KEYS */;" .
-            PHP_EOL;
-    }
-
-    public function end_add_disable_keys()
-    {
-        if (func_num_args() != 1) {
-            return "";
-        }
-        $args = func_get_args();
-        return "/*!40000 ALTER TABLE `${args[0]}` ENABLE KEYS */;" .
-            PHP_EOL;
-    }
-
-    public function start_disable_autocommit()
-    {
-        return "SET autocommit=0;" . PHP_EOL;
-    }
-
-    public function end_disable_autocommit()
-    {
-        return "COMMIT;" . PHP_EOL;
-    }
-
-    public function add_drop_database()
-    {
-        if (func_num_args() != 1) {
-             return "";
-        }
-
-        $args = func_get_args();
-
-        return "/*!40000 DROP DATABASE IF EXISTS `${args[0]}`*/;" .
-            PHP_EOL . PHP_EOL;
-    }
-
-    public function add_drop_trigger()
-    {
-        if (func_num_args() != 1) {
-            return "";
-        }
-
-        $args = func_get_args();
-
-        return "DROP TRIGGER IF EXISTS `${args[0]}`;" . PHP_EOL;
-    }
-
-    public function drop_table()
-    {
-        if (func_num_args() != 1) {
-            return "";
-        }
-
-        $args = func_get_args();
-
-        return "DROP TABLE IF EXISTS `${args[0]}`;" . PHP_EOL;
-    }
-
-    public function drop_view()
-    {
-        if (func_num_args() != 1) {
-            return "";
-        }
-
-        $args = func_get_args();
-
-        return "DROP TABLE IF EXISTS `${args[0]}`;" . PHP_EOL .
-                "/*!50001 DROP VIEW IF EXISTS `${args[0]}`*/;" . PHP_EOL;
-    }
-
-    public function getDatabaseHeader()
-    {
-        if (func_num_args() != 1) {
-            return "";
-        }
-
-        $args = func_get_args();
-
-        return "--" . PHP_EOL .
-            "-- Current Database: `${args[0]}`" . PHP_EOL .
-            "--" . PHP_EOL . PHP_EOL;
-    }
-
-    /**
-     * Decode column metadata and fill info structure.
-     * type, is_numeric and is_blob will always be available.
-     *
-     * @param array $colType Array returned from "SHOW COLUMNS FROM tableName"
-     * @return array
-     */
-    public function parseColumnType($colType)
-    {
-        $colInfo = array();
-        $colParts = explode(" ", $colType['Type']);
-
-        if($fparen = strpos($colParts[0], "("))
-        {
-            $colInfo['type'] = substr($colParts[0], 0, $fparen);
-            $colInfo['length']  = str_replace(")", "", substr($colParts[0], $fparen+1));
-            $colInfo['attributes'] = isset($colParts[1]) ? $colParts[1] : NULL;
-        }
-        else
-        {
-            $colInfo['type'] = $colParts[0];
-        }
-        $colInfo['is_numeric'] = in_array($colInfo['type'], $this->mysqlTypes['numerical']);
-        $colInfo['is_blob'] = in_array($colInfo['type'], $this->mysqlTypes['blob']);
-
-        return $colInfo;
-    }
-
-    public function backup_parameters()
-    {
-        if (func_num_args() != 1) {
-            throw new Exception("Unexpected parameter passed to " . __METHOD__);
-        }
-
-        $args = func_get_args();
-        $dumpSettings = $args[0];
-        $ret = "/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;" . PHP_EOL .
-            "/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;" . PHP_EOL .
-            "/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;" . PHP_EOL .
-            "/*!40101 SET NAMES " . $dumpSettings['default-character-set'] . " */;" . PHP_EOL;
-
-        if (false === $dumpSettings['skip-tz-utz']) {
-            $ret .= "/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;" . PHP_EOL .
-                "/*!40103 SET TIME_ZONE='+00:00' */;" . PHP_EOL;
-        }
-
-        $ret .= "/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;" . PHP_EOL .
-            "/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;" . PHP_EOL .
-            "/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;" . PHP_EOL .
-            "/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;" . PHP_EOL .PHP_EOL;
-
-        return $ret;
-    }
-
-    public function restore_parameters()
-    {
-        if (func_num_args() != 1) {
-            throw new Exception("Unexpected parameter passed to " . __METHOD__);
-        }
-
-        $args = func_get_args();
-        $dumpSettings = $args[0];
-        $ret = "";
-
-        if (false === $dumpSettings['skip-tz-utz']) {
-            $ret .= "/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;" . PHP_EOL;
-        }
-
-        $ret .= "/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;" . PHP_EOL .
-            "/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;" . PHP_EOL .
-            "/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;" . PHP_EOL .
-            "/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;" . PHP_EOL .
-            "/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;" . PHP_EOL .
-            "/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;" . PHP_EOL .
-            "/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;" . PHP_EOL . PHP_EOL;
-
-        return $ret;
-    }
+	private $dbHandler = null;
+
+	// Numerical Mysql types
+	public $mysqlTypes = array(
+		'numerical' => array(
+			'bit',
+			'tinyint',
+			'smallint',
+			'mediumint',
+			'int',
+			'integer',
+			'bigint',
+			'real',
+			'double',
+			'float',
+			'decimal',
+			'numeric'
+		),
+		'blob' => array(
+			'tinyblob',
+			'blob',
+			'mediumblob',
+			'longblob',
+			'binary',
+			'varbinary',
+			'bit'
+		)
+	);
+
+	public function __construct ($dbHandler)
+	{
+		$this->dbHandler = $dbHandler;
+	}
+
+	public function databases()
+	{
+		if (func_num_args() != 1) {
+			throw new Exception("Unexpected parameter passed to " . __METHOD__);
+		}
+
+		$args = func_get_args();
+		$databaseName = $args[0];
+
+		$resultSet = $this->dbHandler->query("SHOW VARIABLES LIKE 'character_set_database';");
+		$characterSet = $resultSet->fetchColumn(1);
+		$resultSet->closeCursor();
+
+		$resultSet = $this->dbHandler->query("SHOW VARIABLES LIKE 'collation_database';");
+		$collationDb = $resultSet->fetchColumn(1);
+		$resultSet->closeCursor();
+		$ret = "";
+
+		$ret .= "CREATE DATABASE /*!32312 IF NOT EXISTS*/ `${databaseName}`".
+			" /*!40100 DEFAULT CHARACTER SET ${characterSet} " .
+			" COLLATE ${collationDb} */;" . PHP_EOL . PHP_EOL .
+			"USE `${databaseName}`;" . PHP_EOL . PHP_EOL;
+
+		return $ret;
+	}
+
+	public function show_create_table($tableName)
+	{
+		return "SHOW CREATE TABLE `$tableName`";
+	}
+
+	public function show_create_view($viewName)
+	{
+		return "SHOW CREATE VIEW `$viewName`";
+	}
+
+	public function show_create_trigger($triggerName)
+	{
+		return "SHOW CREATE TRIGGER `$triggerName`";
+	}
+
+	public function create_table($row, $dumpSettings)
+	{
+		if (!isset($row['Create Table'])) {
+			throw new Exception("Error getting table code, unknown output");
+		}
+
+		$ret = "/*!40101 SET @saved_cs_client     = @@character_set_client */;" . PHP_EOL .
+			"/*!40101 SET character_set_client = " . $dumpSettings['default-character-set'] . " */;" . PHP_EOL .
+			$row['Create Table'] . ";" . PHP_EOL .
+			"/*!40101 SET character_set_client = @saved_cs_client */;" . PHP_EOL .
+			PHP_EOL;
+		return $ret;
+	}
+
+	public function create_view($row)
+	{
+		$ret = "";
+		if (!isset($row['Create View'])) {
+				throw new Exception("Error getting view structure, unknown output");
+		}
+
+		$triggerStmt = $row['Create View'];
+		$triggerStmtReplaced1 = str_replace(
+			"CREATE ALGORITHM",
+			"/*!50001 CREATE ALGORITHM",
+			$triggerStmt
+		);
+		$triggerStmtReplaced2 = str_replace(
+			" DEFINER=",
+			" */" . PHP_EOL . "/*!50013 DEFINER=",
+			$triggerStmtReplaced1
+		);
+		$triggerStmtReplaced3 = str_replace(
+			" VIEW ",
+			" */" . PHP_EOL . "/*!50001 VIEW ",
+			$triggerStmtReplaced2
+		);
+		if (false === $triggerStmtReplaced1 ||
+			false === $triggerStmtReplaced2 ||
+			false === $triggerStmtReplaced3) {
+			$triggerStmtReplaced = $triggerStmt;
+		} else {
+			$triggerStmtReplaced = $triggerStmtReplaced3 . " */;";
+		}
+
+		$ret .= $triggerStmtReplaced . PHP_EOL . PHP_EOL;
+		return $ret;
+	}
+
+	public function create_trigger($row)
+	{
+		$ret = "";
+		if (!isset($row['SQL Original Statement'])) {
+			throw new Exception("Error getting trigger code, unknown output");
+		}
+
+		$triggerStmt = $row['SQL Original Statement'];
+		$triggerStmtReplaced = str_replace(
+			"CREATE DEFINER",
+			"/*!50003 CREATE*/ /*!50017 DEFINER",
+			$triggerStmt
+		);
+		$triggerStmtReplaced = str_replace(
+			" TRIGGER",
+			"*/ /*!50003 TRIGGER",
+			$triggerStmtReplaced
+		);
+		if ( false === $triggerStmtReplaced ) {
+			$triggerStmtReplaced = $triggerStmt;
+		}
+
+		$ret .= "DELIMITER ;;" . PHP_EOL .
+			$triggerStmtReplaced . "*/;;" . PHP_EOL .
+			"DELIMITER ;" . PHP_EOL . PHP_EOL;
+		return $ret;
+	}
+
+	public function show_tables()
+	{
+		if (func_num_args() != 1) {
+			return "";
+		}
+
+		$args = func_get_args();
+
+		return "SELECT TABLE_NAME AS tbl_name " .
+			"FROM INFORMATION_SCHEMA.TABLES " .
+			"WHERE TABLE_TYPE='BASE TABLE' AND TABLE_SCHEMA='${args[0]}'";
+	}
+
+	public function show_views()
+	{
+		if (func_num_args() != 1) {
+			return "";
+		}
+
+		$args = func_get_args();
+
+		return "SELECT TABLE_NAME AS tbl_name " .
+			"FROM INFORMATION_SCHEMA.TABLES " .
+			"WHERE TABLE_TYPE='VIEW' AND TABLE_SCHEMA='${args[0]}'";
+	}
+
+	public function show_triggers()
+	{
+		if (func_num_args() != 1) {
+			return "";
+		}
+
+		$args = func_get_args();
+
+		return "SHOW TRIGGERS FROM `${args[0]}`;";
+	}
+
+
+	public function show_columns()
+	{
+		if (func_num_args() != 1) {
+			return "";
+		}
+
+		$args = func_get_args();
+
+		return "SHOW COLUMNS FROM `${args[0]}`;";
+	}
+
+	public function setup_transaction()
+	{
+		return "SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ";
+	}
+
+	public function start_transaction()
+	{
+		return "START TRANSACTION";
+	}
+
+	public function commit_transaction()
+	{
+		return "COMMIT";
+	}
+
+	public function lock_table()
+	{
+		if (func_num_args() != 1) {
+			return "";
+		}
+
+		$args = func_get_args();
+		//$tableName = $args[0];
+		//return "LOCK TABLES `$tableName` READ LOCAL";
+		return $this->dbHandler->exec("LOCK TABLES `${args[0]}` READ LOCAL");
+
+	}
+
+	public function unlock_table()
+	{
+		return $this->dbHandler->exec("UNLOCK TABLES");
+	}
+
+	public function start_add_lock_table()
+	{
+		if (func_num_args() != 1) {
+			return "";
+		}
+
+		$args = func_get_args();
+
+		return "LOCK TABLES `${args[0]}` WRITE;" . PHP_EOL;
+	}
+
+	public function end_add_lock_table()
+	{
+		return "UNLOCK TABLES;" . PHP_EOL;
+	}
+
+	public function start_add_disable_keys()
+	{
+		if (func_num_args() != 1) {
+			return "";
+		}
+		$args = func_get_args();
+		return "/*!40000 ALTER TABLE `${args[0]}` DISABLE KEYS */;" .
+			PHP_EOL;
+	}
+
+	public function end_add_disable_keys()
+	{
+		if (func_num_args() != 1) {
+			return "";
+		}
+		$args = func_get_args();
+		return "/*!40000 ALTER TABLE `${args[0]}` ENABLE KEYS */;" .
+			PHP_EOL;
+	}
+
+	public function start_disable_autocommit()
+	{
+		return "SET autocommit=0;" . PHP_EOL;
+	}
+
+	public function end_disable_autocommit()
+	{
+		return "COMMIT;" . PHP_EOL;
+	}
+
+	public function add_drop_database()
+	{
+		if (func_num_args() != 1) {
+			 return "";
+		}
+
+		$args = func_get_args();
+
+		return "/*!40000 DROP DATABASE IF EXISTS `${args[0]}`*/;" .
+			PHP_EOL . PHP_EOL;
+	}
+
+	public function add_drop_trigger()
+	{
+		if (func_num_args() != 1) {
+			return "";
+		}
+
+		$args = func_get_args();
+
+		return "DROP TRIGGER IF EXISTS `${args[0]}`;" . PHP_EOL;
+	}
+
+	public function drop_table()
+	{
+		if (func_num_args() != 1) {
+			return "";
+		}
+
+		$args = func_get_args();
+
+		return "DROP TABLE IF EXISTS `${args[0]}`;" . PHP_EOL;
+	}
+
+	public function drop_view()
+	{
+		if (func_num_args() != 1) {
+			return "";
+		}
+
+		$args = func_get_args();
+
+		return "DROP TABLE IF EXISTS `${args[0]}`;" . PHP_EOL .
+				"/*!50001 DROP VIEW IF EXISTS `${args[0]}`*/;" . PHP_EOL;
+	}
+
+	public function getDatabaseHeader()
+	{
+		if (func_num_args() != 1) {
+			return "";
+		}
+
+		$args = func_get_args();
+
+		return "--" . PHP_EOL .
+			"-- Current Database: `${args[0]}`" . PHP_EOL .
+			"--" . PHP_EOL . PHP_EOL;
+	}
+
+	/**
+	 * Decode column metadata and fill info structure.
+	 * type, is_numeric and is_blob will always be available.
+	 *
+	 * @param array $colType Array returned from "SHOW COLUMNS FROM tableName"
+	 * @return array
+	 */
+	public function parseColumnType($colType)
+	{
+		$colInfo = array();
+		$colParts = explode(" ", $colType['Type']);
+
+		if($fparen = strpos($colParts[0], "("))
+		{
+			$colInfo['type'] = substr($colParts[0], 0, $fparen);
+			$colInfo['length']  = str_replace(")", "", substr($colParts[0], $fparen+1));
+			$colInfo['attributes'] = isset($colParts[1]) ? $colParts[1] : NULL;
+		}
+		else
+		{
+			$colInfo['type'] = $colParts[0];
+		}
+		$colInfo['is_numeric'] = in_array($colInfo['type'], $this->mysqlTypes['numerical']);
+		$colInfo['is_blob'] = in_array($colInfo['type'], $this->mysqlTypes['blob']);
+
+		return $colInfo;
+	}
+
+	public function backup_parameters()
+	{
+		if (func_num_args() != 1) {
+			throw new Exception("Unexpected parameter passed to " . __METHOD__);
+		}
+
+		$args = func_get_args();
+		$dumpSettings = $args[0];
+		$ret = "/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;" . PHP_EOL .
+			"/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;" . PHP_EOL .
+			"/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;" . PHP_EOL .
+			"/*!40101 SET NAMES " . $dumpSettings['default-character-set'] . " */;" . PHP_EOL;
+
+		if (false === $dumpSettings['skip-tz-utz']) {
+			$ret .= "/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;" . PHP_EOL .
+				"/*!40103 SET TIME_ZONE='+00:00' */;" . PHP_EOL;
+		}
+
+		$ret .= "/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;" . PHP_EOL .
+			"/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;" . PHP_EOL .
+			"/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;" . PHP_EOL .
+			"/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;" . PHP_EOL .PHP_EOL;
+
+		return $ret;
+	}
+
+	public function restore_parameters()
+	{
+		if (func_num_args() != 1) {
+			throw new Exception("Unexpected parameter passed to " . __METHOD__);
+		}
+
+		$args = func_get_args();
+		$dumpSettings = $args[0];
+		$ret = "";
+
+		if (false === $dumpSettings['skip-tz-utz']) {
+			$ret .= "/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;" . PHP_EOL;
+		}
+
+		$ret .= "/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;" . PHP_EOL .
+			"/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;" . PHP_EOL .
+			"/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;" . PHP_EOL .
+			"/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;" . PHP_EOL .
+			"/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;" . PHP_EOL .
+			"/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;" . PHP_EOL .
+			"/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;" . PHP_EOL . PHP_EOL;
+
+		return $ret;
+	}
 }

Spacing +102 added lines, -102 removed lines

@@ -138,12 +138,12 @@ 
         $this->dumpSettings = self::array_replace_recursive($dumpSettingsDefault, $dumpSettings);
 
         if (!isset($this->pdoSettings[PDO::MYSQL_ATTR_INIT_COMMAND])) {
-            $this->pdoSettings[PDO::MYSQL_ATTR_INIT_COMMAND] = "SET NAMES " . $this->dumpSettings['default-character-set'];
+            $this->pdoSettings[PDO::MYSQL_ATTR_INIT_COMMAND] = "SET NAMES ".$this->dumpSettings['default-character-set'];
         }
 
         $diff = array_diff(array_keys($this->dumpSettings), array_keys($dumpSettingsDefault));
-        if (count($diff)>0) {
-            throw new Exception("Unexpected value in dumpSettings: (" . implode(",", $diff) . ")");
+        if (count($diff) > 0) {
+            throw new Exception("Unexpected value in dumpSettings: (".implode(",", $diff).")");
         }
 
         // Create a new compressManager to manage compressed output
@@ -186,15 +186,15 @@ 
         try {
             switch ($this->dbType) {
                 case 'sqlite':
-                    $this->dbHandler = @new PDO("sqlite:" . $this->db, null, null, $this->pdoSettings);
+                    $this->dbHandler = @new PDO("sqlite:".$this->db, null, null, $this->pdoSettings);
                     break;
                 case 'mysql':
                 case 'pgsql':
                 case 'dblib':
-                    $dsn =  $this->dbType .
-                        ":host=" . $this->host .
-                         (isset($this->port) ? ";port=" . $this->port : "") .
-                        ";dbname=" . $this->db;
+                    $dsn = $this->dbType.
+                        ":host=".$this->host.
+                         (isset($this->port) ? ";port=".$this->port : "").
+                        ";dbname=".$this->db;
                     $this->dbHandler = @new PDO(
                         $dsn,
                         $this->user,
@@ -202,16 +202,16 @@ 
                         $this->pdoSettings
                     );
                     // Fix for always-unicode output
-                    $this->dbHandler->exec("SET NAMES " . $this->dumpSettings['default-character-set']);
+                    $this->dbHandler->exec("SET NAMES ".$this->dumpSettings['default-character-set']);
                     // Store server version
                     $this->version = $this->dbHandler->getAttribute(PDO::ATTR_SERVER_VERSION);
                     break;
                 default:
-                    throw new Exception("Unsupported database type (" . $this->dbType . ")");
+                    throw new Exception("Unsupported database type (".$this->dbType.")");
             }
         } catch (PDOException $e) {
             throw new Exception(
-                "Connection to " . $this->dbType . " failed with message: " .
+                "Connection to ".$this->dbType." failed with message: ".
                 $e->getMessage()
             );
         }
@@ -276,7 +276,7 @@ 
         // Give proper error and exit.
         if (0 < count($this->dumpSettings['include-tables'])) {
             $name = implode(",", $this->dumpSettings['include-tables']);
-            throw new Exception("Table or View (" . $name . ") not found in database");
+            throw new Exception("Table or View (".$name.") not found in database");
         }
 
         $this->exportTables();
@@ -303,16 +303,16 @@ 
         $header = '';
         if (!$this->dumpSettings['skip-comments']) {
             // Some info about software, source and time
-            $header = "-- mysqldump-php https://github.com/ifsnop/mysqldump-php" . PHP_EOL .
-                    "--" . PHP_EOL .
-                    "-- Host: {$this->host}\tDatabase: {$this->db}" . PHP_EOL .
-                    "-- ------------------------------------------------------" . PHP_EOL;
+            $header = "-- mysqldump-php https://github.com/ifsnop/mysqldump-php".PHP_EOL.
+                    "--".PHP_EOL.
+                    "-- Host: {$this->host}\tDatabase: {$this->db}".PHP_EOL.
+                    "-- ------------------------------------------------------".PHP_EOL;
 
             if (!empty($this->version)) {
-                $header .= "-- Server version \t" . $this->version . PHP_EOL;
+                $header .= "-- Server version \t".$this->version.PHP_EOL;
             }
 
-            $header .= "-- Date: " . date('r') . PHP_EOL . PHP_EOL;
+            $header .= "-- Date: ".date('r').PHP_EOL.PHP_EOL;
         }
         return $header;
     }
@@ -328,7 +328,7 @@ 
         if (!$this->dumpSettings['skip-comments']) {
             $footer .= '-- Dump completed';
             if (!$this->dumpSettings['skip-dump-date']) {
-                $footer .= ' on: ' . date('r');
+                $footer .= ' on: '.date('r');
             }
             $footer .= PHP_EOL;
         }
@@ -448,9 +448,9 @@ 
         if (!$this->dumpSettings['no-create-info']) {
             $ret = '';
             if (!$this->dumpSettings['skip-comments']) {
-                $ret = "--" . PHP_EOL .
-                    "-- Table structure for table `$tableName`" . PHP_EOL .
-                    "--" . PHP_EOL . PHP_EOL;
+                $ret = "--".PHP_EOL.
+                    "-- Table structure for table `$tableName`".PHP_EOL.
+                    "--".PHP_EOL.PHP_EOL;
             }
             $stmt = $this->typeAdapter->show_create_table($tableName);
             foreach ($this->dbHandler->query($stmt) as $r) {
@@ -473,7 +473,7 @@ 
         );
         $columns->setFetchMode(PDO::FETCH_ASSOC);
 
-        foreach($columns as $key => $col) {
+        foreach ($columns as $key => $col) {
             $types = $this->typeAdapter->parseColumnType($col);
             $columnTypes[$col['Field']] = array(
                 'is_numeric'=> $types['is_numeric'],
@@ -490,9 +490,9 @@ 
     {
         $ret = '';
         if (!$this->dumpSettings['skip-comments']) {
-            $ret = "--" . PHP_EOL .
-                "-- Table structure for view `${viewName}`" . PHP_EOL .
-                "--" . PHP_EOL . PHP_EOL;
+            $ret = "--".PHP_EOL.
+                "-- Table structure for view `${viewName}`".PHP_EOL.
+                "--".PHP_EOL.PHP_EOL;
         }
         $this->compressManager->write($ret);
         $stmt = $this->typeAdapter->show_create_view($viewName);
@@ -590,22 +590,22 @@ 
             $vals = $this->escape($tableName, $row);
             if ($onlyOnce || !$this->dumpSettings['extended-insert']) {
                 $lineSize += $this->compressManager->write(
-                    "INSERT INTO `$tableName` VALUES (" . implode(",", $vals) . ")"
+                    "INSERT INTO `$tableName` VALUES (".implode(",", $vals).")"
                 );
                 $onlyOnce = false;
             } else {
-                $lineSize += $this->compressManager->write(",(" . implode(",", $vals) . ")");
+                $lineSize += $this->compressManager->write(",(".implode(",", $vals).")");
             }
             if (($lineSize > self::MAXLINESIZE) ||
                     !$this->dumpSettings['extended-insert']) {
                 $onlyOnce = true;
-                $lineSize = $this->compressManager->write(";" . PHP_EOL);
+                $lineSize = $this->compressManager->write(";".PHP_EOL);
             }
         }
         $resultSet->closeCursor();
 
         if (!$onlyOnce) {
-            $this->compressManager->write(";" . PHP_EOL);
+            $this->compressManager->write(";".PHP_EOL);
         }
 
         $this->endListValues($tableName);
@@ -622,9 +622,9 @@ 
     {
         if (!$this->dumpSettings['skip-comments']) {
             $this->compressManager->write(
-                "--" . PHP_EOL .
-                "-- Dumping data for table `$tableName`" .  PHP_EOL .
-                "--" . PHP_EOL . PHP_EOL
+                "--".PHP_EOL.
+                "-- Dumping data for table `$tableName`".PHP_EOL.
+                "--".PHP_EOL.PHP_EOL
             );
         }
 
@@ -710,7 +710,7 @@ 
     function getColumnStmt($tableName)
     {
         $colStmt = array();
-        foreach($this->tableColumnTypes[$tableName] as $colName => $colType) {
+        foreach ($this->tableColumnTypes[$tableName] as $colName => $colType) {
             if ($colType['type'] == 'bit' && $this->dumpSettings['hex-blob']) {
                 $colStmt[] = "LPAD(HEX(`${colName}`),2,'0') AS `${colName}`";
             } else if ($colType['is_blob'] && $this->dumpSettings['hex-blob']) {
@@ -756,11 +756,11 @@ 
     public static function create($c)
     {
         $c = ucfirst(strtolower($c));
-        if (! CompressMethod::isValid($c)) {
+        if (!CompressMethod::isValid($c)) {
             throw new Exception("Compression method ($c) is not defined yet");
         }
 
-        $method =  __NAMESPACE__ . "\\" . "Compress" . $c;
+        $method = __NAMESPACE__."\\"."Compress".$c;
 
         return new $method;
     }
@@ -772,7 +772,7 @@ 
 
     public function __construct()
     {
-        if (! function_exists("bzopen")) {
+        if (!function_exists("bzopen")) {
             throw new Exception("Compression is enabled, but bzip2 lib is not installed or configured properly");
         }
     }
@@ -807,7 +807,7 @@ 
 
     public function __construct()
     {
-        if (! function_exists("gzopen")) {
+        if (!function_exists("gzopen")) {
             throw new Exception("Compression is enabled, but gzip lib is not installed or configured properly");
         }
     }
@@ -898,10 +898,10 @@ 
     public static function create($c, $dbHandler = null)
     {
         $c = ucfirst(strtolower($c));
-        if (! TypeAdapter::isValid($c)) {
+        if (!TypeAdapter::isValid($c)) {
             throw new Exception("Database type support for ($c) not yet available");
         }
-        $method =  __NAMESPACE__ . "\\" . "TypeAdapter" . $c;
+        $method = __NAMESPACE__."\\"."TypeAdapter".$c;
         return new $method($dbHandler);
     }
 
@@ -913,8 +913,8 @@ 
 
     public function show_create_table($tableName)
     {
-        return "SELECT tbl_name as 'Table', sql as 'Create Table' " .
-            "FROM sqlite_master " .
+        return "SELECT tbl_name as 'Table', sql as 'Create Table' ".
+            "FROM sqlite_master ".
             "WHERE type='table' AND tbl_name='$tableName'";
     }
 
@@ -926,8 +926,8 @@ 
 
     public function show_create_view($viewName)
     {
-        return "SELECT tbl_name as 'View', sql as 'Create View' " .
-            "FROM sqlite_master " .
+        return "SELECT tbl_name as 'View', sql as 'Create View' ".
+            "FROM sqlite_master ".
             "WHERE type='view' AND tbl_name='$viewName'";
     }
 
@@ -1117,7 +1117,7 @@ 
         )
     );
 
-    public function __construct ($dbHandler)
+    public function __construct($dbHandler)
     {
         $this->dbHandler = $dbHandler;
     }
@@ -1125,7 +1125,7 @@ 
     public function databases()
     {
         if (func_num_args() != 1) {
-            throw new Exception("Unexpected parameter passed to " . __METHOD__);
+            throw new Exception("Unexpected parameter passed to ".__METHOD__);
         }
 
         $args = func_get_args();
@@ -1141,9 +1141,9 @@ 
         $ret = "";
 
         $ret .= "CREATE DATABASE /*!32312 IF NOT EXISTS*/ `${databaseName}`".
-            " /*!40100 DEFAULT CHARACTER SET ${characterSet} " .
-            " COLLATE ${collationDb} */;" . PHP_EOL . PHP_EOL .
-            "USE `${databaseName}`;" . PHP_EOL . PHP_EOL;
+            " /*!40100 DEFAULT CHARACTER SET ${characterSet} ".
+            " COLLATE ${collationDb} */;".PHP_EOL.PHP_EOL.
+            "USE `${databaseName}`;".PHP_EOL.PHP_EOL;
 
         return $ret;
     }
@@ -1169,10 +1169,10 @@ 
             throw new Exception("Error getting table code, unknown output");
         }
 
-        $ret = "/*!40101 SET @saved_cs_client     = @@character_set_client */;" . PHP_EOL .
-            "/*!40101 SET character_set_client = " . $dumpSettings['default-character-set'] . " */;" . PHP_EOL .
-            $row['Create Table'] . ";" . PHP_EOL .
-            "/*!40101 SET character_set_client = @saved_cs_client */;" . PHP_EOL .
+        $ret = "/*!40101 SET @saved_cs_client     = @@character_set_client */;".PHP_EOL.
+            "/*!40101 SET character_set_client = ".$dumpSettings['default-character-set']." */;".PHP_EOL.
+            $row['Create Table'].";".PHP_EOL.
+            "/*!40101 SET character_set_client = @saved_cs_client */;".PHP_EOL.
             PHP_EOL;
         return $ret;
     }
@@ -1192,12 +1192,12 @@ 
         );
         $triggerStmtReplaced2 = str_replace(
             " DEFINER=",
-            " */" . PHP_EOL . "/*!50013 DEFINER=",
+            " */".PHP_EOL."/*!50013 DEFINER=",
             $triggerStmtReplaced1
         );
         $triggerStmtReplaced3 = str_replace(
             " VIEW ",
-            " */" . PHP_EOL . "/*!50001 VIEW ",
+            " */".PHP_EOL."/*!50001 VIEW ",
             $triggerStmtReplaced2
         );
         if (false === $triggerStmtReplaced1 ||
@@ -1205,10 +1205,10 @@ 
             false === $triggerStmtReplaced3) {
             $triggerStmtReplaced = $triggerStmt;
         } else {
-            $triggerStmtReplaced = $triggerStmtReplaced3 . " */;";
+            $triggerStmtReplaced = $triggerStmtReplaced3." */;";
         }
 
-        $ret .= $triggerStmtReplaced . PHP_EOL . PHP_EOL;
+        $ret .= $triggerStmtReplaced.PHP_EOL.PHP_EOL;
         return $ret;
     }
 
@@ -1230,13 +1230,13 @@ 
             "*/ /*!50003 TRIGGER",
             $triggerStmtReplaced
         );
-        if ( false === $triggerStmtReplaced ) {
+        if (false === $triggerStmtReplaced) {
             $triggerStmtReplaced = $triggerStmt;
         }
 
-        $ret .= "DELIMITER ;;" . PHP_EOL .
-            $triggerStmtReplaced . "*/;;" . PHP_EOL .
-            "DELIMITER ;" . PHP_EOL . PHP_EOL;
+        $ret .= "DELIMITER ;;".PHP_EOL.
+            $triggerStmtReplaced."*/;;".PHP_EOL.
+            "DELIMITER ;".PHP_EOL.PHP_EOL;
         return $ret;
     }
 
@@ -1248,8 +1248,8 @@ 
 
         $args = func_get_args();
 
-        return "SELECT TABLE_NAME AS tbl_name " .
-            "FROM INFORMATION_SCHEMA.TABLES " .
+        return "SELECT TABLE_NAME AS tbl_name ".
+            "FROM INFORMATION_SCHEMA.TABLES ".
             "WHERE TABLE_TYPE='BASE TABLE' AND TABLE_SCHEMA='${args[0]}'";
     }
 
@@ -1261,8 +1261,8 @@ 
 
         $args = func_get_args();
 
-        return "SELECT TABLE_NAME AS tbl_name " .
-            "FROM INFORMATION_SCHEMA.TABLES " .
+        return "SELECT TABLE_NAME AS tbl_name ".
+            "FROM INFORMATION_SCHEMA.TABLES ".
             "WHERE TABLE_TYPE='VIEW' AND TABLE_SCHEMA='${args[0]}'";
     }
 
@@ -1330,12 +1330,12 @@ 
 
         $args = func_get_args();
 
-        return "LOCK TABLES `${args[0]}` WRITE;" . PHP_EOL;
+        return "LOCK TABLES `${args[0]}` WRITE;".PHP_EOL;
     }
 
     public function end_add_lock_table()
     {
-        return "UNLOCK TABLES;" . PHP_EOL;
+        return "UNLOCK TABLES;".PHP_EOL;
     }
 
     public function start_add_disable_keys()
@@ -1344,7 +1344,7 @@ 
             return "";
         }
         $args = func_get_args();
-        return "/*!40000 ALTER TABLE `${args[0]}` DISABLE KEYS */;" .
+        return "/*!40000 ALTER TABLE `${args[0]}` DISABLE KEYS */;".
             PHP_EOL;
     }
 
@@ -1354,18 +1354,18 @@ 
             return "";
         }
         $args = func_get_args();
-        return "/*!40000 ALTER TABLE `${args[0]}` ENABLE KEYS */;" .
+        return "/*!40000 ALTER TABLE `${args[0]}` ENABLE KEYS */;".
             PHP_EOL;
     }
 
     public function start_disable_autocommit()
     {
-        return "SET autocommit=0;" . PHP_EOL;
+        return "SET autocommit=0;".PHP_EOL;
     }
 
     public function end_disable_autocommit()
     {
-        return "COMMIT;" . PHP_EOL;
+        return "COMMIT;".PHP_EOL;
     }
 
     public function add_drop_database()
@@ -1376,8 +1376,8 @@ 
 
         $args = func_get_args();
 
-        return "/*!40000 DROP DATABASE IF EXISTS `${args[0]}`*/;" .
-            PHP_EOL . PHP_EOL;
+        return "/*!40000 DROP DATABASE IF EXISTS `${args[0]}`*/;".
+            PHP_EOL.PHP_EOL;
     }
 
     public function add_drop_trigger()
@@ -1388,7 +1388,7 @@ 
 
         $args = func_get_args();
 
-        return "DROP TRIGGER IF EXISTS `${args[0]}`;" . PHP_EOL;
+        return "DROP TRIGGER IF EXISTS `${args[0]}`;".PHP_EOL;
     }
 
     public function drop_table()
@@ -1399,7 +1399,7 @@ 
 
         $args = func_get_args();
 
-        return "DROP TABLE IF EXISTS `${args[0]}`;" . PHP_EOL;
+        return "DROP TABLE IF EXISTS `${args[0]}`;".PHP_EOL;
     }
 
     public function drop_view()
@@ -1410,8 +1410,8 @@ 
 
         $args = func_get_args();
 
-        return "DROP TABLE IF EXISTS `${args[0]}`;" . PHP_EOL .
-                "/*!50001 DROP VIEW IF EXISTS `${args[0]}`*/;" . PHP_EOL;
+        return "DROP TABLE IF EXISTS `${args[0]}`;".PHP_EOL.
+                "/*!50001 DROP VIEW IF EXISTS `${args[0]}`*/;".PHP_EOL;
     }
 
     public function getDatabaseHeader()
@@ -1422,9 +1422,9 @@ 
 
         $args = func_get_args();
 
-        return "--" . PHP_EOL .
-            "-- Current Database: `${args[0]}`" . PHP_EOL .
-            "--" . PHP_EOL . PHP_EOL;
+        return "--".PHP_EOL.
+            "-- Current Database: `${args[0]}`".PHP_EOL.
+            "--".PHP_EOL.PHP_EOL;
     }
 
     /**
@@ -1439,10 +1439,10 @@ 
         $colInfo = array();
         $colParts = explode(" ", $colType['Type']);
 
-        if($fparen = strpos($colParts[0], "("))
+        if ($fparen = strpos($colParts[0], "("))
         {
             $colInfo['type'] = substr($colParts[0], 0, $fparen);
-            $colInfo['length']  = str_replace(")", "", substr($colParts[0], $fparen+1));
+            $colInfo['length'] = str_replace(")", "", substr($colParts[0], $fparen + 1));
             $colInfo['attributes'] = isset($colParts[1]) ? $colParts[1] : NULL;
         }
         else
@@ -1458,25 +1458,25 @@ 
     public function backup_parameters()
     {
         if (func_num_args() != 1) {
-            throw new Exception("Unexpected parameter passed to " . __METHOD__);
+            throw new Exception("Unexpected parameter passed to ".__METHOD__);
         }
 
         $args = func_get_args();
         $dumpSettings = $args[0];
-        $ret = "/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;" . PHP_EOL .
-            "/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;" . PHP_EOL .
-            "/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;" . PHP_EOL .
-            "/*!40101 SET NAMES " . $dumpSettings['default-character-set'] . " */;" . PHP_EOL;
+        $ret = "/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;".PHP_EOL.
+            "/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;".PHP_EOL.
+            "/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;".PHP_EOL.
+            "/*!40101 SET NAMES ".$dumpSettings['default-character-set']." */;".PHP_EOL;
 
         if (false === $dumpSettings['skip-tz-utz']) {
-            $ret .= "/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;" . PHP_EOL .
-                "/*!40103 SET TIME_ZONE='+00:00' */;" . PHP_EOL;
+            $ret .= "/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;".PHP_EOL.
+                "/*!40103 SET TIME_ZONE='+00:00' */;".PHP_EOL;
         }
 
-        $ret .= "/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;" . PHP_EOL .
-            "/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;" . PHP_EOL .
-            "/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;" . PHP_EOL .
-            "/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;" . PHP_EOL .PHP_EOL;
+        $ret .= "/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;".PHP_EOL.
+            "/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;".PHP_EOL.
+            "/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;".PHP_EOL.
+            "/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;".PHP_EOL.PHP_EOL;
 
         return $ret;
     }
@@ -1484,7 +1484,7 @@ 
     public function restore_parameters()
     {
         if (func_num_args() != 1) {
-            throw new Exception("Unexpected parameter passed to " . __METHOD__);
+            throw new Exception("Unexpected parameter passed to ".__METHOD__);
         }
 
         $args = func_get_args();
@@ -1492,16 +1492,16 @@ 
         $ret = "";
 
         if (false === $dumpSettings['skip-tz-utz']) {
-            $ret .= "/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;" . PHP_EOL;
+            $ret .= "/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;".PHP_EOL;
         }
 
-        $ret .= "/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;" . PHP_EOL .
-            "/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;" . PHP_EOL .
-            "/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;" . PHP_EOL .
-            "/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;" . PHP_EOL .
-            "/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;" . PHP_EOL .
-            "/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;" . PHP_EOL .
-            "/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;" . PHP_EOL . PHP_EOL;
+        $ret .= "/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;".PHP_EOL.
+            "/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;".PHP_EOL.
+            "/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;".PHP_EOL.
+            "/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;".PHP_EOL.
+            "/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;".PHP_EOL.
+            "/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;".PHP_EOL.
+            "/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;".PHP_EOL.PHP_EOL;
 
         return $ret;
     }

Braces +1 added lines, -2 removed lines

@@ -1444,8 +1444,7 @@
             $colInfo['type'] = substr($colParts[0], 0, $fparen);
             $colInfo['length']  = str_replace(")", "", substr($colParts[0], $fparen+1));
             $colInfo['attributes'] = isset($colParts[1]) ? $colParts[1] : NULL;
-        }
-        else
+        } else
         {
             $colInfo['type'] = $colParts[0];
         }

core/auth/Connexion.class.php

Spacing +9 added lines, -9 removed lines

@@ -57,7 +57,7 @@ 
 				}
 
 				//si le compte est archiver (bloqué) l'utilisateur ne peut pas se connecter au site
-				if ($archiver  == 1) {
+				if ($archiver == 1) {
 					FlashMessage::setFlash("Votre compte a été bloqué par un administrateur, vous ne pouvez donc pas vous connecter à ce site, veuillez réesseyer ultérieurement");
 					header("location:$page_retour_err");
 				}
@@ -69,7 +69,7 @@ 
 				
 
 				//si les mdp sont egaux on redirige ver esace membre sinon ver login avec un mess d'erreur
-				if (($valide == 1) && ($archiver  != 1)) {
+				if (($valide == 1) && ($archiver != 1)) {
 					if ($mdp == $mdpbdd) {
 						$_SESSION['login'] = $pseudo;
 						$_SESSION["idlogin".CLEF_SITE] = $id;
@@ -79,19 +79,19 @@ 
 						$last_change_mdp = mktime(0, 0, 0, $date_array[1], $date_array[2], $date_array[0]);
 						$today = mktime(0, 0, 0, date("m"), date("d"), date("Y"));
 
-						if (($today-$last_change_mdp) > 259200) {
+						if (($today - $last_change_mdp) > 259200) {
 							self::setUpdatelastConnexion($id);
 
 							$membre = new Membre($id);
 							$membre->setMdp($mdpbdd, $mdp_noncrypt, $mdp_noncrypt);
 
 							if (isset($_POST['remember'])) {
-								setcookie("auth".CLEF_SITE, $id."-----".sha1($pseudo . $membre->getMdp()), time()+3600*24*3, "/", "", false, true);
+								setcookie("auth".CLEF_SITE, $id."-----".sha1($pseudo.$membre->getMdp()), time() + 3600 * 24 * 3, "/", "", false, true);
 							}
 						}
 						else {
 							if (isset($_POST['remember'])) {
-								setcookie("auth".CLEF_SITE, $id."-----".sha1($pseudo . $mdpbdd), time()+3600*24*3, "/", "", false, true);
+								setcookie("auth".CLEF_SITE, $id."-----".sha1($pseudo.$mdpbdd), time() + 3600 * 24 * 3, "/", "", false, true);
 							}
 						}
 
@@ -143,7 +143,7 @@ 
 							$last_change_mdp = mktime(0, 0, 0, $date_array[1], $date_array[2], $date_array[0]);
 							$today = mktime(0, 0, 0, date("m"), date("d"), date("Y"));
 
-							if (($today-$last_change_mdp) > 259200) {
+							if (($today - $last_change_mdp) > 259200) {
 								self::setUpdatelastConnexion($obj->ID_identite);
 
 								//on refait un nouveau mdp encrypté avec le même mdp
@@ -154,10 +154,10 @@ 
 								//on detruit le cookie et on le refait avec le mdp regénéré
 								setcookie("auth".CLEF_SITE, NULL, -1);
 								$key = sha1($obj->pseudo.$membre->getMdp());
-								setcookie("auth".CLEF_SITE, $obj->ID_identite."-----".$key, time()+3600*24*3, "/", "", false, true);
+								setcookie("auth".CLEF_SITE, $obj->ID_identite."-----".$key, time() + 3600 * 24 * 3, "/", "", false, true);
 							}
 							else {
-								setcookie("auth".CLEF_SITE, $obj->ID_identite."-----".$key, time()+3600*24*3, "/", "", false, true);
+								setcookie("auth".CLEF_SITE, $obj->ID_identite."-----".$key, time() + 3600 * 24 * 3, "/", "", false, true);
 							}
 						}
 						else {
@@ -204,7 +204,7 @@ 
 		public static function setUpdatelastConnexion($id_identite) {
 			$dbc = App::getDb();
 
-			$dbc->prepare("UPDATE identite SET last_change_mdp=:date WHERE ID_identite=:id_identite", array("date"=>date("Y-m-d"),"id_identite"=>$id_identite));
+			$dbc->prepare("UPDATE identite SET last_change_mdp=:date WHERE ID_identite=:id_identite", array("date"=>date("Y-m-d"), "id_identite"=>$id_identite));
 		}
 
 		/**

Braces +10 added lines, -15 removed lines

@@ -44,8 +44,7 @@ 
 			if (!isset($id)) {
 				FlashMessage::setFlash("Vos identifiants de connexions sont incorrects");
 				header("location:$page_retour_err");
-			}
-			else {
+			} else {
 				$config = new Configuration();
 
 				//cela veut dire que l'utilisateur doit obligatoirement etre valider pour avoir acces au site
@@ -88,8 +87,7 @@ 
 							if (isset($_POST['remember'])) {
 								setcookie("auth".CLEF_SITE, $id."-----".sha1($pseudo . $membre->getMdp()), time()+3600*24*3, "/", "", false, true);
 							}
-						}
-						else {
+						} else {
 							if (isset($_POST['remember'])) {
 								setcookie("auth".CLEF_SITE, $id."-----".sha1($pseudo . $mdpbdd), time()+3600*24*3, "/", "", false, true);
 							}
@@ -98,8 +96,7 @@ 
 
 						FlashMessage::setFlash("Vous êtes maintenant connecté", "info");
 						header("location:$page_retour");
-					}
-					else {
+					} else {
 						FlashMessage::setFlash("Vos identifiants de connexions sont incorrects");
 						header("location:$page_retour_err");
 					}
@@ -130,8 +127,7 @@ 
 					if ($obj->archiver == 1) {
 						setcookie("auth".CLEF_SITE, NULL, -1);
 						self::setDeconnexion($page_retour);
-					}
-					else {
+					} else {
 						$key = sha1($obj->pseudo.$obj->mdp);
 
 						if ($key == $auth[1]) {
@@ -155,12 +151,10 @@ 
 								setcookie("auth".CLEF_SITE, NULL, -1);
 								$key = sha1($obj->pseudo.$membre->getMdp());
 								setcookie("auth".CLEF_SITE, $obj->ID_identite."-----".$key, time()+3600*24*3, "/", "", false, true);
-							}
-							else {
+							} else {
 								setcookie("auth".CLEF_SITE, $obj->ID_identite."-----".$key, time()+3600*24*3, "/", "", false, true);
 							}
-						}
-						else {
+						} else {
 							if ($obj_connecte == 1) {
 								self::setDeconnexion($page_retour);
 							}
@@ -168,8 +162,7 @@ 
 					}
 
 				}
-			}
-			else if (!isset($_SESSION["idlogin".CLEF_SITE])) {
+			} else if (!isset($_SESSION["idlogin".CLEF_SITE])) {
 				if ($obj_connecte == 1) {
 					FlashMessage::setFlash("Vous devez être connecté pour accéder à cette page");
 					header("location:".$page_retour);
@@ -216,6 +209,8 @@ 
 			$dbc = App::getDb();
 
 			$query = $dbc->query("SELECT last_change_mdp FROM identite WHERE ID_identite=".$id_identite);
-			foreach ($query as $obj) return $obj->last_change_mdp;
+			foreach ($query as $obj) {
+				return $obj->last_change_mdp;
+			}
 		}
 	}
\ No newline at end of file

core/auth/Encrypt.class.php

Spacing +7 added lines, -7 removed lines

@@ -13,7 +13,7 @@ 
 		
 		
 		//-------------------------- GETTER ----------------------------------------------------------------------------//
-		public static function getParams($id_identite=null) {
+		public static function getParams($id_identite = null) {
 			if ($id_identite != null) {
 				$dbc = App::getDb();
 
@@ -38,7 +38,7 @@ 
 		 * @param $id_identite
 		 * @return string
 		 */
-		public static function setEncryptMdp($mdp, $id_identite=null) {
+		public static function setEncryptMdp($mdp, $id_identite = null) {
 			$encrypt_str = ChaineCaractere::random(154);
 
 			//on cache le mdp
@@ -48,9 +48,9 @@ 
 			$longeur_mdp = strlen($mdp);
 
 			//on va couper le mot de passe en 2 suivant un nombre aleatoire
-			$nb_aleatoire_mdp = rand(3, $longeur_mdp-2);
-			$bout1_mdp = mb_substr($mdp, 0, $longeur_mdp/2, "UTF-8");
-			$bout2_mdp = mb_substr($mdp, $longeur_mdp/2, $longeur_mdp, "UTF-8");
+			$nb_aleatoire_mdp = rand(3, $longeur_mdp - 2);
+			$bout1_mdp = mb_substr($mdp, 0, $longeur_mdp / 2, "UTF-8");
+			$bout2_mdp = mb_substr($mdp, $longeur_mdp / 2, $longeur_mdp, "UTF-8");
 
 			//on stock la taille des bouts pour pouvoir les décrypter
 			$taille_bout1 = strlen($bout1_mdp);
@@ -59,7 +59,7 @@ 
 			//on insere le premier bout aleatoirement dans le hashmdp
 			//on calcul sa longeur total (celle duhash + la logneur du mdp que l'on va rajouter dedans)
 			$longueur_hash = strlen($encrypt_str);
-			$debut_bout1 = rand(0, $longueur_hash/2);
+			$debut_bout1 = rand(0, $longueur_hash / 2);
 
 			//on rajouter le premier bout dans le mot de passe + recalcule de la longeur du hash avec le mdp add
 			$encrypt_str = mb_substr($encrypt_str, 0, $debut_bout1).$bout1_mdp.mb_substr($encrypt_str, $debut_bout1, $longueur_hash);
@@ -67,7 +67,7 @@ 
 			//on insere le second bout aleatoirement dans le hashmdp
 			//on calcul sa longeur total (celle duhash + la logneur premier bout du mdp que l'on va rajouter dedans)
 			$longueur_hash = strlen($encrypt_str);
-			$debut_bout2 = rand($longueur_hash/2, $longueur_hash);
+			$debut_bout2 = rand($longueur_hash / 2, $longueur_hash);
 
 			//on rajoute le deuxieme
 			$mdp_encrypt = mb_substr($encrypt_str, 0, $debut_bout2).$bout2_mdp.mb_substr($encrypt_str, $debut_bout2, $longueur_hash);

Braces +2 added lines, -4 removed lines

@@ -21,8 +21,7 @@ 
 				foreach ($query as $obj) {
 					$params = $obj->mdp_params;
 				}
-			}
-			else {
+			} else {
 				$params = self::$params;
 			}
 
@@ -74,8 +73,7 @@ 
 
 			if ($id_identite != null) {
 				self::setSaveParams("$taille_bout1, $debut_bout2, $nb_aleatoire_mdp, $taille_bout2, $debut_bout1, ".ChaineCaractere::random(20), $id_identite);
-			}
-			else {
+			} else {
 				self::$params = "$taille_bout1, $debut_bout2, $nb_aleatoire_mdp, $taille_bout2, $debut_bout1, ".ChaineCaractere::random(20);
 			}
 

Doc Comments +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 		//-------------------------- GETTER ----------------------------------------------------------------------------//
 		/**
 		 * @param null $id_identite
-		 * @return mixed
+		 * @return string
 		 */
 		public static function getParams($id_identite=null) {
 			if ($id_identite != null) {
@@ -38,7 +38,7 @@ 
 		//-------------------------- SETTER ----------------------------------------------------------------------------//
 		/**
 		 * fonction qui permet d'encrypter un mot de passe, une fois encrype, on save les params pour le retrouver en bdd
-		 * @param $mdp
+		 * @param string|null $mdp
 		 * @param $id_identite
 		 * @return string
 		 */

core/auth/login.php

Braces +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
 
 	if (isset($_POST['admin'])) {
 		Connexion::setLogin($pseudo, $mdp, WEBROOT."administrator/login", WEBROOT."administrator");
-	}
-	else {
+	} else {
 		Connexion::setLogin($pseudo, $mdp, WEBROOT."login", WEBROOT."index.php");
 	}
 ?>
\ No newline at end of file

core/auth/Inscription.class.php

Spacing +8 added lines, -8 removed lines

@@ -14,7 +14,7 @@ 
 
 		//-------------------------- CONSTRUCTEUR ----------------------------------------------------------------------------//
 		public function __construct($datas) {
-			for ($i=0 ; $i<count($datas) ; $i++) {
+			for ($i = 0; $i < count($datas); $i++) {
 				$function = "setVerif".ucfirst($datas[$i][0]);
 
 				if (isset($datas[$i][2])) {
@@ -43,7 +43,7 @@ 
 			return $this->mail;
 		}
 		public function getErreur() {
-			return $this->erreur;;
+			return $this->erreur; ;
 		}
 
 		protected function getTestRequired($value) {
@@ -83,7 +83,7 @@ 
 		 * @param null $required
 		 * @return bool
 		 */
-		protected function setVerifNom($value, $required=null) {
+		protected function setVerifNom($value, $required = null) {
 			//test avec le required, si le champe est vide et que le required est != null on return fa	lse sinon on va tester
 			if (($required != null) && ($this->getTestRequired($value) == false)) {
 				$this->erreur .= "<li>Le champs nom ne peut pas être vide</li>";
@@ -110,7 +110,7 @@ 
 		 * @param null $required
 		 * @return bool
 		 */
-		protected function setVerifPrenom($value, $required=null) {
+		protected function setVerifPrenom($value, $required = null) {
 			//test avec le required, si le champe est vide et que le required est != null on return fa	lse sinon on va tester
 			if (($required != null) && ($this->getTestRequired($value) == false)) {
 				$this->erreur .= "<li>Le champs prénom ne peut pas être vide</li>";
@@ -137,7 +137,7 @@ 
 		 * @param null $required
 		 * @return bool
 		 */
-		protected function setVerifMdp($value, $required=null) {
+		protected function setVerifMdp($value, $required = null) {
 			//test avec le required, si le champe est vide et que le required est != null on return fa	lse sinon on va tester
 			if (($required != null) && ($this->getTestRequired($value) == false)) {
 				$this->erreur .= "<li>Le champs mot de passe ne peut pas être vide</li>";
@@ -164,7 +164,7 @@ 
 		 * @param null $required
 		 * @return bool
 		 */
-		protected function setVerifRetapeMdp($value, $required=null) {
+		protected function setVerifRetapeMdp($value, $required = null) {
 			if ($this->mdp == $value) {
 				return true;
 			}
@@ -181,7 +181,7 @@ 
 		 * @param null $required
 		 * @return bool
 		 */
-		protected function setVerifPseudo($value, $required=null) {
+		protected function setVerifPseudo($value, $required = null) {
 			//test avec le required, si le champe est vide et que le required est != null on return fa	lse sinon on va tester
 			if (($required != null) && ($this->getTestRequired($value) == false)) {
 				$this->erreur .= "<li>Le champs pseudo ne peut pas être vide</li>";
@@ -208,7 +208,7 @@ 
 		 * @param null $required
 		 * @return bool
 		 */
-		protected function setVerifMail($value, $required=null) {
+		protected function setVerifMail($value, $required = null) {
 			//test avec le required, si le champe est vide et que le required est != null on return fa	lse sinon on va tester
 			if (($required != null) && ($this->getTestRequired($value) == false)) {
 				$this->erreur .= "<li>Le champs E-mail ne peut pas être vide</li>";

Braces +20 added lines, -40 removed lines

@@ -19,8 +19,7 @@ 
 
 				if (isset($datas[$i][2])) {
 					$this->$function($datas[$i][1], $datas[$i][2]);
-				}
-				else {
+				} else {
 					$this->$function($datas[$i][1]);
 				}
 			}
@@ -49,8 +48,7 @@ 
 		protected function getTestRequired($value) {
 			if (($value == "") || ($value == null) || (strlen($value) == 0)) {
 				return false;
-			}
-			else {
+			} else {
 				return true;
 			}
 		}
@@ -58,8 +56,7 @@ 
 		protected function getTestLongueur($value, $longeur) {
 			if (strlen($value) > $longeur) {
 				return true;
-			}
-			else {
+			} else {
 				return false;
 			}
 		}
@@ -67,8 +64,7 @@ 
 		protected function getTestInt($value) {
 			if (is_numeric($value)) {
 				return true;
-			}
-			else {
+			} else {
 				return false;
 			}
 		}
@@ -88,17 +84,14 @@ 
 			if (($required != null) && ($this->getTestRequired($value) == false)) {
 				$this->erreur .= "<li>Le champs nom ne peut pas être vide</li>";
 				return false;
-			}
-			else {
+			} else {
 				if (($value != "") && ($this->getTestLongueur($value, 2) == true)) {
 					$this->nom = $value;
 					return true;
-				}
-				else if (($value != "") && ($this->getTestLongueur($value, 2) == false)) {
+				} else if (($value != "") && ($this->getTestLongueur($value, 2) == false)) {
 					$this->erreur .= "<li>Le champs nom soit être supérieur à deux caractères</li>";
 					return false;
-				}
-				else {
+				} else {
 					return true;
 				}
 			}
@@ -115,17 +108,14 @@ 
 			if (($required != null) && ($this->getTestRequired($value) == false)) {
 				$this->erreur .= "<li>Le champs prénom ne peut pas être vide</li>";
 				return false;
-			}
-			else {
+			} else {
 				if (($value != "") && ($this->getTestLongueur($value, 2) == true)) {
 					$this->prenom = $value;
 					return true;
-				}
-				else if (($value != "") && ($this->getTestLongueur($value, 2) == false)) {
+				} else if (($value != "") && ($this->getTestLongueur($value, 2) == false)) {
 					$this->erreur .= "<li>Le champs prénom soit être supérieur à deux caractères</li>";
 					return false;
-				}
-				else {
+				} else {
 					return true;
 				}
 			}
@@ -142,17 +132,14 @@ 
 			if (($required != null) && ($this->getTestRequired($value) == false)) {
 				$this->erreur .= "<li>Le champs mot de passe ne peut pas être vide</li>";
 				return false;
-			}
-			else {
+			} else {
 				if (($value != "") && ($this->getTestLongueur($value, 2) == true)) {
 					$this->mdp = $value;
 					return true;
-				}
-				else if (($value != "") && ($this->getTestLongueur($value, 2) == false)) {
+				} else if (($value != "") && ($this->getTestLongueur($value, 2) == false)) {
 					$this->erreur .= "<li>Le champs mot de passe soit être supérieur à deux caractères</li>";
 					return false;
-				}
-				else {
+				} else {
 					return true;
 				}
 			}
@@ -167,8 +154,7 @@ 
 		protected function setVerifRetapeMdp($value, $required=null) {
 			if ($this->mdp == $value) {
 				return true;
-			}
-			else {
+			} else {
 				$this->erreur .= "<li>Les mots de passent ne correspondent pas</li>";
 				$this->mdp = null;
 				return false;
@@ -186,17 +172,14 @@ 
 			if (($required != null) && ($this->getTestRequired($value) == false)) {
 				$this->erreur .= "<li>Le champs pseudo ne peut pas être vide</li>";
 				return false;
-			}
-			else {
+			} else {
 				if (($value != "") && ($this->getTestLongueur($value, 2) == true)) {
 					$this->pseudo = $value;
 					return true;
-				}
-				else if (($value != "") && ($this->getTestLongueur($value, 2) == false)) {
+				} else if (($value != "") && ($this->getTestLongueur($value, 2) == false)) {
 					$this->erreur .= "<li>Le champs pseudo soit être supérieur à deux caractères</li>";
 					return false;
-				}
-				else {
+				} else {
 					return true;
 				}
 			}
@@ -213,17 +196,14 @@ 
 			if (($required != null) && ($this->getTestRequired($value) == false)) {
 				$this->erreur .= "<li>Le champs E-mail ne peut pas être vide</li>";
 				return false;
-			}
-			else {
+			} else {
 				if (($value != "") && (filter_var($value, FILTER_VALIDATE_EMAIL) != false)) {
 					$this->mail = $value;
 					return true;
-				}
-				else if (($value != "") && (filter_var($value, FILTER_VALIDATE_EMAIL) == false)) {
+				} else if (($value != "") && (filter_var($value, FILTER_VALIDATE_EMAIL) == false)) {
 					$this->erreur .= "<li>Le champs E-mail doit être une adresse E-mail valide</li>";
 					return false;
-				}
-				else {
+				} else {
 					return true;
 				}
 			}

core/auth/changer_mdp.php

Braces +3 added lines, -6 removed lines

@@ -18,20 +18,17 @@
 		if ($membre->getErreur()) {
 			FlashMessage::setFlash($membre->getErreur());
 			header("location:".ADMWEBROOT."gestion-comptes/mon-compte");
-		}
-		else {
+		} else {
 			Connexion::setDeconnexion(WEBROOT."administrator/login");
 			FlashMessage::setFlash("Votre mot de passe a été changé avec succès, vous pouvez vous reconnecter avec votre nouveau mot de passe", "info");
 		}
-	}
-	else {
+	} else {
 		$membre->setMdp($mdp, $new_mdp, $verif_new_mdp);
 
 		if ($membre->getErreur()) {
 			FlashMessage::setFlash($membre->getErreur());
 			header("location:index.php");
-		}
-		else {
+		} else {
 			Connexion::setDeconnexion("index.php?page=login");
 			FlashMessage::setFlash("Votre mot de passe a été changé avec succès, vous pouvez vous reconnecter avec votre nouveau mot de passe", "info");
 		}

config/initialise.php

Braces +5 added lines, -5 removed lines

@@ -1,7 +1,9 @@ 
 <?php
 	//error_reporting(E_ALL ^ E_NOTICE);
 
-	if (!isset($page_root)) $page_root = "index.php";
+	if (!isset($page_root)) {
+		$page_root = "index.php";
+	}
 
 	//-------------------------- CONSTANTE POUR LES ROUTES ----------------------------------------------------------------------------//
 	//definit le chemin vers la racine du projet (depuis racine serveur web
@@ -48,15 +50,13 @@ 
 		if ($ini["installation"] == 1) {
 			header("location:".WEBROOT."installation");
 		}
-	}
-	else {
+	} else {
 		header("location:".WEBROOT."installation");
 	}
 
 	if ($ini["developpment"] == 1) {
 		$tab = "dev";
-	}
-	else {
+	} else {
 		$tab = "prod";
 	}
 

core/auth/Membre.class.php

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 	namespace core\auth;
 
 
-	use core\images\Resize;
-
 	class Membre {
 		protected $id_identite;
 		protected $nom;

Spacing +7 added lines, -7 removed lines

@@ -19,7 +19,7 @@ 
 		
 		//------------------------------ constructeur-----------------------------------
 		//Récupérer en base de données les infos du membre
-		public function __construct($id_identite=null){
+		public function __construct($id_identite = null) {
 			$dbc = \core\App::getDb();
 
 			$this->debut_lien = IMGROOT."profil/";
@@ -85,7 +85,7 @@ 
 		/**
 		 * @param null $id_identite
 		 */
-		public function setSupprimUser($id_identite=null) {
+		public function setSupprimUser($id_identite = null) {
 			$dbc = \core\App::getDb();
 
 			if ($id_identite == null) {
@@ -99,7 +99,7 @@ 
 			$oldimg_profil = $obj->img_profil;
 			if ($oldimg_profil != "") {
 				$oldimg_profil = explode("/", $oldimg_profil);
-				if(end($oldimg_profil) == "defaut.png") {
+				if (end($oldimg_profil) == "defaut.png") {
 					
 				}
 				else {
@@ -194,22 +194,22 @@ 
 		 * @param string $mdp
 		 * @return integer
 		 */
-		function testpassword($mdp)	{
+		function testpassword($mdp) {
 			$longueur = strlen($mdp);
 			$point = 0;
 
-			for ($i=0 ; $i<$longueur ; $i++) 	{
+			for ($i = 0; $i < $longueur; $i++) {
 				$lettre = $mdp[$i];
 
 				if ($lettre >= 'a' && $lettre <= 'z') {
 					$point = $point + 1;
 					$point_min = 1;
 				}
-				else if ($lettre >= 'A' && $lettre <= 'Z'){
+				else if ($lettre >= 'A' && $lettre <= 'Z') {
 					$point = $point + 2;
 					$point_maj = 2;
 				}
-				else if ($lettre >= '0' && $lettre <= '9'){
+				else if ($lettre >= '0' && $lettre <= '9') {
 					$point = $point + 3;
 					$point_chiffre = 3;
 				}

Braces +12 added lines, -24 removed lines

@@ -38,8 +38,7 @@ 
 
 					if ($obj->img_profil == "") {
 						$this->img = $this->debut_lien."defaut.png";
-					}
-					else {
+					} else {
 						$this->img = $obj->img_profil;
 					}
 				}
@@ -101,8 +100,7 @@ 
 				$oldimg_profil = explode("/", $oldimg_profil);
 				if(end($oldimg_profil) == "defaut.png") {
 					
-				}
-				else {
+				} else {
 					unlink("../../images/profil/".end($oldimg_profil));
 					
 				}
@@ -127,16 +125,13 @@ 
 			if (strlen($new_pseudo) < 5) {
 				$err = "Votre pseudo est trop court";
 				$this->erreur = $err;
-			}
-			else if (strlen($new_pseudo) > 15) {
+			} else if (strlen($new_pseudo) > 15) {
 				$err = "Votre pseudo est trop long";
 				$this->erreur = $err;
-			}
-			else if ($new_pseudo == $pseudo_bdd) {
+			} else if ($new_pseudo == $pseudo_bdd) {
 				$err = "Ce pseudo est déjà utilisé, veuillez en choisir un autre";
 				$this->erreur = $err;
-			}
-			else {
+			} else {
 				$dbc->query("UPDATE identite set pseudo=$new_pseudo WHERE ID_identite=".$_SESSION["idlogin".CLEF_SITE]);
 				$this->pseudo = $new_pseudo;
 			}
@@ -157,24 +152,20 @@ 
 			if (md5($old_mdp) != $mdp) {
 				$err = "Votre mot de passe est incorrect";
 				$this->erreur = $err;
-			}
-			else {
+			} else {
 				if ($new_mdp != $verif_new_mdp) {
 					$err = "Vos mots de passe sont différents";
 					$this->erreur = $err;
-				}
-				else {
+				} else {
 					$testmdp = $this->testpassword($new_mdp);
 					
 					if (strlen($new_mdp) < 5) {
 						$err = "Votre mot de passe est trop court";
 						$this->erreur = $err;
-					}
-					else if ($testmdp < 40) {
+					} else if ($testmdp < 40) {
 						$err = "Votre mot de passe est trop simple";
 						$this->erreur = $err;
-					}
-					else {
+					} else {
 						$mdpok = Encrypt::setEncryptMdp($new_mdp, $this->id_identite);
 						//le nouveau mdp est bon on update
 						$dbc->query("UPDATE identite SET mdp='$mdpok' WHERE ID_identite=".$this->id_identite);
@@ -204,16 +195,13 @@ 
 				if ($lettre >= 'a' && $lettre <= 'z') {
 					$point = $point + 1;
 					$point_min = 1;
-				}
-				else if ($lettre >= 'A' && $lettre <= 'Z'){
+				} else if ($lettre >= 'A' && $lettre <= 'Z'){
 					$point = $point + 2;
 					$point_maj = 2;
-				}
-				else if ($lettre >= '0' && $lettre <= '9'){
+				} else if ($lettre >= '0' && $lettre <= '9'){
 					$point = $point + 3;
 					$point_chiffre = 3;
-				}
-				else {
+				} else {
 					$point = $point + 5;
 					$point_caracteres = 5;
 				}

admin/views/gestion-comptes/creer-utilisateur.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?=\core\HTML\flashmessage\FlashMessage::getFlash();?>
+<?=\core\HTML\flashmessage\FlashMessage::getFlash(); ?>
 <header>
 	<div class="inner">
 		<h1>Mon compte</h1>