Changeset 170

Timestamp:

01/06/07 16:35:16 (16 years ago)

Author:

liq

Message:

fliq's feed syndication mod 1.4

Location:

dev

Files:

• common/feed.php (modified) (2 diffs)
• mods/feed_syndication/feed_fetcher.php (modified) (4 diffs)
• mods/feed_syndication/readme.txt (modified) (5 diffs)
• mods/feed_syndication/settings.php (modified) (15 diffs)
• mods/feed_syndication/v1.3 (deleted)
• mods/feed_syndication/v1.4 (added)

dev/common/feed.php

@@ -1 +1 @@
 <?php
-// liq's feed syndication mod v1.3
+        //////
+//////  //////
+//////  liq's feed syndication mod v1.4
+////////////
+////////////
+////////////
+////////////
+ 
 
 @set_time_limit(0);
@@ -7 +14 @@
 require_once("class.killlist.php");
 require_once("class.kill.php");
+require_once("db.php");
+require_once("globals.php");
 
-$html .= "<rss version=\"2.0\">
-<channel>
-<title>".KB_TITLE."</title>
-<description>Kill Feed v1.3</description>
-<link>".KB_HOST."</link>
-<copyright>".KB_TITLE."</copyright>\n";
+  $html .= "<rss version=\"2.0\">
+        <channel>
+        <title>" . KB_TITLE . "</title>
+        <link>http://" . KB_HOST . "</link>
+        <description>Kill Feed v1.4</description>
+        <copyright>" . KB_TITLE . "</copyright>\n";
+  
+  $klist = new KillList();
+  $klist->setPodsNoobShips(true);
+  
+  if ($_GET['week'])
+  {
+      $klist->setWeek($_GET['week']);
+  }
+  elseif (!$_GET['lastkllid'])
+  {
+      $klist->setWeek(date("W"));
+  }
+  
+  if ($_GET['year'])
+  {
+      $klist->setYear($_GET['year']);
+  }
+  elseif (!$_GET['lastkllid'])
+  {
+      $klist->setYear(date("Y"));
+  }    
+  
+  if ($_GET['lastkllid'] && method_exists($klist, 'setMinKllID'))
+  {
+          $klist->setMinKllID($_GET['lastkllid']);
+  }
+  
+  if ($_GET['corp'] || $_GET['corp_name'])
+  {
+      if ($_GET['corp'])
+      {
+          $c = $_GET['corp'];
+      }
+      if ($_GET['corp_name'])
+      {
+          $c = $_GET['corp_name'];
+      }
+      $corp = new Corporation();
+      $corp->lookup(urldecode($c));
+  }
+  
+  if ($_GET['alli'] || $_GET['alliance_name'])
+  {
+      if ($_GET['alli'])
+      {
+          $a = $_GET['alli'];
+      }
+      if ($_GET['alliance_name'])
+      {
+          $a = $_GET['alliance_name'];
+      }
+      $alli = new Alliance();
+      $alli->add(urldecode($a));
+  }
+  
+  if ($_GET['losses'])
+  {
+      if (CORP_ID) //local 
+      {
+          $klist->addVictimCorp(new Corporation(CORP_ID));
+      }
+      if (ALLIANCE_ID) //local 
+      {
+          $klist->addVictimAlliance(new Alliance(ALLIANCE_ID));
+      }
+      if ($corp && !$_GET['friend']) //remote
+      {
+          $klist->addInvolvedCorp($corp);
+      }
+      if ($alli && !$_GET['friend']) //remote
+      {
+          $klist->addInvolvedAlliance($alli);
+      }
+  }
+  else
+  {
+      if (CORP_ID) //local 
+      {
+          $klist->addInvolvedCorp(new Corporation(CORP_ID));
+      }
+      if (ALLIANCE_ID) //local 
+      {
+          $klist->addInvolvedAlliance(new Alliance(ALLIANCE_ID));
+      }
+      if ($corp && !$_GET['friend']) //remote
+      {
+          $klist->addVictimCorp($corp);
+      }
+      if ($alli && !$_GET['friend']) //remote
+      {
+          $klist->addVictimAlliance($alli);
+      }
+  }
+  
+  $kills = array();
+  while ($kill = $klist->getKill())
+  {
+      $kills[$kill->getID()] = $kill->getTimestamp();
+  }
+  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";
+  }
+  
+  $html .= "</channel></rss>";
+  
+  if ($_GET['gz'])
+  {
+      echo gzdeflate($html, 9);
+  }
+  else
+  {
+      echo $html;
+  }
+?>
 
