Changeset 147

Timestamp:

12/12/06 12:29:11 (16 years ago)

Author:

liq

Message:

-added Liq's Feed Syndication Mod v1.2

Files:

• 1.2.1/common/admin_feed.php (modified) (7 diffs)
• 1.2.1/common/feed.php (modified) (3 diffs)
• 1.2.1/common/feed_fetcher.php (modified) (3 diffs)
• dev/common/admin_feed.php (modified) (7 diffs)
• dev/common/feed.php (modified) (3 diffs)
• dev/common/feed_fetcher.php (modified) (3 diffs)

1.2.1/common/admin_feed.php

@@ -1 +1 @@
 <?
 
-// liq's feed syndication mod v1.1
+// liq's feed syndication mod v1.2
   
 @set_time_limit(0); 
@@ -22 +22 @@
                 $feedcount = 3;
 
-        if ( $_POST['submit'] ) {
         
-                if ( ctype_digit($_POST['fetch_feed_count']) ) {
+        if ( $_POST['submit'] || $_POST['fetch']  ) {
+                        if ( ctype_digit($_POST['fetch_feed_count']) ) {
                         setConfig('fetch_feed_count', $_POST['fetch_feed_count']);
                         $feedcount = $_POST['fetch_feed_count'];
@@ -41 +41 @@
                 else
                         setConfig('fetch_comment', '');
-
+        
                 for ($i = 1; $i<=$feedcount; $i++) {
                         $url = "fetch_url_".$i;
@@ -50 +50 @@
                                 setConfig($url, '');
                                 $feed[$i] = '';                 
-                }
-        } 
+                }               
+        }
 
         $feed = array();
@@ -60 +60 @@
                 $time[$i] = $tmp[1];
         }
+        
         if ( $_POST['fetch'] ) {
-            if (CORP_ID) {
-                $corp = new Corporation(CORP_ID);
-                $myid = '&corp='.urlencode($corp->getName());
-            }
-            if (ALLIANCE_ID) {
-                $alli = new Alliance(ALLIANCE_ID);
-                $myid = '&alli='.urlencode($alli->getName()); 
-                        }
+         if (CORP_ID) {
+             $corp = new Corporation(CORP_ID);
+             $myid = '&corp='.urlencode($corp->getName());
+         }
+         if (ALLIANCE_ID) {
+             $alli = new Alliance(ALLIANCE_ID);
+             $myid = '&alli='.urlencode($alli->getName()); 
+                 }
+
                  for ($i=1; $i<=$feedcount; $i++) {
                         $feedfetch = new Fetcher();
                         $cfg = "fetch_url_".$i;
-                        if (preg_match($validurl , $feed[$i])) {
+                        if (preg_match($validurl , $feed[$i]) && $_POST["fetch_feed_".$i]) {
                             $str = '';
                                 if ($time[$i])
@@ -85 +87 @@
                             } else
                                 $html .= $feedfetch->grab( $feed[$i].$myid.$str );
-                        }
+                        } 
+                        
                     setConfig($cfg, $feed[$i].':::'.$lastkllid);
             $time[$i] = $lastkllid;     
@@ -91 +94 @@
         }
   
-        $html .= "<br><form id=options name=options method=post action=?a=admin_feed>";
-    $html .= "<input type=submit id=submit name=fetch value=\"Fetch\">";
+        $html .= "<form id=options name=options method=post action=?a=admin_feed>";
+    $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=\"";
+        if ( $feed[$i] )   
+           $html .= $feed[$i];
+        $html .= "\"> ";
+                $html .= "<input type=checkbox name=fetch_feed_".$i." id=fetch_feed_".$i;
+        if ( $feed[$i] )  
+                        $html .= " checked=\"checked\"";
+                $html .= "><b>Fetch?</b><br>";   
+                $html .= "</td></tr>";
+        }
         
