diff options
Diffstat (limited to 'abs/extra/community/mre/patch.diff')
| -rw-r--r-- | abs/extra/community/mre/patch.diff | 232 |
1 files changed, 126 insertions, 106 deletions
diff --git a/abs/extra/community/mre/patch.diff b/abs/extra/community/mre/patch.diff index 66390d9..38a501a 100644 --- a/abs/extra/community/mre/patch.diff +++ b/abs/extra/community/mre/patch.diff @@ -9,65 +9,6 @@ return $matches[1]; return '0'; } ---- ../mre-1.1.2/class/NHLEvent.php.original 2006-11-05 17:06:57.000000000 -0600 -+++ ../mre-1.1.2/class/NHLEvent.php 2010-05-21 00:44:49.000000000 -0500 -@@ -27,7 +27,7 @@ - /** - * URL to grab game info from - */ -- const url = 'http://scores.espn.go.com/nhl/scoreboard'; -+ const url = 'http://localhost/scores/nhl.php'; - - /** - * Class constructor. -@@ -39,32 +39,27 @@ - parent::__construct(); - - $criteria = $this->generateSearchTerms($gameInfo); -+ - if(!sizeof($criteria)) - trigger_error("Unable to generate valid search terms! [$gameInfo]", E_USER_WARNING); - else - { - $data = file(self::url); -- if($data !== FALSE) -- foreach($criteria as $term) -- { -- $status = ''; -- foreach($data as $line) -- if(preg_match('/' . preg_quote($term) . '/', $line)) -- { -- $status = $line; -- break; -- } -- if(preg_match('/id.*st"\>(.*)\<\/td/U', $status, $match)) -- { -- $this->setStatus($match[1]); -- if(preg_match('/^Final/', $match[1])) -- $this->setEventOver(TRUE); -- else -- $this->setEventOver(FALSE); -- $this->setValid(TRUE); -- break; -- } -+ if($data) -+ { -+ foreach($data as $line) -+ { -+ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) -+ { -+ if(strpos($line,'FINAL')) -+ $this->setEventOver(TRUE); -+ else -+ $this->setEventOver(FALSE); -+ $this->setValid(TRUE); -+ break; -+ } - } -+ } - } - if(!$this->isValid()) - trigger_error("Unable to find NHL info for '$gameInfo'! The NHL parser may need to be updated.", E_USER_WARNING); --- ../mre-1.1.2/conf/mre.conf.in.original 2006-08-13 16:48:57.000000000 -0500 +++ ../mre-1.1.2/conf/mre.conf.in 2010-05-04 00:25:26.000000000 -0500 @@ -28,9 +28,9 @@ @@ -82,18 +23,29 @@ ; Number of minutes to sleep between runs sleep = 5 ; Logging level (0 = normal, 1 = +error, 2 = +warning, 3 = +debug) +--- ../mre-1.1.2/class/EventFactory.php.original 2006-09-22 10:18:07.000000000 -0500 ++++ ../mre-1.1.2/class/EventFactory.php 2010-08-28 00:02:37.000000000 -0500 +@@ -50,7 +50,7 @@ + $obj = new NHLEvent($data['subtitle']); break; + case 'MLB Baseball': + $obj = new MLBEvent($data['subtitle']); break; +- case 'NFL Football': ++ case ($data['title']=='NFL Football' || $data['title']=='NFL Preseason Football'): + $obj = new NFLEvent($data['subtitle']); break; + case 'College Football': + $obj = new NCAAFEvent($data['subtitle']); break; --- ../mre-1.1.2/class/MLBEvent.php.original 2006-11-05 17:06:57.000000000 -0600 -+++ ../mre-1.1.2/class/MLBEvent.php 2010-05-21 20:08:30.000000000 -0500 ++++ ../mre-1.1.2/class/MLBEvent.php 2010-08-28 00:02:37.000000000 -0500 @@ -27,7 +27,7 @@ /** * URL to grab game info from */ - const url = 'http://scores.espn.go.com/mlb/scoreboard'; -+ const url = 'http://localhost/scores/mlb.php'; ++ const url = 'http://sports.espn.go.com/mlb/bottomline/scores'; /** * Class constructor. -@@ -43,41 +43,22 @@ +@@ -43,41 +43,25 @@ trigger_error("Unable to generate valid search terms! [$gameInfo]", E_USER_WARNING); else { @@ -133,9 +85,12 @@ + $data = file(self::url); + if($data) + { -+ foreach($data as $line) -+ { -+ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) ++ $data_array=explode("&", $data[0]); ++ foreach($data_array as $line) ++ { ++ $line=str_replace("%20", " ", $line); ++ $line=str_replace("Chicago Sox", "Chicago White Sox", $line); #Program guide gives Chicago White Sox, website gives Chicago Sox ++ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) + { + if((strpos($line,'FINAL'))or(strpos($line,'Postponed'))) + $this->setEventOver(TRUE); @@ -150,18 +105,80 @@ } if(!$this->isValid()) trigger_error("Unable to find MLB info for '$gameInfo'! The MLB parser may need to be updated.", E_USER_WARNING); +--- ../mre-1.1.2/class/NFLEvent.php.original 2006-11-05 17:06:57.000000000 -0600 ++++ ../mre-1.1.2/class/NFLEvent.php 2010-08-28 00:06:56.000000000 -0500 +@@ -27,7 +27,7 @@ + /** + * URL to grab game info from + */ +- const url = 'http://scores.espn.go.com/nfl/scoreboard'; ++ const url = 'http://sports.espn.go.com/nfl/bottomline/scores'; + + /** + * Class constructor. +@@ -44,33 +44,23 @@ + else + { + $data = file(self::url); +- $games = array(); +- if($data !== FALSE) +- { +- // Split the huge string into individual game data +- foreach($data as $line) +- if(preg_match('/\<td class="teamTop.*".*\>.*/', $line)) +- $games[] = $line; +- if(!sizeof($games)) +- trigger_error("Unable to find valid game data within source!", E_USER_WARNING); +- foreach($criteria as $term) +- { +- foreach($games as $game) +- { +- if(preg_match('/' . preg_quote($term) . '/', $game)) +- if(preg_match('/teamTop.*\>(.*)\<\/td\>/U', $game, $matches)) +- { +- $this->setStatus($matches[1]); +- if(preg_match('/^(Final|Postponed)/', $matches[1])) +- $this->setEventOver(TRUE); +- else +- $this->setEventOver(FALSE); +- $this->setValid(TRUE); +- break 2; +- } +- } +- } +- } ++ if($data) ++ { ++ $data_array=explode("&", $data[0]); ++ foreach($data_array as $line) ++ { ++ $line=str_replace("%20", " ", $line); ++ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) ++ { ++ if(strpos($line,'FINAL')) ++ $this->setEventOver(TRUE); ++ else ++ $this->setEventOver(FALSE); ++ $this->setValid(TRUE); ++ break; ++ } ++ } ++ } + } + if(!$this->isValid()) + trigger_error("Unable to find NFL info for '$gameInfo'! The NFL parser may need to be updated.", E_USER_WARNING); --- ../mre-1.1.2/class/NBAEvent.php.original 2006-11-05 17:06:57.000000000 -0600 -+++ ../mre-1.1.2/class/NBAEvent.php 2010-05-21 21:15:42.000000000 -0500 ++++ ../mre-1.1.2/class/NBAEvent.php 2010-08-28 00:09:50.000000000 -0500 @@ -27,7 +27,7 @@ /** * URL to grab game info from */ - const url = 'http://scores.espn.go.com/nba/scoreboard'; -+ const url = 'http://localhost/scores/nba.php'; ++ const url = 'http://sports.espn.go.com/nba/bottomline/scores'; /** * Class constructor. -@@ -44,35 +44,21 @@ +@@ -44,35 +44,23 @@ else { $data = file(self::url); @@ -194,10 +211,12 @@ - break; - } + if($data) -+ { -+ foreach($data as $line) -+ { -+ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) ++ { ++ $data_array=explode("&", $data[0]); ++ foreach($data_array as $line) ++ { ++ $line=str_replace("%20", " ", $line); ++ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) + { + if(strpos($line,'FINAL')) + $this->setEventOver(TRUE); @@ -211,63 +230,64 @@ } if(!$this->isValid()) trigger_error("Unable to find NBA info for '$gameInfo'! The NBA parser may need to be updated.", E_USER_WARNING); ---- ../mre-1.1.2/class/NFLEvent.php.original 2006-11-05 17:06:57.000000000 -0600 -+++ ../mre-1.1.2/class/NFLEvent.php 2010-05-21 19:09:36.000000000 -0500 +--- ../mre-1.1.2/class/NHLEvent.php.original 2006-11-05 17:06:57.000000000 -0600 ++++ ../mre-1.1.2/class/NHLEvent.php 2010-08-28 00:09:04.000000000 -0500 @@ -27,7 +27,7 @@ /** * URL to grab game info from */ -- const url = 'http://scores.espn.go.com/nfl/scoreboard'; -+ const url = 'http://localhost/scores/nfl.php'; +- const url = 'http://scores.espn.go.com/nhl/scoreboard'; ++ const url = 'http://sports.espn.go.com/nhl/bottomline/scores'; /** * Class constructor. -@@ -44,33 +44,21 @@ +@@ -39,32 +39,29 @@ + parent::__construct(); + + $criteria = $this->generateSearchTerms($gameInfo); ++ + if(!sizeof($criteria)) + trigger_error("Unable to generate valid search terms! [$gameInfo]", E_USER_WARNING); else { $data = file(self::url); -- $games = array(); - if($data !== FALSE) -- { -- // Split the huge string into individual game data -- foreach($data as $line) -- if(preg_match('/\<td class="teamTop.*".*\>.*/', $line)) -- $games[] = $line; -- if(!sizeof($games)) -- trigger_error("Unable to find valid game data within source!", E_USER_WARNING); - foreach($criteria as $term) - { -- foreach($games as $game) +- $status = ''; +- foreach($data as $line) +- if(preg_match('/' . preg_quote($term) . '/', $line)) +- { +- $status = $line; +- break; +- } +- if(preg_match('/id.*st"\>(.*)\<\/td/U', $status, $match)) - { -- if(preg_match('/' . preg_quote($term) . '/', $game)) -- if(preg_match('/teamTop.*\>(.*)\<\/td\>/U', $game, $matches)) -- { -- $this->setStatus($matches[1]); -- if(preg_match('/^(Final|Postponed)/', $matches[1])) -- $this->setEventOver(TRUE); -- else -- $this->setEventOver(FALSE); -- $this->setValid(TRUE); -- break 2; -- } +- $this->setStatus($match[1]); +- if(preg_match('/^Final/', $match[1])) +- $this->setEventOver(TRUE); +- else +- $this->setEventOver(FALSE); +- $this->setValid(TRUE); +- break; - } -- } -- } -+ if($data) ++ if($data) + { -+ foreach($data as $line) ++ $data_array=explode("&", $data[0]); ++ foreach($data_array as $line) + { -+ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) ++ $line=str_replace("%20", " ", $line); ++ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) + { -+ if(strpos($line,'FINAL')) ++ if(strpos($line,'FINAL')) + $this->setEventOver(TRUE); + else + $this->setEventOver(FALSE); + $this->setValid(TRUE); + break; + } -+ } -+ } + } ++ } } if(!$this->isValid()) - trigger_error("Unable to find NFL info for '$gameInfo'! The NFL parser may need to be updated.", E_USER_WARNING); + trigger_error("Unable to find NHL info for '$gameInfo'! The NHL parser may need to be updated.", E_USER_WARNING);
\ No newline at end of file |