Skip to content

Commit d221737

Browse files
khoaofgodkhoaofgod
committed
Merge pull request #183 from Geolim4/issue-182
Issue 182
2 parents 26f5527 + e5f9feb commit d221737

6 files changed

Lines changed: 80 additions & 70 deletions

File tree

‎phpfastcache/3.0.0/abstract.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,14 @@ public function isExisting($keyword)
157157
* todo: search
158158
* @param $query
159159
* @return mixed
160-
* @throws \Exception
160+
* @throws \phpfastcacheCoreException
161161
*/
162162
public function search($query)
163163
{
164164
if (method_exists($this, "driver_search")) {
165165
return $this->driver_search($query);
166166
}
167-
throw new Exception('Search method is not supported by this driver.');
167+
throw new phpfastcacheCoreException('Search method is not supported by this driver.');
168168
}
169169

170170
/**
@@ -376,15 +376,15 @@ public function __get($name)
376376
* @param $name
377377
* @param $v
378378
* @return bool|null
379-
* @throws \Exception
379+
* @throws \phpfastcacheCoreException
380380
*/
381381
public function __set($name, $v)
382382
{
383383
if (isset($v[ 1 ]) && is_numeric($v[ 1 ])) {
384384
return $this->set($name, $v[ 0 ], $v[ 1 ],
385385
isset($v[ 2 ]) ? $v[ 2 ] : array());
386386
} else {
387-
throw new Exception("Example ->$name = array('VALUE', 300);", 98);
387+
throw new phpfastcacheCoreException("Example ->$name = array('VALUE', 300);", 98);
388388
}
389389
}
390390

