Merge remote-tracking branch 'refs/remotes/origin/master' into implementing_link

Author: na2axl

.gitignore

@@ -30,3 +30,4 @@ composer.phar
 
 /vendor/
 /_site/
+/servers/

src/config/users.json config/users.jsonsrc/config/users.json renamed to config/users.json

@@ -65,7 +65,7 @@ public function addUser($server, $username, $password)
         public function getConfig($filename)
         {
             if ($this->_exists($filename)) {
-                return json_decode(file_get_contents(realpath( dirname(__DIR__) . "/config/{$filename}.json")), TRUE);
+                return json_decode(file_get_contents(realpath(dirname(dirname(__DIR__)) . "/config/{$filename}.json")), TRUE);
             } else {
                 $this->_writeConfig($filename, array());
                 return array();
@@ -80,7 +80,7 @@ public function getConfig($filename)
          */
         private function _writeConfig($filename, array $config)
         {
-            return (bool)file_put_contents(realpath( dirname(__DIR__) . "/config/{$filename}.json"), json_encode($config));
+            return (bool)file_put_contents(realpath(dirname(dirname(__DIR__)) . "/config/{$filename}.json"), json_encode($config));
         }
 
         /**
@@ -90,6 +90,6 @@ private function _writeConfig($filename, array $config)
          */
         private function _exists($filename)
         {
-            return file_exists(realpath( dirname(__DIR__) . "/config/{$filename}.json"));
+            return file_exists(realpath(dirname(dirname(__DIR__)) . "/config/{$filename}.json"));
         }
     }

src/JSONDB/Configuration.php

@@ -59,6 +59,6 @@ class Util
          */
         public static function crypt($string)
         {
-            return crypt(sha1($string), self::$cryptSalt);
+            return sha1($string . self::$cryptSalt);
         }
     }