@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | protected $prepared_cache = array(); |
| 34 | 34 | |
| 35 | - public function connect ($config_path) { |
|
| 35 | + public function connect($config_path) { |
|
| 36 | 36 | if (file_exists($config_path)) { |
| 37 | 37 | require($config_path); |
| 38 | 38 | } else if (file_exists(CONFIG_PATH . $config_path)) { |
@@ -66,15 +66,15 @@ discard block |
||
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - public function update ($sql, $params = array()) { |
|
| 69 | + public function update($sql, $params = array()) { |
|
| 70 | 70 | $this->execute($sql, $params); |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - public function close () { |
|
| 73 | + public function close() { |
|
| 74 | 74 | $this->conn = null; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - public function execute ($sql, $params = array()) { |
|
| 77 | + public function execute($sql, $params = array()) { |
|
| 78 | 78 | //dont allow SELECT statements |
| 79 | 79 | if (strstr($sql, "SELECT")) { |
| 80 | 80 | throw new IllegalArgumentException("method DBDriver::execute() isnt for select statements, its only for write statements, use getRow() or listRows() instead."); |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | |
| 105 | 105 | if (!$res) { |
| 106 | 106 | if (DEBUG_MODE) { |
| 107 | - echo "SQL Query: " + $sql; |
|
| 107 | + echo "SQL Query: " +$sql; |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | //TODO: throw exception instead |
@@ -157,15 +157,15 @@ discard block |
||
| 157 | 157 | } |
| 158 | 158 | } |
| 159 | 159 | |
| 160 | - public function listAllDrivers () { |
|
| 160 | + public function listAllDrivers() { |
|
| 161 | 161 | return $this->conn->getAvailableDrivers(); |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | - public function quote ($str) : string { |
|
| 164 | + public function quote($str) : string { |
|
| 165 | 165 | return $this->conn->quote($str); |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | - protected function getQuery ($sql, bool $allow_information_schema = false) { |
|
| 168 | + protected function getQuery($sql, bool $allow_information_schema = false) { |
|
| 169 | 169 | /** |
| 170 | 170 | * check, if sql query contains comments |
| 171 | 171 | * |
@@ -299,7 +299,7 @@ discard block |
||
| 299 | 299 | return $this->queries; |
| 300 | 300 | } |
| 301 | 301 | |
| 302 | - public function beginTransaction () { |
|
| 302 | + public function beginTransaction() { |
|
| 303 | 303 | $this->conn->beginTransaction(); |
| 304 | 304 | } |
| 305 | 305 | |
@@ -55,9 +55,9 @@ discard block |
||
| 55 | 55 | $this->conn = new PDO("mysql:host=" . $this->host . ";port=" . $this->port . ";dbname=" . $this->database . "", $this->username, $this->password, $this->options); |
| 56 | 56 | |
| 57 | 57 | if (DEBUG_MODE) { |
| 58 | - //$this->conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
|
| 59 | - //$this->conn->setAttribute(PDO::ATTR_EMULATE_PREPARES, false); |
|
| 60 | - } |
|
| 58 | + //$this->conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
|
| 59 | + //$this->conn->setAttribute(PDO::ATTR_EMULATE_PREPARES, false); |
|
| 60 | + } |
|
| 61 | 61 | } catch (PDOException $e) { |
| 62 | 62 | echo "Couldnt connect to database!"; |
| 63 | 63 | echo $e->getTraceAsString(); |
@@ -103,15 +103,15 @@ discard block |
||
| 103 | 103 | $res = $stmt->execute(); |
| 104 | 104 | |
| 105 | 105 | if (!$res) { |
| 106 | - if (DEBUG_MODE) { |
|
| 107 | - echo "SQL Query: " + $sql; |
|
| 108 | - } |
|
| 106 | + if (DEBUG_MODE) { |
|
| 107 | + echo "SQL Query: " + $sql; |
|
| 108 | + } |
|
| 109 | 109 | |
| 110 | 110 | //TODO: throw exception instead |
| 111 | 111 | |
| 112 | 112 | print_r($stmt->errorInfo()); |
| 113 | 113 | |
| 114 | - ob_end_flush(); |
|
| 114 | + ob_end_flush(); |
|
| 115 | 115 | exit; |
| 116 | 116 | } |
| 117 | 117 | |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | exit; |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - print_r($e); |
|
| 126 | + print_r($e); |
|
| 127 | 127 | |
| 128 | 128 | echo "<br /><br /><b>Query</b>: " . $sql . ", parameters: "; |
| 129 | 129 | var_dump($params); |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | exit; |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - print_r($e); |
|
| 145 | + print_r($e); |
|
| 146 | 146 | |
| 147 | 147 | echo "<br /><br /><b>Query</b>: " . $sql . ", parameters: "; |
| 148 | 148 | var_dump($params); |
@@ -206,8 +206,8 @@ discard block |
||
| 206 | 206 | |
| 207 | 207 | $sql = str_replace("{DBPRAEFIX}", $this->praefix, $sql); |
| 208 | 208 | $sql = str_replace("{praefix}", $this->praefix, $sql); |
| 209 | - $sql = str_replace("{prefix}", $this->praefix, $sql); |
|
| 210 | - $sql = str_replace("{PREFIX}", $this->praefix, $sql); |
|
| 209 | + $sql = str_replace("{prefix}", $this->praefix, $sql); |
|
| 210 | + $sql = str_replace("{PREFIX}", $this->praefix, $sql); |
|
| 211 | 211 | return str_replace("{PRAEFIX}", $this->praefix, $sql); |
| 212 | 212 | } |
| 213 | 213 | |
@@ -255,10 +255,10 @@ discard block |
||
| 255 | 255 | $res = $stmt->execute(); |
| 256 | 256 | |
| 257 | 257 | if (!$res) { |
| 258 | - if (DEBUG_MODE) { |
|
| 259 | - echo "SQL Query: " . $sql . "<br />"; |
|
| 260 | - var_dump($params); |
|
| 261 | - } |
|
| 258 | + if (DEBUG_MODE) { |
|
| 259 | + echo "SQL Query: " . $sql . "<br />"; |
|
| 260 | + var_dump($params); |
|
| 261 | + } |
|
| 262 | 262 | |
| 263 | 263 | throw new PDOException("PDOException while getRow(): " . ($this->getErrorInfo())[3] . "\n" . ($stmt->errorInfo())[2] . ""); |
| 264 | 264 | } |
@@ -296,9 +296,9 @@ discard block |
||
| 296 | 296 | $rows = $stmt->fetchAll(PDO::FETCH_ASSOC); |
| 297 | 297 | |
| 298 | 298 | if ($rows === FALSE) { |
| 299 | - //failure, http://php.net/manual/de/pdostatement.fetchall.php |
|
| 300 | - throw new PDOException("Failure while listRows(): " . print_r($this->getErrorInfo(), true)); |
|
| 301 | - } |
|
| 299 | + //failure, http://php.net/manual/de/pdostatement.fetchall.php |
|
| 300 | + throw new PDOException("Failure while listRows(): " . print_r($this->getErrorInfo(), true)); |
|
| 301 | + } |
|
| 302 | 302 | |
| 303 | 303 | return $rows; |
| 304 | 304 | } |
@@ -344,9 +344,9 @@ discard block |
||
| 344 | 344 | } |
| 345 | 345 | } |
| 346 | 346 | |
| 347 | - public function lastInsertId(): int { |
|
| 348 | - return $this->conn->lastInsertId(); |
|
| 349 | - } |
|
| 347 | + public function lastInsertId(): int { |
|
| 348 | + return $this->conn->lastInsertId(); |
|
| 349 | + } |
|
| 350 | 350 | |
| 351 | 351 | public function listQueryHistory() : array { |
| 352 | 352 | return self::$query_history; |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | $this->memcache = new Memcache(); |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - public function connect ($host, $port) { |
|
| 38 | + public function connect($host, $port) { |
|
| 39 | 39 | $this->memcache->connect($host, $port); |
| 40 | 40 | } |
| 41 | 41 | |
@@ -88,11 +88,11 @@ discard block |
||
| 88 | 88 | } |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - protected function getKey ($area, $key) { |
|
| 91 | + protected function getKey($area, $key) { |
|
| 92 | 92 | return md5($area) . md5($key); |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - private function listAllKeys ($limit = 10000) { |
|
| 95 | + private function listAllKeys($limit = 10000) { |
|
| 96 | 96 | //list with keys |
| 97 | 97 | $keys = array(); |
| 98 | 98 | |
@@ -30,13 +30,13 @@ discard block |
||
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | public function get($area, $key) { |
| 33 | - if ($this->contains($area, $key)) { |
|
| 34 | - $file_path = $this->getFilePath($area, $key); |
|
| 35 | - //echo "area: " . $area . ", key: " . $key . ", File path: " . $file_path . "<br />\n"; |
|
| 33 | + if ($this->contains($area, $key)) { |
|
| 34 | + $file_path = $this->getFilePath($area, $key); |
|
| 35 | + //echo "area: " . $area . ", key: " . $key . ", File path: " . $file_path . "<br />\n"; |
|
| 36 | 36 | |
| 37 | - $content = file_get_contents($file_path); |
|
| 37 | + $content = file_get_contents($file_path); |
|
| 38 | 38 | |
| 39 | - //echo $content; |
|
| 39 | + //echo $content; |
|
| 40 | 40 | |
| 41 | 41 | return unserialize($content); |
| 42 | 42 | } else { |
@@ -45,12 +45,12 @@ discard block |
||
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | public function contains ($area, $key) : bool { |
| 48 | - return CACHING && file_exists($this->getFilePath($area, $key)); |
|
| 48 | + return CACHING && file_exists($this->getFilePath($area, $key)); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | protected function getFilePath (string $area, string $key) : string { |
| 52 | - return CACHE_PATH . md5($area) . "/" . md5($key) . ".php"; |
|
| 53 | - } |
|
| 52 | + return CACHE_PATH . md5($area) . "/" . md5($key) . ".php"; |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | 55 | private function check_directory ($name) { |
| 56 | 56 | if (!file_exists(CACHE_PATH . $name . "/")) { |
@@ -74,23 +74,23 @@ discard block |
||
| 74 | 74 | if (empty($area)) { |
| 75 | 75 | $this->rrmdir(CACHE_PATH, CACHE_PATH); |
| 76 | 76 | } else { |
| 77 | - //area is not null |
|
| 78 | - |
|
| 79 | - $area_path = CACHE_PATH . md5($area) . "/"; |
|
| 80 | - |
|
| 81 | - if (!empty($key)) { |
|
| 82 | - $file_path = CACHE_PATH . md5($area) . "/" + md5($key) + ".php"; |
|
| 83 | - |
|
| 84 | - //check, if file exists |
|
| 85 | - if (file_exists($file_path)) { |
|
| 86 | - //remove file |
|
| 87 | - unlink($file_path); |
|
| 88 | - } |
|
| 89 | - } else { |
|
| 90 | - //clear full area |
|
| 91 | - $this->rrmdir($area_path, CACHE_PATH); |
|
| 92 | - } |
|
| 93 | - } |
|
| 77 | + //area is not null |
|
| 78 | + |
|
| 79 | + $area_path = CACHE_PATH . md5($area) . "/"; |
|
| 80 | + |
|
| 81 | + if (!empty($key)) { |
|
| 82 | + $file_path = CACHE_PATH . md5($area) . "/" + md5($key) + ".php"; |
|
| 83 | + |
|
| 84 | + //check, if file exists |
|
| 85 | + if (file_exists($file_path)) { |
|
| 86 | + //remove file |
|
| 87 | + unlink($file_path); |
|
| 88 | + } |
|
| 89 | + } else { |
|
| 90 | + //clear full area |
|
| 91 | + $this->rrmdir($area_path, CACHE_PATH); |
|
| 92 | + } |
|
| 93 | + } |
|
| 94 | 94 | // TODO: Implement clear() method. |
| 95 | 95 | } |
| 96 | 96 | |
@@ -44,15 +44,15 @@ discard block |
||
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - public function contains ($area, $key) : bool { |
|
| 47 | + public function contains($area, $key) : bool { |
|
| 48 | 48 | return CACHING && file_exists($this->getFilePath($area, $key)); |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - protected function getFilePath (string $area, string $key) : string { |
|
| 51 | + protected function getFilePath(string $area, string $key) : string { |
|
| 52 | 52 | return CACHE_PATH . md5($area) . "/" . md5($key) . ".php"; |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - private function check_directory ($name) { |
|
| 55 | + private function check_directory($name) { |
|
| 56 | 56 | if (!file_exists(CACHE_PATH . $name . "/")) { |
| 57 | 57 | mkdir(CACHE_PATH . $name . "/"); |
| 58 | 58 | } |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | $area_path = CACHE_PATH . md5($area) . "/"; |
| 80 | 80 | |
| 81 | 81 | if (!empty($key)) { |
| 82 | - $file_path = CACHE_PATH . md5($area) . "/" + md5($key) + ".php"; |
|
| 82 | + $file_path = CACHE_PATH . md5($area) . "/" +md5($key) + ".php"; |
|
| 83 | 83 | |
| 84 | 84 | //check, if file exists |
| 85 | 85 | if (file_exists($file_path)) { |
@@ -94,15 +94,15 @@ discard block |
||
| 94 | 94 | // TODO: Implement clear() method. |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - protected function rrmdir ($dir, $cache_dir) { |
|
| 97 | + protected function rrmdir($dir, $cache_dir) { |
|
| 98 | 98 | if (is_dir($dir)) { |
| 99 | 99 | $objects = scandir($dir); |
| 100 | 100 | foreach ($objects as $object) { |
| 101 | 101 | if ($object != "." && $object != "..") { |
| 102 | - if (is_dir($dir."/".$object)) |
|
| 103 | - $this->rrmdir($dir."/".$object, $cache_dir); |
|
| 102 | + if (is_dir($dir . "/" . $object)) |
|
| 103 | + $this->rrmdir($dir . "/" . $object, $cache_dir); |
|
| 104 | 104 | else |
| 105 | - unlink($dir."/".$object); |
|
| 105 | + unlink($dir . "/" . $object); |
|
| 106 | 106 | } |
| 107 | 107 | } |
| 108 | 108 | |
@@ -99,10 +99,11 @@ |
||
| 99 | 99 | $objects = scandir($dir); |
| 100 | 100 | foreach ($objects as $object) { |
| 101 | 101 | if ($object != "." && $object != "..") { |
| 102 | - if (is_dir($dir."/".$object)) |
|
| 103 | - $this->rrmdir($dir."/".$object, $cache_dir); |
|
| 104 | - else |
|
| 105 | - unlink($dir."/".$object); |
|
| 102 | + if (is_dir($dir."/".$object)) { |
|
| 103 | + $this->rrmdir($dir."/".$object, $cache_dir); |
|
| 104 | + } else { |
|
| 105 | + unlink($dir."/".$object); |
|
| 106 | + } |
|
| 106 | 107 | } |
| 107 | 108 | } |
| 108 | 109 | |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | |
| 18 | 18 | class PostGreSQLDriver extends MySQLDriver { |
| 19 | 19 | |
| 20 | - public function connect ($config_path) { |
|
| 20 | + public function connect($config_path) { |
|
| 21 | 21 | if (file_exists($config_path)) { |
| 22 | 22 | require($config_path); |
| 23 | 23 | } else if (file_exists(CONFIG_PATH . $config_path)) { |
@@ -163,7 +163,7 @@ |
||
| 163 | 163 | } |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | - protected function getKey ($area, $key) { |
|
| 166 | + protected function getKey($area, $key) { |
|
| 167 | 167 | return md5($area) . md5($key); |
| 168 | 168 | } |
| 169 | 169 | |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | |
| 19 | 19 | class Packages { |
| 20 | 20 | |
| 21 | - public static function listPackages (bool $installed_required = true) : array { |
|
| 21 | + public static function listPackages(bool $installed_required = true) : array { |
|
| 22 | 22 | |
| 23 | 23 | if (!file_exists(ROOT_PATH . "store/package_list.php")) { |
| 24 | 24 | return array(); |
@@ -115,8 +115,8 @@ discard block |
||
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | if (!(self::$second_level_cache instanceof ICache)) { |
| 118 | - throw new Exception("second level cache is not instance of ICache."); |
|
| 119 | - } |
|
| 118 | + throw new Exception("second level cache is not instance of ICache."); |
|
| 119 | + } |
|
| 120 | 120 | |
| 121 | 121 | return self::$second_level_cache; |
| 122 | 122 | } |
@@ -148,27 +148,27 @@ discard block |
||
| 148 | 148 | unset(self::$cache_instances[$name]); |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | - /** |
|
| 152 | - * put session |
|
| 153 | - * |
|
| 154 | - * @param $area cache area |
|
| 155 | - * @param $key cache key |
|
| 156 | - * @param $value cache entry value, can also be an object |
|
| 157 | - * @param $ttl time to live of cache entry in seconds (optional) |
|
| 158 | - */ |
|
| 159 | - public static function put(string $area, string $key, $value, $ttl = 180 * 60) { |
|
| 160 | - self::getCache()->put($area, $key, $value, $ttl); |
|
| 161 | - } |
|
| 162 | - |
|
| 163 | - public static function get(string $area, string $key) { |
|
| 164 | - return self::getCache()->get($area, $key); |
|
| 165 | - } |
|
| 166 | - |
|
| 167 | - public static function contains(string $area, string $key) : bool { |
|
| 168 | - return self::getCache()->contains($area, $key); |
|
| 169 | - } |
|
| 170 | - |
|
| 171 | - public static function clear(string $area = "", string $key = "") { |
|
| 172 | - self::getCache()->clear($area, $key); |
|
| 173 | - } |
|
| 151 | + /** |
|
| 152 | + * put session |
|
| 153 | + * |
|
| 154 | + * @param $area cache area |
|
| 155 | + * @param $key cache key |
|
| 156 | + * @param $value cache entry value, can also be an object |
|
| 157 | + * @param $ttl time to live of cache entry in seconds (optional) |
|
| 158 | + */ |
|
| 159 | + public static function put(string $area, string $key, $value, $ttl = 180 * 60) { |
|
| 160 | + self::getCache()->put($area, $key, $value, $ttl); |
|
| 161 | + } |
|
| 162 | + |
|
| 163 | + public static function get(string $area, string $key) { |
|
| 164 | + return self::getCache()->get($area, $key); |
|
| 165 | + } |
|
| 166 | + |
|
| 167 | + public static function contains(string $area, string $key) : bool { |
|
| 168 | + return self::getCache()->contains($area, $key); |
|
| 169 | + } |
|
| 170 | + |
|
| 171 | + public static function clear(string $area = "", string $key = "") { |
|
| 172 | + self::getCache()->clear($area, $key); |
|
| 173 | + } |
|
| 174 | 174 | } |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | */ |
| 33 | 33 | protected static $cache_instances = array(); |
| 34 | 34 | |
| 35 | - public static function init () { |
|
| 35 | + public static function init() { |
|
| 36 | 36 | require(CONFIG_PATH . "cache.php"); |
| 37 | 37 | |
| 38 | 38 | if (!isset($config['first_lvl_cache']) || !isset($config['first_lvl_cache']['class_name'])) { |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | //TODO: load other caches |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | - public static function &getCache ($name = "") : ICache { |
|
| 99 | + public static function &getCache($name = "") : ICache { |
|
| 100 | 100 | if (empty($name)) { |
| 101 | 101 | return self::$instance; |
| 102 | 102 | } else { |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | } |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | - public static function &get2ndLvlCache () : ICache { |
|
| 112 | + public static function &get2ndLvlCache() : ICache { |
|
| 113 | 113 | if (self::$second_level_cache == null) { |
| 114 | 114 | throw new Exception("second level cache is null."); |
| 115 | 115 | } |
@@ -121,11 +121,11 @@ discard block |
||
| 121 | 121 | return self::$second_level_cache; |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | - public static function containsCache ($name) { |
|
| 124 | + public static function containsCache($name) { |
|
| 125 | 125 | return isset(self::$cache_instances[$name]); |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | - public static function putCache ($name, &$cache_instance) { |
|
| 128 | + public static function putCache($name, &$cache_instance) { |
|
| 129 | 129 | if ($name == null || $name == "") { |
| 130 | 130 | throw new NullPointerException("cache name cannot be null."); |
| 131 | 131 | } |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | } |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | - public static function removeCache ($name) { |
|
| 147 | + public static function removeCache($name) { |
|
| 148 | 148 | unset(self::$cache_instances[$name]); |
| 149 | 149 | } |
| 150 | 150 | |
@@ -18,61 +18,61 @@ |
||
| 18 | 18 | |
| 19 | 19 | class AutoLoaderCache { |
| 20 | 20 | |
| 21 | - public static function init () { |
|
| 22 | - //check, if directory autoloader in cache exists |
|
| 23 | - if (!file_exists(CACHE_PATH . "autoloader")) { |
|
| 24 | - mkdir(CACHE_PATH . "autoloader"); |
|
| 25 | - } |
|
| 26 | - //check, if autoloader configuration exists |
|
| 27 | - if (!file_exists(STORE_PATH . "autoloader/autoloader.php")) { |
|
| 28 | - //TODO: generate file automatically (self repair) |
|
| 21 | + public static function init () { |
|
| 22 | + //check, if directory autoloader in cache exists |
|
| 23 | + if (!file_exists(CACHE_PATH . "autoloader")) { |
|
| 24 | + mkdir(CACHE_PATH . "autoloader"); |
|
| 25 | + } |
|
| 26 | + //check, if autoloader configuration exists |
|
| 27 | + if (!file_exists(STORE_PATH . "autoloader/autoloader.php")) { |
|
| 28 | + //TODO: generate file automatically (self repair) |
|
| 29 | 29 | |
| 30 | - throw new ConfigurationException("autoloader configuration not found in store."); |
|
| 31 | - } |
|
| 32 | - if (!file_exists(CACHE_PATH . "autoloader/preloaded_classes.php")) { |
|
| 33 | - //create cache |
|
| 34 | - self::createCache(); |
|
| 35 | - } |
|
| 36 | - } |
|
| 37 | - public static function load () { |
|
| 38 | - if (!file_exists(STORE_PATH . "autoloader/autoloader.php")) { |
|
| 39 | - throw new ConfigurationException("autoloader configuration not found in store."); |
|
| 40 | - } |
|
| 41 | - if (!file_exists(CACHE_PATH . "autoloader/preloaded_classes.php")) { |
|
| 42 | - //cache file doesnt exists |
|
| 43 | - self::createCache(); |
|
| 44 | - } |
|
| 45 | - //load classes from cache to save I/O |
|
| 46 | - require(CACHE_PATH . "autoloader/preloaded_classes.php"); |
|
| 47 | - } |
|
| 48 | - private static function createCache () { |
|
| 49 | - require(STORE_PATH . "autoloader/autoloader.php"); |
|
| 50 | - //create new cache file |
|
| 51 | - $data = ""; |
|
| 30 | + throw new ConfigurationException("autoloader configuration not found in store."); |
|
| 31 | + } |
|
| 32 | + if (!file_exists(CACHE_PATH . "autoloader/preloaded_classes.php")) { |
|
| 33 | + //create cache |
|
| 34 | + self::createCache(); |
|
| 35 | + } |
|
| 36 | + } |
|
| 37 | + public static function load () { |
|
| 38 | + if (!file_exists(STORE_PATH . "autoloader/autoloader.php")) { |
|
| 39 | + throw new ConfigurationException("autoloader configuration not found in store."); |
|
| 40 | + } |
|
| 41 | + if (!file_exists(CACHE_PATH . "autoloader/preloaded_classes.php")) { |
|
| 42 | + //cache file doesnt exists |
|
| 43 | + self::createCache(); |
|
| 44 | + } |
|
| 45 | + //load classes from cache to save I/O |
|
| 46 | + require(CACHE_PATH . "autoloader/preloaded_classes.php"); |
|
| 47 | + } |
|
| 48 | + private static function createCache () { |
|
| 49 | + require(STORE_PATH . "autoloader/autoloader.php"); |
|
| 50 | + //create new cache file |
|
| 51 | + $data = ""; |
|
| 52 | 52 | |
| 53 | - foreach ($autoloader_classes as $class_path) { |
|
| 54 | - if (file_exists($class_path)) { |
|
| 55 | - //get php code directly |
|
| 56 | - $data .= file_get_contents($class_path); |
|
| 57 | - } else if (file_exists(ROOT_PATH . $class_path)) { |
|
| 58 | - //use ROOT_PATH prefix |
|
| 59 | - $data .= file_get_contents(ROOT_PATH . $class_path); |
|
| 60 | - } else { |
|
| 61 | - echo "<!-- class " . $class_path . " couldnt be cached, file path doesnt exists. -->"; |
|
| 62 | - } |
|
| 63 | - } |
|
| 53 | + foreach ($autoloader_classes as $class_path) { |
|
| 54 | + if (file_exists($class_path)) { |
|
| 55 | + //get php code directly |
|
| 56 | + $data .= file_get_contents($class_path); |
|
| 57 | + } else if (file_exists(ROOT_PATH . $class_path)) { |
|
| 58 | + //use ROOT_PATH prefix |
|
| 59 | + $data .= file_get_contents(ROOT_PATH . $class_path); |
|
| 60 | + } else { |
|
| 61 | + echo "<!-- class " . $class_path . " couldnt be cached, file path doesnt exists. -->"; |
|
| 62 | + } |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - //remove unneccessary php tags |
|
| 66 | - $data = str_replace("<?php", "", $data); |
|
| 67 | - $data = str_replace("?>", "", $data); |
|
| 68 | - $text = "<" . "?" . "php " . $data . " ?" . ">"; |
|
| 65 | + //remove unneccessary php tags |
|
| 66 | + $data = str_replace("<?php", "", $data); |
|
| 67 | + $data = str_replace("?>", "", $data); |
|
| 68 | + $text = "<" . "?" . "php " . $data . " ?" . ">"; |
|
| 69 | 69 | |
| 70 | - //write data to file in uncrommpressed way |
|
| 71 | - file_put_contents(CACHE_PATH . "autoloader/preloaded_classes_uncompressed.php", $text); |
|
| 70 | + //write data to file in uncrommpressed way |
|
| 71 | + file_put_contents(CACHE_PATH . "autoloader/preloaded_classes_uncompressed.php", $text); |
|
| 72 | 72 | |
| 73 | - //compress code, remove comments and unneccessary whitespaces with php_strip_whitespace() |
|
| 74 | - file_put_contents(CACHE_PATH . "autoloader/preloaded_classes.php", php_strip_whitespace(CACHE_PATH . "autoloader/preloaded_classes_uncompressed.php")); |
|
| 75 | - } |
|
| 73 | + //compress code, remove comments and unneccessary whitespaces with php_strip_whitespace() |
|
| 74 | + file_put_contents(CACHE_PATH . "autoloader/preloaded_classes.php", php_strip_whitespace(CACHE_PATH . "autoloader/preloaded_classes_uncompressed.php")); |
|
| 75 | + } |
|
| 76 | 76 | |
| 77 | 77 | } |
| 78 | 78 | |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | class AutoLoaderCache { |
| 20 | 20 | |
| 21 | - public static function init () { |
|
| 21 | + public static function init() { |
|
| 22 | 22 | //check, if directory autoloader in cache exists |
| 23 | 23 | if (!file_exists(CACHE_PATH . "autoloader")) { |
| 24 | 24 | mkdir(CACHE_PATH . "autoloader"); |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | self::createCache(); |
| 35 | 35 | } |
| 36 | 36 | } |
| 37 | - public static function load () { |
|
| 37 | + public static function load() { |
|
| 38 | 38 | if (!file_exists(STORE_PATH . "autoloader/autoloader.php")) { |
| 39 | 39 | throw new ConfigurationException("autoloader configuration not found in store."); |
| 40 | 40 | } |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | //load classes from cache to save I/O |
| 46 | 46 | require(CACHE_PATH . "autoloader/preloaded_classes.php"); |
| 47 | 47 | } |
| 48 | - private static function createCache () { |
|
| 48 | + private static function createCache() { |
|
| 49 | 49 | require(STORE_PATH . "autoloader/autoloader.php"); |
| 50 | 50 | //create new cache file |
| 51 | 51 | $data = ""; |
@@ -34,20 +34,20 @@ discard block |
||
| 34 | 34 | @ini_set("expose_php", "off"); |
| 35 | 35 | |
| 36 | 36 | //dont allow include($url) to avoid code injection |
| 37 | - @ini_set("allow_url_include", "0"); |
|
| 37 | + @ini_set("allow_url_include", "0"); |
|
| 38 | 38 | |
| 39 | - header("X-Content-Type-Options: nosniff"); |
|
| 39 | + header("X-Content-Type-Options: nosniff"); |
|
| 40 | 40 | |
| 41 | - //enable internet explorer XSS protection, https://www.perpetual-beta.org/weblog/security-headers.html |
|
| 42 | - header("X-XSS-Protection: 1; mode=block"); |
|
| 41 | + //enable internet explorer XSS protection, https://www.perpetual-beta.org/weblog/security-headers.html |
|
| 42 | + header("X-XSS-Protection: 1; mode=block"); |
|
| 43 | 43 | |
| 44 | - //https://developer.mozilla.org/de/docs/Web/HTTP/Headers/X-Frame-Options |
|
| 45 | - $x_frame_options = Settings::get("x_frame_options", "SAMEORIGIN"); |
|
| 44 | + //https://developer.mozilla.org/de/docs/Web/HTTP/Headers/X-Frame-Options |
|
| 45 | + $x_frame_options = Settings::get("x_frame_options", "SAMEORIGIN"); |
|
| 46 | 46 | |
| 47 | - if (strcmp($x_frame_options, "none") !== 0) { |
|
| 48 | - //set X-Frame-Options header to avoid clickjacking attacks |
|
| 49 | - header("X-Frame-Options: " . $x_frame_options); |
|
| 50 | - } |
|
| 47 | + if (strcmp($x_frame_options, "none") !== 0) { |
|
| 48 | + //set X-Frame-Options header to avoid clickjacking attacks |
|
| 49 | + header("X-Frame-Options: " . $x_frame_options); |
|
| 50 | + } |
|
| 51 | 51 | |
| 52 | 52 | /** |
| 53 | 53 | * dont allow some XSS attacks or SQL Injections from host or server name |
@@ -96,13 +96,13 @@ discard block |
||
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | public static function checkCSRFToken ($value = null) { |
| 99 | - if (is_null($value)) { |
|
| 100 | - if (!isset($_REQUEST['csrf_token']) || empty($_REQUEST['csrf_token'])) { |
|
| 101 | - return false; |
|
| 102 | - } |
|
| 99 | + if (is_null($value)) { |
|
| 100 | + if (!isset($_REQUEST['csrf_token']) || empty($_REQUEST['csrf_token'])) { |
|
| 101 | + return false; |
|
| 102 | + } |
|
| 103 | 103 | |
| 104 | - $value = $_REQUEST['csrf_token']; |
|
| 105 | - } |
|
| 104 | + $value = $_REQUEST['csrf_token']; |
|
| 105 | + } |
|
| 106 | 106 | |
| 107 | 107 | return self::$csrf_token === $value; |
| 108 | 108 | } |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | protected static $csrf_token = ""; |
| 6 | 6 | |
| 7 | - public static function checkPHPOptions () { |
|
| 7 | + public static function checkPHPOptions() { |
|
| 8 | 8 | if (get_magic_quotes_gpc()) { |
| 9 | 9 | throw new SecurityException("magic quotes is on."); |
| 10 | 10 | } |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | libxml_disable_entity_loader(true); |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | - public static function check () { |
|
| 24 | + public static function check() { |
|
| 25 | 25 | //check php options |
| 26 | 26 | self::checkPHPOptions(); |
| 27 | 27 | |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | self::initCSRFToken(); |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | - protected static function initCSRFToken () { |
|
| 71 | + protected static function initCSRFToken() { |
|
| 72 | 72 | if (!isset($_SESSION['csrf_token'])) { |
| 73 | 73 | /*self::$csrf_token = hash_hmac( |
| 74 | 74 | 'sha512', |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | );*/ |
| 78 | 78 | |
| 79 | 79 | //generate new random token with 32 bytes |
| 80 | - self::$csrf_token = base64_encode( openssl_random_pseudo_bytes(32)); |
|
| 80 | + self::$csrf_token = base64_encode(openssl_random_pseudo_bytes(32)); |
|
| 81 | 81 | |
| 82 | 82 | $_SESSION['csrf_token'] = self::$csrf_token; |
| 83 | 83 | } else { |
@@ -86,16 +86,16 @@ discard block |
||
| 86 | 86 | } |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | - public static function getCSRFToken () { |
|
| 89 | + public static function getCSRFToken() { |
|
| 90 | 90 | //return CSRF token |
| 91 | 91 | return self::$csrf_token; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | - public static function getCSRFTokenField () { |
|
| 94 | + public static function getCSRFTokenField() { |
|
| 95 | 95 | return "<input type=\"hidden\" name=<\"csrf_token\" value=\"" . self::$csrf_token . "\" />"; |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - public static function checkCSRFToken ($value = null) { |
|
| 98 | + public static function checkCSRFToken($value = null) { |
|
| 99 | 99 | if (is_null($value)) { |
| 100 | 100 | if (!isset($_REQUEST['csrf_token']) || empty($_REQUEST['csrf_token'])) { |
| 101 | 101 | return false; |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | return self::$csrf_token === $value; |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - public static function containsPort ($address) { |
|
| 110 | + public static function containsPort($address) { |
|
| 111 | 111 | if (strpos($address, ":") === false) { |
| 112 | 112 | return false; |
| 113 | 113 | } |