AASA#35243 knownBookmarks openen voortaan in gewoon tabje

svn path=/Website/trunk/; revision=30255

APPL/API/shorturl.asp

@@ -51,14 +51,16 @@
     // Strip eventuele leading &fac_id=XXXX er ook af.
     rest = rest.substring(rest.indexOf("u=")).substring(("u="+u).length+1);
 
+    var isKnownBookmark = false;
     if (u in known_bookmarks)
     {
+        isKnownBookmark = true;
         checkUserAgent(); // devicebits waren anders mogelijk nog niet gezet
         if (device.test(device.isDesktop) || device.test(device.isTouch))
             url = known_bookmarks[u].gui;
         else
             url = known_bookmarks[u].mob || known_bookmarks[u].gui;
-        url = rooturl + "/" + url + keyparam;
+        url = url + keyparam;
 
         if (keyparam > -1)
         {
@@ -95,7 +97,7 @@
         var url = oRs("fac_bookmark_path").Value;
         var refresher = oRs("fac_bookmark_refreshtime").Value;
         var bookmark_naam = oRs("fac_bookmark_naam").Value;
-
+__DoLog(url);
         if (user_key < 0)
         {
             if (oRs("prs_perslid_key_auth").Value)
@@ -146,6 +148,13 @@
     else
         var theURL = protectQS.create(url);
 
+
+    if (isKnownBookmark)
+    {
+        Session("FirstPage") = theURL;
+        theURL = rooturl;
+    }
+
     var no302 = getQParamInt("no302", 0) == 1;
     if (no302)
     {