-$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']);
-    }
-}
-
-if ($_GET['corp'] || $_GET['corp_name'])
-{
-    if ($_GET['corp'])
-    {
-        $c = $_GET['corp'];
-    }
-    if ($_GET['corp_name'])
-    {
-        $c = $_GET['corp_name'];
-    }
-    $corp = new Corporation();
-    $corp->lookup(urldecode($c));
-}
-
-if ($_GET['alli'] || $_GET['alliance_name'])
-{
-    if ($_GET['alli'])
-    {
-        $a = $_GET['alli'];
-    }
-    if ($_GET['alliance_name'])
-    {
-        $a = $_GET['alliance_name'];
-    }
-    $alli = new Alliance();
-    $alli->add(urldecode($a));
-}
-
-if ($_GET['week'])
-{
-    $klist->setWeek($_GET['week']);
-}
-elseif (!$_GET['lastkllid'])
-{
-    $klist->setWeek(date("W"));
-}
-
-if ($_GET['losses'])
-{
-    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
-{
-    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);
-    }
-}
-
-$kills = array();
-while ($kill = $klist->getKill())
-{
-    $kills[$kill->getID()] = $kill->getTimestamp();
-}
-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";
-}
-$html .= "</channel>
-</rss>";
-
-if ($_GET['gz'] || $_GET['compress'] == 1)
-{
-    echo gzdeflate($html, 9);
-}
-else
-{
-    echo $html;
-}
-?>

dev/mods/feed_syndication/feed_fetcher.php

@@ -2 +2 @@
         //////
 //////  //////
-//////  liq's feed syndication mod v1.3
+//////  liq's feed syndication mod v1.4
 ////////////
 ////////////
@@ -10 +10 @@
 
 @set_time_limit(0);
+@ini_set('memory_limit',999999999);
+
 require_once( "common/class.kill.php" );
 require_once( "common/class.parser.php" );
 if ( file_exists("../../common/class.comments.php") ) // for the Eve-Dev Comment Class
-        require_once( "class.comments.php" );
+        require_once( "common/class.comments.php" );
 if ( file_exists("../../common/class.comment.php") ) // for the D2 Killboard Comment Class
-        require_once( "class.comment.php" );
+        require_once( "common/class.comment.php" );
 
 $insideitem = false;
@@ -81 +83 @@
                 }       
                 
-                if (!xml_parse( $xml_parser, $data, feof($fp) ) && !feof($fp) )
+                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." <i>(".$cprs.")</i></div>";
-                else
-                        $html .= "<div class=block-header2>No kills added from feed: ".$url." <i>(".$cprs.")</i></div>";
-                //echo "url:".$url." --- ";
-                //echo " strg:".$str;
+
+                if ( getConfig('fetch_verbose') ) {
+                        if ($x)
+                                $html .= "<div class=block-header2>".$x." kills added from feed: ".$url."<br>".$str." <i><br>(".$cprs.")</i><br><br></div>";
+                        else
+                                $html .= "<div class=block-header2>No kills added from feed: ".$url."<br>".$str." <i><br>(".$cprs.")</i><br><br></div>";
+                } else {
+                        if ($x)
+                                $html .= "<div class=block-header2>".$x." kills added from feed: ".$url." <i>(".$cprs.")</i><br><br></div>";
+                        else
+                                $html .= "<div class=block-header2>No kills added from feed: ".$url." <i>(".$cprs.")</i><br><br></div>";
+                }
                 
 return $html;
@@ -161 +168 @@
 
 }
-
 ?>

dev/mods/feed_syndication/readme.txt

@@ -1 +1 @@
         //////
 //////  //////
-//////  liq's feed syndication mod v1.3
+//////  liq's feed syndication mod v1.4
 ////////////
 ////////////
@@ -11 +11 @@
 //INSTALLATION:
 
+### --> STANDALONE version:
+1. put all files in your /common directory
+
+2. add the following line to common/admin_menu.php:
+$menubox->addOption( "Feeds", "?a=admin_feed" );
+or if you use eve-dev kilboard version 1.2.0 and above (using smarty templates):
+$menubox->addOption("link", "Feeds", "?a=admin_feed");
+
+3. wee. youre done.
+
+4. you can access the feed interface now via the menubox in admin menu 
+
+
+### --> MOD version:
 1. create directory mods/feed
+
 2. put the files settings.php and feed_fetcher.php in /mods/feed_syndication directory.
+
 3. put feed.php in your /common directory
