Changeset 389

Timestamp:

06/22/09 14:03:23 (11 years ago)

Author:

kovell

Message:

Feed marks api-only feeds. Fetcher properly stores api flag for feed. Searches are trimmed of whitespace. html fix.

Location:

dev

Files:

• common/admin/feed_fetcher.php (modified) (1 diff)
• common/feed.php (modified) (4 diffs)
• common/search.php (modified) (1 diff)
• templates/index.tpl (modified) (1 diff)

dev/common/admin/feed_fetcher.php

@@ -153 +153 @@
                                 if($this->trackkey_ != '' && $this->tracklast_ < intval($title) && intval($title) > 0)
                                 {
-                                        config::set($this->trackkey_, $uurl . ':::' . intval($title) . ':::' . $this->trackfriend_);
+                                        if($apikills)
+                                                config::set($this->trackkey_, $uurl . ':::' . intval($title) . ':::' . $this->trackfriend_ . ':::on' );
+                                        else
+                                                config::set($this->trackkey_, $uurl . ':::' . intval($title) . ':::' . $this->trackfriend_ . ':::' );
                                 }
                                 if ( $killid == 0 || $killid == -1 || $killid == -2 || $killid == -3)

dev/common/feed.php

@@ -33 +33 @@
         <title>'.KB_TITLE.'</title>
         <link>'.KB_HOST.'</link>
-        <description>Kill Feed v1.6</description>
+        <description>Kill Feed '.$feedversion.'</description>
         <copyright>'.KB_TITLE."</copyright>\n";
 if($_GET['combined']) $html .= "<combined>true</combined>\n";
+if($_GET['APIkills']) $html .= "<apikills>true</apikills>\n";
 $klist = new KillList();
 $klist->setPodsNoobShips(true);
@@ -44 +45 @@
         $klist->setWeek($w);
 }
-elseif (!$_GET['lastkllid'])
+elseif (!isset($_GET['lastkllid']))
 {
         $klist->setWeek(kbdate("W"));
@@ -54 +55 @@
         $klist->setYear($y);
 }
-elseif (!$_GET['lastkllid'])
+elseif (!isset($_GET['lastkllid']))
 {
         $klist->setYear(kbdate("Y"));
@@ -60 +61 @@
 
 $kid = intval($_GET['lastkllid']);
-if ($kid)
+if (isset($_GET['lastkllid']))
 {
         $klist->setMinKllID($kid);

dev/common/search.php

@@ -15 +15 @@
 $searchphrase = slashfix($_REQUEST['searchphrase']);
 $searchphrase = preg_replace('/\*/', '%', $searchphrase);
+$searchphrase = trim($searchphrase);
 if ($searchphrase != "" && strlen($searchphrase) >= 3)
 {

dev/templates/index.tpl

@@ -31 +31 @@
 <img src="banner/{$banner}" border="0" alt="Banner"></a>
 {else}
-<a href="?a=home"><img src="banner/{$banner}" border="0"></a>
+<a href="?a=home"><img src="banner/{$banner}" border="0" alt="Banner"></a>
 {/if}
 {/if}