Changeset 475 for trunk/lib/Navigation.inc.php

Timestamp:

Apr 26, 2014 3:04:02 AM (10 years ago)

Author:

anonymous

Message:

Logging longer messages when possible. Fixed compatibility regression with Nav::currentPage(); may break compatability with codebase v2.1.6 only.

File:

• trunk/lib/Navigation.inc.php (modified) (1 diff)

trunk/lib/Navigation.inc.php

@@ -268 +268 @@
 
     /**
-     * Returns a string if the queried page is the current page. One use is to print
-     * CSS tags if the current page matches a link, such as:
-     * $nav->currentPage('mypage.php', ' id="current"');
-     *
-     * @access  public
-     *
-     * @param   mixed   $page   The URI of the page to query, with PREG express markup, if needed.
-     * @param   mixed   $return The value to return if the current page matches the page queried.
-     *
-     * @return  mixed   The value set for $return, TRUE by default.
-     */
-    public function currentPage($test_uri, $true_return=true, $false_return=false, $strip_query=false)
-    {
-        $actual_uri = $strip_query ? strtok($_SERVER['REQUEST_URI'], '?') : $_SERVER['REQUEST_URI'];
-        $test_uri = $strip_query ? strtok($test_uri, '?') : $test_uri;
-        if (preg_match('/^' . preg_quote(urldecode($test_uri), '/') . '$/i', $actual_uri)) {
+     * Test if the given URI matches the URL of the current page. By default the URI is tested
+     * without concern
+     * One use is to change the returned value for a positive match
+     * so a css class prints for an element representing the current page:
+     *   echo $nav->currentPage('/script.php?op=info', ' class="current"', '', true);
+     * The above will match only if the current page (REQUEST_URI) is also '/script.php?op=info',
+     * and will return the string ' class="current"' if it is.
+     *
+     * @access  public
+     *
+     * @param   string  $test_uri       A URI to test against the current page.
+     * @param   mixed   $true_return    The value to return if the current page matches the test URI.
+     * @param   mixed   $false_return   The value to return if the current page does not match the test URI.
+     * @param   bool    $include_query  If set true, include the URI query string in the test.
+     *
+     * @return  mixed   If the test URI matches the current page URI, the value given for $true_return
+     *                  is returned (true by default), otherwise the value given for $false_return is
+     *                  returned (false by default).
+     */
+    public function currentPage($test_uri, $true_return=true, $false_return=false, $include_query=false)
+    {
+        $app =& App::getInstance();
+
+        $actual_uri = $include_query ? $_SERVER['REQUEST_URI'] : strtok($_SERVER['REQUEST_URI'], '?');
+        $test_uri = $include_query ? $test_uri : strtok($test_uri, '?');
+        if (mb_strtolower($test_uri) == mb_strtolower($actual_uri)) {
+            // $app->logMsg(sprintf('Current page (%s) == test URI (%s)', $actual_uri, $test_uri), LOG_DEBUG, __FILE__, __LINE__);
             return $true_return;
         }
+        // $app->logMsg(sprintf('Current page (%s) != test URI (%s)', $actual_uri, $test_uri), LOG_DEBUG, __FILE__, __LINE__);
         return $false_return;
     }