Changeset 137

Timestamp:

12/07/06 05:34:28 (14 years ago)

Author:

exi

Message:

Pimped the syndication module.

Location:

dev

Files:

• common/admin_feed.php (modified) (1 diff)
• common/class.killlist.php (modified) (2 diffs)
• common/feed.php (modified) (4 diffs)
• common/feed_fetcher.php (modified) (1 diff)
• templates/icon.tpl (modified) (1 diff)
• templates/kill_detail.tpl (modified) (1 diff)

dev/common/admin_feed.php

@@ -1 @@
-<?
+<?php
+@set_time_limit(0);
+
 // liq's feed syndication mod v1.0
+require_once("class.page.php");
+require_once("db.php");
+require_once("admin_menu.php");
+require_once("feed_fetcher.php");
+require_once("class.killboard.php");
+require_once('class.corp.php');
+require_once('class.alliance.php');
 
-  require_once( "class.page.php" );
-  require_once( "db.php" );
-  require_once( "admin_menu.php" );  
-  require_once( "feed_fetcher.php" );
-  require_once( "class.killboard.php" );
-  
-  $page = new Page( "Administration - Feeds" );
-  $page->setAdmin();
-  $killboard = new Killboard( KB_SITE );
-  
-  $validurl = "/^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}((:[0-9]{1,5})?\/.*)?$/i";  
-    
-  $html .= "<table class=kb-subtable>";
-  
-        if ( $_POST['fetch'] ) {
-                $i=1;
-                while ( $i <= 5 ) {
-                        @set_time_limit(0); 
-                        $feed = new Fetcher();
-                        $url = "fetch_url_".$i;
-                        if ( preg_match( $validurl ,$config->getConfig($url) )) {
-                        
-                                if ( $_POST['graball'] ) {
-                                        $l=1; 
-                                        while ( $l <= 52 ) {
-                                                $html .= "<b>Week: ". $l ."</b><br>";
-                                                $html .= $feed->generate( $config->getConfig($url)."&week=".$l );
-                                                $l++;
-                                        }
-                            } else
-                                $html .= $feed->generate( $config->getConfig($url) );
-                        }
-                        $i++;
-                }
-        }
+$page = new Page("Administration - Feeds");
+$page->setAdmin();
+$killboard = new Killboard(KB_SITE);
 
