diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-08-11 21:28:30 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-08-11 21:28:30 +0400 |
commit | d293408450bc8b0c0f79934da6a43914626935ae (patch) | |
tree | e50c0df2f698b6033e13f963b9a16a01ef5bf020 /plugins/SEO | |
parent | 3b74ae5cdac37e16315c3a24ecf2591f742ca3c7 (diff) | |
parent | 2340530c1109a37527f3b8ad0b82e54e7a6eb137 (diff) |
Merge branch 'plugin_namespaces'
Conflicts:
plugins/UserCountryMap/Controller.php
Diffstat (limited to 'plugins/SEO')
-rw-r--r-- | plugins/SEO/API.php | 26 | ||||
-rw-r--r-- | plugins/SEO/Controller.php | 15 | ||||
-rw-r--r-- | plugins/SEO/MajesticClient.php | 6 | ||||
-rw-r--r-- | plugins/SEO/RankChecker.php | 16 | ||||
-rw-r--r-- | plugins/SEO/SEO.php | 9 |
5 files changed, 43 insertions, 29 deletions
diff --git a/plugins/SEO/API.php b/plugins/SEO/API.php index 185561df44..74dd10ac56 100644 --- a/plugins/SEO/API.php +++ b/plugins/SEO/API.php @@ -6,10 +6,14 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * * @category Piwik_Plugins - * @package Piwik_SEO + * @package SEO */ +namespace Piwik\Plugins\SEO; + use Piwik\Piwik; use Piwik\DataTable; +use Piwik\Plugins\SEO\MajesticClient; +use Piwik\Plugins\SEO\RankChecker; /** * @see plugins/Referers/functions.php @@ -20,14 +24,14 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/Referers/functions.php'; * The SEO API lets you access a list of SEO metrics for the specified URL: Google Pagerank, Goolge/Bing indexed pages * Alexa Rank, age of the Domain name and count of DMOZ entries. * - * @package Piwik_SEO + * @package SEO */ -class Piwik_SEO_API +class API { static private $instance = null; /** - * @return Piwik_SEO_API + * @return \Piwik\Plugins\SEO\API */ static public function getInstance() { @@ -46,29 +50,29 @@ class Piwik_SEO_API public function getRank($url) { Piwik::checkUserHasSomeViewAccess(); - $rank = new Piwik_SEO_RankChecker($url); + $rank = new RankChecker($url); - $linkToMajestic = Piwik_SEO_MajesticClient::getLinkForUrl($url); + $linkToMajestic = MajesticClient::getLinkForUrl($url); $data = array( 'Google PageRank' => array( 'rank' => $rank->getPageRank(), - 'logo' => Piwik_getSearchEngineLogoFromUrl('http://google.com'), + 'logo' => \Piwik\Plugins\Referers\getSearchEngineLogoFromUrl('http://google.com'), 'id' => 'pagerank' ), Piwik_Translate('SEO_Google_IndexedPages') => array( 'rank' => $rank->getIndexedPagesGoogle(), - 'logo' => Piwik_getSearchEngineLogoFromUrl('http://google.com'), + 'logo' => \Piwik\Plugins\Referers\getSearchEngineLogoFromUrl('http://google.com'), 'id' => 'google-index', ), Piwik_Translate('SEO_Bing_IndexedPages') => array( 'rank' => $rank->getIndexedPagesBing(), - 'logo' => Piwik_getSearchEngineLogoFromUrl('http://bing.com'), + 'logo' => \Piwik\Plugins\Referers\getSearchEngineLogoFromUrl('http://bing.com'), 'id' => 'bing-index', ), Piwik_Translate('SEO_AlexaRank') => array( 'rank' => $rank->getAlexaRank(), - 'logo' => Piwik_getSearchEngineLogoFromUrl('http://alexa.com'), + 'logo' => \Piwik\Plugins\Referers\getSearchEngineLogoFromUrl('http://alexa.com'), 'id' => 'alexa', ), Piwik_Translate('SEO_DomainAge') => array( @@ -95,7 +99,7 @@ class Piwik_SEO_API // Add DMOZ only if > 0 entries found $dmozRank = array( 'rank' => $rank->getDmoz(), - 'logo' => Piwik_getSearchEngineLogoFromUrl('http://dmoz.org'), + 'logo' => \Piwik\Plugins\Referers\getSearchEngineLogoFromUrl('http://dmoz.org'), 'id' => 'dmoz', ); if ($dmozRank['rank'] > 0) { diff --git a/plugins/SEO/Controller.php b/plugins/SEO/Controller.php index fc51c128f9..ee23bde1f4 100644 --- a/plugins/SEO/Controller.php +++ b/plugins/SEO/Controller.php @@ -6,18 +6,21 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * * @category Piwik_Plugins - * @package Piwik_SEO + * @package SEO */ +namespace Piwik\Plugins\SEO; + use Piwik\Common; use Piwik\DataTable\Renderer; -use Piwik\Controller; +use Piwik\Plugins\SEO\API; use Piwik\View; use Piwik\Site; +use Piwik\Plugins\SEO\RankChecker; /** - * @package Piwik_SEO + * @package SEO */ -class Piwik_SEO_Controller extends Controller +class Controller extends \Piwik\Controller { function getRank() { @@ -34,10 +37,10 @@ class Piwik_SEO_Controller extends Controller $url = $site->getMainUrl(); } - $dataTable = Piwik_SEO_API::getInstance()->getRank($url); + $dataTable = API::getInstance()->getRank($url); $view = new View('@SEO/getRank'); - $view->urlToRank = Piwik_SEO_RankChecker::extractDomainFromUrl($url); + $view->urlToRank = RankChecker::extractDomainFromUrl($url); /** @var \Piwik\DataTable\Renderer\Php $renderer */ $renderer = Renderer::factory('php'); diff --git a/plugins/SEO/MajesticClient.php b/plugins/SEO/MajesticClient.php index 34f16a038e..1f89009121 100644 --- a/plugins/SEO/MajesticClient.php +++ b/plugins/SEO/MajesticClient.php @@ -6,8 +6,10 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * * @category Piwik_Plugins - * @package Piwik_SEO + * @package SEO */ +namespace Piwik\Plugins\SEO; + use Piwik\Common; use Piwik\Http; @@ -16,7 +18,7 @@ use Piwik\Http; * * Hides the HTTP request sending logic. */ -class Piwik_SEO_MajesticClient +class MajesticClient { const API_BASE = 'http://simpleapi.majesticseo.com/sapi/'; const API_KEY = 'ETHPYY'; // please only use this key within Piwik diff --git a/plugins/SEO/RankChecker.php b/plugins/SEO/RankChecker.php index cdc858176c..74d8afda3b 100644 --- a/plugins/SEO/RankChecker.php +++ b/plugins/SEO/RankChecker.php @@ -6,10 +6,14 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * * @category Piwik_Plugins - * @package Piwik_SEO + * @package SEO */ +namespace Piwik\Plugins\SEO; + +use Exception; use Piwik\Piwik; use Piwik\Http; +use Piwik\Plugins\SEO\MajesticClient; /** * The functions below are derived/adapted from GetRank.org's @@ -18,9 +22,9 @@ use Piwik\Http; * @copyright Copyright (C) 2007 - 2010 GetRank.Org All rights reserved. * @link http://www.getrank.org/free-pagerank-script/ * @license GPL - * @package Piwik_SEO + * @package SEO */ -class Piwik_SEO_RankChecker +class RankChecker { private $url; private $majesticInfo = null; @@ -185,7 +189,7 @@ class Piwik_SEO_RankChecker try { $majesticInfo = $this->getMajesticInfo(); return $majesticInfo['backlink_count']; - } catch(Exception $e) { + } catch (Exception $e) { Piwik::log($e->getMessage()); return 0; } @@ -201,7 +205,7 @@ class Piwik_SEO_RankChecker try { $majesticInfo = $this->getMajesticInfo(); return $majesticInfo['referrer_domains_count']; - } catch(Exception $e) { + } catch (Exception $e) { Piwik::log($e->getMessage()); return 0; } @@ -366,7 +370,7 @@ class Piwik_SEO_RankChecker private function getMajesticInfo() { if ($this->majesticInfo === null) { - $client = new Piwik_SEO_MajesticClient(); + $client = new MajesticClient(); $this->majesticInfo = $client->getBacklinkStats($this->url); } diff --git a/plugins/SEO/SEO.php b/plugins/SEO/SEO.php index 505f8de521..dd488bef97 100644 --- a/plugins/SEO/SEO.php +++ b/plugins/SEO/SEO.php @@ -6,16 +6,17 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * * @category Piwik_Plugins - * @package Piwik_SEO + * @package SEO */ +namespace Piwik\Plugins\SEO; + use Piwik\Version; -use Piwik\Plugin; use Piwik\WidgetsList; /** - * @package Piwik_SEO + * @package SEO */ -class Piwik_SEO extends Plugin +class SEO extends \Piwik\Plugin { /** * @see Piwik_Plugin::getInformation |