Changeset 159 for trunk/lib/App.inc.php

Timestamp:

Jun 11, 2006 5:41:23 AM (18 years ago)

Author:

scdev

Message:

${1}

File:

• trunk/lib/App.inc.php (modified) (4 diffs)

trunk/lib/App.inc.php

@@ -830 +830 @@
     * @param    mixed   $carry_args     Additional arguments to carry in the URL automatically (see $app->oHREF()).
     * @param    string  $default_url    A default URL if there is not a valid specified boomerang URL.
+    * @param    bool    $queryless_referrer_comparison   Exclude the URL query from the refererIsMe() comparison.
     * @return   bool                    False if the session is not running. No return otherwise.
     * @author   Quinn Comendant <quinn@strangecode.com>
     * @since    31 Mar 2006 19:17:00
     */
-    function dieBoomerangURL($id=null, $carry_args=null, $default_url=null)
+    function dieBoomerangURL($id=null, $carry_args=null, $default_url=null, $queryless_referrer_comparison=false)
     {
         if (!$this->running) {
@@ -854 +855 @@
         } else if (isset($default_url)) {
             $url = $default_url;
-        } else if (!refererIsMe()) {
+        } else if (!refererIsMe(true === $queryless_referrer_comparison)) {
             // Ensure that the redirecting page is not also the referrer.
             $url = getenv('HTTP_REFERER');
@@ -888 +889 @@
         if ('' != $url && is_string($url)) {
             // Delete any boomerang request keys in the query string.
-            $url = preg_replace('/boomerang=[\w]+/', '', $url);
+            $url = preg_replace('/[&?]?boomerang=[\w]+/', '', $url);
 
             if (isset($_SESSION['_app'][$this->_ns]['boomerang']['url']) && is_array($_SESSION['_app'][$this->_ns]['boomerang']['url']) && !empty($_SESSION['_app'][$this->_ns]['boomerang']['url'])) {
@@ -999 +1000 @@
         }
         if ($boomerang_time >= (time() - 2)) {
-            // Last boomerang direction was more than 2 seconds ago.
-            $this->logMsg(sprintf('validBoomerangURL(%s) not valid, boomerang_time too short: %s', $id, time() - $boomerang_time), LOG_DEBUG, __FILE__, __LINE__);
+            // Last boomerang direction was less than 2 seconds ago.
+            $this->logMsg(sprintf('validBoomerangURL(%s) not valid, boomerang_time too short: %s seconds', $id, time() - $boomerang_time), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }