Changeset 386

Timestamp:

06/21/09 14:00:25 (13 years ago)

Author:

kovell

Message:

Fetch properly ignores non-api kills when requested.
missing subsystem slot icon

Location:

dev

Files:

• common/admin/feed_fetcher.php (modified) (4 diffs)
• common/includes/globals.php (modified) (1 diff)
• cron/cron_fetcher.php (modified) (7 diffs)
• img/icon76_04.png (added)

dev/common/admin/feed_fetcher.php

@@ -53 +53 @@
         function grab($url, $str, $trackfriend = '', $trackkey = '')
         {
-                global $x, $uurl, $feedversion;
+                global $x, $uurl, $feedversion, $apikills;
                 //                $this->trackurl_ = $trackurl;
                 $this->trackfriend_ = $trackfriend;
@@ -59 +59 @@
                 $x=0;
                 $fetchurl = $url.$str."&board=".urlencode(KB_TITLE);
+                if(strpos($fetchurl, 'apikills=1')) $apikills = true;
+                else $apikills = false;
                 if(!strpos($fetchurl,'?')) $fetchurl =
                                 substr_replace($fetchurl,'?', strpos($fetchurl,'&'),0);
@@ -120 +122 @@
         function endElement($parser, $name)
         {
-                global $insideitem, $tag, $title, $description, $link, $html, $x, $uurl, $apiID;
+                global $insideitem, $tag, $title, $description, $link, $html, $x, $uurl, $apiID, $apikills;
 
                 if ($name == "ITEM")
@@ -144 +146 @@
                                         }
                                 }
-                                else
+                                elseif(!$apikills)
                                 {
                                         $parser = new Parser( $description );

dev/common/includes/globals.php

@@ -7 +7 @@
 else
 {
-        $svn_rev = '383';
+        $svn_rev = '386';
 }
 define('SVN_REV', $svn_rev);

dev/cron/cron_fetcher.php

@@ -1 +1 @@
 #!/usr/bin/php
 <?php
-// ////
-// ////  //////
-// ////  liq's feed syndication mod v1.6
-// //////////
-// //////////
-// //////////
-// //////////
+/*
+ * EDK Feed Syndication v1.7
+ * based on liq's feed syndication mod v1.5
+ *
+ */
+
 // set this to 1 if you are running a master killboard and want
 // to even fetch mails not related to your corp / alliance
-define(MASTER, 0);
+define('MASTER', 0);
 
-$version = "v1.6";
 @set_time_limit(0);
 
@@ -19 +17 @@
 //die();
 $KB_HOME = ereg_replace('[/\\]cron$', '', getcwd());
-chdir($KB_HOME); 
+chdir($KB_HOME);
 
 require_once('kbconfig.php');
@@ -63 +61 @@
     $myid = '&alli=' . urlencode($alli->getName());
 }
+define('KB_TITLE', config::get('cfg_kbtitle'));
+define('DB_USE_CCP', true);
 
 $year = gmdate("Y");
@@ -71 +71 @@
 
 $feed = array();
+$friend = array();
 for ($i = 1; $i <= $feedcount; $i++)
 {
@@ -79 +80 @@
     if ($tmp[2] == "on")
         $friend[$i] = $tmp[2];
+        if ($tmp[3] == "on")
+        $apikills[$i] = $tmp[3];
     $feedfetch = new Fetcher();
     if (preg_match($validurl , $feed[$i]))
@@ -90 +93 @@
         if ($friend[$i])
             $str .= '&friend=1';
+                if ($apikills[$i])
+                        $str .= '&apikills=1';
         if (!config::get('fetch_compress'))
             $str .= "&gz=1";
@@ -107 +112 @@
             {
                 //Fetch final kill id of board from feed if possible and set as new last kill.
-                if(intval($feedfetch->finalkllid_)> $feedlast[$i]) 
+                if(intval($feedfetch->finalkllid_)> $feedlast[$i])
                     config::set("fetch_url_" . $i, $feed[$i] . ':::' . intval($feedfetch->finalkllid_) . ':::' . $friend[$i]);
                 else config::set("fetch_url_" . $i, $feed[$i] . ':::' . $feedlast[$i] . ':::' . $friend[$i]);