Merge branch 'FixBridges' of https://github.com/logmanoriginal/rss-bridge

bridges/AnimeUltimeBridge.php

@@ -108,6 +108,7 @@ class AnimeUltimeBridge extends BridgeAbstract {
     }
 
     public function getName() {
+        if(!is_null($this->getInput('type'))){
             $typeFilter = array_search(
                 $this->getInput('type'),
                 self::PARAMETERS[$this->queriedContext]['type']['values']
@@ -116,4 +117,7 @@ class AnimeUltimeBridge extends BridgeAbstract {
             return 'Latest '.$typeFilter.' - Anime-Ultime Bridge';
         }
 
+        return parent::getName();
+    }
+
 }

bridges/DailymotionBridge.php

@@ -85,6 +85,7 @@ class DailymotionBridge extends BridgeAbstract{
         case 'From search results':
             $specific=$this->getInput('s');
             break;
+        default: return parent::getName();
         }
 
         return $specific.' : Dailymotion Bridge';

bridges/GBAtempBridge.php

@@ -115,10 +115,14 @@ class GBAtempBridge extends BridgeAbstract {
     }
 
     public function getName() {
+        if(!is_null($this->getInput('type'))){
             $type=array_search(
                 $this->getInput('type'),
                 self::PARAMETERS[$this->queriedContext]['type']['values']
             );
             return 'GBAtemp '.$type.' Bridge';
         }
+
+        return parent::getName();
+    }
 }

bridges/KununuBridge.php

