Microtime all CSS and JS paths to help stop caching

mattpass · mattpass · commit b65a7a690ee2 · 2015-01-23T08:22:41.000Z
diff --git a/editor.php b/editor.php
@@ -10,36 +10,37 @@
 <title>ICEcoder v <?php echo $ICEcoder["versionNo"];?> editor</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="robots" content="noindex, nofollow">
-<link rel="stylesheet" href="<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror.css">
-<link rel="stylesheet" href="<?php echo $ICEcoder["codeMirrorDir"]; ?>/addon/hint/show-hint.css">
-<link rel="stylesheet" href="<?php echo $ICEcoder["codeMirrorDir"]; ?>/addon/lint/lint.css">
+<link rel="stylesheet" href="<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror.css?microtime=<?php echo microtime(true);?>">
+<link rel="stylesheet" href="<?php echo $ICEcoder["codeMirrorDir"]; ?>/addon/hint/show-hint.css?microtime=<?php echo microtime(true);?>">
+<link rel="stylesheet" href="<?php echo $ICEcoder["codeMirrorDir"]; ?>/addon/lint/lint.css?microtime=<?php echo microtime(true);?>">
 <!--
 codemirror-compressed.js
 incls:	codemirror
 modes:	clike, coffeescript, css, erlang, go, htmlmixed, javascript, julia, lua, markdown, perl, php, python, ruby, rust, sass, sql, xml, yaml
 addon:	brace-fold, closebrackets, closetag, css-hint, html-hint, javascript-hint, javascript-lint, lint, match-highlighter, searchcursor, show-hint, sql-hint, trailingspace, xml-fold, xml-hint
 //-->
-<script src="<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror-compressed.js"></script>
+<script src="<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror-compressed.js?microtime=<?php echo microtime(true);?>"></script>
 <?php
 if (file_exists(dirname(__FILE__)."/plugins/jshint/jshint-2.5.6.min.js")) {
-	echo '<script src="plugins/jshint/jshint-2.5.6.min.js"></script>';
+	echo '<script src="plugins/jshint/jshint-2.5.6.min.js?microtime='.microtime(true).'></script>';
 };?>
-<script src="lib/mmd.js"></script>
-<script src="lib/foldcode.js"></script>
+<script src="lib/mmd.js?microtime=<?php echo microtime(true);?>"></script>
+<script src="lib/foldcode.js?microtime=<?php echo microtime(true);?>"></script>
 <?php
 if (file_exists(dirname(__FILE__)."/plugins/emmet/emmet.min.js")) {
-	echo '<script src="plugins/emmet/emmet.min.js"></script>';
+	echo '<script src="plugins/emmet/emmet.min.js?microtime=".microtime(true)."></script>';
 };?>
 <?php
 if (file_exists(dirname(__FILE__)."/plugins/pesticide/pesticide.js")) {
-	echo '<script src="plugins/pesticide/pesticide.js"></script>';
+	echo '<script src="plugins/pesticide/pesticide.js?microtime=".microtime(true)."></script>';
 };?>
 <?php
 if (file_exists(dirname(__FILE__)."/plugins/stats.js/stats.min.js")) {
-	echo '<script src="plugins/stats.js/stats.min.js"></script>';
+	echo '<script src="plugins/stats.js/stats.min.js?microtime=".microtime(true)."></script>';
 };?>
 <link rel="stylesheet" href="<?php
 if ($ICEcoder["theme"]=="default") {echo 'lib/editor.css';} else {echo $ICEcoder["codeMirrorDir"].'/theme/'.$ICEcoder["theme"].'.css';};
+echo "?microtime=".microtime(true);
 $activeLineBG = array_search($ICEcoder["theme"],array("3024-day","base16-light","eclipse","elegant","neat","solarized","xq-light")) !== false ? "#ccc" : "#000";
 ?>">
 