-        if ( $_POST['submit'] ) {
-        
-                $i=1;
-                while ( $i <= 5 ) {
-                        $url = "fetch_url_".$i;
-                        if ( preg_match($validurl ,$_POST[$url]) )
-                                $config->setConfig($url, $_POST[$url]);         
-                else 
-                                $config->setConfig($url, '');
-                        $i++;
-                }
-        } 
+// the rig0r basecode does not have this functions
+function setConfig($key, $value)
+{
+    global $config;
 
-  $html .= "<br><form id=options name=options method=post action=?a=admin_feed>";
-  $html .= "<input type=submit id=submit name=fetch value=\"Fetch\">";
-  $html .= "<br><br><input type=checkbox name=graball id=graball>grab ALL kills from the feed servers? <br> <i>(use this may take upto several hours depending on the amount of kills to import!)</i>";
-  $html .= "</form></table><br>";
-  
-  $html .= "<table class=kb-subtable>";
-  $html .= "<div class=block-header2>Feed options</div>";
-  $html .= "<form id=options name=options method=post action=?a=admin_feed>";
-  $html .= "Feed url #1<input type=text name=fetch_url_1 size=50 class=password value=\"".$config->getConfig('fetch_url_1')."\"><br><br>";
-  $html .= "Feed url #2<input type=text name=fetch_url_2 size=50 class=password value=\"".$config->getConfig('fetch_url_2')."\"><br><br>";
-  $html .= "Feed url #3<input type=text name=fetch_url_3 size=50 class=password value=\"".$config->getConfig('fetch_url_3')."\"><br><br>";
-  $html .= "Feed url #4<input type=text name=fetch_url_4 size=50 class=password value=\"".$config->getConfig('fetch_url_4')."\"><br><br>";
-  $html .= "Feed url #5<input type=text name=fetch_url_5 size=50 class=password value=\"".$config->getConfig('fetch_url_5')."\"><br><br>";
-  $html .= "<i>Example: http://killboard.eve-d2.com/?a=feed</i>"; 
-  $html .= "<br><br><br><input type=submit id=submit name=submit value=\"Save\">";
-  $html .= "</form></table>"; 
+    if (method_exists($config, 'setConfig'))
+    {
+        return $config->setConfig($key, $value);
+    }
 
-  $page->addContext( $menubox->generate() );
-  $page->setContent( $html );
-  $page->generate();
-        
+    $qry = new DBQuery();
+    $qry->execute("select cfg_value from kb3_config
+                   where cfg_key = '".$key."' and cfg_site = '".KB_SITE."'");
+    if ($qry->recordCount())
+    {
+        $sql = "update kb3_config set cfg_value = '".$value."'
+                where cfg_site = '".KB_SITE."' and cfg_key = '".$key."'";
+    }
+    else
+    {
+        $sql = "insert into kb3_config values ( '".KB_SITE."','".$key."','".$value."' )";
+    }
+    $qry->execute($sql);
+}
+
+function getConfig($key)
+{
+    global $config;
+
+    if (method_exists($config, 'getConfig'))
+    {
+        return $config->getConfig($key);
+    }
+    $qry = new DBQuery();
+    $qry->query("select ".$key." from kb3_config where cfg_site = '".KB_SITE."'");
+    $row = $qry->getRow();
+    if (isset($row[$key]))
+    {
+        return $row[$key];
+    }
+    return false;
+}
+
+$validurl = "/^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}((:[0-9]{1,5})?\/.*)?$/i";
+
+$html .= "<table class=\"kb-subtable\">";
+
+$feed = array();
+for ($i = 1; $i<=5; $i++)
+{
+    $str = getConfig('fetch_url_'.$i);
+    $tmp = explode(':::', $str);
+    $feed[$i] = $tmp[0];
+    $time[$i] = $tmp[1];
+}
+
+if ($_POST['fetch'])
+{
+    $i = 1;
+    while ($i <= 5)
+    {
+        $feedfetch = new Fetcher();
+        $url = "fetch_url_".$i;
+        if (preg_match($validurl , $feed[$i]))
+        {
+            $str = '';
+            if (CORP_ID)
+            {
+                $corp = new Corporation(CORP_ID);
+                $str = '&corp_name='.urlencode($corp->getName());
+            }
+            else
+            {
+                $all = new Alliance(ALLIANCE_ID);
+                $str = '&alliance_name='.urlencode($all->getName());
+            }
+            if ($time[$i])
+            {
+                $str .= '&lastkllid='.$time[$i];
+            }
+
+            if ($_POST['graball'])
+            {
+                $l = 1;
+                while ($l <= 52)
+                {
+                    $html .= "<b>Week: ".$l."</b><br>";
+                    $html .= $feedfetch->generate($feed[$i]."&week=".$l.$str);
+                    $l++;
+                }
+            }
+            else
+            {
+                $html .= $feedfetch->generate($feed[$i].$str);
+            }
+            setConfig($url, $feed[$i].':::'.$lastkllid);
+            $time[$i] = $lastkllid;
+        }
+        $i++;
+    }
+}
+
+if ($_POST['submit'])
+{
+    $i = 1;
+    while ($i <= 5)
+    {
+        $url = "fetch_url_".$i;
+        if (preg_match($validurl , $_POST[$url]))
+        {
+            setConfig($url, $_POST[$url].':::'.$time[$i]);
+            $feed[$i] = $_POST[$url];
+        }
+        else
+        {
+            setConfig($url, '');
+        }
+        $i++;
+    }
+}
+
+$html .= "<br><form id=options name=options method=post action=?a=admin_feed>";
+$html .= "<input type=submit id=submit name=fetch value=\"Fetch\">";
+$html .= "<br><br><input type=checkbox name=graball id=graball>grab ALL kills from the feed servers? <br> <i>(use this may take upto several hours depending on the amount of kills to import!)</i>";
+$html .= "</form></table><br>";
+
+$html .= "<table class=kb-subtable>";
+$html .= "<div class=block-header2>Feed options</div>";
+$html .= "<form id=options name=options method=post action=?a=admin_feed>";
+$html .= "Feed url #1<input type=text name=fetch_url_1 size=50 class=password value=\"".$feed[1]."\"><br><br>";
+$html .= "Feed url #2<input type=text name=fetch_url_2 size=50 class=password value=\"".$feed[2]."\"><br><br>";
+$html .= "Feed url #3<input type=text name=fetch_url_3 size=50 class=password value=\"".$feed[3]."\"><br><br>";
+$html .= "Feed url #4<input type=text name=fetch_url_4 size=50 class=password value=\"".$feed[4]."\"><br><br>";
+$html .= "Feed url #5<input type=text name=fetch_url_5 size=50 class=password value=\"".$feed[5]."\"><br><br>";
+$html .= "<i>Example: http://killboard.eve-d2.com/?a=feed</i>";
+$html .= "<br><br><br><input type=submit id=submit name=submit value=\"Save\">";
+$html .= "</form></table>";
+
+$page->addContext($menubox->generate());
+$page->setContent($html);
+$page->generate();
 ?>

dev/common/class.killlist.php

@@ -188 +188 @@
                 $this->sql_ = $nsql;
             }
