diff options
65 files changed, 84 insertions, 102 deletions
diff --git a/core/FrontController.php b/core/FrontController.php index 0207983cdd..d7b98dc63b 100644 --- a/core/FrontController.php +++ b/core/FrontController.php @@ -14,6 +14,7 @@ namespace Piwik; use Exception; use Piwik\API\Request; use Piwik\API\ResponseBuilder; +use Piwik\Plugin\Controller; use Piwik\Session; /** diff --git a/core/Menu/MenuAbstract.php b/core/Menu/MenuAbstract.php index fc4eddb0ca..edd53161ba 100644 --- a/core/Menu/MenuAbstract.php +++ b/core/Menu/MenuAbstract.php @@ -25,11 +25,6 @@ abstract class MenuAbstract protected $renames = array(); protected $orderingApplied = false; - /* - * Can't enforce static function in 5.2. - */ - //abstract static public function getInstance(); - /** * Builds the menu, applies edits, renames * and orders the entries. diff --git a/core/PluginsArchiver.php b/core/Plugin/Archiver.php index 7dc6a2d2e2..f5e08566c2 100644 --- a/core/PluginsArchiver.php +++ b/core/Plugin/Archiver.php @@ -9,14 +9,15 @@ * @package Piwik_PluginArchiver */ -namespace Piwik; +namespace Piwik\Plugin; use Piwik\ArchiveProcessor; +use Piwik\Config; /** * Plugins that archive metrics for websites can implement an Archiver that extends this class */ -abstract class PluginsArchiver +abstract class Archiver { protected $processor; diff --git a/core/Controller.php b/core/Plugin/Controller.php index dd3fe35bde..f54c068d0d 100644 --- a/core/Controller.php +++ b/core/Plugin/Controller.php @@ -8,19 +8,30 @@ * @category Piwik * @package Piwik */ -namespace Piwik; +namespace Piwik\Plugin; use Exception; +use Piwik\Access; use Piwik\API\Request; +use Piwik\Common; +use Piwik\Config; use Piwik\DataTable\Filter\CalculateEvolutionFilter; +use Piwik\Date; +use Piwik\FrontController; use Piwik\Menu\MenuTop; +use Piwik\NoAccessException; use Piwik\Period\Month; use Piwik\Period; use Piwik\Period\Range; +use Piwik\Piwik; use Piwik\Plugins\API\API; use Piwik\Plugins\LanguagesManager\LanguagesManager; use Piwik\Plugins\SitesManager\API as APISitesManager; use Piwik\Plugins\UsersManager\API as APIUsersManager; +use Piwik\Registry; +use Piwik\SettingsPiwik; +use Piwik\Site; +use Piwik\Url; use Piwik\View; use Piwik\ViewDataTable; diff --git a/core/Controller/Admin.php b/core/Plugin/ControllerAdmin.php index a955403b6e..31bc629f36 100644 --- a/core/Controller/Admin.php +++ b/core/Plugin/ControllerAdmin.php @@ -8,10 +8,9 @@ * @category Piwik * @package Piwik */ -namespace Piwik\Controller; +namespace Piwik\Plugin; use Piwik\Config; -use Piwik\Controller; use Piwik\Menu\MenuAdmin; use Piwik\Menu\MenuTop; use Piwik\Piwik; @@ -27,7 +26,7 @@ use Piwik\View; * * @api */ -abstract class Admin extends Controller +abstract class ControllerAdmin extends Controller { /** * Set the minimal variables in the view object diff --git a/core/PluginsManager.php b/core/Plugin/Manager.php index 64f1b5c511..9392d9d6cf 100644 --- a/core/PluginsManager.php +++ b/core/Plugin/Manager.php @@ -9,9 +9,8 @@ * @package Piwik */ -namespace Piwik; +namespace Piwik\Plugin; -use Piwik\Plugin\MetadataLoader; use Piwik\Translate; require_once PIWIK_INCLUDE_PATH . '/core/EventDispatcher.php'; @@ -20,9 +19,9 @@ require_once PIWIK_INCLUDE_PATH . '/core/EventDispatcher.php'; * Plugin manager * * @package Piwik - * @subpackage PluginsManager + * @subpackage Manager */ -class PluginsManager +class Manager { protected $pluginsToLoad = array(); @@ -67,9 +66,9 @@ class PluginsManager static private $instance = null; /** - * Returns the singleton PluginsManager + * Returns the singleton Manager * - * @return PluginsManager + * @return Manager */ static public function getInstance() { @@ -873,7 +872,7 @@ class PluginsManager /** * @package Piwik - * @subpackage PluginsManager + * @subpackage Manager */ class PluginsManager_PluginException extends \Exception { @@ -36,7 +36,7 @@ if (!defined('PIWIK_INCLUDE_PATH')) { @ignore_user_abort(true); require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php'; -require_once PIWIK_INCLUDE_PATH . '/core/PluginsManager.php'; +require_once PIWIK_INCLUDE_PATH . '/core/Plugin/Manager.php'; require_once PIWIK_INCLUDE_PATH . '/core/Plugin.php'; require_once PIWIK_INCLUDE_PATH . '/core/Common.php'; require_once PIWIK_INCLUDE_PATH . '/core/Piwik.php'; diff --git a/plugins/API/Controller.php b/plugins/API/Controller.php index 0dcf07bba7..e82d1923c0 100644 --- a/plugins/API/Controller.php +++ b/plugins/API/Controller.php @@ -21,7 +21,7 @@ use Piwik\View; * * @package Piwik_API */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { function index() { diff --git a/plugins/Actions/Archiver.php b/plugins/Actions/Archiver.php index 7b69d07a51..99cabed9b3 100644 --- a/plugins/Actions/Archiver.php +++ b/plugins/Actions/Archiver.php @@ -15,7 +15,6 @@ use Piwik\DataTable\Manager; use Piwik\DataTable\Row\DataTableSummaryRow; use Piwik\DataTable; use Piwik\Metrics; -use Piwik\PluginsArchiver; use Piwik\RankingQuery; use Piwik\Tracker\Action; @@ -24,7 +23,7 @@ use Piwik\Tracker\Action; * * @package Actions */ -class Archiver extends PluginsArchiver +class Archiver extends \Piwik\Plugin\Archiver { const DOWNLOADS_RECORD_NAME = 'Actions_downloads'; const OUTLINKS_RECORD_NAME = 'Actions_outlink'; diff --git a/plugins/Actions/Controller.php b/plugins/Actions/Controller.php index d4c70e7430..d979c9384f 100644 --- a/plugins/Actions/Controller.php +++ b/plugins/Actions/Controller.php @@ -19,7 +19,7 @@ use Piwik\ViewDataTable; * * @package Actions */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { // // Actions that render whole pages diff --git a/plugins/Annotations/Controller.php b/plugins/Annotations/Controller.php index 2e545242ec..bc9ee5c5e8 100755 --- a/plugins/Annotations/Controller.php +++ b/plugins/Annotations/Controller.php @@ -20,7 +20,7 @@ use Piwik\View; * * @package Annotations */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { /** * Controller action that returns HTML displaying annotations for a site and diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php index ffedbcf624..34ad95a7e2 100644 --- a/plugins/CoreAdminHome/Controller.php +++ b/plugins/CoreAdminHome/Controller.php @@ -30,7 +30,7 @@ use Piwik\View; * * @package CoreAdminHome */ -class Controller extends \Piwik\Controller\Admin +class Controller extends \Piwik\Plugin\ControllerAdmin { const LOGO_HEIGHT = 300; const LOGO_SMALL_HEIGHT = 100; diff --git a/plugins/CoreConsole/templates/controller/Controller.php b/plugins/CoreConsole/templates/controller/Controller.php index c27a7de9bb..7f219a58cc 100644 --- a/plugins/CoreConsole/templates/controller/Controller.php +++ b/plugins/CoreConsole/templates/controller/Controller.php @@ -16,7 +16,7 @@ use Piwik\View; * * @package PLUGINNAME */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { public function index() diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php index b201d30463..c2e1be90d5 100644 --- a/plugins/CoreHome/Controller.php +++ b/plugins/CoreHome/Controller.php @@ -30,7 +30,7 @@ use Piwik\View; * * @package CoreHome */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { function getDefaultAction() { diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php index f4f4bdf332..b33700f9f3 100644 --- a/plugins/CorePluginsAdmin/Controller.php +++ b/plugins/CorePluginsAdmin/Controller.php @@ -23,7 +23,7 @@ use Piwik\View; /** * @package CorePluginsAdmin */ -class Controller extends \Piwik\Controller\Admin +class Controller extends Plugin\ControllerAdmin { const UPDATE_NONCE = 'CorePluginsAdmin.updatePlugin'; const INSTALL_NONCE = 'CorePluginsAdmin.installPlugin'; diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php index f52e10416a..bb580ee8f0 100644 --- a/plugins/CoreUpdater/Controller.php +++ b/plugins/CoreUpdater/Controller.php @@ -36,7 +36,7 @@ use Piwik\View\OneClickDone; * * @package CoreUpdater */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { const CONFIG_FILE_BACKUP = '/config/global.ini.auto-backup-before-update.php'; const PATH_TO_EXTRACT_LATEST_VERSION = '/tmp/latest/'; diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php index e125f6e757..165fdef9ad 100644 --- a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php +++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php @@ -12,8 +12,8 @@ namespace Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph; use Piwik\Common; -use Piwik\Controller; use Piwik\Period\Range; +use Piwik\Plugin\Controller; use Piwik\Plugins\CoreVisualizations\JqplotDataGenerator; use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph; use Piwik\Site; diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php index dff481db66..80ef438830 100644 --- a/plugins/CustomVariables/Archiver.php +++ b/plugins/CustomVariables/Archiver.php @@ -12,15 +12,14 @@ namespace Piwik\Plugins\CustomVariables; use Piwik\Common; use Piwik\Config; -use Piwik\DataAccess\LogAggregator; +use Piwik\DataAccess\LogAggregator; use Piwik\DataArray; use Piwik\Metrics; -use Piwik\PluginsArchiver; use Piwik\Tracker; use Piwik\Tracker\GoalManager; -class Archiver extends PluginsArchiver +class Archiver extends \Piwik\Plugin\Archiver { const LABEL_CUSTOM_VALUE_NOT_DEFINED = "Value not defined"; const CUSTOM_VARIABLE_RECORD_NAME = 'CustomVariables_valueByName'; diff --git a/plugins/CustomVariables/Controller.php b/plugins/CustomVariables/Controller.php index 458b5da629..cfeac7b693 100644 --- a/plugins/CustomVariables/Controller.php +++ b/plugins/CustomVariables/Controller.php @@ -17,7 +17,7 @@ use Piwik\ViewDataTable; /** * @package CustomVariables */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { public function index($fetch = false) { diff --git a/plugins/DBStats/Controller.php b/plugins/DBStats/Controller.php index 890fd1d71c..807357ad8f 100644 --- a/plugins/DBStats/Controller.php +++ b/plugins/DBStats/Controller.php @@ -18,7 +18,7 @@ use Piwik\ViewDataTable; /** * @package DBStats */ -class Controller extends \Piwik\Controller\Admin +class Controller extends \Piwik\Plugin\ControllerAdmin { /** * Returns the index for this plugin. Shows every other report defined by this plugin, diff --git a/plugins/Dashboard/Controller.php b/plugins/Dashboard/Controller.php index 963e7dcf43..7fd5666bf7 100644 --- a/plugins/Dashboard/Controller.php +++ b/plugins/Dashboard/Controller.php @@ -22,7 +22,7 @@ use Piwik\WidgetsList; * * @package Dashboard */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { /** * @var Dashboard diff --git a/plugins/DevicesDetection/Archiver.php b/plugins/DevicesDetection/Archiver.php index 58b1df2cca..fc02c0e06d 100644 --- a/plugins/DevicesDetection/Archiver.php +++ b/plugins/DevicesDetection/Archiver.php @@ -12,9 +12,8 @@ namespace Piwik\Plugins\DevicesDetection; use Piwik\Metrics; -use Piwik\PluginsArchiver; -class Archiver extends PluginsArchiver +class Archiver extends \Piwik\Plugin\Archiver { const DEVICE_TYPE_RECORD_NAME = 'DevicesDetection_types'; const DEVICE_BRAND_RECORD_NAME = 'DevicesDetection_brands'; diff --git a/plugins/DevicesDetection/Controller.php b/plugins/DevicesDetection/Controller.php index 2dec8ab910..ddff5a1b5f 100644 --- a/plugins/DevicesDetection/Controller.php +++ b/plugins/DevicesDetection/Controller.php @@ -17,7 +17,7 @@ use Piwik\View; use Piwik\ViewDataTable; use UserAgentParserEnhanced; -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { public function index($fetch = false) { diff --git a/plugins/ExamplePlugin/Controller.php b/plugins/ExamplePlugin/Controller.php index 1dc8c07e59..2062c92b5e 100644 --- a/plugins/ExamplePlugin/Controller.php +++ b/plugins/ExamplePlugin/Controller.php @@ -20,7 +20,7 @@ use Piwik\View; * * @package ExamplePlugin */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { /** * Go to /piwik/?module=ExamplePlugin&action=helloWorld to execute this method diff --git a/plugins/ExampleRssWidget/Controller.php b/plugins/ExampleRssWidget/Controller.php index 7c0708c9d7..6f0c21716e 100644 --- a/plugins/ExampleRssWidget/Controller.php +++ b/plugins/ExampleRssWidget/Controller.php @@ -18,7 +18,7 @@ use Piwik\Piwik; * * @package ExampleRssWidget */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { public function rssPiwik() { diff --git a/plugins/ExampleUI/Controller.php b/plugins/ExampleUI/Controller.php index 0b607682bc..f4dd86c6fb 100644 --- a/plugins/ExampleUI/Controller.php +++ b/plugins/ExampleUI/Controller.php @@ -18,7 +18,7 @@ use Piwik\ViewDataTable; /** * @package ExampleUI */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { public function dataTables() { diff --git a/plugins/Feedback/Controller.php b/plugins/Feedback/Controller.php index ee2f37f637..5b7ecc50e3 100644 --- a/plugins/Feedback/Controller.php +++ b/plugins/Feedback/Controller.php @@ -25,7 +25,7 @@ use Piwik\View; * * @package Feedback */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { function index() { diff --git a/plugins/Goals/Archiver.php b/plugins/Goals/Archiver.php index 612ce28a4d..1cc9fcdc28 100644 --- a/plugins/Goals/Archiver.php +++ b/plugins/Goals/Archiver.php @@ -15,11 +15,9 @@ use Piwik\DataAccess\LogAggregator; use Piwik\DataArray; use Piwik\DataTable; use Piwik\Metrics; -use Piwik\PluginsArchiver; -use Piwik\PluginsManager; use Piwik\Tracker\GoalManager; -class Archiver extends PluginsArchiver +class Archiver extends \Piwik\Plugin\Archiver { const VISITS_UNTIL_RECORD_NAME = 'visits_until_conv'; const DAYS_UNTIL_CONV_RECORD_NAME = 'days_until_conv'; diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php index ffffc8173e..17edce163d 100644 --- a/plugins/Goals/Controller.php +++ b/plugins/Goals/Controller.php @@ -26,7 +26,7 @@ use Piwik\ViewDataTable; * * @package Goals */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { const CONVERSION_RATE_PRECISION = 1; diff --git a/plugins/ImageGraph/Controller.php b/plugins/ImageGraph/Controller.php index b401f93bd5..52cd75d013 100644 --- a/plugins/ImageGraph/Controller.php +++ b/plugins/ImageGraph/Controller.php @@ -16,7 +16,7 @@ use Piwik\Plugins\API\API as APIPlugins; use Piwik\SettingsPiwik; use Piwik\View; -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { // Call metadata reports, and draw the default graph for each report. public function index() diff --git a/plugins/ImageGraph/ImageGraph.php b/plugins/ImageGraph/ImageGraph.php index 12f7d4352e..d8337cae0c 100644 --- a/plugins/ImageGraph/ImageGraph.php +++ b/plugins/ImageGraph/ImageGraph.php @@ -91,7 +91,7 @@ class ImageGraph extends \Piwik\Plugin $dateForMultiplePeriodGraph = $dateForSinglePeriodGraph; } else { $periodForMultiplePeriodGraph = $periodForSinglePeriodGraph; - $dateForMultiplePeriodGraph = \Piwik\Controller::getDateRangeRelativeToEndDate( + $dateForMultiplePeriodGraph = \Piwik\Plugin\Controller::getDateRangeRelativeToEndDate( $periodForSinglePeriodGraph, 'last' . self::GRAPH_EVOLUTION_LAST_PERIODS, $dateForSinglePeriodGraph, diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index df9659b181..d6cb3630f9 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -40,7 +40,7 @@ use Zend_Db_Adapter_Exception; * * @package Installation */ -class Controller extends \Piwik\Controller\Admin +class Controller extends \Piwik\Plugin\ControllerAdmin { // public so plugins can add/delete installation steps public $steps = array( diff --git a/plugins/LanguagesManager/Controller.php b/plugins/LanguagesManager/Controller.php index 3177a3dabe..f52e4c0630 100644 --- a/plugins/LanguagesManager/Controller.php +++ b/plugins/LanguagesManager/Controller.php @@ -19,7 +19,7 @@ use Piwik\Url; /** * @package LanguagesManager */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { /** * anonymous = in the session diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php index edc80beda1..e72cfe7456 100644 --- a/plugins/Live/Controller.php +++ b/plugins/Live/Controller.php @@ -24,7 +24,7 @@ use Piwik\ViewDataTable; /** * @package Live */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { const SIMPLE_VISIT_COUNT_WIDGET_LAST_MINUTES_CONFIG_KEY = 'live_widget_visitor_count_last_minutes'; diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php index 3c7b88c5ec..abcf05d65f 100644 --- a/plugins/Login/Controller.php +++ b/plugins/Login/Controller.php @@ -34,7 +34,7 @@ require_once PIWIK_INCLUDE_PATH . '/core/Config.php'; * * @package Login */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { /** * Generate hash on user info and password diff --git a/plugins/MobileMessaging/Controller.php b/plugins/MobileMessaging/Controller.php index 96d5509977..c6f7c62052 100644 --- a/plugins/MobileMessaging/Controller.php +++ b/plugins/MobileMessaging/Controller.php @@ -24,7 +24,7 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php'; * * @package MobileMessaging */ -class Controller extends \Piwik\Controller\Admin +class Controller extends \Piwik\Plugin\ControllerAdmin { /* * Mobile Messaging Settings tab : diff --git a/plugins/MultiSites/Controller.php b/plugins/MultiSites/Controller.php index bbb800b7b4..a48d86f1cc 100644 --- a/plugins/MultiSites/Controller.php +++ b/plugins/MultiSites/Controller.php @@ -25,7 +25,7 @@ use Piwik\View; * * @package MultiSites */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { protected $orderBy = 'visits'; protected $order = 'desc'; diff --git a/plugins/Overlay/Controller.php b/plugins/Overlay/Controller.php index 8ebf533c27..eadc70b7f0 100644 --- a/plugins/Overlay/Controller.php +++ b/plugins/Overlay/Controller.php @@ -22,7 +22,7 @@ use Piwik\ProxyHttp; use Piwik\Tracker\Action; use Piwik\View; -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { /** The index of the plugin */ diff --git a/plugins/PrivacyManager/Controller.php b/plugins/PrivacyManager/Controller.php index 3a29c285b4..90620ac536 100644 --- a/plugins/PrivacyManager/Controller.php +++ b/plugins/PrivacyManager/Controller.php @@ -26,7 +26,7 @@ use Piwik\View; * * @package PrivacyManager */ -class Controller extends \Piwik\Controller\Admin +class Controller extends \Piwik\Plugin\ControllerAdmin { const ANONYMIZE_IP_PLUGIN_NAME = "AnonymizeIP"; diff --git a/plugins/Provider/Archiver.php b/plugins/Provider/Archiver.php index a449a9f4e8..101ea8ecdf 100644 --- a/plugins/Provider/Archiver.php +++ b/plugins/Provider/Archiver.php @@ -11,9 +11,8 @@ namespace Piwik\Plugins\Provider; use Piwik\Metrics; -use Piwik\PluginsArchiver; -class Archiver extends PluginsArchiver +class Archiver extends \Piwik\Plugin\Archiver { const PROVIDER_RECORD_NAME = 'Provider_hostnameExt'; const PROVIDER_FIELD = "location_provider"; diff --git a/plugins/Provider/Controller.php b/plugins/Provider/Controller.php index 6d79bd3d1a..4fde51d552 100644 --- a/plugins/Provider/Controller.php +++ b/plugins/Provider/Controller.php @@ -16,7 +16,7 @@ use Piwik\ViewDataTable; * * @package Provider */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { /** * Provider diff --git a/plugins/Proxy/Controller.php b/plugins/Proxy/Controller.php index 3531d781a4..60b43cd21c 100644 --- a/plugins/Proxy/Controller.php +++ b/plugins/Proxy/Controller.php @@ -22,7 +22,7 @@ use Piwik\UrlHelper; * * @package Proxy */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { const TRANSPARENT_PNG_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEUAAACnej3aAAAAAXRSTlMAQObYZgAAAApJREFUCNdjYAAAAAIAAeIhvDMAAAAASUVORK5CYII='; const JS_MIME_TYPE = "application/javascript; charset=UTF-8"; diff --git a/plugins/Referrers/Archiver.php b/plugins/Referrers/Archiver.php index 9255efc9d8..85f39579ed 100644 --- a/plugins/Referrers/Archiver.php +++ b/plugins/Referrers/Archiver.php @@ -15,9 +15,8 @@ use Piwik\Common; use Piwik\Config; use Piwik\DataArray; use Piwik\Metrics; -use Piwik\PluginsArchiver; -class Archiver extends PluginsArchiver +class Archiver extends \Piwik\Plugin\Archiver { const SEARCH_ENGINES_RECORD_NAME = 'Referrers_keywordBySearchEngine'; const KEYWORDS_RECORD_NAME = 'Referrers_searchEngineByKeyword'; diff --git a/plugins/Referrers/Controller.php b/plugins/Referrers/Controller.php index 62473aebc6..2c4cfd5fb9 100644 --- a/plugins/Referrers/Controller.php +++ b/plugins/Referrers/Controller.php @@ -24,7 +24,7 @@ use Piwik\ViewDataTable; * * @package Referrers */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { public function index() { diff --git a/plugins/SEO/Controller.php b/plugins/SEO/Controller.php index 9ae07949fe..8483f7bbc3 100644 --- a/plugins/SEO/Controller.php +++ b/plugins/SEO/Controller.php @@ -19,7 +19,7 @@ use Piwik\View; /** * @package SEO */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { function getRank() { diff --git a/plugins/ScheduledReports/Controller.php b/plugins/ScheduledReports/Controller.php index e0bd9e7c0e..41c2e9a6f0 100644 --- a/plugins/ScheduledReports/Controller.php +++ b/plugins/ScheduledReports/Controller.php @@ -21,7 +21,7 @@ use Piwik\View; * * @package ScheduledReports */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { const DEFAULT_REPORT_TYPE = ScheduledReports::EMAIL_TYPE; diff --git a/plugins/SegmentEditor/API.php b/plugins/SegmentEditor/API.php index e17bbacd19..62fd909bc1 100644 --- a/plugins/SegmentEditor/API.php +++ b/plugins/SegmentEditor/API.php @@ -94,7 +94,7 @@ class API { $autoArchive = (int)$autoArchive; if ($autoArchive) { - $exception = new Exception("To prevent abuse, autoArchive=1 requires Super User or Admin access."); + $exception = new Exception("To prevent abuse, autoArchive=1 requires Super User or ControllerAdmin access."); if (empty($idSite)) { if (!Piwik::isUserIsSuperUser()) { throw $exception; diff --git a/plugins/SegmentEditor/Controller.php b/plugins/SegmentEditor/Controller.php index a05c0d2382..0f45c062ce 100644 --- a/plugins/SegmentEditor/Controller.php +++ b/plugins/SegmentEditor/Controller.php @@ -18,7 +18,7 @@ use Piwik\View; /** * @package SegmentEditor */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { public function getSelector() diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php index b67f1144cf..c10b09a88d 100644 --- a/plugins/SitesManager/Controller.php +++ b/plugins/SitesManager/Controller.php @@ -27,7 +27,7 @@ use Piwik\View; * * @package SitesManager */ -class Controller extends \Piwik\Controller\Admin +class Controller extends \Piwik\Plugin\ControllerAdmin { /** * Main view showing listing of websites and settings diff --git a/plugins/Transitions/Controller.php b/plugins/Transitions/Controller.php index a4ee6213c4..e4c80f2432 100644 --- a/plugins/Transitions/Controller.php +++ b/plugins/Transitions/Controller.php @@ -16,7 +16,7 @@ use Piwik\View; /** * @package Transitions */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { /** diff --git a/plugins/UserCountry/Archiver.php b/plugins/UserCountry/Archiver.php index a72f643e14..29e576a833 100644 --- a/plugins/UserCountry/Archiver.php +++ b/plugins/UserCountry/Archiver.php @@ -16,9 +16,8 @@ use Piwik\DataArray; use Piwik\DataTable; use Piwik\Metrics; use Piwik\Plugins\UserCountry\LocationProvider; -use Piwik\PluginsArchiver; -class Archiver extends PluginsArchiver +class Archiver extends \Piwik\Plugin\Archiver { const COUNTRY_RECORD_NAME = 'UserCountry_country'; const REGION_RECORD_NAME = 'UserCountry_region'; diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php index 1fda49ee67..b207bc2497 100644 --- a/plugins/UserCountry/Controller.php +++ b/plugins/UserCountry/Controller.php @@ -12,7 +12,6 @@ namespace Piwik\Plugins\UserCountry; use Exception; use Piwik\Common; -use Piwik\Controller\Admin; use Piwik\DataTable\Renderer\Json; use Piwik\Http; use Piwik\IP; @@ -29,7 +28,7 @@ use Piwik\ViewDataTable; * * @package UserCountry */ -class Controller extends Admin +class Controller extends \Piwik\Plugin\ControllerAdmin { public function index() { diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php index d700d4ef39..8f3c227beb 100644 --- a/plugins/UserCountryMap/Controller.php +++ b/plugins/UserCountryMap/Controller.php @@ -24,7 +24,7 @@ use Piwik\ViewDataTable; * * @package UserCountryMap */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { // By default plot up to the last 30 days of visitors on the map, for low traffic sites diff --git a/plugins/UserSettings/Archiver.php b/plugins/UserSettings/Archiver.php index 783779ce3c..66b008d45d 100644 --- a/plugins/UserSettings/Archiver.php +++ b/plugins/UserSettings/Archiver.php @@ -16,7 +16,6 @@ use Piwik\DataAccess\LogAggregator; use Piwik\DataArray; use Piwik\DataTable; use Piwik\Metrics; -use Piwik\PluginsArchiver; require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php'; @@ -25,7 +24,7 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php'; * * @see PluginsArchiver */ -class Archiver extends PluginsArchiver +class Archiver extends \Piwik\Plugin\Archiver { const LANGUAGE_RECORD_NAME = 'UserSettings_language'; const PLUGIN_RECORD_NAME = 'UserSettings_plugin'; diff --git a/plugins/UserSettings/Controller.php b/plugins/UserSettings/Controller.php index aa8c2dc871..3b9d6b331d 100644 --- a/plugins/UserSettings/Controller.php +++ b/plugins/UserSettings/Controller.php @@ -17,7 +17,7 @@ use Piwik\ViewDataTable; * * @package UserSettings */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { public function index() { diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php index 7106deb878..22d1038543 100644 --- a/plugins/UsersManager/Controller.php +++ b/plugins/UsersManager/Controller.php @@ -14,7 +14,6 @@ use Exception; use Piwik\API\ResponseBuilder; use Piwik\Common; use Piwik\Config; -use Piwik\Controller\Admin; use Piwik\Piwik; use Piwik\Plugins\SitesManager\API as APISitesManager; use Piwik\Plugins\UsersManager\API as APIUsersManager; @@ -27,7 +26,7 @@ use Piwik\View; * * @package UsersManager */ -class Controller extends Admin +class Controller extends \Piwik\Plugin\ControllerAdmin { static function orderByName($a, $b) { diff --git a/plugins/VisitFrequency/Controller.php b/plugins/VisitFrequency/Controller.php index 1f6d09286e..5117be02f6 100644 --- a/plugins/VisitFrequency/Controller.php +++ b/plugins/VisitFrequency/Controller.php @@ -19,7 +19,7 @@ use Piwik\View; * * @package VisitFrequency */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { function index() { diff --git a/plugins/VisitTime/Archiver.php b/plugins/VisitTime/Archiver.php index 40c53f29ae..0bd362226b 100644 --- a/plugins/VisitTime/Archiver.php +++ b/plugins/VisitTime/Archiver.php @@ -13,9 +13,8 @@ namespace Piwik\Plugins\VisitTime; use Piwik\DataArray; use Piwik\Date; -use Piwik\PluginsArchiver; -class Archiver extends PluginsArchiver +class Archiver extends \Piwik\Plugin\Archiver { const SERVER_TIME_RECORD_NAME = 'VisitTime_serverTime'; const LOCAL_TIME_RECORD_NAME = 'VisitTime_localTime'; diff --git a/plugins/VisitTime/Controller.php b/plugins/VisitTime/Controller.php index 7387a6e481..25411acbe9 100644 --- a/plugins/VisitTime/Controller.php +++ b/plugins/VisitTime/Controller.php @@ -17,7 +17,7 @@ use Piwik\ViewDataTable; * * @package VisitTime */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { public function index() { diff --git a/plugins/VisitorInterest/Archiver.php b/plugins/VisitorInterest/Archiver.php index 5022dabc0d..e5660b6bf2 100644 --- a/plugins/VisitorInterest/Archiver.php +++ b/plugins/VisitorInterest/Archiver.php @@ -14,9 +14,8 @@ namespace Piwik\Plugins\VisitorInterest; use Piwik\DataAccess\LogAggregator; use Piwik\DataTable; use Piwik\Metrics; -use Piwik\PluginsArchiver; -class Archiver extends PluginsArchiver +class Archiver extends \Piwik\Plugin\Archiver { // third element is unit (s for seconds, default is munutes) const TIME_SPENT_RECORD_NAME = 'VisitorInterest_timeGap'; diff --git a/plugins/VisitorInterest/Controller.php b/plugins/VisitorInterest/Controller.php index 03b1b5599f..e57b48fe35 100644 --- a/plugins/VisitorInterest/Controller.php +++ b/plugins/VisitorInterest/Controller.php @@ -16,7 +16,7 @@ use Piwik\ViewDataTable; /** * @package VisitorInterest */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { public function index() { diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php index ed0486640b..ca9aaa7df9 100644 --- a/plugins/VisitsSummary/Controller.php +++ b/plugins/VisitsSummary/Controller.php @@ -24,7 +24,7 @@ use Piwik\ViewDataTable; * * @package VisitsSummary */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { public function index() { diff --git a/plugins/Widgetize/Controller.php b/plugins/Widgetize/Controller.php index 5c122f825c..885a5b7983 100644 --- a/plugins/Widgetize/Controller.php +++ b/plugins/Widgetize/Controller.php @@ -20,7 +20,7 @@ use Piwik\WidgetsList; * * @package Widgetize */ -class Controller extends \Piwik\Controller +class Controller extends \Piwik\Plugin\Controller { public function index() { diff --git a/tests/PHPUnit/DatabaseTestCase.php b/tests/PHPUnit/DatabaseTestCase.php index 4b2fe845c0..579d75560d 100644 --- a/tests/PHPUnit/DatabaseTestCase.php +++ b/tests/PHPUnit/DatabaseTestCase.php @@ -48,7 +48,7 @@ class DatabaseTestCase extends PHPUnit_Framework_TestCase Db::createDatabaseObject(); DbHelper::createTables(); -// \Piwik\PluginsManager::getInstance()->loadPlugins(array()); +// \Piwik\Manager::getInstance()->loadPlugins(array()); IntegrationTestCase::loadAllPlugins(); } catch (Exception $e) { diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php index dbc3a006aa..babe6f83d2 100755 --- a/tests/PHPUnit/IntegrationTestCase.php +++ b/tests/PHPUnit/IntegrationTestCase.php @@ -217,18 +217,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase { \Piwik\SettingsPiwik::$piwikUrlCache = null; IntegrationTestCase::unloadAllPlugins(); -/* - $plugins = \Piwik\PluginsManager::getInstance()->getLoadedPlugins(); - foreach ($plugins AS $plugin) { - if ($dropDatabase) { - try { - $plugin->uninstall(); - } catch(Exception $e) { - echo "\n There was an error uninstalling a plugin: " . $e->getMessage() . "\n"; - } - } - } - \Piwik\PluginsManager::getInstance()->unloadPlugins();*/ + if ($dropDatabase) { DbHelper::dropDatabase(); } |