Merge branch 'master' of github.com:profplump/UberZach-Video

findTorrent.pl

@@ -33,7 +33,7 @@ my $TIMEOUT       = 15;
 my $ERR_DELAY     = $TIMEOUT * 2;
 my $ERR_RETRIES   = 3;
 my $UA            = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.75.14 (KHTML, like Gecko) Version/7.0.3 Safari/7046A194A';
-my $EXCLUDES_FILE = $ENV{'HOME'} . '.findTorrent.exclude';
+my $EXCLUDES_FILE = $ENV{'HOME'} . '/.findTorrent.exclude';
 
 # Static tracker list, appended to all magnet URIs
 my @TRACKERS = ('udp://open.demonii.com:1337/announce', 'udp://tracker.publicbt.com:80/announce', 'udp://tracker.openbittorrent.com:80/announce', 'udp://9.rarbg.com:2710/announce');

web/includes/season.php

@@ -130,7 +130,7 @@ function addSeason($series, $season) {
 	# Ensure the season does not exist
 	$season_path = seasonPath($series, $season);
 	if (file_exists($season_path)) {
-		die('Invalid season: ' . htmlspecialchars($season) . "\n");
+		die(htmlspecialchars($series). ': Invalid season: ' . htmlspecialchars($season) . "\n");
 	}
 
 	# Ensure the season number is listed on TVDB
@@ -140,7 +140,7 @@ function addSeason($series, $season) {
 	}
 	$seasons = getTVDBSeasons($flags['tvdb-id'], $flags['tvdb-lid']);
 	if (!$seasons[ $season ]) {
-		die('Season not listed in TheTVDB: ' . htmlspecialchars($season) . "\n");
+		die(htmlspecialchars($series) . ': Season not listed in TheTVDB: ' . htmlspecialchars($season) . "\n");
 	}
 
 	# Create the directory