+            if ($this->minkllid_)
+            {
+                $this->sql_ .= ' WHERE kll.kll_id > \''.$this->minkllid_.'\' ';
+            }
+
             // group by
             if ($this->groupby_) $this->sql_ .= " group by " . implode(",", $this->groupby_);
@@ -414 +419 @@
     }
 
+    function setMinKllID($id)
+    {
+        $this->timeframe_ = '';
+        $this->minkllid_ = $id;
+    }
+
     function getCount()
     {

dev/common/feed.php

@@ -1 +1 @@
 <?php
+@set_time_limit(0);
+
 // liq's feed syndication mod v1.0
-
-header('Content-type: text/xml'); 
 require_once("class.corp.php");
 require_once("class.alliance.php");
@@ -28 +28 @@
         $prevdate = "";
         $this->kill_list_->rewind();
-                
+
         while ($kill = $this->kill_list_->getKill())
         {
-                $rawkill = new Kill( $kill->getID() );
-                
-                $html .= "
+            $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> "; 
+            <pubDate>".strftime("%a, %d %b %Y %T %Z" , strtotime($kill->getTimeStamp()))."</pubDate>
+                </item> ";
         }
         return $html;
     }
 }
-  
 
 $html .= "
@@ -58 +57 @@
 $klist->setPodsNoobShips(true);
 
