Merge branch 'master' of https://github.com/FabianBeiner/PHP-IMDB-Gra…

…bber
FabianBeiner · Aug 24, 2014 · aeb3571 · aeb3571
2 parents 1d674ba + 793cc1e
commit aeb3571
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/imdb.class.php b/imdb.class.php
@@ -48,22 +48,22 @@ class IMDB {
     const IMDB_AKA          = '~Also Known As:</h4>(.*)<span~Ui';
     const IMDB_ASPECT_RATIO = '~Aspect Ratio:</h4>(.*)</div>~Ui';
     const IMDB_BUDGET       = '~Budget:</h4>(.*)<span~Ui';
-    const IMDB_CAST         = '~itemprop="actor"(?:.*)><a href="/name/nm(\d+)/(?:.*)" itemprop=\'url\'> <span class="itemprop" itemprop="name">(.*)</span>~Ui';
+    const IMDB_CAST         = '~itemprop="actor"(?:.*)><a href="/name/nm(\d+)/(?:.*)"(?:\s*)itemprop=\'url\'> <span class="itemprop" itemprop="name">(.*)</span>~Ui';
     const IMDB_FULL_CAST    = '~<span class="itemprop" itemprop="name">(.*?)</span>~Ui';
     const IMDB_CHAR         = '~<td class="character">\s+<div>(.*)</div>\s+</td~Ui';
-    const IMDB_COLOR        = '~href="/search/title\?colors=(?:.*)" itemprop=\'url\'>(.*)</a>~Ui';
+    const IMDB_COLOR        = '~href="/search/title\?colors=(?:.*)"(?:\s*)itemprop=\'url\'>(.*)</a>~Ui';
     const IMDB_COMPANY      = '~Production Co:</h4>(.*)</div>~Ui';
-    const IMDB_COMPANY_NAME = '~href="/company/co(\d+)(?:\?.*)" itemprop=\'url\'>(.*)</a>~Ui';
-    const IMDB_COUNTRY      = '~href="/country/(\w+)\?(?:.*)" itemprop=\'url\'>(.*)</a>~Ui';
+    const IMDB_COMPANY_NAME = '~href="/company/co(\d+)(?:\?.*)"(?:\s*)itemprop=\'url\'>(.*)</a>~Ui';
+    const IMDB_COUNTRY      = '~href="/country/(\w+)\?(?:.*)"(?:\s*)itemprop=\'url\'>(.*)</a>~Ui';
     const IMDB_CREATOR      = '~(?:Creator|Creators):</h4>(.*)</div>~Ui';
     const IMDB_DESCRIPTION  = '~<p itemprop="description">(.*)(?:<a|<\/p>)~Ui';
     const IMDB_DIRECTOR     = '~(?:Director|Directors):</h4>(.*)</div>~Ui';
     const IMDB_GENRE        = '~href="/genre/(.*)(?:\?.*)"(?:\s+|)>(.*)</a>~Ui';
     const IMDB_ID           = '~(tt\d{6,})~';
-    const IMDB_LANGUAGES    = '~href="/language/(.*)(?:\?.*)" itemprop=\'url\'>(.*)</a>~Ui';
-    const IMDB_LOCATION     = '~href="/search/title\?locations=(.*)(?:&.*)" itemprop=\'url\'>(.*)</a>~Ui';
+    const IMDB_LANGUAGES    = '~href="/language/(.*)(?:\?.*)"(?:\s*)itemprop=\'url\'>(.*)</a>~Ui';
+    const IMDB_LOCATION     = '~href="/search/title\?locations=(.*)(?:&.*)"itemprop=\'url\'>(.*)</a>~Ui';
     const IMDB_MPAA         = '~span itemprop="contentRating"(?:.*)>(.*)</span~Ui';
-    const IMDB_NAME         = '~href="/name/nm(\d+)/(?:.*)" itemprop=\'(?:\w+)\'><span class="itemprop" itemprop="name">(.*)</span>~Ui';
+    const IMDB_NAME         = '~href="/name/nm(\d+)/(?:.*)"(?:\s*)itemprop=\'(?:\w+)\'><span class="itemprop" itemprop="name">(.*)</span>~Ui';
     const IMDB_OPENING      = '~Opening Weekend:</h4>(.*)\(~Ui';
     const IMDB_PLOT         = '~Storyline</h2>\s+<div class="inline canwrap" itemprop="description">\s+<p>(.*)(?:<em|<\/p>|<\/div>)~Ui';
     const IMDB_POSTER       = '~"src="(.*)"itemprop="image" \/>~Ui';
@@ -76,7 +76,7 @@ class IMDB {
     const IMDB_SITES        = '~Official Sites:</h4>(.*)(?:<a href="officialsites|</div>)~Ui';
     const IMDB_SITES_A      = '~href="(.*)" itemprop=\'url\'>(.*)</a>~Ui';
     const IMDB_SOUND_MIX    = '~Sound Mix:</h4>(.*)</div>~Ui';
-    const IMDB_SOUND_MIX_A  = '~href="/search/title\?sound_mixes=(?:.*)" itemprop=\'url\'>(.*)</a>~Ui';
+    const IMDB_SOUND_MIX_A  = '~href="/search/title\?sound_mixes=(?:.*)"(?:\s*)itemprop=\'url\'>(.*)</a>~Ui';
     const IMDB_TAGLINE      = '~Taglines:</h4>(.*)(?:<span|<\/span>|</div>)~Ui';
     const IMDB_TITLE        = '~property=\'og:title\' content="(.*) \((?:.*)\)"~Ui';
     const IMDB_TITLE_ORIG   = '~<span class="title-extra" itemprop="name">(.*)<i>\(original title\)<\/i>\s+</span>~Ui';