Changeset 777

Timestamp:

10/23/2007 04:49:10 PM (3 years ago)

Author:

JavaWoman

Message:

merging NOTICE fix from 1.1.6.4 [776] back to trunk

Files:

• trunk/libs/Wakka.class.php (modified) (9 diffs)

trunk/libs/Wakka.class.php

@@ -574 +574 @@
         /**
          * Generate a timestamp - OBSOLETE.
-         * 
+         *
          * DISABLED: replaced by getmicrotime() in Compatibility library!
          * Left in place but returning just zero for now.
@@ -1163 +1163 @@
          * @todo        decide if we need (all) these methods!
          *                      JW: my vote is NOT if all a getter does is return a variable directly;
-         *                      but useful if there's some processing or checking involved - 
+         *                      but useful if there's some processing or checking involved -
          *                      in which case an accompanying "setter" method should be used
          *                      for creating/updating the variable - if only for consistency.
@@ -2780 +2780 @@
          * to a wikkapage via XHTML tag attributes that expect a URL, such as href,
          * src, or archive tags, or attributes in elements in XML/RSS.
-         * 
+         *
          * Its main purpose is to avoid "path confusion" when a relative URL would be
          * attached to a <b>rewritten</b> (base) URL; without rewriting there's no
@@ -3017 +3017 @@
                         $tag = '';      // Href() will pick up current page name if none specified
                 }
-                
+
                 // form action (action is a required attribute!)
                 // !!! If rewrite mode is off, "tag" has to be passed as a hidden field
@@ -3145 +3145 @@
         function LogReferrer($tag = '', $referrer = '')
         {
+                /* better fix farther on
                 if (!isset($_SERVER['HTTP_REFERER']))
                 {
                         return; #38
                 }
+                */
 
                 // fill values
@@ -3156 +3158 @@
                         $tag = $this->tag;
                 }
-                if (!$referrer = trim($referrer))
-                {
-                        $referrer = $_SERVER['HTTP_REFERER'];
-                }
-                $referrer = $this->cleanUrl($referrer);                 # secured JW 2005-01-20
+                if (empty($referrer))
+                {
+                        $referrer = (isset($_SERVER['HTTP_REFERER'])) ? $_SERVER['HTTP_REFERER'] : '';  #38
+                }
+                $referrer = trim($this->cleanUrl($referrer));                   # secured JW 2005-01-20
 
                 // check if it's coming from another site
                 #if ($referrer && !preg_match('/^'.preg_quote($this->GetConfigValue('base_url'), '/').'/', $referrer))
-                if ($referrer && !preg_match('/^'.preg_quote($this->base_url, '/').'/', $referrer))
+                if (!empty($referrer) && !preg_match('/^'.preg_quote($this->base_url, '/').'/', $referrer))
                 {
                         $parsed_url = parse_url($referrer);
@@ -3358 +3360 @@
          * @access      public
          * @uses        Wakka::GetConfigValue()
-         * 
+         *
          * @param       string  $handler        handler name, optionally with appended parameters
          * @return      boolean TRUE if handler is found, FALSE otherwise
@@ -3438 +3440 @@
         /**
          * Authenticate a user from (persistent) cookies.
-         * 
+         *
          * @uses        Wakka::GetConfigValue()
          * @uses        Wakka::LoadAll()
@@ -3606 +3608 @@
          * {@link Wakka::existsUser()} or {@link Wakka::loadUserData()} depending on
          * purpose!</b>
-         * 
+         *
          * ***Returns FALSE while still existing for reference.***
          *