prevent js file to get stored in lastUrl

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@442 b3834d28-1941-0410-a4f8-b48e95affb8f

2 files changed, 9 insertions, 1 deletions

diff --git a/src/SemanticScuttle/header.php b/src/SemanticScuttle/header.php
index 1b32643..5b411d9 100644
--- a/src/SemanticScuttle/header.php
+++ b/src/SemanticScuttle/header.php
@@ -63,7 +63,14 @@ if (!defined('UNIT_TEST_MODE')) {
         if (isset($_SESSION['lastUrl'])) {
             $GLOBALS['lastUrl'] = $_SESSION['lastUrl'];
         }
-        $_SESSION['lastUrl'] = $_SERVER['REQUEST_URI'];
+        //this here is hacky, but currently the only way to
+        // differentiate between css/js php files and normal
+        // http files
+        if (!isset($GLOBALS['saveInLastUrl'])
+            || $GLOBALS['saveInLastUrl']
+        ) {
+            $_SESSION['lastUrl'] = $_SERVER['REQUEST_URI'];
+        }
     }
 }
 
diff --git a/www/jsScuttle.php b/www/jsScuttle.php
index 8b19967..6aba422 100644
--- a/www/jsScuttle.php
+++ b/www/jsScuttle.php
@@ -1,5 +1,6 @@
 <?php
 header('Content-Type: text/javascript');
+$GLOBALS['saveInLastUrl'] = false;
 require_once '../src/SemanticScuttle/header.php';
 require_once 'SemanticScuttle/functions.php';
 $player_root = ROOT .'includes/player/';