Improve the main JSONDB class

* Use the class PreparedQueryStatement for prepared queries.
* Move methods used for prepared queries in class
PreparedQueryStatement.
* Create a .htaccess file in each created servers with user's
credentials.
* Fix bug with server's creation (server's path and user's credentials
wasn't saved)

Author: na2axl

src/JSONDB/JSONDB.php

@@ -144,13 +144,6 @@ class JSONDB
          */
         private $parsedQuery;
 
-        /**
-         * An array of keys inserted in the
-         * query.
-         * @var array
-         */
-        private $preparedQueryKeys = array();
-
         /**
          * Store the result of a query.
          *
@@ -303,6 +296,18 @@ public function createServer($path, $username, $password, $connect = FALSE)
 
                 chmod($path, 0777);
 
+                $htaccess = fopen($path . '/.htaccess', 'a+');
+                foreach(array('AuthType Basic', 'AuthName "JSONDB Server Access"', 'AuthUserFile "' . realpath(dirname(__DIR__) . '/config/.htpasswd') . '"', 'Require user ' . $username) as $line) {
+                    fwrite($htaccess, $line . "\n");
+                }
+                fclose($htaccess);
+
+                $htpasswd = fopen(realpath(dirname(__DIR__) . '/config/.htpasswd'), 'a+');
+                fwrite($htpasswd, $username . ':' . crypt($password) . "\n");
+                fclose($htpasswd);
+
+                $this->config->addUser($path, $username, $password);
+
                 if ($connect) {
                     $this->connect($path, $username, $password);
                 }
@@ -371,7 +376,7 @@ public function connect($server, $username, $password, $database = NULL)
                 throw new Exception("JSONDB Error: There is no registered server with the path \"{$server}\".");
             }
 
-            if ($config[$server]['username'] !== sha1(md5($username)) || $config[$server]['password'] !== sha1(md5($password))) {
+            if ($config[$server]['username'] !== Util::crypt($username) || $config[$server]['password'] !== Util::crypt($password)) {
                 $this->benchmark->mark('jsondb_(connect)_end');
                 throw new Exception("JSONDB Error: User's authentication failed for user \"{$username}\" on server \"{$server}\". Access denied.");
             }
@@ -482,57 +487,23 @@ public function query($query)
             }
 
             $this->queryString = $query;
+            $this->queryIsExecuted = FALSE;
+            $this->queryIsPrepared = FALSE;
 
             return $this->execute();
         }
 
         /**
          * Sends a prepared query.
          * @param string $query The query
-         * @return JSONDB
+         * @return PreparedQueryStatement
          */
         public function prepare($query)
         {
             $this->queryString = $query;
-            return $this->_prepareQuery();
-        }
-
-        /**
-         * Binds a value in a prepared query.
-         * @param string $key The parameter's key
-         * @param string|int|bool $value The parameter's value
-         * @param int $parse_method The parse method to use
-         * @throws Exception
-         */
-        public function bindValue($key, $value, $parse_method = JSONDB::PARAM_STRING)
-        {
-            if ($this->queryIsPrepared()) {
-                if (in_array($key, $this->preparedQueryKeys, TRUE)) {
-                    switch ($parse_method) {
-                        default:
-                        case self::PARAM_STRING:
-                            $value = self::quote((string)$value);
-                            break;
-
-                        case self::PARAM_INT:
-                            $value = (int)$value;
-                            break;
-
-                        case self::PARAM_BOOL:
-                            $value = ((string)((int)$value)) . ':JSONDB::TO_BOOL:';
-                            break;
+            $this->queryIsPrepared = TRUE;
 
-                        case self::PARAM_NULL:
-                            $value = (string)$value . ':JSONDB::TO_NULL:';
-                            break;
-                    }
-                    $this->queryString = str_replace($key, $value, $this->queryString);
-                } else {
-                    throw new Exception("JSONDB Error: Can't bind the value \"{$value}\" for the key \"{$key}\". The key isn't in the query.");
-                }
-            } else {
-                throw new Exception("JSONDB Error: Can't use JSONDB::bindValue() with non prepared queries. Send your query with JSONDB::prepare() first.");
-            }
+            return new PreparedQueryStatement($query, $this);
         }
 
         /**
@@ -550,31 +521,32 @@ public static function quote($value)
          * @return mixed
          * @throws Exception
          */
-        public function execute()
+        private function execute()
         {
-            if (NULL === $this->database || NULL === $this->parsedQuery) {
-                throw new Exception("JSONDB Error: Can't execute the query. No database/table selected or internal error.");
-            }
+            if (!$this->queryIsExecuted()) {
+                if (NULL === $this->database || NULL === $this->parsedQuery) {
+                    throw new Exception("JSONDB Error: Can't execute the query. No database/table selected or internal error.");
+                }
 
-            if ($this->queryIsPrepared()) {
-                $this->queryIsPrepared = FALSE;
-                return $this->query($this->queryString);
-            }
+                $this->setTable($this->parsedQuery['table']);
+                $table_path = $this->_getTablePath();
+                if (!file_exists($table_path) || !is_readable($table_path) || !is_writable($table_path)) {
+                    throw new Exception("JSONDB Error: Can't execute the query. The table \"{$this->table}\" doesn't exists in database \"{$this->database}\" or file access denied.");
+                }
 
-            $this->setTable($this->parsedQuery['table']);
-            $table_path = $this->_getTablePath();
-            if (!file_exists($table_path) || !is_readable($table_path) || !is_writable($table_path)) {
-                throw new Exception("JSONDB Error: Can't execute the query. The table \"{$this->table}\" doesn't exists in database \"{$this->database}\" or file access denied.");
-            }
+                $json_array = $this->cache->get($table_path);
+                $method = "_{$this->parsedQuery['action']}";
 
-            $json_array = $this->cache->get($table_path);
-            $method = "_{$this->parsedQuery['action']}";
+                $this->benchmark->mark('jsondb_(query)_start');
+                $return = $this->$method($json_array);
+                $this->benchmark->mark('jsondb_(query)_end');
 
-            $this->benchmark->mark('jsondb_(query)_start');
-            $return = $this->$method($json_array);
-            $this->benchmark->mark('jsondb_(query)_end');
+                $this->queryIsExecuted = TRUE;
 
-            return $return;
+                return $return;
+            } else {
+                throw new Exception('JSONDB Error: There is no query to execute, or the query is already executed.');
+            }
         }
 
         /**
@@ -605,19 +577,6 @@ public function queryIsExecuted()
             return $this->queryIsExecuted === TRUE;
         }
 
-        /**
-         * Prepare a query.
-         * @return JSONDB
-         */
-        private function _prepareQuery()
-        {
-            $this->queryIsPrepared = TRUE;
-            $query = $this->queryString;
-            preg_match_all('#(:[\w]+)#', $query, $keys);
-            $this->preparedQueryKeys = $keys[0];
-            return static::getInstance();
-        }
-
         /**
          * @param $data
          * @param bool $min
@@ -798,7 +757,7 @@ protected function _select($data)
             $result = $temp;
 
             $this->queryResults = $result;
-            $this->queryIsExecuted = TRUE;
+
             return new QueryResult($this->queryResults, $this);
         }