diff --git a/src/public/icons/favicon.ico b/src/public/icons/favicon.ico index 30b36d4..1fae1b9 100644 Binary files a/src/public/icons/favicon.ico and b/src/public/icons/favicon.ico differ diff --git a/src/public/icons/logo16.png b/src/public/icons/logo16.png index 6dfa7e5..da0bdd7 100644 Binary files a/src/public/icons/logo16.png and b/src/public/icons/logo16.png differ diff --git a/src/public/icons/logo32.png b/src/public/icons/logo32.png index e3cad38..fff2ab3 100644 Binary files a/src/public/icons/logo32.png and b/src/public/icons/logo32.png differ diff --git a/src/public/icons/logo320.png b/src/public/icons/logo320.png index 82c1bfd..e84b176 100644 Binary files a/src/public/icons/logo320.png and b/src/public/icons/logo320.png differ diff --git a/src/public/icons/logo512.png b/src/public/icons/logo512.png index 308f2ef..615fc4a 100644 Binary files a/src/public/icons/logo512.png and b/src/public/icons/logo512.png differ diff --git a/src/public/icons/logo64.png b/src/public/icons/logo64.png index 730d5c7..deb8b1e 100644 Binary files a/src/public/icons/logo64.png and b/src/public/icons/logo64.png differ diff --git a/src/public/icons/logo640.png b/src/public/icons/logo640.png index eabaf98..edd4493 100644 Binary files a/src/public/icons/logo640.png and b/src/public/icons/logo640.png differ diff --git a/src/web/_model/main.php b/src/web/_model/main.php index 6767010..5728932 100644 --- a/src/web/_model/main.php +++ b/src/web/_model/main.php @@ -23,7 +23,7 @@ class Main_model extends Model { private function asset_stamp($path): int { $root = $GLOBALS['webroot']; $path = $root . '/../public/' . $path; - return filemtime($path); + return @filemtime($path); } /** @@ -45,7 +45,8 @@ class Main_model extends Model { public function get_url_full($path): string { $host = $_SERVER['HTTP_HOST']; $base = lang('base_path'); - $url = "http://{$host}{$base}{$path}"; + $time = @filemtime($GLOBALS['rootroot'] . '/' . $path); + $url = "http://{$host}{$base}{$path}?timestamp={$time}"; return $url; } @@ -57,7 +58,8 @@ class Main_model extends Model { return $this->get_url_full($path); } $base = lang('base_path'); - $url = "{$base}{$path}"; + $time = @filemtime($GLOBALS['rootroot'] . '/' . $path); + $url = "{$base}{$path}?timestamp={$time}"; return $url; } diff --git a/src/web/_views/head.php b/src/web/_views/head.php index e30e05c..ef0d86c 100644 --- a/src/web/_views/head.php +++ b/src/web/_views/head.php @@ -14,12 +14,12 @@ <?=$title?> - - - - - - + "> + "> + "> + "> + "> + "> main->get_ie_version() <= 7) echo $this->main->link_css('css/legacy.css'); diff --git a/src/web/index.php b/src/web/index.php index e33e750..eedf913 100644 --- a/src/web/index.php +++ b/src/web/index.php @@ -5,6 +5,7 @@ ini_set('html_errors', '1'); $webroot = dirname(__FILE__); $assetroot = realpath(dirname(__FILE__) . '/../assets'); $publicroot = realpath(dirname(__FILE__) . '/../public'); +$rootroot = realpath(dirname(__FILE__) . '/..'); $main_model = NULL; // loadd all third party