Skip to content

Commit 3ef6a1f

Browse files
committed
Merge pull request #135 from dongnan/final
Replaced all @Date("U") to time()
2 parents beb1f94 + a690326 commit 3ef6a1f

File tree

4 files changed

+17
-12
lines changed

4 files changed

+17
-12
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,3 +226,8 @@ pip-log.txt
226226
.idea/scopes/scope_settings.xml
227227
.idea/vcs.xml
228228
.idea/workspace.xml
229+
230+
#################
231+
## NetBeans
232+
#################
233+
nbproject/

phpfastcache/3.0.0/abstract.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ public function set($keyword, $value = "", $time = 0, $option = array() ) {
3434
}
3535
$object = array(
3636
"value" => $value,
37-
"write_time" => @date("U"),
37+
"write_time" => time(),
3838
"expired_in" => $time,
39-
"expired_time" => @date("U") + (Int)$time,
39+
"expired_time" => time() + (Int)$time,
4040
);
4141

4242
return $this->driver_set($keyword,$object,$time,$option);
@@ -114,7 +114,7 @@ function increment($keyword, $step = 1 , $option = array()) {
114114
return false;
115115
} else {
116116
$value = (Int)$object['value'] + (Int)$step;
117-
$time = $object['expired_time'] - @date("U");
117+
$time = $object['expired_time'] - time();
118118
$this->set($keyword,$value, $time, $option);
119119
return true;
120120
}
@@ -126,7 +126,7 @@ function decrement($keyword, $step = 1 , $option = array()) {
126126
return false;
127127
} else {
128128
$value = (Int)$object['value'] - (Int)$step;
129-
$time = $object['expired_time'] - @date("U");
129+
$time = $object['expired_time'] - time();
130130
$this->set($keyword,$value, $time, $option);
131131
return true;
132132
}
@@ -140,7 +140,7 @@ function touch($keyword, $time = 300, $option = array()) {
140140
return false;
141141
} else {
142142
$value = $object['value'];
143-
$time = $object['expired_time'] - @date("U") + $time;
143+
$time = $object['expired_time'] - time() + $time;
144144
$this->set($keyword, $value,$time, $option);
145145
return true;
146146
}

phpfastcache/3.0.0/drivers/files.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ function driver_isExisting($keyword) {
233233

234234
function isExpired($object) {
235235

236-
if(isset($object['expired_time']) && @date("U") >= $object['expired_time']) {
236+
if(isset($object['expired_time']) && time() >= $object['expired_time']) {
237237
return true;
238238
} else {
239239
return false;

phpfastcache/3.0.0/drivers/sqlite.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ function driver_set($keyword, $value = "", $time = 300, $option = array() ) {
201201
$stm->execute(array(
202202
":keyword" => $keyword,
203203
":object" => $this->encode($value),
204-
":exp" => @date("U") + (Int)$time,
204+
":exp" => time() + (Int)$time,
205205
));
206206

207207
return true;
@@ -212,7 +212,7 @@ function driver_set($keyword, $value = "", $time = 300, $option = array() ) {
212212
$stm->execute(array(
213213
":keyword" => $keyword,
214214
":object" => $this->encode($value),
215-
":exp" => @date("U") + (Int)$time,
215+
":exp" => time() + (Int)$time,
216216
));
217217
} catch (PDOException $e) {
218218
return false;
@@ -268,7 +268,7 @@ function driver_get($keyword, $option = array()) {
268268
}
269269

270270
function isExpired($row) {
271-
if(isset($row['exp']) && @date("U") >= $row['exp']) {
271+
if(isset($row['exp']) && time() >= $row['exp']) {
272272
return true;
273273
}
274274

@@ -280,7 +280,7 @@ function deleteRow($row) {
280280
$stm = $this->db($row['keyword'])->prepare("DELETE FROM `caching` WHERE (`id`=:id) OR (`exp` <= :U) ");
281281
$stm->execute(array(
282282
":id" => $row['id'],
283-
":U" => @date("U"),
283+
":U" => time(),
284284
));
285285
} catch (PDOException $e) {
286286
return false;
@@ -292,7 +292,7 @@ function driver_delete($keyword, $option = array()) {
292292
$stm = $this->db($keyword)->prepare("DELETE FROM `caching` WHERE (`keyword`=:keyword) OR (`exp` <= :U)");
293293
$stm->execute(array(
294294
":keyword" => $keyword,
295-
":U" => @date("U"),
295+
":U" => time(),
296296
));
297297
} catch (PDOException $e) {
298298
return false;
@@ -324,7 +324,7 @@ function driver_stats($option = array()) {
324324

325325
$stm = $PDO->prepare("DELETE FROM `caching` WHERE `exp` <= :U");
326326
$stm->execute(array(
327-
":U" => @date("U"),
327+
":U" => time(),
328328
));
329329

330330
$PDO->exec("VACUUM;");

0 commit comments

Comments
 (0)