@@ -74,8 +75,8 @@
 .diffGreyLighter {background: #888 !important; color: #222 !important}
 .diffNone {}
 </style>
-<link rel="stylesheet" href="lib/file-types.css">
-<link rel="stylesheet" href="lib/file-type-icons.css">
+<link rel="stylesheet" href="lib/file-types.css?microtime=<?php echo microtime(true);?>">
+<link rel="stylesheet" href="lib/file-type-icons.css?microtime=<?php echo microtime(true);?>">
 </head>
 
 <body style="color: #fff; margin: 0" onKeyDown="return top.ICEcoder.interceptKeys('content', event);" onKeyUp="top.ICEcoder.resetKeys(event);" onBlur="parent.ICEcoder.resetKeys(event);">
diff --git a/files.php b/files.php
@@ -12,10 +12,10 @@
 <head>
 <title>ICEcoder v <?php echo $ICEcoder["versionNo"];?> file manager</title>
 <meta name="robots" content="noindex, nofollow">
-<link rel="stylesheet" type="text/css" href="lib/files.css">
-<link rel="stylesheet" type="text/css" href="lib/file-types.css">
-<link rel="stylesheet" type="text/css" href="lib/file-type-icons.css">
-<script src="lib/ice-coder<?php if (!$ICEcoder['devMode']) {echo '.min';};?>.js" type="text/javascript"></script>
+<link rel="stylesheet" type="text/css" href="lib/files.css?microtime=<?php echo microtime(true);?>">
+<link rel="stylesheet" type="text/css" href="lib/file-types.css?microtime=<?php echo microtime(true);?>">
+<link rel="stylesheet" type="text/css" href="lib/file-type-icons.css?microtime=<?php echo microtime(true);?>">
+<script src="lib/ice-coder<?php if (!$ICEcoder['devMode']) {echo '.min';}; echo ".js?microtime=".microtime(true);?>" type="text/javascript"></script>
 </head>
 
 <body onFocus="top.ICEcoder.files.style.background='#444'" onBlur="top.ICEcoder.files.style.background='#383838'" onload="top.ICEcoder.showHideGithubNav(top.ICEcoder.githubDiff ? 'show' : 'hide')" onDblClick="top.ICEcoder.openFile()" onKeyDown="return top.ICEcoder.interceptKeys('files', event);" onKeyUp="top.ICEcoder.resetKeys(event);" onBlur="parent.ICEcoder.resetKeys(event);">
diff --git a/lib/github-manager.php b/lib/github-manager.php
@@ -168,7 +168,7 @@
 <title>ICEcoder <?php echo $ICEcoder["versionNo"];?> GitHub manager</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="robots" content="noindex, nofollow">
-<link rel="stylesheet" type="text/css" href="github-manager.css">
+<link rel="stylesheet" type="text/css" href="github-manager.css?microtime=<?php echo microtime(true);?>">
 </head>
 
 <body class="githubManager">
diff --git a/lib/github.php b/lib/github.php
@@ -23,7 +23,7 @@
 		echo '<!DOCTYPE html>
 			<html>
 			<head>
-			<script src="github.js"></script>
+			<script src="github.js?microtime=<?php echo microtime(true);?>"></script>
 			</body>
 			<script>
 			top.ICEcoder.githubAuthTokenSet = true;
@@ -47,8 +47,8 @@
 		echo '<!DOCTYPE html>
 			<html>
 			<head>
-			<script src="github.js"></script>
-			<script src="underscore-min.js"></script>
+			<script src="github.js?microtime=<?php echo microtime(true);?>"></script>
+			<script src="underscore-min.js?microtime=<?php echo microtime(true);?>"></script>
 			</body>
 			<script>
 			// Start our github object, establish this repo & file path
@@ -153,8 +153,8 @@
 		<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> GitHub commit files</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<meta name="robots" content="noindex, nofollow">
-		<script src="github.js"></script>
-		<link rel="stylesheet" type="text/css" href="github.css">
+		<script src="github.js?microtime=<?php echo microtime(true);?>"></script>
+		<link rel="stylesheet" type="text/css" href="github.css?microtime=<?php echo microtime(true);?>">
 		</head>
 
 		<body class="githubAction">
diff --git a/lib/help.php b/lib/help.php
@@ -10,7 +10,7 @@
 <title>ICEcoder <?php echo $ICEcoder["versionNo"];?> help</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="robots" content="noindex, nofollow">
-<link rel="stylesheet" type="text/css" href="help.css">
+<link rel="stylesheet" type="text/css" href="help.css?microtime=<?php echo microtime(true);?>">
 </head>
 
 <body class="help">
diff --git a/lib/login.php b/lib/login.php
@@ -14,7 +14,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="robots" content="noindex, nofollow">
 <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-<link rel="stylesheet" type="text/css" href="ice-coder.css">
+<link rel="stylesheet" type="text/css" href="ice-coder.css?microtime=<?php echo microtime(true);?>">
 <link rel="icon" type="image/png" href="../favicon.png">
 </head>
 
diff --git a/lib/multiple-results.php b/lib/multiple-results.php
@@ -15,7 +15,7 @@
 <title>ICEcoder <?php echo $ICEcoder["versionNo"];?> multiple results screen</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="robots" content="noindex, nofollow">
-<link rel="stylesheet" type="text/css" href="multiple-results.css">
+<link rel="stylesheet" type="text/css" href="multiple-results.css?microtime=<?php echo microtime(true);?>">
 </head>
 
 <body class="results" onLoad="top.get('loadingMask').style.visibility = 'hidden'">
diff --git a/lib/plugins-manager.php b/lib/plugins-manager.php
@@ -193,7 +193,7 @@ function deletePlugin($dir) {
 <title>ICEcoder <?php echo $ICEcoder["versionNo"];?> plugins manager</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="robots" content="noindex, nofollow">
-<link rel="stylesheet" type="text/css" href="plugins-manager.css">
+<link rel="stylesheet" type="text/css" href="plugins-manager.css?microtime=<?php echo microtime(true);?>">
 </head>
 
 <body class="pluginsManager">
diff --git a/lib/properties.php b/lib/properties.php
@@ -17,7 +17,7 @@
 <title>ICEcoder <?php echo $ICEcoder["versionNo"];?> file/folder properties</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="robots" content="noindex, nofollow">
-<link rel="stylesheet" type="text/css" href="properties.css">
+<link rel="stylesheet" type="text/css" href="properties.css?microtime=<?php echo microtime(true);?>">
 </head>
 
 <body class="properties">
diff --git a/lib/settings-screen.php b/lib/settings-screen.php
@@ -10,9 +10,9 @@
 <title>ICEcoder <?php echo $ICEcoder["versionNo"];?> settings screen</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="robots" content="noindex, nofollow">
-<link rel="stylesheet" type="text/css" href="settings-screen.css">
-<link rel="stylesheet" href="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror.css">
-<script src="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror-compressed.js"></script>
+<link rel="stylesheet" type="text/css" href="settings-screen.css?microtime=<?php echo microtime(true);?>">
+<link rel="stylesheet" href="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror.css?microtime=<?php echo microtime(true);?>">
+<script src="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror-compressed.js?microtime=<?php echo microtime(true);?>"></script>
 
 <style type="text/css">
 .CodeMirror {position: absolute; width: 409px; height: 180px; font-size: <?php echo $ICEcoder["fontSize"];?>}
@@ -21,7 +21,7 @@
 .cm-tab {border-left-width: <?php echo $ICEcoder["visibleTabs"] ? "1px" : "0";?>; margin-left: <?php echo $ICEcoder["visibleTabs"] ? "-1px" : "0";?>; border-left-style: solid; border-left-color: rgba(255,255,255,0.2)}
 </style>
 
-<link rel="stylesheet" href="editor.css">
+<link rel="stylesheet" href="editor.css?microtime=<?php echo microtime(true);?>">
 <?php
 $themeArray = array();
 $handle = opendir('../'.$ICEcoder["codeMirrorDir"].'/theme/');
@@ -32,7 +32,7 @@
 }
 sort($themeArray);
 for ($i=0;$i<count($themeArray);$i++) {
-	echo '<link rel="stylesheet" href="../'.$ICEcoder["codeMirrorDir"].'/theme/'.$themeArray[$i].'.css">'.PHP_EOL;
+	echo '<link rel="stylesheet" href="../'.$ICEcoder["codeMirrorDir"].'/theme/'.$themeArray[$i].'.css?microtime=<?php echo microtime(true);?>">'.PHP_EOL;
 }
 ?>
 </head>
diff --git a/lib/settings-update.php b/lib/settings-update.php
@@ -69,6 +69,7 @@
 
 	// Work out the theme to use now
 	$ICEcoder["theme"]=="default" ? $themeURL = 'lib/editor.css' : $themeURL = $ICEcoder["codeMirrorDir"].'/theme/'.$ICEcoder["theme"].'.css';
+	$themeURL .= "?microtime=".microtime(true);
 
 	// Do we need a file manager refresh?
 	$refreshFM = $_POST['changedFileSettings']=="true" ? "true" : "false";
diff --git a/test/index.php b/test/index.php
@@ -8,7 +8,7 @@
 <head>
 <title>ICEcoder Test Suite</title>
 <meta name="robots" content="noindex, nofollow">
-<script src="object-watch.js"></script>
+<script src="object-watch.js?microtime=<?php echo microtime(true);?>"></script>
 </head>
 
 <script>

-Original file line number
+Diff line change
 <title>ICEcoder v <?php echo $ICEcoder["versionNo"];?> editor</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="robots" content="noindex, nofollow">
 -<link rel="stylesheet" href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror.css">
 -<link rel="stylesheet" href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $ICEcoder["codeMirrorDir"]; ?>/addon/hint/show-hint.css">
 -<link rel="stylesheet" href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $ICEcoder["codeMirrorDir"]; ?>/addon/lint/lint.css">
 +<link rel="stylesheet" href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror.css?microtime=<?php echo microtime(true);?>">
 +<link rel="stylesheet" href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $ICEcoder["codeMirrorDir"]; ?>/addon/hint/show-hint.css?microtime=<?php echo microtime(true);?>">
 +<link rel="stylesheet" href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $ICEcoder["codeMirrorDir"]; ?>/addon/lint/lint.css?microtime=<?php echo microtime(true);?>">
 <!--
 codemirror-compressed.js
 incls:	codemirror
 modes:	clike, coffeescript, css, erlang, go, htmlmixed, javascript, julia, lua, markdown, perl, php, python, ruby, rust, sass, sql, xml, yaml
 addon:	brace-fold, closebrackets, closetag, css-hint, html-hint, javascript-hint, javascript-lint, lint, match-highlighter, searchcursor, show-hint, sql-hint, trailingspace, xml-fold, xml-hint
 //-->
 -<script src="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror-compressed.js"></script>
 +<script src="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror-compressed.js?microtime=<?php echo microtime(true);?>"></script>
 <?php
 if (file_exists(dirname(__FILE__)."/plugins/jshint/jshint-2.5.6.min.js")) {
 -	echo '<script src="proxy.php?url=https%3A%2F%2Fgithub.com%2Fplugins%2Fjshint%2Fjshint-2.5.6.min.js%3Cspan+class%3D"x x-first x-last">"></script>';
 +	echo '<script src="proxy.php?url=https%3A%2F%2Fgithub.com%2Fplugins%2Fjshint%2Fjshint-2.5.6.min.js%3Cspan+class%3D"x x-first">?microtime='.microtime(true).'></script>';
 };?>
 -<script src="proxy.php?url=https%3A%2F%2Fgithub.com%2Flib%2Fmmd.js"></script>
 -<script src="proxy.php?url=https%3A%2F%2Fgithub.com%2Flib%2Ffoldcode.js"></script>
 +<script src="proxy.php?url=https%3A%2F%2Fgithub.com%2Flib%2Fmmd.js%3Cspan+class%3D"x x-first">?microtime=<?php echo microtime(true);?>"></script>
 +<script src="proxy.php?url=https%3A%2F%2Fgithub.com%2Flib%2Ffoldcode.js%3Cspan+class%3D"x x-first">?microtime=<?php echo microtime(true);?>"></script>
 <?php
 if (file_exists(dirname(__FILE__)."/plugins/emmet/emmet.min.js")) {
 -	echo '<script src="proxy.php?url=https%3A%2F%2Fgithub.com%2Fplugins%2Femmet%2Femmet.min.js"></script>';
 +	echo '<script src="proxy.php?url=https%3A%2F%2Fgithub.com%2Fplugins%2Femmet%2Femmet.min.js%3Cspan+class%3D"x x-first x-last">?microtime=".microtime(true)."></script>';
 };?>
 <?php
 if (file_exists(dirname(__FILE__)."/plugins/pesticide/pesticide.js")) {
 -	echo '<script src="proxy.php?url=https%3A%2F%2Fgithub.com%2Fplugins%2Fpesticide%2Fpesticide.js"></script>';
 +	echo '<script src="proxy.php?url=https%3A%2F%2Fgithub.com%2Fplugins%2Fpesticide%2Fpesticide.js%3Cspan+class%3D"x x-first x-last">?microtime=".microtime(true)."></script>';
 };?>
 <?php
 if (file_exists(dirname(__FILE__)."/plugins/stats.js/stats.min.js")) {
 -	echo '<script src="proxy.php?url=https%3A%2F%2Fgithub.com%2Fplugins%2Fstats.js%2Fstats.min.js"></script>';
 +	echo '<script src="proxy.php?url=https%3A%2F%2Fgithub.com%2Fplugins%2Fstats.js%2Fstats.min.js%3Cspan+class%3D"x x-first x-last">?microtime=".microtime(true)."></script>';
 };?>
 <link rel="stylesheet" href="<?php
 if ($ICEcoder["theme"]=="default") {echo 'lib/editor.css';} else {echo $ICEcoder["codeMirrorDir"].'/theme/'.$ICEcoder["theme"].'.css';};
 +echo "?microtime=".microtime(true);
 $activeLineBG = array_search($ICEcoder["theme"],array("3024-day","base16-light","eclipse","elegant","neat","solarized","xq-light")) !== false ? "#ccc" : "#000";
 ?>">
 .diffGreyLighter {background: #888 !important; color: #222 !important}
 .diffNone {}
 </style>
 -<link rel="stylesheet" href="proxy.php?url=https%3A%2F%2Fgithub.com%2Flib%2Ffile-types.css">
 -<link rel="stylesheet" href="proxy.php?url=https%3A%2F%2Fgithub.com%2Flib%2Ffile-type-icons.css">
 +<link rel="stylesheet" href="proxy.php?url=https%3A%2F%2Fgithub.com%2Flib%2Ffile-types.css%3Cspan+class%3D"x x-first">?microtime=<?php echo microtime(true);?>">
 +<link rel="stylesheet" href="proxy.php?url=https%3A%2F%2Fgithub.com%2Flib%2Ffile-type-icons.css%3Cspan+class%3D"x x-first">?microtime=<?php echo microtime(true);?>">
 </head>
 <body style="color: #fff; margin: 0" onKeyDown="return top.ICEcoder.interceptKeys('content', event);" onKeyUp="top.ICEcoder.resetKeys(event);" onBlur="parent.ICEcoder.resetKeys(event);">
-Original file line number
+Diff line change
 <head>
 <title>ICEcoder v <?php echo $ICEcoder["versionNo"];?> file manager</title>
 <meta name="robots" content="noindex, nofollow">
 -<link rel="stylesheet" type="text/css" href="proxy.php?url=https%3A%2F%2Fgithub.com%2Flib%2Ffiles.css">
 -<link rel="stylesheet" type="text/css" href="proxy.php?url=https%3A%2F%2Fgithub.com%2Flib%2Ffile-types.css">
 -<link rel="stylesheet" type="text/css" href="proxy.php?url=https%3A%2F%2Fgithub.com%2Flib%2Ffile-type-icons.css">
 -<script src="proxy.php?url=https%3A%2F%2Fgithub.com%2Flib%2Fice-coder%3Cspan+class%3D"pl-ent"><?php if (!$ICEcoder['devMode']) {echo '.min';};?>.js" type="text/javascript"></script>
 +<link rel="stylesheet" type="text/css" href="proxy.php?url=https%3A%2F%2Fgithub.com%2Flib%2Ffiles.css%3Cspan+class%3D"x x-first">?microtime=<?php echo microtime(true);?>">
 +<link rel="stylesheet" type="text/css" href="proxy.php?url=https%3A%2F%2Fgithub.com%2Flib%2Ffile-types.css%3Cspan+class%3D"x x-first">?microtime=<?php echo microtime(true);?>">
 +<link rel="stylesheet" type="text/css" href="proxy.php?url=https%3A%2F%2Fgithub.com%2Flib%2Ffile-type-icons.css%3Cspan+class%3D"x x-first">?microtime=<?php echo microtime(true);?>">
 +<script src="proxy.php?url=https%3A%2F%2Fgithub.com%2Flib%2Fice-coder%3Cspan+class%3D"pl-ent"><?php if (!$ICEcoder['devMode']) {echo '.min';}; echo ".js?microtime=".microtime(true);?>" type="text/javascript"></script>
 </head>
 <body onFocus="top.ICEcoder.files.style.background='#444'" onBlur="top.ICEcoder.files.style.background='#383838'" onload="top.ICEcoder.showHideGithubNav(top.ICEcoder.githubDiff ? 'show' : 'hide')" onDblClick="top.ICEcoder.openFile()" onKeyDown="return top.ICEcoder.interceptKeys('files', event);" onKeyUp="top.ICEcoder.resetKeys(event);" onBlur="parent.ICEcoder.resetKeys(event);">