Skip to content
This repository was archived by the owner on Mar 1, 2018. It is now read-only.

Commit 92d12cd

Browse files
psvmccpsvmcc
committed
1.7.6
1 parent e629d86 commit 92d12cd

34 files changed

+881
-481
lines changed

‎action.php

+27-11
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
$tracker = $url['host'];
4242
$tracker = preg_replace('/www\./', '', $tracker);
4343

44-
if ($tracker == 'lostfilm.tv' || $tracker == 'lostfilm-mirror' || $tracker == 'novafilm.tv' || $tracker == 'newstudio.tv')
44+
if ($tracker == 'lostfilm.tv' || $tracker == 'lostfilm-mirror' || $tracker == 'newstudio.tv')
4545
{
4646
$return['error'] = TRUE;
4747
$return['msg'] = 'Это не форумный трекер. Добавьте как Сериал по его названию.';
@@ -58,7 +58,7 @@
5858
$tracker = 'rutor.org';
5959
$_POST['url'] = 'http://rutor.info'.$url['path'];
6060
}
61-
if ($tracker == 'anidub.com')
61+
if ($tracker == 'anidub.com' || $tracker == 'riperam.org')
6262
$threme = $url['path'];
6363
elseif ($tracker == 'animelayer.ru')
6464
{
@@ -112,9 +112,17 @@
112112
else
113113
$name = Sys::getHeader($_POST['url']);
114114

115-
Database::setThreme($tracker, $name, $_POST['path'], $threme, Sys::strBoolToInt($_POST['update_header']));
116-
$return['error'] = FALSE;
117-
$return['msg'] = 'Тема добавлена для мониторинга.';
115+
$query = Database::setThreme($tracker, $name, $_POST['path'], $threme, Sys::strBoolToInt($_POST['update_header']));
116+
if ($query === TRUE)
117+
{
118+
$return['error'] = FALSE;
119+
$return['msg'] = 'Тема добавлена для мониторинга.';
120+
}
121+
else
122+
{
123+
$return['error'] = TRUE;
124+
$return['msg'] = 'Произошла ошибка при сохранении в БД.'.var_dump($query);
125+
}
118126
}
119127
else
120128
{
@@ -170,9 +178,17 @@
170178
$class = str_replace('-', '', $class);
171179
if (Database::checkSerialExist($tracker, $_POST['name'], $_POST['hd']))
172180
{
173-
Database::setSerial($tracker, $_POST['name'], $_POST['path'], $_POST['hd']);
174-
$return['error'] = FALSE;
175-
$return['msg'] = 'Сериал добавлен для мониторинга.';
181+
$query = Database::setSerial($tracker, $_POST['name'], $_POST['path'], $_POST['hd']);
182+
if ($query === TRUE)
183+
{
184+
$return['error'] = FALSE;
185+
$return['msg'] = 'Сериал добавлен для мониторинга.';
186+
}
187+
else
188+
{
189+
$return['error'] = TRUE;
190+
$return['msg'] = 'Произошла ошибка при сохранении в БД.'.var_dump($query);
191+
}
176192
}
177193
else
178194
{
@@ -198,7 +214,7 @@
198214
if ($_POST['action'] == 'update')
199215
{
200216
$tracker = $_POST['tracker'];
201-
if ($tracker == 'lostfilm.tv' || $tracker == 'lostfilm-mirror' || $tracker == 'novafilm.tv' || $tracker == 'newstudio.tv' || $tracker == 'baibako.tv')
217+
if ($tracker == 'lostfilm.tv' || $tracker == 'lostfilm-mirror' || $tracker == 'newstudio.tv' || $tracker == 'baibako.tv')
202218
{
203219
$engineFile = $dir.'/trackers/'.$tracker.'.engine.php';
204220
$functionEngine = include_once $engineFile;
@@ -217,12 +233,12 @@
217233
$tracker = preg_replace('/www\./', '', $tracker);
218234
if ($tracker == 'tr.anidub.com')
219235
$tracker = 'anidub.com';
220-
if ($tracker == 'zerkalo-rutor.org')
236+
if ($tracker == 'cool-tor.org')
221237
$tracker = 'rutor.org';
222238
elseif ($tracker == 'baibako.tv')
223239
$tracker = 'baibako.tv_forum';
224240

225-
if ($tracker == 'anidub.com')
241+
if ($tracker == 'anidub.com' || $tracker == 'riperam.org')
226242
$threme = $url['path'];
227243
elseif ($tracker == 'animelayer.ru')
228244
{

‎changelog.txt

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
14.02.2017 - 1.7.6:
2+
- Трекеры anidub.com, nnmclub.to, rutracker.org перешли на использование https
3+
- Улучшена совместимость с PHP 7.2
4+
- Удалён трекер novafilm.tv
5+
- Добавлен трекер http://riperam.org
6+
- Исправление мелких багов
17
21.11.2017 - 1.7.4:
28
- nnm-club.name переехал на https://nnmclub.to
39
19.11.2017 - 1.7.3:

‎class/Database.class.php

+11-10
Original file line numberDiff line numberDiff line change
@@ -434,11 +434,11 @@ public static function getTorrent($id)
434434
}
435435
$stmt = NULL;
436436
$resultArray = NULL;
437-
}
438-
437+
}
438+
/*
439439
public static function getTorrentsListByTracker($tracker)
440440
{
441-
if ($tracker == 'lostfilm.tv' || $tracker == 'novafilm.tv')
441+
if ($tracker == 'lostfilm.tv')
442442
$fields = 'hd, ep';
443443
if ($tracker == 'rutracker.org' || $tracker == 'nnm-club.ru' || $tracker == 'rutor.org' || $tracker == 'booktracker.org')
444444
$fields = 'torrent_id';
@@ -452,7 +452,7 @@ public static function getTorrentsListByTracker($tracker)
452452
{
453453
$resultArray[$i]['name'] = $row['name'];
454454
$resultArray[$i]['timestamp'] = $row['timestamp'];
455-
if ($tracker == 'lostfilm.tv' || $tracker == 'novafilm.tv')
455+
if ($tracker == 'lostfilm.tv')
456456
{
457457
$resultArray[$i]['hd'] = $row['hd'];
458458
$resultArray[$i]['ep'] = $row['ep'];
@@ -467,7 +467,7 @@ public static function getTorrentsListByTracker($tracker)
467467
$stmt = NULL;
468468
$resultArray = NULL;
469469
}
470-
470+
*/
471471
public static function getUserToWatch()
472472
{
473473
$stmt = self::newStatement("SELECT `id`, `tracker`, `name` FROM `watch` ORDER BY `tracker`");
@@ -798,7 +798,7 @@ public static function setNewEpisode($id, $ep)
798798
public static function updateSerial($id, $name, $path, $hd, $reset, $script, $pause)
799799
{
800800
if ($reset)
801-
$stmt = self::newStatement("UPDATE `torrent` SET `name` = :name, `path` = :path, `hd` = :hd, `ep` = '', `timestamp` = '1970-01-01 00:00:00', `hash` = '', `script` = :script, `pause` = :pause WHERE `id` = :id");
801+
$stmt = self::newStatement("UPDATE `torrent` SET `name` = :name, `path` = :path, `hd` = :hd, `ep` = '', `timestamp` = '2000-01-01 00:00:00', `hash` = '', `script` = :script, `pause` = :pause WHERE `id` = :id");
802802
else
803803
$stmt = self::newStatement("UPDATE `torrent` SET `name` = :name, `path` = :path, `hd` = :hd, `script` = :script, `pause` = :pause WHERE `id` = :id");
804804
$stmt->bindParam(':name', $name);
@@ -828,7 +828,7 @@ public static function updateThreme($id, $name, $path, $threme, $update, $reset,
828828

829829
if ($reset)
830830
{
831-
$stmt = self::newStatement("UPDATE `torrent` SET `timestamp` = '1970-01-01 00:00:00', `hash` = '' WHERE `id` = :id");
831+
$stmt = self::newStatement("UPDATE `torrent` SET `timestamp` = '2000-01-01 00:00:00', `hash` = '' WHERE `id` = :id");
832832
$stmt->bindParam(':id', $id);
833833
}
834834
if ($stmt->execute())
@@ -997,10 +997,11 @@ public static function setErrorToThreme($id, $value)
997997
$stmt = NULL;
998998
}
999999

1000-
public static function setClosedThreme($id)
1000+
public static function setClosedThreme($id, $closed)
10011001
{
1002-
$stmt = self::newStatement("UPDATE `torrent` SET `closed` = 1 WHERE `id` = :id");
1002+
$stmt = self::newStatement("UPDATE `torrent` SET `closed` = :closed WHERE `id` = :id");
10031003
$stmt->bindParam(':id', $id);
1004+
$stmt->bindParam(':closed', $closed);
10041005
if ($stmt->execute())
10051006
return TRUE;
10061007
else
@@ -1047,7 +1048,7 @@ public static function setCookie($tracker, $cookie)
10471048
$stmt = NULL;
10481049
}
10491050

1050-
public static function saveToTemp($id, $name, $path, $hash, $tracker, $date)
1051+
public static function saveToTemp($id, $name, $path, $tracker, $date)
10511052
{
10521053
$stmt = self::newStatement("INSERT INTO `temp` (`id`, `name`, `path`, `tracker`, `date`) VALUES (:id, :name, :path, :tracker, :date)");
10531054
$stmt->bindParam(':id', $id);

‎class/Deluge.class.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public static function addNew($id, $file, $hash, $tracker)
1717
if ( ! empty($hash))
1818
{
1919
$delOpt = '';
20-
if ($tracker == 'lostfilm.tv' || $tracker == 'novafilm.tv' || $tracker == 'baibako.tv' || $tracker == 'newstudio.tv')
20+
if ($tracker == 'lostfilm.tv' || $tracker == 'lostfilm-mirror' || $tracker == 'baibako.tv' || $tracker == 'newstudio.tv')
2121
{
2222
if ($deleteOldFiles)
2323
$delOpt = '--remove_data';
@@ -34,6 +34,7 @@ public static function addNew($id, $file, $hash, $tracker)
3434

3535
#добавляем торрент в torrent-клиента
3636
$command = `deluge-console 'connect $torrentAddress $torrentLogin $torrentPassword; add -p "$pathToDownload" $file'`;
37+
3738
if ( ! preg_match('/Torrent added!/', $command))
3839
{
3940
$return['status'] = FALSE;

‎class/Notification.class.php

+8-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ public static function findWarning()
99
foreach ($trackersArray as $tracker)
1010
{
1111
$warningsCount = Database::getWarningsCount($tracker);
12-
if ($warningsCount == 1)
12+
if ($warningsCount != NULL)
1313
{
14-
$warningsArray = Database::getWarnings($tracker);
15-
Notification::sendNotification('warning', $warningsArray['time'], $tracker, $warningsArray['reason']);
16-
}
14+
if ($warningsCount == 1)
15+
{
16+
$warningsArray = Database::getWarnings($tracker);
17+
Notification::sendNotification('warning', $warningsArray['time'], $tracker, $warningsArray['reason']);
18+
}
19+
}
1720
}
1821
}
1922

@@ -30,7 +33,7 @@ public static function sendMail($email, $date, $tracker, $message, $header_messa
3033
if ($name != '' || $name != 0)
3134
{
3235
$msg .= '<br />Ссылка на тему: ';
33-
if ($tracker == 'rutracker.org' || $tracker == 'nnm-club.name' || $tracker == 'tfile.cc' || $tracker == 'torrents.net.ua' || $tracker == 'pornolab.net' || $tracker == 'rustorka.com')
36+
if ($tracker == 'rutracker.org' || $tracker == 'nnmclub.to' || $tracker == 'tfile.cc' || $tracker == 'torrents.net.ua' || $tracker == 'pornolab.net' || $tracker == 'rustorka.com')
3437
$msg .= "http://{$tracker}/forum/viewtopic.php?t={$name}";
3538
elseif ($tracker == 'kinozal.tv' || $tracker == 'animelayer.ru' || $tracker == 'tracker.0day.kiev.ua')
3639
$msg .= "http://{$tracker}/details.php?id={$name}";

‎class/System.class.php

+16-11
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static function checkInternet()
1313
'url' => 'https://www.google.ru/',
1414
)
1515
);
16-
if (preg_match('/<title>Google<\/title>/', $page))
16+
if (preg_match('/<title>.*<\/title>/', $page))
1717
return TRUE;
1818
else
1919
return FALSE;
@@ -194,7 +194,6 @@ public static function getUrlContent($param = null)
194194
$proxy = FALSE;
195195
}
196196
}
197-
198197
if ($proxy)
199198
{
200199
curl_setopt($ch, CURLOPT_PROXY, $proxyAddress);
@@ -242,7 +241,7 @@ public static function parseHeader($tracker, $page)
242241
if ( ! empty($array[1]))
243242
{
244243
if ($tracker == 'anidub.com')
245-
$name = substr($array[1], 0, -23);
244+
$name = substr($array[1], 0, -114);
246245
elseif ($tracker == 'animelayer.ru')
247246
$name = substr($array[1], 0, -15);
248247
elseif ($tracker == 'baibako.tv')
@@ -253,7 +252,7 @@ public static function parseHeader($tracker, $page)
253252
$name = substr($array[1], 48);
254253
elseif ($tracker == 'kinozal.me')
255254
$name = substr($array[1], 0, -22);
256-
elseif ($tracker == 'nnm-club.name')
255+
elseif ($tracker == 'nnmclub.to')
257256
$name = substr($array[1], 0, -12);
258257
elseif ($tracker == 'rutracker.org')
259258
$name = substr($array[1], 0, -17);
@@ -265,13 +264,19 @@ public static function parseHeader($tracker, $page)
265264
$name = substr($array[1], 0, -96);
266265
elseif ($tracker == 'pornolab.net')
267266
$name = substr($array[1], 0, -16);
267+
elseif ($tracker == 'riperam.org')
268+
{
269+
preg_match('/(.*) \&bull\; Riper\.AM/', $array[1], $array2);
270+
if ( ! empty($array2[1]))
271+
$name = $array2[1];
272+
}
268273
elseif ($tracker == 'rustorka.com')
269274
$name = substr($array[1], 0, -111);
270-
elseif ($tracker == 'rutor.info')
275+
elseif (preg_match('/.*tor\.org|rutor\.info/', $array[1]))
271276
{
272-
preg_match('/<title>.*tor.info :: (.*)<\/title>/', $forumPage, $array);
273-
if ( ! empty($array[1]))
274-
$name = $array[1];
277+
preg_match('/.*tor.info :: (.*)/', $array[1], $array2);
278+
if ( ! empty($array2[1]))
279+
$name = $array2[1];
275280
}
276281
else
277282
$name = $array[1];
@@ -287,7 +292,7 @@ public static function getHeader($url)
287292
$tracker = preg_replace('/www\./', '', $tracker);
288293

289294
if (preg_match('/.*tor\.org|rutor\.info/', $tracker))
290-
$tracker = 'rutor.info';
295+
$tracker = 'rutor.org';
291296

292297
if ($tracker == 'rustorka.com' || $tracker == 'booktracker.org' || $tracker == 'tracker.0day.kiev.ua')
293298
{
@@ -355,7 +360,7 @@ public static function getHeader($url)
355360
);
356361
}
357362

358-
if ($tracker != 'animelayer.ru' && $tracker != 'booktracker.org' && $tracker != 'casstudio.tv' && $tracker != 'torrents.net.ua' && $tracker != 'rustorka.com' && $tracker != 'rutor.info' && $tracker != 'tr.anidub.com')
363+
if ($tracker != 'animelayer.ru' && $tracker != 'booktracker.org' && $tracker != 'casstudio.tv' && $tracker != 'torrents.net.ua' && $tracker != 'riperam.org' && $tracker != 'rustorka.com' && $tracker != 'rutor.org' && $tracker != 'tr.anidub.com')
359364
$forumPage = iconv('windows-1251', 'utf-8//IGNORE', $forumPage);
360365

361366
if ($tracker == 'tr.anidub.com')
@@ -396,7 +401,7 @@ public static function addToClient($id, $name, $path, $hash, $tracker, $date_str
396401
}
397402
else
398403
{
399-
Database::saveToTemp($id, $name, $path, $hash, $tracker, $date_str);
404+
Database::saveToTemp($id, $name, $path, $tracker, $date_str);
400405
Errors::setWarnings($torrentClient, $status['msg']);
401406
$return['status'] = FALSE;
402407
}

‎class/Transmission.class.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static function addNew($id, $file, $hash, $tracker)
2828
if ( ! empty($hash))
2929
{
3030
$delOpt = 'false';
31-
if ($tracker == 'lostfilm.tv' || $tracker == 'novafilm.tv' || $tracker == 'baibako.tv' || $tracker == 'newstudio.tv')
31+
if ($tracker == 'lostfilm.tv' || $tracker == 'lostfilm-mirror' || $tracker == 'baibako.tv' || $tracker == 'newstudio.tv')
3232
{
3333
if ($deleteOldFiles)
3434
$delOpt = 'true';
@@ -74,6 +74,11 @@ public static function addNew($id, $file, $hash, $tracker)
7474
$return['status'] = FALSE;
7575
$return['msg'] = 'torrent_file_fail';
7676
}
77+
elseif (preg_match('/http error 0: No Response/i', $result->result))
78+
{
79+
$return['status'] = FALSE;
80+
$return['msg'] = 'no_response';
81+
}
7782
else
7883
{
7984
$return['status'] = FALSE;

0 commit comments

Comments
 (0)