@@ -424,7 +424,7 @@ protected function required_extension($name)
424424
/**
425425
* @param $file
426426
* @return string
427-
* @throws \Exception
427+
* @throws \phpfastcacheCoreException
428428
*/
429429
protected function readfile($file)
430430
{
@@ -435,7 +435,7 @@ protected function readfile($file)
435435

436436
$file_handle = @fopen($file, "r");
437437
if (!$file_handle) {
438-
throw new Exception("Can't Read File", 96);
438+
throw new phpfastcacheCoreException("Can't Read File", 96);
439439

440440
}
441441
while (!feof($file_handle)) {
@@ -488,7 +488,7 @@ protected function decode($value)
488488
/**
489489
* Auto Create .htaccess to protect cache folder
490490
* @param string $path
491-
* @throws \Exception
491+
* @throws \phpfastcacheCoreException
492492
*/
493493
protected function htaccessGen($path = "")
494494
{
@@ -502,7 +502,7 @@ protected function htaccessGen($path = "")
502502

503503
$f = @fopen($path . "/.htaccess", "w+");
504504
if (!$f) {
505-
throw new Exception("Can't create .htaccess", 97);
505+
throw new phpfastcacheCoreException("Can't create .htaccess", 97);
506506
}
507507
fwrite($f, $html);
508508
fclose($f);
@@ -526,7 +526,7 @@ protected function isPHPModule()
526526
/**
527527
* return System Information
528528
* @return mixed
529-
* @throws \Exception
529+
* @throws \phpfastcacheCoreException
530530
*/
531531
public function systemInfo()
532532
{
@@ -536,7 +536,7 @@ public function systemInfo()
536536
$this->option[ 'system' ][ 'drivers' ] = array();
537537
$dir = @opendir(dirname(__FILE__) . "/drivers/");
538538
if (!$dir) {
539-
throw new Exception("Can't open file dir ext", 100);
539+
throw new phpfastcacheCoreException("Can't open file dir ext", 100);
540540
}
541541

542542
while ($file = @readdir($dir)) {

‎phpfastcache/3.0.0/drivers/files.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function __construct($config = array())
1818
$this->getPath(); // force create path
1919

2020
if (!$this->checkdriver() && !isset($config[ 'skipError' ])) {
21-
throw new Exception("Can't use this driver for your website!");
21+
throw new phpfastcacheDriverException("Can't use this driver for your website!");
2222
}
2323

2424
}
@@ -78,7 +78,7 @@ private function getFilePath($keyword, $skip = false)
7878
if($skip == false) {
7979
if(!file_exists($path)) {
8080
if(!mkdir($path,$this->__setChmodAuto())) {
81-
throw new Exception("PLEASE CHMOD ".$this->getPath()." - 0777 OR ANY WRITABLE PERMISSION!",92);
81+
throw new phpfastcacheDriverException("PLEASE CHMOD ".$this->getPath()." - 0777 OR ANY WRITABLE PERMISSION!",92);
8282
}
8383
}
8484
}
@@ -192,7 +192,7 @@ public function driver_stats($option = array())
192192
$path = $this->getPath();
193193
$dir = @opendir($path);
194194
if (!$dir) {
195-
throw new Exception("Can't read PATH:" . $path, 94);
195+
throw new phpfastcacheDriverException("Can't read PATH:" . $path, 94);
196196
}
197197

198198
$total = 0;
@@ -202,7 +202,7 @@ public function driver_stats($option = array())
202202
// read sub dir
203203
$subdir = opendir($path."/".$file);
204204
if(!$subdir) {
205-
throw new Exception("Can't read path:".$path."/".$file,93);
205+
throw new phpfastcacheDriverException("Can't read path:".$path."/".$file,93);
206206
}
207207

208208
while($f = readdir($subdir)) {
@@ -264,15 +264,15 @@ public function driver_clean($option = array())
264264
$path = $this->getPath();
265265
$dir = @opendir($path);
266266
if (!$dir) {
267-
throw new Exception("Can't read PATH:" . $path, 94);
267+
throw new phpfastcacheDriverException("Can't read PATH:" . $path, 94);
268268
}
269269

270270
while($file=readdir($dir)) {
271271
if($file!="." && $file!=".." && is_dir($path."/".$file)) {
272272
// read sub dir
273273
$subdir = @opendir($path . "/" . $file);
274274
if (!$subdir) {
275-
throw new Exception("Can't read path:" . $path . "/" . $file,
275+
throw new phpfastcacheDriverException("Can't read path:" . $path . "/" . $file,
276276
93);
277277
}
278278

‎phpfastcache/3.0.0/drivers/sqlite.php‎

Lines changed: 33 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ public function initIndexing(PDO $db)
8686

8787
// delete everything before reset indexing
8888
$dir = opendir($this->path);
89-
while($file = readdir($dir)) {
90-
if($file != "." && $file!=".." && $file != "indexing" && $file!="dbfastcache") {
91-
unlink($this->path."/".$file);
89+
while ($file = readdir($dir)) {
90+
if ($file != "." && $file != ".." && $file != "indexing" && $file != "dbfastcache") {
91+
unlink($this->path . "/" . $file);
9292
}
9393
}
9494

@@ -109,7 +109,7 @@ public function indexing($keyword)
109109
{
110110
if ($this->indexing == null) {
111111
$createTable = false;
112-
if(!file_exists($this->path."/indexing")) {
112+
if (!file_exists($this->path . "/indexing")) {
113113
$createTable = true;
114114
}
115115

@@ -136,8 +136,8 @@ public function indexing($keyword)
136136

137137
// check file size
138138

139-
$size = file_exists($this->path."/db".$db) ? filesize($this->path."/db".$db) : 1;
140-
$size = round($size / 1024 / 1024,1);
139+
$size = file_exists($this->path . "/db" . $db) ? filesize($this->path . "/db" . $db) : 1;
140+
$size = round($size / 1024 / 1024, 1);
141141

142142

143143
if ($size > $this->max_size) {
@@ -177,18 +177,18 @@ public function indexing($keyword)
177177
*/
178178
public function db($keyword, $reset = false)
179179
{
180-
/*
180+
/**
181181
* Default is fastcache
182182
*/
183183
$instant = $this->indexing($keyword);
184184

185-
/*
185+
/**
186186
* init instant
187187
*/
188188
if (!isset($this->instant[ $instant ])) {
189189
// check DB Files ready or not
190190
$createTable = false;
191-
if(!file_exists($this->path."/db".$instant) || $reset == true) {
191+
if (!file_exists($this->path . "/db" . $instant) || $reset == true) {
192192
$createTable = true;
193193
}
194194
$PDO = new PDO("sqlite:" . $this->path . "/db" . $instant);
@@ -233,7 +233,7 @@ public function driver_set(
233233
$time = 300,
234234
$option = array()
235235
) {
236-
$skipExisting = isset($option['skipExisting']) ? $option['skipExisting'] : false;
236+
$skipExisting = isset($option[ 'skipExisting' ]) ? $option[ 'skipExisting' ] : false;
237237
$toWrite = true;
238238

239239
// check in cache first
@@ -271,14 +271,9 @@ public function driver_set(
271271
} catch (PDOException $e) {
272272
return false;
273273
}
274-
275274
}
276-
277-
278275
}
279-
280276
return false;
281-
282277
}
283278

284279
/**
@@ -393,30 +388,29 @@ public function driver_stats($option = array())
393388
$optimized = 0;
394389

395390
$dir = opendir($this->path);
396-
while($file = readdir($dir)) {
397-
if($file!="." && $file!="..") {
398-
$file_path = $this->path."/".$file;
391+
while ($file = readdir($dir)) {
392+
if ($file != "." && $file != "..") {
393+
$file_path = $this->path . "/" . $file;
399394
$size = filesize($file_path);
400395
$total = $total + $size;
401396

402-
try {
403-
$PDO = new PDO("sqlite:".$file_path);
404-
$PDO->setAttribute(PDO::ATTR_ERRMODE,
405-
PDO::ERRMODE_EXCEPTION);
406-
407-
$stm = $PDO->prepare("DELETE FROM `caching` WHERE `exp` <= :U");
408-
$stm->execute(array(
409-
":U" => date("U"),
410-
));
397+
try {
398+
$PDO = new PDO("sqlite:" . $file_path);
399+
$PDO->setAttribute(PDO::ATTR_ERRMODE,
400+
PDO::ERRMODE_EXCEPTION);
411401

412-
$PDO->exec("VACUUM;");
413-
$size = filesize($file_path);
414-
$optimized = $optimized + $size;
415-
} catch (PDOException $e) {
416-
$size = 0;
417-
$optimized = 0;
418-
}
402+
$stm = $PDO->prepare("DELETE FROM `caching` WHERE `exp` <= :U");
403+
$stm->execute(array(
404+
":U" => date("U"),
405+
));
419406

407+
$PDO->exec("VACUUM;");
408+
$size = filesize($file_path);
409+
$optimized = $optimized + $size;
410+
} catch (PDOException $e) {
411+
$size = 0;
412+
$optimized = 0;
413+
}
420414

421415

422416
}
@@ -438,13 +432,13 @@ public function driver_clean($option = array())
438432

439433
// close connection
440434
$this->instant = array();
441-
$this->indexing = NULL;
442-
435+
$this->indexing = null;
436+
443437
// delete everything before reset indexing
444438
$dir = opendir($this->path);
445-
while($file = readdir($dir)) {
446-
if($file != "." && $file!="..") {
447-
unlink($this->path."/".$file);
439+
while ($file = readdir($dir)) {
440+
if ($file != "." && $file != "..") {
441+
unlink($this->path . "/" . $file);
448442
}
449443
}
450444
}

‎phpfastcache/3.0.0/exceptions/phpfastcacheCoreException.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
/**
4+
* phpfastcacheCoreException
5+
* @author Khoa Bui (khoaofgod) <khoaofgod@gmail.com> http://www.phpfastcache.com
6+
* @author Georges.L (Geolim4) <contact@geolim4.com>
7+
*/
8+
class phpfastcacheCoreException extends Exception
9+
{
10+
11+
}

‎phpfastcache/3.0.0/exceptions/phpfastcacheDriverException.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
/**
4+
* phpfastcacheDriverException
5+
* @author Khoa Bui (khoaofgod) <khoaofgod@gmail.com> http://www.phpfastcache.com
6+
* @author Georges.L (Geolim4) <contact@geolim4.com>
7+
*/
8+
class phpfastcacheDriverException extends Exception
9+
{
10+
11+
}

‎phpfastcache/3.0.0/phpfastcache.php‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
require_once(dirname(__FILE__) . "/abstract.php");
99
require_once(dirname(__FILE__) . "/driver.php");
10+
require_once(dirname(__FILE__) . "/exceptions/phpfastcacheCoreException.php");
11+
require_once(dirname(__FILE__) . "/exceptions/phpfastcacheDriverException.php");
1012

1113
/**
1214
* Short function
@@ -203,8 +205,7 @@ public static function getPath($skip_create_path = false, $config)
203205
$tmp_dir = ini_get('upload_tmp_dir') ? ini_get('upload_tmp_dir') : sys_get_temp_dir();
204206
$path = $tmp_dir;
205207
} else {
206-
$path = isset($_SERVER[ 'DOCUMENT_ROOT' ]) ? rtrim($_SERVER[ 'DOCUMENT_ROOT' ],
207-
"/") . "/../" : rtrim(dirname(__FILE__), "/") . "/";
208+
$path = isset($_SERVER[ 'DOCUMENT_ROOT' ]) ? rtrim($_SERVER[ 'DOCUMENT_ROOT' ], "/") . "/../" : rtrim(dirname(__FILE__), "/") . "/";
208209
}
209210

210211
if (self::$config[ 'path' ] != "") {
@@ -244,8 +245,7 @@ public static function getPath($skip_create_path = false, $config)
244245
@chmod($full_path, self::__setChmodAuto($config));
245246
}
246247
if (!@file_exists($full_path) || !@is_writable($full_path)) {
247-
throw new Exception("PLEASE CREATE OR CHMOD " . $full_path . " - 0777 OR ANY WRITABLE PERMISSION!",
248-
92);
248+
throw new phpfastcacheCoreException("PLEASE CREATE OR CHMOD " . $full_path . " - 0777 OR ANY WRITABLE PERMISSION!", 92);
249249
}
250250
}
251251

@@ -325,30 +325,24 @@ protected static function htaccessGen($path, $create = true)
325325
{
326326

327327
if ($create == true) {
328-
if (!is_writeable($path)) {
329-
try {
330-
chmod($path, 0777);
331-
} catch (Exception $e) {
332-
throw new Exception("PLEASE CHMOD " . $path . " - 0777 OR ANY WRITABLE PERMISSION!",
333-
92);
328+
if (!is_writable($path)) {
329+
if (!chmod($path, 0777)) {
330+
throw new phpfastcacheCoreException("PLEASE CHMOD " . $path . " - 0777 OR ANY WRITABLE PERMISSION!", 92);
334331
}
335332
}
336333

337-
if(!file_exists($path."/.htaccess")) {
334+
if (!file_exists($path . "/.htaccess")) {
338335
// echo "write me";
339336
$html = "order deny, allow \r\n
340337
deny from all \r\n
341338
allow from 127.0.0.1";
342339

343340
$f = @fopen($path . "/.htaccess", "w+");
344341
if (!$f) {
345-
throw new Exception("PLEASE CHMOD " . $path . " - 0777 OR ANY WRITABLE PERMISSION!",
346-
92);
342+
throw new phpfastcacheCoreException("PLEASE CHMOD " . $path . " - 0777 OR ANY WRITABLE PERMISSION!", 92);
347343
}
348344
fwrite($f, $html);
349345
fclose($f);
350-
351-
352346
}
353347
}
354348

0 commit comments

Comments
 (0)