fixes #2869 removed yahoo backlink and indexed pages check; checking urls without http:// is now possible

git-svn-id: http://dev.piwik.org/svn/trunk@5680 59fd770c-687e-43c8-a1e3-f5a4ff64c105

3 files changed, 5 insertions, 30 deletions

diff --git a/plugins/SEO/API.php b/plugins/SEO/API.php
index 4098bcb349..afc4e1183f 100644
--- a/plugins/SEO/API.php
+++ b/plugins/SEO/API.php
@@ -53,16 +53,6 @@ class Piwik_SEO_API
 				'logo' => Piwik_getSearchEngineLogoFromUrl('http://google.com'),
 				'id' => 'pagerank'
 			),
-			Piwik_Translate('SEO_YahooBacklinks')	=> array(
-				'rank' => $rank->getBacklinksYahoo(),
-				'logo' => Piwik_getSearchEngineLogoFromUrl('http://search.yahoo.com'),
-				'id' => 'yahoo-bls'
-			),
-			Piwik_Translate('SEO_YahooIndexedPages') => array(
-				'rank' => $rank->getIndexedYahoo(),
-				'logo' => Piwik_getSearchEngineLogoFromUrl('http://search.yahoo.com'),
-				'id' => 'yahoo-pages'
-			),
 			Piwik_Translate('SEO_AlexaRank') => array(
 				'rank' => $rank->getAlexaRank(),
 				'logo' => Piwik_getSearchEngineLogoFromUrl('http://alexa.com'),
diff --git a/plugins/SEO/Controller.php b/plugins/SEO/Controller.php
index fe4238e26b..9d1ad17c3a 100644
--- a/plugins/SEO/Controller.php
+++ b/plugins/SEO/Controller.php
@@ -21,6 +21,11 @@ class Piwik_SEO_Controller extends Piwik_Controller
 		$site = new Piwik_Site($idSite);
 
 		$url = urldecode(Piwik_Common::getRequestVar('url', '', 'string'));
+		
+		if(!empty($url) && strpos($url, 'http://') !== 0 && strpos($url, 'https://') !== 0) {
+			$url = 'http://'.$url;
+		}
+		
 		if(empty($url) || !Piwik_Common::isLookLikeUrl($url))
 		{
 			$url = $site->getMainUrl();
diff --git a/plugins/SEO/RankChecker.php b/plugins/SEO/RankChecker.php
index ea441a4e06..17421c0c3d 100644
--- a/plugins/SEO/RankChecker.php
+++ b/plugins/SEO/RankChecker.php
@@ -120,16 +120,6 @@ class Piwik_SEO_RankChecker
 		return $value;
 	}
 
-	public function getBacklinksYahoo()
-	{
-		$url = $this->url;
-		$url = 'http://siteexplorer.search.yahoo.com/search?p='.urlencode($url);
-		$data = $this->getPage($url);
-		preg_match('/Inlinks \(([0-9\,]+)\)/si', $data, $p);
-		$value = isset($p[1]) ? $this->toInt($p[1]) : 0;
-		return $value;
-	}
-
 	public function getAge()
 	{
 		$url = preg_replace('/^www\./', '', $this->url);
@@ -145,16 +135,6 @@ class Piwik_SEO_RankChecker
 		return $value;
 	}
 
-	public function getIndexedYahoo()
-	{
-		$url = $this->url;
-		$url = 'http://siteexplorer.search.yahoo.com/search?p='.urlencode($url);
-		$data = $this->getPage($url);
-		preg_match('/Pages \(([0-9,]{1,})\)/im', $data, $p);
-		$value = isset($p[1]) ? $this->toInt($p[1]) : 0;
-		return $value;
-	}
-
 	private function toInt($string)
 	{
 		return preg_replace('#[^0-9]#si', '', $string);