From 587c933112187483fac09fae61a95eae1db84b98 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Sun, 03 Nov 2013 17:36:46 +0000
Subject: [PATCH] 1. Zmiana nazw kanałów AXN (Crime/Sci-Fi -> Black/White) 2. Usunięcie kanału RSS Linux News 3. Inne drobne zmiany (wspierane PHP >= 5.3)
---
data/tv/pobierz.php | 4 ++--
data/tv/xmltv_parse.php | 4 ++--
.travis.yml | 1 -
data/tv/aliases | 4 ++--
test.php | 2 +-
data/rss/channels.list | 1 -
6 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 2e72fdc..54ddd3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,5 @@
- 5.5
- 5.4
- 5.3
- - 5.2
script: phpunit --coverage-text
diff --git a/data/rss/channels.list b/data/rss/channels.list
index fcc4a4d..c218376 100644
--- a/data/rss/channels.list
+++ b/data/rss/channels.list
@@ -5,7 +5,6 @@
http://rss.gazeta.pl/pub/rss/wiadomosci.xml gazeta g,gazeta.pl Gazeta.pl
http://feeds.feedburner.com/glowny-di di dziennik internautow Dziennik Internautów
http://hacking.pl/rss.xml hacking h,hacking.pl Hacking.pl
-http://linuxnews.pl/feed/ linuxnews l,linux,ln,linux news,linuxnews.pl Linux News
http://rss.bankier.pl/wiadomosci/wiadomosci.xml bankier bankier.pl Bankier.pl
http://bash.org.pl/rss/ bash b,sh,bash.org,bash.org.pl bash.org.pl
diff --git a/data/tv/aliases b/data/tv/aliases
index 1303d7e..3c1ab5c 100644
--- a/data/tv/aliases
+++ b/data/tv/aliases
@@ -40,8 +40,8 @@
Filmbox Extra FilmboxExtra FBX FBE FX FE
AXN A
-AXN Crime AXNCrime Crime AC
-AXN Sci-fi AXN Scifi Sci-fi Scifi SF
+AXN Black AXNBlack Black AB
+AXN White AXNWhite White AW
Ale Kino! Ale Kino AleKino! AleKino AK! AK
Kino Polska KinoPolska Kino KP
diff --git a/data/tv/pobierz.php b/data/tv/pobierz.php
index ccb93bd..f8259d3 100644
--- a/data/tv/pobierz.php
+++ b/data/tv/pobierz.php
@@ -37,8 +37,8 @@
436 => 'FilmBox',
433 => 'FilmBox Extra',
174 => 'AXN',
- 418 => 'AXN Crime',
- 416 => 'AXN Sci-fi',
+ 538 => 'AXN Black',
+ 539 => 'AXN White',
85 => 'Ale Kino!',
205 => 'Kino Polska',
403 => 'TCM',
diff --git a/data/tv/xmltv_parse.php b/data/tv/xmltv_parse.php
index 4a9976b..220cc60 100644
--- a/data/tv/xmltv_parse.php
+++ b/data/tv/xmltv_parse.php
@@ -37,7 +37,7 @@
$line = explode("\t", $line);
for($i=0; $i<count($line); $i++) {
- if($tv!==NULL AND funcs::utfToAscii($line[$i])==$tv) {
+ if($tv !== NULL AND funcs::utfToAscii($line[$i]) == $tv) {
return $line[0];
}
else
@@ -47,7 +47,7 @@
}
}
- if($tv!==NULL) {
+ if($tv !== NULL) {
return FALSE;
}
else
diff --git a/test.php b/test.php
index 22b47d8..6b3be46 100644
--- a/test.php
+++ b/test.php
@@ -18,7 +18,7 @@
echo '<table>
<tr> <th class="head" colspan="2">Interpreter PHP</th> </tr>
';
-test('Wersja PHP >= 5.2', version_compare(PHP_VERSION, '5.2.0', '>='));
+test('Wersja PHP >= 5.3', version_compare(PHP_VERSION, '5.3.0', '>='));
test('magic_quotes_gpc = Off', (get_magic_quotes_gpc() == 0));
test('allow_url_fopen = On', (ini_get('allow_url_fopen') == 1));
test('setlocale(pl_PL.UTF8)', setlocale(LC_CTYPE, 'pl_PL.UTF8', 'pl_PL', 'polish', 'plk'));
--
Gitblit v1.9.1