From 3d2bacf380a73e6898401ef2ca6dac24055727c7 Mon Sep 17 00:00:00 2001 From: franzz Date: Tue, 9 Oct 2018 20:12:06 +0200 Subject: [PATCH] add addTimestampToFilePath function --- inc/main.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/inc/main.php b/inc/main.php index edb0d6a..ad40bce 100755 --- a/inc/main.php +++ b/inc/main.php @@ -3,7 +3,7 @@ /** * Main Class * @author franzz - * @version 2.2 + * @version 2.3 */ abstract class Main extends PhpObject { @@ -90,6 +90,17 @@ abstract class Main extends PhpObject $this->setMasks(); } + public function addTimestampToFilePath($sFile) + { + //Remove timestamp + $sFilePath = preg_replace('/(.*)\?[\d]{14}$/', '$1', $sFile); + + //Remove base URL + $sLocalPath = str_replace($this->asContext['serv_name'], '', $sFilePath); + + return file_exists($sLocalPath)?$sFilePath.'?'.date("YmdHis", filemtime($sLocalPath)):$sFile; + } + public function addUncaughtError($sError) { $this->addError('Uncaught errors:'."\n".$sError); @@ -155,7 +166,7 @@ abstract class Main extends PhpObject public static function getJsonResult($bSuccess, $sDesc, $asVars=array()) { header('Content-type: application/json'); - return json_encode(array('result'=>$bSuccess?self::SUCCESS:self::ERROR, 'desc'=>ToolBox::mb_ucwords($sDesc), 'data'=>$asVars)); + return json_encode(array('result'=>$bSuccess?self::SUCCESS:self::ERROR, 'desc'=>$sDesc, 'data'=>$asVars)); } }