@@ -42,9 +42,12 @@ class KununuBridge extends BridgeAbstract {
 	private $companyName = '';
 
 	public function getURI(){
-        $company = $this->encode_umlauts(strtolower(str_replace(' ', '-', trim($this->getInput('company')))));
+		if(!is_null($this->getInput('company')) && !is_null($this->getInput('site'))){
+
+			$company = $this->fix_company_name($this->getInput('company'));
 			$site = $this->getInput('site');
 			$section = '';
+
 			switch($site){
 			case 'at':
 			case 'de':
@@ -59,16 +62,23 @@ class KununuBridge extends BridgeAbstract {
 			return self::URI . $site . '/' . $company . '/' . $section;
 		}
 
+		return parent::getURI();
+	}
+
 	function getName(){
-        $company = $this->encode_umlauts(strtolower(str_replace(' ', '-', trim($this->getInput('company')))));
+		if(!is_null($this->getInput('company'))){
+			$company = $this->fix_company_name($this->getInput('company'));
 			return ($this->companyName?:$company).' - '.self::NAME;
 		}
 
+		return paren::getName();
+	}
+
 	public function collectData(){
 		$full = $this->getInput('full');
 
 		// Load page
-		$html = getSimpleHTMLDOM($this->getURI());
+		$html = getSimpleHTMLDOMCached($this->getURI());
 		if(!$html)
 			returnServerError('Unable to receive data from ' . $this->getURI() . '!');
 		// Update name for this request
@@ -109,6 +119,16 @@ class KununuBridge extends BridgeAbstract {
 		return preg_replace('/href=(\'|\")\//i', 'href="'.self::URI, $text);
 	}
 
+	/*
+	* Returns a fixed version of the provided company name
+	*/
+	private function fix_company_name($company){
+		$company = trim($company);
+		$company = str_replace(' ', '-', $company);
+		$company = strtolower($company);
+		return $this->encode_umlauts($company);
+	}
+
 	/**
 	* Encodes unmlauts in the given text
 	*/
@@ -123,12 +143,8 @@ class KununuBridge extends BridgeAbstract {
 	* Returns the company name from the review html
 	*/
 	private function extract_company_name($html){
-		$panel = $html->find('div.panel', 0);
+		$company_name = $html->find('h1[itemprop=name]', 0);
-		if($panel === false)
+		if(is_null($company_name))
-			returnServerError('Cannot find panel for company name!');
-
-		$company_name = $panel->find('h1', 0);
-		if($company_name === false)
 			returnServerError('Cannot find company name!');
 
 		return $company_name->plaintext;
@@ -139,11 +155,11 @@ class KununuBridge extends BridgeAbstract {
 	*/
 	private function extract_article_date($article){
 		// They conviniently provide a time attribute for us :)
-		$date = $article->find('time[itemprop=dtreviewed]', 0);
+		$date = $article->find('meta[itemprop=dateCreated]', 0);
-		if($date === false)
+		if(is_null($date))
 			returnServerError('Cannot find article date!');
 
-		return strtotime($date->datetime);
+		return strtotime($date->content);
 	}
 
 	/**
@@ -151,7 +167,7 @@ class KununuBridge extends BridgeAbstract {
 	*/
 	private function extract_article_rating($article){
 		$rating = $article->find('span.rating', 0);
-		if($rating === false)
+		if(is_null($rating))
 			returnServerError('Cannot find article rating!');
 
 		return $rating->getAttribute('aria-label');
@@ -161,8 +177,8 @@ class KununuBridge extends BridgeAbstract {
 	* Returns the summary from a given article
 	*/
 	private function extract_article_summary($article){
-		$summary = $article->find('[itemprop=summary]', 0);
+		$summary = $article->find('[itemprop=name]', 0);
-		if($summary === false)
+		if(is_null($summary))
 			returnServerError('Cannot find article summary!');
 
 		return strip_tags($summary->innertext);
@@ -172,32 +188,27 @@ class KununuBridge extends BridgeAbstract {
 	* Returns the URI from a given article
 	*/
 	private function extract_article_uri($article){
-		// Notice: This first part is the same as in extract_article_summary!
+		$anchor = $article->find('ku-company-review-more', 0);
-		$summary = $article->find('[itemprop=summary]', 0);
+		if(is_null($anchor))
-		if($summary === false)
-			returnServerError('Cannot find article summary!');
-
-		$anchor = $summary->find('a', 0);
-		if($anchor === false)
 			returnServerError('Cannot find article URI!');
 
-		return self::URI . $anchor->href;
+		return self::URI . $anchor->{'review-url'};
 	}
 
 	/**
 	* Returns the position of the author from a given article
 	*/
 	private function extract_article_author_position($article){
-		// We need to parse the aside manually
+		// We need to parse the user-content manually
-		$aside = $article->find('aside', 0);
+		$user_content = $article->find('div.user-content', 0);
-		if($aside === false)
+		if(is_null($user_content))
-			returnServerError('Cannot find article author information!');
+			returnServerError('Cannot find user content!');
 
 		// Go through all h2 elements to find index of required span (I know... it's stupid)
 		$author_position = 'Unknown';
-		foreach($aside->find('h2') as $subject){
+		foreach($user_content->find('div') as $content){
-			if(stristr(strtolower($subject->plaintext), 'position')){ /* This works for at, ch, de, us */
+			if(stristr(strtolower($content->plaintext), 'position')){ /* This works for at, ch, de, us */
-				$author_position = $subject->next_sibling()->plaintext;
+				$author_position = $content->next_sibling()->plaintext;
 				break;
 			}
 		}
@@ -209,8 +220,8 @@ class KununuBridge extends BridgeAbstract {
 	* Returns the description from a given article
 	*/
 	private function extract_article_description($article){
-		$description = $article->find('div[itemprop=description]', 0);
+		$description = $article->find('[itemprop=reviewBody]', 0);
-		if($description === false)
+		if(is_null($description))
 			returnServerError('Cannot find article description!');
 
 		return $this->fix_url($description->innertext);
@@ -227,7 +238,7 @@ class KununuBridge extends BridgeAbstract {
 
 		// Find the article
 		$article = $html->find('article', 0);
-		if($article === false)
+		if(is_null($article))
 			returnServerError('Cannot find article!');
 
 		// Luckily they use the same layout for the review overview and full article pages :)

bridges/MangareaderBridge.php

@@ -239,6 +239,7 @@ EOD;
         case 'Get manga updates':
             $path = $this->getInput('path');
             break;
+        default: return parent::getURI();
         }
         return self::URI . $path;
     }