diff options
author | Benaka Moorthi <benaka.moorthi@gmail.com> | 2013-09-24 06:58:51 +0400 |
---|---|---|
committer | Benaka Moorthi <benaka.moorthi@gmail.com> | 2013-09-24 06:58:51 +0400 |
commit | 48681dd582fbc9f840183cad28cc3e4dd3418d05 (patch) | |
tree | 88008786b75c8a3a342f6e784413430a9c0779e2 /plugins | |
parent | ae5fc3786a19f67202e2e83fd83e9e67657e8173 (diff) |
Remove use of Zend_Registry to hold DB connections.
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/Dashboard/Dashboard.php | 3 | ||||
-rw-r--r-- | plugins/DevicesDetection/DevicesDetection.php | 3 | ||||
-rw-r--r-- | plugins/Goals/API.php | 4 | ||||
-rw-r--r-- | plugins/Installation/Controller.php | 4 | ||||
-rw-r--r-- | plugins/Installation/FormDatabaseSetup.php | 9 | ||||
-rw-r--r-- | plugins/LanguagesManager/LanguagesManager.php | 3 | ||||
-rw-r--r-- | plugins/PDFReports/API.php | 8 | ||||
-rw-r--r-- | plugins/PDFReports/PDFReports.php | 3 | ||||
-rw-r--r-- | plugins/Provider/Provider.php | 3 | ||||
-rw-r--r-- | plugins/SegmentEditor/API.php | 11 | ||||
-rw-r--r-- | plugins/SegmentEditor/SegmentEditor.php | 3 | ||||
-rw-r--r-- | plugins/SitesManager/API.php | 38 | ||||
-rw-r--r-- | plugins/UsersManager/API.php | 26 |
13 files changed, 57 insertions, 61 deletions
diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php index 4de67194d8..58bdc303c9 100644 --- a/plugins/Dashboard/Dashboard.php +++ b/plugins/Dashboard/Dashboard.php @@ -16,7 +16,6 @@ use Piwik\Common; use Piwik\Site; use Piwik\Db; use Piwik\WidgetsList; -use Zend_Registry; /** * @package Dashboard @@ -264,7 +263,7 @@ class Dashboard extends \Piwik\Plugin } catch (Exception $e) { // mysql code error 1050:table already exists // see bug #153 http://dev.piwik.org/trac/ticket/153 - if (!Zend_Registry::get('db')->isErrNo($e, '1050')) { + if (!Db::get()->isErrNo($e, '1050')) { throw $e; } } diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php index 6f298348e9..bdff5eadcc 100644 --- a/plugins/DevicesDetection/DevicesDetection.php +++ b/plugins/DevicesDetection/DevicesDetection.php @@ -19,7 +19,6 @@ use Piwik\Plugins\DevicesDetection\Archiver; use Piwik\WidgetsList; use Piwik\Db; use UserAgentParserEnhanced; -use Zend_Registry; require_once PIWIK_INCLUDE_PATH . "/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php"; require_once PIWIK_INCLUDE_PATH . '/plugins/DevicesDetection/functions.php'; @@ -224,7 +223,7 @@ class DevicesDetection extends \Piwik\Plugin Db::exec($q2); } } catch (Exception $e) { - if (!Zend_Registry::get('db')->isErrNo($e, '1060')) { + if (!Db::get()->isErrNo($e, '1060')) { throw $e; } } diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php index c80ade9ac3..59866c8923 100644 --- a/plugins/Goals/API.php +++ b/plugins/Goals/API.php @@ -111,7 +111,7 @@ class API $pattern = $this->checkPattern($pattern); // save in db - $db = \Zend_Registry::get('db'); + $db = Db::get(); $idGoal = $db->fetchOne("SELECT max(idgoal) + 1 FROM " . Common::prefixTable('goal') . " WHERE idsite = ?", $idSite); @@ -157,7 +157,7 @@ class API $name = $this->checkName($name); $pattern = $this->checkPattern($pattern); $this->checkPatternIsValid($patternType, $pattern); - \Zend_Registry::get('db')->update(Common::prefixTable('goal'), + Db::get()->update(Common::prefixTable('goal'), array( 'name' => $name, 'match_attribute' => $matchAttribute, diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index e6528ed6f8..234467f0e0 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -234,7 +234,7 @@ class Controller extends \Piwik\Controller\Admin } $this->createDbFromSessionInformation(); - $db = \Zend_Registry::get('db'); + $db = Db::get(); try { $db->checkClientVersion(); @@ -543,7 +543,7 @@ class Controller extends \Piwik\Controller\Admin { $dbInfos = $this->session->db_infos; Config::getInstance()->database = $dbInfos; - DbHelper::createDatabaseObject($dbInfos); + Db::createDatabaseObject($dbInfos); } /** diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php index b4b8550f03..9e4a128719 100644 --- a/plugins/Installation/FormDatabaseSetup.php +++ b/plugins/Installation/FormDatabaseSetup.php @@ -16,6 +16,7 @@ use HTML_QuickForm2_Factory; use HTML_QuickForm2_Rule; use Piwik\Db\Adapter; use Piwik\DbHelper; +use Piwik\Db; use Piwik\Filesystem; use Piwik\QuickForm2; use Zend_Db_Adapter_Exception; @@ -120,7 +121,7 @@ class FormDatabaseSetup extends QuickForm2 } try { - @DbHelper::createDatabaseObject($dbInfos); + @Db::createDatabaseObject($dbInfos); } catch (Zend_Db_Adapter_Exception $e) { $db = Adapter::factory($adapter, $dbInfos, $connect = false); @@ -128,11 +129,11 @@ class FormDatabaseSetup extends QuickForm2 if ($db->isErrNo($e, '1049')) { $dbInfosConnectOnly = $dbInfos; $dbInfosConnectOnly['dbname'] = null; - @DbHelper::createDatabaseObject($dbInfosConnectOnly); + @Db::createDatabaseObject($dbInfosConnectOnly); @DbHelper::createDatabase($dbInfos['dbname']); // select the newly created database - @DbHelper::createDatabaseObject($dbInfos); + @Db::createDatabaseObject($dbInfos); } else { throw $e; } @@ -179,7 +180,7 @@ class Rule_checkUserPrivileges extends HTML_QuickForm2_Rule } } - $db = \Zend_Registry::get('db'); + $db = Db::get(); try { // try to drop tables before running privilege tests diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php index 4372676c74..5d962d9476 100644 --- a/plugins/LanguagesManager/LanguagesManager.php +++ b/plugins/LanguagesManager/LanguagesManager.php @@ -20,7 +20,6 @@ use Piwik\Plugins\LanguagesManager\API; use Piwik\View; use Piwik\Db; use Piwik\Translate; -use Zend_Registry; /** * @@ -116,7 +115,7 @@ class LanguagesManager extends \Piwik\Plugin } catch (Exception $e) { // mysql code error 1050:table already exists // see bug #153 http://dev.piwik.org/trac/ticket/153 - if (!Zend_Registry::get('db')->isErrNo($e, '1050')) { + if (!Db::get()->isErrNo($e, '1050')) { throw $e; } } diff --git a/plugins/PDFReports/API.php b/plugins/PDFReports/API.php index 909c61ce07..df72e8c39c 100644 --- a/plugins/PDFReports/API.php +++ b/plugins/PDFReports/API.php @@ -110,7 +110,7 @@ class API // validation of requested reports $reports = self::validateRequestedReports($idSite, $reportType, $reports); - $db = \Zend_Registry::get('db'); + $db = Db::get(); $idReport = $db->fetchOne("SELECT max(idreport) + 1 FROM " . Common::prefixTable('report')); if ($idReport == false) { @@ -170,7 +170,7 @@ class API // validation of requested reports $reports = self::validateRequestedReports($idSite, $reportType, $reports); - \Zend_Registry::get('db')->update(Common::prefixTable('report'), + Db::get()->update(Common::prefixTable('report'), array( 'description' => $description, 'idsegment' => $idSegment, @@ -198,7 +198,7 @@ class API $report = reset($pdfReports); Piwik::checkUserIsSuperUserOrTheUser($report['login']); - \Zend_Registry::get('db')->update(Common::prefixTable('report'), + Db::get()->update(Common::prefixTable('report'), array( 'deleted' => 1, ), @@ -548,7 +548,7 @@ class API ); // Update flag in DB - \Zend_Registry::get('db')->update(Common::prefixTable('report'), + Db::get()->update(Common::prefixTable('report'), array('ts_last_sent' => Date::now()->getDatetime()), "idreport = " . $report['idreport'] ); diff --git a/plugins/PDFReports/PDFReports.php b/plugins/PDFReports/PDFReports.php index 9fe7f8c54a..295adbab79 100644 --- a/plugins/PDFReports/PDFReports.php +++ b/plugins/PDFReports/PDFReports.php @@ -27,7 +27,6 @@ use Piwik\ScheduledTime; use Piwik\Site; use Piwik\View; use Zend_Mime; -use Zend_Registry; /** * @@ -550,7 +549,7 @@ class PDFReports extends \Piwik\Plugin Db::exec($query); } } catch (Exception $e) { - if (!Zend_Registry::get('db')->isErrNo($e, '1050')) { + if (!Db::get()->isErrNo($e, '1050')) { throw $e; } } diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php index f2562e9485..b6013e0e3c 100644 --- a/plugins/Provider/Provider.php +++ b/plugins/Provider/Provider.php @@ -18,7 +18,6 @@ use Piwik\ArchiveProcessor; use Piwik\Db; use Piwik\Plugins\Provider\Archiver; use Piwik\WidgetsList; -use Zend_Registry; /** * @@ -78,7 +77,7 @@ class Provider extends \Piwik\Plugin try { Db::exec($query); } catch (Exception $e) { - if (!Zend_Registry::get('db')->isErrNo($e, '1060')) { + if (!Db::get()->isErrNo($e, '1060')) { throw $e; } } diff --git a/plugins/SegmentEditor/API.php b/plugins/SegmentEditor/API.php index 1dbc8b0811..7c96fc25b6 100644 --- a/plugins/SegmentEditor/API.php +++ b/plugins/SegmentEditor/API.php @@ -15,6 +15,7 @@ use Piwik\Piwik; use Piwik\Common; use Piwik\Date; use Piwik\Segment; +use Piwik\Db; /** * The SegmentEditor API lets you add, update, delete custom Segments, and list saved segments.a @@ -138,7 +139,7 @@ class API Piwik_PostEvent(self::DELETE_SEGMENT_EVENT, array(&$idSegment)); $segment = $this->getSegmentOrFail($idSegment); - $db = \Zend_Registry::get('db'); + $db = Db::get(); $db->delete(Common::prefixTable('segment'), 'idsegment = ' . $idSegment); return true; } @@ -175,7 +176,7 @@ class API 'ts_last_edit' => Date::now()->getDatetime(), ); - $db = \Zend_Registry::get('db'); + $db = Db::get(); $db->update(Common::prefixTable("segment"), $bind, "idsegment = $idSegment" @@ -203,7 +204,7 @@ class API $enabledAllUsers = $this->checkEnabledAllUsers($enabledAllUsers); $autoArchive = $this->checkAutoArchive($autoArchive, $idSite); - $db = \Zend_Registry::get('db'); + $db = Db::get(); $bind = array( 'name' => $name, 'definition' => $definition, @@ -231,7 +232,7 @@ class API if (!is_numeric($idSegment)) { throw new Exception("idSegment should be numeric."); } - $segment = \Zend_Registry::get('db')->fetchRow("SELECT * " . + $segment = Db::get()->fetchRow("SELECT * " . " FROM " . Common::prefixTable("segment") . " WHERE idsegment = ?", $idSegment); @@ -289,7 +290,7 @@ class API AND deleted = 0 $extraWhere ORDER BY name ASC"; - $segments = \Zend_Registry::get('db')->fetchAll($sql, $bind); + $segments = Db::get()->fetchAll($sql, $bind); return $segments; } diff --git a/plugins/SegmentEditor/SegmentEditor.php b/plugins/SegmentEditor/SegmentEditor.php index 8037d868e9..2fdaea66ed 100644 --- a/plugins/SegmentEditor/SegmentEditor.php +++ b/plugins/SegmentEditor/SegmentEditor.php @@ -16,7 +16,6 @@ use Piwik\Plugins\SegmentEditor\API; use Piwik\Plugins\SegmentEditor\Controller; use Piwik\Version; use Piwik\Db; -use Zend_Registry; /** * @package SegmentEditor @@ -94,7 +93,7 @@ class SegmentEditor extends \Piwik\Plugin Db::exec($query); } } catch (Exception $e) { - if (!Zend_Registry::get('db')->isErrNo($e, '1050')) { + if (!Db::get()->isErrNo($e, '1050')) { throw $e; } } diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php index 9231b3855a..6b299349d7 100644 --- a/plugins/SitesManager/API.php +++ b/plugins/SitesManager/API.php @@ -99,9 +99,9 @@ class API Piwik::checkUserIsSuperUser(); $group = trim($group); - $sites = \Zend_Registry::get('db')->fetchAll("SELECT * - FROM " . Common::prefixTable("site") . " - WHERE `group` = ?", $group); + $sites = Db::get()->fetchAll("SELECT * + FROM " . Common::prefixTable("site") . " + WHERE `group` = ?", $group); return $sites; } @@ -114,7 +114,7 @@ class API public function getSitesGroups() { Piwik::checkUserIsSuperUser(); - $groups = \Zend_Registry::get('db')->fetchAll("SELECT DISTINCT `group` FROM " . Common::prefixTable("site")); + $groups = Db::get()->fetchAll("SELECT DISTINCT `group` FROM " . Common::prefixTable("site")); $cleanedGroups = array(); foreach ($groups as $group) { $cleanedGroups[] = $group['group']; @@ -133,9 +133,9 @@ class API public function getSiteFromId($idSite) { Piwik::checkUserHasViewAccess($idSite); - $site = \Zend_Registry::get('db')->fetchRow("SELECT * - FROM " . Common::prefixTable("site") . " - WHERE idsite = ?", $idSite); + $site = Db::get()->fetchRow("SELECT * + FROM " . Common::prefixTable("site") . " + WHERE idsite = ?", $idSite); return $site; } @@ -148,7 +148,7 @@ class API */ private function getAliasSiteUrlsFromId($idSite) { - $db = \Zend_Registry::get('db'); + $db = Db::get(); $result = $db->fetchAll("SELECT url FROM " . Common::prefixTable("site_url") . " WHERE idsite = ?", $idSite); @@ -198,7 +198,7 @@ class API public function getAllSites() { Piwik::checkUserIsSuperUser(); - $sites = \Zend_Registry::get('db')->fetchAll("SELECT * FROM " . Common::prefixTable("site") . " ORDER BY idsite ASC"); + $sites = Db::get()->fetchAll("SELECT * FROM " . Common::prefixTable("site") . " ORDER BY idsite ASC"); $return = array(); foreach ($sites as $site) { $return[$site['idsite']] = $site; @@ -363,7 +363,7 @@ class API $limit = "LIMIT " . (int)$limit; } - $db = \Zend_Registry::get('db'); + $db = Db::get(); $sites = $db->fetchAll("SELECT * FROM " . Common::prefixTable("site") . " WHERE idsite IN (" . implode(", ", $idSites) . ") @@ -392,7 +392,7 @@ class API $url = $this->removeTrailingSlash($url); list($url, $urlBis) = $this->getNormalizedUrls($url); if (Piwik::isUserIsSuperUser()) { - $ids = \Zend_Registry::get('db')->fetchAll( + $ids = Db::get()->fetchAll( 'SELECT idsite FROM ' . Common::prefixTable('site') . ' WHERE (main_url = ? OR main_url = ?) ' . @@ -402,7 +402,7 @@ class API WHERE (url = ? OR url = ?) ', array($url, $urlBis, $url, $urlBis)); } else { $login = Piwik::getCurrentUserLogin(); - $ids = \Zend_Registry::get('db')->fetchAll( + $ids = Db::get()->fetchAll( 'SELECT idsite FROM ' . Common::prefixTable('site') . ' WHERE (main_url = ? OR main_url = ?)' . @@ -430,7 +430,7 @@ class API Piwik::checkUserIsSuperUser(); $timezones = Piwik::getArrayFromApiParameter($timezones); $timezones = array_unique($timezones); - $ids = \Zend_Registry::get('db')->fetchAll( + $ids = Db::get()->fetchAll( 'SELECT idsite FROM ' . Common::prefixTable('site') . ' WHERE timezone IN (' . Common::getSqlStringFieldsArray($timezones) . ') @@ -507,7 +507,7 @@ class API } $this->checkValidCurrency($currency); - $db = \Zend_Registry::get('db'); + $db = Db::get(); $url = $urls[0]; $urls = array_slice($urls, 1); @@ -581,7 +581,7 @@ class API throw new Exception(Piwik_TranslateException("SitesManager_ExceptionDeleteSite")); } - $db = \Zend_Registry::get('db'); + $db = Db::get(); $db->query("DELETE FROM " . Common::prefixTable("site") . " WHERE idsite = ?", $idSite); @@ -1045,7 +1045,7 @@ class API $bind['sitesearch_category_parameters'] = $searchCategoryParameters; $bind['name'] = $siteName; - $db = \Zend_Registry::get('db'); + $db = Db::get(); $db->update(Common::prefixTable("site"), $bind, "idsite = $idSite" @@ -1189,7 +1189,7 @@ class API private function insertSiteUrls($idSite, $urls) { if (count($urls) != 0) { - $db = \Zend_Registry::get('db'); + $db = Db::get(); foreach ($urls as $url) { $db->insert(Common::prefixTable("site_url"), array( 'idsite' => $idSite, @@ -1205,7 +1205,7 @@ class API */ private function deleteSiteAliasUrls($idsite) { - $db = \Zend_Registry::get('db'); + $db = Db::get(); $db->query("DELETE FROM " . Common::prefixTable("site_url") . " WHERE idsite = ?", $idsite); } @@ -1341,7 +1341,7 @@ class API } $ids_str .= $id_val; - $db = \Zend_Registry::get('db'); + $db = Db::get(); $bind = array('%' . $pattern . '%', 'http%' . $pattern . '%'); // Also match the idsite diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php index 64a2e8f5f9..57d69fc962 100644 --- a/plugins/UsersManager/API.php +++ b/plugins/UsersManager/API.php @@ -132,7 +132,7 @@ class API $where = 'WHERE login IN (' . Common::getSqlStringFieldsArray($userLogins) . ')'; $bind = $userLogins; } - $db = \Zend_Registry::get('db'); + $db = Db::get(); $users = $db->fetchAll("SELECT * FROM " . Common::prefixTable("user") . " $where @@ -155,7 +155,7 @@ class API { Piwik::checkUserHasSomeAdminAccess(); - $db = \Zend_Registry::get('db'); + $db = Db::get(); $users = $db->fetchAll("SELECT login FROM " . Common::prefixTable("user") . " ORDER BY login ASC"); @@ -187,7 +187,7 @@ class API $this->checkAccessType($access); - $db = \Zend_Registry::get('db'); + $db = Db::get(); $users = $db->fetchAll("SELECT login,idsite FROM " . Common::prefixTable("access") . " WHERE access = ? @@ -218,7 +218,7 @@ class API { Piwik::checkUserHasAdminAccess($idSite); - $db = \Zend_Registry::get('db'); + $db = Db::get(); $users = $db->fetchAll("SELECT login,access FROM " . Common::prefixTable("access") . " WHERE idsite = ?", $idSite); @@ -234,7 +234,7 @@ class API Piwik::checkUserHasAdminAccess($idSite); $this->checkAccessType($access); - $db = \Zend_Registry::get('db'); + $db = Db::get(); $users = $db->fetchAll("SELECT login FROM " . Common::prefixTable("access") . " WHERE idsite = ? AND access = ?", array($idSite, $access)); @@ -271,7 +271,7 @@ class API $this->checkUserExists($userLogin); $this->checkUserIsNotSuperUser($userLogin); - $db = \Zend_Registry::get('db'); + $db = Db::get(); $users = $db->fetchAll("SELECT idsite,access FROM " . Common::prefixTable("access") . " WHERE login = ?", $userLogin); @@ -298,7 +298,7 @@ class API $this->checkUserExists($userLogin); $this->checkUserIsNotSuperUser($userLogin); - $db = \Zend_Registry::get('db'); + $db = Db::get(); $user = $db->fetchRow("SELECT * FROM " . Common::prefixTable("user") . " WHERE login = ?", $userLogin); @@ -317,7 +317,7 @@ class API Piwik::checkUserIsSuperUser(); $this->checkUserEmailExists($userEmail); - $db = \Zend_Registry::get('db'); + $db = Db::get(); $user = $db->fetchRow("SELECT * FROM " . Common::prefixTable("user") . " WHERE email = ?", $userEmail); @@ -383,7 +383,7 @@ class API $token_auth = $this->getTokenAuth($userLogin, $passwordTransformed); - $db = \Zend_Registry::get('db'); + $db = Db::get(); $db->insert(Common::prefixTable("user"), array( 'login' => $userLogin, @@ -443,7 +443,7 @@ class API $alias = $this->getCleanAlias($alias, $userLogin); $token_auth = $this->getTokenAuth($userLogin, $password); - $db = \Zend_Registry::get('db'); + $db = Db::get(); $db->update(Common::prefixTable("user"), array( @@ -559,7 +559,7 @@ class API $this->deleteUserAccess($userLogin, $idSites); // delete UserAccess - $db = \Zend_Registry::get('db'); + $db = Db::get(); // if the access is noaccess then we don't save it as this is the default value // when no access are specified @@ -639,7 +639,7 @@ class API */ private function deleteUserOnly($userLogin) { - $db = \Zend_Registry::get('db'); + $db = Db::get(); $db->query("DELETE FROM " . Common::prefixTable("user") . " WHERE login = ?", $userLogin); Piwik_PostEvent('UsersManager.deleteUser', array($userLogin)); @@ -656,7 +656,7 @@ class API */ private function deleteUserAccess($userLogin, $idSites = null) { - $db = \Zend_Registry::get('db'); + $db = Db::get(); if (is_null($idSites)) { $db->query("DELETE FROM " . Common::prefixTable("access") . |