From 540da2c75cf2339b4a6886bca2670044e3231602 Mon Sep 17 00:00:00 2001 From: khongchi Date: Thu, 21 Nov 2013 16:13:53 +0900 Subject: [PATCH] =?UTF-8?q?#85,=20time()=EC=9D=84=20$=5FSERVER['REQUEST=5F?= =?UTF-8?q?TIME']=EC=9C=BC=EB=A1=9C=20=EB=8C=80=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/cache/CacheApc.class.php | 2 +- classes/cache/CacheMemcache.class.php | 2 +- classes/cache/CacheWincache.class.php | 2 +- classes/context/Context.class.php | 2 +- classes/xml/XmlQueryParser.class.php | 2 +- .../queryargument/DefaultValue.class.php | 2 +- config/func.inc.php | 2 +- modules/admin/admin.admin.controller.php | 2 +- modules/admin/admin.admin.model.php | 4 ++-- modules/admin/admin.admin.view.php | 12 ++++++------ modules/comment/comment.model.php | 2 +- modules/document/document.item.php | 2 +- modules/install/install.admin.controller.php | 2 +- modules/layout/layout.admin.controller.php | 2 +- modules/member/member.class.php | 6 +++--- modules/member/member.controller.php | 18 +++++++++--------- modules/menu/menu.admin.controller.php | 2 +- modules/module/module.controller.php | 2 +- modules/page/page.mobile.php | 2 +- modules/page/page.view.php | 6 +++--- modules/poll/poll.controller.php | 2 +- modules/session/session.controller.php | 4 ++-- modules/session/session.model.php | 2 +- modules/spamfilter/spamfilter.model.php | 2 +- modules/trackback/trackback.controller.php | 2 +- modules/trackback/trackback.model.php | 4 ++-- modules/widget/widget.controller.php | 2 +- .../counter_status/counter_status.class.php | 2 +- 28 files changed, 48 insertions(+), 48 deletions(-) diff --git a/classes/cache/CacheApc.class.php b/classes/cache/CacheApc.class.php index 689382a34..43b13b939 100644 --- a/classes/cache/CacheApc.class.php +++ b/classes/cache/CacheApc.class.php @@ -67,7 +67,7 @@ class CacheApc extends CacheBase $valid_time = $this->valid_time; } - return apc_store(md5(_XE_PATH_ . $key), array(time(), $buff), $valid_time); + return apc_store(md5(_XE_PATH_ . $key), array($_SERVER['REQUEST_TIME'], $buff), $valid_time); } /** diff --git a/classes/cache/CacheMemcache.class.php b/classes/cache/CacheMemcache.class.php index fb741ea29..2f297b88c 100644 --- a/classes/cache/CacheMemcache.class.php +++ b/classes/cache/CacheMemcache.class.php @@ -113,7 +113,7 @@ class CacheMemcache extends CacheBase $valid_time = $this->valid_time; } - return $this->Memcache->set($this->getKey($key), array(time(), $buff), MEMCACHE_COMPRESSED, $valid_time); + return $this->Memcache->set($this->getKey($key), array($_SERVER['REQUEST_TIME'], $buff), MEMCACHE_COMPRESSED, $valid_time); } /** diff --git a/classes/cache/CacheWincache.class.php b/classes/cache/CacheWincache.class.php index 8c9c6b32a..2b0ee4b11 100644 --- a/classes/cache/CacheWincache.class.php +++ b/classes/cache/CacheWincache.class.php @@ -69,7 +69,7 @@ class CacheWincache extends CacheBase { $valid_time = $this->valid_time; } - return wincache_ucache_set(md5(_XE_PATH_ . $key), array(time(), $buff), $valid_time); + return wincache_ucache_set(md5(_XE_PATH_ . $key), array($_SERVER['REQUEST_TIME'], $buff), $valid_time); } /** diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 531b2ab67..2b1980f71 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -282,7 +282,7 @@ class Context $this->lang_type = $this->get('l'); if($_COOKIE['lang_type'] != $this->lang_type) { - setcookie('lang_type', $this->lang_type, time() + 3600 * 24 * 1000, '/'); + setcookie('lang_type', $this->lang_type, $_SERVER['REQUEST_TIME'] + 3600 * 24 * 1000, '/'); } } elseif($_COOKIE['lang_type']) diff --git a/classes/xml/XmlQueryParser.class.php b/classes/xml/XmlQueryParser.class.php index ff7d2e312..d87109aff 100644 --- a/classes/xml/XmlQueryParser.class.php +++ b/classes/xml/XmlQueryParser.class.php @@ -674,7 +674,7 @@ class XmlQueryParser extends XmlParser $val = '$_SERVER[\'REMOTE_ADDR\']'; break; case 'unixtime' : - $val = 'time()'; + $val = '$_SERVER[\'REQUEST_TIME\']'; break; case 'curdate' : $val = 'date("YmdHis")'; diff --git a/classes/xml/xmlquery/queryargument/DefaultValue.class.php b/classes/xml/xmlquery/queryargument/DefaultValue.class.php index cf618cd0a..d4b9c0a95 100644 --- a/classes/xml/xmlquery/queryargument/DefaultValue.class.php +++ b/classes/xml/xmlquery/queryargument/DefaultValue.class.php @@ -130,7 +130,7 @@ class DefaultValue $this->_is_string_from_function = TRUE; break; case 'unixtime' : - $val = 'time()'; + $val = '$_SERVER[\'REQUEST_TIME\']'; break; case 'curdate' : $val = 'date("YmdHis")'; diff --git a/config/func.inc.php b/config/func.inc.php index b37a01df1..53ac022c3 100644 --- a/config/func.inc.php +++ b/config/func.inc.php @@ -582,7 +582,7 @@ function ztime($str) */ function getTimeGap($date, $format = 'Y.m.d') { - $gap = time() + zgap() - ztime($date); + $gap = $_SERVER['REQUEST_TIME'] + zgap() - ztime($date); $lang_time_gap = Context::getLang('time_gap'); if($gap < 60) diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index b783e35b9..a55d53238 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -57,7 +57,7 @@ class adminAdminController extends admin function procAdminRecompileCacheFile() { // rename cache dir - $temp_cache_dir = './files/cache_' . time(); + $temp_cache_dir = './files/cache_' . $_SERVER['REQUEST_TIME']; FileHandler::rename('./files/cache', $temp_cache_dir); FileHandler::makeDir('./files/cache'); diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php index 0aef3bf81..b10d5480b 100644 --- a/modules/admin/admin.admin.model.php +++ b/modules/admin/admin.admin.model.php @@ -48,7 +48,7 @@ class adminAdminModel extends admin $sftp = ssh2_sftp($connection); // create temp file - $pin = time(); + $pin = $_SERVER['REQUEST_TIME']; FileHandler::writeFile('./files/cache/ftp_check', $pin); // create path candidate @@ -142,7 +142,7 @@ class adminAdminModel extends admin } // create temp file - $pin = time(); + $pin = $_SERVER['REQUEST_TIME']; FileHandler::writeFile('./files/cache/ftp_check', $pin); // create path candidate diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index 9b19b5a70..55928d8b4 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -79,7 +79,7 @@ class adminAdminView extends admin function checkEasyinstall() { $lastTime = (int) FileHandler::readFile($this->easyinstallCheckFile); - if($lastTime > time() - 60 * 60 * 24 * 30) + if($lastTime > $_SERVER['REQUEST_TIME'] - 60 * 60 * 24 * 30) { return; } @@ -114,7 +114,7 @@ class adminAdminView extends admin */ function _markingCheckEasyinstall() { - $currentTime = time(); + $currentTime = $_SERVER['REQUEST_TIME']; FileHandler::writeFile($this->easyinstallCheckFile, $currentTime); } @@ -222,7 +222,7 @@ class adminAdminView extends admin // move from index method, because use in admin footer $newest_news_url = sprintf("http://news.xpressengine.com/%s/news.php?version=%s&package=%s", _XE_LOCATION_, __XE_VERSION__, _XE_PACKAGE_); $cache_file = sprintf("%sfiles/cache/newest_news.%s.cache.php", _XE_PATH_, _XE_LOCATION_); - if(!file_exists($cache_file) || filemtime($cache_file) + 60 * 60 < time()) + if(!file_exists($cache_file) || filemtime($cache_file) + 60 * 60 < $_SERVER['REQUEST_TIME']) { // Considering if data cannot be retrieved due to network problem, modify filemtime to prevent trying to reload again when refreshing administration page // Ensure to access the administration page even though news cannot be displayed @@ -276,7 +276,7 @@ class adminAdminView extends admin { // Get statistics $args = new stdClass(); - $args->date = date("Ymd000000", time() - 60 * 60 * 24); + $args->date = date("Ymd000000", $_SERVER['REQUEST_TIME'] - 60 * 60 * 24); $today = date("Ymd"); // Member Status @@ -429,8 +429,8 @@ class adminAdminView extends admin $oAdminModel = getAdminModel('admin'); $favicon_url = $oAdminModel->getFaviconUrl(); $mobicon_url = $oAdminModel->getMobileIconUrl(); - Context::set('favicon_url', $favicon_url.'?'.time()); - Context::set('mobicon_url', $mobicon_url.'?'.time()); + Context::set('favicon_url', $favicon_url.'?'.$_SERVER['REQUEST_TIME']); + Context::set('mobicon_url', $mobicon_url.'?'.$_SERVER['REQUEST_TIME']); $oDocumentModel = getModel('document'); $config = $oDocumentModel->getDocumentConfig(); diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php index 095085a01..c04ebae67 100644 --- a/modules/comment/comment.model.php +++ b/modules/comment/comment.model.php @@ -563,7 +563,7 @@ class commentModel extends comment // create a lock file to prevent repeated work when performing a batch job $lock_file = "./files/cache/tmp/lock." . $document_srl; - if(file_exists($lock_file) && filemtime($lock_file) + 60 * 60 * 10 < time()) + if(file_exists($lock_file) && filemtime($lock_file) + 60 * 60 * 10 < $_SERVER['REQUEST_TIME']) { return; } diff --git a/modules/document/document.item.php b/modules/document/document.item.php index 5c75fb73a..898f0a8e0 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -847,7 +847,7 @@ class documentItem extends Object if($this->isSecret()) $buffs[] = "secret"; // Set the latest time - $time_check = date("YmdHis", time()-$time_interval); + $time_check = date("YmdHis", $_SERVER['REQUEST_TIME']-$time_interval); // Check new post if($this->get('regdate')>$time_check) $buffs[] = "new"; diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php index a8624a3d2..0c5bb3012 100644 --- a/modules/install/install.admin.controller.php +++ b/modules/install/install.admin.controller.php @@ -272,7 +272,7 @@ class installAdminController extends install } Context::set('name', $name); - Context::set('tmpFileName', $tmpFileName.'?'.time()); + Context::set('tmpFileName', $tmpFileName.'?'.$_SERVER['REQUEST_TIME']); } /** diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php index f998d362a..796c25ae0 100644 --- a/modules/layout/layout.admin.controller.php +++ b/modules/layout/layout.admin.controller.php @@ -833,7 +833,7 @@ class layoutAdminController extends layout private function _makeRandomMid() { - $time = time(); + $time = $_SERVER['REQUEST_TIME']; $randomString = ""; for($i=0;$i<4;$i++) { diff --git a/modules/member/member.class.php b/modules/member/member.class.php index e7bde82dd..482242817 100644 --- a/modules/member/member.class.php +++ b/modules/member/member.class.php @@ -379,7 +379,7 @@ class member extends ModuleObject { if($output->data && $output->data->count) { $last_update = strtotime($output->data->last_update); - $term = intval(time()-$last_update); + $term = intval($_SERVER['REQUEST_TIME']-$last_update); //update, if IP address access in a short time, update count. If not, make count 1. if($term < $config->max_error_count_time) { @@ -422,14 +422,14 @@ class member extends ModuleObject { { //update $content = unserialize($output->data->content); - $content[] = array($_SERVER['REMOTE_ADDR'],Context::getLang($message),time()); + $content[] = array($_SERVER['REMOTE_ADDR'],Context::getLang($message),$_SERVER['REQUEST_TIME']); $args->content = serialize($content); $output = executeQuery('member.updateLoginCountHistoryByMemberSrl', $args); } else { //insert - $content[0] = array($_SERVER['REMOTE_ADDR'],Context::getLang($message),time()); + $content[0] = array($_SERVER['REMOTE_ADDR'],Context::getLang($message),$_SERVER['REQUEST_TIME']); $args->content = serialize($content); $output = executeQuery('member.insertLoginCountHistoryByMemberSrl', $args); } diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 6a4d76910..fb98f54bb 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1501,7 +1501,7 @@ class memberController extends member // If no information exists, delete a cookie if(!$output->toBool() || !$output->data) { - setCookie('xeak',null,time()+60*60*24*365, '/'); + setCookie('xeak',null,$_SERVER['REQUEST_TIME']+60*60*24*365, '/'); return; } @@ -1513,7 +1513,7 @@ class memberController extends member if(!$user_id || !$password) { - setCookie('xeak',null,time()+60*60*24*365, '/'); + setCookie('xeak',null,$_SERVER['REQUEST_TIME']+60*60*24*365, '/'); return; } @@ -1562,7 +1562,7 @@ class memberController extends member else { executeQuery('member.deleteAutologin', $args); - setCookie('xeak',null,time()+60*60*24*365, '/'); + setCookie('xeak',null,$_SERVER['REQUEST_TIME']+60*60*24*365, '/'); } } @@ -1615,7 +1615,7 @@ class memberController extends member if($errorCount >= $config->max_error_count) { $last_update = strtotime($output->data->last_update); - $term = intval(time()-$last_update); + $term = intval($_SERVER['REQUEST_TIME']-$last_update); if($term < $config->max_error_count_time) { $term = $config->max_error_count_time - $term; @@ -1708,7 +1708,7 @@ class memberController extends member $autologin_args->member_srl = $this->memberInfo->member_srl; executeQuery('member.deleteAutologin', $autologin_args); $autologin_output = executeQuery('member.insertAutologin', $autologin_args); - if($autologin_output->toBool()) setCookie('xeak',$autologin_args->autologin_key, time()+31536000, '/'); + if($autologin_output->toBool()) setCookie('xeak',$autologin_args->autologin_key, $_SERVER['REQUEST_TIME']+31536000, '/'); } if($this->memberInfo->is_admin == 'Y') { @@ -1821,7 +1821,7 @@ class memberController extends member $logged_info = Context::get('logged_info'); // If the date of the temporary restrictions limit further information on the date of - if($config->limit_day) $args->limit_date = date("YmdHis", time()+$config->limit_day*60*60*24); + if($config->limit_day) $args->limit_date = date("YmdHis", $_SERVER['REQUEST_TIME']+$config->limit_day*60*60*24); $args->member_srl = getNextSequence(); $args->list_order = -1 * $args->member_srl; @@ -2225,9 +2225,9 @@ class memberController extends member $_SESSION[$key] = ''; } session_destroy(); - setcookie(session_name(), '', time()-42000, '/'); - setcookie('sso','',time()-42000, '/'); - setcookie('xeak','',time()-42000, '/'); + setcookie(session_name(), '', $_SERVER['REQUEST_TIME']-42000, '/'); + setcookie('sso','',$_SERVER['REQUEST_TIME']-42000, '/'); + setcookie('xeak','',$_SERVER['REQUEST_TIME']-42000, '/'); if($memberSrl || $_COOKIE['xeak']) { diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php index 06da686d8..27061004f 100644 --- a/modules/menu/menu.admin.controller.php +++ b/modules/menu/menu.admin.controller.php @@ -1120,7 +1120,7 @@ class menuAdminController extends menu private function _makeRandomMid() { - $time = time(); + $time = $_SERVER['REQUEST_TIME']; $randomString = ""; for($i=0;$i<4;$i++) { diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php index 322e7118c..dc2239169 100644 --- a/modules/module/module.controller.php +++ b/modules/module/module.controller.php @@ -1252,7 +1252,7 @@ class moduleController extends module $this->unlockTimeoutPassed(); $args->lock_name = $lock_name; if(!$timeout) $timeout = 60; - $args->deadline = date("YmdHis", time() + $timeout); + $args->deadline = date("YmdHis", $_SERVER['REQUEST_TIME'] + $timeout); if($member_srl) $args->member_srl = $member_srl; $output = executeQuery('module.insertLock', $args); if($output->toBool()) diff --git a/modules/page/page.mobile.php b/modules/page/page.mobile.php index 417d082e1..a13c27512 100644 --- a/modules/page/page.mobile.php +++ b/modules/page/page.mobile.php @@ -61,7 +61,7 @@ class pageMobile extends pageView $mtime = filemtime($cache_file); } - if($mtime + $interval*60 > time()) + if($mtime + $interval*60 > $_SERVER['REQUEST_TIME']) { $page_content = FileHandler::readFile($cache_file); $page_content = preg_replace('@<\!--#Meta:@', '