-        $html .= "<br><br><input type=checkbox name=fetch_losses id=fetch_losses>";
-        $html .= "<b>Get Kills?</b> <br> <i>(by default only your losses get fetched, when ticked all kills where one of your pilots is involved get fetched instead)</i>"; 
+        $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 .= "<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 .= "<br><br><input type=checkbox name=graball id=graball>";
-    $html .= "<b>Grab ALL mails from the feed servers?</b> <br> <i>(fetches all mails from the feed servers! use this may take upto several hours depending on the amount of kills to import!)</i>";
-
-        $html .= "</form></table><br><br>";
-  
-    $html .= "<table class=kb-subtable>";
-    $html .= "<div class=block-header2>Feeds</div>";
-    $html .= "<form id=options name=options method=post action=?a=admin_feed>";
-    for ($i = 1; $i<=$feedcount; $i++) {
-        $html .= "<b>Feed url #".$i."</b><input type=text name=fetch_url_".$i." size=50 class=password value=\"";
-        if ( $feed[$i] )
-           $html .= $feed[$i];
-        $html .= "\"><br><br>";
-    }
-    $html .= "<i>Example: http://killboard.eve-d2.com/?a=feed</i><br><br>";
-    
-        $html .= "<div class=block-header2>Options</div>";
-        $html .= "<b>Number of feeds:</b> <input type=text name=fetch_feed_count size=2 maxlength=2 class=password value=\"".$feedcount."\"<br><br>";
+    $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 .= "<input type=checkbox name=fetch_verbose id=fetch_verbose";
-    if ( getConfig('fetch_verbose') )  
-                $html .= " checked=\"checked\"";
-        $html .= "><b>Verbose mode?</b> <br> <i>(display errormessages when the imported mail is malformed, already exists, is not related etc.)</i><br><br>"; 
-
-        $html .= "<b>Comment for automatically parsed killmails?</b><br><br>"; 
-        $html .= "<input type=text size=50 class=password name=fetch_comment id=fetch_comment value=\"";
+        $html .= "<input type=submit id=submit name=fetch value=\"Fetch!\"><br><br>";
+        
+        $html .= "<div class=block-header2>Options</div><table>";
+        $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=\"";
     if ( getConfig('fetch_comment') ) 
                 $html .= getConfig('fetch_comment');
-        $html .= "\"><br><i>(leave blank for none)</i><br>";
+        $html .= "\"><br><i> (leave blank for none)</i><br></td></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 malformed, already exists, is not related etc.)</i></td>"; 
+        $html .= "</tr></table><br><br>";
 
-    $html .= "<br><br><br><input type=submit id=submit name=submit value=\"Save\">";
-    $html .= "</form></table>"; 
+    $html .= "<input type=submit id=submit name=submit value=\"Save\">";
+        $html .= "</form>";  
 
     $page->addContext( $menubox->generate() );

1.2.1/common/feed.php

@@ -1 +1 @@
 <?php
 
-// liq's feed syndication mod v1.1
+// liq's feed syndication mod v1.2
 
 @set_time_limit(0);