-if ($_GET['week']) {
-        @set_time_limit(0);
-        $klist->setWeek( $_GET['week'] );
+if ($_GET['week'])
+{
+    $klist->setWeek($_GET['week']);
 }
-else 
-        $klist->setWeek( date("W") );
+elseif (!$_GET['lastkllid'])
+{
+    $klist->setWeek(date("W"));
+}
+if ($_GET['lastkllid'])
+{
+    if (method_exists($klist, 'setMinKllID'))
+    {
+        $klist->setMinKllID($_GET['lastkllid']);
+    }
+}
 
-if (CORP_ID)
-    $klist->addInvolvedCorp(new Corporation(CORP_ID));
-if (ALLIANCE_ID)
-    $klist->addInvolvedAlliance(new Alliance(ALLIANCE_ID));
+if ($_GET['corp_name'])
+{
+    $corp = new Corporation();
+    $corp->lookup($_GET['corp_name']);
+    $klist->addInvolvedCorp($corp);
+}
+elseif ($_GET['alliance_name'])
+{
+    $ally = new Alliance();
+    $ally->add($_GET['alliance_name']);
+    $klist->addInvolvedAlliance($ally);
+}
 
 $table = new RSSTable($klist);
@@ -76 +92 @@
 </channel>
 </rss>";
- 
+
 echo $html;
-
 ?>

dev/common/feed_fetcher.php

@@ -1 +1 @@
 <?php
+@set_time_limit(0);
 // liq's feed syndication mod v1.0
+require_once("class.page.php");
+require_once("class.kill.php");
+require_once("class.parser.php");
 
-  require_once( "class.page.php" );
-  require_once( "class.kill.php" );
-  require_once( "class.parser.php" );
-  
-   
-$insideitem = false; 
+$insideitem = false;
 $tag = "";
 $title = "";
 $description = "";
 $link = "";
-$x=0;
+$x = 0;
 
-class Fetcher 
+class Fetcher
 {
- 
-function generate($url) { 
-                global $x;
-                @set_time_limit(0);  
-        $xml_parser = xml_parser_create();
-                xml_set_object ( $xml_parser, $this );
-                xml_set_element_handler($xml_parser, "startElement", "endElement");       
-                xml_set_character_data_handler ( $xml_parser, 'characterData' );  
-                $fp = @fopen($url,"r");
-                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);
-                xml_parser_free($xml_parser);
-                if ($x)
-                        $html = "<div class=block-header2>".$x." kills added from feed: ".$url."</div>";
-                else
-                        $html = "<div class=block-header2>No kills added from feed: ".$url."</div>";
-                
-return $html; 
-}
+    function generate($url, $lastkllid = 0)
+    {
+        global $x;
 
-function startElement($parser, $name, $attrs) {
-        global $insideitem, $tag, $title, $description, $link;
-        if ($insideitem) {
-                $tag = $name;
-        } elseif ($name == "ITEM") {
-                $insideitem = true;
-        }
-}
+        $xml_parser = xml_parser_create();
+        xml_set_object($xml_parser, $this);
+        xml_set_element_handler($xml_parser, "startElement", "endElement");
+        xml_set_character_data_handler ($xml_parser, 'characterData');
 
-function endElement($parser, $name) {
-        global $insideitem, $tag, $title, $description, $link, $html, $x;
+        $fp = @fopen($url, "r");
+        $file = '';
+        while ($data = fread($fp, 4096))
+        {
+            $file .= $data;
+        }
+        fclose($fp);
 
-        if ($name == "ITEM") {
-                if ( isset( $description ) ) {
-                        $parser = new Parser( $description );
-                $killid = $parser->parse( true );
-                if ( $killid == 0 || $killid == -1 || $killid == -2 || $killid == -3 ) {
-                        $page = new Page( "Error" );
-                                if ( $killid == 0 )
-                                $html .= "Killmail is malformed.<br>";
-                                if ( $killid == -3 )
-                                $html .= "Killmail does not have a final blow! <p><br>To prevent the corruption of the database please just fake a <i>(laid the final blow)</i> behind one of the involved players on the killmail.<br><br><b>Example:</b><i><br>Name: liquidism (laid the final blow)</i></p>";
-                        if ( $killid == -2 )
-                                        $html .= "Killmail is not related to ".KB_TITLE.".<br>";
-                                if ( $killid == -1 )
-                                        $html .= "Killmail already posted <a href=\"?a=kill_detail&kll_id=".$parser->dupeid_."\">here</a>.<br>";
-                        }               
-                        else {
-                                $qry = new DBQuery();
-                                $qry->execute( "insert into kb3_log     values( ".$killid.", '".KB_SITE."','".$_SERVER['REMOTE_ADDR']."',now() )" );
-                                $html .= "Killmail has succsessfully been posted <a href=\"?a=kill_detail&kll_id=".$killid."\">here</a>.<br>";                  
-                                $x++;
-                        }
-        }
-                $title = "";
-                $description = ""; 
-                $link = "";
-                $insideitem = false;
-        }
-}
+        if (!$file && file_exists('class.http.php'))
+        {
+            include_once('class.http.php');
+            $file = new http($url);
+            $file = $file->get_content();
+        }
+        if (!xml_parse($xml_parser, $file))
+            return "<i>Error getting XML data from ".$url."</i><br><br>";
+        xml_parser_free($xml_parser);
 
-function characterData($parser, $data) {
-        global $insideitem, $tag, $title, $description, $link;
-        if ($insideitem) {
-                switch ($tag) {
-                        case "TITLE":
-                        $title .= $data;
-                        break;
-                        case "DESCRIPTION":
-                        $description .= $data;
-                        break;
-                        case "LINK":
-                        $link .= $data;
-                        break;
-                }
-        }
-}
+        if ($x)
+        {
+            $html = "<div class=block-header2>".$x." kills added from feed: ".$url."</div>";
+        }
+        else
+        {
+            $html = "<div class=block-header2>No kills added from feed: ".$url."</div>";
+        }
 
+        return $html;
+    }
 
+    function startElement($parser, $name, $attrs)
+    {
+        global $insideitem, $tag, $title, $description, $link;
+        if ($insideitem)
+        {
+            $tag = $name;
+        }
+        elseif ($name == "ITEM")
+        {
+            $insideitem = true;
+        }
+    }
 
+    function endElement($parser, $name)
+    {
+        global $insideitem, $tag, $title, $description, $link, $html, $x, $lastkllid;
+
+        if ($name == "ITEM")
+        {
+            if (isset($description))
+            {
+                $parser = new Parser($description);
+                $killid = $parser->parse(true);
+                if ($killid == 0 || $killid == -1 || $killid == -2 || $killid == -3)
+                {
+                    $page = new Page("Error");
+                    if ($killid == 0)
+                        $html .= "Killmail is malformed.<br>";
+                    if ($killid == -3)
+                        $html .= "Killmail does not have a final blow! <p><br>To prevent the corruption of the database please just fake a <i>(laid the final blow)</i> behind one of the involved players on the killmail.<br><br><b>Example:</b><i><br>Name: liquidism (laid the final blow)</i></p>";
+                    if ($killid == -2)
+                        $html .= "Killmail is not related to ".KB_TITLE.".<br>";
+                    if ($killid == -1)
+                        $html .= "Killmail already posted <a href=\"?a=kill_detail&kll_id=".$parser->dupeid_."\">here</a>.<br>";
+                }
+                else
+                {
+                    $qry = new DBQuery();
+                    $qry->execute("insert into kb3_log  values( ".$killid.", '".KB_SITE."','".$_SERVER['REMOTE_ADDR']."',now() )");
+                    $html .= "Killmail has succsessfully been posted <a href=\"?a=kill_detail&kll_id=".$killid."\">here</a>.<br>";
+                    $x++;
+                }
+            }
+            if (trim($title) > $lastkllid || $lastkllid == 0)
+            {
+                $lastkllid = trim($title);
+            }
+            $title = "";
+            $description = "";
+            $link = "";
+            $insideitem = false;
+        }
+    }
+
+    function characterData($parser, $data)
+    {
+        global $insideitem, $tag, $title, $description, $link;
+        if ($insideitem)
+        {
+            switch ($tag)
+            {
+                case "TITLE":
+                    $title .= $data;
+                    break;
+                case "DESCRIPTION":
+                    $description .= $data;
+                    break;
+                case "LINK":
+                    $link .= $data;
+                    break;
+            }
+        }
+    }
 }
 ?>

dev/templates/icon.tpl

@@ -1 +1 @@
 <!-- icon.tpl -->
-<div class=item-icon style="background:url({$img}); height:32px; width:32px"><img src="{$icon}" /></div>
+<div class="item-icon" style="background: url({$img}); border: none; height:32px; width:32px"><img border="0" src="{$icon}"/></div>
 <!-- /icon.tpl -->

dev/templates/kill_detail.tpl

@@ -64 +64 @@
 {if $slot.items}
                 <tr class="kb-table-row-even">
-                    <td width="32"><img src="img/{$slot.img}" alt="{$slot.text}" border="0"></td>
+                    <td class="item-icon" width="32"><img src="img/{$slot.img}" alt="{$slot.text}" border="0"></td>
                     <td colspan="2" class="kb-table-cell"><b>{$slot.text}</b> </td>
     {if $config->getConfig('item_values')}