Changeset 386
- Timestamp:
- 06/21/09 14:00:25 (13 years ago)
- Location:
- dev
- Files:
-
- 1 added
- 3 modified
Legend:
- Unmodified
- Added
- Removed
-
dev/common/admin/feed_fetcher.php
r380 r386 53 53 function grab($url, $str, $trackfriend = '', $trackkey = '') 54 54 { 55 global $x, $uurl, $feedversion ;55 global $x, $uurl, $feedversion, $apikills; 56 56 // $this->trackurl_ = $trackurl; 57 57 $this->trackfriend_ = $trackfriend; … … 59 59 $x=0; 60 60 $fetchurl = $url.$str."&board=".urlencode(KB_TITLE); 61 if(strpos($fetchurl, 'apikills=1')) $apikills = true; 62 else $apikills = false; 61 63 if(!strpos($fetchurl,'?')) $fetchurl = 62 64 substr_replace($fetchurl,'?', strpos($fetchurl,'&'),0); … … 120 122 function endElement($parser, $name) 121 123 { 122 global $insideitem, $tag, $title, $description, $link, $html, $x, $uurl, $apiID ;124 global $insideitem, $tag, $title, $description, $link, $html, $x, $uurl, $apiID, $apikills; 123 125 124 126 if ($name == "ITEM") … … 144 146 } 145 147 } 146 else 148 elseif(!$apikills) 147 149 { 148 150 $parser = new Parser( $description ); -
dev/common/includes/globals.php
r383 r386 7 7 else 8 8 { 9 $svn_rev = '38 3';9 $svn_rev = '386'; 10 10 } 11 11 define('SVN_REV', $svn_rev); -
dev/cron/cron_fetcher.php
r370 r386 1 1 #!/usr/bin/php 2 2 <?php 3 // //// 4 // //// ////// 5 // //// liq's feed syndication mod v1.6 6 // ////////// 7 // ////////// 8 // ////////// 9 // ////////// 3 /* 4 * EDK Feed Syndication v1.7 5 * based on liq's feed syndication mod v1.5 6 * 7 */ 8 10 9 // set this to 1 if you are running a master killboard and want 11 10 // to even fetch mails not related to your corp / alliance 12 define( MASTER, 0);11 define('MASTER', 0); 13 12 14 $version = "v1.6";15 13 @set_time_limit(0); 16 14 … … 19 17 //die(); 20 18 $KB_HOME = ereg_replace('[/\\]cron$', '', getcwd()); 21 chdir($KB_HOME); 19 chdir($KB_HOME); 22 20 23 21 require_once('kbconfig.php'); … … 63 61 $myid = '&alli=' . urlencode($alli->getName()); 64 62 } 63 define('KB_TITLE', config::get('cfg_kbtitle')); 64 define('DB_USE_CCP', true); 65 65 66 66 $year = gmdate("Y"); … … 71 71 72 72 $feed = array(); 73 $friend = array(); 73 74 for ($i = 1; $i <= $feedcount; $i++) 74 75 { … … 79 80 if ($tmp[2] == "on") 80 81 $friend[$i] = $tmp[2]; 82 if ($tmp[3] == "on") 83 $apikills[$i] = $tmp[3]; 81 84 $feedfetch = new Fetcher(); 82 85 if (preg_match($validurl , $feed[$i])) … … 90 93 if ($friend[$i]) 91 94 $str .= '&friend=1'; 95 if ($apikills[$i]) 96 $str .= '&apikills=1'; 92 97 if (!config::get('fetch_compress')) 93 98 $str .= "&gz=1"; … … 107 112 { 108 113 //Fetch final kill id of board from feed if possible and set as new last kill. 109 if(intval($feedfetch->finalkllid_)> $feedlast[$i]) 114 if(intval($feedfetch->finalkllid_)> $feedlast[$i]) 110 115 config::set("fetch_url_" . $i, $feed[$i] . ':::' . intval($feedfetch->finalkllid_) . ':::' . $friend[$i]); 111 116 else config::set("fetch_url_" . $i, $feed[$i] . ':::' . $feedlast[$i] . ':::' . $friend[$i]);