+
 3. login as admin and enable the feed-mod in 'Mods'
+
 4. wee. youre done.
 
+5. click 'Settings' in the 'Mods' menu to access the feed interface
+
 additionally you can add the following line to common/admin_menu.php for direct access:
-$menubox->addOption( "Feeds", "?a=settings_feed_syndication" );
+$menubox->addOption( "Feeds", "?a=settings_feed" );
 or if you use eve-dev kilboard version 1.2.0 and above (using smarty templates):
-$menubox->addOption("link", "Feeds", "?a=settings_feed_syndication");
+$menubox->addOption("link", "Feeds", "?a=settings_feed");
 
 
@@ -38 +58 @@
 -> enter feed urls in the format: http://killboard.eve-d2.com/?a=feed
 
--> a list of known feeds can be found here: http://www.eve-dev.net/e107_plugins/forum/forum_viewtopic.php?1896
+-> a list of known feeds can be found here: http://myeve.eve-online.com/ingameboard.asp?a=topic&threadID=443506&page=1#2
 
--> clicking the 'fetch' button will get all kills of the actual week.
+-> your actual week is automatically selected in the first and last week boxes.
 
--> ticking the 'grab-ALL-mails-box' will grab the kills of ALL weeks (iteration from week #1 through to week #52)!
-** be careful with this option! it can take several minutes or even hours to have all the kills parsed and added to your database **
-** be patient. don't close your browser, don't reload. you only need to use this ONCE to initialize a feed connection.
-after initializing, weekly updates are totally sufficient to keep your board uptodate **
+-> clicking the 'fetch' button will by default get all kills of the actual week unless you select a different timeframe.
+
+-> selecting a timeframe with the first and last week boxes lets the fetcher get all mails of this timeframe.
+** be careful with this option! it can take several minutes or even hours to have all 
+the kills parsed and added to your database, especially if you select a really long timeframe **
+** be patient. don't close your browser, don't reload. after doing a full fetch first, weekly updates are totally sufficient to keep your board uptodate **
+
 
 -> by default their kills aka. your losses get fetched unless you tick the 'get kills'
@@ -53 +76 @@
 checks and decides if a fetched stream supports GZip compression - if not it uses regular html/rss output.
 
+
 -> if you are running a master killboard (eg. to supply and share killdata with other killboards) edit settings.php and set 'MASTER' to 1.
 the board will then even fetch kills not related to the alliance or corp ID you set in the killboards config.php.
-leave this option untouched if youre running a normal killboard for your corp or alliance - it will just slow things down.
+leave this option untouched if youre running a normal killboard for your corp or alliance - it will just slow things down and
+wont work for you without modifications to the parser class.
 
--> the feed is not supposed to be human readable so ffs dont complain about the formatting,
+-> the feed is not supposed to be human readable so ffs dont complain about the formatting.
 for human readable rss output use the rss mod ( /?a=rss ) instead.
 
@@ -63 +88 @@
 
 //VERSION CHANGES:
+
+
+//v1.4
+
+feed.php:
+- added selection of the year to output
+- added support for friend<->friend killboard fetching
+- minor code cleanups
+- other stuff i forgot
+
+feed_fetcher.php:
+- added a fix for the memory exhaustion bug some boards had (check if your php is running in php-safe-mode. if so, disable it)
+- improved verbose output
+
+admin_feed.php / settings.php
+- replaced the grab-all switch with an advanced range selection system by week and year
+- added support for friend<->friend killboard fetching
+- minor code cleanups
+- other stuff i forgot
+
 
 //v1.3

dev/mods/feed_syndication/settings.php

@@ -2 +2 @@
         //////
 //////  //////
-//////  liq's feed syndication mod v1.3
+//////  liq's feed syndication mod v1.4
 ////////////
 ////////////
@@ -12 +12 @@
 // to even fetch mails not related to your corp / alliance
 define( MASTER, 0 );
-
-
 
 @set_time_limit(0);
@@ -22 +20 @@
 require_once( 'common/class.alliance.php' );
 
-        $page = new Page( "Administration - Feeds" );
+        $page = new Page( "Administration - Feed Syndication v1.4" );
         $page->setAdmin();
 
@@ -33 +31 @@
                 $feedcount = 3;
 
-
         if ( $_POST['submit'] || $_POST['fetch']  ) {
-                        if ( ctype_digit($_POST['fetch_feed_count']) ) {
-                        setConfig('fetch_feed_count', $_POST['fetch_feed_count']);
+                        if ( ctype_digit($_POST['fetch_feed_count']) && $_POST['fetch_feed_count'] > 0) {
                         $feedcount = $_POST['fetch_feed_count'];
+                        setConfig('fetch_feed_count', $feedcount);
                         for ($i = 99; $i>=$feedcount; $i--) {
                                 delConfig('fetch_url_'.$i);
                         }
                 }
-
                 if ( $_POST['fetch_verbose'] )
                         setConfig('fetch_verbose', '1');
@@ -60 +56 @@
                 for ($i = 1; $i<=$feedcount; $i++) {
                         $url = "fetch_url_".$i;
+                        $friends = $_POST["friend_".$i];
                         if ( preg_match($validurl ,$_POST[$url]) ) {
-                                setConfig($url, $_POST[$url].':::'.$time[$i]);
+                                setConfig($url, $_POST[$url].':::'.$time[$i].':::'.$friends);
                                 $feed[$i] = $_POST[$url];
                 } else
@@ -68 +65 @@
                 }
         }
-
         $feed = array();
         for ($i = 1; $i<=$feedcount; $i++) {
@@ -75 +71 @@
                 $feed[$i] = $tmp[0];
                 $time[$i] = $tmp[1];
+                $friend[$i] = $tmp[2];
         }
-
         if ( $_POST['fetch'] ) {
          if (CORP_ID && !MASTER) {
@@ -85 +81 @@
              $alli = new Alliance(ALLIANCE_ID);
              $myid = '&alli='.urlencode($alli->getName());
-                }
-
+                 }
                  for ($i=1; $i<=$feedcount; $i++) {
                         $feedfetch = new Fetcher();
@@ -92 +87 @@
                         if (preg_match($validurl , $feed[$i]) && $_POST["fetch_feed_".$i]) {
                             $str = '';
-                                if ($time[$i])
-                        $str .= '&lastkllid='.$time[$i];
+                                //if ($time[$i])
+                //      $str .= '&lastkllid='.$time[$i];
+                                if ($friend[$i])
+                        $str .= '&friend=1';
                                 if ( $_POST['fetch_losses'] )
                         $str .= "&losses=1";
                                 if ( !getConfig('fetch_compress') )
                         $str .= "&gz=1";
-                                if ( $_POST['graball'] ) {
-                                        for ($l = 1; $l<=52; $l++) {
+                                if ( $_POST['range1'] && $_POST['range2'] ) {
+                                        if ( $_POST['range1'] > $_POST['range2'] ) {
+                                                $range1 = $_POST['range2'];
+                                                $range2 = $_POST['range1'];
+                                        } else {
+                                                $range1 = $_POST['range1'];
+                                                $range2 = $_POST['range2'];
+                                        }
+                                        for ($l = $range1; $l<=$range2; $l++) {
                                                 $html .= "<b>Week: ". $l ."</b><br>";
-                                                $html .= $feedfetch->grab( $feed[$i]."&week=".$l, $myid.$str );
+                                                $html .= $feedfetch->grab( $feed[$i]."&year=".$_POST['year']."&week=".$l, $myid.$str );
                                         }
                             } else
                                 $html .= $feedfetch->grab( $feed[$i], $myid.$str );
                         }
-
-                    setConfig($cfg, $feed[$i].':::'.$lastkllid);
+                    setConfig($cfg, $feed[$i].':::'.$lastkllid.':::'.$friend);
             $time[$i] = $lastkllid;
                 }
         }
 
-        $html .= "<form id=options name=options method=post action=?a=settings_feed>";
+        $html .= "<form id=options name=options method=post action=?a=settings_feed_syndication>";
     $html .= "</table>";
 
     $html .= "<div class=block-header2>Feeds</div><table>";
-
     for ($i = 1; $i<=$feedcount; $i++) {
         $html .= "<tr><td width=85px><b>Feed url #".$i."</b></td><td><input type=text name=fetch_url_".$i." size=50 class=password value=\"";
@@ -122 +124 @@
            $html .= $feed[$i];
         $html .= "\"> ";
+                $html .= "<input type=checkbox name=friend_".$i." id=friend_".$i;
+                if ( $friend[$i] )
+                        $html .= " checked=\"checked\"";
+                $html .= "><b>Friend?</b>";
                 $html .= "<input type=checkbox name=fetch_feed_".$i." id=fetch_feed_".$i;
         if ( $feed[$i] )
@@ -128 +134 @@
                 $html .= "</td></tr>";
         }
-
         $html .= "</table><i>Example: http://killboard.eve-d2.com/?a=feed</i><br><br><br>";
 
-        $html .= "<table><tr><td height=30px width=150px><b>Get kills instead of losses?</b></td>";
+    $html .= "<table><tr><td height=20px width=150px><b>First week:</b></td>";
+        $html .= '<td><select name="range1">';
+        $now = date("W");
+        for ($i = 1; $i<=52; $i++) {
+                if ( $now == $i )
+                        $html .= '<option selected="selected "value="'.$i.'">'.$i.'</option>';  
+                else
+                        $html .= '<option value="'.$i.'">'.$i.'</option>'; 
+        }                       
+        $html .= '</select>';
+    $html .= "<i></i></td></tr>";
+        $html .= "<tr><td height=20px width=150px><b>Last week:</b></td>";
+        $html .= '<td><select name="range2">';
+        for ($i = 52; $i>=1; $i--) {
+                if ( $now == $i )
+                        $html .= '<option selected="selected "value="'.$i.'">'.$i.'</option>';  
+                else
+                        $html .= '<option value="'.$i.'">'.$i.'</option>';
+        }                       
+        $html .= '</select>';   
+    $html .= "<i></i></td></tr>";
+        
+        $html .= "<tr><td height=20px width=150px><b>Year:</b></td>";
+        $html .= '<td><select name="year">';
+        $html .= '<option "value="2009">2009</option>'; 
+        $html .= '<option "value="2008">2008</option>'; 
+        $html .= '<option selected="selected "value="">2007</option>';  
+        $html .= '<option "value="2006">2006</option>'; 
+        $html .= '<option "value="2005">2005</option>'; 
+        $html .= '</select>';   
+    $html .= "</td></tr>";
+        $html .= "<tr><td height=40px width=150px><b>Get kills instead of losses?</b></td>";
         $html .= "<td><input type=checkbox name=fetch_losses id=fetch_losses>";
-        $html .= "<i> (by default only your losses get fetched, when ticked all kills where one of your pilots is involved get fetched instead)</i></td></tr>";
-
-    $html .= "<tr><td height=30px width=150px><b>Grab ALL mails from the feed servers?</b></td>";
-        $html .= "<td><input type=checkbox name=graball id=graball>";
-    $html .= "<i> (fetches all mails from the feed servers! use this may take upto several hours depending on the amount of kills to import!)</i></td>";
-        $html .= "</tr></table><br><br>";
-
+        $html .= "<i> (by default only their kills, your losses, get fetched, when ticked this is inversed)</i></td></tr>";
+        $html .= "</table><br><br>";
         $html .= "<input type=submit id=submit name=fetch value=\"Fetch!\"><br><br>";
 
@@ -145 +176 @@
         $html .= "<tr><td height=30px width=150px><b>Number of feeds:</b></td>";
         $html .= "<td><input type=text name=fetch_feed_count size=2 maxlength=2 class=password value=\"".$feedcount."\"</td></tr>";
-
         $html .= "<tr><td height=50px width=150px><b>Comment for automatically parsed killmails?</b></td>";
         $html .= "<td><input type=text size=50 class=password name=fetch_comment id=fetch_comment value=\"";
@@ -151 +181 @@
                 $html .= getConfig('fetch_comment');
         $html .= "\"><br><i> (leave blank for none)</i><br></td></tr>";
-
         $html .= "<tr><td height=30px width=150px><b>Enable compression?</b></td>";
     $html .= "<td><input type=checkbox name=fetch_compress id=fetch_compress";
@@ -158 +187 @@
         $html .= "><i> (enables GZip compression for feeds that support this feature, for streams that do not support GZip compression regular html mode will be used automatically)</i></td>";
         $html .= "</tr>";
-        
         $html .= "<tr><td height=30px width=150px><b>Verbose mode?</b></td>";
     $html .= "<td><input type=checkbox name=fetch_verbose id=fetch_verbose";
         if ( getConfig('fetch_verbose') )
                 $html .= " checked=\"checked\"";
-        $html .= "><i> (displays errormessages when the imported mail is rejected for being malformed, already existing, not being related etc.)</i></td>";
+        $html .= "><i> (displays advanced feed request information and errormessages when the imported mail is rejected for being malformed, already exists or is not related to your corp or alliance)</i></td>";
         $html .= "</tr></table><br><br>";
-
     $html .= "<input type=submit id=submit name=submit value=\"Save\">";
         $html .= "</form>";
@@ -172 +199 @@
     $page->setContent( $html );
     $page->generate();
-
 ?>