Changeset 778

Timestamp:

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

Author:

JavaWoman

Message:

Aligning LogRefrrer() and LoadReferrers() with (just updated) version in trunk.

refs #562

Files:

• branches/1.1.6.4/libs/Wakka.class.php (modified) (3 diffs)

branches/1.1.6.4/libs/Wakka.class.php

@@ -1220 +1220 @@
         {
                 // fill values
-                if (!$tag = trim($tag)) $tag = $this->GetPageTag();
+                if (!$tag = trim($tag))
+                {
+                        #$tag = $this->GetPageTag();
+                        $tag = $this->tag;
+                }
                 #if (!$referrer = trim($referrer)) $referrer = $_SERVER["HTTP_REFERER"]; NOTICE
                 if (empty($referrer))
@@ -1229 +1233 @@
 
                 // check if it's coming from another site
-                #if ($referrer && !preg_match("/^".preg_quote($this->GetConfigValue("base_url"), "/")."/", $referrer))
-                if (!empty($referrer) && !preg_match("/^".preg_quote($this->GetConfigValue("base_url"), "/")."/", $referrer))
+                #if ($referrer && !preg_match('/^'.preg_quote($this->GetConfigValue('base_url'), '/').'/', $referrer))
+                if (!empty($referrer) && !preg_match('/^'.preg_quote($this->GetConfigValue('base_url'), '/').'/', $referrer))
                 {
                         $parsed_url = parse_url($referrer);
-                        $spammer = $parsed_url["host"];
-                        $blacklist = $this->LoadSingle("select * from ".$this->config["table_prefix"]."referrer_blacklist WHERE spammer = '".mysql_real_escape_string($spammer)."'");
-                        if (!$blacklist) {
-                        $this->Query("insert into ".$this->config["table_prefix"]."referrers set ".
-                                "page_tag = '".mysql_real_escape_string($tag)."', ".
-                                "referrer = '".mysql_real_escape_string($referrer)."', ".
-                                "time = now()");
+                        $spammer = $parsed_url['host'];
+                        $blacklist = $this->LoadSingle("
+                                SELECT *
+                                FROM ".$this->GetConfigValue('table_prefix')."referrer_blacklist
+                                WHERE spammer = '".mysql_real_escape_string($spammer)."'"
+                                );
+                        if (FALSE === $blacklist)
+                        {
+                                $this->Query("
+                                        INSERT INTO ".$this->GetConfigValue('table_prefix')."referrers
+                                        SET page_tag    = '".mysql_real_escape_string($tag)."',
+                                                referrer        = '".mysql_real_escape_string($referrer)."',
+                                                time            = now()"
+                                        );
                         }
                 }
@@ -1245 +1256 @@
         function LoadReferrers($tag = "")
         {
-                return $this->LoadAll("select referrer, count(referrer) as num from ".$this->config["table_prefix"]."referrers ".($tag = trim($tag) ? "where page_tag = '".mysql_real_escape_string($tag)."'" : "")." group by referrer order by num desc");
+                $where = ($tag = trim($tag)) ? "                        WHERE page_tag = '".mysql_real_escape_string($tag)."'" : '';
+                $referrers = $this->LoadAll("
+                        SELECT referrer, COUNT(referrer) AS num
+                        FROM ".$this->GetConfigValue('table_prefix')."referrers".
+                        $where."
+                        GROUP BY referrer
+                        ORDER BY num DESC"
+                        );
+                return $referrers;
         }