From a2b27f51aaf22c8339ca3cc50b871e29f1c24899 Mon Sep 17 00:00:00 2001 From: Thomas Lutz Date: Wed, 6 Aug 2014 14:56:11 +0200 Subject: [PATCH] Refactored like suggested; removed BC break --- SEOstats/Services/Sistrix.php | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/SEOstats/Services/Sistrix.php b/SEOstats/Services/Sistrix.php index 26c775d3..d6b27376 100644 --- a/SEOstats/Services/Sistrix.php +++ b/SEOstats/Services/Sistrix.php @@ -49,12 +49,7 @@ public static function getVisibilityIndex($url = false) $html = parent::_getPage($dataUrl); @preg_match_all('#

(.*?)<\/h3>#si', $html, $matches); - if(isset($matches[1][0])) { - $vi = str_replace(',','.',$matches[1][0]); - return $vi; - } else { - return parent::noDataDefaultValue(); - } + return isset($matches[1][0]) ? $matches[1][0] : parent::noDataDefaultValue(); } /** @@ -70,8 +65,6 @@ public static function getVisibilityIndexByApi($url = false, $db = false) self::guardApiKey(); self::guardApiCredits(); - $db = ($db == false) ? Config\DefaultSettings::SISTRIX_DB : $db; - $url = parent::getUrl($url); $domain = static::getDomainFromUrl($url); $database = static::getValidDatabase($db); @@ -80,12 +73,11 @@ public static function getVisibilityIndexByApi($url = false, $db = false) $json = parent::_getPage($dataUrl); - if(!empty($json)) { - $json_decoded = (Helper\Json::decode($json, true)); - return $json_decoded['answer'][0]['sichtbarkeitsindex'][0]['value']; - } else { + if(empty($json)) { return parent::noDataDefaultValue(); } + $json_decoded = (Helper\Json::decode($json, true)); + return $json_decoded['answer'][0]['sichtbarkeitsindex'][0]['value']; } public static function getApiCredits() { @@ -95,12 +87,11 @@ public static function getApiCredits() { $json = parent::_getPage($dataUrl); - if(!empty($json)) { - $json_decoded = (Helper\Json::decode($json, true)); - return $json_decoded['answer'][0]['credits'][0]['value']; - } else { + if(empty($json)) { return parent::noDataDefaultValue(); } + $json_decoded = (Helper\Json::decode($json, true)); + return $json_decoded['answer'][0]['credits'][0]['value']; } private static function checkApiCredits() { @@ -136,6 +127,8 @@ protected static function getDomainFromUrl($url) protected static function getValidDatabase($db) { + $db = ($db == false) ? Config\DefaultSettings::SISTRIX_DB : $db; + $database = self::checkDatabase($db); static::guardDatabaseIsValid($database);