@@ -83 +83 @@
 
 if ( $_GET['losses']) {
-        $html .= "<description> Loss Feed </description>";
+        $html .= "<description> Loss Feed v1.2</description>";
         if (CORP_ID)
                 $klist->addVictimCorp(new Corporation(CORP_ID));
@@ -94 +94 @@
 
 } else {
-        $html .= "<description> Kill Feed </description>";
+        $html .= "<description> Kill Feed v1.2</description>";
         if (CORP_ID)
                 $klist->addInvolvedCorp(new Corporation(CORP_ID));

1.2.1/common/feed_fetcher.php

@@ -1 +1 @@
 <?php
 
-// liq's feed syndication mod v1.1
+// liq's feed syndication mod v1.2
 
   @set_time_limit(0); 
@@ -55 +55 @@
 function grab($url) { 
                 global $x, $fetchurl;
+                $x=0;
                 $fetchurl = $url;
         $xml_parser = xml_parser_create();
@@ -104 +105 @@
                                 if (class_exists('Comments') && getConfig('fetch_comment')) { // for the Eve-Dev Comment Class
                                         $comments = new Comments($killid);
-                        $comments->addComment("Automatic Kill Import", getConfig('fetch_comment')." (mail fetched from: ".$fetchurl.")");
+                        $comments->addComment("liq's feed syndication", getConfig('fetch_comment')." (mail fetched from: ".$fetchurl.")");
                                 }
                                 if (class_exists('Comment') && getConfig('fetch_comment')) { // for the D2 Killboard Comment Class

dev/common/admin_feed.php

@@ -1 +1 @@
 <?
 
-// liq's feed syndication mod v1.1
+// liq's feed syndication mod v1.2
   
 @set_time_limit(0); 
@@ -22 +22 @@
                 $feedcount = 3;
 
-        if ( $_POST['submit'] ) {
         
-                if ( ctype_digit($_POST['fetch_feed_count']) ) {
+        if ( $_POST['submit'] || $_POST['fetch']  ) {
+                        if ( ctype_digit($_POST['fetch_feed_count']) ) {
                         setConfig('fetch_feed_count', $_POST['fetch_feed_count']);
                         $feedcount = $_POST['fetch_feed_count'];
@@ -41 +41 @@
                 else
                         setConfig('fetch_comment', '');
-
+        
                 for ($i = 1; $i<=$feedcount; $i++) {
                         $url = "fetch_url_".$i;
@@ -50 +50 @@
                                 setConfig($url, '');
                                 $feed[$i] = '';                 
-                }
-        } 
+                }               
+        }
 
         $feed = array();
@@ -60 +60 @@
                 $time[$i] = $tmp[1];
         }
+        
         if ( $_POST['fetch'] ) {
-            if (CORP_ID) {
-                $corp = new Corporation(CORP_ID);
-                $myid = '&corp='.urlencode($corp->getName());
-            }
-            if (ALLIANCE_ID) {
-                $alli = new Alliance(ALLIANCE_ID);
-                $myid = '&alli='.urlencode($alli->getName()); 
-                        }
+         if (CORP_ID) {
+             $corp = new Corporation(CORP_ID);
+             $myid = '&corp='.urlencode($corp->getName());
+         }
+         if (ALLIANCE_ID) {
+             $alli = new Alliance(ALLIANCE_ID);
+             $myid = '&alli='.urlencode($alli->getName()); 
+                 }
+
                  for ($i=1; $i<=$feedcount; $i++) {
                         $feedfetch = new Fetcher();
                         $cfg = "fetch_url_".$i;
-                        if (preg_match($validurl , $feed[$i])) {
+                        if (preg_match($validurl , $feed[$i]) && $_POST["fetch_feed_".$i]) {
                             $str = '';
                                 if ($time[$i])
@@ -85 +87 @@
                             } else
                                 $html .= $feedfetch->grab( $feed[$i].$myid.$str );
-                        }
+                        } 
+                        
                     setConfig($cfg, $feed[$i].':::'.$lastkllid);
             $time[$i] = $lastkllid;     
@@ -91 +94 @@
         }
   
-        $html .= "<br><form id=options name=options method=post action=?a=admin_feed>";
-    $html .= "<input type=submit id=submit name=fetch value=\"Fetch\">";
+        $html .= "<form id=options name=options method=post action=?a=admin_feed>";
+    $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=\"";
+        if ( $feed[$i] )   
+           $html .= $feed[$i];
+        $html .= "\"> ";
+                $html .= "<input type=checkbox name=fetch_feed_".$i." id=fetch_feed_".$i;
+        if ( $feed[$i] )  
+                        $html .= " checked=\"checked\"";
+                $html .= "><b>Fetch?</b><br>";   
+                $html .= "</td></tr>";
+        }
         
-        $html .= "<br><br><input type=checkbox name=fetch_losses id=fetch_losses>";
-        $html .= "<b>Get Kills?</b> <br> <i>(by default only your losses get fetched, when ticked all kills where one of your pilots is involved get fetched instead)</i>"; 
+        $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 .= "<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 .= "<br><br><input type=checkbox name=graball id=graball>";
-    $html .= "<b>Grab ALL mails from the feed servers?</b> <br> <i>(fetches all mails from the feed servers! use this may take upto several hours depending on the amount of kills to import!)</i>";
-
-        $html .= "</form></table><br><br>";
-  
-    $html .= "<table class=kb-subtable>";
-    $html .= "<div class=block-header2>Feeds</div>";
-    $html .= "<form id=options name=options method=post action=?a=admin_feed>";
-    for ($i = 1; $i<=$feedcount; $i++) {
-        $html .= "<b>Feed url #".$i."</b><input type=text name=fetch_url_".$i." size=50 class=password value=\"";
-        if ( $feed[$i] )
-           $html .= $feed[$i];
-        $html .= "\"><br><br>";
-    }
-    $html .= "<i>Example: http://killboard.eve-d2.com/?a=feed</i><br><br>";
-    
-        $html .= "<div class=block-header2>Options</div>";
-        $html .= "<b>Number of feeds:</b> <input type=text name=fetch_feed_count size=2 maxlength=2 class=password value=\"".$feedcount."\"<br><br>";
+    $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 .= "<input type=checkbox name=fetch_verbose id=fetch_verbose";
-    if ( getConfig('fetch_verbose') )  
-                $html .= " checked=\"checked\"";
-        $html .= "><b>Verbose mode?</b> <br> <i>(display errormessages when the imported mail is malformed, already exists, is not related etc.)</i><br><br>"; 
-
-        $html .= "<b>Comment for automatically parsed killmails?</b><br><br>"; 
-        $html .= "<input type=text size=50 class=password name=fetch_comment id=fetch_comment value=\"";
+        $html .= "<input type=submit id=submit name=fetch value=\"Fetch!\"><br><br>";
+        
+        $html .= "<div class=block-header2>Options</div><table>";
+        $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=\"";
     if ( getConfig('fetch_comment') ) 
                 $html .= getConfig('fetch_comment');
-        $html .= "\"><br><i>(leave blank for none)</i><br>";
+        $html .= "\"><br><i> (leave blank for none)</i><br></td></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 malformed, already exists, is not related etc.)</i></td>"; 
+        $html .= "</tr></table><br><br>";
 
-    $html .= "<br><br><br><input type=submit id=submit name=submit value=\"Save\">";
-    $html .= "</form></table>"; 
+    $html .= "<input type=submit id=submit name=submit value=\"Save\">";
+        $html .= "</form>";  
 
     $page->addContext( $menubox->generate() );

dev/common/feed.php

@@ -1 +1 @@
 <?php
 
-// liq's feed syndication mod v1.1
+// liq's feed syndication mod v1.2
 
 @set_time_limit(0);
@@ -83 +83 @@
 
 if ( $_GET['losses']) {
-        $html .= "<description> Loss Feed </description>";
+        $html .= "<description> Loss Feed v1.2</description>";
         if (CORP_ID)
                 $klist->addVictimCorp(new Corporation(CORP_ID));
@@ -94 +94 @@
 
 } else {
-        $html .= "<description> Kill Feed </description>";
+        $html .= "<description> Kill Feed v1.2</description>";
         if (CORP_ID)
                 $klist->addInvolvedCorp(new Corporation(CORP_ID));

dev/common/feed_fetcher.php

@@ -1 +1 @@
 <?php
 
-// liq's feed syndication mod v1.1
+// liq's feed syndication mod v1.2
 
   @set_time_limit(0); 
@@ -55 +55 @@
 function grab($url) { 
                 global $x, $fetchurl;
+                $x=0;
                 $fetchurl = $url;
         $xml_parser = xml_parser_create();
@@ -104 +105 @@
                                 if (class_exists('Comments') && getConfig('fetch_comment')) { // for the Eve-Dev Comment Class
                                         $comments = new Comments($killid);
-                        $comments->addComment("Automatic Kill Import", getConfig('fetch_comment')." (mail fetched from: ".$fetchurl.")");
+                        $comments->addComment("liq's feed syndication", getConfig('fetch_comment')." (mail fetched from: ".$fetchurl.")");
                                 }
                                 if (class_exists('Comment') && getConfig('fetch_comment')) { // for the D2 Killboard Comment Class