Changeset 150 for dev

Timestamp:

12/12/06 20:06:30 (16 years ago)

Author:

liq

Message:

dev version: small fix to feed_fetcher.php to prevent
1.2.1 version: exi reverted my changes because of 'tag not allowed to change stuff' but with that made the old v1.0 code available again with is partly INCOMPATIBLE with the current mod_v1.2 release (and buggy). updated back to mod ver 1.2 to prevent incompatible code to be spreaded.

cheers
//liq

Location:

dev

Files:

• common/feed.php (modified) (1 diff)
• mods/feed_syndication/feed_fetcher.php (modified) (1 diff)

dev/common/feed.php

@@ -1 +1 @@
 <?php
+
+// liq's feed syndication mod v1.2
+
 @set_time_limit(0);
+header('Content-type: text/xml'); 
+require_once( "class.corp.php" );
+require_once( "class.alliance.php" );
+require_once( "class.killlist.php" );
+require_once( "class.kill.php" );
+require_once( "db.php" );
+require_once( "globals.php" );
 
-// based on liq's feed syndication
-require_once("class.corp.php");
-require_once("class.alliance.php");
-require_once("class.killlist.php");
-require_once("class.kill.php");
-require_once("db.php");
-require_once("globals.php");
+class RSSTable
+{
+    function RSSTable($kill_list) {
+        $this->limit = 0;
+        $this->offset = 0;
+        $this->kill_list_ = $kill_list;
+    }
 
-$html .= "
-<rss version=\"2.0\">
-<channel>
-<title>".KB_TITLE."</title>
-<description>Kill Feed</description>
-<link>".KB_HOST."</link>
-<copyright>".KB_TITLE."</copyright>\n";
+    function setLimit($limit) {
+        $this->limit_ = $limit;
+    }
 
-$klist = new KillList();
-$klist->setPodsNoobShips(true);
-
-if ($_GET['week'])
-{
-    $klist->setWeek($_GET['week']);
-}
-elseif (!$_GET['lastkllid'])
-{
-    $klist->setWeek(date("W"));
-}
-if ($_GET['lastkllid'])
-{
-    if (method_exists($klist, 'setMinKllID'))
-    {
-        $klist->setMinKllID($_GET['lastkllid']);
+    function generate() {
+        $prevdate = "";
+        $this->kill_list_->rewind();
+                
+        while ($kill = $this->kill_list_->getKill())
+        {
+                $rawkill = new Kill( $kill->getID() );
+                
+                $html .= "
+                <item>
+                        <title>".$rawkill->getID()."</title>
+                <description> <![CDATA[ ".$rawkill->getRawMail()." ]]>  </description>
+                <guid>?a=kill_detail&amp;kll_id=".$kill->getID()."</guid>
+            <pubDate>".strftime( "%a, %d %b %Y %T %Z" , strtotime($kill->getTimeStamp()))."</pubDate>
+                </item> "; 
+        }
+        return $html;
     }
 }
 
-if ($_GET['corp'])
+$html .= "
+<rss version=\"2.0\"><channel>
+<title>".KB_TITLE."</title>
+<link>".KB_HOST."</link>
+<copyright>".KB_TITLE."</copyright>";
+
+$klist = new KillList();
+$klist->setOrdered(true);
+$klist->setPodsNoobShips(true);
+
+if ($_GET['corp'] || $_GET['corp_name'])
 {
-    $_GET['corp_name'] = $_GET['corp'];
+        if ($_GET['corp'])
+                $c=$_GET['corp'];
+        if ($_GET['corp_name'])
+                $c=$_GET['corp_name'];
+        $corp = new Corporation();
+        $corp->lookup( urldecode($c) );
 }
-elseif ($_GET['alli'])
+if ($_GET['alli'] || $_GET['alliance_name'])
 {
-    $_GET['alliance_name'] = $_GET['corp'];
-}
-if ($_GET['corp_name'])
-{
-    $corp = new Corporation();
-    $corp->lookup($_GET['corp_name']);
-    if ($_GET['losses'])
-    {
-        $klist->addVictimCorp($corp);
-    }
-    else
-    {
-        $klist->addInvolvedCorp($corp);
-    }
-}
-elseif ($_GET['alliance_name'])
-{
-    $ally = new Alliance();
-    $ally->add($_GET['alliance_name']);
-    if ($_GET['losses'])
-    {
-        $klist->addVictimAlliance($ally);
-    }
-    else
-    {
-        $klist->addInvolvedAlliance($ally);
-    }
+        if ($_GET['alli'])
+                $a=$_GET['alli'];
+        if ($_GET['alliance_name'])
+                $a=$_GET['alliance_name'];
+    $alli = new Alliance();
+    $alli->add( urldecode($a) );  
 }
 
-$kills = array();
-while ($kill = $klist->getKill())
-{
-    $kills[$kill->getID()] = $kill->getTimestamp();
+if ($_GET['week'])
+        $klist->setWeek( $_GET['week'] );
+elseif (!$_GET['lastkllid'])
+        $klist->setWeek( date("W") );
+if ($_GET['lastkllid']) {
+        if (method_exists($klist, 'setMinKllID'))
+        $klist->setMinKllID($_GET['lastkllid']);
 }
-asort($kills);
 
-foreach ($kills as $id => $timestamp)
-{
-        $kill = new Kill($id);
-    $html .= "<item>
-        <title>".$id."</title>
-        <description> <![CDATA[ ".$kill->getRawMail()." ]]>     </description>
-        <guid>?a=kill_detail&amp;kll_id=".$id."</guid>
-    <pubDate>".strftime("%a, %d %b %Y %T %Z" , strtotime($timestamp))."</pubDate>
-        </item>\n";
+if ( $_GET['losses']) {
+        $html .= "<description> Loss Feed v1.2</description>";
+        if (CORP_ID)
+                $klist->addVictimCorp(new Corporation(CORP_ID));
+        if (ALLIANCE_ID)
+                $klist->addVictimAlliance(new Alliance(ALLIANCE_ID));
+        if ($corp)
+                $klist->addInvolvedCorp($corp);
+        if ($alli)
+                $klist->addInvolvedAlliance($alli);
+
+} else {
+        $html .= "<description> Kill Feed v1.2</description>";
+        if (CORP_ID)
+                $klist->addInvolvedCorp(new Corporation(CORP_ID));
+        if (ALLIANCE_ID)
+                $klist->addInvolvedAlliance(new Alliance(ALLIANCE_ID));
+    if ($corp)
+                $klist->addVictimCorp($corp);
+        if ($alli)
+        $klist->addVictimAlliance($alli);
 }
-$html .= "
-</channel>
-</rss>";
 
-if ($_GET['compress'] == '1')
-{
-    echo gzdeflate($html);
-}
-else
-{
-    echo $html;
-}
+$table = new RSSTable($klist);
+$html .= $table->generate();
+$html .= "</channel></rss>";
+echo $html;
+
 ?>

dev/mods/feed_syndication/feed_fetcher.php

@@ -62 +62 @@
                 xml_set_character_data_handler ( $xml_parser, 'characterData' );
                 $fp = @fopen($url,"r");
-                while ($data = fread($fp, 4096)) {
+                while ($data = @fread($fp, 4096)) {
                         if (!xml_parse( $xml_parser, $data, feof($fp) ) && !feof($fp) )
                                 return "<i>Error getting XML data from ".$url."</i><br><br>";
                 }
-                fclose($fp);
+                @fclose($fp);
                 xml_parser_free($xml_parser);
                 if ($x)