diff options
358 files changed, 3091 insertions, 2621 deletions
diff --git a/core/API/DataTableGenericFilter.php b/core/API/DataTableGenericFilter.php index fec5bb7e94..111453520c 100644 --- a/core/API/DataTableGenericFilter.php +++ b/core/API/DataTableGenericFilter.php @@ -8,6 +8,9 @@ * @category Piwik * @package Piwik */ +namespace Piwik\API; + +use Exception; use Piwik\Common; use Piwik\DataTable; use Piwik\DataTable\Filter\AddColumnsProcessedMetricsGoal; @@ -16,7 +19,7 @@ use Piwik\DataTable\Filter\AddColumnsProcessedMetricsGoal; * @package Piwik * @subpackage Piwik_API */ -class Piwik_API_DataTableGenericFilter +class DataTableGenericFilter { private static $genericFiltersInfo = null; diff --git a/core/API/DataTableManipulator.php b/core/API/DataTableManipulator.php index 03541cf4ff..1fce679f95 100644 --- a/core/API/DataTableManipulator.php +++ b/core/API/DataTableManipulator.php @@ -8,15 +8,21 @@ * @category Piwik * @package Piwik */ +namespace Piwik\API; + +use Exception; use Piwik\DataTable\Row; use Piwik\Period\Range; use Piwik\DataTable; +use Piwik_API_API; +use Piwik\API\Proxy; +use Piwik\API\ResponseBuilder; /** * Base class for manipulating data tables. * It provides generic mechanisms like iteration and loading subtables. * - * The manipulators are used in Piwik_API_ResponseBuilder and are triggered by + * The manipulators are used in ResponseBuilder and are triggered by * API parameters. They are not filters because they don't work on the pre- * fetched nested data tables. Instead, they load subtables using this base * class. This way, they can only load the tables they really need instead @@ -27,7 +33,7 @@ use Piwik\DataTable; * @package Piwik * @subpackage Piwik_API */ -abstract class Piwik_API_DataTableManipulator +abstract class DataTableManipulator { protected $apiModule; protected $apiMethod; @@ -92,7 +98,7 @@ abstract class Piwik_API_DataTableManipulator * Load the subtable for a row. * Returns null if none is found. * - * @param DataTable $dataTable + * @param DataTable $dataTable * @param Row $row * * @return DataTable @@ -114,7 +120,7 @@ abstract class Piwik_API_DataTableManipulator if ($dataTable) { $period = $dataTable->metadata['period']; if ($period instanceof Range) { - $request['date'] = $period->getDateStart().','.$period->getDateEnd(); + $request['date'] = $period->getDateStart() . ',' . $period->getDateEnd(); } else { $request['date'] = $period->getDateStart()->toString(); } @@ -132,8 +138,8 @@ abstract class Piwik_API_DataTableManipulator // run it on the flattened table. unset($request['filter_pattern_recursive']); - $dataTable = Piwik_API_Proxy::getInstance()->call($class, $method, $request); - $response = new Piwik_API_ResponseBuilder($format = 'original', $request); + $dataTable = Proxy::getInstance()->call($class, $method, $request); + $response = new ResponseBuilder($format = 'original', $request); $dataTable = $response->getResponse($dataTable); if (method_exists($dataTable, 'applyQueuedFilters')) { $dataTable->applyQueuedFilters(); @@ -144,7 +150,7 @@ abstract class Piwik_API_DataTableManipulator /** * In this method, subclasses can clean up the request array for loading subtables - * in order to make Piwik_API_ResponseBuilder behave correctly (e.g. not trigger the + * in order to make ResponseBuilder behave correctly (e.g. not trigger the * manipulator again). * * @param $request @@ -169,5 +175,4 @@ abstract class Piwik_API_DataTableManipulator } return $this->apiMethodForSubtable; } - } diff --git a/core/API/DataTableManipulator/Flattener.php b/core/API/DataTableManipulator/Flattener.php index 6ccae47fdd..ab9127d338 100644 --- a/core/API/DataTableManipulator/Flattener.php +++ b/core/API/DataTableManipulator/Flattener.php @@ -8,8 +8,11 @@ * @category Piwik * @package Piwik */ +namespace Piwik\API\DataTableManipulator; + use Piwik\DataTable; use Piwik\DataTable\Row; +use Piwik\API\DataTableManipulator; /** * This class is responsible for flattening data tables. @@ -20,7 +23,7 @@ use Piwik\DataTable\Row; * @package Piwik * @subpackage Piwik_API */ -class Piwik_API_DataTableManipulator_Flattener extends Piwik_API_DataTableManipulator +class Flattener extends DataTableManipulator { private $includeAggregateRows = false; @@ -66,7 +69,7 @@ class Piwik_API_DataTableManipulator_Flattener extends Piwik_API_DataTableManipu if ($this->includeAggregateRows) { $dataTable->applyQueuedFilters(); } - + $newDataTable = $dataTable->getEmptyClone($keepFilters = false); foreach ($dataTable->getRows() as $row) { $this->flattenRow($row, $newDataTable); diff --git a/core/API/DataTableManipulator/LabelFilter.php b/core/API/DataTableManipulator/LabelFilter.php index 56ccd4366e..f8eb91ec6f 100644 --- a/core/API/DataTableManipulator/LabelFilter.php +++ b/core/API/DataTableManipulator/LabelFilter.php @@ -8,9 +8,13 @@ * @category Piwik * @package Piwik */ +namespace Piwik\API\DataTableManipulator; + use Piwik\Common; use Piwik\DataTable; use Piwik\DataTable\Row; +use Piwik\API\DataTableManipulator; +use false; /** * This class is responsible for handling the label parameter that can be @@ -23,7 +27,7 @@ use Piwik\DataTable\Row; * @package Piwik * @subpackage Piwik_API */ -class Piwik_API_DataTableManipulator_LabelFilter extends Piwik_API_DataTableManipulator +class LabelFilter extends DataTableManipulator { const SEPARATOR_RECURSIVE_LABEL = '>'; @@ -96,7 +100,7 @@ class Piwik_API_DataTableManipulator_LabelFilter extends Piwik_API_DataTableMani } /** - * Clean up request for Piwik_API_ResponseBuilder to behave correctly + * Clean up request for ResponseBuilder to behave correctly * * @param $request */ @@ -108,7 +112,7 @@ class Piwik_API_DataTableManipulator_LabelFilter extends Piwik_API_DataTableMani /** * Use variations of the label to make it easier to specify the desired label * - * Note: The HTML Encoded version must be tried first, since in Piwik_API_ResponseBuilder the $label is unsanitized + * Note: The HTML Encoded version must be tried first, since in ResponseBuilder the $label is unsanitized * via Common::unsanitizeLabelParameter. * * @param string $label @@ -117,19 +121,19 @@ class Piwik_API_DataTableManipulator_LabelFilter extends Piwik_API_DataTableMani private function getLabelVariations($label) { static $pageTitleReports = array('getPageTitles', 'getEntryPageTitles', 'getExitPageTitles'); - + $variations = array(); $label = urldecode($label); $label = trim($label); - $sanitizedLabel = Common::sanitizeInputValue( $label ); + $sanitizedLabel = Common::sanitizeInputValue($label); $variations[] = $sanitizedLabel; if ($this->apiModule == 'Actions' && in_array($this->apiMethod, $pageTitleReports) ) { // special case: the Actions.getPageTitles report prefixes some labels with a blank. - // the blank might be passed by the user but is removed in Piwik_API_Request::getRequestArrayFromString. + // the blank might be passed by the user but is removed in Request::getRequestArrayFromString. $variations[] = ' ' . $sanitizedLabel; $variations[] = ' ' . $label; } diff --git a/core/API/DocumentationGenerator.php b/core/API/DocumentationGenerator.php index e928409dfa..8c2b0ca37a 100644 --- a/core/API/DocumentationGenerator.php +++ b/core/API/DocumentationGenerator.php @@ -8,14 +8,20 @@ * @category Piwik * @package Piwik */ +namespace Piwik\API; + +use Exception; use Piwik\Piwik; use Piwik\Common; +use Piwik\API\Proxy; +use Piwik_API_Proxy_NoDefaultValue; +use Piwik_Url; /** * @package Piwik * @subpackage Piwik_API */ -class Piwik_API_DocumentationGenerator +class DocumentationGenerator { protected $modulesToHide = array('CoreAdminHome', 'DBStats'); protected $countPluginsLoaded = 0; @@ -29,7 +35,7 @@ class Piwik_API_DocumentationGenerator foreach ($plugins as $plugin) { $plugin = Common::unprefixClass($plugin); try { - Piwik_API_Proxy::getInstance()->registerClass('Piwik_' . $plugin . '_API'); + Proxy::getInstance()->registerClass('Piwik_' . $plugin . '_API'); } catch (Exception $e) { } } @@ -57,8 +63,8 @@ class Piwik_API_DocumentationGenerator 'date' => Common::getRequestVar('date', 'today', 'string') ); - foreach (Piwik_API_Proxy::getInstance()->getMetadata() as $class => $info) { - $moduleName = Piwik_API_Proxy::getInstance()->getModuleNameFromClassName($class); + foreach (Proxy::getInstance()->getMetadata() as $class => $info) { + $moduleName = Proxy::getInstance()->getModuleNameFromClassName($class); if (in_array($moduleName, $this->modulesToHide)) { continue; } @@ -87,9 +93,9 @@ class Piwik_API_DocumentationGenerator } $exampleUrl = $prefixUrls . $exampleUrl; $str .= " [ Example in - <a target=_blank href='$exampleUrl&format=xml$token_auth'>XML</a>, - <a target=_blank href='$exampleUrl&format=JSON$token_auth'>Json</a>, - <a target=_blank href='$exampleUrl&format=Tsv$token_auth&translateColumnNames=1'>Tsv (Excel)</a> + <a target=_blank href='$exampleUrl&format=xml$token_auth'>XML</a>, + <a target=_blank href='$exampleUrl&format=JSON$token_auth'>Json</a>, + <a target=_blank href='$exampleUrl&format=Tsv$token_auth&translateColumnNames=1'>Tsv (Excel)</a> $lastNUrls ]"; } else { @@ -104,7 +110,7 @@ class Piwik_API_DocumentationGenerator } $str = "<h2 id='topApiRef' name='topApiRef'>Quick access to APIs</h2> - $toc + $toc $str"; return $str; } @@ -129,7 +135,7 @@ class Piwik_API_DocumentationGenerator 'languageCode' => 'fr', 'url' => 'http://forum.piwik.org/', - 'pageUrl' => 'http://forum.piwik.org/', + 'pageUrl' => 'http://forum.piwik.org/', 'apiModule' => 'UserCountry', 'apiAction' => 'getCountry', 'lastMinutes' => '30', @@ -165,7 +171,7 @@ class Piwik_API_DocumentationGenerator } // we try to give an URL example to call the API - $aParameters = Piwik_API_Proxy::getInstance()->getParametersList($class, $methodName); + $aParameters = Proxy::getInstance()->getParametersList($class, $methodName); // Kindly force some known generic parameters to appear in the final list // the parameter 'format' can be set to all API methods (used in tests) // the parameter 'hideIdSubDatable' is used for integration tests only @@ -189,7 +195,7 @@ class Piwik_API_DocumentationGenerator $aParameters['showColumns'] = false; $aParameters['filter_pattern_recursive'] = false; - $moduleName = Piwik_API_Proxy::getInstance()->getModuleNameFromClassName($class); + $moduleName = Proxy::getInstance()->getModuleNameFromClassName($class); $aParameters = array_merge(array('module' => 'API', 'method' => $moduleName . '.' . $methodName), $aParameters); foreach ($aParameters as $nameVariable => &$defaultValue) { @@ -204,7 +210,6 @@ class Piwik_API_DocumentationGenerator return '?' . Piwik_Url::getQueryStringFromParameters($aParameters); } - /** * Returns the methods $class.$name parameters (and default value if provided) as a string. * @@ -214,7 +219,7 @@ class Piwik_API_DocumentationGenerator */ public function getParametersString($class, $name) { - $aParameters = Piwik_API_Proxy::getInstance()->getParametersList($class, $name); + $aParameters = Proxy::getInstance()->getParametersList($class, $name); $asParameters = array(); foreach ($aParameters as $nameVariable => $defaultValue) { // Do not show API parameters starting with _ @@ -235,5 +240,4 @@ class Piwik_API_DocumentationGenerator $sParameters = implode(", ", $asParameters); return "($sParameters)"; } - } diff --git a/core/API/Proxy.php b/core/API/Proxy.php index 08810ab396..8579e4a13a 100644 --- a/core/API/Proxy.php +++ b/core/API/Proxy.php @@ -8,17 +8,14 @@ * @category Piwik * @package Piwik */ -use Piwik\Common; -/** - * To differentiate between "no value" and default value of null - * - * @package Piwik - * @subpackage Piwik_API - */ -class Piwik_API_Proxy_NoDefaultValue -{ -} +namespace Piwik\API; +use Exception; +use Piwik\Common; +use Piwik\Timer; +use ReflectionClass; +use ReflectionMethod; +use Zend_Registry; /** * Proxy is a singleton that has the knowledge of every method available, their parameters @@ -31,7 +28,7 @@ class Piwik_API_Proxy_NoDefaultValue * @package Piwik * @subpackage Piwik_API */ -class Piwik_API_Proxy +class Proxy { // array of already registered plugins names protected $alreadyRegistered = array(); @@ -44,7 +41,7 @@ class Piwik_API_Proxy /** * Singleton instance - * @var self|null + * @var \Piwik\API\Proxy|null */ static private $instance = null; @@ -59,14 +56,14 @@ class Piwik_API_Proxy /** * Singleton, returns instance * - * @return Piwik_API_Proxy + * @return \Piwik\API\Proxy */ static public function getInstance() { - if (self::$instance == null) { - self::$instance = new self; + if (\Piwik\API\self::$instance == null) { + \Piwik\API\self::$instance = new \Piwik\API\self; } - return self::$instance; + return \Piwik\API\self::$instance; } /** @@ -154,7 +151,7 @@ class Piwik_API_Proxy * @param array $parametersRequest The parameters pairs (name=>value) * * @return mixed|null - * @throws Exception|Access_NoAccessException + * @throws Exception|\Piwik\NoAccessException */ public function call($className, $methodName, $parametersRequest) { @@ -183,7 +180,7 @@ class Piwik_API_Proxy $finalParameters = $this->getRequestParametersArray($parameterNamesDefaultValues, $parametersRequest); // start the timer - $timer = new Piwik_Timer(); + $timer = new Timer(); // call the method $returnedValue = call_user_func_array(array($object, $methodName), $finalParameters); @@ -192,12 +189,12 @@ class Piwik_API_Proxy if (substr($className, 0, 6) == 'Piwik_' && substr($className, -4) == '_API') { $pluginName = substr($className, 6, -4); Piwik_PostEvent('API.Proxy.processReturnValue', array( - &$returnedValue, - array('className' => $className, - 'module' => $pluginName, - 'action' => $methodName, - 'parameters' => &$parametersRequest) - )); + &$returnedValue, + array('className' => $className, + 'module' => $pluginName, + 'action' => $methodName, + 'parameters' => &$parametersRequest) + )); } // Restore the request @@ -285,7 +282,7 @@ class Piwik_API_Proxy } else { try { - if( $name == 'segment' && !empty($parametersRequest['segment'])) { + if ($name == 'segment' && !empty($parametersRequest['segment'])) { // segment parameter is an exception: we do not want to sanitize user input or it would break the segment encoding $requestValue = ($parametersRequest['segment']); } else { @@ -318,7 +315,7 @@ class Piwik_API_Proxy */ private function includeApiFile($fileName) { - $module = self::getModuleNameFromClassName($fileName); + $module = \Piwik\API\self::getModuleNameFromClassName($fileName); $path = PIWIK_INCLUDE_PATH . '/plugins/' . $module . '/API.php'; if (is_readable($path)) { @@ -410,3 +407,13 @@ class Piwik_API_Proxy } } } + +/** + * To differentiate between "no value" and default value of null + * + * @package Piwik + * @subpackage Piwik_API + */ +class Piwik_API_Proxy_NoDefaultValue +{ +} diff --git a/core/API/Request.php b/core/API/Request.php index 7a7569e59c..168da13ac3 100644 --- a/core/API/Request.php +++ b/core/API/Request.php @@ -8,10 +8,18 @@ * @category Piwik * @package Piwik */ +namespace Piwik\API; + +use Exception; +use Piwik\API\DataTableGenericFilter; +use Piwik\API\Proxy; use Piwik\Piwik; use Piwik\Common; use Piwik\Access; use Piwik\DataTable; +use Piwik\Url; +use Piwik\API\ResponseBuilder; +use Piwik_FrontController_PluginDeactivatedException; /** * An API request is the object used to make a call to the API and get the result. @@ -23,7 +31,7 @@ use Piwik\DataTable; * (see examples in the documentation http://piwik.org/docs/analytics-api) * * Example: - * $request = new Piwik_API_Request(' + * $request = new Request(' * method=UserSettings.getWideScreen * &idSite=1 * &date=yesterday @@ -39,7 +47,7 @@ use Piwik\DataTable; * @package Piwik * @subpackage Piwik_API */ -class Piwik_API_Request +class Request { protected $request = null; @@ -54,7 +62,7 @@ class Piwik_API_Request $defaultRequest = $_GET + $_POST; $requestRaw = self::getRequestParametersGET(); - if(!empty($requestRaw['segment'])) { + if (!empty($requestRaw['segment'])) { $defaultRequest['segment'] = $requestRaw['segment']; } @@ -74,7 +82,6 @@ class Piwik_API_Request $requestParsed = Common::getArrayFromQueryString($request); $requestArray = $requestParsed + $defaultRequest; - } foreach ($requestArray as &$element) { @@ -130,7 +137,7 @@ class Piwik_API_Request $outputFormat = strtolower(Common::getRequestVar('format', 'xml', 'string', $this->request)); // create the response - $response = new Piwik_API_ResponseBuilder($outputFormat, $this->request); + $response = new ResponseBuilder($outputFormat, $this->request); try { // read parameters @@ -146,7 +153,7 @@ class Piwik_API_Request self::reloadAuthUsingTokenAuth($this->request); // call the method - $returnedValue = Piwik_API_Proxy::getInstance()->call($moduleClass, $method, $this->request); + $returnedValue = Proxy::getInstance()->call($moduleClass, $method, $this->request); $toReturn = $response->getResponse($returnedValue, $module, $method); } catch (Exception $e) { @@ -207,7 +214,7 @@ class Piwik_API_Request $params = $paramOverride + $params; // process request - $request = new Piwik_API_Request($params); + $request = new Request($params); return $request->process(); } @@ -216,16 +223,16 @@ class Piwik_API_Request */ public static function getRequestParametersGET() { - if(empty($_SERVER['QUERY_STRING'])) { + if (empty($_SERVER['QUERY_STRING'])) { return array(); } $GET = Common::getArrayFromQueryString($_SERVER['QUERY_STRING']); return $GET; } - + /** * Returns the current URL without generic filter query parameters. - * + * * @param array $params Query parameter values to override in the new URL. * @return string */ @@ -233,7 +240,7 @@ class Piwik_API_Request { // unset all filter query params so the related report will show up in its default state, // unless the filter param was in $queryParams - $genericFiltersInfo = Piwik_API_DataTableGenericFilter::getGenericFiltersInformation(); + $genericFiltersInfo = DataTableGenericFilter::getGenericFiltersInformation(); foreach ($genericFiltersInfo as $filter) { foreach ($filter as $queryParamName => $queryParamInfo) { if (!isset($params[$queryParamName])) { @@ -242,6 +249,6 @@ class Piwik_API_Request } } - return Piwik_Url::getCurrentQueryStringWithParametersModified($params); + return Url::getCurrentQueryStringWithParametersModified($params); } } diff --git a/core/API/ResponseBuilder.php b/core/API/ResponseBuilder.php index c9bc6eec91..512339ee62 100644 --- a/core/API/ResponseBuilder.php +++ b/core/API/ResponseBuilder.php @@ -8,6 +8,12 @@ * @category Piwik * @package Piwik */ +namespace Piwik\API; + +use Exception; +use Piwik\API\DataTableManipulator\Flattener; +use Piwik\API\DataTableManipulator\LabelFilter; +use Piwik\API\DataTableGenericFilter; use Piwik\DataTable\Renderer\Json; use Piwik\DataTable\Simple; use Piwik\DataTable\Renderer; @@ -19,7 +25,7 @@ use Piwik\DataTable; * @package Piwik * @subpackage Piwik_API */ -class Piwik_API_ResponseBuilder +class ResponseBuilder { const DISPLAY_BACKTRACE_DEBUG = false; @@ -141,7 +147,6 @@ class Piwik_API_ResponseBuilder return $renderer->renderException(); } - /** * @param Exception $e * @return Exception @@ -149,11 +154,11 @@ class Piwik_API_ResponseBuilder protected function decorateExceptionWithDebugTrace(Exception $e) { // If we are in tests, show full backtrace - if( defined('PIWIK_PATH_TEST_TO_ROOT')) { - if(self::DISPLAY_BACKTRACE_DEBUG) { + if (defined('PIWIK_PATH_TEST_TO_ROOT')) { + if (self::DISPLAY_BACKTRACE_DEBUG) { $message = $e->getMessage() . " in \n " . $e->getFile() . ":" . $e->getLine() . " \n " . $e->getTraceAsString(); } else { - $message = $e->getMessage() . "\n \n --> To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in " . basename(__FILE__) ; + $message = $e->getMessage() . "\n \n --> To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in " . basename(__FILE__); } return new Exception($message); } @@ -287,7 +292,7 @@ class Piwik_API_ResponseBuilder { // if requested, flatten nested tables if (Common::getRequestVar('flat', '0', 'string', $this->request) == '1') { - $flattener = new Piwik_API_DataTableManipulator_Flattener($this->apiModule, $this->apiMethod, $this->request); + $flattener = new Flattener($this->apiModule, $this->apiMethod, $this->request); if (Common::getRequestVar('include_aggregate_rows', '0', 'string', $this->request) == '1') { $flattener->includeAggregateRows(); } @@ -296,7 +301,7 @@ class Piwik_API_ResponseBuilder // if the flag disable_generic_filters is defined we skip the generic filters if (0 == Common::getRequestVar('disable_generic_filters', '0', 'string', $this->request)) { - $genericFilter = new Piwik_API_DataTableGenericFilter($this->request); + $genericFilter = new DataTableGenericFilter($this->request); $genericFilter->filter($datatable); } @@ -321,7 +326,7 @@ class Piwik_API_ResponseBuilder if (!empty($label)) { $addLabelIndex = Common::getRequestVar('labelFilterAddLabelIndex', 0, 'int', $this->request) == 1; - $filter = new Piwik_API_DataTableManipulator_LabelFilter($this->apiModule, $this->apiMethod, $this->request); + $filter = new LabelFilter($this->apiModule, $this->apiMethod, $this->request); $datatable = $filter->filter($label, $datatable, $addLabelIndex); } return $this->getRenderedDataTable($datatable); @@ -478,7 +483,7 @@ class Piwik_API_ResponseBuilder * Returns the value for the label query parameter which can be either a string * (ie, label=...) or array (ie, label[]=...). * - * @param array $request + * @param array $request * @return array */ static public function getLabelFromRequest($request) @@ -497,7 +502,7 @@ class Piwik_API_ResponseBuilder static public function unsanitizeLabelParameter($label) { - // this is needed because Piwik_API_Proxy uses Common::getRequestVar which in turn + // this is needed because Proxy uses Common::getRequestVar which in turn // uses Common::sanitizeInputValue. This causes the > that separates recursive labels // to become > and we need to undo that here. $label = Common::unsanitizeInputValues($label); diff --git a/core/Access.php b/core/Access.php index ab92cf97c1..a53cd52d1b 100644 --- a/core/Access.php +++ b/core/Access.php @@ -186,7 +186,7 @@ class Access public function getRawSitesWithSomeViewAccess($login) { - return Piwik_FetchAll(self::getSqlAccessSite("access, t2.idsite"), $login); + return Db::fetchAll(self::getSqlAccessSite("access, t2.idsite"), $login); } /** @@ -331,7 +331,7 @@ class Access /** * Throws an exception if the user is not the SuperUser * - * @throws Access_NoAccessException + * @throws \Piwik\NoAccessException */ public function checkUserIsSuperUser() { @@ -343,7 +343,7 @@ class Access /** * If the user doesn't have an ADMIN access for at least one website, throws an exception * - * @throws Access_NoAccessException + * @throws \Piwik\NoAccessException */ public function checkUserHasSomeAdminAccess() { @@ -359,7 +359,7 @@ class Access /** * If the user doesn't have any view permission, throw exception * - * @throws Access_NoAccessException + * @throws \Piwik\NoAccessException */ public function checkUserHasSomeViewAccess() { @@ -377,7 +377,7 @@ class Access * If the user doesn't have ADMIN access for at least one website of the list, we throw an exception. * * @param int|array $idSites List of ID sites to check - * @throws Access_NoAccessException If for any of the websites the user doesn't have an ADMIN access + * @throws \Piwik\NoAccessException If for any of the websites the user doesn't have an ADMIN access */ public function checkUserHasAdminAccess($idSites) { @@ -398,7 +398,7 @@ class Access * If the user doesn't have VIEW or ADMIN access for at least one website of the list, we throw an exception. * * @param int|array|string $idSites List of ID sites to check (integer, array of integers, string comma separated list of integers) - * @throws Access_NoAccessException If for any of the websites the user doesn't have an VIEW or ADMIN access + * @throws \Piwik\NoAccessException If for any of the websites the user doesn't have an VIEW or ADMIN access */ public function checkUserHasViewAccess($idSites) { @@ -417,7 +417,7 @@ class Access /** * @param int|array|string $idSites * @return array - * @throws Access_NoAccessException + * @throws \Piwik\NoAccessException */ protected function getIdSites($idSites) { diff --git a/core/ArchiveProcessor/Day.php b/core/ArchiveProcessor/Day.php index ba8fbb3ae6..244936b73f 100644 --- a/core/ArchiveProcessor/Day.php +++ b/core/ArchiveProcessor/Day.php @@ -11,7 +11,7 @@ namespace Piwik\ArchiveProcessor; use Piwik\Metrics; use Piwik\ArchiveProcessor; -use Piwik_DataArray; +use Piwik\DataArray; use Piwik\DataTable; /** @@ -23,10 +23,10 @@ class Day extends ArchiveProcessor { /** * Converts the given array to a datatable - * @param Piwik_DataArray $array + * @param DataArray $array * @return \Piwik\DataTable */ - static public function getDataTableFromDataArray(Piwik_DataArray $array) + static public function getDataTableFromDataArray(DataArray $array) { $dataArray = $array->getDataArray(); $dataArrayTwoLevels = $array->getDataArrayWithTwoLevels(); @@ -62,7 +62,7 @@ class Day extends ArchiveProcessor * Mac OS 15 36 ... * * @param string $dimension Table log_visit field name to be use to compute common stats - * @return Piwik_DataArray + * @return DataArray */ public function getMetricsForDimension($dimension) { @@ -73,7 +73,7 @@ class Day extends ArchiveProcessor $dimension = array("label" => reset($dimension)); } $query = $this->getLogAggregator()->queryVisitsByDimension($dimension); - $metrics = new Piwik_DataArray(); + $metrics = new DataArray(); while ($row = $query->fetch()) { $metrics->sumMetricsVisits($row["label"], $row); } diff --git a/core/AssetManager.php b/core/AssetManager.php index f175bc5c41..3f701e02b7 100644 --- a/core/AssetManager.php +++ b/core/AssetManager.php @@ -8,9 +8,15 @@ * @category Piwik * @package Piwik */ +namespace Piwik; + +use Exception; +use JSMin; use Piwik\Config; use Piwik\Piwik; use Piwik\Common; +use Piwik\Version; +use lessc; /** * @see libs/jsmin/jsmin.php @@ -18,7 +24,7 @@ use Piwik\Common; require_once PIWIK_INCLUDE_PATH . '/libs/jsmin/jsmin.php'; /** - * Piwik_AssetManager is the class used to manage the inclusion of UI assets: + * AssetManager is the class used to manage the inclusion of UI assets: * JavaScript and CSS files. * * It performs the following actions: @@ -35,7 +41,7 @@ require_once PIWIK_INCLUDE_PATH . '/libs/jsmin/jsmin.php'; * * @package Piwik */ -class Piwik_AssetManager +class AssetManager { const MERGED_CSS_FILE = "asset_manager_global_css.css"; const MERGED_JS_FILE = "asset_manager_global_js.js"; @@ -82,7 +88,7 @@ class Piwik_AssetManager public static function generateAssetsCacheBuster() { $pluginList = md5(implode(",", \Piwik\PluginsManager::getInstance()->getLoadedPluginsName())); - $cacheBuster = md5(Common::getSalt() . $pluginList . PHP_VERSION . Piwik_Version::VERSION); + $cacheBuster = md5(Common::getSalt() . $pluginList . PHP_VERSION . Version::VERSION); return $cacheBuster; } @@ -133,7 +139,8 @@ class Piwik_AssetManager $firstLine = fgets($f); fclose($f); if (!empty($firstLine) - && trim($firstLine) == trim($firstLineCompileHash)) { + && trim($firstLine) == trim($firstLineCompileHash) + ) { return; } // Some CSS file in the merge, has changed since last merged asset was generated @@ -145,9 +152,9 @@ class Piwik_AssetManager Piwik_PostEvent('AssetManager.filterMergedCss', array(&$mergedContent)); $mergedContent = - $firstLineCompileHash . "\n" - . "/* Piwik CSS file is compiled with Less. You may be interested in writing a custom Theme for Piwik! */\n" - . $mergedContent; + $firstLineCompileHash . "\n" + . "/* Piwik CSS file is compiled with Less. You may be interested in writing a custom Theme for Piwik! */\n" + . $mergedContent; self::writeAssetToFile($mergedContent, self::MERGED_CSS_FILE); } diff --git a/core/CacheFile.php b/core/CacheFile.php index 7458588dc3..addb926d6c 100644 --- a/core/CacheFile.php +++ b/core/CacheFile.php @@ -8,6 +8,9 @@ * @category Piwik * @package Piwik */ +namespace Piwik; + +use Exception; use Piwik\Piwik; use Piwik\Common; @@ -21,7 +24,7 @@ use Piwik\Common; * * @package Piwik */ -class Piwik_CacheFile +class CacheFile { /** * @var string @@ -39,7 +42,7 @@ class Piwik_CacheFile /** * @param string $directory directory to use - * @param int $timeToLiveInSeconds TTL + * @param int $timeToLiveInSeconds TTL */ public function __construct($directory, $timeToLiveInSeconds = 300) { diff --git a/core/Common.php b/core/Common.php index da6e8892b5..4f40424c95 100644 --- a/core/Common.php +++ b/core/Common.php @@ -1,9 +1,18 @@ <?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + * @category Piwik + * @package Piwik + */ namespace Piwik; use Exception; -use Piwik_IP; -use Piwik_Tracker; +use Piwik\IP; +use Piwik\Tracker; use Piwik_Tracker_Cache; use Piwik_UserCountry_LocationProvider_Default; @@ -753,10 +762,10 @@ class Common */ public static function convertVisitorIdToBin($id) { - if (strlen($id) !== Piwik_Tracker::LENGTH_HEX_ID_STRING + if (strlen($id) !== Tracker::LENGTH_HEX_ID_STRING || @bin2hex(self::hex2bin($id)) != $id ) { - throw new Exception("visitorId is expected to be a " . Piwik_Tracker::LENGTH_HEX_ID_STRING . " hex char string"); + throw new Exception("visitorId is expected to be a " . Tracker::LENGTH_HEX_ID_STRING . " hex char string"); } return self::hex2bin($id); } @@ -778,7 +787,7 @@ class Common */ public static function long2ip($ip) { - return Piwik_IP::long2ip($ip); + return IP::long2ip($ip); } /** diff --git a/core/Controller.php b/core/Controller.php index 0d6aa3ec64..344dee8616 100644 --- a/core/Controller.php +++ b/core/Controller.php @@ -8,6 +8,9 @@ * @category Piwik * @package Piwik */ +namespace Piwik; + +use Exception; use Piwik\Config; use Piwik\DataTable\Filter\CalculateEvolutionFilter; use Piwik\Period; @@ -18,7 +21,18 @@ use Piwik\Common; use Piwik\Access; use Piwik\Date; use Piwik\Site; - +use Piwik_API_API; +use Piwik\API\Request; +use Piwik\FrontController; +use Piwik_LanguagesManager; +use Piwik_SitesManager_API; +use Piwik\Url; +use Piwik_UsersManager_API; +use Piwik\View; +use Piwik\ViewDataTable; +use Piwik_ViewDataTable_GenerateGraphHTML_ChartEvolution; +use Zend_Registry; +use false; /** * Parent class of all plugins Controllers (located in /plugins/PluginName/Controller.php @@ -26,7 +40,7 @@ use Piwik\Site; * * @package Piwik */ -abstract class Piwik_Controller +abstract class Controller { /** * Plugin name, eg. Referers @@ -139,21 +153,21 @@ abstract class Piwik_Controller * - echo the output of the rendering if fetch = false * - returns the output of the rendering if fetch = true * - * @param Piwik_ViewDataTable $view view object to use + * @param ViewDataTable $view view object to use * @param bool $fetch indicates whether to output or return the content * @return string|void */ - protected function renderView(Piwik_ViewDataTable $view, $fetch = false) + protected function renderView(ViewDataTable $view, $fetch = false) { Piwik_PostEvent('Controller.renderView', array( - $this, - array('view' => $view, - 'controllerName' => $view->getCurrentControllerName(), - 'controllerAction' => $view->getCurrentControllerAction(), - 'apiMethodToRequestDataTable' => $view->getApiMethodToRequestDataTable(), - 'controllerActionCalledWhenRequestSubTable' => $view->getControllerActionCalledWhenRequestSubTable(), - ) - )); + $this, + array('view' => $view, + 'controllerName' => $view->getCurrentControllerName(), + 'controllerAction' => $view->getCurrentControllerAction(), + 'apiMethodToRequestDataTable' => $view->getApiMethodToRequestDataTable(), + 'controllerActionCalledWhenRequestSubTable' => $view->getControllerActionCalledWhenRequestSubTable(), + ) + )); $view->main(); @@ -175,7 +189,7 @@ abstract class Piwik_Controller */ protected function getLastUnitGraph($currentModuleName, $currentControllerAction, $apiMethod) { - $view = Piwik_ViewDataTable::factory('graphEvolution'); + $view = ViewDataTable::factory('graphEvolution'); $view->init($currentModuleName, $currentControllerAction, $apiMethod); return $view; } @@ -256,7 +270,7 @@ abstract class Piwik_Controller * - period: day, week, month, year * * @param array $paramsToSet array( 'date' => 'last50', 'viewDataTable' =>'sparkline' ) - * @throws Access_NoAccessException + * @throws \Piwik\NoAccessException * @return array */ protected function getGraphParamsModified($paramsToSet = array()) @@ -282,7 +296,7 @@ abstract class Piwik_Controller } if (is_null($this->site)) { - throw new Access_NoAccessException("Website not initialized, check that you are logged in and/or using the correct token_auth."); + throw new \Piwik\NoAccessException("Website not initialized, check that you are logged in and/or using the correct token_auth."); } $paramDate = self::getDateRangeRelativeToEndDate($period, $range, $endDate, $this->site); @@ -312,8 +326,8 @@ abstract class Piwik_Controller * Returns a numeric value from the API. * Works only for API methods that originally returns numeric values (there is no cast here) * - * @param string $methodToCall Name of method to call, eg. Referers.getNumberOfDistinctSearchEngines - * @param bool|string $date A custom date to use when getting the value. If false, the 'date' query + * @param string $methodToCall Name of method to call, eg. Referers.getNumberOfDistinctSearchEngines + * @param bool|string $date A custom date to use when getting the value. If false, the 'date' query * parameter is used. * * @return int|float @@ -322,14 +336,14 @@ abstract class Piwik_Controller { $params = $date === false ? array() : array('date' => $date); - $return = Piwik_API_Request::processRequest($methodToCall, $params); + $return = Request::processRequest($methodToCall, $params); $columns = $return->getFirstRow()->getColumns(); return reset($columns); } /** * Returns the current URL to use in a img src=X to display a sparkline. - * $action must be the name of a Controller method that requests data using the Piwik_ViewDataTable::factory + * $action must be the name of a Controller method that requests data using the ViewDataTable::factory * It will automatically build a sparkline by setting the viewDataTable=sparkline parameter in the URL. * It will also computes automatically the 'date' for the 'last30' days/weeks/etc. * @@ -351,7 +365,7 @@ abstract class Piwik_Controller $value = rawurlencode(implode(',', $value)); } } - $url = Piwik_Url::getCurrentQueryStringWithParametersModified($params); + $url = Url::getCurrentQueryStringWithParametersModified($params); return $url; } @@ -359,7 +373,7 @@ abstract class Piwik_Controller * Sets the first date available in the calendar * * @param Date $minDate - * @param Piwik_View $view + * @param View $view * @return void */ protected function setMinDateView(Date $minDate, $view) @@ -373,7 +387,7 @@ abstract class Piwik_Controller * Sets "today" in the calendar. Today does not always mean "UTC" today, eg. for websites in UTC+12. * * @param Date $maxDate - * @param Piwik_View $view + * @param View $view * @return void */ protected function setMaxDateView(Date $maxDate, $view) @@ -388,7 +402,7 @@ abstract class Piwik_Controller * various templates and Javascript. * If any error happens, displays the login screen * - * @param Piwik_View $view + * @param View $view * @throws Exception * @return void */ @@ -454,7 +468,7 @@ abstract class Piwik_Controller /** * Set the minimal variables in the view object * - * @param Piwik_View $view + * @param View $view */ protected function setBasicVariablesView($view) { @@ -488,7 +502,7 @@ abstract class Piwik_Controller public static function setHostValidationVariablesView($view) { // check if host is valid - $view->isValidHost = Piwik_Url::isValidHost(); + $view->isValidHost = Url::isValidHost(); if (!$view->isValidHost) { // invalid host, so display warning to user $validHost = Config::getInstance()->General['trusted_hosts'][0]; @@ -501,14 +515,14 @@ abstract class Piwik_Controller $mailToUrl = "mailto:$superUserEmail?subject=$emailSubject&body=$emailBody"; $mailLinkStart = "<a href=\"$mailToUrl\">"; - $invalidUrl = Piwik_Url::getCurrentUrlWithoutQueryString($checkIfTrusted = false); - $validUrl = Piwik_Url::getCurrentScheme() . '://' . $validHost - . Piwik_Url::getCurrentScriptName(); + $invalidUrl = Url::getCurrentUrlWithoutQueryString($checkIfTrusted = false); + $validUrl = Url::getCurrentScheme() . '://' . $validHost + . Url::getCurrentScriptName(); $invalidUrl = Common::sanitizeInputValue($invalidUrl); $validUrl = Common::sanitizeInputValue($validUrl); $changeTrustedHostsUrl = "index.php" - . Piwik_Url::getCurrentQueryStringWithParametersModified(array( + . Url::getCurrentQueryStringWithParametersModified(array( 'module' => 'CoreAdminHome', 'action' => 'generalSettings' )) @@ -551,7 +565,7 @@ abstract class Piwik_Controller /** * Sets general period variables (available periods, current period, period labels) used by templates * - * @param Piwik_View $view + * @param View $view * @throws Exception * @return void */ @@ -589,7 +603,7 @@ abstract class Piwik_Controller * Set metrics variables (displayed metrics, available metrics) used by template * Handles the server-side of the metrics picker * - * @param Piwik_View|Piwik_ViewDataTable $view + * @param View|ViewDataTable $view * @param string $defaultMetricDay name of the default metric for period=day * @param string $defaultMetric name of the default metric for other periods * @param array $metricsForDay metrics that are only available for period=day @@ -597,7 +611,7 @@ abstract class Piwik_Controller * @param bool $labelDisplayed add 'label' to columns to display? * @return void */ - protected function setMetricsVariablesView(Piwik_ViewDataTable $view, $defaultMetricDay = 'nb_uniq_visitors', + protected function setMetricsVariablesView(ViewDataTable $view, $defaultMetricDay = 'nb_uniq_visitors', $defaultMetric = 'nb_visits', $metricsForDay = array('nb_uniq_visitors'), $metricsForAllPeriods = array('nb_visits', 'nb_actions'), $labelDisplayed = true) { @@ -642,7 +656,7 @@ abstract class Piwik_Controller } $parametersString = ''; if (!empty($parameters)) { - $parametersString = '&' . Piwik_Url::getQueryStringFromParameters($parameters); + $parametersString = '&' . Url::getQueryStringFromParameters($parameters); } if ($websiteId) { @@ -670,11 +684,10 @@ abstract class Piwik_Controller Piwik_ExitWithMessage($errorMessage, false, true); } - Piwik_FrontController::getInstance()->dispatch(Piwik::getLoginPluginName(), false); + FrontController::getInstance()->dispatch(Piwik::getLoginPluginName(), false); exit; } - /** * Returns default website that Piwik should load * @@ -753,13 +766,13 @@ abstract class Piwik_Controller * within the site. The token should never appear in the browser's * address bar. * - * @throws Access_NoAccessException if token doesn't match + * @throws \Piwik\NoAccessException if token doesn't match * @return void */ protected function checkTokenInUrl() { if (Common::getRequestVar('token_auth', false) != Piwik::getCurrentUserTokenAuth()) { - throw new Access_NoAccessException(Piwik_TranslateException('General_ExceptionInvalidToken')); + throw new \Piwik\NoAccessException(Piwik_TranslateException('General_ExceptionInvalidToken')); } } @@ -779,7 +792,6 @@ abstract class Piwik_Controller } } - /** * Returns the pretty date representation * @@ -792,7 +804,6 @@ abstract class Piwik_Controller return self::getCalendarPrettyDate(Period::factory($period, Date::factory($date))); } - /** * Calculates the evolution from one value to another and returns HTML displaying * the evolution percent. The HTML includes an up/down arrow and is colored red, black or diff --git a/core/Controller/Admin.php b/core/Controller/Admin.php index a6c58b46a6..be4bcd2741 100644 --- a/core/Controller/Admin.php +++ b/core/Controller/Admin.php @@ -8,21 +8,26 @@ * @category Piwik * @package Piwik */ +namespace Piwik\Controller; + use Piwik\Config; use Piwik\Piwik; +use Piwik\Controller; +use Piwik\View; +use Piwik\Url; /** * Parent class of all plugins Controllers with admin functions * * @package Piwik */ -abstract class Piwik_Controller_Admin extends Piwik_Controller +abstract class Admin extends Controller { /** * Set the minimal variables in the view object * Extended by some admin view specific variables * - * @param Piwik_View $view + * @param View $view */ protected function setBasicVariablesView($view) { @@ -31,12 +36,12 @@ abstract class Piwik_Controller_Admin extends Piwik_Controller self::setBasicVariablesAdminView($view); } - static public function displayWarningIfConfigFileNotWritable(Piwik_View $view ) + static public function displayWarningIfConfigFileNotWritable(View $view) { $view->configFileNotWritable = !Config::getInstance()->isFileWritable(); } - static public function setBasicVariablesAdminView(Piwik_View $view) + static public function setBasicVariablesAdminView(View $view) { $statsEnabled = Config::getInstance()->Tracker['record_statistics']; if ($statsEnabled == "0") { @@ -44,7 +49,7 @@ abstract class Piwik_Controller_Admin extends Piwik_Controller } $view->topMenu = Piwik_GetTopMenu(); - $view->currentAdminMenuName = Piwik_GetCurrentAdminMenuName(); + $view->currentAdminMenuName = \Piwik\Menu\Admin::getInstance()->getCurrentAdminMenuName(); $view->enableFrames = Config::getInstance()->General['enable_framed_settings']; if (!$view->enableFrames) { @@ -59,21 +64,21 @@ abstract class Piwik_Controller_Admin extends Piwik_Controller // for cannot find installed plugin warning $missingPlugins = \Piwik\PluginsManager::getInstance()->getMissingPlugins(); if (!empty($missingPlugins)) { - $pluginsLink = Piwik_Url::getCurrentQueryStringWithParametersModified(array( - 'module' => 'CorePluginsAdmin', 'action' => 'index' - )); + $pluginsLink = Url::getCurrentQueryStringWithParametersModified(array( + 'module' => 'CorePluginsAdmin', 'action' => 'index' + )); $view->missingPluginsWarning = Piwik_Translate('CoreAdminHome_MissingPluginsWarning', array( '<strong>' . implode('</strong>, <strong>', $missingPlugins) . '</strong>', '<a href="' . $pluginsLink . '"/>', '</a>' )); } - + self::checkPhpVersion($view); $view->menu = Piwik_GetAdminMenu(); } - + /** * Check if the current PHP version is >= 5.3. If not, a warning is displayed * to the user. diff --git a/core/Cookie.php b/core/Cookie.php index 24bd7c8ba2..84246569af 100644 --- a/core/Cookie.php +++ b/core/Cookie.php @@ -8,6 +8,8 @@ * @category Piwik * @package Piwik */ +namespace Piwik; + use Piwik\Common; /** @@ -18,7 +20,7 @@ use Piwik\Common; * * @package Piwik */ -class Piwik_Cookie +class Cookie { /** * Don't create a cookie bigger than 1k diff --git a/core/DataAccess/ArchiveSelector.php b/core/DataAccess/ArchiveSelector.php index 8ed467ba90..b261e78fc3 100644 --- a/core/DataAccess/ArchiveSelector.php +++ b/core/DataAccess/ArchiveSelector.php @@ -72,7 +72,7 @@ class ArchiveSelector OR name = '" . self::NB_VISITS_CONVERTED_RECORD_LOOKED_UP . "') $timeStampWhere ORDER BY idarchive DESC"; - $results = Piwik_FetchAll($sqlQuery, $bindSQL); + $results = Db::fetchAll($sqlQuery, $bindSQL); if (empty($results)) { return false; } @@ -185,7 +185,7 @@ class ArchiveSelector $sql = sprintf($getArchiveIdsSql, $table, $dateCondition); // get the archive IDs - foreach (Piwik_FetchAll($sql, $bind) as $row) { + foreach (Db::fetchAll($sql, $bind) as $row) { $archiveName = $row['name']; //FIXMEA duplicate with Archive.php @@ -246,7 +246,7 @@ class ArchiveSelector $table = ArchiveTableCreator::getBlobTable($date); } $sql = sprintf($getValuesSql, $table, implode(',', $ids)); - $dataRows = Piwik_FetchAll($sql, $bind); + $dataRows = Db::fetchAll($sql, $bind); foreach ($dataRows as $row) { $rows[] = $row; } @@ -305,10 +305,10 @@ class ArchiveSelector $yesterday = Date::factory('yesterday')->getDateTime(); $bind = array(Piwik::$idPeriods['range'], $yesterday); $numericTable = ArchiveTableCreator::getNumericTable($date); - Piwik_Query(sprintf($query, $numericTable), $bind); + Db::query(sprintf($query, $numericTable), $bind); Piwik::log("Purging Custom Range archives: done [ purged archives older than $yesterday from $numericTable / blob ]"); try { - Piwik_Query(sprintf($query, ArchiveTableCreator::getBlobTable($date)), $bind); + Db::query(sprintf($query, ArchiveTableCreator::getBlobTable($date)), $bind); } catch (Exception $e) { // Individual blob tables could be missing } @@ -318,9 +318,9 @@ class ArchiveSelector { $query = "DELETE FROM %s WHERE idarchive IN (" . implode(',', $idArchivesToDelete) . ")"; - Piwik_Query(sprintf($query, ArchiveTableCreator::getNumericTable($date))); + Db::query(sprintf($query, ArchiveTableCreator::getNumericTable($date))); try { - Piwik_Query(sprintf($query, ArchiveTableCreator::getBlobTable($date))); + Db::query(sprintf($query, ArchiveTableCreator::getBlobTable($date))); } catch (Exception $e) { // Individual blob tables could be missing } @@ -335,7 +335,7 @@ class ArchiveSelector AND ts_archived < ?) OR value = " . ArchiveProcessor::DONE_ERROR . ")"; - $result = Piwik_FetchAll($query, array($purgeArchivesOlderThan)); + $result = Db::fetchAll($query, array($purgeArchivesOlderThan)); $idArchivesToDelete = array(); if (!empty($result)) { foreach ($result as $row) { diff --git a/core/DataAccess/ArchiveTableCreator.php b/core/DataAccess/ArchiveTableCreator.php index 9b2fb6797d..cb70f49b35 100644 --- a/core/DataAccess/ArchiveTableCreator.php +++ b/core/DataAccess/ArchiveTableCreator.php @@ -1,12 +1,4 @@ <?php -namespace Piwik\DataAccess; - -use Exception; -use Piwik\Piwik; -use Piwik\Common; -use Piwik\Date; -use Zend_Registry; - /** * Piwik - Open source web analytics * @@ -17,6 +9,14 @@ use Zend_Registry; * @package Piwik */ +namespace Piwik\DataAccess; + +use Exception; +use Piwik\Piwik; +use Piwik\Common; +use Piwik\Date; +use Zend_Registry; + class ArchiveTableCreator { const NUMERIC_TABLE = "numeric"; diff --git a/core/DataAccess/ArchiveWriter.php b/core/DataAccess/ArchiveWriter.php index ef04212b74..8296c0f438 100644 --- a/core/DataAccess/ArchiveWriter.php +++ b/core/DataAccess/ArchiveWriter.php @@ -13,13 +13,13 @@ namespace Piwik\DataAccess; use Exception; use Piwik\ArchiveProcessor\Rules; use Piwik\Config; +use Piwik\Db; use Piwik\DataAccess\ArchiveTableCreator; use Piwik\Period; use Piwik\Piwik; use Piwik\Common; use Piwik\ArchiveProcessor; use Piwik\Segment; -use Zend_Registry; /** * This class is used to create a new Archive. @@ -69,7 +69,7 @@ class ArchiveWriter protected function acquireLock() { $lockName = $this->getArchiveProcessorLockName(); - $result = Piwik_GetDbLock($lockName, $maxRetries = 30); + $result = Db::getDbLock($lockName, $maxRetries = 30); if (!$result) { Piwik::log("SELECT GET_LOCK failed to acquire lock. Proceeding anyway."); } @@ -86,12 +86,12 @@ class ArchiveWriter $numericTable = $this->getTableNumeric(); $idSite = $this->idSite; - $db = Zend_Registry::get('db'); + $db = \Zend_Registry::get('db'); $locked = self::PREFIX_SQL_LOCK . Common::generateUniqId(); $date = date("Y-m-d H:i:s"); $dbLockName = "allocateNewArchiveId.$numericTable"; - if (Piwik_GetDbLock($dbLockName, $maxRetries = 30) === false) { + if (Db::getDbLock($dbLockName, $maxRetries = 30) === false) { throw new Exception("allocateNewArchiveId: Cannot get named lock for table $numericTable."); } $insertSql = "INSERT INTO $numericTable " @@ -105,7 +105,7 @@ class ArchiveWriter 0 " . " FROM $numericTable as tb1"; $db->exec($insertSql); - Piwik_ReleaseDbLock($dbLockName); + Db::releaseDbLock($dbLockName); $selectIdSql = "SELECT idarchive FROM $numericTable WHERE name = ? LIMIT 1"; $id = $db->fetchOne($selectIdSql, $locked); return $id; @@ -147,7 +147,7 @@ class ArchiveWriter protected function deletePreviousArchiveStatus() { - Piwik_Query("DELETE FROM " . $this->getTableNumeric() . " + Db::query("DELETE FROM " . $this->getTableNumeric() . " WHERE idarchive = ? AND (name = '" . $this->doneFlag . "' OR name LIKE '" . self::PREFIX_SQL_LOCK . "%')", array($this->getIdArchive()) ); @@ -165,7 +165,7 @@ class ArchiveWriter protected function releaseArchiveProcessorLock() { $lockName = $this->getArchiveProcessorLockName(); - return Piwik_ReleaseDbLock($lockName); + return Db::releaseDbLock($lockName); } public function insertBulkRecords($records) @@ -224,7 +224,7 @@ class ArchiveWriter $bindSql = $this->getInsertRecordBind(); $bindSql[] = $name; $bindSql[] = $value; - Piwik_Query($query, $bindSql); + Db::query($query, $bindSql); return true; } diff --git a/core/DataAccess/LogAggregator.php b/core/DataAccess/LogAggregator.php index 72e94e8b70..f1b38c7d4e 100644 --- a/core/DataAccess/LogAggregator.php +++ b/core/DataAccess/LogAggregator.php @@ -16,7 +16,7 @@ use Piwik\Metrics; use Piwik\Date; use Piwik\Segment; use Piwik\Site; -use Piwik_RankingQuery; +use Piwik\RankingQuery; use Piwik_Tracker_GoalManager; use Zend_Registry; @@ -128,9 +128,9 @@ class LogAggregator * @param array $additionalSelects Additional SELECT clause * @param bool|array $metrics Set this if you want to limit the columns that are returned. * The possible values in the array are Metrics::INDEX_*. - * @param bool|Piwik_RankingQuery $rankingQuery + * @param bool|\Piwik\RankingQuery $rankingQuery * A pre-configured ranking query instance that is used to limit the result. - * If set, the return value is the array returned by Piwik_RankingQuery::execute(). + * If set, the return value is the array returned by RankingQuery::execute(). * * @return mixed */ @@ -347,7 +347,7 @@ class LogAggregator * @param array|bool $additionalSelects additional select clause * @param bool|array $metrics Set this if you want to limit the columns that are returned. * The possible values in the array are Metrics::INDEX_*. - * @param Piwik_RankingQuery $rankingQuery pre-configured ranking query instance + * @param \Piwik\RankingQuery $rankingQuery pre-configured ranking query instance * @param bool|string $joinLogActionOnColumn column from log_link_visit_action that * log_action should be joined on. * can be an array to join multiple times. diff --git a/core/DataArray.php b/core/DataArray.php index 58d9d159f4..e9971997d2 100644 --- a/core/DataArray.php +++ b/core/DataArray.php @@ -8,7 +8,11 @@ * @category Piwik * @package Piwik */ +namespace Piwik; + +use Exception; use Piwik\Metrics; +use Piwik_Tracker_GoalManager; /** * The DataArray is a data structure used to aggregate datasets, @@ -17,7 +21,7 @@ use Piwik\Metrics; * */ -class Piwik_DataArray +class DataArray { protected $data = array(); protected $dataTwoLevels = array(); @@ -198,16 +202,16 @@ class Piwik_DataArray * @param $row * @throws Exception if the the data row contains non numeric values */ - public function sumMetrics( $label, $row) + public function sumMetrics($label, $row) { - foreach($row as $columnName => $columnValue) { - if(empty($columnValue)) { + foreach ($row as $columnName => $columnValue) { + if (empty($columnValue)) { continue; } - if(empty($this->data[$label][$columnName])) { + if (empty($this->data[$label][$columnName])) { $this->data[$label][$columnName] = 0; } - if(!is_numeric($columnValue)) { + if (!is_numeric($columnValue)) { throw new Exception("DataArray->sumMetricsPivot expects rows of numeric values, non numeric found: " . var_export($columnValue, true) . " for column $columnName"); } $this->data[$label][$columnName] += $columnValue; diff --git a/core/DataTable/Filter/MetadataCallbackReplace.php b/core/DataTable/Filter/MetadataCallbackReplace.php index 32051c1e6f..affbc6f4ab 100644 --- a/core/DataTable/Filter/MetadataCallbackReplace.php +++ b/core/DataTable/Filter/MetadataCallbackReplace.php @@ -13,7 +13,6 @@ namespace Piwik\DataTable\Filter; use Piwik\DataTable; use Piwik\DataTable\Filter\ColumnCallbackReplace; use Piwik\DataTable\Row; -use false; /** * Replace a metadata value with a new value resulting diff --git a/core/DataTable/Renderer.php b/core/DataTable/Renderer.php index 88f3f9ff37..bdec4b87ca 100644 --- a/core/DataTable/Renderer.php +++ b/core/DataTable/Renderer.php @@ -299,7 +299,7 @@ abstract class Renderer $this->apiMetaData = false; } - $api = Piwik_API_API::getInstance(); + $api = \Piwik_API_API::getInstance(); $meta = $api->getMetadata($this->idSite, $apiModule, $apiAction); if (is_array($meta[0])) { $meta = $meta[0]; diff --git a/core/DataTable/Renderer/Rss.php b/core/DataTable/Renderer/Rss.php index 2b131d25df..3061ddbc67 100644 --- a/core/DataTable/Renderer/Rss.php +++ b/core/DataTable/Renderer/Rss.php @@ -15,7 +15,7 @@ use Piwik\Common; use Piwik\DataTable\Renderer; use Piwik\Date; use Piwik\DataTable; -use Piwik_Url; +use Piwik\Url; /** * RSS Feed. @@ -69,7 +69,7 @@ class Rss extends Renderer $idSite = Common::getRequestVar('idSite', 1, 'int'); $period = Common::getRequestVar('period'); - $piwikUrl = Piwik_Url::getCurrentUrlWithoutFileName() + $piwikUrl = Url::getCurrentUrlWithoutFileName() . "?module=CoreHome&action=index&idSite=" . $idSite . "&period=" . $period; $out = ""; $moreRecentFirst = array_reverse($table->getArray(), true); diff --git a/core/PluginsFunctions/Sql.php b/core/Db.php index 2a0d3665ba..d73b5c65f6 100644 --- a/core/PluginsFunctions/Sql.php +++ b/core/Db.php @@ -8,25 +8,27 @@ * @category Piwik * @package PluginsFunctions */ +namespace Piwik; use Piwik\Config; +use Piwik\Tracker; /** * SQL wrapper * * @package PluginsFunctions */ -class Piwik_Sql +class Db { /** * Returns the database adapter to use * - * @return Piwik_Tracker_Db|Piwik_Db_Adapter_Interface + * @return Piwik_Tracker_Db|AdapterInterface */ static private function getDb() { $db = null; if (!empty($GLOBALS['PIWIK_TRACKER_MODE'])) { - $db = Piwik_Tracker::getDatabase(); + $db = Tracker::getDatabase(); } if ($db === null) { $db = Zend_Registry::get('db'); @@ -37,7 +39,7 @@ class Piwik_Sql /** * Executes an unprepared SQL query on the DB. Recommended for DDL statements, e.g., CREATE/DROP/ALTER. * The return result is DBMS-specific. For MySQLI, it returns the number of rows affected. For PDO, it returns the Zend_Db_Statement object - * If you want to fetch data from the DB you should use the function Piwik_FetchAll() + * If you want to fetch data from the DB you should use the function Db::fetchAll() * * @param string $sql SQL Query * @return integer|Zend_Db_Statement @@ -54,7 +56,7 @@ class Piwik_Sql /** * Executes a SQL query on the DB and returns the Zend_Db_Statement object - * If you want to fetch data from the DB you should use the function Piwik_FetchAll() + * If you want to fetch data from the DB you should use the function Db::fetchAll() * * See also http://framework.zend.com/manual/en/zend.db.statement.html * @@ -162,7 +164,7 @@ class Piwik_Sql // filter out all InnoDB tables $nonInnoDbTables = array(); - foreach (Piwik_FetchAll("SHOW TABLE STATUS") as $row) { + foreach (Db::fetchAll("SHOW TABLE STATUS") as $row) { if (strtolower($row['Engine']) != 'innodb' && in_array($row['Name'], $tables) ) { @@ -234,18 +236,22 @@ class Piwik_Sql * Performs a SELECT on a table one chunk at a time and returns the first * fetched value. * - * @param string $sql The SQL to perform. The last two conditions of the WHERE - * expression must be as follows: 'id >= ? AND id < ?' where - * 'id' is the int id of the table. If $step < 0, the condition - * should be 'id <= ? AND id > ?'. - * @param int $first The minimum ID to loop from. - * @param int $last The maximum ID to loop to. - * @param int $step The maximum number of rows to scan in each smaller SELECT. - * @param array $params parameters to bind in the query, array( param1 => value1, param2 => value2) + * This function will break up a SELECT into several smaller SELECTs and + * should be used when performing a SELECT that can take a long time to finish. + * Using several smaller SELECTs will ensure that the table will not be locked + * for too long. * - * @return array + * @param string $sql The SQL to perform. The last two conditions of the WHERE + * expression must be as follows: 'id >= ? AND id < ?' where + * 'id' is the int id of the table. + * @param int $first The minimum ID to loop from. + * @param int $last The maximum ID to loop to. + * @param int $step The maximum number of rows to scan in each smaller SELECT. + * @param array $params Parameters to bind in the query, array( param1 => value1, param2 => value2) + * + * @return string */ - static public function segmentedFetchFirst($sql, $first, $last, $step, $params) + static public function segmentedFetchFirst($sql, $first, $last, $step, $params = array()) { $result = false; if ($step > 0) { @@ -264,17 +270,23 @@ class Piwik_Sql * Performs a SELECT on a table one chunk at a time and returns an array * of every fetched value. * - * @param string $sql The SQL to perform. The last two conditions of the WHERE - * expression must be as follows: 'id >= ? AND id < ?' where - * 'id' is the int id of the table. - * @param int $first The minimum ID to loop from. - * @param int $last The maximum ID to loop to. - * @param int $step The maximum number of rows to scan in each smaller SELECT. - * @param array $params Parameters to bind in the query, array( param1 => value1, param2 => value2) + * This function will break up a SELECT into several smaller SELECTs and + * should be used when performing a SELECT that can take a long time to finish. + * Using several smaller SELECTs will ensure that the table will not be locked + * for too long. + * + * + * @param string $sql The SQL to perform. The last two conditions of the WHERE + * expression must be as follows: 'id >= ? AND id < ?' where + * 'id' is the int id of the table. + * @param int $first The minimum ID to loop from. + * @param int $last The maximum ID to loop to. + * @param int $step The maximum number of rows to scan in each smaller SELECT. + * @param array $params Parameters to bind in the query, array( param1 => value1, param2 => value2) * * @return array */ - static public function segmentedFetchOne($sql, $first, $last, $step, $params) + static public function segmentedFetchOne($sql, $first, $last, $step, $params = array()) { $result = array(); if ($step > 0) { @@ -333,7 +345,7 @@ class Piwik_Sql * * @return array */ - static public function segmentedQuery($sql, $first, $last, $step, $params) + static public function segmentedQuery($sql, $first, $last, $step, $params = array()) { if ($step > 0) { for ($i = $first; $i <= $last; $i += $step) { @@ -391,291 +403,3 @@ class Piwik_Sql return $db->fetchOne($sql, array($lockName)) == '1'; } } - -/** - * Executes an unprepared SQL query on the DB. Recommended for DDL statements, e.g., CREATE/DROP/ALTER. - * The return result is DBMS-specific. For MySQLI, it returns the number of rows affected. For PDO, it returns the Zend_Db_Statement object - * If you want to fetch data from the DB you should use the function Piwik_FetchAll() - * - * @see Piwik_Sql::exec - * - * @param string $sqlQuery SQL Query - * @return integer|Zend_Db_Statement - */ -function Piwik_Exec($sqlQuery) -{ - return Piwik_Sql::exec($sqlQuery); -} - -/** - * Executes a SQL query on the DB and returns the Zend_Db_Statement object - * If you want to fetch data from the DB you should use the function Piwik_FetchAll() - * - * See also http://framework.zend.com/manual/en/zend.db.statement.html - * - * @see Piwik_Sql::query - * - * @param string $sqlQuery SQL Query - * @param array $parameters Parameters to bind in the query, array( param1 => value1, param2 => value2) - * @return Zend_Db_Statement - */ -function Piwik_Query($sqlQuery, $parameters = array()) -{ - return Piwik_Sql::query($sqlQuery, $parameters); -} - -/** - * Executes the SQL Query and fetches all the rows from the database query - * - * @see Piwik_Sql::fetchAll - * - * @param string $sqlQuery SQL Query - * @param array $parameters Parameters to bind in the query, array( param1 => value1, param2 => value2) - * @return array (one row in the array per row fetched in the DB) - */ -function Piwik_FetchAll($sqlQuery, $parameters = array()) -{ - return Piwik_Sql::fetchAll($sqlQuery, $parameters); -} - -/** - * Fetches first row of result from the database query - * - * @see Piwik_Sql::fetchRow - * - * @param string $sqlQuery SQL Query - * @param array $parameters Parameters to bind in the query, array( param1 => value1, param2 => value2) - * @return array - */ -function Piwik_FetchRow($sqlQuery, $parameters = array()) -{ - return Piwik_Sql::fetchRow($sqlQuery, $parameters); -} - -/** - * Fetches first column of first row of result from the database query - * - * @see Piwik_Sql::fetchOne - * - * @param string $sqlQuery SQL Query - * @param array $parameters Parameters to bind in the query, array( param1 => value1, param2 => value2) - * @return string - */ -function Piwik_FetchOne($sqlQuery, $parameters = array()) -{ - return Piwik_Sql::fetchOne($sqlQuery, $parameters); -} - -/** - * Fetches result from the database query as an array of associative arrays. - * - * @param string $sqlQuery - * @param array $parameters Parameters to bind in the query, array( param1 => value1, param2 => value2) - * @return array - */ -function Piwik_FetchAssoc($sqlQuery, $parameters = array()) -{ - return Piwik_Sql::fetchAssoc($sqlQuery, $parameters); -} - -/** - * Deletes all desired rows in a table, while using a limit. This function will execute a - * DELETE query until there are no more rows to delete. - * - * @see Piwik_Sql::deleteAllRows - * - * @param string $table The name of the table to delete from. Must be prefixed. - * @param string $where The where clause of the query. Must include the WHERE keyword. - * @param int $maxRowsPerQuery The maximum number of rows to delete per DELETE query. - * @param array $parameters Parameters to bind in the query. - * @return int The total number of rows deleted. - */ -function Piwik_DeleteAllRows($table, $where, $maxRowsPerQuery, $parameters = array()) -{ - return Piwik_Sql::deleteAllRows($table, $where, $maxRowsPerQuery, $parameters); -} - -/** - * Runs an OPTIMIZE TABLE query on the supplied table or tables. The table names must be prefixed. - * - * @see Piwik_Sql::optimizeTables - * - * @param string|array $tables The name of the table to optimize or an array of tables to optimize. - * @return Zend_Db_Statement - */ -function Piwik_OptimizeTables($tables) -{ - return Piwik_Sql::optimizeTables($tables); -} - -/** - * Drops the supplied table or tables. The table names must be prefixed. - * - * @see Piwik_Sql::dropTables - * - * @param string|array $tables The name of the table to drop or an array of table names to drop. - * @return Zend_Db_Statement - */ -function Piwik_DropTables($tables) -{ - return Piwik_Sql::dropTables($tables); -} - -/** - * Locks the supplied table or tables. The table names must be prefixed. - * - * @see Piwik_Sql::lockTables - * - * @param string|array $tablesToRead The table or tables to obtain 'read' locks on. - * @param string|array $tablesToWrite The table or tables to obtain 'write' locks on. - * @return Zend_Db_Statement - */ -function Piwik_LockTables($tablesToRead, $tablesToWrite = array()) -{ - return Piwik_Sql::lockTables($tablesToRead, $tablesToWrite); -} - -/** - * Releases all table locks. - * - * @see Piwik_Sql::unlockAllTables - * - * @return Zend_Db_Statement - */ -function Piwik_UnlockAllTables() -{ - return Piwik_Sql::unlockAllTables(); -} - -/** - * Performs a SELECT on a table one chunk at a time and returns the first - * fetched value. - * - * This function will break up a SELECT into several smaller SELECTs and - * should be used when performing a SELECT that can take a long time to finish. - * Using several smaller SELECTs will ensure that the table will not be locked - * for too long. - * - * @see Piwik_Sql::segmentedFetchFirst - * - * @param string $sql The SQL to perform. The last two conditions of the WHERE - * expression must be as follows: 'id >= ? AND id < ?' where - * 'id' is the int id of the table. - * @param int $first The minimum ID to loop from. - * @param int $last The maximum ID to loop to. - * @param int $step The maximum number of rows to scan in each smaller SELECT. - * @param array $params Parameters to bind in the query, array( param1 => value1, param2 => value2) - * - * @return string - */ -function Piwik_SegmentedFetchFirst($sql, $first, $last, $step, $params = array()) -{ - return Piwik_Sql::segmentedFetchFirst($sql, $first, $last, $step, $params); -} - -/** - * Performs a SELECT on a table one chunk at a time and returns an array - * of every fetched value. - * - * This function will break up a SELECT into several smaller SELECTs and - * should be used when performing a SELECT that can take a long time to finish. - * Using several smaller SELECTs will ensure that the table will not be locked - * for too long. - * - * @see Piwik_Sql::segmentedFetchFirst - * - * @param string $sql The SQL to perform. The last two conditions of the WHERE - * expression must be as follows: 'id >= ? AND id < ?' where - * 'id' is the int id of the table. - * @param int $first The minimum ID to loop from. - * @param int $last The maximum ID to loop to. - * @param int $step The maximum number of rows to scan in each smaller SELECT. - * @param array $params Parameters to bind in the query, array( param1 => value1, param2 => value2) - * - * @return array - */ -function Piwik_SegmentedFetchOne($sql, $first, $last, $step, $params = array()) -{ - return Piwik_Sql::segmentedFetchOne($sql, $first, $last, $step, $params); -} - -/** - * Performs a SELECT on a table one chunk at a time and returns an array - * of every fetched row. - * - * This function will break up a SELECT into several smaller SELECTs and - * should be used when performing a SELECT that can take a long time to finish. - * Using several smaller SELECTs will ensure that the table will not be locked - * for too long. - * - * @see Piwik_Sql::segmentedFetchFirst - * - * @param string $sql The SQL to perform. The last two conditions of the WHERE - * expression must be as follows: 'id >= ? AND id < ?' where - * 'id' is the int id of the table. - * @param int $first The minimum ID to loop from. - * @param int $last The maximum ID to loop to. - * @param int $step The maximum number of rows to scan in each smaller SELECT. - * @param array $params Parameters to bind in the query, array( param1 => value1, param2 => value2) - * - * @return array - */ -function Piwik_SegmentedFetchAll($sql, $first, $last, $step, $params = array()) -{ - return Piwik_Sql::segmentedFetchAll($sql, $first, $last, $step, $params); -} - -/** - * Performs a query on a table one chunk at a time and returns an array of - * every fetched row. - * - * This function will break up a non-SELECT query (like an INSERT, UPDATE, or - * DELETE) into smaller queries and should be used when performing an operation - * that can take a long time to finish. Using several small queries will ensure - * that the table will not be locked for too long. - * - * @see Piwik_Sql::segmentedQuery - * - * @param string $sql The SQL to perform. The last two conditions of the WHERE - * expression must be as follows: 'id >= ? AND id < ?' where - * 'id' is the int id of the table. - * @param int $first The minimum ID to loop from. - * @param int $last The maximum ID to loop to. - * @param int $step The maximum number of rows to scan in each smaller query. - * @param array $params Parameters to bind in the query, array( param1 => value1, param2 => value2) - * - * @return array - */ -function Piwik_SegmentedQuery($sql, $first, $last, $step, $params = array()) -{ - return Piwik_Sql::segmentedQuery($sql, $first, $last, $step, $params); -} - -/** - * Attempts to get a named lock. This function uses a timeout of 1s, but will - * retry a set number of time. - * - * @see Piwik_Sql::getDbLock - * - * @param string $lockName The lock name. - * @param int $maxRetries The max number of times to retry. - * @return bool true if the lock was obtained, false if otherwise. - */ -function Piwik_GetDbLock($lockName, $maxRetries = 30) -{ - return Piwik_Sql::getDbLock($lockName, $maxRetries); -} - -/** - * Releases a named lock. - * - * @see Piwik_Sql::releaseDbLock - * - * @param string $lockName The lock name. - * @return bool true if the lock was released, false if otherwise. - */ -function Piwik_ReleaseDbLock($lockName) -{ - return Piwik_Sql::releaseDbLock($lockName); -} - diff --git a/core/Db/Adapter.php b/core/Db/Adapter.php index db9214b82a..e818866802 100644 --- a/core/Db/Adapter.php +++ b/core/Db/Adapter.php @@ -8,13 +8,17 @@ * @category Piwik * @package Piwik */ +namespace Piwik\Db; + +use Piwik\Db\AdapterInterface; use Piwik\Loader; +use Zend_Db_Table; /** * @package Piwik * @subpackage Piwik_Db */ -class Piwik_Db_Adapter +class Adapter { /** * Create adapter @@ -22,7 +26,7 @@ class Piwik_Db_Adapter * @param string $adapterName database adapter name * @param array $dbInfos database connection info * @param bool $connect - * @return Piwik_Db_Adapter_Interface + * @return AdapterInterface */ public static function factory($adapterName, & $dbInfos, $connect = true) { diff --git a/core/Db/Adapter/Mysqli.php b/core/Db/Adapter/Mysqli.php index 38495a2357..db923dbf99 100644 --- a/core/Db/Adapter/Mysqli.php +++ b/core/Db/Adapter/Mysqli.php @@ -9,12 +9,13 @@ * @package Piwik */ use Piwik\Config; +use Piwik\Db\AdapterInterface; /** * @package Piwik * @subpackage Piwik_Db */ -class Piwik_Db_Adapter_Mysqli extends Zend_Db_Adapter_Mysqli implements Piwik_Db_Adapter_Interface +class Piwik_Db_Adapter_Mysqli extends Zend_Db_Adapter_Mysqli implements AdapterInterface { /** * Constructor diff --git a/core/Db/Adapter/Pdo/Mssql.php b/core/Db/Adapter/Pdo/Mssql.php index 458a99fcc5..c77797b6c1 100644 --- a/core/Db/Adapter/Pdo/Mssql.php +++ b/core/Db/Adapter/Pdo/Mssql.php @@ -8,13 +8,23 @@ * @category Piwik * @package Piwik */ +namespace Piwik\Db\Adapter\Pdo; + +use Exception; +use PDO; +use PDOException; use Piwik\Config; +use Piwik\Db\Adapter\AdapterInterface; +use Zend_Db; +use Zend_Db_Adapter_Exception; +use Zend_Db_Adapter_Pdo_Mssql; +use Zend_Db_Profiler; /** * @package Piwik * @subpackage Piwik_Db */ -class Piwik_Db_Pdo_Mssql extends Zend_Db_Adapter_Pdo_Mssql implements Piwik_Db_Adapter_Interface +class Mssql extends Zend_Db_Adapter_Pdo_Mssql implements AdapterInterface { /** * Returns connection handle @@ -38,7 +48,7 @@ class Piwik_Db_Pdo_Mssql extends Zend_Db_Adapter_Pdo_Mssql implements Piwik_Db_A /** * @see Zend_Db_Adapter_Exception */ - throw new Zend_Db_Adapter_Exception('The PDO extension is required for this adapter but the extension is not loaded'); + throw new \Zend_Db_Adapter_Exception('The PDO extension is required for this adapter but the extension is not loaded'); } // check the PDO driver is available @@ -46,7 +56,7 @@ class Piwik_Db_Pdo_Mssql extends Zend_Db_Adapter_Pdo_Mssql implements Piwik_Db_A /** * @see Zend_Db_Adapter_Exception */ - throw new Zend_Db_Adapter_Exception('The ' . $this->_pdoType . ' driver is not currently installed'); + throw new \Zend_Db_Adapter_Exception('The ' . $this->_pdoType . ' driver is not currently installed'); } // create PDO connection @@ -71,7 +81,6 @@ class Piwik_Db_Pdo_Mssql extends Zend_Db_Adapter_Pdo_Mssql implements Piwik_Db_A $this->_connection = new PDO("sqlsrv:$serverName", $uid, $pwd, array('Database' => $database)); - if ($this->_connection === false) { die(self::FormatErrors(sqlsrv_errors())); } @@ -91,7 +100,6 @@ class Piwik_Db_Pdo_Mssql extends Zend_Db_Adapter_Pdo_Mssql implements Piwik_Db_A $this->_connection->setAttribute(PDO::ATTR_CASE, $this->_caseFolding); $this->_connection->setAttribute(PDO::SQLSRV_ENCODING_UTF8, true); - // always use exceptions. $this->_connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); @@ -100,7 +108,7 @@ class Piwik_Db_Pdo_Mssql extends Zend_Db_Adapter_Pdo_Mssql implements Piwik_Db_A /** * @see Zend_Db_Adapter_Exception */ - throw new Zend_Db_Adapter_Exception($e->getMessage(), $e->getCode(), $e); + throw new \Zend_Db_Adapter_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -134,7 +142,6 @@ class Piwik_Db_Pdo_Mssql extends Zend_Db_Adapter_Pdo_Mssql implements Piwik_Db_A if (version_compare($serverVersion, $requiredVersion) === -1) { throw new Exception(Piwik_TranslateException('General_ExceptionDatabaseVersion', array('MSSQL', $serverVersion, $requiredVersion))); } - } /** diff --git a/core/Db/Adapter/Pdo/Mysql.php b/core/Db/Adapter/Pdo/Mysql.php index c2ad0ea2d8..37dae1bee8 100644 --- a/core/Db/Adapter/Pdo/Mysql.php +++ b/core/Db/Adapter/Pdo/Mysql.php @@ -8,13 +8,23 @@ * @category Piwik * @package Piwik */ +namespace Piwik\Db\Adapter\Pdo; + +use Exception; +use PDO; +use PDOException; use Piwik\Config; +use Piwik\Db\Adapter\AdapterInterface; +use Zend_Config; +use Zend_Db_Adapter_Pdo_Mysql; +use Zend_Db_Select; +use Zend_Db_Statement_Interface; /** * @package Piwik * @subpackage Piwik_Db */ -class Piwik_Db_Adapter_Pdo_Mysql extends Zend_Db_Adapter_Pdo_Mysql implements Piwik_Db_Adapter_Interface +class Mysql extends Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface { /** * Constructor diff --git a/core/Db/Adapter/Pdo/Pgsql.php b/core/Db/Adapter/Pdo/Pgsql.php index f4e68dfde9..16baba2543 100644 --- a/core/Db/Adapter/Pdo/Pgsql.php +++ b/core/Db/Adapter/Pdo/Pgsql.php @@ -8,13 +8,20 @@ * @category Piwik * @package Piwik */ +namespace Piwik\Db\Adapter\Pdo; + +use Exception; +use PDO; +use PDOException; use Piwik\Config; +use Piwik\Db\Adapter\AdapterInterface; +use Zend_Db_Adapter_Pdo_Pgsql; /** * @package Piwik * @subpackage Piwik_Db */ -class Piwik_Db_Adapter_Pdo_Pgsql extends Zend_Db_Adapter_Pdo_Pgsql implements Piwik_Db_Adapter_Interface +class Pgsql extends Zend_Db_Adapter_Pdo_Pgsql implements AdapterInterface { /** * Reset the configuration variables in this adapter. diff --git a/core/Db/Adapter/Interface.php b/core/Db/AdapterInterface.php index bd81c0834d..e13a99769b 100644 --- a/core/Db/Adapter/Interface.php +++ b/core/Db/AdapterInterface.php @@ -9,11 +9,15 @@ * @package Piwik */ +namespace Piwik\Db; + +use Exception; + /** * @package Piwik * @subpackage Piwik_Db */ -interface Piwik_Db_Adapter_Interface +interface AdapterInterface { /** * Reset the configuration variables in this adapter. diff --git a/core/Db/Schema.php b/core/Db/Schema.php index fed20dfe28..261860c6a1 100644 --- a/core/Db/Schema.php +++ b/core/Db/Schema.php @@ -8,7 +8,10 @@ * @category Piwik * @package Piwik */ +namespace Piwik\Db; + use Piwik\Config; +use Piwik\Db\Schema\SchemaInterface; /** * Schema abstraction @@ -18,12 +21,12 @@ use Piwik\Config; * @package Piwik * @subpackage Piwik_Db */ -class Piwik_Db_Schema +class Schema { /** * Singleton instance * - * @var Piwik_Db_Schema + * @var \Piwik\Db\Schema */ static private $instance = null; @@ -35,9 +38,9 @@ class Piwik_Db_Schema private $schema = null; /** - * Returns the singleton Piwik_Db_Schema + * Returns the singleton Schema * - * @return Piwik_Db_Schema + * @return \Piwik\Db\Schema */ static public function getInstance() { @@ -145,9 +148,9 @@ class Piwik_Db_Schema } /** - * Returns an instance that subclasses Piwik_Db_Schema + * Returns an instance that subclasses Schema * - * @return Piwik_Db_Schema_Interface + * @return \Piwik\Db\Schema\SchemaInterface */ private function getSchema() { diff --git a/core/Db/Schema/Myisam.php b/core/Db/Schema/Myisam.php index 274e6f82e0..8a6ae12e07 100644 --- a/core/Db/Schema/Myisam.php +++ b/core/Db/Schema/Myisam.php @@ -8,10 +8,15 @@ * @category Piwik * @package Piwik */ +namespace Piwik\Db\Schema; + +use Exception; use Piwik\Config; +use Piwik\Db\Schema\SchemaInterface; use Piwik\Piwik; use Piwik\Common; use Piwik\Date; +use Zend_Registry; /** * MySQL schema @@ -19,7 +24,7 @@ use Piwik\Date; * @package Piwik * @subpackage Piwik_Db */ -class Piwik_Db_Schema_Myisam implements Piwik_Db_Schema_Interface +class Myisam implements SchemaInterface { /** * Is this MySQL storage engine available? @@ -92,7 +97,7 @@ class Piwik_Db_Schema_Myisam implements Piwik_Db_Schema_Interface excluded_ips TEXT NOT NULL, excluded_parameters TEXT NOT NULL, excluded_user_agents TEXT NOT NULL, - `group` VARCHAR(250) NOT NULL, + `group` VARCHAR(250) NOT NULL, keep_url_fragment TINYINT NOT NULL DEFAULT 0, PRIMARY KEY(idsite) ) DEFAULT CHARSET=utf8 @@ -197,7 +202,7 @@ class Piwik_Db_Schema_Myisam implements Piwik_Db_Schema_Interface visit_total_searches SMALLINT(5) UNSIGNED NOT NULL, visit_total_time SMALLINT(5) UNSIGNED NOT NULL, visit_goal_converted TINYINT(1) NOT NULL, - visit_goal_buyer TINYINT(1) NOT NULL, + visit_goal_buyer TINYINT(1) NOT NULL, referer_type TINYINT(1) UNSIGNED NULL, referer_name VARCHAR(70) NULL, referer_url TEXT NOT NULL, @@ -247,7 +252,7 @@ class Piwik_Db_Schema_Myisam implements Piwik_Db_Schema_Interface server_time DATETIME NOT NULL, idvisit INTEGER(10) UNSIGNED NOT NULL, idorder varchar(100) NOT NULL, - + idaction_sku INTEGER(10) UNSIGNED NOT NULL, idaction_name INTEGER(10) UNSIGNED NOT NULL, idaction_category INTEGER(10) UNSIGNED NOT NULL, @@ -258,7 +263,7 @@ class Piwik_Db_Schema_Myisam implements Piwik_Db_Schema_Interface price FLOAT NOT NULL, quantity INTEGER(10) UNSIGNED NOT NULL, deleted TINYINT(1) UNSIGNED NOT NULL, - + PRIMARY KEY(idvisit, idorder, idaction_sku), INDEX index_idsite_servertime ( idsite, server_time ) ) DEFAULT CHARSET=utf8 @@ -287,7 +292,7 @@ class Piwik_Db_Schema_Myisam implements Piwik_Db_Schema_Interface url text NOT NULL, idgoal int(10) NOT NULL, buster int unsigned NOT NULL, - + idorder varchar(100) default NULL, items SMALLINT UNSIGNED DEFAULT NULL, revenue float default NULL, @@ -295,7 +300,7 @@ class Piwik_Db_Schema_Myisam implements Piwik_Db_Schema_Interface revenue_tax float default NULL, revenue_shipping float default NULL, revenue_discount float default NULL, - + custom_var_k1 VARCHAR(200) DEFAULT NULL, custom_var_v1 VARCHAR(200) DEFAULT NULL, custom_var_k2 VARCHAR(200) DEFAULT NULL, @@ -493,7 +498,7 @@ class Piwik_Db_Schema_Myisam implements Piwik_Db_Schema_Interface if (is_null($dbName)) { $dbName = Config::getInstance()->database['dbname']; } - Piwik_Exec("CREATE DATABASE IF NOT EXISTS " . $dbName . " DEFAULT CHARACTER SET utf8"); + Db::exec("CREATE DATABASE IF NOT EXISTS " . $dbName . " DEFAULT CHARACTER SET utf8"); } /** @@ -502,7 +507,7 @@ class Piwik_Db_Schema_Myisam implements Piwik_Db_Schema_Interface public function dropDatabase() { $dbName = Config::getInstance()->database['dbname']; - Piwik_Exec("DROP DATABASE IF EXISTS " . $dbName); + Db::exec("DROP DATABASE IF EXISTS " . $dbName); } /** @@ -546,7 +551,7 @@ class Piwik_Db_Schema_Myisam implements Piwik_Db_Schema_Interface { $tablesAlreadyInstalled = $this->getTablesInstalled($forceReload = true); foreach ($tablesAlreadyInstalled as $table) { - Piwik_Query("TRUNCATE `$table`"); + Db::query("TRUNCATE `$table`"); } } diff --git a/core/Db/Schema/Interface.php b/core/Db/SchemaInterface.php index a56f79eb03..c8ad0eb340 100644 --- a/core/Db/Schema/Interface.php +++ b/core/Db/SchemaInterface.php @@ -9,13 +9,15 @@ * @package Piwik */ +namespace Piwik\Db; + /** * Database schema interface * * @package Piwik * @subpackage Piwik_Db */ -interface Piwik_Db_Schema_Interface +interface SchemaInterface { /** * Is this schema available? diff --git a/core/ExceptionHandler.php b/core/ExceptionHandler.php index c06bc3d5af..5b21d59e6e 100644 --- a/core/ExceptionHandler.php +++ b/core/ExceptionHandler.php @@ -9,6 +9,7 @@ * @package Piwik */ use Piwik\Piwik; +use Piwik\FrontController; /** * Exception handler used to display nicely exceptions in Piwik @@ -22,7 +23,7 @@ function Piwik_ExceptionHandler(Exception $exception) Zend_Registry::get('logger_exception')->logEvent($exception); } catch (Exception $e) { - if (Piwik_FrontController::shouldRethrowException()) { + if (FrontController::shouldRethrowException()) { throw $exception; } diff --git a/core/FrontController.php b/core/FrontController.php index 9d777ed4b6..1acd18820f 100644 --- a/core/FrontController.php +++ b/core/FrontController.php @@ -8,20 +8,16 @@ * @category Piwik * @package Piwik */ -use Piwik\Config; -use Piwik\Piwik; -use Piwik\Common; -use Piwik\Access; -use Piwik\Translate; -/** - * @see core/PluginsManager.php - * @see core/Translate.php - * @see core/Option.php - */ -require_once PIWIK_INCLUDE_PATH . '/core/PluginsManager.php'; -require_once PIWIK_INCLUDE_PATH . '/core/Translate.php'; -require_once PIWIK_INCLUDE_PATH . '/core/Option.php'; +namespace Piwik; +use \Piwik\NoAccessException; +use Exception; +use Piwik\API\Request; +use Piwik\API\ResponseBuilder; +use Piwik\Session; +use Piwik\Timer; +use Piwik\Url; +use Zend_Registry; /** * Front controller. @@ -31,9 +27,9 @@ require_once PIWIK_INCLUDE_PATH . '/core/Option.php'; * For a detailed explanation, see the documentation on http://piwik.org/docs/plugins/framework-overview * * @package Piwik - * @subpackage Piwik_FrontController + * @subpackage FrontController */ -class Piwik_FrontController +class FrontController { /** * Set to false and the Front Controller will not dispatch the request @@ -47,7 +43,7 @@ class Piwik_FrontController /** * returns singleton * - * @return Piwik_FrontController + * @return \Piwik\FrontController */ public static function getInstance() { @@ -83,10 +79,10 @@ class Piwik_FrontController $action = Common::getRequestVar('action', false); } - if (!Piwik_Session::isFileBasedSessions() + if (!Session::isFileBasedSessions() && ($module !== 'API' || ($action && $action !== 'index')) ) { - Piwik_Session::start(); + Session::start(); } if (is_null($parameters)) { @@ -128,7 +124,7 @@ class Piwik_FrontController try { return call_user_func_array(array($params[0], $params[1]), $params[2]); - } catch (Access_NoAccessException $e) { + } catch (\Piwik\NoAccessException $e) { Piwik_PostEvent('FrontController.NoAccessException', array($e), $pending = true); } catch (Exception $e) { $debugTrace = $e->getTraceAsString(); @@ -190,7 +186,7 @@ class Piwik_FrontController * * @return Exception */ - protected function createConfigObject() + public function createConfigObject() { $exceptionToThrow = false; try { @@ -221,9 +217,8 @@ class Piwik_FrontController } $initialized = true; - try { - Zend_Registry::set('timer', new Piwik_Timer); + Zend_Registry::set('timer', new Timer); $directoriesToCheck = array( '/tmp/', @@ -240,8 +235,8 @@ class Piwik_FrontController $exceptionToThrow = $this->createConfigObject(); - if (Piwik_Session::isFileBasedSessions()) { - Piwik_Session::start(); + if (Session::isFileBasedSessions()) { + Session::start(); } $this->handleMaintenanceMode(); @@ -256,7 +251,6 @@ class Piwik_FrontController throw $exceptionToThrow; } - try { Piwik::createDatabaseObject(); } catch (Exception $e) { @@ -267,7 +261,7 @@ class Piwik_FrontController throw $e; } - Piwik::createLogObject(); + \Piwik\Log::make(); // Init the Access object, so that eg. core/Updates/* can enforce Super User and use some APIs Access::getInstance(); @@ -286,16 +280,16 @@ class Piwik_FrontController $authAdapter = Zend_Registry::get('auth'); } catch (Exception $e) { throw new Exception("Authentication object cannot be found in the Registry. Maybe the Login plugin is not activated? - <br />You can activate the plugin by adding:<br /> - <code>Plugins[] = Login</code><br /> - under the <code>[Plugins]</code> section in your config/config.ini.php"); + <br />You can activate the plugin by adding:<br /> + <code>Plugins[] = Login</code><br /> + under the <code>[Plugins]</code> section in your config/config.ini.php"); } Access::getInstance()->reloadAccess($authAdapter); // Force the auth to use the token_auth if specified, so that embed dashboard // and all other non widgetized controller methods works fine if (($token_auth = Common::getRequestVar('token_auth', false, 'string')) !== false) { - Piwik_API_Request::reloadAuthUsingTokenAuth(); + Request::reloadAuthUsingTokenAuth(); } Piwik::raiseMemoryLimitIfNecessary(); @@ -334,7 +328,7 @@ class Piwik_FrontController if (empty($format)) { throw $exception; } - $response = new Piwik_API_ResponseBuilder($format); + $response = new ResponseBuilder($format); echo $response->getResponseException($exception); exit; } @@ -349,18 +343,19 @@ class Piwik_FrontController && !(Common::getRequestVar('module', '') == 'CoreAdminHome' && Common::getRequestVar('action', '') == 'optOut') ) { - $url = Piwik_Url::getCurrentUrl(); + $url = Url::getCurrentUrl(); $url = str_replace("http://", "https://", $url); - Piwik_Url::redirectToUrl($url); + Url::redirectToUrl($url); } } } + /** * Exception thrown when the requested plugin is not activated in the config file * * @package Piwik - * @subpackage Piwik_FrontController + * @subpackage FrontController */ class Piwik_FrontController_PluginDeactivatedException extends Exception { @@ -370,3 +365,4 @@ class Piwik_FrontController_PluginDeactivatedException extends Exception } } + diff --git a/core/HTMLPurifier.php b/core/HTMLPurifier.php deleted file mode 100644 index 33095f2f52..0000000000 --- a/core/HTMLPurifier.php +++ /dev/null @@ -1,50 +0,0 @@ -<?php -/** - * Piwik - Open source web analytics - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - * @category Piwik - * @package Piwik - */ - -/** - * HTML Purifier class wrapper. - * - * @package Piwik - */ -class Piwik_HTMLPurifier -{ - private static $instance = null; - - /** - * Returns the singleton HTMLPurifier or a mock object - * - * @return HTMLPurifier|Piwik_HTMLPurifier - */ - public static function getInstance() - { - if (self::$instance == null) { - if (file_exists(PIWIK_INCLUDE_PATH . '/libs/HTMLPurifier.php')) { - if (!class_exists('HTMLPurifier_Bootstrap', false)) { - HTMLPurifier_Bootstrap::registerAutoload(); - } - - $config = HTMLPurifier_Config::createDefault(); - $config->set('Cache.SerializerPath', PIWIK_USER_PATH . '/tmp/purifier'); - - self::$instance = new HTMLPurifier($config); - } else { - $c = __CLASS__; - self::$instance = new $c(); - } - } - return self::$instance; - } - - public function purify($html, $config = null) - { - return $html; - } -} diff --git a/core/Http.php b/core/Http.php index de30bf3b2f..df00fce2a1 100644 --- a/core/Http.php +++ b/core/Http.php @@ -8,9 +8,14 @@ * @category Piwik * @package Piwik */ +namespace Piwik; + +use Exception; use Piwik\Config; use Piwik\Piwik; use Piwik\Common; +use Piwik\IP; +use Piwik\Version; /** * Server-side http client to retrieve content from remote servers, and optionally save to a local file. @@ -18,7 +23,7 @@ use Piwik\Common; * * @package Piwik */ -class Piwik_Http +class Http { /** * Get "best" available transport method for sendHttpRequest() calls. @@ -55,16 +60,16 @@ class Piwik_Http * If no $destinationPath is specified, the trimmed response (without header) is returned as a string. * If a $destinationPath is specified, the response (without header) is saved to a file. * - * @param string $aUrl - * @param int $timeout - * @param string $userAgent - * @param string $destinationPath - * @param int $followDepth - * @param bool $acceptLanguage + * @param string $aUrl + * @param int $timeout + * @param string $userAgent + * @param string $destinationPath + * @param int $followDepth + * @param bool $acceptLanguage * @param array|bool $byteRange For Range: header. Should be two element array of bytes, eg, array(0, 1024) * Doesn't work w/ fopen method. - * @param bool $getExtendedInfo True to return status code, headers & response, false if just response. - * @param string $httpMethod The HTTP method to use. Defaults to 'GET'. + * @param bool $getExtendedInfo True to return status code, headers & response, false if just response. + * @param string $httpMethod The HTTP method to use. Defaults to 'GET'. * * @throws Exception * @return bool true (or string) on success; false on HTTP response error code (1xx or 4xx) @@ -88,19 +93,19 @@ class Piwik_Http /** * Sends http request using the specified transport method * - * @param string $method - * @param string $aUrl - * @param int $timeout - * @param string $userAgent - * @param string $destinationPath - * @param resource $file - * @param int $followDepth + * @param string $method + * @param string $aUrl + * @param int $timeout + * @param string $userAgent + * @param string $destinationPath + * @param resource $file + * @param int $followDepth * @param bool|string $acceptLanguage Accept-language header - * @param bool $acceptInvalidSslCertificate Only used with $method == 'curl'. If set to true (NOT recommended!) the SSL certificate will not be checked - * @param array|bool $byteRange For Range: header. Should be two element array of bytes, eg, array(0, 1024) + * @param bool $acceptInvalidSslCertificate Only used with $method == 'curl'. If set to true (NOT recommended!) the SSL certificate will not be checked + * @param array|bool $byteRange For Range: header. Should be two element array of bytes, eg, array(0, 1024) * Doesn't work w/ fopen method. - * @param bool $getExtendedInfo True to return status code, headers & response, false if just response. - * @param string $httpMethod The HTTP method to use. Defaults to 'GET'. + * @param bool $getExtendedInfo True to return status code, headers & response, false if just response. + * @param string $httpMethod The HTTP method to use. Defaults to 'GET'. * * @throws Exception * @return bool true (or string/array) on success; false on HTTP response error code (1xx or 4xx) @@ -130,7 +135,7 @@ class Piwik_Http // Piwik services behave like a proxy, so we should act like one. $xff = 'X-Forwarded-For: ' . (isset($_SERVER['HTTP_X_FORWARDED_FOR']) && !empty($_SERVER['HTTP_X_FORWARDED_FOR']) ? $_SERVER['HTTP_X_FORWARDED_FOR'] . ',' : '') - . Piwik_IP::getIpFromHeader(); + . IP::getIpFromHeader(); if (empty($userAgent)) { $userAgent = self::getUserAgent(); @@ -138,7 +143,7 @@ class Piwik_Http $via = 'Via: ' . (isset($_SERVER['HTTP_VIA']) && !empty($_SERVER['HTTP_VIA']) ? $_SERVER['HTTP_VIA'] . ', ' : '') - . Piwik_Version::VERSION . ' ' + . Version::VERSION . ' ' . ($userAgent ? " ($userAgent)" : ''); // range header @@ -450,7 +455,6 @@ class Piwik_Http @curl_setopt_array($ch, $curl_options); self::configCurlCertificate($ch); - /* * as of php 5.2.0, CURLOPT_FOLLOWLOCATION can't be set if * in safe_mode or open_basedir is set @@ -540,7 +544,7 @@ class Piwik_Http * * @param string $url The url to download from. * @param string $outputPath The path to the file to save/append to. - * @param bool $isContinuation True if this is the continuation of a download, + * @param bool $isContinuation True if this is the continuation of a download, * or if we're starting a fresh one. * * @throws Exception @@ -560,7 +564,7 @@ class Piwik_Http // if we're starting a download, get the expected file size & save as an option $downloadOption = $outputPath . '_expectedDownloadSize'; if (!$isContinuation) { - $expectedFileSizeResult = Piwik_Http::sendHttpRequest( + $expectedFileSizeResult = Http::sendHttpRequest( $url, $timeout = 300, $userAgent = null, @@ -601,7 +605,7 @@ class Piwik_Http } // download a chunk of the file - $result = Piwik_Http::sendHttpRequest( + $result = Http::sendHttpRequest( $url, $timeout = 300, $userAgent = null, @@ -650,7 +654,7 @@ class Piwik_Http { return !empty($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] - : 'Piwik/' . Piwik_Version::VERSION; + : 'Piwik/' . Version::VERSION; } /** diff --git a/core/IP.php b/core/IP.php index 2fa60ca33d..e1fecf600d 100644 --- a/core/IP.php +++ b/core/IP.php @@ -9,31 +9,11 @@ * @package Piwik */ +namespace Piwik; + use Piwik\Config; use Piwik\Common; - -if (Common::isWindows() || !function_exists('inet_ntop')) { - function _inet_ntop($in_addr) - { - return php_compat_inet_ntop($in_addr); - } -} else { - function _inet_ntop($in_addr) - { - return inet_ntop($in_addr); - } -} -if (Common::isWindows() || !function_exists('inet_pton')) { - function _inet_pton($address) - { - return php_compat_inet_pton($address); - } -} else { - function _inet_pton($address) - { - return inet_pton($address); - } -} +use false; /** * Handling IP addresses (both IPv4 and IPv6). @@ -52,7 +32,7 @@ if (Common::isWindows() || !function_exists('inet_pton')) { * * @package Piwik */ -class Piwik_IP +class IP { const MAPPED_IPv4_START = '::ffff:'; @@ -134,7 +114,7 @@ class Piwik_IP } // single IP - if (($ip = @_inet_pton($ipRangeString)) === false) + if (($ip = @self::_inet_pton($ipRangeString)) === false) return false; $maxbits = Common::strlen($ip) * 8; @@ -157,7 +137,7 @@ class Piwik_IP public static function P2N($ipString) { // use @inet_pton() because it throws an exception and E_WARNING on invalid input - $ip = @_inet_pton($ipString); + $ip = @self::_inet_pton($ipString); return $ip === false ? "\x00\x00\x00\x00" : $ip; } @@ -172,7 +152,7 @@ class Piwik_IP public static function N2P($ip) { // use @inet_ntop() because it throws an exception and E_WARNING on invalid input - $ipStr = @_inet_ntop($ip); + $ipStr = @self::_inet_ntop($ip); return $ipStr === false ? '0.0.0.0' : $ipStr; } @@ -293,7 +273,7 @@ class Piwik_IP $bits = substr($ipRange, $pos + 1); $range = substr($ipRange, 0, $pos); - $high = $low = @_inet_pton($range); + $high = $low = @self::_inet_pton($range); if ($low === false) { return false; } @@ -435,7 +415,6 @@ class Piwik_IP /** * Get hostname for a given IP address * - * @todo Remove in 2.0? * @param string $ipStr Human-readable IP address * @return string Hostname or unmodified $ipStr if failure */ @@ -446,154 +425,172 @@ class Piwik_IP $host = strtolower(@gethostbyaddr($ipStr)); return $host === '' ? $ipStr : $host; } -} -/** - * Converts a packed internet address to a human readable representation - * - * @link http://php.net/inet_ntop - * - * @param string $in_addr 32-bit IPv4 or 128-bit IPv6 address - * @return string|false string representation of address or false on failure - */ -function php_compat_inet_ntop($in_addr) -{ - $r = bin2hex($in_addr); - - switch (Common::strlen($in_addr)) { - case 4: - // IPv4 address - $prefix = ''; - break; - - case 16: - // IPv4-mapped address - if (substr_compare($r, '00000000000000000000ffff', 0, 24) === 0) { - $prefix = '::ffff:'; - $r = substr($r, 24); - break; - } + static private function _inet_ntop($in_addr) + { + if (Common::isWindows() || !function_exists('inet_ntop')) { + return self::php_compat_inet_ntop($in_addr); + } else { + return inet_ntop($in_addr); + } + } - // IPv4-compat address - if (substr_compare($r, '000000000000000000000000', 0, 24) === 0 && - substr_compare($r, '0000', 24, 4) !== 0 - ) { - $prefix = '::'; - $r = substr($r, 24); + static private function _inet_pton($address) + { + if (Common::isWindows() || !function_exists('inet_pton')) { + return self::php_compat_inet_pton($address); + } else { + return inet_pton($address); + } + } + + /** + * Converts a packed internet address to a human readable representation + * + * @link http://php.net/inet_ntop + * + * @param string $in_addr 32-bit IPv4 or 128-bit IPv6 address + * @return string|false string representation of address or false on failure + */ + static public function php_compat_inet_ntop($in_addr) + { + $r = bin2hex($in_addr); + + switch (Common::strlen($in_addr)) { + case 4: + // IPv4 address + $prefix = ''; break; - } - $r = str_split($r, 4); - $r = implode(':', $r); - - // compress leading zeros - $r = preg_replace( - '/(^|:)0{1,3}/', - '$1', - $r - ); - - // compress longest (and leftmost) consecutive groups of zeros - if (preg_match_all('/(?:^|:)(0(:|$))+/D', $r, $matches)) { - $longestMatch = 0; - foreach ($matches[0] as $aMatch) { - if (strlen($aMatch) > strlen($longestMatch)) { - $longestMatch = $aMatch; - } + case 16: + // IPv4-mapped address + if (substr_compare($r, '00000000000000000000ffff', 0, 24) === 0) { + $prefix = '::ffff:'; + $r = substr($r, 24); + break; } - $r = substr_replace($r, '::', strpos($r, $longestMatch), strlen($longestMatch)); - } - return $r; + // IPv4-compat address + if (substr_compare($r, '000000000000000000000000', 0, 24) === 0 && + substr_compare($r, '0000', 24, 4) !== 0 + ) { + $prefix = '::'; + $r = substr($r, 24); + break; + } - default: - return false; - } + $r = str_split($r, 4); + $r = implode(':', $r); + + // compress leading zeros + $r = preg_replace( + '/(^|:)0{1,3}/', + '$1', + $r + ); + + // compress longest (and leftmost) consecutive groups of zeros + if (preg_match_all('/(?:^|:)(0(:|$))+/D', $r, $matches)) { + $longestMatch = 0; + foreach ($matches[0] as $aMatch) { + if (strlen($aMatch) > strlen($longestMatch)) { + $longestMatch = $aMatch; + } + } + $r = substr_replace($r, '::', strpos($r, $longestMatch), strlen($longestMatch)); + } - $r = str_split($r, 2); - $r = array_map('hexdec', $r); - $r = implode('.', $r); - return $prefix . $r; -} + return $r; -/** - * Converts a human readable IP address to its packed in_addr representation - * - * @link http://php.net/inet_pton - * - * @param string $address a human readable IPv4 or IPv6 address - * @return string in_addr representation or false on failure - */ -function php_compat_inet_pton($address) -{ - // IPv4 (or IPv4-compat, or IPv4-mapped) - if (preg_match('/(^|:)([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)$/iD', $address, $matches)) { - for ($i = count($matches); $i-- > 2;) { - if ($matches[$i] > 255 || - ($matches[$i][0] == '0' && strlen($matches[$i]) > 1) - ) { + default: return false; - } } - if (empty($matches[1])) { - $r = ip2long($address); - if ($r === false) { - return false; + $r = str_split($r, 2); + $r = array_map('hexdec', $r); + $r = implode('.', $r); + return $prefix . $r; + } + + /** + * Converts a human readable IP address to its packed in_addr representation + * + * @link http://php.net/inet_pton + * + * @param string $address a human readable IPv4 or IPv6 address + * @return string in_addr representation or false on failure + */ + static public function php_compat_inet_pton($address) + { + // IPv4 (or IPv4-compat, or IPv4-mapped) + if (preg_match('/(^|:)([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)$/iD', $address, $matches)) { + for ($i = count($matches); $i-- > 2;) { + if ($matches[$i] > 255 || + ($matches[$i][0] == '0' && strlen($matches[$i]) > 1) + ) { + return false; + } } - return pack('N', $r); - } + if (empty($matches[1])) { + $r = ip2long($address); + if ($r === false) { + return false; + } - $suffix = sprintf("%02x%02x:%02x%02x", $matches[2], $matches[3], $matches[4], $matches[5]); - $address = substr_replace($address, $matches[1] . $suffix, strrpos($address, $matches[0])); - } + return pack('N', $r); + } - // IPv6 - if (strpos($address, ':') === false || - strspn($address, '01234567890abcdefABCDEF:') !== strlen($address) - ) { - return false; - } + $suffix = sprintf("%02x%02x:%02x%02x", $matches[2], $matches[3], $matches[4], $matches[5]); + $address = substr_replace($address, $matches[1] . $suffix, strrpos($address, $matches[0])); + } - if (substr($address, 0, 2) == '::') { - $address = '0' . $address; - } + // IPv6 + if (strpos($address, ':') === false || + strspn($address, '01234567890abcdefABCDEF:') !== strlen($address) + ) { + return false; + } - if (substr($address, -2) == '::') { - $address .= '0'; - } + if (substr($address, 0, 2) == '::') { + $address = '0' . $address; + } - $r = explode(':', $address); - $count = count($r); + if (substr($address, -2) == '::') { + $address .= '0'; + } - // grouped zeros - if (strpos($address, '::') !== false - && $count < 8 - ) { - $zeroGroup = array_search('', $r, 1); + $r = explode(':', $address); + $count = count($r); - // we're replacing this cell, so we splice (8 - $count + 1) cells containing '0' - array_splice($r, $zeroGroup, 1, array_fill(0, 9 - $count, '0')); - } + // grouped zeros + if (strpos($address, '::') !== false + && $count < 8 + ) { + $zeroGroup = array_search('', $r, 1); - // guard against excessive ':' or '::' - if ($count > 8 || - array_search('', $r, 1) !== false - ) { - return false; - } + // we're replacing this cell, so we splice (8 - $count + 1) cells containing '0' + array_splice($r, $zeroGroup, 1, array_fill(0, 9 - $count, '0')); + } - // leading zeros - foreach ($r as $v) { - if (strlen(ltrim($v, '0')) > 4) { + // guard against excessive ':' or '::' + if ($count > 8 || + array_search('', $r, 1) !== false + ) { return false; } - } - $r = array_map('hexdec', $r); - array_unshift($r, 'n*'); - $r = call_user_func_array('pack', $r); + // leading zeros + foreach ($r as $v) { + if (strlen(ltrim($v, '0')) > 4) { + return false; + } + } - return $r; + $r = array_map('hexdec', $r); + array_unshift($r, 'n*'); + $r = call_user_func_array('pack', $r); + + return $r; + } } diff --git a/core/JqplotDataGenerator.php b/core/JqplotDataGenerator.php index 4ae3c493b2..76d48f5f19 100644 --- a/core/JqplotDataGenerator.php +++ b/core/JqplotDataGenerator.php @@ -9,57 +9,64 @@ * @package Piwik */ +namespace Piwik; + +use Exception; use Piwik\Common; +use Piwik\JqplotDataGenerator\Evolution; use Piwik\Metrics; use Piwik\DataTable; +use Piwik_Visualization; +use Piwik_Visualization_Chart_Pie; +use Piwik_Visualization_Chart_VerticalBar; /** * Generates JSON data used to configure and populate JQPlot graphs. - * + * * Supports pie graphs, bar graphs and time serieses (aka, evolution graphs). */ -class Piwik_JqplotDataGenerator +class JqplotDataGenerator { /** * View properties. @see Piwik_ViewDataTable for more info. - * + * * @var array */ protected $properties; - + /** * This object does most of the work in generating the JQPlot JSON data. - * + * * @var Piwik_Visualization */ protected $visualization; - + /** * Creates a new JqplotDataGenerator instance for a graph type and view properties. - * + * * @param string $type 'pie', 'bar', or 'evolution' * @param array $properties The view properties. - * @return Piwik_JqplotDataGenerator + * @return \Piwik\JqplotDataGenerator */ public static function factory($type, $properties) { switch ($type) { case 'evolution': - return new Piwik_JqplotDataGenerator_Evolution($properties); + return new Evolution($properties); case 'pie': $visualization = new Piwik_Visualization_Chart_Pie(); - return new Piwik_JqplotDataGenerator($visualization, $properties); + return new JqplotDataGenerator($visualization, $properties); case 'bar': $visualization = new Piwik_Visualization_Chart_VerticalBar(); - return new Piwik_JqplotDataGenerator($visualization, $properties); + return new JqplotDataGenerator($visualization, $properties); default: throw new Exception("Unknown JqplotDataGenerator type '$type'."); } } - + /** * Constructor. - * + * * @param Piwik_Visualization $visualization * @param array $properties */ @@ -68,10 +75,10 @@ class Piwik_JqplotDataGenerator $this->visualization = $visualization; $this->properties = $properties; } - + /** * Generates JSON graph data and returns it. - * + * * @param DataTable|DataTable\Map $dataTable * @return string */ @@ -80,9 +87,9 @@ class Piwik_JqplotDataGenerator if (!empty($this->properties['graph_limit'])) { $offsetStartSummary = $this->properties['graph_limit'] - 1; $sortColumn = !empty($this->properties['filter_sort_column']) - ? $this->properties['filter_sort_column'] - : Metrics::INDEX_NB_VISITS; - + ? $this->properties['filter_sort_column'] + : Metrics::INDEX_NB_VISITS; + $dataTable->filter( 'AddSummaryRow', array($offsetStartSummary, Piwik_Translate('General_Others'), $sortColumn)); } @@ -93,12 +100,12 @@ class Piwik_JqplotDataGenerator if (!empty($this->properties['add_total_row'])) { $dataTable->queueFilter('AddSummaryRow', array(0, Piwik_Translate('General_Total'), null, false)); } - + $this->initChartObjectData($dataTable); } - + $this->visualization->customizeChartProperties(); - + return $this->visualization->render(); } @@ -110,7 +117,7 @@ class Piwik_JqplotDataGenerator $dataTable->filter('ColumnCallbackReplace', array('label', 'urldecode')); $xLabels = $dataTable->getColumn('label'); - + $columnNames = $this->properties['columns_to_display']; if (($labelColumnIndex = array_search('label', $columnNames)) !== false) { unset($columnNames[$labelColumnIndex]); @@ -119,10 +126,10 @@ class Piwik_JqplotDataGenerator $columnNameToTranslation = $columnNameToValue = array(); foreach ($columnNames as $columnName) { $columnNameToTranslation[$columnName] = @$this->properties['translations'][$columnName]; - + $columnNameToValue[$columnName] = $dataTable->getColumn($columnName); } - + $visualization = $this->visualization; $visualization->setAxisXLabels($xLabels); $visualization->setAxisYValues($columnNameToValue); @@ -151,20 +158,20 @@ class Piwik_JqplotDataGenerator $unit = $this->properties['y_axis_unit']; } } - + // the bar charts contain the labels a first series // this series has to be removed from the units if ($this->visualization instanceof Piwik_Visualization_Chart_VerticalBar) { array_shift($units); } - + return $units; } private function deriveUnitsFromRequestedColumnNames() { $idSite = Common::getRequestVar('idSite', null, 'int'); - + $units = array(); foreach ($this->properties['columns_to_display'] as $columnName) { $derivedUnit = Metrics::getUnit($columnName, $idSite); @@ -190,7 +197,7 @@ class Piwik_JqplotDataGenerator 'displayed' => in_array($column, $this->properties['columns_to_display']) ); } - + $this->visualization->setSelectableColumns( $selectableColumns, $this->properties['allow_multi_select_series_picker']); } diff --git a/core/JqplotDataGenerator/Evolution.php b/core/JqplotDataGenerator/Evolution.php index 47c85f0724..218b0da890 100644 --- a/core/JqplotDataGenerator/Evolution.php +++ b/core/JqplotDataGenerator/Evolution.php @@ -8,17 +8,23 @@ * @category Piwik * @package Piwik */ +namespace Piwik\JqplotDataGenerator; + use Piwik\Piwik; use Piwik\Common; use Piwik\DataTable; +use Piwik\ViewDataTable; +use Piwik\Url; +use Piwik\JqplotDataGenerator; +use Piwik_Visualization_Chart_Evolution; /** * Generates JQPlot JSON data/config for evolution graphs. */ -class Piwik_JqplotDataGenerator_Evolution extends Piwik_JqplotDataGenerator +class Evolution extends JqplotDataGenerator { protected $rowPickerConfig = array(); - + /** * Constructor. */ @@ -89,7 +95,7 @@ class Piwik_JqplotDataGenerator_Evolution extends Piwik_JqplotDataGenerator $yAxisLabelToValueCleaned[$yAxisLabel][] = $columnValue; } } - + $visualization = $this->visualization; $visualization->setAxisXLabels($xLabels); $visualization->setAxisYValues($yAxisLabelToValueCleaned); @@ -113,14 +119,14 @@ class Piwik_JqplotDataGenerator_Evolution extends Piwik_JqplotDataGenerator 'idSite' => $idSite, 'period' => $period->getLabel(), 'date' => $dateInUrl->toString(), - 'segment' => Piwik_ViewDataTable::getRawSegmentFromRequest() + 'segment' => ViewDataTable::getRawSegmentFromRequest() ); $hash = ''; if (!empty($queryStringAsHash)) { - $hash = '#' . Piwik_Url::getQueryStringFromParameters($queryStringAsHash + $parameters); + $hash = '#' . Url::getQueryStringFromParameters($queryStringAsHash + $parameters); } $link = 'index.php?' . - Piwik_Url::getQueryStringFromParameters(array( + Url::getQueryStringFromParameters(array( 'module' => 'CoreHome', 'action' => 'index', ) + $parameters) @@ -131,7 +137,7 @@ class Piwik_JqplotDataGenerator_Evolution extends Piwik_JqplotDataGenerator } $this->addSeriesPickerToView(); - + // configure the row picker if ($this->properties['row_picker_mach_rows_by'] !== false) { $visualization->setSelectableRows(array_values($this->rowPickerConfig)); @@ -204,12 +210,12 @@ class Piwik_JqplotDataGenerator_Evolution extends Piwik_JqplotDataGenerator */ private function getQueryStringAsHash() { - $queryString = Piwik_Url::getArrayFromCurrentQueryString(); + $queryString = Url::getArrayFromCurrentQueryString(); $piwikParameters = array('idSite', 'date', 'period', 'XDEBUG_SESSION_START', 'KEY'); foreach ($piwikParameters as $parameter) { unset($queryString[$parameter]); } - if (Piwik_IsMenuUrlFound($queryString)) { + if (Piwik_Menu_Main::getInstance()->isUrlFound($queryString)) { return $queryString; } return false; diff --git a/core/Log.php b/core/Log.php index 2228ec9dae..18fe490f13 100644 --- a/core/Log.php +++ b/core/Log.php @@ -8,17 +8,23 @@ * @category Piwik * @package Piwik */ +namespace Piwik; use Piwik\Config; use Piwik\Common; +use Piwik\Log\Exception; +use Piwik\Log\Error; +use Piwik\Log\APICall; +use Piwik\Log\Message; + /** * * @package Piwik - * @subpackage Piwik_Log + * @subpackage Log * @see Zend_Log, libs/Zend/Log.php * @link http://framework.zend.com/manual/en/zend.log.html */ -abstract class Piwik_Log extends Zend_Log +abstract class Log extends \Zend_Log { protected $logToDatabaseTableName = null; protected $logToDatabaseColumnMapping = null; @@ -52,20 +58,20 @@ abstract class Piwik_Log extends Zend_Log function addWriteToFile() { Common::mkdir(dirname($this->logToFileFilename)); - $writerFile = new Zend_Log_Writer_Stream($this->logToFileFilename); + $writerFile = new \Zend_Log_Writer_Stream($this->logToFileFilename); $writerFile->setFormatter($this->fileFormatter); $this->addWriter($writerFile); } function addWriteToNull() { - $this->addWriter(new Zend_Log_Writer_Null); + $this->addWriter(new \Zend_Log_Writer_Null); } function addWriteToDatabase() { - $writerDb = new Zend_Log_Writer_Db( - Zend_Registry::get('db'), + $writerDb = new \Zend_Log_Writer_Db( + \Zend_Registry::get('db'), $this->logToDatabaseTableName, $this->logToDatabaseColumnMapping); @@ -74,7 +80,7 @@ abstract class Piwik_Log extends Zend_Log function addWriteToScreen() { - $writerScreen = new Zend_Log_Writer_Stream('php://output'); + $writerScreen = new \Zend_Log_Writer_Stream('php://output'); $writerScreen->setFormatter($this->screenFormatter); $this->addWriter($writerScreen); } @@ -96,7 +102,7 @@ abstract class Piwik_Log extends Zend_Log { // sanity checks if (empty($this->_writers)) { - throw new Zend_Log_Exception('No writers were added'); + throw new \Zend_Log_Exception('No writers were added'); } $event['timestamp'] = date('Y-m-d H:i:s'); @@ -139,56 +145,55 @@ abstract class Piwik_Log extends Zend_Log } } -} -/** - * - * @package Piwik - * @subpackage Piwik_Log - */ -class Piwik_Log_Formatter_FileFormatter implements Zend_Log_Formatter_Interface -{ /** - * Formats data into a single line to be written by the writer. - * - * @param array $event event data - * @return string formatted line to write to the log + * Create log object + * @throws Exception */ - public function format($event) + static public function make() { - foreach ($event as &$value) { - $value = str_replace("\n", '\n', $value); - $value = '"' . $value . '"'; + $configAPI = Config::getInstance()->log; + + $aLoggers = array( + 'logger_api_call' => new APICall, + 'logger_exception' => new Exception, + 'logger_error' => new Error, + 'logger_message' => new Message, + ); + + foreach ($configAPI as $loggerType => $aRecordTo) { + if (isset($aLoggers[$loggerType])) { + $logger = $aLoggers[$loggerType]; + + foreach ($aRecordTo as $recordTo) { + switch ($recordTo) { + case 'screen': + $logger->addWriteToScreen(); + break; + + case 'database': + $logger->addWriteToDatabase(); + break; + + case 'file': + $logger->addWriteToFile(); + break; + + default: + throw new Exception("'$recordTo' is not a valid Log type. Valid logger types are: screen, database, file."); + break; + } + } + } } - $ts = $event['timestamp']; - unset($event['timestamp']); - return $ts . ' ' . implode(" ", $event) . "\n"; - } -} - -/** - * - * @package Piwik - * @subpackage Piwik_Log - */ -class Piwik_Log_Formatter_ScreenFormatter implements Zend_Log_Formatter_Interface -{ - function formatEvent($event) - { - // no injection in error messages, backtrace when displayed on screen - return array_map(array('Piwik\Common', 'sanitizeInputValue'), $event); - } - function format($string) - { - return self::getFormattedString($string); - } - - static public function getFormattedString($string) - { - if (!Common::isPhpCliMode()) { - @header('Content-Type: text/html; charset=utf-8'); + foreach ($aLoggers as $loggerType => $logger) { + if ($logger->getWritersCount() == 0) { + $logger->addWriteToNull(); + } + \Zend_Registry::set($loggerType, $logger); } - return $string; } + } + diff --git a/core/Log/APICall.php b/core/Log/APICall.php index 07e5bb25ff..39398b92ba 100644 --- a/core/Log/APICall.php +++ b/core/Log/APICall.php @@ -8,14 +8,18 @@ * @category Piwik * @package Piwik */ +namespace Piwik\Log; + +use Piwik\IP; +use Piwik\Log; /** * Class used to log all the API Calls information (class / method / parameters / returned value / time spent) * * @package Piwik - * @subpackage Piwik_Log + * @subpackage Log */ -class Piwik_Log_APICall extends Piwik_Log +class APICall extends Log { const ID = 'logger_api_call'; @@ -36,8 +40,8 @@ class Piwik_Log_APICall extends Piwik_Log 'timestamp' => 'timestamp', 'returned_value' => 'returned_value' ); - $screenFormatter = new Piwik_Log_APICall_Formatter_ScreenFormatter(); - $fileFormatter = new Piwik_Log_Formatter_FileFormatter(); + $screenFormatter = new APICall_Formatter_ScreenFormatter(); + $fileFormatter = new Formatter_FileFormatter(); parent::__construct($logToFileFilename, $fileFormatter, @@ -45,7 +49,7 @@ class Piwik_Log_APICall extends Piwik_Log $logToDatabaseTableName, $logToDatabaseColumnMapping); - $this->setEventItem('caller_ip', Piwik_IP::P2N(Piwik_IP::getIpFromHeader())); + $this->setEventItem('caller_ip', IP::P2N(IP::getIpFromHeader())); } /** @@ -67,7 +71,7 @@ class Piwik_Log_APICall extends Piwik_Log $event['parameter_values'] = serialize($parameterValues); $event['execution_time'] = $executionTime; $event['returned_value'] = is_array($returnedValue) ? serialize($returnedValue) : $returnedValue; - parent::log($event, Piwik_Log::INFO, null); + parent::log($event, Log::INFO, null); } } @@ -75,9 +79,9 @@ class Piwik_Log_APICall extends Piwik_Log * Class used to format the API Call log on the screen. * * @package Piwik - * @subpackage Piwik_Log + * @subpackage Log */ -class Piwik_Log_APICall_Formatter_ScreenFormatter extends Piwik_Log_Formatter_ScreenFormatter +class APICall_Formatter_ScreenFormatter extends Formatter_ScreenFormatter { /** * Formats data into a single line to be written by the writer. diff --git a/core/Log/Error.php b/core/Log/Error.php index bd54c8e6f0..609227080e 100644 --- a/core/Log/Error.php +++ b/core/Log/Error.php @@ -8,14 +8,17 @@ * @category Piwik * @package Piwik */ +namespace Piwik\Log; +use Piwik\Log; +use Zend_Log_Writer_Stream; /** * Class used to log an error event. * * @package Piwik - * @subpackage Piwik_Log + * @subpackage Log */ -class Piwik_Log_Error extends Piwik_Log +class Error extends Log { const ID = 'logger_error'; @@ -34,8 +37,8 @@ class Piwik_Log_Error extends Piwik_Log 'errfile' => 'errfile', 'backtrace' => 'backtrace' ); - $screenFormatter = new Piwik_Log_Error_Formatter_ScreenFormatter(); - $fileFormatter = new Piwik_Log_Formatter_FileFormatter(); + $screenFormatter = new Error_Formatter_ScreenFormatter(); + $fileFormatter = new Formatter_FileFormatter(); parent::__construct($logToFileFilename, $fileFormatter, $screenFormatter, @@ -49,7 +52,7 @@ class Piwik_Log_Error extends Piwik_Log function addWriteToScreen() { parent::addWriteToScreen(); - $writerScreen = new Zend_Log_Writer_Stream('php://stderr'); + $writerScreen = new \Zend_Log_Writer_Stream('php://stderr'); $writerScreen->setFormatter($this->screenFormatter); $this->addWriter($writerScreen); } @@ -72,7 +75,7 @@ class Piwik_Log_Error extends Piwik_Log $event['errline'] = $errline; $event['backtrace'] = $backtrace; - parent::log($event, Piwik_Log::ERR, null); + parent::log($event, Log::ERR, null); } } @@ -80,9 +83,9 @@ class Piwik_Log_Error extends Piwik_Log * Format an error event to be displayed on the screen. * * @package Piwik - * @subpackage Piwik_Log + * @subpackage Log */ -class Piwik_Log_Error_Formatter_ScreenFormatter extends Piwik_Log_Formatter_ScreenFormatter +class Error_Formatter_ScreenFormatter extends Formatter_ScreenFormatter { /** * Formats data into a single line to be written by the writer. @@ -108,9 +111,9 @@ class Piwik_Log_Error_Formatter_ScreenFormatter extends Piwik_Log_Formatter_Scre // is there any other case where the errno is zero at this point? if ($errno == 0) return ''; $strReturned .= "\n<div style='word-wrap: break-word; border: 3px solid red; padding:4px; width:70%; background-color:#FFFF96;'> - <strong>There is an error. Please report the message (Piwik " . (class_exists('Piwik_Version') ? Piwik_Version::VERSION : '') . ") - and full backtrace in the <a href='?module=Proxy&action=redirect&url=http://forum.piwik.org' target='_blank'>Piwik forums</a> (please do a Search first as it might have been reported already!).<br /><br/> - "; + <strong>There is an error. Please report the message (Piwik " . (class_exists('Piwik\Version') ? Piwik_Version::VERSION : '') . ") + and full backtrace in the <a href='?module=Proxy&action=redirect&url=http://forum.piwik.org' target='_blank'>Piwik forums</a> (please do a Search first as it might have been reported already!).<br /><br/> + "; switch ($errno) { case E_ERROR: $strReturned .= "Error"; diff --git a/core/Log/Exception.php b/core/Log/Exception.php index b71479e575..2e7bb34bb4 100644 --- a/core/Log/Exception.php +++ b/core/Log/Exception.php @@ -8,16 +8,19 @@ * @category Piwik * @package Piwik */ +namespace Piwik\Log; + use Piwik\Common; +use Piwik\Log; /** * Class used to log an exception event. * Displays the exception with a user friendly error message, suggests to get support from piwik.org * * @package Piwik - * @subpackage Piwik_Log + * @subpackage Log */ -class Piwik_Log_Exception extends Piwik_Log +class Exception extends Log { const ID = 'logger_exception'; @@ -36,8 +39,8 @@ class Piwik_Log_Exception extends Piwik_Log 'errfile' => 'errfile', 'backtrace' => 'backtrace' ); - $screenFormatter = new Piwik_Log_Exception_Formatter_ScreenFormatter(); - $fileFormatter = new Piwik_Log_Formatter_FileFormatter(); + $screenFormatter = new Exception_Formatter_ScreenFormatter(); + $fileFormatter = new Formatter_FileFormatter(); parent::__construct($logToFileFilename, $fileFormatter, @@ -52,7 +55,7 @@ class Piwik_Log_Exception extends Piwik_Log function addWriteToScreen() { parent::addWriteToScreen(); - $writerScreen = new Zend_Log_Writer_Stream('php://stderr'); + $writerScreen = new \Zend_Log_Writer_Stream('php://stderr'); $writerScreen->setFormatter($this->screenFormatter); $this->addWriter($writerScreen); } @@ -71,7 +74,7 @@ class Piwik_Log_Exception extends Piwik_Log $event['errline'] = $exception->getLine(); $event['backtrace'] = $exception->getTraceAsString(); - parent::log($event, Piwik_Log::CRIT, null); + parent::log($event, Log::CRIT, null); } } @@ -79,9 +82,9 @@ class Piwik_Log_Exception extends Piwik_Log * Format an exception event to be displayed on the screen. * * @package Piwik - * @subpackage Piwik_Log + * @subpackage Log */ -class Piwik_Log_Exception_Formatter_ScreenFormatter extends Piwik_Log_Formatter_ScreenFormatter +class Exception_Formatter_ScreenFormatter extends Formatter_ScreenFormatter { /** * Formats data into a single line to be written by the writer. @@ -96,7 +99,7 @@ class Piwik_Log_Exception_Formatter_ScreenFormatter extends Piwik_Log_Formatter_ $outputFormat = strtolower(Common::getRequestVar('format', 'html', 'string')); $response = new Piwik_API_ResponseBuilder($outputFormat); - $message = $response->getResponseException(new Exception($errstr)); + $message = $response->getResponseException(new \Exception($errstr)); return parent::format($message); } } diff --git a/core/Log/Formatter.php b/core/Log/Formatter.php new file mode 100644 index 0000000000..3fa7c3d803 --- /dev/null +++ b/core/Log/Formatter.php @@ -0,0 +1,62 @@ +<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + * @category Piwik + * @package Piwik + */ +namespace Piwik\Log; + +/** + * @package Piwik + * @subpackage Log + */ +class Formatter_FileFormatter implements \Zend_Log_Formatter_Interface +{ + /** + * Formats data into a single line to be written by the writer. + * + * @param array $event event data + * @return string formatted line to write to the log + */ + public function format($event) + { + foreach ($event as &$value) { + $value = str_replace("\n", '\n', $value); + $value = '"' . $value . '"'; + } + $ts = $event['timestamp']; + unset($event['timestamp']); + return $ts . ' ' . implode(" ", $event) . "\n"; + } +} + +/** + * + * @package Piwik + * @subpackage Log + */ +class Formatter_ScreenFormatter implements \Zend_Log_Formatter_Interface +{ + function formatEvent($event) + { + // no injection in error messages, backtrace when displayed on screen + return array_map(array('Piwik\Common', 'sanitizeInputValue'), $event); + } + + function format($string) + { + return self::getFormattedString($string); + } + + static public function getFormattedString($string) + { + if (!Common::isPhpCliMode()) { + @header('Content-Type: text/html; charset=utf-8'); + } + return $string; + } +}
\ No newline at end of file diff --git a/core/Log/Message.php b/core/Log/Message.php index eb200a3b68..26acec5348 100644 --- a/core/Log/Message.php +++ b/core/Log/Message.php @@ -8,16 +8,55 @@ * @category Piwik * @package Piwik */ +namespace Piwik\Log; use Piwik\Piwik; use Piwik\Common; +use Piwik\Log; + +/** + * Format a standard message event to be displayed on the screen. + * The message can be a PHP array or a string. + * + * @package Piwik + * @subpackage Log + */ +class Message_Formatter_ScreenFormatter extends Formatter_ScreenFormatter +{ + /** + * Formats data into a single line to be written by the writer. + * + * @param array $event event data + * @return string formatted line to write to the log + */ + public function format($event) + { + if (is_array($event['message'])) { + $message = "<pre>" . var_export($event['message'], true) . "</pre>"; + } else { + $message = $event['message']; + } + if (!Common::isPhpCliMode()) { + $message .= "<br/>"; + } + $message .= "\n"; + + $memory = ''; + // Hacky: let's hide the memory usage in CLI to hide from the archive.php output + if (!Common::isPhpCliMode()) { + $memory = '[' . Piwik::getMemoryUsage() . '] '; + } + $message = '[' . $event['timestamp'] . '] [' . $event['requestKey'] . '] ' . $memory . $message; + return parent::format($message); + } +} /** * Class used to log a standard message event. * * @package Piwik - * @subpackage Piwik_Log + * @subpackage Log */ -class Piwik_Log_Message extends Piwik_Log +class Message extends Log { const ID = 'logger_message'; @@ -32,8 +71,8 @@ class Piwik_Log_Message extends Piwik_Log 'message' => 'message', 'timestamp' => 'timestamp' ); - $screenFormatter = new Piwik_Log_Message_Formatter_ScreenFormatter(); - $fileFormatter = new Piwik_Log_Formatter_FileFormatter(); + $screenFormatter = new Log\Message_Formatter_ScreenFormatter(); + $fileFormatter = new Formatter_FileFormatter(); parent::__construct($logToFileFilename, $fileFormatter, @@ -51,43 +90,6 @@ class Piwik_Log_Message extends Piwik_Log { $event = array(); $event['message'] = $message; - parent::log($event, Piwik_Log::INFO, null); + parent::log($event, Log::INFO, null); } -} - -/** - * Format a standard message event to be displayed on the screen. - * The message can be a PHP array or a string. - * - * @package Piwik - * @subpackage Piwik_Log - */ -class Piwik_Log_Message_Formatter_ScreenFormatter extends Piwik_Log_Formatter_ScreenFormatter -{ - /** - * Formats data into a single line to be written by the writer. - * - * @param array $event event data - * @return string formatted line to write to the log - */ - public function format($event) - { - if (is_array($event['message'])) { - $message = "<pre>" . var_export($event['message'], true) . "</pre>"; - } else { - $message = $event['message']; - } - if (!Common::isPhpCliMode()) { - $message .= "<br/>"; - } - $message .= "\n"; - - $memory = ''; - // Hacky: let's hide the memory usage in CLI to hide from the archive.php output - if (!Common::isPhpCliMode()) { - $memory = '[' . Piwik::getMemoryUsage() . '] '; - } - $message = '[' . $event['timestamp'] . '] [' . $event['requestKey'] . '] ' . $memory . $message; - return parent::format($message); - } -} +}
\ No newline at end of file diff --git a/core/Mail.php b/core/Mail.php index d9f917e464..1ffbc5d2e4 100644 --- a/core/Mail.php +++ b/core/Mail.php @@ -8,8 +8,12 @@ * @category Piwik * @package Piwik */ +namespace Piwik; + use Piwik\Config; use Piwik\Piwik; +use Piwik\Url; +use Zend_Mail; /** * Class for sending mails, for more information see: @@ -18,7 +22,7 @@ use Piwik\Piwik; * @see Zend_Mail, libs/Zend/Mail.php * @link http://framework.zend.com/manual/en/zend.mail.html */ -class Piwik_Mail extends Zend_Mail +class Mail extends Zend_Mail { /** * Default charset utf-8 @@ -41,7 +45,7 @@ class Piwik_Mail extends Zend_Mail public function setFrom($email, $name = null) { $hostname = Config::getInstance()->mail['defaultHostnameIfEmpty']; - $piwikHost = Piwik_Url::getCurrentHost($hostname); + $piwikHost = Url::getCurrentHost($hostname); // If known Piwik URL, use it instead of "localhost" $piwikUrl = Piwik::getPiwikUrl(); @@ -77,8 +81,8 @@ class Piwik_Mail extends Zend_Mail if (!empty($mailConfig['encryption'])) $smtpConfig['ssl'] = $mailConfig['encryption']; - $tr = new Zend_Mail_Transport_Smtp($mailConfig['host'], $smtpConfig); - Piwik_Mail::setDefaultTransport($tr); + $tr = new \Zend_Mail_Transport_Smtp($mailConfig['host'], $smtpConfig); + Mail::setDefaultTransport($tr); ini_set("smtp_port", $mailConfig['port']); } } diff --git a/core/Menu/Admin.php b/core/Menu/Admin.php index 7af69b3255..aa8fee720a 100644 --- a/core/Menu/Admin.php +++ b/core/Menu/Admin.php @@ -8,17 +8,20 @@ * @category Piwik * @package Piwik_Menu */ +namespace Piwik\Menu; + +use Piwik\Menu\MenuAbstract; use Piwik\Piwik; /** * @package Piwik_Menu */ -class Piwik_Menu_Admin extends Piwik_Menu_Abstract +class Admin extends MenuAbstract { static private $instance = null; /** - * @return Piwik_Menu_Admin + * @return \Piwik\Menu\Admin */ static public function getInstance() { @@ -40,75 +43,28 @@ class Piwik_Menu_Admin extends Piwik_Menu_Abstract } return parent::get(); } -} -/** - * Returns the current AdminMenu name - * - * @return boolean - */ -function Piwik_GetCurrentAdminMenuName() -{ - $menu = Piwik_GetAdminMenu(); - $currentModule = Piwik::getModule(); - $currentAction = Piwik::getAction(); - foreach ($menu as $name => $submenu) { - foreach ($submenu as $subMenuName => $parameters) { - if (strpos($subMenuName, '_') !== 0 && - $parameters['_url']['module'] == $currentModule - && $parameters['_url']['action'] == $currentAction - ) { - return $subMenuName; + /** + * Returns the current AdminMenu name + * + * @return boolean + */ + function getCurrentAdminMenuName() + { + $menu = Piwik_GetAdminMenu(); + $currentModule = Piwik::getModule(); + $currentAction = Piwik::getAction(); + foreach ($menu as $name => $submenu) { + foreach ($submenu as $subMenuName => $parameters) { + if (strpos($subMenuName, '_') !== 0 && + $parameters['_url']['module'] == $currentModule + && $parameters['_url']['action'] == $currentAction + ) { + return $subMenuName; + } } } + return false; } - return false; -} - -/** - * Returns the AdminMenu - * - * @return Array - */ -function Piwik_GetAdminMenu() -{ - return Piwik_Menu_Admin::getInstance()->get(); } -/** - * Adds a new AdminMenu entry. - * - * @param string $adminMenuName - * @param string $url - * @param boolean $displayedForCurrentUser - * @param int $order - */ -function Piwik_AddAdminMenu($adminMenuName, $url, $displayedForCurrentUser = true, $order = 10) -{ - Piwik_Menu_Admin::getInstance()->add('General_Settings', $adminMenuName, $url, $displayedForCurrentUser, $order); -} - -/** - * Adds a new AdminMenu entry with a submenu. - * - * @param string $adminMenuName - * @param string $adminSubMenuName - * @param string $url - * @param boolean $displayedForCurrentUser - * @param int $order - */ -function Piwik_AddAdminSubMenu($adminMenuName, $adminSubMenuName, $url, $displayedForCurrentUser = true, $order = 10) -{ - Piwik_Menu_Admin::getInstance()->add($adminMenuName, $adminSubMenuName, $url, $displayedForCurrentUser, $order); -} - -/** - * Renames an AdminMenu entry. - * - * @param string $adminMenuOriginal - * @param string $adminMenuRenamed - */ -function Piwik_RenameAdminMenuEntry($adminMenuOriginal, $adminMenuRenamed) -{ - Piwik_Menu_Admin::getInstance()->rename($adminMenuOriginal, null, $adminMenuRenamed, null); -} diff --git a/core/Menu/Main.php b/core/Menu/Main.php index fa21883a30..105ac9cd66 100644 --- a/core/Menu/Main.php +++ b/core/Menu/Main.php @@ -8,16 +8,19 @@ * @category Piwik * @package Piwik_Menu */ +namespace Piwik\Menu; + +use Piwik\Menu\MenuAbstract; /** * @package Piwik_Menu */ -class Piwik_Menu_Main extends Piwik_Menu_Abstract +class Main extends MenuAbstract { static private $instance = null; /** - * @return Piwik_Menu_Abstract + * @return MenuAbstract */ static public function getInstance() { @@ -35,7 +38,7 @@ class Piwik_Menu_Main extends Piwik_Menu_Abstract */ public function isUrlFound($url) { - $menu = Piwik_Menu_Main::getInstance()->get(); + $menu = Main::getInstance()->get(); foreach ($menu as $mainMenuName => $subMenus) { foreach ($subMenus as $subMenuName => $menuUrl) { @@ -60,66 +63,5 @@ class Piwik_Menu_Main extends Piwik_Menu_Abstract } return parent::get(); } - -} - -/** - * Checks if an entry uses the URL $url. - * - * @param string $url - * @return boolean - */ -function Piwik_IsMenuUrlFound($url) -{ - return Piwik_Menu_Main::getInstance()->isUrlFound($url); } -/** - * Returns the MainMenu as array. - * - * @return array - */ -function Piwik_GetMenu() -{ - return Piwik_Menu_Main::getInstance()->get(); -} - -/** - * Adds a new entry to the MainMenu. - * - * @param string $mainMenuName - * @param string $subMenuName - * @param string $url - * @param boolean $displayedForCurrentUser - * @param int $order - */ -function Piwik_AddMenu($mainMenuName, $subMenuName, $url, $displayedForCurrentUser = true, $order = 10) -{ - Piwik_Menu_Main::getInstance()->add($mainMenuName, $subMenuName, $url, $displayedForCurrentUser, $order); -} - -/** - * Renames a menu entry. - * - * @param string $mainMenuOriginal - * @param string $subMenuOriginal - * @param string $mainMenuRenamed - * @param string $subMenuRenamed - */ -function Piwik_RenameMenuEntry($mainMenuOriginal, $subMenuOriginal, - $mainMenuRenamed, $subMenuRenamed) -{ - Piwik_Menu_Main::getInstance()->rename($mainMenuOriginal, $subMenuOriginal, $mainMenuRenamed, $subMenuRenamed); -} - -/** - * Edits the URL of a menu entry. - * - * @param string $mainMenuToEdit - * @param string $subMenuToEdit - * @param string $newUrl - */ -function Piwik_EditMenuUrl($mainMenuToEdit, $subMenuToEdit, $newUrl) -{ - Piwik_Menu_Main::getInstance()->editUrl($mainMenuToEdit, $subMenuToEdit, $newUrl); -} diff --git a/core/Menu/Abstract.php b/core/Menu/MenuAbstract.php index 14574847bf..5bb4adb39c 100644 --- a/core/Menu/Abstract.php +++ b/core/Menu/MenuAbstract.php @@ -8,12 +8,15 @@ * @category Piwik * @package Piwik_Menu */ +namespace Piwik\Menu; + use Piwik\Common; +use Piwik_SitesManager_API; /** * @package Piwik_Menu */ -abstract class Piwik_Menu_Abstract +abstract class MenuAbstract { protected $menu = null; @@ -45,11 +48,11 @@ abstract class Piwik_Menu_Abstract /** * Adds a new entry to the menu. * - * @param string $menuName - * @param string $subMenuName - * @param string $url - * @param bool $displayedForCurrentUser - * @param int $order + * @param string $menuName + * @param string $subMenuName + * @param string $url + * @param bool $displayedForCurrentUser + * @param int $order * @param bool|string $tooltip Tooltip to display. */ public function add($menuName, $subMenuName, $url, $displayedForCurrentUser, $order = 50, $tooltip = false) @@ -74,10 +77,10 @@ abstract class Piwik_Menu_Abstract /** * Builds a single menu item * - * @param string $menuName - * @param string $subMenuName - * @param string $url - * @param int $order + * @param string $menuName + * @param string $subMenuName + * @param string $url + * @param int $order * @param bool|string $tooltip Tooltip to display. */ private function buildMenuItem($menuName, $subMenuName, $url, $order = 50, $tooltip = false) diff --git a/core/Menu/Top.php b/core/Menu/Top.php index b3438c906c..b646eb89a9 100644 --- a/core/Menu/Top.php +++ b/core/Menu/Top.php @@ -8,16 +8,19 @@ * @category Piwik * @package Piwik_Menu */ +namespace Piwik\Menu; + +use Piwik\Menu\MenuAbstract; /** * @package Piwik_Menu */ -class Piwik_Menu_Top extends Piwik_Menu_Abstract +class Top extends MenuAbstract { static private $instance = null; /** - * @return Piwik_Menu_Top + * @return \Piwik\Menu\Top */ static public function getInstance() { @@ -61,44 +64,3 @@ class Piwik_Menu_Top extends Piwik_Menu_Abstract return parent::get(); } } - -/** - * Returns the TopMenu as an array. - * - * @return array - */ -function Piwik_GetTopMenu() -{ - return Piwik_Menu_Top::getInstance()->get(); -} - -/** - * Adds a new entry to the TopMenu. - * - * @param string $topMenuName - * @param string $data - * @param boolean $displayedForCurrentUser - * @param int $order - * @param bool $isHTML - * @param bool|string $tooltip Tooltip to display. - */ -function Piwik_AddTopMenu($topMenuName, $data, $displayedForCurrentUser = true, $order = 10, $isHTML = false, - $tooltip = false) -{ - if ($isHTML) { - Piwik_Menu_Top::getInstance()->addHtml($topMenuName, $data, $displayedForCurrentUser, $order, $tooltip); - } else { - Piwik_Menu_Top::getInstance()->add($topMenuName, null, $data, $displayedForCurrentUser, $order, $tooltip); - } -} - -/** - * Renames a entry of the TopMenu - * - * @param string $topMenuOriginal - * @param string $topMenuRenamed - */ -function Piwik_RenameTopMenuEntry($topMenuOriginal, $topMenuRenamed) -{ - Piwik_Menu_Top::getInstance()->rename($topMenuOriginal, null, $topMenuRenamed, null); -} diff --git a/core/Nonce.php b/core/Nonce.php index 23e447f949..ff6a97227b 100644 --- a/core/Nonce.php +++ b/core/Nonce.php @@ -8,7 +8,12 @@ * @category Piwik * @package Piwik */ +namespace Piwik; + use Piwik\Common; +use Piwik_Session_Namespace; +use Piwik\Url; +use false; /** * Nonce class. @@ -23,7 +28,7 @@ use Piwik\Common; * * @package Piwik */ -class Piwik_Nonce +class Nonce { /** * Generate nonce @@ -68,8 +73,8 @@ class Piwik_Nonce } // validate referer - $referer = Piwik_Url::getReferer(); - if (!empty($referer) && !Piwik_Url::isLocalUrl($referer)) { + $referer = Url::getReferer(); + if (!empty($referer) && !Url::isLocalUrl($referer)) { return false; } @@ -117,7 +122,7 @@ class Piwik_Nonce */ static public function getAcceptableOrigins() { - $host = Piwik_Url::getCurrentHost(null); + $host = Url::getCurrentHost(null); $port = ''; // parse host:port diff --git a/core/Option.php b/core/Option.php index 11f541bd55..653363bfc1 100644 --- a/core/Option.php +++ b/core/Option.php @@ -8,17 +8,18 @@ * @category Piwik * @package Piwik */ +namespace Piwik; use Piwik\Common; /** - * Piwik_Option provides a very simple mechanism to save/retrieve key-values pair + * Option provides a very simple mechanism to save/retrieve key-values pair * from the database (persistent key-value datastore). * * This is useful to save Piwik-wide preferences, configuration values. * * @package Piwik */ -class Piwik_Option +class Option { /** * @var array @@ -32,14 +33,14 @@ class Piwik_Option /** * Singleton instance - * @var self + * @var \Piwik\Option */ static private $instance = null; /** * Returns Singleton instance * - * @return Piwik_Option + * @return \Piwik\Option */ static public function getInstance() { @@ -68,7 +69,7 @@ class Piwik_Option if (isset($this->all[$name])) { return $this->all[$name]; } - $value = Piwik_FetchOne('SELECT option_value ' . + $value = Db::fetchOne('SELECT option_value ' . 'FROM `' . Common::prefixTable('option') . '`' . 'WHERE option_name = ?', $name); if ($value === false) { @@ -88,7 +89,7 @@ class Piwik_Option public function set($name, $value, $autoLoad = 0) { $autoLoad = (int)$autoLoad; - Piwik_Query('INSERT INTO `' . Common::prefixTable('option') . '` (option_name, option_value, autoload) ' . + Db::query('INSERT INTO `' . Common::prefixTable('option') . '` (option_name, option_value, autoload) ' . ' VALUES (?, ?, ?) ' . ' ON DUPLICATE KEY UPDATE option_value = ?', array($name, $value, $autoLoad, $value)); @@ -111,7 +112,7 @@ class Piwik_Option $bind[] = $value; } - Piwik_Query($sql, $bind); + Db::query($sql, $bind); $this->clearCache(); } @@ -133,7 +134,7 @@ class Piwik_Option $bind[] = $value; } - Piwik_Query($sql, $bind); + Db::query($sql, $bind); $this->clearCache(); } @@ -149,7 +150,7 @@ class Piwik_Option return; } - $all = Piwik_FetchAll('SELECT option_value, option_name + $all = Db::fetchAll('SELECT option_value, option_name FROM `' . Common::prefixTable('option') . '` WHERE autoload = 1'); foreach ($all as $option) { @@ -171,26 +172,3 @@ class Piwik_Option $this->all = array(); } } - -/** - * Returns the option value for the requested option $name - * - * @param string $name Key - * @return string|false Value or false, if not found - */ -function Piwik_GetOption($name) -{ - return Piwik_Option::getInstance()->get($name); -} - -/** - * Sets the option value in the database - * - * @param string $name - * @param string $value - * @param int $autoLoad if set to 1, this option value will be automatically loaded; should be set to 1 for options that will always be used in the Piwik request. - */ -function Piwik_SetOption($name, $value, $autoLoad = 0) -{ - Piwik_Option::getInstance()->set($name, $value, $autoLoad); -} diff --git a/core/Piwik.php b/core/Piwik.php index 5edff85b19..97ad1c97bb 100644 --- a/core/Piwik.php +++ b/core/Piwik.php @@ -11,28 +11,22 @@ namespace Piwik; use Exception; -use Piwik\Config; use Piwik\Access; -use Access_NoAccessException; -use Piwik_AssetManager; +use Piwik\AssetManager; use Piwik\Common; -use Piwik_Db_Adapter; -use Piwik_Db_Schema; -use Piwik_Log_APICall; -use Piwik_Log_Error; -use Piwik_Log_Exception; -use Piwik_Log_Formatter_ScreenFormatter; -use Piwik_Log_Message; +use Piwik\Config; use Piwik\Plugin; -use Piwik_Session; use Piwik\Site; -use Piwik_Tracker; +use Piwik\Db\Adapter; +use Piwik\Db\Schema; +use Piwik\Session; +use Piwik\Tracker; use Piwik_Tracker_Cache; use Piwik_Tracker_Db; use Piwik_Tracker_GoalManager; -use Piwik_Url; +use Piwik\Url; use Piwik_UsersManager_API; -use Piwik_View; +use Piwik\View; use Zend_Registry; /** @@ -127,7 +121,7 @@ class Piwik */ static public function uninstall() { - Piwik_Db_Schema::getInstance()->dropTables(); + Schema::getInstance()->dropTables(); } /** @@ -140,7 +134,7 @@ class Piwik static public function isInstalled() { try { - return Piwik_Db_Schema::getInstance()->hasTables(); + return Schema::getInstance()->hasTables(); } catch (Exception $e) { return false; } @@ -152,8 +146,8 @@ class Piwik */ static public function deleteAllCacheOnUpdate() { - Piwik_AssetManager::removeMergedAssets(); - Piwik_View::clearCompiledTemplates(); + AssetManager::removeMergedAssets(); + View::clearCompiledTemplates(); Piwik_Tracker_Cache::deleteTrackerCache(); } @@ -190,7 +184,7 @@ class Piwik return $url; } - $currentUrl = Common::sanitizeInputValue(Piwik_Url::getCurrentUrlWithoutFileName()); + $currentUrl = Common::sanitizeInputValue(Url::getCurrentUrlWithoutFileName()); if (empty($url) // if URL changes, always update the cache @@ -211,7 +205,7 @@ class Piwik */ static public function isHttps() { - return Piwik_Url::getCurrentScheme() === 'https'; + return Url::getCurrentScheme() === 'https'; } /** @@ -1060,7 +1054,7 @@ class Piwik "<p><img src='plugins/Zeitgeist/images/error_medium.png' style='vertical-align:middle; float:left;padding:20 20 20 20' />" . $message . "</p></div>"; - print(Piwik_Log_Formatter_ScreenFormatter::getFormattedString($output)); + print(\Piwik\Log\Formatter_ScreenFormatter::getFormattedString($output)); exit; } @@ -1115,7 +1109,7 @@ class Piwik } if (is_null($db)) { - $db = Piwik_Tracker::getDatabase(); + $db = Tracker::getDatabase(); } $tableName = Common::prefixTable('log_profiling'); @@ -1524,7 +1518,7 @@ class Piwik 'Free Web Analytics', 'Analytics Platform', ); - $id = abs(intval(md5(Piwik_Url::getCurrentHost()))); + $id = abs(intval(md5(Url::getCurrentHost()))); $title = $titles[$id % count($titles)]; return $title; } @@ -1647,7 +1641,7 @@ class Piwik * Check that current user is either the specified user or the superuser * * @param string $theUser - * @throws Access_NoAccessException if the user is neither the super user nor the user $theUser + * @throws \Piwik\NoAccessException if the user is neither the super user nor the user $theUser */ static public function checkUserIsSuperUserOrTheUser($theUser) { @@ -1656,8 +1650,8 @@ class Piwik // or to the super user Piwik::checkUserIsSuperUser(); } - } catch (Access_NoAccessException $e) { - throw new Access_NoAccessException(Piwik_Translate('General_ExceptionCheckUserIsSuperUserOrTheUser', array($theUser))); + } catch (\Piwik\NoAccessException $e) { + throw new \Piwik\NoAccessException(Piwik_Translate('General_ExceptionCheckUserIsSuperUserOrTheUser', array($theUser))); } } @@ -1689,7 +1683,7 @@ class Piwik /** * Checks if user is not the anonymous user. * - * @throws Access_NoAccessException if user is anonymous. + * @throws \Piwik\NoAccessException if user is anonymous. */ static public function checkUserIsNotAnonymous() { @@ -1901,11 +1895,11 @@ class Piwik */ static public function redirectToModule($newModule, $newAction = '', $parameters = array()) { - $newUrl = 'index.php' . Piwik_Url::getCurrentQueryStringWithParametersModified( + $newUrl = 'index.php' . Url::getCurrentQueryStringWithParametersModified( array('module' => $newModule, 'action' => $newAction) + $parameters ); - Piwik_Url::redirectToUrl($newUrl); + Url::redirectToUrl($newUrl); } /* @@ -1932,7 +1926,7 @@ class Piwik Piwik_PostEvent('Reporting.createDatabase', array(&$db)); if (is_null($db)) { $adapter = $dbInfos['adapter']; - $db = @Piwik_Db_Adapter::factory($adapter, $dbInfos); + $db = @Adapter::factory($adapter, $dbInfos); } Zend_Registry::set('db', $db); } @@ -1972,55 +1966,6 @@ class Piwik * Global log object */ - /** - * Create log object - * @throws Exception - */ - static public function createLogObject() - { - $configAPI = Config::getInstance()->log; - - $aLoggers = array( - 'logger_api_call' => new Piwik_Log_APICall, - 'logger_exception' => new Piwik_Log_Exception, - 'logger_error' => new Piwik_Log_Error, - 'logger_message' => new Piwik_Log_Message, - ); - - foreach ($configAPI as $loggerType => $aRecordTo) { - if (isset($aLoggers[$loggerType])) { - $logger = $aLoggers[$loggerType]; - - foreach ($aRecordTo as $recordTo) { - switch ($recordTo) { - case 'screen': - $logger->addWriteToScreen(); - break; - - case 'database': - $logger->addWriteToDatabase(); - break; - - case 'file': - $logger->addWriteToFile(); - break; - - default: - throw new Exception("'$recordTo' is not a valid Log type. Valid logger types are: screen, database, file."); - break; - } - } - } - } - - foreach ($aLoggers as $loggerType => $logger) { - if ($logger->getWritersCount() == 0) { - $logger->addWriteToNull(); - } - Zend_Registry::set($loggerType, $logger); - } - } - /* * User input validation */ @@ -2119,7 +2064,7 @@ class Piwik */ static public function isAvailable() { - return Piwik_Db_Schema::getInstance()->isAvailable(); + return Schema::getInstance()->isAvailable(); } /** @@ -2130,7 +2075,7 @@ class Piwik */ static public function getTableCreateSql($tableName) { - return Piwik_Db_Schema::getInstance()->getTableCreateSql($tableName); + return Schema::getInstance()->getTableCreateSql($tableName); } /** @@ -2140,7 +2085,7 @@ class Piwik */ static public function getTablesCreateSql() { - return Piwik_Db_Schema::getInstance()->getTablesCreateSql(); + return Schema::getInstance()->getTablesCreateSql(); } /** @@ -2150,7 +2095,7 @@ class Piwik */ static public function createDatabase($dbName = null) { - Piwik_Db_Schema::getInstance()->createDatabase($dbName); + Schema::getInstance()->createDatabase($dbName); } /** @@ -2158,7 +2103,7 @@ class Piwik */ static public function dropDatabase() { - Piwik_Db_Schema::getInstance()->dropDatabase(); + Schema::getInstance()->dropDatabase(); } /** @@ -2166,7 +2111,7 @@ class Piwik */ static public function createTables() { - Piwik_Db_Schema::getInstance()->createTables(); + Schema::getInstance()->createTables(); } /** @@ -2174,7 +2119,7 @@ class Piwik */ static public function createAnonymousUser() { - Piwik_Db_Schema::getInstance()->createAnonymousUser(); + Schema::getInstance()->createAnonymousUser(); } /** @@ -2182,7 +2127,7 @@ class Piwik */ static public function truncateAllTables() { - Piwik_Db_Schema::getInstance()->truncateAllTables(); + Schema::getInstance()->truncateAllTables(); } /** @@ -2192,7 +2137,7 @@ class Piwik */ static public function dropTables($doNotDelete = array()) { - Piwik_Db_Schema::getInstance()->dropTables($doNotDelete); + Schema::getInstance()->dropTables($doNotDelete); } /** @@ -2203,7 +2148,7 @@ class Piwik */ static public function getTablesNames() { - return Piwik_Db_Schema::getInstance()->getTablesNames(); + return Schema::getInstance()->getTablesNames(); } /** @@ -2214,7 +2159,7 @@ class Piwik */ static public function getTablesInstalled($forceReload = true) { - return Piwik_Db_Schema::getInstance()->getTablesInstalled($forceReload); + return Schema::getInstance()->getTablesInstalled($forceReload); } /** @@ -2286,7 +2231,7 @@ class Piwik try { $queryStart = 'LOAD DATA ' . $keyword . 'INFILE '; $sql = $queryStart . $query; - $result = @Piwik_Exec($sql); + $result = @Db::exec($sql); if (empty($result) || $result < 0) { continue; } @@ -2322,7 +2267,7 @@ class Piwik */ static public function tableInsertBatch($tableName, $fields, $values, $throwException = false) { - $filePath = PIWIK_USER_PATH . '/' . Piwik_AssetManager::MERGED_FILE_DIR . $tableName . '-' . Common::generateUniqId() . '.csv'; + $filePath = PIWIK_USER_PATH . '/' . AssetManager::MERGED_FILE_DIR . $tableName . '-' . Common::generateUniqId() . '.csv'; if (Zend_Registry::get('db')->hasBulkLoader()) { try { @@ -2388,7 +2333,7 @@ class Piwik INTO " . $tableName . " $fieldList VALUES (" . Common::getSqlStringFieldsArray($row) . ")"; - Piwik_Query($query, $row); + Db::query($query, $row); } } @@ -2410,8 +2355,8 @@ class Piwik { if (is_null(self::$lockPrivilegeGranted)) { try { - Piwik_LockTables(Common::prefixTable('log_visit')); - Piwik_UnlockAllTables(); + Db::lockTables(Common::prefixTable('log_visit')); + Db::unlockAllTables(); self::$lockPrivilegeGranted = true; } catch (Exception $ex) { @@ -2493,7 +2438,7 @@ class Piwik */ public static function checkIfFileSystemIsNFS() { - $sessionsPath = Piwik_Session::getSessionsDirectory(); + $sessionsPath = Session::getSessionsDirectory(); // this command will display details for the filesystem that holds the $sessionsPath // path, but only if its type is NFS. if not NFS, df will return one or less lines diff --git a/core/Plugin.php b/core/Plugin.php index 06aa0534ec..578d38c5f5 100644 --- a/core/Plugin.php +++ b/core/Plugin.php @@ -64,7 +64,7 @@ class Plugin * - 'homepage' => string // plugin homepage URL * - 'license' => string // plugin license * - 'license_homepage' => string // license homepage URL - * - 'version' => string // plugin version number; examples and 3rd party plugins must not use Piwik_Version::VERSION; 3rd party plugins must increment the version number with each plugin release + * - 'version' => string // plugin version number; examples and 3rd party plugins must not use Version::VERSION; 3rd party plugins must increment the version number with each plugin release * - 'theme' => bool // Whether this plugin is a theme (a theme is a plugin, but a plugin is not necessarily a theme) * * @return array diff --git a/core/Plugin/Config.php b/core/Plugin/Config.php index 2b41f23d5a..cb4ecd42e5 100644 --- a/core/Plugin/Config.php +++ b/core/Plugin/Config.php @@ -9,12 +9,14 @@ * @package Piwik */ +namespace Piwik\Plugin; + /** * Read / write local plugin-specific configuration * * @package Piwik */ -class Piwik_Plugin_Config +class Config { private $pluginName; private $configFileName; diff --git a/core/Plugin/MetadataLoader.php b/core/Plugin/MetadataLoader.php index 335442f31c..5400fde01d 100644 --- a/core/Plugin/MetadataLoader.php +++ b/core/Plugin/MetadataLoader.php @@ -12,7 +12,7 @@ namespace Piwik\Plugin; use Exception; use Piwik\Common; -use Piwik_Version; +use Piwik\Version; /** * @see core/Version.php @@ -73,7 +73,7 @@ class MetadataLoader 'author_homepage' => 'http://piwik.org/', 'license' => 'GPL v3 or later', 'license_homepage' => 'http://www.gnu.org/licenses/gpl.html', - 'version' => Piwik_Version::VERSION, + 'version' => Version::VERSION, 'theme' => false, ); } diff --git a/core/PluginsManager.php b/core/PluginsManager.php index 4660a37cd2..f11698f202 100644 --- a/core/PluginsManager.php +++ b/core/PluginsManager.php @@ -18,21 +18,6 @@ use Piwik\EventDispatcher; use Piwik\Translate; use Piwik\Plugin\MetadataLoader; -/** - * @see core/Menu/Abstract.php - * @see core/Menu/Main.php - * @see core/Menu/Admin.php - * @see core/Menu/Top.php - * @see core/PluginsFunctions/WidgetsList.php - * @see core/PluginsFunctions/Sql.php - * @see core/EventDispatcher.php - */ -require_once PIWIK_INCLUDE_PATH . '/core/Menu/Abstract.php'; -require_once PIWIK_INCLUDE_PATH . '/core/Menu/Main.php'; -require_once PIWIK_INCLUDE_PATH . '/core/Menu/Admin.php'; -require_once PIWIK_INCLUDE_PATH . '/core/Menu/Top.php'; -require_once PIWIK_INCLUDE_PATH . '/core/PluginsFunctions/WidgetsList.php'; -require_once PIWIK_INCLUDE_PATH . '/core/PluginsFunctions/Sql.php'; require_once PIWIK_INCLUDE_PATH . '/core/EventDispatcher.php'; /** @@ -535,7 +520,7 @@ class PluginsManager */ public function unloadPlugin($plugin) { - if (!($plugin instanceof Piwik_Plugin)) { + if (!($plugin instanceof Plugin)) { $oPlugin = $this->loadPlugin($plugin); if ($oPlugin === null) { unset($this->loadedPlugins[$plugin]); @@ -719,7 +704,6 @@ class PluginsManager } } -namespace Piwik; /** * @package Piwik * @subpackage PluginsManager diff --git a/core/ProxyHeaders.php b/core/ProxyHeaders.php index 5b18bcfbc3..07d9c9f883 100644 --- a/core/ProxyHeaders.php +++ b/core/ProxyHeaders.php @@ -8,6 +8,8 @@ * @category Piwik * @package Piwik */ +namespace Piwik; + use Piwik\Common; /** @@ -15,7 +17,7 @@ use Piwik\Common; * * @package Piwik */ -class Piwik_ProxyHeaders +class ProxyHeaders { /** * Get protocol information, with the exception of HTTPS diff --git a/core/QuickForm2.php b/core/QuickForm2.php index a41f2e5eb9..23f0690e45 100644 --- a/core/QuickForm2.php +++ b/core/QuickForm2.php @@ -9,8 +9,17 @@ * @package Piwik */ +namespace Piwik; + +use HTML_QuickForm2; +use HTML_QuickForm2_InvalidArgumentException; +use HTML_QuickForm2_Node; +use HTML_QuickForm2_NotFoundException; +use HTML_QuickForm2_Renderer; +use Piwik\Url; + /** - * Parent class for forms to be included in Smarty + * Manages forms displayed in Twig * * For an example, @see Piwik_Login_FormLogin * @@ -18,14 +27,14 @@ * @see HTML_QuickForm2, libs/HTML/QuickForm2.php * @link http://pear.php.net/package/HTML_QuickForm2/ */ -abstract class Piwik_QuickForm2 extends HTML_QuickForm2 +abstract class QuickForm2 extends HTML_QuickForm2 { protected $a_formElements = array(); function __construct($id, $method = 'post', $attributes = null, $trackSubmit = false) { if (!isset($attributes['action'])) { - $attributes['action'] = Piwik_Url::getCurrentQueryString(); + $attributes['action'] = Url::getCurrentQueryString(); } if (!isset($attributes['name'])) { $attributes['name'] = $id; diff --git a/core/RankingQuery.php b/core/RankingQuery.php index 147f58e1bf..e72d76f193 100644 --- a/core/RankingQuery.php +++ b/core/RankingQuery.php @@ -9,6 +9,10 @@ * @package Piwik */ +namespace Piwik; + +use Exception; + /** * The ranking query class wraps an arbitrary SQL query with more SQL that limits * the number of results while grouping the rest to "Others" and allows for some @@ -18,7 +22,7 @@ * The general use case looks like this: * * // limit to 500 rows + "Others" - * $rankingQuery = new Piwik_RankingQuery(500); + * $rankingQuery = new RankingQuery(500); * * // idaction_url will be "Others" in the row that contains the aggregated rest * $rankingQuery->addLabelColumn('idaction_url'); @@ -38,7 +42,7 @@ * * @package Piwik */ -class Piwik_RankingQuery +class RankingQuery { /** @@ -205,7 +209,7 @@ class Piwik_RankingQuery public function execute($innerQuery, $bind = array()) { $query = $this->generateQuery($innerQuery); - $data = Piwik_FetchAll($query, $bind); + $data = Db::fetchAll($query, $bind); if ($this->columnToMarkExcludedRows !== false) { // split the result into the regular result and the rows with special treatment @@ -285,7 +289,6 @@ class Piwik_RankingQuery } else { $additionalColumnsAggregatedString .= ', `' . $additionalColumn . '`'; } - } // initialize the counters @@ -359,5 +362,4 @@ class Piwik_RankingQuery END "; } - } diff --git a/core/ReportRenderer.php b/core/ReportRenderer.php index 7d43bf4856..7f8e959c74 100644 --- a/core/ReportRenderer.php +++ b/core/ReportRenderer.php @@ -8,20 +8,25 @@ * @category Piwik * @package Piwik */ +namespace Piwik; + +use Exception; use Piwik\DataTable\Simple; use Piwik\DataTable\Row; use Piwik\Piwik; use Piwik\DataTable; use Piwik\Loader; +use Piwik\API\Request; +use Piwik_ImageGraph_API; /** * A Report Renderer produces user friendly renderings of any given Piwik report. * All new Renderers must be copied in ReportRenderer and added to the $availableReportRenderers. * * @package Piwik - * @subpackage Piwik_ReportRenderer + * @subpackage ReportRenderer */ -abstract class Piwik_ReportRenderer +abstract class ReportRenderer { const DEFAULT_REPORT_FONT = 'dejavusans'; const REPORT_TEXT_COLOR = "68,68,68"; @@ -44,7 +49,7 @@ abstract class Piwik_ReportRenderer * * @throws exception If the renderer is unknown * @param string $rendererType - * @return Piwik_ReportRenderer + * @return \Piwik\ReportRenderer */ static public function factory($rendererType) { @@ -108,8 +113,8 @@ abstract class Piwik_ReportRenderer * @param string $reportTitle * @param string $prettyDate formatted date * @param string $description - * @param array $reportMetadata metadata for all reports - * @param array $segment segment applied to all reports + * @param array $reportMetadata metadata for all reports + * @param array $segment segment applied to all reports */ abstract public function renderFrontPage($reportTitle, $prettyDate, $description, $reportMetadata, $segment); @@ -168,7 +173,7 @@ abstract class Piwik_ReportRenderer protected static function sendToBrowser($filename, $extension, $contentType, $content) { - $filename = Piwik_ReportRenderer::appendExtension($filename, $extension); + $filename = ReportRenderer::appendExtension($filename, $extension); Piwik::overrideCacheControlHeaders(); header('Content-Description: File Transfer'); @@ -237,7 +242,7 @@ abstract class Piwik_ReportRenderer '&height=' . $height . ($segment != null ? '&segment=' . urlencode($segment['definition']) : ''); - $request = new Piwik_API_Request($requestGraph); + $request = new Request($requestGraph); try { $imageGraph = $request->process(); @@ -250,7 +255,6 @@ abstract class Piwik_ReportRenderer imagedestroy($imageGraph); return $imageGraphData; - } catch (Exception $e) { throw new Exception("ImageGraph API returned an error: " . $e->getMessage() . "\n"); } diff --git a/core/ReportRenderer/Html.php b/core/ReportRenderer/Html.php index 0f72de2aaf..e1d30734c4 100644 --- a/core/ReportRenderer/Html.php +++ b/core/ReportRenderer/Html.php @@ -6,16 +6,20 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * * @category Piwik - * @package Piwik_ReportRenderer + * @package ReportRenderer */ -use Piwik\Piwik; +namespace Piwik\ReportRenderer; +use Piwik\Piwik; +use Piwik\View; +use Piwik\ReportRenderer; +use Piwik_API_API; /** * - * @package Piwik_ReportRenderer + * @package ReportRenderer */ -class Piwik_ReportRenderer_Html extends Piwik_ReportRenderer +class Html extends ReportRenderer { const IMAGE_GRAPH_WIDTH = 700; const IMAGE_GRAPH_HEIGHT = 200; @@ -53,21 +57,21 @@ class Piwik_ReportRenderer_Html extends Piwik_ReportRenderer { $this->epilogue(); - return Piwik_ReportRenderer::writeFile($filename, self::HTML_FILE_EXTENSION, $this->rendering); + return ReportRenderer::writeFile($filename, self::HTML_FILE_EXTENSION, $this->rendering); } public function sendToBrowserDownload($filename) { $this->epilogue(); - Piwik_ReportRenderer::sendToBrowser($filename, self::HTML_FILE_EXTENSION, self::HTML_CONTENT_TYPE, $this->rendering); + ReportRenderer::sendToBrowser($filename, self::HTML_FILE_EXTENSION, self::HTML_CONTENT_TYPE, $this->rendering); } public function sendToBrowserInline($filename) { $this->epilogue(); - Piwik_ReportRenderer::inlineToBrowser(self::HTML_CONTENT_TYPE, $this->rendering); + ReportRenderer::inlineToBrowser(self::HTML_CONTENT_TYPE, $this->rendering); } public function getRenderedReport() @@ -79,13 +83,13 @@ class Piwik_ReportRenderer_Html extends Piwik_ReportRenderer private function epilogue() { - $view = new Piwik_View('@CoreHome/ReportRenderer/_htmlReportFooter'); + $view = new View('@CoreHome/ReportRenderer/_htmlReportFooter'); $this->rendering .= $view->render(); } public function renderFrontPage($reportTitle, $prettyDate, $description, $reportMetadata, $segment) { - $frontPageView = new Piwik_View('@CoreHome/ReportRenderer/_htmlReportHeader'); + $frontPageView = new View('@CoreHome/ReportRenderer/_htmlReportHeader'); $this->assignCommonParameters($frontPageView); // todo rename 'websiteName' to 'reportTitle' once branch twig is merged @@ -104,15 +108,15 @@ class Piwik_ReportRenderer_Html extends Piwik_ReportRenderer $this->rendering .= $frontPageView->render(); } - private function assignCommonParameters(Piwik_View $view) + private function assignCommonParameters(View $view) { - $view->assign("reportTitleTextColor", Piwik_ReportRenderer::REPORT_TITLE_TEXT_COLOR); + $view->assign("reportTitleTextColor", ReportRenderer::REPORT_TITLE_TEXT_COLOR); $view->assign("reportTitleTextSize", self::REPORT_TITLE_TEXT_SIZE); - $view->assign("reportTextColor", Piwik_ReportRenderer::REPORT_TEXT_COLOR); - $view->assign("tableHeaderBgColor", Piwik_ReportRenderer::TABLE_HEADER_BG_COLOR); - $view->assign("tableHeaderTextColor", Piwik_ReportRenderer::TABLE_HEADER_TEXT_COLOR); - $view->assign("tableCellBorderColor", Piwik_ReportRenderer::TABLE_CELL_BORDER_COLOR); - $view->assign("tableBgColor", Piwik_ReportRenderer::TABLE_BG_COLOR); + $view->assign("reportTextColor", ReportRenderer::REPORT_TEXT_COLOR); + $view->assign("tableHeaderBgColor", ReportRenderer::TABLE_HEADER_BG_COLOR); + $view->assign("tableHeaderTextColor", ReportRenderer::TABLE_HEADER_TEXT_COLOR); + $view->assign("tableCellBorderColor", ReportRenderer::TABLE_CELL_BORDER_COLOR); + $view->assign("tableBgColor", ReportRenderer::TABLE_BG_COLOR); $view->assign("reportTableHeaderTextSize", self::REPORT_TABLE_HEADER_TEXT_SIZE); $view->assign("reportTableRowTextSize", self::REPORT_TABLE_ROW_TEXT_SIZE); $view->assign("reportBackToTopTextSize", self::REPORT_BACK_TO_TOP_TEXT_SIZE); @@ -122,7 +126,7 @@ class Piwik_ReportRenderer_Html extends Piwik_ReportRenderer public function renderReport($processedReport) { - $reportView = new Piwik_View('@CoreHome/ReportRenderer/_htmlReportBody'); + $reportView = new View('@CoreHome/ReportRenderer/_htmlReportBody'); $this->assignCommonParameters($reportView); $reportMetadata = $processedReport['metadata']; diff --git a/core/ReportRenderer/Pdf.php b/core/ReportRenderer/Pdf.php index 7e7e6069f0..192a7f9133 100644 --- a/core/ReportRenderer/Pdf.php +++ b/core/ReportRenderer/Pdf.php @@ -6,9 +6,14 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * * @category Piwik - * @package Piwik_ReportRenderer + * @package ReportRenderer */ +namespace Piwik\ReportRenderer; + use Piwik\Common; +use Piwik\TCPDF; +use Piwik\ReportRenderer; +use Piwik_API_API; /** * @see libs/tcpdf @@ -19,9 +24,9 @@ require_once PIWIK_INCLUDE_PATH . '/core/TCPDF.php'; /** * - * @package Piwik_ReportRenderer + * @package ReportRenderer */ -class Piwik_ReportRenderer_Pdf extends Piwik_ReportRenderer +class Pdf extends ReportRenderer { const IMAGE_GRAPH_WIDTH_LANDSCAPE = 1050; const IMAGE_GRAPH_WIDTH_PORTRAIT = 760; @@ -71,19 +76,19 @@ class Piwik_ReportRenderer_Pdf extends Piwik_ReportRenderer private $reportColumns; private $reportRowsMetadata; private $currentPage = 0; - private $reportFont = Piwik_ReportRenderer::DEFAULT_REPORT_FONT; + private $reportFont = ReportRenderer::DEFAULT_REPORT_FONT; private $TCPDF; private $orientation = self::PORTRAIT; public function __construct() { - $this->TCPDF = new Piwik_TCPDF(); - $this->headerTextColor = preg_split("/,/", Piwik_ReportRenderer::REPORT_TITLE_TEXT_COLOR); - $this->reportTextColor = preg_split("/,/", Piwik_ReportRenderer::REPORT_TEXT_COLOR); - $this->tableHeaderBackgroundColor = preg_split("/,/", Piwik_ReportRenderer::TABLE_HEADER_BG_COLOR); - $this->tableHeaderTextColor = preg_split("/,/", Piwik_ReportRenderer::TABLE_HEADER_TEXT_COLOR); - $this->tableCellBorderColor = preg_split("/,/", Piwik_ReportRenderer::TABLE_CELL_BORDER_COLOR); - $this->tableBackgroundColor = preg_split("/,/", Piwik_ReportRenderer::TABLE_BG_COLOR); + $this->TCPDF = new TCPDF(); + $this->headerTextColor = preg_split("/,/", ReportRenderer::REPORT_TITLE_TEXT_COLOR); + $this->reportTextColor = preg_split("/,/", ReportRenderer::REPORT_TEXT_COLOR); + $this->tableHeaderBackgroundColor = preg_split("/,/", ReportRenderer::TABLE_HEADER_BG_COLOR); + $this->tableHeaderTextColor = preg_split("/,/", ReportRenderer::TABLE_HEADER_TEXT_COLOR); + $this->tableCellBorderColor = preg_split("/,/", ReportRenderer::TABLE_CELL_BORDER_COLOR); + $this->tableBackgroundColor = preg_split("/,/", ReportRenderer::TABLE_BG_COLOR); } public function setLocale($locale) @@ -111,7 +116,7 @@ class Piwik_ReportRenderer_Pdf extends Piwik_ReportRenderer case 'en': default: - $reportFont = Piwik_ReportRenderer::DEFAULT_REPORT_FONT; + $reportFont = ReportRenderer::DEFAULT_REPORT_FONT; break; } $this->reportFont = $reportFont; @@ -119,8 +124,8 @@ class Piwik_ReportRenderer_Pdf extends Piwik_ReportRenderer public function sendToDisk($filename) { - $filename = Piwik_ReportRenderer::appendExtension($filename, self::PDF_CONTENT_TYPE); - $outputFilename = Piwik_ReportRenderer::getOutputPath($filename); + $filename = ReportRenderer::appendExtension($filename, self::PDF_CONTENT_TYPE); + $outputFilename = ReportRenderer::getOutputPath($filename); $this->TCPDF->Output($outputFilename, 'F'); @@ -129,13 +134,13 @@ class Piwik_ReportRenderer_Pdf extends Piwik_ReportRenderer public function sendToBrowserDownload($filename) { - $filename = Piwik_ReportRenderer::appendExtension($filename, self::PDF_CONTENT_TYPE); + $filename = ReportRenderer::appendExtension($filename, self::PDF_CONTENT_TYPE); $this->TCPDF->Output($filename, 'D'); } public function sendToBrowserInline($filename) { - $filename = Piwik_ReportRenderer::appendExtension($filename, self::PDF_CONTENT_TYPE); + $filename = ReportRenderer::appendExtension($filename, self::PDF_CONTENT_TYPE); $this->TCPDF->Output($filename, 'I'); } diff --git a/core/ScheduledTask.php b/core/ScheduledTask.php index 585d793b91..8d9c368c54 100644 --- a/core/ScheduledTask.php +++ b/core/ScheduledTask.php @@ -9,13 +9,18 @@ * @package Piwik */ +namespace Piwik; + +use Exception; +use Piwik\ScheduledTime; + /** - * Piwik_ScheduledTask is used by the task scheduler and by plugins to configure runnable tasks. + * ScheduledTask is used by the task scheduler and by plugins to configure runnable tasks. * * @package Piwik - * @subpackage Piwik_ScheduledTask + * @subpackage ScheduledTask */ -class Piwik_ScheduledTask +class ScheduledTask { const LOWEST_PRIORITY = 12; const LOW_PRIORITY = 9; @@ -49,7 +54,7 @@ class Piwik_ScheduledTask /** * The scheduled time policy - * @var Piwik_ScheduledTime + * @var ScheduledTime */ var $scheduledTime; @@ -110,10 +115,9 @@ class Piwik_ScheduledTask return $this->methodParameter; } - /** * Return scheduled time - * @return Piwik_ScheduledTime + * @return ScheduledTime */ public function getScheduledTime() { @@ -131,7 +135,7 @@ class Piwik_ScheduledTask /** * Return the task priority. The priority will be an integer whose value is - * between Piwik_ScheduledTask::HIGH_PRIORITY and Piwik_ScheduledTask::LOW_PRIORITY. + * between ScheduledTask::HIGH_PRIORITY and ScheduledTask::LOW_PRIORITY. * * @return int */ diff --git a/core/ScheduledTime.php b/core/ScheduledTime.php index 1db44c1643..b0c6b8b224 100644 --- a/core/ScheduledTime.php +++ b/core/ScheduledTime.php @@ -9,15 +9,22 @@ * @package Piwik */ +namespace Piwik; + +use Exception; +use Piwik_ScheduledTime_Daily; +use Piwik_ScheduledTime_Monthly; +use Piwik_ScheduledTime_Weekly; + /** - * The Piwik_ScheduledTime abstract class is used as a base class for different types of scheduling intervals. - * Piwik_ScheduledTime subclasses are used to schedule tasks within Piwik. + * The ScheduledTime abstract class is used as a base class for different types of scheduling intervals. + * ScheduledTime subclasses are used to schedule tasks within Piwik. * * @see Piwik_ScheduledTask * @package Piwik - * @subpackage Piwik_ScheduledTime + * @subpackage ScheduledTime */ -abstract class Piwik_ScheduledTime +abstract class ScheduledTime { const PERIOD_NEVER = 'never'; const PERIOD_DAY = 'day'; diff --git a/core/ScheduledTime/Daily.php b/core/ScheduledTime/Daily.php index 46efdd0ddf..1783ddb160 100644 --- a/core/ScheduledTime/Daily.php +++ b/core/ScheduledTime/Daily.php @@ -8,15 +8,16 @@ * @category Piwik * @package Piwik */ +use Piwik\ScheduledTime; /** * Piwik_ScheduledTime_Daily class is used to schedule tasks every day. * * @see Piwik_ScheduledTask * @package Piwik - * @subpackage Piwik_ScheduledTime + * @subpackage ScheduledTime */ -class Piwik_ScheduledTime_Daily extends Piwik_ScheduledTime +class Piwik_ScheduledTime_Daily extends ScheduledTime { public function getRescheduledTime() { diff --git a/core/ScheduledTime/Hourly.php b/core/ScheduledTime/Hourly.php index fa5a4a3230..142ce95868 100644 --- a/core/ScheduledTime/Hourly.php +++ b/core/ScheduledTime/Hourly.php @@ -8,15 +8,16 @@ * @category Piwik * @package Piwik */ +use Piwik\ScheduledTime; /** * Piwik_ScheduledTime_Hourly class is used to schedule tasks every hour. * * @see Piwik_ScheduledTask * @package Piwik - * @subpackage Piwik_ScheduledTime + * @subpackage ScheduledTime */ -class Piwik_ScheduledTime_Hourly extends Piwik_ScheduledTime +class Piwik_ScheduledTime_Hourly extends ScheduledTime { public function getRescheduledTime() { diff --git a/core/ScheduledTime/Monthly.php b/core/ScheduledTime/Monthly.php index e09777a23a..c3e4d759da 100644 --- a/core/ScheduledTime/Monthly.php +++ b/core/ScheduledTime/Monthly.php @@ -8,15 +8,16 @@ * @category Piwik * @package Piwik */ +use Piwik\ScheduledTime; /** * Piwik_ScheduledTime_Monthly class is used to schedule tasks every month. * * @see Piwik_ScheduledTask * @package Piwik - * @subpackage Piwik_ScheduledTime + * @subpackage ScheduledTime */ -class Piwik_ScheduledTime_Monthly extends Piwik_ScheduledTime +class Piwik_ScheduledTime_Monthly extends ScheduledTime { /** * Day of the week for scheduled time. diff --git a/core/ScheduledTime/Weekly.php b/core/ScheduledTime/Weekly.php index d47cf53350..af8a78214f 100644 --- a/core/ScheduledTime/Weekly.php +++ b/core/ScheduledTime/Weekly.php @@ -8,15 +8,16 @@ * @category Piwik * @package Piwik */ +use Piwik\ScheduledTime; /** * Piwik_ScheduledTime_Weekly class is used to schedule tasks every week. * * @see Piwik_ScheduledTask * @package Piwik - * @subpackage Piwik_ScheduledTime + * @subpackage ScheduledTime */ -class Piwik_ScheduledTime_Weekly extends Piwik_ScheduledTime +class Piwik_ScheduledTime_Weekly extends ScheduledTime { public function getRescheduledTime() diff --git a/core/Session.php b/core/Session.php index 1db8458cb7..dcbd327562 100644 --- a/core/Session.php +++ b/core/Session.php @@ -8,17 +8,23 @@ * @category Piwik * @package Piwik */ +namespace Piwik; + +use Exception; use Piwik\Config; use Piwik\Piwik; use Piwik\Common; +use Piwik_Session_SaveHandler_DbTable; +use Zend_Registry; +use Zend_Session; /** * Session initialization. * * @package Piwik - * @subpackage Piwik_Session + * @subpackage Session */ -class Piwik_Session extends Zend_Session +class Session extends Zend_Session { protected static $sessionStarted = false; diff --git a/core/Session/Namespace.php b/core/Session/Namespace.php index f2fb04b131..d46ca799d7 100644 --- a/core/Session/Namespace.php +++ b/core/Session/Namespace.php @@ -14,7 +14,7 @@ use Piwik\Common; * Session namespace. * * @package Piwik - * @subpackage Piwik_Session + * @subpackage Session */ class Piwik_Session_Namespace extends Zend_Session_Namespace { diff --git a/core/Session/SaveHandler/DbTable.php b/core/Session/SaveHandler/DbTable.php index df00a920ea..a8bedd44ef 100644 --- a/core/Session/SaveHandler/DbTable.php +++ b/core/Session/SaveHandler/DbTable.php @@ -13,7 +13,7 @@ * Database-backed session save handler * * @package Piwik - * @subpackage Piwik_Session + * @subpackage Session */ class Piwik_Session_SaveHandler_DbTable implements Zend_Session_SaveHandler_Interface { diff --git a/core/TCPDF.php b/core/TCPDF.php index 2be9e09ad9..ab0e3d2a54 100644 --- a/core/TCPDF.php +++ b/core/TCPDF.php @@ -9,6 +9,10 @@ * @package Piwik */ +namespace Piwik; + +use Exception; + /** * @see libs/tcpdf/tcpdf.php */ @@ -19,7 +23,7 @@ require_once PIWIK_INCLUDE_PATH . '/libs/tcpdf/tcpdf.php'; * * @package Piwik */ -class Piwik_TCPDF extends TCPDF +class TCPDF extends \TCPDF { protected $footerContent = null; protected $currentPageNo = null; diff --git a/core/TaskScheduler.php b/core/TaskScheduler.php index aa39e703de..a102e55252 100644 --- a/core/TaskScheduler.php +++ b/core/TaskScheduler.php @@ -10,10 +10,16 @@ */ // When set to true, all scheduled tasks will be triggered in all requests (careful!) +namespace Piwik; + +use Exception; +use Piwik\ScheduledTask; +use Piwik\Timer; + define('DEBUG_FORCE_SCHEDULED_TASKS', false); /** - * Piwik_TaskScheduler is the class used to manage the execution of periodicaly planned task. + * TaskScheduler is the class used to manage the execution of periodicaly planned task. * * It performs the following actions : * - Identifies tasks of Piwik @@ -22,7 +28,7 @@ define('DEBUG_FORCE_SCHEDULED_TASKS', false); * @package Piwik */ -class Piwik_TaskScheduler +class TaskScheduler { const GET_TASKS_EVENT = "TaskScheduler.getScheduledTasks"; const TIMETABLE_OPTION_STRING = "TaskScheduler.timetable"; @@ -56,8 +62,8 @@ class Piwik_TaskScheduler // for every priority level, starting with the highest and concluding with the lowest $executionResults = array(); - for ($priority = Piwik_ScheduledTask::HIGHEST_PRIORITY; - $priority <= Piwik_ScheduledTask::LOWEST_PRIORITY; + for ($priority = ScheduledTask::HIGHEST_PRIORITY; + $priority <= ScheduledTask::LOWEST_PRIORITY; ++$priority) { // loop through each task foreach ($tasks as $task) { @@ -105,7 +111,7 @@ class Piwik_TaskScheduler // get the array where rescheduled timetables are stored $timetable = self::getTimetableFromOptionTable(); - $taskName = Piwik_ScheduledTask::getTaskName($className, $methodName, $methodParameter); + $taskName = ScheduledTask::getTaskName($className, $methodName, $methodParameter); return self::taskHasBeenScheduledOnce($taskName, $timetable) ? $timetable[$taskName] : false; } @@ -167,7 +173,7 @@ class Piwik_TaskScheduler static private function executeTask($task) { try { - $timer = new Piwik_Timer(); + $timer = new Timer(); call_user_func(array($task->getObjectInstance(), $task->getMethodName()), $task->getMethodParameter()); $message = $timer->__toString(); } catch (Exception $e) { diff --git a/core/Timer.php b/core/Timer.php index 236787db67..d3f1e29d79 100644 --- a/core/Timer.php +++ b/core/Timer.php @@ -8,13 +8,15 @@ * @category Piwik * @package Piwik */ +namespace Piwik; + use Piwik\Piwik; /** * * @package Piwik */ -class Piwik_Timer +class Timer { private $timerStart; private $memoryStart; diff --git a/core/Tracker.php b/core/Tracker.php index a5fb093b95..aca7ee28eb 100644 --- a/core/Tracker.php +++ b/core/Tracker.php @@ -8,11 +8,25 @@ * @category Piwik * @package Piwik */ +namespace Piwik; + +use Exception; use Piwik\Config; use Piwik\Piwik; use Piwik\Common; use Piwik\Access; use Piwik\Translate; +use Piwik\TaskScheduler; +use Piwik_Tracker_Cache; +use Piwik_Tracker_Db; +use Piwik_Tracker_Db_Exception; +use Piwik_Tracker_Db_Mysqli; +use Piwik_Tracker_Db_Pdo_Mysql; +use Piwik_Tracker_Request; +use Piwik_Tracker_Visit; +use Piwik_Tracker_Visit_Excluded; +use Piwik_Tracker_Visit_Interface; +use Zend_Registry; /** * Class used by the logging script piwik.php called by the javascript tag. @@ -22,9 +36,9 @@ use Piwik\Translate; * We try to include as little files as possible (no dependency on 3rd party modules). * * @package Piwik - * @subpackage Piwik_Tracker + * @subpackage Tracker */ -class Piwik_Tracker +class Tracker { protected $stateValid = self::STATE_NOTHING_TO_NOTICE; /** @@ -126,13 +140,12 @@ class Piwik_Tracker { return self::$pluginsToLoad; } + static public function setPluginsToLoad($plugins) { self::$pluginsToLoad = $plugins; } - - /** * Update Tracker config * @@ -245,17 +258,16 @@ class Piwik_Tracker ++$this->countOfLoggedRequests; } - // run scheduled task try { if (!$isAuthenticated // Do not run schedule task if we are importing logs or doing custom tracking (as it could slow down) - && $this->shouldRunScheduledTasks()) { + && $this->shouldRunScheduledTasks() + ) { self::runScheduledTasks(); } } catch (Exception $e) { $this->exitWithException($e); } - } else { $this->handleEmptyRequest(new Piwik_Tracker_Request($_GET + $_POST)); } @@ -316,7 +328,7 @@ class Piwik_Tracker // we ensure English translations at least are loaded Translate::getInstance()->loadEnglishTranslation(); - $resultTasks = Piwik_TaskScheduler::runTasks(); + $resultTasks = TaskScheduler::runTasks(); // restore original user privilege Piwik::setUserIsSuperUser($isSuperUser); @@ -343,10 +355,10 @@ class Piwik_Tracker self::$initTrackerMode = true; require_once PIWIK_INCLUDE_PATH . '/core/Loader.php'; require_once PIWIK_INCLUDE_PATH . '/core/Option.php'; - + $access = Access::getInstance(); $config = Config::getInstance(); - + try { $db = Zend_Registry::get('db'); } catch (Exception $e) { @@ -355,9 +367,9 @@ class Piwik_Tracker $pluginsManager = \Piwik\PluginsManager::getInstance(); $pluginsToLoad = Config::getInstance()->Plugins['Plugins']; - $pluginsForcedNotToLoad = Piwik_Tracker::getPluginsNotToLoad(); + $pluginsForcedNotToLoad = Tracker::getPluginsNotToLoad(); $pluginsToLoad = array_diff($pluginsToLoad, $pluginsForcedNotToLoad); - $pluginsToLoad = array_merge($pluginsToLoad, Piwik_Tracker::getPluginsToLoad()); + $pluginsToLoad = array_merge($pluginsToLoad, Tracker::getPluginsToLoad()); $pluginsManager->loadPlugins($pluginsToLoad); } } @@ -375,7 +387,7 @@ class Piwik_Tracker $result = array('succeeded' => $this->countOfLoggedRequests); // send error when in debug mode or when authenticated (which happens when doing log importing, if ((isset($GLOBALS['PIWIK_TRACKER_DEBUG']) && $GLOBALS['PIWIK_TRACKER_DEBUG']) || $authenticated) { - $result['error'] = Piwik_Tracker_GetErrorMessage($e); + $result['error'] = $this->getMessageFromException($e); } echo Common::json_encode($result); exit; @@ -387,11 +399,11 @@ class Piwik_Tracker $footerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/templates/simpleLayoutFooter.tpl'); $headerPage = str_replace('{$HTML_TITLE}', 'Piwik › Error', $headerPage); - echo $headerPage . '<p>' . Piwik_Tracker_GetErrorMessage($e) . '</p>' . $trailer . $footerPage; + echo $headerPage . '<p>' . $this->getMessageFromException($e) . '</p>' . $trailer . $footerPage; } // If not debug, but running authenticated (eg. during log import) then we display raw errors elseif ($authenticated) { Common::sendHeader('Content-Type: text/html; charset=utf-8'); - echo Piwik_Tracker_GetErrorMessage($e); + echo $this->getMessageFromException($e); } else { $this->outputTransparentGif(); } @@ -491,7 +503,7 @@ class Piwik_Tracker Piwik_PostEvent('Tracker.getDatabaseConfig', array(&$configDb)); - $db = Piwik_Tracker::factory($configDb); + $db = Tracker::factory($configDb); $db->connect(); return $db; @@ -597,7 +609,7 @@ class Piwik_Tracker if (!empty($disableProvider) && $request->isAuthenticated() ) { - Piwik_Tracker::setPluginsNotToLoad(array('Provider')); + Tracker::setPluginsNotToLoad(array('Provider')); } try { @@ -649,7 +661,7 @@ class Piwik_Tracker */ protected function handleTrackingApi(Piwik_Tracker_Request $request) { - if(!$request->isAuthenticated()) { + if (!$request->isAuthenticated()) { return; } @@ -738,23 +750,23 @@ class Piwik_Tracker self::setPluginsNotToLoad($pluginsDisabled); // we load 'DevicesDetection' in tests only (disabled by default) - self::setPluginsToLoad( array('DevicesDetection') ); + self::setPluginsToLoad(array('DevicesDetection')); } -} -/** - * Gets the error message to output when a tracking request fails. - * - * @param Exception $e - * @return string - */ -function Piwik_Tracker_GetErrorMessage($e) -{ - // Note: duplicated from FormDatabaseSetup.isAccessDenied - // Avoid leaking the username/db name when access denied - if ($e->getCode() == 1044 || $e->getCode() == 42000) { - return "Error while connecting to the Piwik database - please check your credentials in config/config.ini.php file"; - } else { - return $e->getMessage(); + /** + * Gets the error message to output when a tracking request fails. + * + * @param Exception $e + * @return string + */ + private function getMessageFromException($e) + { + // Note: duplicated from FormDatabaseSetup.isAccessDenied + // Avoid leaking the username/db name when access denied + if ($e->getCode() == 1044 || $e->getCode() == 42000) { + return "Error while connecting to the Piwik database - please check your credentials in config/config.ini.php file"; + } else { + return $e->getMessage(); + } } } diff --git a/core/Tracker/Action.php b/core/Tracker/Action.php index 1fee863928..b7df4c0b1c 100644 --- a/core/Tracker/Action.php +++ b/core/Tracker/Action.php @@ -10,13 +10,14 @@ */ use Piwik\Config; use Piwik\Common; +use Piwik\Tracker; /** * Interface of the Action object. * New Action classes can be defined in plugins and used instead of the default one. * * @package Piwik - * @subpackage Piwik_Tracker + * @subpackage Tracker */ interface Piwik_Tracker_Action_Interface { @@ -51,7 +52,7 @@ interface Piwik_Tracker_Action_Interface * Parses the action name and URL from the request array, then records the action in the log table. * * @package Piwik - * @subpackage Piwik_Tracker + * @subpackage Tracker */ class Piwik_Tracker_Action implements Piwik_Tracker_Action_Interface { @@ -505,7 +506,7 @@ class Piwik_Tracker_Action implements Piwik_Tracker_Action_Interface if (empty($bind)) { return $actionNamesAndTypes; } - $actionIds = Piwik_Tracker::getDatabase()->fetchAll($sql, $bind); + $actionIds = Tracker::getDatabase()->fetchAll($sql, $bind); // For the Actions found in the lookup table, add the idaction in the array, // If not found in lookup table, queue for INSERT @@ -545,8 +546,8 @@ class Piwik_Tracker_Action implements Piwik_Tracker_Action_Interface $urlPrefix = $normalizedUrls[$actionToInsert]['prefixId']; } - Piwik_Tracker::getDatabase()->query($sql, array($name, $name, $type, $urlPrefix)); - $actionId = Piwik_Tracker::getDatabase()->lastInsertId(); + Tracker::getDatabase()->query($sql, array($name, $name, $type, $urlPrefix)); + $actionId = Tracker::getDatabase()->lastInsertId(); Common::printDebug("Recorded a new action (" . self::getActionTypeName($type) . ") in the lookup table: " . $name . " (idaction = " . $actionId . ")"); $actionNamesAndTypes[$actionToInsert][] = $actionId; @@ -665,7 +666,7 @@ class Piwik_Tracker_Action implements Piwik_Tracker_Action_Interface 'idvisit' => $idVisit, 'idsite' => $this->request->getIdSite(), 'idvisitor' => $visitorIdCookie, - 'server_time' => Piwik_Tracker::getDatetimeFromTimestamp($this->request->getCurrentTimestamp()), + 'server_time' => Tracker::getDatetimeFromTimestamp($this->request->getCurrentTimestamp()), 'idaction_url' => $this->getIdActionUrl(), 'idaction_name' => $idActionName, 'idaction_url_ref' => $idRefererActionUrl, @@ -694,9 +695,9 @@ class Piwik_Tracker_Action implements Piwik_Tracker_Action_Interface $values = Common::getSqlStringFieldsArray($insertWithoutNulls); $sql = "INSERT INTO " . Common::prefixTable('log_link_visit_action') . " ($fields) VALUES ($values)"; - Piwik_Tracker::getDatabase()->query($sql, $bind); + Tracker::getDatabase()->query($sql, $bind); - $this->idLinkVisitAction = Piwik_Tracker::getDatabase()->lastInsertId(); + $this->idLinkVisitAction = Tracker::getDatabase()->lastInsertId(); $info = array( 'idSite' => $this->request->getIdSite(), diff --git a/core/Tracker/Cache.php b/core/Tracker/Cache.php index 72910c11e0..b65cbc37bd 100644 --- a/core/Tracker/Cache.php +++ b/core/Tracker/Cache.php @@ -11,18 +11,20 @@ use Piwik\ArchiveProcessor\Rules; use Piwik\Config; use Piwik\Piwik; +use Piwik\CacheFile; +use Piwik\Tracker; /** * Simple cache mechanism used in Tracker to avoid requesting settings from mysql on every request * * @package Piwik - * @subpackage Piwik_Tracker + * @subpackage Tracker */ class Piwik_Tracker_Cache { /** * Public for tests only - * @var Piwik_CacheFile + * @var CacheFile */ static public $trackerCache = null; @@ -30,7 +32,7 @@ class Piwik_Tracker_Cache { if (is_null(self::$trackerCache)) { $ttl = Config::getInstance()->Tracker['tracker_cache_file_ttl']; - self::$trackerCache = new Piwik_CacheFile('tracker', $ttl); + self::$trackerCache = new CacheFile('tracker', $ttl); } return self::$trackerCache; } @@ -50,7 +52,7 @@ class Piwik_Tracker_Cache return $cacheContent; } - Piwik_Tracker::initCorePiwikInTrackerMode(); + Tracker::initCorePiwikInTrackerMode(); // save current user privilege and temporarily assume super user privilege $isSuperUser = Piwik::isUserIsSuperUser(); @@ -95,7 +97,7 @@ class Piwik_Tracker_Cache return $cacheContent; } - Piwik_Tracker::initCorePiwikInTrackerMode(); + Tracker::initCorePiwikInTrackerMode(); $cacheContent = array( 'isBrowserTriggerEnabled' => Rules::isBrowserTriggerEnabled(), 'lastTrackerCronRun' => Piwik_GetOption('lastTrackerCronRun'), diff --git a/core/Tracker/Db.php b/core/Tracker/Db.php index 5b7cbde2cc..f917f3ed61 100644 --- a/core/Tracker/Db.php +++ b/core/Tracker/Db.php @@ -9,6 +9,7 @@ * @package Piwik */ use Piwik\Common; +use Piwik\Timer; /** * Simple database wrapper. @@ -16,7 +17,7 @@ use Piwik\Common; * We wrote this simple class * * @package Piwik - * @subpackage Piwik_Tracker + * @subpackage Tracker */ abstract class Piwik_Tracker_Db { @@ -60,18 +61,18 @@ abstract class Piwik_Tracker_Db /** * Initialize profiler * - * @return Piwik_Timer + * @return Timer */ protected function initProfiler() { - return new Piwik_Timer; + return new Timer; } /** * Record query profile * * @param string $query - * @param Piwik_Timer $timer + * @param Timer $timer */ protected function recordQueryProfile($query, $timer) { diff --git a/core/Tracker/Db/Exception.php b/core/Tracker/Db/Exception.php index 3958a1e008..2368503790 100644 --- a/core/Tracker/Db/Exception.php +++ b/core/Tracker/Db/Exception.php @@ -13,7 +13,7 @@ * Database Exception * * @package Piwik - * @subpackage Piwik_Tracker + * @subpackage Tracker */ class Piwik_Tracker_Db_Exception extends Exception { diff --git a/core/Tracker/Db/Mysqli.php b/core/Tracker/Db/Mysqli.php index 96036499a0..12ed3ed725 100644 --- a/core/Tracker/Db/Mysqli.php +++ b/core/Tracker/Db/Mysqli.php @@ -13,7 +13,7 @@ * mysqli wrapper * * @package Piwik - * @subpackage Piwik_Tracker + * @subpackage Tracker */ class Piwik_Tracker_Db_Mysqli extends Piwik_Tracker_Db { diff --git a/core/Tracker/Db/Pdo/Mysql.php b/core/Tracker/Db/Pdo/Mysql.php index aaca0b2780..de201fd511 100644 --- a/core/Tracker/Db/Pdo/Mysql.php +++ b/core/Tracker/Db/Pdo/Mysql.php @@ -13,7 +13,7 @@ * PDO MySQL wrapper * * @package Piwik - * @subpackage Piwik_Tracker + * @subpackage Tracker */ class Piwik_Tracker_Db_Pdo_Mysql extends Piwik_Tracker_Db { diff --git a/core/Tracker/Db/Pdo/Pgsql.php b/core/Tracker/Db/Pdo/Pgsql.php index f6c282d156..52e04e27f4 100644 --- a/core/Tracker/Db/Pdo/Pgsql.php +++ b/core/Tracker/Db/Pdo/Pgsql.php @@ -13,7 +13,7 @@ * PDO PostgreSQL wrapper * * @package Piwik - * @subpackage Piwik_Tracker + * @subpackage Tracker */ class Piwik_Tracker_Db_Pdo_Pgsql extends Piwik_Tracker_Db_Pdo_Mysql { diff --git a/core/Tracker/GoalManager.php b/core/Tracker/GoalManager.php index 719639619d..88e5057c09 100644 --- a/core/Tracker/GoalManager.php +++ b/core/Tracker/GoalManager.php @@ -10,10 +10,11 @@ */ use Piwik\Config; use Piwik\Common; +use Piwik\Tracker; /** * @package Piwik - * @subpackage Piwik_Tracker + * @subpackage Tracker */ class Piwik_Tracker_GoalManager { @@ -238,7 +239,7 @@ class Piwik_Tracker_GoalManager 'idvisit' => $visitorInformation['idvisit'], 'idsite' => $idSite, 'idvisitor' => $visitorInformation['idvisitor'], - 'server_time' => Piwik_Tracker::getDatetimeFromTimestamp($visitorInformation['visit_last_action_time']), + 'server_time' => Tracker::getDatetimeFromTimestamp($visitorInformation['visit_last_action_time']), 'location_country' => $location_country, 'visitor_returning' => $visitorInformation['visitor_returning'], 'visitor_days_since_first' => $visitorInformation['visitor_days_since_first'], @@ -254,7 +255,7 @@ class Piwik_Tracker_GoalManager } // Copy Custom Variables from Visit row to the Goal conversion - for ($i = 1; $i <= Piwik_Tracker::MAX_CUSTOM_VARIABLES; $i++) { + for ($i = 1; $i <= Tracker::MAX_CUSTOM_VARIABLES; $i++) { if (isset($visitorInformation['custom_var_k' . $i]) && strlen($visitorInformation['custom_var_k' . $i]) ) { @@ -449,7 +450,7 @@ class Piwik_Tracker_GoalManager self::ITEM_IDORDER_ABANDONED_CART ); - $itemsInDb = Piwik_Tracker::getDatabase()->fetchAll($sql, $bind); + $itemsInDb = Tracker::getDatabase()->fetchAll($sql, $bind); Common::printDebug("Items found in current cart, for conversion_item (visit,idorder)=" . var_export($bind, true)); Common::printDebug($itemsInDb); @@ -668,7 +669,7 @@ class Piwik_Tracker_GoalManager $sqlBind[] = $newRow['idvisit']; $sqlBind[] = $item['idorder_original_value']; $sqlBind[] = $newRow['idaction_sku']; - Piwik_Tracker::getDatabase()->query($sql, $sqlBind); + Tracker::getDatabase()->query($sql, $sqlBind); } } @@ -704,7 +705,7 @@ class Piwik_Tracker_GoalManager $i++; $bind = array_merge($bind, $newRow); } - Piwik_Tracker::getDatabase()->query($sql, $bind); + Tracker::getDatabase()->query($sql, $bind); Common::printDebug($sql); Common::printDebug($bind); } @@ -793,16 +794,16 @@ class Piwik_Tracker_GoalManager $sql = 'UPDATE ' . Common::prefixTable('log_conversion') . " SET " . implode($updateParts, ', ') . " WHERE " . implode($updateWhereParts, ' AND '); - Piwik_Tracker::getDatabase()->query($sql, $sqlBind); + Tracker::getDatabase()->query($sql, $sqlBind); return true; } else { $sql = 'INSERT IGNORE INTO ' . Common::prefixTable('log_conversion') . " ($fields) VALUES ($bindFields) "; $bind = array_values($newGoal); - $result = Piwik_Tracker::getDatabase()->query($sql, $bind); + $result = Tracker::getDatabase()->query($sql, $bind); // If a record was inserted, we return true - return Piwik_Tracker::getDatabase()->rowCount($result) > 0; + return Tracker::getDatabase()->rowCount($result) > 0; } } diff --git a/core/Tracker/IgnoreCookie.php b/core/Tracker/IgnoreCookie.php index 7253c25520..38f1b96f66 100644 --- a/core/Tracker/IgnoreCookie.php +++ b/core/Tracker/IgnoreCookie.php @@ -9,39 +9,40 @@ * @package Piwik */ use Piwik\Config; +use Piwik\Cookie; /** * Tracking cookies. * * @package Piwik - * @subpackage Piwik_Tracker + * @subpackage Tracker */ class Piwik_Tracker_IgnoreCookie { /** * Get tracking cookie * - * @return Piwik_Cookie + * @return Cookie */ static public function getTrackingCookie() { $cookie_name = @Config::getInstance()->Tracker['cookie_name']; $cookie_path = @Config::getInstance()->Tracker['cookie_path']; - return new Piwik_Cookie($cookie_name, null, $cookie_path); + return new Cookie($cookie_name, null, $cookie_path); } /** * Get ignore (visit) cookie * - * @return Piwik_Cookie + * @return Cookie */ static public function getIgnoreCookie() { $cookie_name = @Config::getInstance()->Tracker['ignore_visits_cookie_name']; $cookie_path = @Config::getInstance()->Tracker['cookie_path']; - return new Piwik_Cookie($cookie_name, null, $cookie_path); + return new Cookie($cookie_name, null, $cookie_path); } /** diff --git a/core/Tracker/Referer.php b/core/Tracker/Referer.php index b1389c256b..5b9765ecea 100644 --- a/core/Tracker/Referer.php +++ b/core/Tracker/Referer.php @@ -12,7 +12,7 @@ use Piwik\Common; /** * @package Piwik - * @subpackage Piwik_Tracker + * @subpackage Tracker */ class Piwik_Tracker_Referer { diff --git a/core/Tracker/Request.php b/core/Tracker/Request.php index c27ebe6b9a..bf878bb106 100644 --- a/core/Tracker/Request.php +++ b/core/Tracker/Request.php @@ -1,6 +1,9 @@ <?php use Piwik\Config; use Piwik\Common; +use Piwik\Cookie; +use Piwik\IP; +use Piwik\Tracker; /** * Piwik - Open source web analytics @@ -292,7 +295,7 @@ class Piwik_Tracker_Request foreach ($customVar as $id => $keyValue) { $id = (int)$id; if ($id < 1 - || $id > Piwik_Tracker::MAX_CUSTOM_VARIABLES + || $id > Tracker::MAX_CUSTOM_VARIABLES || count($keyValue) != 2 || (!is_string($keyValue[0]) && !is_numeric($keyValue[0])) ) { @@ -316,7 +319,7 @@ class Piwik_Tracker_Request static public function truncateCustomVariable($input) { - return substr(trim($input), 0, Piwik_Tracker::MAX_LENGTH_CUSTOM_VARIABLE); + return substr(trim($input), 0, Tracker::MAX_LENGTH_CUSTOM_VARIABLE); } protected function shouldUseThirdPartyCookie() @@ -342,7 +345,7 @@ class Piwik_Tracker_Request protected function makeThirdPartyCookie() { - $cookie = new Piwik_Cookie( + $cookie = new Cookie( $this->getCookieName(), $this->getCookieExpire(), $this->getCookiePath()); @@ -376,8 +379,8 @@ class Piwik_Tracker_Request // Was a Visitor ID "forced" (@see Tracking API setVisitorId()) for this request? $idVisitor = $this->getForcedVisitorId(); if (!empty($idVisitor)) { - if (strlen($idVisitor) != Piwik_Tracker::LENGTH_HEX_ID_STRING) { - throw new Exception("Visitor ID (cid) $idVisitor must be " . Piwik_Tracker::LENGTH_HEX_ID_STRING . " characters long"); + if (strlen($idVisitor) != Tracker::LENGTH_HEX_ID_STRING) { + throw new Exception("Visitor ID (cid) $idVisitor must be " . Tracker::LENGTH_HEX_ID_STRING . " characters long"); } Common::printDebug("Request will be recorded for this idvisitor = " . $idVisitor); $found = true; @@ -391,7 +394,7 @@ class Piwik_Tracker_Request $cookie = $this->makeThirdPartyCookie(); $idVisitor = $cookie->get(0); if ($idVisitor !== false - && strlen($idVisitor) == Piwik_Tracker::LENGTH_HEX_ID_STRING + && strlen($idVisitor) == Tracker::LENGTH_HEX_ID_STRING ) { $found = true; } @@ -400,11 +403,11 @@ class Piwik_Tracker_Request // If a third party cookie was not found, we default to the first party cookie if (!$found) { $idVisitor = Common::getRequestVar('_id', '', 'string', $this->params); - $found = strlen($idVisitor) >= Piwik_Tracker::LENGTH_HEX_ID_STRING; + $found = strlen($idVisitor) >= Tracker::LENGTH_HEX_ID_STRING; } if ($found) { - $truncated = substr($idVisitor, 0, Piwik_Tracker::LENGTH_HEX_ID_STRING); + $truncated = substr($idVisitor, 0, Tracker::LENGTH_HEX_ID_STRING); $binVisitorId = @Common::hex2bin($truncated); if (!empty($binVisitorId)) { return $binVisitorId; @@ -418,9 +421,9 @@ class Piwik_Tracker_Request if (!empty($this->enforcedIp)) { $ipString = $this->enforcedIp; } else { - $ipString = Piwik_IP::getIpFromHeader(); + $ipString = IP::getIpFromHeader(); } - $ip = Piwik_IP::P2N($ipString); + $ip = IP::P2N($ipString); return $ip; } diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php index da14bb6de0..97e398b0f2 100644 --- a/core/Tracker/Visit.php +++ b/core/Tracker/Visit.php @@ -10,10 +10,12 @@ */ use Piwik\Config; use Piwik\Common; +use Piwik\IP; +use Piwik\Tracker; /** * @package Piwik - * @subpackage Piwik_Tracker + * @subpackage Tracker */ interface Piwik_Tracker_Visit_Interface { @@ -33,7 +35,7 @@ interface Piwik_Tracker_Visit_Interface * One request to the piwik.php script is associated to one action. * * @package Piwik - * @subpackage Piwik_Tracker + * @subpackage Tracker */ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface { @@ -268,9 +270,9 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface if ($incrementActions) { $sqlActionUpdate .= "visit_total_actions = visit_total_actions + 1, "; } - Common::printDebug("Visit is known (IP = " . Piwik_IP::N2P($this->getVisitorIp()) . ")"); + Common::printDebug("Visit is known (IP = " . IP::N2P($this->getVisitorIp()) . ")"); - $datetimeServer = Piwik_Tracker::getDatetimeFromTimestamp($this->request->getCurrentTimestamp()); + $datetimeServer = Tracker::getDatetimeFromTimestamp($this->request->getCurrentTimestamp()); $valuesToUpdate['visit_last_action_time'] = $datetimeServer; // Add 1 so it's always > 0 @@ -291,7 +293,7 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface } // Might update the idvisitor when it was forced or overwritten for this visit - if (strlen($this->visitorInfo['idvisitor']) == Piwik_Tracker::LENGTH_BINARY_ID) { + if (strlen($this->visitorInfo['idvisitor']) == Tracker::LENGTH_BINARY_ID) { $valuesToUpdate['idvisitor'] = $this->visitorInfo['idvisitor']; } @@ -324,7 +326,7 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface AND idvisit = ?"; array_push($sqlBind, $this->request->getIdSite(), (int)$this->visitorInfo['idvisit']); - $result = Piwik_Tracker::getDatabase()->query($sqlQuery, $sqlBind); + $result = Tracker::getDatabase()->query($sqlQuery, $sqlBind); $this->visitorInfo['visit_last_action_time'] = $this->request->getCurrentTimestamp(); @@ -334,7 +336,7 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface } Common::printDebug('Updating existing visit: ' . var_export($valuesToUpdate, true)); - if (Piwik_Tracker::getDatabase()->rowCount($result) == 0) { + if (Tracker::getDatabase()->rowCount($result) == 0) { Common::printDebug("Visitor with this idvisit wasn't found in the DB."); Common::printDebug("$sqlQuery --- "); Common::printDebug($sqlBind); @@ -373,7 +375,7 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface */ protected function handleNewVisit($idActionUrl, $idActionName, $actionType, $visitIsConverted) { - Common::printDebug("New Visit (IP = " . Piwik_IP::N2P($this->getVisitorIp()) . ")"); + Common::printDebug("New Visit (IP = " . IP::N2P($this->getVisitorIp()) . ")"); $daysSinceFirstVisit = $this->request->getDaysSinceFirstVisit(); $visitCount = $this->request->getVisitCount(); @@ -414,8 +416,8 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface 'visitor_days_since_last' => $daysSinceLastVisit, 'visitor_days_since_order' => $daysSinceLastOrder, 'visitor_days_since_first' => $daysSinceFirstVisit, - 'visit_first_action_time' => Piwik_Tracker::getDatetimeFromTimestamp($this->request->getCurrentTimestamp()), - 'visit_last_action_time' => Piwik_Tracker::getDatetimeFromTimestamp($this->request->getCurrentTimestamp()), + 'visit_first_action_time' => Tracker::getDatetimeFromTimestamp($this->request->getCurrentTimestamp()), + 'visit_last_action_time' => Tracker::getDatetimeFromTimestamp($this->request->getCurrentTimestamp()), 'visit_entry_idaction_url' => (int)$idActionUrl, 'visit_entry_idaction_name' => (int)$idActionName, 'visit_exit_idaction_url' => (int)$idActionUrl, @@ -495,7 +497,7 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface private function getVisitorLocation($browserLang) { $location = array(); - $userInfo = array('lang' => $browserLang, 'ip' => Piwik_IP::N2P($this->getVisitorIp())); + $userInfo = array('lang' => $browserLang, 'ip' => IP::N2P($this->getVisitorIp())); Piwik_PostEvent('Tracker.getVisitorLocation', array(&$location, $userInfo)); $location = $this->request->enrichLocation($location); @@ -575,9 +577,9 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface $sql = "INSERT INTO " . Common::prefixTable('log_visit') . " ($fields) VALUES ($values)"; $bind = array_values($this->visitorInfo); - Piwik_Tracker::getDatabase()->query($sql, $bind); + Tracker::getDatabase()->query($sql, $bind); - $idVisit = Piwik_Tracker::getDatabase()->lastInsertId(); + $idVisit = Tracker::getDatabase()->lastInsertId(); $this->visitorInfo['idvisit'] = $idVisit; $this->visitorInfo['visit_first_action_time'] = $this->request->getCurrentTimestamp(); @@ -598,7 +600,7 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface } // If the visitor had a first party ID cookie, then we use this value if (!empty($this->visitorInfo['idvisitor']) - && strlen($this->visitorInfo['idvisitor']) == Piwik_Tracker::LENGTH_BINARY_ID + && strlen($this->visitorInfo['idvisitor']) == Tracker::LENGTH_BINARY_ID ) { return $this->visitorInfo['idvisitor']; } @@ -610,7 +612,7 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface */ static public function generateUniqueVisitorId() { - $uniqueId = substr(Common::generateUniqId(), 0, Piwik_Tracker::LENGTH_HEX_ID_STRING); + $uniqueId = substr(Common::generateUniqId(), 0, Tracker::LENGTH_HEX_ID_STRING); return $uniqueId; } @@ -758,7 +760,7 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface } - $visitRow = Piwik_Tracker::getDatabase()->fetch($sql, $bindSql); + $visitRow = Tracker::getDatabase()->fetch($sql, $bindSql); $isNewVisitForced = $this->request->getParam('new_visit'); $isNewVisitForced = !empty($isNewVisitForced); @@ -798,7 +800,7 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface // Custom Variables copied from Visit in potential later conversion if (!empty($selectCustomVariables)) { - for ($i = 1; $i <= Piwik_Tracker::MAX_CUSTOM_VARIABLES; $i++) { + for ($i = 1; $i <= Tracker::MAX_CUSTOM_VARIABLES; $i++) { if (isset($visitRow['custom_var_k' . $i]) && strlen($visitRow['custom_var_k' . $i]) ) { @@ -1018,7 +1020,7 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface protected function getConfigHash($os, $browserName, $browserVersion, $resolution, $plugin_Flash, $plugin_Java, $plugin_Director, $plugin_Quicktime, $plugin_RealPlayer, $plugin_PDF, $plugin_WindowsMedia, $plugin_Gears, $plugin_Silverlight, $plugin_Cookie, $ip, $browserLang) { $hash = md5($os . $browserName . $browserVersion . $plugin_Flash . $plugin_Java . $plugin_Director . $plugin_Quicktime . $plugin_RealPlayer . $plugin_PDF . $plugin_WindowsMedia . $plugin_Gears . $plugin_Silverlight . $plugin_Cookie . $ip . $browserLang, $raw_output = true); - return Common::substr($hash, 0, Piwik_Tracker::LENGTH_BINARY_ID); + return Common::substr($hash, 0, Tracker::LENGTH_BINARY_ID); } /** @@ -1055,7 +1057,7 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface /** * @package Piwik - * @subpackage Piwik_Tracker + * @subpackage Tracker */ class Piwik_Tracker_Visit_VisitorNotFoundInDatabase extends Exception { diff --git a/core/Tracker/VisitExcluded.php b/core/Tracker/VisitExcluded.php index fc9fbfe52f..70d8d23e0b 100644 --- a/core/Tracker/VisitExcluded.php +++ b/core/Tracker/VisitExcluded.php @@ -9,6 +9,7 @@ * @package Piwik */ use Piwik\Common; +use Piwik\IP; /** * This class contains the logic to exclude some visitors from being tracked as per user settings @@ -134,7 +135,7 @@ class Piwik_Tracker_VisitExcluded || strpos($this->userAgent, 'Google Page Speed Insights') !== false // #4049 || strpos($this->userAgent, 'bingbot') !== false // Bingbot || strpos($this->userAgent, 'YottaaMonitor') !== false // Yottaa - || Piwik_IP::isIpInRange($this->ip, $this->getBotIpRanges())); + || IP::isIpInRange($this->ip, $this->getBotIpRanges())); } protected function getBotIpRanges() @@ -182,8 +183,8 @@ class Piwik_Tracker_VisitExcluded { $websiteAttributes = Piwik_Tracker_Cache::getCacheWebsiteAttributes($this->idSite); if (!empty($websiteAttributes['excluded_ips'])) { - if (Piwik_IP::isIpInRange($this->ip, $websiteAttributes['excluded_ips'])) { - Common::printDebug('Visitor IP ' . Piwik_IP::N2P($this->ip) . ' is excluded from being tracked'); + if (IP::isIpInRange($this->ip, $websiteAttributes['excluded_ips'])) { + Common::printDebug('Visitor IP ' . IP::N2P($this->ip) . ' is excluded from being tracked'); return true; } } diff --git a/core/TranslationWriter.php b/core/TranslationWriter.php index a103799d33..566b2112f8 100644 --- a/core/TranslationWriter.php +++ b/core/TranslationWriter.php @@ -9,6 +9,9 @@ * @package Piwik * */ +namespace Piwik; + +use Exception; use Piwik\Common; /** @@ -16,7 +19,7 @@ use Piwik\Common; * * @package Piwik */ -class Piwik_TranslationWriter +class TranslationWriter { static private $baseTranslation = null; diff --git a/core/Twig.php b/core/Twig.php index 124f018fb5..ea5e23d9f5 100644 --- a/core/Twig.php +++ b/core/Twig.php @@ -8,17 +8,29 @@ * @category Piwik * @package Piwik */ +namespace Piwik; + +use Exception; use Piwik\Piwik; use Piwik\Common; +use Piwik\AssetManager; use Piwik\Translate; +use Piwik\Url; +use Piwik_Visualization_Sparkline; +use Twig_Environment; +use Twig_Extension_Debug; +use Twig_Loader_Chain; +use Twig_Loader_Filesystem; +use Twig_SimpleFilter; +use Twig_SimpleFunction; /** * Twig class * * @package Piwik - * @subpackage Piwik_Twig + * @subpackage Twig */ -class Piwik_Twig +class Twig { /** * @var Twig_Environment @@ -37,9 +49,9 @@ class Piwik_Twig // Create new Twig Environment and set cache dir $this->twig = new Twig_Environment($chainLoader, array( - 'debug' => true, // to use {{ dump(var) }} in twig templates + 'debug' => true, // to use {{ dump(var) }} in twig templates 'strict_variables' => true, // throw an exception if variables are invalid - 'cache' => PIWIK_USER_PATH . '/tmp/templates_c', + 'cache' => PIWIK_USER_PATH . '/tmp/templates_c', ) ); $this->twig->addExtension(new Twig_Extension_Debug()); @@ -50,7 +62,7 @@ class Piwik_Twig $this->addFilter_sumTime(); $this->addFilter_money(); $this->addFilter_truncate(); - $this->twig->addFilter( new Twig_SimpleFilter('implode', 'implode')); + $this->twig->addFilter(new Twig_SimpleFilter('implode', 'implode')); $this->addFunction_includeAssets(); $this->addFunction_linkTo(); @@ -69,9 +81,9 @@ class Piwik_Twig $assetType = strtolower($params['type']); switch ($assetType) { case 'css': - return Piwik_AssetManager::getCssAssets(); + return AssetManager::getCssAssets(); case 'js': - return Piwik_AssetManager::getJsAssets(); + return AssetManager::getJsAssets(); default: throw new Exception("The twig function includeAssets 'type' parameter needs to be either 'css' or 'js'."); } @@ -125,7 +137,7 @@ class Piwik_Twig protected function addFunction_linkTo() { $urlFunction = new Twig_SimpleFunction('linkTo', function ($params) { - return 'index.php' . Piwik_Url::getCurrentQueryStringWithParametersModified($params); + return 'index.php' . Url::getCurrentQueryStringWithParametersModified($params); }); $this->twig->addFunction($urlFunction); } @@ -136,8 +148,8 @@ class Piwik_Twig private function getDefaultThemeLoader() { $themeLoader = new Twig_Loader_Filesystem(array( - sprintf("%s/plugins/%s/templates/", PIWIK_INCLUDE_PATH, \Piwik\PluginsManager::DEFAULT_THEME) - )); + sprintf("%s/plugins/%s/templates/", PIWIK_INCLUDE_PATH, \Piwik\PluginsManager::DEFAULT_THEME) + )); return $themeLoader; } @@ -185,7 +197,7 @@ class Piwik_Twig { $urlRewriteFilter = new Twig_SimpleFilter('urlRewriteWithParameters', function ($parameters) { $parameters['updated'] = null; - $url = Piwik_Url::getCurrentQueryStringWithParametersModified($parameters); + $url = Url::getCurrentQueryStringWithParametersModified($parameters); return $url; }); $this->twig->addFilter($urlRewriteFilter); @@ -214,7 +226,7 @@ class Piwik_Twig private function addPluginNamespaces(Twig_Loader_Filesystem $loader) { $plugins = \Piwik\PluginsManager::getInstance()->getLoadedPluginsName(); - foreach($plugins as $name) { + foreach ($plugins as $name) { $name = Common::unprefixClass($name); $path = sprintf("%s/plugins/%s/templates/", PIWIK_INCLUDE_PATH, $name); if (is_dir($path)) { diff --git a/core/Unzip.php b/core/Unzip.php index ed915b27f7..003b37a9e0 100644 --- a/core/Unzip.php +++ b/core/Unzip.php @@ -9,12 +9,20 @@ * @package Piwik */ +namespace Piwik; + +use Piwik_Unzip_Gzip; +use Piwik_Unzip_Interface; +use Piwik_Unzip_PclZip; +use Piwik_Unzip_Tar; +use Piwik_Unzip_ZipArchive; + /** * Unzip wrapper around ZipArchive and PclZip * * @package Piwik */ -class Piwik_Unzip +class Unzip { /** * Factory method to create an unarchiver diff --git a/core/Unzip/Gzip.php b/core/Unzip/Gzip.php index b7d7c14a35..86d7bace14 100755 --- a/core/Unzip/Gzip.php +++ b/core/Unzip/Gzip.php @@ -13,7 +13,7 @@ * Unzip implementation for .gz files. * * @package Piwik - * @subpackage Piwik_Unzip + * @subpackage Unzip */ class Piwik_Unzip_Gzip implements Piwik_Unzip_Interface { diff --git a/core/Unzip/Interface.php b/core/Unzip/Interface.php index 5c9bccd82d..bd20ddec0b 100644 --- a/core/Unzip/Interface.php +++ b/core/Unzip/Interface.php @@ -13,7 +13,7 @@ * Unzip interface * * @package Piwik - * @subpackage Piwik_Unzip + * @subpackage Unzip */ interface Piwik_Unzip_Interface { diff --git a/core/Unzip/PclZip.php b/core/Unzip/PclZip.php index d6351cdca9..043f77925c 100644 --- a/core/Unzip/PclZip.php +++ b/core/Unzip/PclZip.php @@ -18,7 +18,7 @@ require_once PIWIK_INCLUDE_PATH . '/libs/PclZip/pclzip.lib.php'; * Unzip wrapper around PclZip * * @package Piwik - * @subpackage Piwik_Unzip + * @subpackage Unzip */ class Piwik_Unzip_PclZip implements Piwik_Unzip_Interface { diff --git a/core/Unzip/Tar.php b/core/Unzip/Tar.php index ad7aebf6b9..e243cbeffb 100755 --- a/core/Unzip/Tar.php +++ b/core/Unzip/Tar.php @@ -18,7 +18,7 @@ require_once PIWIK_INCLUDE_PATH . '/libs/Archive_Tar/Tar.php'; * Unzip implementation for Archive_Tar PEAR lib. * * @package Piwik - * @subpackage Piwik_Unzip + * @subpackage Unzip */ class Piwik_Unzip_Tar implements Piwik_Unzip_Interface { diff --git a/core/Unzip/ZipArchive.php b/core/Unzip/ZipArchive.php index c542f5f259..fdb1aa8cfd 100644 --- a/core/Unzip/ZipArchive.php +++ b/core/Unzip/ZipArchive.php @@ -13,7 +13,7 @@ * Unzip wrapper around ZipArchive * * @package Piwik - * @subpackage Piwik_Unzip + * @subpackage Unzip */ class Piwik_Unzip_ZipArchive implements Piwik_Unzip_Interface { diff --git a/core/UpdateCheck.php b/core/UpdateCheck.php index 85d1716f29..2c30124676 100644 --- a/core/UpdateCheck.php +++ b/core/UpdateCheck.php @@ -8,15 +8,22 @@ * @category Piwik * @package Piwik */ +namespace Piwik; + +use Exception; use Piwik\Config; use Piwik\Common; +use Piwik\Http; +use Piwik_SitesManager_API; +use Piwik\Url; +use Piwik\Version; /** * Class to check if a newer version of Piwik is available * * @package Piwik */ -class Piwik_UpdateCheck +class UpdateCheck { const CHECK_INTERVAL = 28800; // every 8 hours const UI_CLICK_CHECK_INTERVAL = 10; // every 10s when user clicks UI link @@ -28,7 +35,7 @@ class Piwik_UpdateCheck * Check for a newer version * * @param bool $force Force check - * @param int $interval Interval used for update checks + * @param int $interval Interval used for update checks */ public static function check($force = false, $interval = null) { @@ -44,9 +51,9 @@ class Piwik_UpdateCheck // set the time checked first, so that parallel Piwik requests don't all trigger the http requests Piwik_SetOption(self::LAST_TIME_CHECKED, time(), $autoLoad = 1); $parameters = array( - 'piwik_version' => Piwik_Version::VERSION, + 'piwik_version' => Version::VERSION, 'php_version' => PHP_VERSION, - 'url' => Piwik_Url::getCurrentUrlWithoutQueryString(), + 'url' => Url::getCurrentUrlWithoutQueryString(), 'trigger' => Common::getRequestVar('module', '', 'string'), 'timezone' => Piwik_SitesManager_API::getInstance()->getDefaultTimezone(), ); @@ -61,7 +68,7 @@ class Piwik_UpdateCheck } try { - $latestVersion = Piwik_Http::sendHttpRequest($url, $timeout); + $latestVersion = Http::sendHttpRequest($url, $timeout); if (!preg_match('~^[0-9][0-9a-zA-Z_.-]*$~D', $latestVersion)) { $latestVersion = ''; } @@ -83,7 +90,7 @@ class Piwik_UpdateCheck { $latestVersion = Piwik_GetOption(self::LATEST_VERSION); if (!empty($latestVersion) - && version_compare(Piwik_Version::VERSION, $latestVersion) == -1 + && version_compare(Version::VERSION, $latestVersion) == -1 ) { return $latestVersion; } diff --git a/core/Updater.php b/core/Updater.php index bc62eca147..a0000eeb55 100644 --- a/core/Updater.php +++ b/core/Updater.php @@ -9,19 +9,15 @@ * @package Piwik */ use Piwik\Common; - -/** - * @see core/Option.php - */ -require_once PIWIK_INCLUDE_PATH . '/core/Option.php'; +use Piwik\Version; /** * Load and execute all relevant, incremental update scripts for Piwik core and plugins, and bump the component version numbers for completed updates. * * @package Piwik - * @subpackage Piwik_Updater + * @subpackage Updater */ -class Piwik_Updater +class Updater { const INDEX_CURRENT_VERSION = 0; const INDEX_NEW_VERSION = 1; @@ -130,7 +126,7 @@ class Piwik_Updater $this->hasMajorDbUpdate = $this->hasMajorDbUpdate || call_user_func(array($className, 'isMajorUpdate')); } } - // unfortunately had to extract this query from the Piwik_Option class + // unfortunately had to extract this query from the Option class $queries[] = 'UPDATE `' . Common::prefixTable('option') . '` SET option_value = \'' . $fileVersion . '\' WHERE option_name = \'' . $this->getNameInOptionTable($componentName) . '\';'; @@ -257,7 +253,7 @@ class Piwik_Updater if ($currentVersion === false) { if ($name === 'core') { // This should not happen - $currentVersion = Piwik_Version::VERSION; + $currentVersion = Version::VERSION; } else { $currentVersion = '0.0.1'; } @@ -288,7 +284,7 @@ class Piwik_Updater { foreach ($sqlarray as $update => $ignoreError) { try { - Piwik_Exec($update); + Db::exec($update); } catch (Exception $e) { if (($ignoreError === false) || !Zend_Registry::get('db')->isErrNo($e, $ignoreError) @@ -305,7 +301,7 @@ class Piwik_Updater * Exception thrown by updater if a non-recoverable error occurs * * @package Piwik - * @subpackage Piwik_Updater + * @subpackage Updater */ class Piwik_Updater_UpdateErrorException extends Exception { diff --git a/core/Updates.php b/core/Updates.php index e4387d0634..9f5e7ab1ee 100644 --- a/core/Updates.php +++ b/core/Updates.php @@ -8,6 +8,8 @@ * @category Piwik * @package Piwik */ +namespace Piwik; + use Piwik\Config; /** @@ -16,7 +18,7 @@ use Piwik\Config; * @example core/Updates/0.4.2.php * @package Piwik */ -abstract class Piwik_Updates +abstract class Updates { /** * Return SQL to be executed in this update @@ -87,7 +89,6 @@ abstract class Piwik_Updates $config->forceSave(); } - public static function deletePluginFromConfigFile($pluginToDelete) { $config = Config::getInstance(); @@ -108,6 +109,4 @@ abstract class Piwik_Updates $config->forceSave(); } } - - } diff --git a/core/Updates/0.2.10.php b/core/Updates/0.2.10.php index a85bcb88a8..da9a669abd 100644 --- a/core/Updates/0.2.10.php +++ b/core/Updates/0.2.10.php @@ -10,11 +10,13 @@ */ use Piwik\Piwik; use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_2_10 extends Piwik_Updates +class Piwik_Updates_0_2_10 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/0.2.12.php b/core/Updates/0.2.12.php index 378ad1c724..54b4dd41f8 100644 --- a/core/Updates/0.2.12.php +++ b/core/Updates/0.2.12.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_2_12 extends Piwik_Updates +class Piwik_Updates_0_2_12 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/0.2.13.php b/core/Updates/0.2.13.php index 15c510bb25..0cf92efc3d 100644 --- a/core/Updates/0.2.13.php +++ b/core/Updates/0.2.13.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_2_13 extends Piwik_Updates +class Piwik_Updates_0_2_13 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/0.2.24.php b/core/Updates/0.2.24.php index e6515309b1..f98c46fba6 100644 --- a/core/Updates/0.2.24.php +++ b/core/Updates/0.2.24.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_2_24 extends Piwik_Updates +class Piwik_Updates_0_2_24 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/0.2.27.php b/core/Updates/0.2.27.php index e88ab68ffb..a53430d182 100644 --- a/core/Updates/0.2.27.php +++ b/core/Updates/0.2.27.php @@ -10,11 +10,13 @@ */ use Piwik\Piwik; use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_2_27 extends Piwik_Updates +class Piwik_Updates_0_2_27 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/0.2.32.php b/core/Updates/0.2.32.php index b13a40ad18..d80b2826a9 100644 --- a/core/Updates/0.2.32.php +++ b/core/Updates/0.2.32.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_2_32 extends Piwik_Updates +class Piwik_Updates_0_2_32 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/0.2.33.php b/core/Updates/0.2.33.php index 50d6a2eea3..b871521187 100644 --- a/core/Updates/0.2.33.php +++ b/core/Updates/0.2.33.php @@ -10,11 +10,13 @@ */ use Piwik\Piwik; use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_2_33 extends Piwik_Updates +class Piwik_Updates_0_2_33 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/0.2.34.php b/core/Updates/0.2.34.php index bfefb5b501..b49b8cd28c 100644 --- a/core/Updates/0.2.34.php +++ b/core/Updates/0.2.34.php @@ -9,11 +9,12 @@ * @package Updates */ use Piwik\Piwik; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_2_34 extends Piwik_Updates +class Piwik_Updates_0_2_34 extends Updates { static function update($schema = 'Myisam') { diff --git a/core/Updates/0.2.35.php b/core/Updates/0.2.35.php index c5377fb43f..23800f8404 100644 --- a/core/Updates/0.2.35.php +++ b/core/Updates/0.2.35.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_2_35 extends Piwik_Updates +class Piwik_Updates_0_2_35 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/0.2.37.php b/core/Updates/0.2.37.php index a415ebbe58..be90976039 100644 --- a/core/Updates/0.2.37.php +++ b/core/Updates/0.2.37.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_2_37 extends Piwik_Updates +class Piwik_Updates_0_2_37 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/0.4.1.php b/core/Updates/0.4.1.php index 1e06dd7fb3..4fa7ee8035 100644 --- a/core/Updates/0.4.1.php +++ b/core/Updates/0.4.1.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_4_1 extends Piwik_Updates +class Piwik_Updates_0_4_1 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/0.4.2.php b/core/Updates/0.4.2.php index f03b443163..a52b4a181a 100644 --- a/core/Updates/0.4.2.php +++ b/core/Updates/0.4.2.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_4_2 extends Piwik_Updates +class Piwik_Updates_0_4_2 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/0.4.4.php b/core/Updates/0.4.4.php index b63731c5e7..5c783c9ac9 100644 --- a/core/Updates/0.4.4.php +++ b/core/Updates/0.4.4.php @@ -8,11 +8,12 @@ * @category Piwik * @package Updates */ +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_4_4 extends Piwik_Updates +class Piwik_Updates_0_4_4 extends Updates { static function update() { diff --git a/core/Updates/0.4.php b/core/Updates/0.4.php index 9e9e1ee0b0..048de15e25 100644 --- a/core/Updates/0.4.php +++ b/core/Updates/0.4.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_4 extends Piwik_Updates +class Piwik_Updates_0_4 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/0.5.4.php b/core/Updates/0.5.4.php index 2a48de630f..a0ce6d61b5 100644 --- a/core/Updates/0.5.4.php +++ b/core/Updates/0.5.4.php @@ -10,11 +10,13 @@ */ use Piwik\Config; use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_5_4 extends Piwik_Updates +class Piwik_Updates_0_5_4 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/0.5.5.php b/core/Updates/0.5.5.php index 8ad736b81d..cf1c287160 100644 --- a/core/Updates/0.5.5.php +++ b/core/Updates/0.5.5.php @@ -10,11 +10,13 @@ */ use Piwik\Piwik; use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_5_5 extends Piwik_Updates +class Piwik_Updates_0_5_5 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/0.5.php b/core/Updates/0.5.php index f38c38aa46..01f52ba549 100644 --- a/core/Updates/0.5.php +++ b/core/Updates/0.5.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_5 extends Piwik_Updates +class Piwik_Updates_0_5 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/0.6-rc1.php b/core/Updates/0.6-rc1.php index f383115ae1..b2c27728f7 100644 --- a/core/Updates/0.6-rc1.php +++ b/core/Updates/0.6-rc1.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_6_rc1 extends Piwik_Updates +class Piwik_Updates_0_6_rc1 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/0.6.2.php b/core/Updates/0.6.2.php index a3625a479c..38847b6b8b 100644 --- a/core/Updates/0.6.2.php +++ b/core/Updates/0.6.2.php @@ -9,11 +9,12 @@ * @package Updates */ use Piwik\Piwik; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_6_2 extends Piwik_Updates +class Piwik_Updates_0_6_2 extends Updates { static function update() { diff --git a/core/Updates/0.6.3.php b/core/Updates/0.6.3.php index b20fd75627..8353628267 100644 --- a/core/Updates/0.6.3.php +++ b/core/Updates/0.6.3.php @@ -10,11 +10,13 @@ */ use Piwik\Config; use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_6_3 extends Piwik_Updates +class Piwik_Updates_0_6_3 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/0.7.php b/core/Updates/0.7.php index 6e00fc9f7f..ed132626c0 100644 --- a/core/Updates/0.7.php +++ b/core/Updates/0.7.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_7 extends Piwik_Updates +class Piwik_Updates_0_7 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/0.9.1.php b/core/Updates/0.9.1.php index 4bc4aab764..526c365e76 100644 --- a/core/Updates/0.9.1.php +++ b/core/Updates/0.9.1.php @@ -10,11 +10,13 @@ */ use Piwik\Piwik; use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_0_9_1 extends Piwik_Updates +class Piwik_Updates_0_9_1 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/1.1.php b/core/Updates/1.1.php index de74d8c713..ee84f4b01c 100644 --- a/core/Updates/1.1.php +++ b/core/Updates/1.1.php @@ -10,11 +10,12 @@ */ use Piwik\Config; use Piwik\Piwik; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_1 extends Piwik_Updates +class Piwik_Updates_1_1 extends Updates { static function update($schema = 'Myisam') { diff --git a/core/Updates/1.10-b4.php b/core/Updates/1.10-b4.php index 59ae4cda68..ecf98b9d7c 100755 --- a/core/Updates/1.10-b4.php +++ b/core/Updates/1.10-b4.php @@ -8,11 +8,12 @@ * @category Piwik * @package Updates */ +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_10_b4 extends Piwik_Updates +class Piwik_Updates_1_10_b4 extends Updates { static function isMajorUpdate() { diff --git a/core/Updates/1.10.1.php b/core/Updates/1.10.1.php index 38a2b53e7f..f2649393b8 100755 --- a/core/Updates/1.10.1.php +++ b/core/Updates/1.10.1.php @@ -8,11 +8,12 @@ * @category Piwik * @package Updates */ +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_10_1 extends Piwik_Updates +class Piwik_Updates_1_10_1 extends Updates { static function isMajorUpdate() { diff --git a/core/Updates/1.10.2-b1.php b/core/Updates/1.10.2-b1.php index e2d9f2130f..70a5b906cf 100755 --- a/core/Updates/1.10.2-b1.php +++ b/core/Updates/1.10.2-b1.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_10_2_b1 extends Piwik_Updates +class Piwik_Updates_1_10_2_b1 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/1.10.2-b2.php b/core/Updates/1.10.2-b2.php index 8e57c75297..40b048e27c 100644 --- a/core/Updates/1.10.2-b2.php +++ b/core/Updates/1.10.2-b2.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_10_2_b2 extends Piwik_Updates +class Piwik_Updates_1_10_2_b2 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/1.11-b1.php b/core/Updates/1.11-b1.php index 3f7a31904e..82980a3c08 100644 --- a/core/Updates/1.11-b1.php +++ b/core/Updates/1.11-b1.php @@ -8,11 +8,12 @@ * @category Piwik * @package Updates */ +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_11_b1 extends Piwik_Updates +class Piwik_Updates_1_11_b1 extends Updates { static function isMajorUpdate() { diff --git a/core/Updates/1.12-b1.php b/core/Updates/1.12-b1.php index 75c69e3839..3a9b6dd742 100644 --- a/core/Updates/1.12-b1.php +++ b/core/Updates/1.12-b1.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_12_b1 extends Piwik_Updates +class Piwik_Updates_1_12_b1 extends Updates { static function isMajorUpdate() { diff --git a/core/Updates/1.12-b15.php b/core/Updates/1.12-b15.php index ea66360caf..916af1f4c7 100644 --- a/core/Updates/1.12-b15.php +++ b/core/Updates/1.12-b15.php @@ -8,11 +8,12 @@ * @category Piwik * @package Updates */ +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_12_b15 extends Piwik_Updates +class Piwik_Updates_1_12_b15 extends Updates { static function update() { diff --git a/core/Updates/1.12-b16.php b/core/Updates/1.12-b16.php index b3956fc6ce..44819663ba 100644 --- a/core/Updates/1.12-b16.php +++ b/core/Updates/1.12-b16.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_12_b16 extends Piwik_Updates +class Piwik_Updates_1_12_b16 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/1.2-rc1.php b/core/Updates/1.2-rc1.php index 36c9e42899..409e7f7219 100644 --- a/core/Updates/1.2-rc1.php +++ b/core/Updates/1.2-rc1.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_2_rc1 extends Piwik_Updates +class Piwik_Updates_1_2_rc1 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/1.2-rc2.php b/core/Updates/1.2-rc2.php index 0ab9c30bdc..681ee893fe 100644 --- a/core/Updates/1.2-rc2.php +++ b/core/Updates/1.2-rc2.php @@ -8,11 +8,12 @@ * @category Piwik * @package Updates */ +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_2_rc2 extends Piwik_Updates +class Piwik_Updates_1_2_rc2 extends Updates { static function update() { diff --git a/core/Updates/1.2.3.php b/core/Updates/1.2.3.php index f479dff100..56383d84ea 100644 --- a/core/Updates/1.2.3.php +++ b/core/Updates/1.2.3.php @@ -10,11 +10,13 @@ */ use Piwik\Config; use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_2_3 extends Piwik_Updates +class Piwik_Updates_1_2_3 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/1.2.5-rc1.php b/core/Updates/1.2.5-rc1.php index 14d4e29a60..a13523927d 100644 --- a/core/Updates/1.2.5-rc1.php +++ b/core/Updates/1.2.5-rc1.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_2_5_rc1 extends Piwik_Updates +class Piwik_Updates_1_2_5_rc1 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/1.2.5-rc7.php b/core/Updates/1.2.5-rc7.php index dc613a7f83..badfab6eaa 100644 --- a/core/Updates/1.2.5-rc7.php +++ b/core/Updates/1.2.5-rc7.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_2_5_rc7 extends Piwik_Updates +class Piwik_Updates_1_2_5_rc7 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/1.4-rc1.php b/core/Updates/1.4-rc1.php index 6a1029a455..fcc404b06d 100644 --- a/core/Updates/1.4-rc1.php +++ b/core/Updates/1.4-rc1.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_4_rc1 extends Piwik_Updates +class Piwik_Updates_1_4_rc1 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/1.4-rc2.php b/core/Updates/1.4-rc2.php index c1b52dd079..1655a9f1b7 100644 --- a/core/Updates/1.4-rc2.php +++ b/core/Updates/1.4-rc2.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_4_rc2 extends Piwik_Updates +class Piwik_Updates_1_4_rc2 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/1.5-b1.php b/core/Updates/1.5-b1.php index 71670a7c6e..f3c2cf1a9b 100644 --- a/core/Updates/1.5-b1.php +++ b/core/Updates/1.5-b1.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_5_b1 extends Piwik_Updates +class Piwik_Updates_1_5_b1 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/1.5-b2.php b/core/Updates/1.5-b2.php index 26ca5fdd38..7a992f6c18 100644 --- a/core/Updates/1.5-b2.php +++ b/core/Updates/1.5-b2.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_5_b2 extends Piwik_Updates +class Piwik_Updates_1_5_b2 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/1.5-b3.php b/core/Updates/1.5-b3.php index 48af21fc13..4df144fe5d 100644 --- a/core/Updates/1.5-b3.php +++ b/core/Updates/1.5-b3.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_5_b3 extends Piwik_Updates +class Piwik_Updates_1_5_b3 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/1.5-b4.php b/core/Updates/1.5-b4.php index 5f0c46dfec..b4c0b40f47 100644 --- a/core/Updates/1.5-b4.php +++ b/core/Updates/1.5-b4.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_5_b4 extends Piwik_Updates +class Piwik_Updates_1_5_b4 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/1.5-b5.php b/core/Updates/1.5-b5.php index bea0539c39..d6e2cb9c7c 100644 --- a/core/Updates/1.5-b5.php +++ b/core/Updates/1.5-b5.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_5_b5 extends Piwik_Updates +class Piwik_Updates_1_5_b5 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/1.5-rc6.php b/core/Updates/1.5-rc6.php index 1015ef63db..0de1b76d18 100644 --- a/core/Updates/1.5-rc6.php +++ b/core/Updates/1.5-rc6.php @@ -8,11 +8,12 @@ * @category Piwik * @package Updates */ +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_5_rc6 extends Piwik_Updates +class Piwik_Updates_1_5_rc6 extends Updates { static function update() { diff --git a/core/Updates/1.6-b1.php b/core/Updates/1.6-b1.php index 992e5b01ee..ca578ead28 100644 --- a/core/Updates/1.6-b1.php +++ b/core/Updates/1.6-b1.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_6_b1 extends Piwik_Updates +class Piwik_Updates_1_6_b1 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/1.6-rc1.php b/core/Updates/1.6-rc1.php index b838a03727..2abd9983a9 100644 --- a/core/Updates/1.6-rc1.php +++ b/core/Updates/1.6-rc1.php @@ -8,11 +8,12 @@ * @category Piwik * @package Updates */ +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_6_rc1 extends Piwik_Updates +class Piwik_Updates_1_6_rc1 extends Updates { static function update() { diff --git a/core/Updates/1.7-b1.php b/core/Updates/1.7-b1.php index 04fb74269c..015960cb8b 100644 --- a/core/Updates/1.7-b1.php +++ b/core/Updates/1.7-b1.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_7_b1 extends Piwik_Updates +class Piwik_Updates_1_7_b1 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/1.7.2-rc5.php b/core/Updates/1.7.2-rc5.php index 42af42e7c8..72bc715645 100644 --- a/core/Updates/1.7.2-rc5.php +++ b/core/Updates/1.7.2-rc5.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_7_2_rc5 extends Piwik_Updates +class Piwik_Updates_1_7_2_rc5 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/1.7.2-rc7.php b/core/Updates/1.7.2-rc7.php index cb1d96851c..4649c89a21 100755 --- a/core/Updates/1.7.2-rc7.php +++ b/core/Updates/1.7.2-rc7.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_7_2_rc7 extends Piwik_Updates +class Piwik_Updates_1_7_2_rc7 extends Updates { static function getSql($schema = 'Myisam') { @@ -26,14 +28,14 @@ class Piwik_Updates_1_7_2_rc7 extends Piwik_Updates static function update() { try { - $dashboards = Piwik_FetchAll('SELECT * FROM `' . Common::prefixTable('user_dashboard') . '`'); + $dashboards = Db::fetchAll('SELECT * FROM `' . Common::prefixTable('user_dashboard') . '`'); foreach ($dashboards AS $dashboard) { $idDashboard = $dashboard['iddashboard']; $login = $dashboard['login']; $layout = $dashboard['layout']; $layout = html_entity_decode($layout); $layout = str_replace("\\\"", "\"", $layout); - Piwik_Query('UPDATE `' . Common::prefixTable('user_dashboard') . '` SET layout = ? WHERE iddashboard = ? AND login = ?', array($layout, $idDashboard, $login)); + Db::query('UPDATE `' . Common::prefixTable('user_dashboard') . '` SET layout = ? WHERE iddashboard = ? AND login = ?', array($layout, $idDashboard, $login)); } Piwik_Updater::updateDatabase(__FILE__, self::getSql()); } catch (Exception $e) { diff --git a/core/Updates/1.8.3-b1.php b/core/Updates/1.8.3-b1.php index 99084a2814..a991ac1f2d 100644 --- a/core/Updates/1.8.3-b1.php +++ b/core/Updates/1.8.3-b1.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_8_3_b1 extends Piwik_Updates +class Piwik_Updates_1_8_3_b1 extends Updates { static function getSql($schema = 'Myisam') @@ -55,7 +57,7 @@ class Piwik_Updates_1_8_3_b1 extends Piwik_Updates // - migrate previous reports, if any, from Common::prefixTable('pdf') to Common::prefixTable('report') // - delete Common::prefixTable('pdf') - $reports = Piwik_FetchAll('SELECT * FROM `' . Common::prefixTable('pdf') . '`'); + $reports = Db::fetchAll('SELECT * FROM `' . Common::prefixTable('pdf') . '`'); foreach ($reports AS $report) { $idreport = $report['idreport']; @@ -81,7 +83,7 @@ class Piwik_Updates_1_8_3_b1 extends Piwik_Updates $parameters[Piwik_PDFReports::EMAIL_ME_PARAMETER] = is_null($email_me) ? Piwik_PDFReports::EMAIL_ME_PARAMETER_DEFAULT_VALUE : (bool)$email_me; $parameters[Piwik_PDFReports::DISPLAY_FORMAT_PARAMETER] = $display_format; - Piwik_Query( + Db::query( 'INSERT INTO `' . Common::prefixTable('report') . '` SET idreport = ?, idsite = ?, login = ?, description = ?, period = ?, type = ?, format = ?, reports = ?, parameters = ?, ts_created = ?, @@ -103,7 +105,7 @@ class Piwik_Updates_1_8_3_b1 extends Piwik_Updates ); } - Piwik_Query('DROP TABLE `' . Common::prefixTable('pdf') . '`'); + Db::query('DROP TABLE `' . Common::prefixTable('pdf') . '`'); } catch (Exception $e) { } diff --git a/core/Updates/1.8.4-b1.php b/core/Updates/1.8.4-b1.php index f230d13da6..8a4d066165 100644 --- a/core/Updates/1.8.4-b1.php +++ b/core/Updates/1.8.4-b1.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_8_4_b1 extends Piwik_Updates +class Piwik_Updates_1_8_4_b1 extends Updates { static function isMajorUpdate() diff --git a/core/Updates/1.9-b16.php b/core/Updates/1.9-b16.php index 380a75a808..7b362e0a5c 100755 --- a/core/Updates/1.9-b16.php +++ b/core/Updates/1.9-b16.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_9_b16 extends Piwik_Updates +class Piwik_Updates_1_9_b16 extends Updates { static function isMajorUpdate() { diff --git a/core/Updates/1.9-b19.php b/core/Updates/1.9-b19.php index 03f142de0d..80e62a39f1 100755 --- a/core/Updates/1.9-b19.php +++ b/core/Updates/1.9-b19.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_9_b19 extends Piwik_Updates +class Piwik_Updates_1_9_b19 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/1.9-b9.php b/core/Updates/1.9-b9.php index 737454231e..d5fd876b1f 100755 --- a/core/Updates/1.9-b9.php +++ b/core/Updates/1.9-b9.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_9_b9 extends Piwik_Updates +class Piwik_Updates_1_9_b9 extends Updates { static function isMajorUpdate() { diff --git a/core/Updates/1.9.1-b2.php b/core/Updates/1.9.1-b2.php index 81347c0844..cff70446f8 100644 --- a/core/Updates/1.9.1-b2.php +++ b/core/Updates/1.9.1-b2.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_9_1_b2 extends Piwik_Updates +class Piwik_Updates_1_9_1_b2 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Updates/1.9.3-b10.php b/core/Updates/1.9.3-b10.php index 97e2cd5d5e..c7dc2bb1f7 100755 --- a/core/Updates/1.9.3-b10.php +++ b/core/Updates/1.9.3-b10.php @@ -8,11 +8,12 @@ * @category Piwik * @package Updates */ +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_9_3_b10 extends Piwik_Updates +class Piwik_Updates_1_9_3_b10 extends Updates { static function isMajorUpdate() { diff --git a/core/Updates/1.9.3-b3.php b/core/Updates/1.9.3-b3.php index 60257c6884..3b317e96ba 100644 --- a/core/Updates/1.9.3-b3.php +++ b/core/Updates/1.9.3-b3.php @@ -8,11 +8,12 @@ * @category Piwik * @package Updates */ +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_9_3_b3 extends Piwik_Updates +class Piwik_Updates_1_9_3_b3 extends Updates { static function update() { diff --git a/core/Updates/1.9.3-b8.php b/core/Updates/1.9.3-b8.php index 52938bd166..c961a189a6 100755 --- a/core/Updates/1.9.3-b8.php +++ b/core/Updates/1.9.3-b8.php @@ -9,11 +9,13 @@ * @package Updates */ use Piwik\Common; +use Piwik\Piwik_Updater; +use Piwik\Updates; /** * @package Updates */ -class Piwik_Updates_1_9_3_b8 extends Piwik_Updates +class Piwik_Updates_1_9_3_b8 extends Updates { static function getSql($schema = 'Myisam') { diff --git a/core/Url.php b/core/Url.php index 7ae67c1c94..80923d972c 100644 --- a/core/Url.php +++ b/core/Url.php @@ -8,9 +8,13 @@ * @category Piwik * @package Piwik */ +namespace Piwik; + +use Exception; use Piwik\Config; use Piwik\Piwik; use Piwik\Common; +use Piwik\IP; /** * Class to retrieve absolute URL or URI components of the current URL, @@ -18,7 +22,7 @@ use Piwik\Common; * * @package Piwik */ -class Piwik_Url +class Url { /** * List of hosts that are never checked for validity. @@ -44,7 +48,7 @@ class Piwik_Url * will return "http://example.org/dir1/dir2/index.php" * * @param bool $checkTrustedHost Whether to do trusted host check. Should ALWAYS be true, - * except in Piwik_Controller. + * except in Controller. * @return string */ static public function getCurrentUrlWithoutQueryString($checkTrustedHost = true) @@ -245,7 +249,7 @@ class Piwik_Url * Get host * * @param bool $checkIfTrusted Whether to do trusted host check. Should ALWAYS be true, - * except in Piwik_Controller. + * except in Controller. * @return string|false */ static public function getHost($checkIfTrusted = true) @@ -273,7 +277,7 @@ class Piwik_Url * * @param string $default Default value to return if host unknown * @param bool $checkTrustedHost Whether to do trusted host check. Should ALWAYS be true, - * except in Piwik_Controller. + * except in Controller. * @return string */ static public function getCurrentHost($default = 'unknown', $checkTrustedHost = true) @@ -286,7 +290,7 @@ class Piwik_Url $host = self::getHost($checkTrustedHost); $default = Common::sanitizeInputValue($host ? $host : $default); - return Piwik_IP::getNonProxyIpFromHeader($default, $hostHeaders); + return IP::getNonProxyIpFromHeader($default, $hostHeaders); } /** @@ -435,12 +439,12 @@ class Piwik_Url } // drop port numbers from hostnames and IP addresses - $hosts = array_map(array('Piwik_IP', 'sanitizeIp'), $hosts); + $hosts = array_map(array('Piwik\IP', 'sanitizeIp'), $hosts); $disableHostCheck = Config::getInstance()->General['enable_trusted_host_check'] == 0; // compare scheme and host $parsedUrl = @parse_url($url); - $host = Piwik_IP::sanitizeIp(@$parsedUrl['host']); + $host = IP::sanitizeIp(@$parsedUrl['host']); return !empty($host) && ($disableHostCheck || in_array($host, $hosts)) && !empty($parsedUrl['scheme']) diff --git a/core/Version.php b/core/Version.php index 83d05be495..a34c106394 100644 --- a/core/Version.php +++ b/core/Version.php @@ -9,12 +9,14 @@ * @package Piwik */ +namespace Piwik; + /** * Piwik version information. * * @package Piwik */ -final class Piwik_Version +final class Version { /** * Current Piwik version diff --git a/core/View.php b/core/View.php index 6d01d36329..7b5ea6d073 100644 --- a/core/View.php +++ b/core/View.php @@ -8,9 +8,23 @@ * @category Piwik * @package Piwik */ +namespace Piwik; + +use Exception; use Piwik\Config; use Piwik\Piwik; use Piwik\Common; +use Piwik\AssetManager; +use Piwik\Version; +use Piwik\Url; +use Piwik\UpdateCheck; +use Piwik\Twig; +use Piwik\QuickForm2; +use Piwik_SitesManager_API; +use Piwik_UsersManager_API; +use Piwik_View_Interface; +use Twig_Environment; +use Zend_Registry; /** * Transition for pre-Piwik 0.4.4 @@ -24,7 +38,7 @@ if (!defined('PIWIK_USER_PATH')) { * * @package Piwik */ -class Piwik_View implements Piwik_View_Interface +class View implements Piwik_View_Interface { private $template = ''; @@ -40,15 +54,15 @@ class Piwik_View implements Piwik_View_Interface public function __construct($templateFile) { $templateExt = '.twig'; - if(substr($templateFile, -strlen($templateExt)) !== $templateExt) { + if (substr($templateFile, -strlen($templateExt)) !== $templateExt) { $templateFile .= $templateExt; } $this->template = $templateFile; $this->initializeTwig(); - $this->piwik_version = Piwik_Version::VERSION; - $this->piwikUrl = Common::sanitizeInputValue(Piwik_Url::getCurrentUrlWithoutFileName()); + $this->piwik_version = Version::VERSION; + $this->piwikUrl = Common::sanitizeInputValue(Url::getCurrentUrlWithoutFileName()); } /** @@ -77,7 +91,7 @@ class Piwik_View implements Piwik_View_Interface public function initializeTwig() { - $piwikTwig = new Piwik_Twig(); + $piwikTwig = new Twig(); $this->twig = $piwikTwig->getTwigEnvironment(); } @@ -99,11 +113,11 @@ class Piwik_View implements Piwik_View_Interface $sites = Piwik_SitesManager_API::getInstance()->getSitesWithAtLeastViewAccess($count); usort($sites, create_function('$site1, $site2', 'return strcasecmp($site1["name"], $site2["name"]);')); $this->sites = $sites; - $this->url = Common::sanitizeInputValue(Piwik_Url::getCurrentUrl()); + $this->url = Common::sanitizeInputValue(Url::getCurrentUrl()); $this->token_auth = Piwik::getCurrentUserTokenAuth(); $this->userHasSomeAdminAccess = Piwik::isUserHasSomeAdminAccess(); $this->userIsSuperUser = Piwik::isUserIsSuperUser(); - $this->latest_version_available = Piwik_UpdateCheck::isNewestVersionAvailable(); + $this->latest_version_available = UpdateCheck::isNewestVersionAvailable(); $this->disableLink = Common::getRequestVar('disableLink', 0, 'int'); $this->isWidget = Common::getRequestVar('widget', 0, 'int'); if (Config::getInstance()->General['autocomplete_min_sites'] <= count($sites)) { @@ -116,7 +130,6 @@ class Piwik_View implements Piwik_View_Interface $user = Piwik_UsersManager_API::getInstance()->getUser($userLogin); $this->userAlias = $user['alias']; - } catch (Exception $e) { // can fail, for example at installation (no plugin loaded yet) } @@ -146,7 +159,7 @@ class Piwik_View implements Piwik_View_Interface protected function applyFilter_cacheBuster($output) { - $cacheBuster = Piwik_AssetManager::generateAssetsCacheBuster(); + $cacheBuster = AssetManager::generateAssetsCacheBuster(); $tag = 'cb=' . $cacheBuster; $pattern = array( @@ -195,9 +208,9 @@ class Piwik_View implements Piwik_View_Interface /** * Add form to view * - * @param Piwik_QuickForm2 $form + * @param QuickForm2 $form */ - public function addForm(Piwik_QuickForm2 $form) + public function addForm(QuickForm2 $form) { // assign array with form data @@ -227,7 +240,7 @@ class Piwik_View implements Piwik_View_Interface */ static public function clearCompiledTemplates() { - $view = new Piwik_View(null); + $view = new View(null); $view->twig->clearTemplateCache(); } @@ -241,7 +254,7 @@ class Piwik_View implements Piwik_View_Interface */ static public function singleReport($title, $reportHtml, $fetch = false) { - $view = new Piwik_View('@CoreHome/_singleReport'); + $view = new View('@CoreHome/_singleReport'); $view->title = $title; $view->report = $reportHtml; @@ -256,6 +269,6 @@ class Piwik_View implements Piwik_View_Interface */ static public function factory($templateName = null) { - throw new Exception("Piwik_View::factory is deprecated. Use 'new Piwik_View(\$templateFile)' instead."); + throw new Exception("View::factory is deprecated. Use 'new View(\$templateFile)' instead."); } } diff --git a/core/View/Interface.php b/core/View/Interface.php index 1998ead861..a1730cebef 100644 --- a/core/View/Interface.php +++ b/core/View/Interface.php @@ -10,7 +10,7 @@ */ /** - * Rendering interface for Piwik_View and Piwik_Visualization + * Rendering interface for View and Piwik_Visualization * * @package Piwik */ diff --git a/core/View/ReportsByDimension.php b/core/View/ReportsByDimension.php index 39da988de2..69ac869eb8 100644 --- a/core/View/ReportsByDimension.php +++ b/core/View/ReportsByDimension.php @@ -8,6 +8,9 @@ * @category Piwik * @package SmartyPlugins */ +use Piwik\FrontController; +use Piwik\View; +use Piwik\Url; /** * A facade that makes it easier to use the '_reportsByDimension.twig' template. @@ -16,7 +19,7 @@ * loads them by AJAX when clicked. The loaded report is displayed to the right * of the report listing. */ -class Piwik_View_ReportsByDimension extends Piwik_View +class Piwik_View_ReportsByDimension extends View { /** * Constructor. @@ -47,7 +50,7 @@ class Piwik_View_ReportsByDimension extends Piwik_View $categories[$category][] = array( 'title' => $title, 'params' => $params, - 'url' => Piwik_Url::getCurrentQueryStringWithParametersModified($params) + 'url' => Url::getCurrentQueryStringWithParametersModified($params) ); $this->dimensionCategories = $categories; } @@ -93,7 +96,7 @@ class Piwik_View_ReportsByDimension extends Piwik_View $module = $firstReportInfo['params']['module']; $action = $firstReportInfo['params']['action']; - $this->firstReport = Piwik_FrontController::getInstance()->fetchDispatch($module, $action); + $this->firstReport = FrontController::getInstance()->fetchDispatch($module, $action); $_GET = $oldGet; $_POST = $oldPost; diff --git a/core/ViewDataTable.php b/core/ViewDataTable.php index decc8a0cd0..d1ec61db90 100644 --- a/core/ViewDataTable.php +++ b/core/ViewDataTable.php @@ -8,6 +8,8 @@ * @category Piwik * @package Piwik */ +namespace Piwik; + use Piwik\Config; use Piwik\Metrics; use Piwik\Period; @@ -16,6 +18,7 @@ use Piwik\Piwik; use Piwik\Common; use Piwik\Date; use Piwik\DataTable; +use Piwik\Url; use Piwik\Site; /** @@ -34,7 +37,7 @@ use Piwik\Site; * <pre> * function getNumberOfVisitsPerVisitDuration( $fetch = false) * { - * $view = Piwik_ViewDataTable::factory( 'cloud' ); + * $view = ViewDataTable::factory( 'cloud' ); * $view->init( $this->pluginName, __FUNCTION__, 'VisitorInterest.getNumberOfVisitsPerVisitDuration' ); * $view->setColumnsToDisplay( array('label','nb_visits') ); * $view->disableSort(); @@ -47,9 +50,9 @@ use Piwik\Site; * * @see factory() for all the available output (cloud tags, html table, pie chart, vertical bar chart) * @package Piwik - * @subpackage Piwik_ViewDataTable + * @subpackage ViewDataTable */ -abstract class Piwik_ViewDataTable +abstract class ViewDataTable { /** * Template file that will be loaded for this view. @@ -73,7 +76,7 @@ abstract class Piwik_ViewDataTable * @var array */ protected $viewProperties = array(); - + /** * If the current dataTable refers to a subDataTable (eg. keywordsBySearchEngineId for id=X) this variable is set to the Id * @@ -135,7 +138,7 @@ abstract class Piwik_ViewDataTable * @var array */ protected $documentation = false; - + /** * Default constructor. */ @@ -216,7 +219,7 @@ abstract class Piwik_ViewDataTable * * @param string $defaultType Any of these: table, cloud, graphPie, graphVerticalBar, graphEvolution, sparkline, generateDataChart* * @param string|bool $action - * @return Piwik_ViewDataTable + * @return \Piwik\ViewDataTable */ static public function factory($defaultType = null, $action = false) { @@ -226,7 +229,7 @@ abstract class Piwik_ViewDataTable $defaultType = $defaultProperties['default_view_type']; } } - + if ($defaultType === null) { $defaultType = 'table'; } @@ -266,24 +269,24 @@ abstract class Piwik_ViewDataTable $result = new Piwik_ViewDataTable_HtmlTable(); break; } - + if ($action !== false) { list($plugin, $controllerAction) = explode('.', $action); - + $subtableAction = $controllerAction; if (isset($defaultProperties['subtable_action'])) { $subtableAction = $defaultProperties['subtable_action']; } - + $result->init($plugin, $controllerAction, $action, $subtableAction, $defaultProperties); } - + return $result; } - + /** * Returns the list of view properties that can be overridden by query parameters. - * + * * @return array */ public function getOverridableProperties() @@ -308,11 +311,11 @@ abstract class Piwik_ViewDataTable 'columns' ); } - + /** * Returns the list of view properties that should be sent with the HTML response * as JSON. These properties can be manipulated via the ViewDataTable UI. - * + * * @return array */ public function getJavaScriptProperties() @@ -349,7 +352,7 @@ abstract class Piwik_ViewDataTable * @param string $currentControllerAction eg. 'getKeywords' * @param string $apiMethodToRequestDataTable eg. 'Referers.getKeywords' * @param string $controllerActionCalledWhenRequestSubTable eg. 'getSearchEnginesFromKeywordId' - * @param array $defaultProperties + * @param array $defaultProperties */ public function init($currentControllerName, $currentControllerAction, @@ -361,28 +364,28 @@ abstract class Piwik_ViewDataTable $this->currentControllerAction = $currentControllerAction; $this->controllerActionCalledWhenRequestSubTable = $controllerActionCalledWhenRequestSubTable; $this->idSubtable = Common::getRequestVar('idSubtable', false, 'int'); - + foreach ($defaultProperties as $name => $value) { $this->setViewProperty($name, $value); } - - $queryParams = Piwik_Url::getArrayFromCurrentQueryString(); + + $queryParams = Url::getArrayFromCurrentQueryString(); foreach ($this->getOverridableProperties() as $name) { if (isset($queryParams[$name])) { $this->setViewProperty($name, $queryParams[$name]); } } - + $this->viewProperties['show_footer_icons'] = ($this->idSubtable == false); $this->viewProperties['apiMethodToRequestDataTable'] = $apiMethodToRequestDataTable; - + $this->viewProperties['report_id'] = $currentControllerName . '.' . $currentControllerAction; $this->viewProperties['self_url'] = $this->getBaseReportUrl($currentControllerName, $currentControllerAction); - + if (!\Piwik\PluginsManager::getInstance()->isPluginActivated('Goals')) { $this->viewProperties['show_goals'] = false; } - + // the exclude low population threshold value is sometimes obtained by requesting data. // to avoid issuing unecessary requests when display properties are determined by metadata, // we allow it to be a closure. @@ -393,7 +396,7 @@ abstract class Piwik_ViewDataTable $this->viewProperties['filter_excludelowpop_value'] = $function(); } } - + /** * Forces the View to use a given template. * Usually the template to use is set in the specific ViewDataTable_* @@ -482,14 +485,14 @@ abstract class Piwik_ViewDataTable { $properties = array(); Piwik_PostEvent('ViewDataTable.getReportDisplayProperties', array(&$properties, $apiAction)); - + return $properties; } - + /** * Sets a view property by name. This function handles special view properties * like 'translations' & 'relatedReports' that store arrays. - * + * * @param string $name * @param mixed $value For array properties, $value can be a comma separated string. */ @@ -501,7 +504,7 @@ abstract class Piwik_ViewDataTable ) { $value = Piwik::getArrayFromApiParameter($value); } - + if ($name == 'translations') { $this->viewProperties[$name] = array_merge($this->viewProperties[$name], $value); } else if ($name == 'relatedReports') { @@ -523,7 +526,7 @@ abstract class Piwik_ViewDataTable /** * Function called by the ViewDataTable objects in order to fetch data from the API. * The function init() must have been called before, so that the object knows which API module and action to call. - * It builds the API request string and uses Piwik_API_Request to call the API. + * It builds the API request string and uses Request to call the API. * The requested DataTable object is stored in $this->dataTable. */ protected function loadDataTableFromAPI() @@ -584,7 +587,7 @@ abstract class Piwik_ViewDataTable $filterParameters = $filter[1]; $this->dataTable->filter($filterName, $filterParameters); } - + if (!$this->areGenericFiltersDisabled()) { // Second, generic filters (Sort, Limit, Replace Column Names, etc.) $requestArray = $this->getRequestArray(); @@ -607,7 +610,7 @@ abstract class Piwik_ViewDataTable $this->dataTable->filter($filterName, $filterParameters); } } - + // default columns_to_display to label, nb_uniq_visitors/nb_visits if those columns exist in the // dataset if ($this->dataTable instanceof DataTable) { @@ -616,18 +619,18 @@ abstract class Piwik_ViewDataTable && $this->dataTableColumnsContains($columns, array('nb_visits', 'nb_uniq_visitors')) ) { $columnsToDisplay = array('label'); - + // if unique visitors data is available, show it, otherwise just visits if ($this->dataTableColumnsContains($columns, 'nb_uniq_visitors')) { $columnsToDisplay[] = 'nb_uniq_visitors'; } else { $columnsToDisplay[] = 'nb_visits'; } - + $this->viewProperties['columns_to_display'] = $columnsToDisplay; } } - + return true; } @@ -695,8 +698,8 @@ abstract class Piwik_ViewDataTable // - we request the method to call to get this specific DataTable // - the format = original specifies that we want to get the original DataTable structure itself, not rendered $requestArray = array( - 'method' => $this->viewProperties['apiMethodToRequestDataTable'], - 'format' => 'original', + 'method' => $this->viewProperties['apiMethodToRequestDataTable'], + 'format' => 'original', 'disable_generic_filters' => Common::getRequestVar('disable_generic_filters', 1, 'int') ); @@ -718,14 +721,14 @@ abstract class Piwik_ViewDataTable $requestArray[$varToSet] = $value; } } - + $segment = $this->getRawSegmentFromRequest(); - if(!empty($segment)) { + if (!empty($segment)) { $requestArray['segment'] = $segment; } - + $requestArray = array_merge($requestArray, $this->viewProperties['request_parameters_to_modify']); - + return $requestArray; } @@ -739,7 +742,7 @@ abstract class Piwik_ViewDataTable $segment = Common::getRequestVar('segment', '', 'string'); if (!empty($segment)) { $request = Piwik_API_Request::getRequestParametersGET(); - if(!empty($request['segment'])) { + if (!empty($request['segment'])) { $segmentRaw = $request['segment']; } } @@ -811,7 +814,7 @@ abstract class Piwik_ViewDataTable } } } - + foreach ($this->viewProperties['custom_parameters'] as $name => $value) { $javascriptVariablesToSet[$name] = $value; } @@ -884,7 +887,7 @@ abstract class Piwik_ViewDataTable } $rawSegment = $this->getRawSegmentFromRequest(); - if(!empty($rawSegment)) { + if (!empty($rawSegment)) { $javascriptVariablesToSet['segment'] = $rawSegment; } @@ -921,10 +924,10 @@ abstract class Piwik_ViewDataTable } return $this->viewProperties[$nameVar]; } - + /** * Sets a set of extra request query parameters to be used when querying API data. - * + * * @param array $params */ public function setRequestParametersToModify($params) @@ -1359,7 +1362,7 @@ abstract class Piwik_ViewDataTable private function removeEmptyColumnsFromDisplay() { - if(empty($this->dataTable)) { + if (empty($this->dataTable)) { return; } if ($this->dataTable instanceof DataTable\Map) { @@ -1481,7 +1484,7 @@ abstract class Piwik_ViewDataTable if (!empty($thisReportTitle)) { $this->setReportTitle($thisReportTitle); } - + foreach ($relatedReports as $report => $title) { list($module, $action) = explode('.', $report); $this->addRelatedReport($module, $action, $title); @@ -1501,9 +1504,9 @@ abstract class Piwik_ViewDataTable /** * Sets a custom URL to use to reference this report. * - * @param string $module - * @param string $action - * @param array $queryParams + * @param string $module + * @param string $action + * @param array $queryParams */ public function setReportUrl($module, $action, $queryParams = array()) { @@ -1575,10 +1578,10 @@ abstract class Piwik_ViewDataTable $params = array_merge($queryParams, array('module' => $module, 'action' => $action)); return Piwik_API_Request::getCurrentUrlWithoutGenericFilters($params); } - + /** * Convenience method that creates and renders a ViewDataTable for a API method. - * + * * @param string $pluginName The name of the plugin (eg, UserSettings). * @param string $apiAction The name of the API action (eg, getResolution). * @param bool $fetch If true, the result is returned, if false it is echo'd. @@ -1586,26 +1589,26 @@ abstract class Piwik_ViewDataTable */ static public function render($pluginName, $apiAction, $fetch = true) { - $apiClassName = 'Piwik_'.$pluginName.'_API'; + $apiClassName = 'Piwik_' . $pluginName . '_API'; if (!method_exists($apiClassName::getInstance(), $apiAction)) { throw new Exception("Invalid action name '$apiAction' for '$pluginName' plugin."); } - - $view = self::factory(null, $pluginName.'.'.$apiAction); + + $view = self::factory(null, $pluginName . '.' . $apiAction); $view->main(); $rendered = $view->getView()->render(); - + if ($fetch) { return $rendered; } else { echo $rendered; } } - + /** * Returns whether the DataTable result will have to be expanded for the * current request before rendering. - * + * * @return bool */ public static function shouldLoadExpanded() @@ -1613,14 +1616,14 @@ abstract class Piwik_ViewDataTable // if filter_column_recursive & filter_pattern_recursive are supplied, and flat isn't supplied // we have to load all the child subtables. return Common::getRequestVar('filter_column_recursive', false) !== false - && Common::getRequestVar('filter_pattern_recursive', false) !== false - && Common::getRequestVar('flat', false) === false; + && Common::getRequestVar('filter_pattern_recursive', false) !== false + && Common::getRequestVar('flat', false) === false; } - + /** * Returns true if the first array contains one or more of the specified * column names or their associated integer INDEX_ value. - * + * * @param array $columns Row columns. * @param array|string $columnsToCheckFor eg, array('nb_visits', 'nb_uniq_visitors') * @return bool @@ -1630,7 +1633,7 @@ abstract class Piwik_ViewDataTable if (!is_array($columnsToCheckFor)) { $columnsToCheckFor = array($columnsToCheckFor); } - + foreach ($columnsToCheckFor as $columnToCheckFor) { foreach ($columns as $column) { // check for the column name and its associated integer INDEX_ value @@ -1642,7 +1645,7 @@ abstract class Piwik_ViewDataTable } } } - + return false; } } diff --git a/core/ViewDataTable/Cloud.php b/core/ViewDataTable/Cloud.php index bc2377b4e7..cf3d756089 100644 --- a/core/ViewDataTable/Cloud.php +++ b/core/ViewDataTable/Cloud.php @@ -8,15 +8,17 @@ * @category Piwik * @package Piwik */ +use Piwik\ViewDataTable; +use Piwik\View; /** * Reads the requested DataTable from the API, and prepares the data to give * to Piwik_Visualization_Cloud that will display the tag cloud (via the template _dataTable_cloud.twig). * * @package Piwik - * @subpackage Piwik_ViewDataTable + * @subpackage ViewDataTable */ -class Piwik_ViewDataTable_Cloud extends Piwik_ViewDataTable +class Piwik_ViewDataTable_Cloud extends ViewDataTable { protected $displayLogoInsteadOfLabel = false; @@ -76,7 +78,7 @@ class Piwik_ViewDataTable_Cloud extends Piwik_ViewDataTable protected function buildView() { - $view = new Piwik_View($this->dataTableTemplate); + $view = new View($this->dataTableTemplate); if (!$this->isDataAvailable) { $view->cloudValues = array(); } else { diff --git a/core/ViewDataTable/GenerateGraphHTML.php b/core/ViewDataTable/GenerateGraphHTML.php index 2543d2a64c..4bdadbc791 100644 --- a/core/ViewDataTable/GenerateGraphHTML.php +++ b/core/ViewDataTable/GenerateGraphHTML.php @@ -8,17 +8,21 @@ * @category Piwik * @package Piwik */ +use Piwik\API\Request; use Piwik\Piwik; use Piwik\Common; +use Piwik\JqplotDataGenerator; +use Piwik\ViewDataTable; +use Piwik\View; /** * This class generates the HTML code to embed graphs in the page. * It doesn't call the API but simply prints the html snippet. * * @package Piwik - * @subpackage Piwik_ViewDataTable + * @subpackage ViewDataTable */ -abstract class Piwik_ViewDataTable_GenerateGraphHTML extends Piwik_ViewDataTable +abstract class Piwik_ViewDataTable_GenerateGraphHTML extends ViewDataTable { protected $width = '100%'; protected $height = 250; @@ -89,7 +93,7 @@ abstract class Piwik_ViewDataTable_GenerateGraphHTML extends Piwik_ViewDataTable } /** - * The implementation of this method in Piwik_ViewDataTable passes to the graph whether the + * The implementation of this method in ViewDataTable passes to the graph whether the * goals icon should be displayed or not. Here, we use it to implicitly add the goal metrics * to the metrics picker. */ @@ -236,7 +240,7 @@ abstract class Piwik_ViewDataTable_GenerateGraphHTML extends Piwik_ViewDataTable { // access control $idSite = Common::getRequestVar('idSite', 1, 'int'); - Piwik_API_Request::reloadAuthUsingTokenAuth(); + Request::reloadAuthUsingTokenAuth(); if (!Piwik::isUserHasViewAccess($idSite)) { throw new Exception(Piwik_TranslateException('General_ExceptionPrivilegeAccessWebsite', array("'view'", $idSite))); } @@ -245,7 +249,7 @@ abstract class Piwik_ViewDataTable_GenerateGraphHTML extends Piwik_ViewDataTable $this->graphData = $this->getGraphData($this->dataTable); // build view - $view = new Piwik_View($this->dataTableTemplate); + $view = new View($this->dataTableTemplate); $view->width = $this->width; $view->height = $this->height; @@ -270,7 +274,7 @@ abstract class Piwik_ViewDataTable_GenerateGraphHTML extends Piwik_ViewDataTable protected function getGraphData($dataTable) { $properties = array_merge($this->viewProperties, $this->viewProperties['request_parameters_to_modify']); - $dataGenerator = Piwik_JqplotDataGenerator::factory($this->graphType, $properties); + $dataGenerator = JqplotDataGenerator::factory($this->graphType, $properties); $jsonData = $dataGenerator->generate($dataTable); return str_replace(array("\r", "\n"), '', $jsonData); diff --git a/core/ViewDataTable/GenerateGraphHTML/ChartEvolution.php b/core/ViewDataTable/GenerateGraphHTML/ChartEvolution.php index 4ee089abd8..13b9047644 100644 --- a/core/ViewDataTable/GenerateGraphHTML/ChartEvolution.php +++ b/core/ViewDataTable/GenerateGraphHTML/ChartEvolution.php @@ -11,13 +11,14 @@ use Piwik\Common; use Piwik\Period\Range; +use Piwik\Controller; use Piwik\Site; /** * Generates HTML embed for the Evolution graph * * @package Piwik - * @subpackage Piwik_ViewDataTable + * @subpackage ViewDataTable */ class Piwik_ViewDataTable_GenerateGraphHTML_ChartEvolution extends Piwik_ViewDataTable_GenerateGraphHTML @@ -136,7 +137,7 @@ class Piwik_ViewDataTable_GenerateGraphHTML_ChartEvolution extends Piwik_ViewDat $site = new Site(Common::getRequestVar('idSite')); - $dateRange = Piwik_Controller::getDateRangeRelativeToEndDate($period, 'last' . $lastN, $endDate, $site); + $dateRange = Controller::getDateRangeRelativeToEndDate($period, 'last' . $lastN, $endDate, $site); return array($dateRange, $lastN); } diff --git a/core/ViewDataTable/GenerateGraphHTML/ChartPie.php b/core/ViewDataTable/GenerateGraphHTML/ChartPie.php index 35d99f2bac..c2acd2ea12 100644 --- a/core/ViewDataTable/GenerateGraphHTML/ChartPie.php +++ b/core/ViewDataTable/GenerateGraphHTML/ChartPie.php @@ -13,7 +13,7 @@ * Generates HTML embed for the Pie chart * * @package Piwik - * @subpackage Piwik_ViewDataTable + * @subpackage ViewDataTable */ class Piwik_ViewDataTable_GenerateGraphHTML_ChartPie extends Piwik_ViewDataTable_GenerateGraphHTML diff --git a/core/ViewDataTable/GenerateGraphHTML/ChartVerticalBar.php b/core/ViewDataTable/GenerateGraphHTML/ChartVerticalBar.php index e8efa53230..dfbaff4f63 100644 --- a/core/ViewDataTable/GenerateGraphHTML/ChartVerticalBar.php +++ b/core/ViewDataTable/GenerateGraphHTML/ChartVerticalBar.php @@ -14,7 +14,7 @@ * Generates HTML embed for the vertical bar chart * * @package Piwik - * @subpackage Piwik_ViewDataTable + * @subpackage ViewDataTable */ class Piwik_ViewDataTable_GenerateGraphHTML_ChartVerticalBar extends Piwik_ViewDataTable_GenerateGraphHTML diff --git a/core/ViewDataTable/HtmlTable.php b/core/ViewDataTable/HtmlTable.php index 05b99543fa..cd5443a3e0 100644 --- a/core/ViewDataTable/HtmlTable.php +++ b/core/ViewDataTable/HtmlTable.php @@ -12,6 +12,8 @@ use Piwik\Config; use Piwik\DataTable\Renderer; use Piwik\Piwik; use Piwik\Common; +use Piwik\ViewDataTable; +use Piwik\View; /** * Outputs an AJAX Table for a given DataTable. @@ -19,9 +21,9 @@ use Piwik\Common; * Reads the requested DataTable from the API. * * @package Piwik - * @subpackage Piwik_ViewDataTable + * @subpackage ViewDataTable */ -class Piwik_ViewDataTable_HtmlTable extends Piwik_ViewDataTable +class Piwik_ViewDataTable_HtmlTable extends ViewDataTable { /** * PHP array conversion of the DataTable @@ -61,7 +63,7 @@ class Piwik_ViewDataTable_HtmlTable extends Piwik_ViewDataTable /** * @see Piwik_ViewDataTable::main() - * @throws Exception|Access_NoAccessException + * @throws Exception|\Piwik\NoAccessException * @return null */ public function main() @@ -74,7 +76,7 @@ class Piwik_ViewDataTable_HtmlTable extends Piwik_ViewDataTable $this->isDataAvailable = true; try { $this->loadDataTableFromAPI(); - } catch (Access_NoAccessException $e) { + } catch (\Piwik\NoAccessException $e) { throw $e; } catch (Exception $e) { Piwik::log("Failed to get data from API: " . $e->getMessage()); @@ -113,12 +115,12 @@ class Piwik_ViewDataTable_HtmlTable extends Piwik_ViewDataTable } /** - * @return Piwik_View with all data set + * @return View with all data set */ protected function buildView() { $template = $this->idSubtable ? $this->viewProperties['subtable_template'] : $this->dataTableTemplate; - $view = new Piwik_View($template); + $view = new View($template); if (!empty($this->loadingError)) { $view->error = $this->loadingError; diff --git a/core/ViewDataTable/HtmlTable/AllColumns.php b/core/ViewDataTable/HtmlTable/AllColumns.php index 6b88cfeeb3..87ed0412a4 100644 --- a/core/ViewDataTable/HtmlTable/AllColumns.php +++ b/core/ViewDataTable/HtmlTable/AllColumns.php @@ -8,10 +8,11 @@ * @category Piwik * @package Piwik */ +use Piwik\Controller; /** * @package Piwik - * @subpackage Piwik_ViewDataTable + * @subpackage ViewDataTable */ class Piwik_ViewDataTable_HtmlTable_AllColumns extends Piwik_ViewDataTable_HtmlTable { @@ -38,7 +39,7 @@ class Piwik_ViewDataTable_HtmlTable_AllColumns extends Piwik_ViewDataTable_HtmlT $valid = parent::postDataTableLoadedFromAPI(); if (!$valid) return false; - Piwik_Controller::setPeriodVariablesView($this); + Controller::setPeriodVariablesView($this); $columnUniqueVisitors = false; if ($this->period == 'day') { $columnUniqueVisitors = 'nb_uniq_visitors'; diff --git a/core/ViewDataTable/HtmlTable/Goals.php b/core/ViewDataTable/HtmlTable/Goals.php index 7714e7fd06..fc1fa842e7 100644 --- a/core/ViewDataTable/HtmlTable/Goals.php +++ b/core/ViewDataTable/HtmlTable/Goals.php @@ -15,7 +15,7 @@ use Piwik\Site; /** * @package Piwik - * @subpackage Piwik_ViewDataTable + * @subpackage ViewDataTable */ class Piwik_ViewDataTable_HtmlTable_Goals extends Piwik_ViewDataTable_HtmlTable { diff --git a/core/ViewDataTable/Sparkline.php b/core/ViewDataTable/Sparkline.php index 74e72f03c9..6611bc4441 100644 --- a/core/ViewDataTable/Sparkline.php +++ b/core/ViewDataTable/Sparkline.php @@ -10,14 +10,15 @@ */ use Piwik\Common; use Piwik\DataTable; +use Piwik\ViewDataTable; /** * Reads the requested DataTable from the API and prepare data for the Sparkline view. * * @package Piwik - * @subpackage Piwik_ViewDataTable + * @subpackage ViewDataTable */ -class Piwik_ViewDataTable_Sparkline extends Piwik_ViewDataTable +class Piwik_ViewDataTable_Sparkline extends ViewDataTable { protected function getViewDataTableId() { diff --git a/core/PluginsFunctions/WidgetsList.php b/core/WidgetsList.php index 3bfefe386a..790ebfa89d 100644 --- a/core/PluginsFunctions/WidgetsList.php +++ b/core/WidgetsList.php @@ -8,11 +8,12 @@ * @category Piwik * @package PluginsFunctions */ +namespace Piwik; /** * @package PluginsFunctions */ -class Piwik_WidgetsList +class WidgetsList { /** * List of widgets @@ -39,7 +40,7 @@ class Piwik_WidgetsList self::addWidgets(); Piwik_PostEvent('WidgetsList.get'); - uksort(self::$widgets, array('Piwik_WidgetsList', '_sortWidgetCategories')); + uksort(self::$widgets, array('Piwik\WidgetsList', '_sortWidgetCategories')); $widgets = array(); foreach (self::$widgets as $key => $v) { @@ -102,7 +103,7 @@ class Piwik_WidgetsList * @param string $controllerAction * @param array $customParameters */ - static public function add($widgetCategory, $widgetName, $controllerName, $controllerAction, $customParameters) + static public function add($widgetCategory, $widgetName, $controllerName, $controllerAction, $customParameters = array()) { $widgetName = Piwik_Translate($widgetName); $widgetUniqueId = 'widget' . $controllerName . $controllerAction; @@ -171,44 +172,5 @@ class Piwik_WidgetsList } } -/** - * Returns all available widgets - * - * @see Piwik_WidgetsList::get - * - * @return array - */ -function Piwik_GetWidgetsList() -{ - return Piwik_WidgetsList::get(); -} -/** - * Adds an widget to the list - * - * @see Piwik_WidgetsList::add - * - * @param string $widgetCategory - * @param string $widgetName - * @param string $controllerName - * @param string $controllerAction - * @param array $customParameters - */ -function Piwik_AddWidget($widgetCategory, $widgetName, $controllerName, $controllerAction, $customParameters = array()) -{ - Piwik_WidgetsList::add($widgetCategory, $widgetName, $controllerName, $controllerAction, $customParameters); -} -/** - * Checks if the widget with the given parameters exists in der widget list - * - * @see Piwik_WidgetsList::isDefined - * - * @param string $controllerName - * @param string $controllerAction - * @return bool - */ -function Piwik_IsWidgetDefined($controllerName, $controllerAction) -{ - return Piwik_WidgetsList::isDefined($controllerName, $controllerAction); -} diff --git a/core/functions.php b/core/functions.php new file mode 100644 index 0000000000..81ef9326cc --- /dev/null +++ b/core/functions.php @@ -0,0 +1,259 @@ +<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + * @category Piwik + * @package Piwik + */ + +// All classes and functions below are defined in the global namespace +namespace { + + use Piwik\EventDispatcher; + use Piwik\DataTable; + use Piwik\Menu\Admin; + use Piwik\Menu\Main; + use Piwik\Menu\Top; + + /** + * Post an event to the dispatcher which will notice the observers. + * + * @param string $eventName The event name. + * @param array $params The parameter array to forward to observer callbacks. + * @param bool $pending + * @param null $plugins + * @return void + */ + function Piwik_PostEvent($eventName, $params = array(), $pending = false, $plugins = null) + { + EventDispatcher::getInstance()->postEvent($eventName, $params, $pending, $plugins); + } + + /** + * Register an action to execute for a given event + * + * @param string $eventName Name of event + * @param callable $function Callback hook + */ + function Piwik_AddAction($eventName, $function) + { + EventDispatcher::getInstance()->addObserver($eventName, $function); + } + + + /** + * Returns translated string or given message if translation is not found. + * + * @param string $string Translation string index + * @param array|string|int $args sprintf arguments + * @return string + */ + function Piwik_Translate($string, $args = array()) + { + if (!is_array($args)) { + $args = array($args); + } + if (isset($GLOBALS['Piwik_translations'][$string])) { + $string = $GLOBALS['Piwik_translations'][$string]; + } + if (count($args) == 0) { + return $string; + } + return vsprintf($string, $args); + } + + /** + * Returns translated string or given message if translation is not found. + * This function does not throw any exception. Use it to translate exceptions. + * + * @param string $message Translation string index + * @param array $args sprintf arguments + * @return string + */ + function Piwik_TranslateException($message, $args = array()) + { + try { + return Piwik_Translate($message, $args); + } catch (Exception $e) { + return $message; + } + } + + + /** + * Returns the option value for the requested option $name + * + * @param string $name Key + * @return string|false Value or false, if not found + */ + function Piwik_GetOption($name) + { + return Piwik\Option::getInstance()->get($name); + } + + /** + * Sets the option value in the database + * + * @param string $name + * @param string $value + * @param int $autoLoad if set to 1, this option value will be automatically loaded; should be set to 1 for options that will always be used in the Piwik request. + */ + function Piwik_SetOption($name, $value, $autoLoad = 0) + { + Piwik\Option::getInstance()->set($name, $value, $autoLoad); + } + + /** + * Returns the AdminMenu + * + * @return Array + */ + function Piwik_GetAdminMenu() + { + return Admin::getInstance()->get(); + } + + /** + * Adds a new AdminMenu entry. + * + * @param string $adminMenuName + * @param string $url + * @param boolean $displayedForCurrentUser + * @param int $order + */ + function Piwik_AddAdminMenu($adminMenuName, $url, $displayedForCurrentUser = true, $order = 10) + { + Admin::getInstance()->add('General_Settings', $adminMenuName, $url, $displayedForCurrentUser, $order); + } + + /** + * Adds a new AdminMenu entry with a submenu. + * + * @param string $adminMenuName + * @param string $adminSubMenuName + * @param string $url + * @param boolean $displayedForCurrentUser + * @param int $order + */ + function Piwik_AddAdminSubMenu($adminMenuName, $adminSubMenuName, $url, $displayedForCurrentUser = true, $order = 10) + { + Admin::getInstance()->add($adminMenuName, $adminSubMenuName, $url, $displayedForCurrentUser, $order); + } + + /** + * Renames an AdminMenu entry. + * + * @param string $adminMenuOriginal + * @param string $adminMenuRenamed + */ + function Piwik_RenameAdminMenuEntry($adminMenuOriginal, $adminMenuRenamed) + { + Admin::getInstance()->rename($adminMenuOriginal, null, $adminMenuRenamed, null); + } + + + /** + * Returns the MainMenu as array. + * + * @return array + */ + function Piwik_GetMenu() + { + return Main::getInstance()->get(); + } + + /** + * Adds a new entry to the MainMenu. + * + * @param string $mainMenuName + * @param string $subMenuName + * @param string $url + * @param boolean $displayedForCurrentUser + * @param int $order + */ + function Piwik_AddMenu($mainMenuName, $subMenuName, $url, $displayedForCurrentUser = true, $order = 10) + { + Main::getInstance()->add($mainMenuName, $subMenuName, $url, $displayedForCurrentUser, $order); + } + + /** + * Renames a menu entry. + * + * @param string $mainMenuOriginal + * @param string $subMenuOriginal + * @param string $mainMenuRenamed + * @param string $subMenuRenamed + */ + function Piwik_RenameMenuEntry($mainMenuOriginal, $subMenuOriginal, + $mainMenuRenamed, $subMenuRenamed) + { + Main::getInstance()->rename($mainMenuOriginal, $subMenuOriginal, $mainMenuRenamed, $subMenuRenamed); + } + + /** + * Edits the URL of a menu entry. + * + * @param string $mainMenuToEdit + * @param string $subMenuToEdit + * @param string $newUrl + */ + function Piwik_EditMenuUrl($mainMenuToEdit, $subMenuToEdit, $newUrl) + { + Main::getInstance()->editUrl($mainMenuToEdit, $subMenuToEdit, $newUrl); + } + + /** + * Returns the TopMenu as an array. + * + * @return array + */ + function Piwik_GetTopMenu() + { + return Top::getInstance()->get(); + } + + /** + * Adds a new entry to the TopMenu. + * + * @param string $topMenuName + * @param string $data + * @param boolean $displayedForCurrentUser + * @param int $order + * @param bool $isHTML + * @param bool|string $tooltip Tooltip to display. + */ + function Piwik_AddTopMenu($topMenuName, $data, $displayedForCurrentUser = true, $order = 10, $isHTML = false, + $tooltip = false) + { + if ($isHTML) { + Top::getInstance()->addHtml($topMenuName, $data, $displayedForCurrentUser, $order, $tooltip); + } else { + Top::getInstance()->add($topMenuName, null, $data, $displayedForCurrentUser, $order, $tooltip); + } + } + + /** + * Renames a entry of the TopMenu + * + * @param string $topMenuOriginal + * @param string $topMenuRenamed + */ + function Piwik_RenameTopMenuEntry($topMenuOriginal, $topMenuRenamed) + { + Top::getInstance()->rename($topMenuOriginal, null, $topMenuRenamed, null); + } + + + if(empty($GLOBALS['PIWIK_TRACKER_MODE'])) { // do not define these classes in tracker + + class Piwik_DataTable_Row_DataTableSummary extends DataTable\Row\DataTableSummaryRow { + } + + class Piwik_DataTable_Row extends DataTable\Row { + } + + } +} @@ -8,6 +8,8 @@ * @package Piwik */ +use Piwik\FrontController; + define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__) == '/' ? '' : dirname(__FILE__)); if (file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) { require_once PIWIK_DOCUMENT_ROOT . '/bootstrap.php'; @@ -44,7 +46,7 @@ if (!defined('PIWIK_ENABLE_ERROR_HANDLER') || PIWIK_ENABLE_ERROR_HANDLER) { } if (!defined('PIWIK_ENABLE_DISPATCH') || PIWIK_ENABLE_DISPATCH) { - $controller = Piwik_FrontController::getInstance(); + $controller = FrontController::getInstance(); $controller->init(); $controller->dispatch(); } diff --git a/libs/Zend/Db/Statement/Sqlsrv.php b/libs/Zend/Db/Statement/Sqlsrv.php index 75e5568d36..e72934b148 100644 --- a/libs/Zend/Db/Statement/Sqlsrv.php +++ b/libs/Zend/Db/Statement/Sqlsrv.php @@ -86,7 +86,7 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement */ protected function _bindParam($parameter, &$variable, $type = null, $length = null, $options = null) { - //Sql server doesn't support bind by name + //Db server doesn't support bind by name return true; } diff --git a/misc/cron/archive.php b/misc/cron/archive.php index 45e8abe88a..391cbc5f6f 100644 --- a/misc/cron/archive.php +++ b/misc/cron/archive.php @@ -4,6 +4,11 @@ use Piwik\Config; use Piwik\Piwik; use Piwik\Common; use Piwik\Date; +use Piwik\FrontController; +use Piwik\Http; +use Piwik\Version; +use Piwik\Url; +use Piwik\Timer; $USAGE = " Usage: @@ -118,7 +123,7 @@ class Archiving $this->logSection("INIT"); $this->log("Querying Piwik API at: {$this->piwikUrl}"); - $this->log("Running Piwik " . Piwik_Version::VERSION . " as Super User: " . $this->login); + $this->log("Running Piwik " . Version::VERSION . " as Super User: " . $this->login); $this->acceptInvalidSSLCertificate = $this->isParameterSet("accept-invalid-ssl-certificate"); @@ -187,7 +192,7 @@ class Archiving $skipped = $processed = $archivedPeriodsArchivesWebsite = 0; - $timer = new Piwik_Timer; + $timer = new Timer; $this->logSection("START"); $this->log("Starting Piwik reports archiving..."); @@ -200,7 +205,7 @@ class Archiving continue; } - $timerWebsite = new Piwik_Timer; + $timerWebsite = new Timer; $lastTimestampWebsiteProcessedPeriods = $lastTimestampWebsiteProcessedDay = false; if (!$this->shouldResetState) { @@ -412,12 +417,12 @@ class Archiving * @param $idsite int * @param $period * @param $lastTimestampWebsiteProcessed - * @param Piwik_Timer $timerWebsite + * @param Timer $timerWebsite * @return bool True on success, false if some request failed */ - private function archiveVisitsAndSegments($idsite, $period, $lastTimestampWebsiteProcessed, Piwik_Timer $timerWebsite = null) + private function archiveVisitsAndSegments($idsite, $period, $lastTimestampWebsiteProcessed, Timer $timerWebsite = null) { - $timer = new Piwik_Timer; + $timer = new Timer; $aCurl = array(); $mh = false; $url = $this->piwikUrl . $this->getVisitsRequestUrl($idsite, $period, $lastTimestampWebsiteProcessed) . $this->requestPrepend; @@ -485,8 +490,8 @@ class Archiving curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); } - curl_setopt($ch, CURLOPT_USERAGENT, Piwik_Http::getUserAgent()); - Piwik_Http::configCurlCertificate($ch); + curl_setopt($ch, CURLOPT_USERAGENT, Http::getUserAgent()); + Http::configCurlCertificate($ch); return $ch; } @@ -541,7 +546,7 @@ class Archiving $url = $this->piwikUrl . $url . $this->requestPrepend; //$this->log($url); try { - $response = Piwik_Http::sendHttpRequestBy('curl', $url, $timeout = 300, $userAgent = null, $destinationPath = null, $file = null, $followDepth = 0, $acceptLanguage = false, $acceptInvalidSSLCertificate = $this->acceptInvalidSSLCertificate); + $response = Http::sendHttpRequestBy('curl', $url, $timeout = 300, $userAgent = null, $destinationPath = null, $file = null, $followDepth = 0, $acceptLanguage = false, $acceptInvalidSSLCertificate = $this->acceptInvalidSSLCertificate); } catch (Exception $e) { return $this->logNetworkError($url, $e->getMessage()); } @@ -611,7 +616,7 @@ class Archiving $config = Config::getInstance(); $config->log['log_only_when_debug_parameter'] = 0; $config->log['logger_message'] = array("logger_message" => "screen"); - Piwik::createLogObject(); + \Piwik\Log::make(); if (!function_exists("curl_multi_init")) { $this->log("ERROR: this script requires curl extension php_curl enabled in your CLI php.ini"); @@ -644,7 +649,7 @@ class Archiving private function initCore() { try { - Piwik_FrontController::getInstance()->init(); + FrontController::getInstance()->init(); } catch (Exception $e) { echo "ERROR: During Piwik init, Message: " . $e->getMessage(); exit; @@ -787,7 +792,7 @@ class Archiving // If archive.php run as a web cron, we use the current hostname if (!Common::isPhpCliMode()) { // example.org/piwik/misc/cron/ - $piwikUrl = Common::sanitizeInputValue(Piwik_Url::getCurrentUrlWithoutFileName()); + $piwikUrl = Common::sanitizeInputValue(Url::getCurrentUrlWithoutFileName()); // example.org/piwik/ $piwikUrl = $piwikUrl . "../../"; } // If archive.php run as CLI/shell we require the piwik url to be set diff --git a/misc/others/api_internal_call.php b/misc/others/api_internal_call.php index 8a2b8ad481..09c4702a66 100644 --- a/misc/others/api_internal_call.php +++ b/misc/others/api_internal_call.php @@ -1,4 +1,7 @@ <?php +use Piwik\API\Request; +use Piwik\FrontController; + define('PIWIK_INCLUDE_PATH', realpath('../..')); define('PIWIK_USER_PATH', realpath('../..')); define('PIWIK_ENABLE_DISPATCH', false); @@ -10,10 +13,10 @@ define('PIWIK_ENABLE_SESSION_START', false); require_once PIWIK_INCLUDE_PATH . "/index.php"; require_once PIWIK_INCLUDE_PATH . "/core/API/Request.php"; -Piwik_FrontController::getInstance()->init(); +FrontController::getInstance()->init(); // This inits the API Request with the specified parameters -$request = new Piwik_API_Request(' +$request = new Request(' method=UserSettings.getResolution &idSite=7 &date=yesterday diff --git a/misc/others/geoipUpdateRows.php b/misc/others/geoipUpdateRows.php index 979ff5e8f7..7a2a3de32e 100755 --- a/misc/others/geoipUpdateRows.php +++ b/misc/others/geoipUpdateRows.php @@ -2,6 +2,8 @@ use Piwik\Config; use Piwik\Piwik; use Piwik\Common; +use Piwik\FrontController; +use Piwik\IP; ini_set("memory_limit", "512M"); error_reporting(E_ALL | E_NOTICE); @@ -29,10 +31,10 @@ $GLOBALS['PIWIK_TRACKER_DEBUG'] = false; define('PIWIK_ENABLE_DISPATCH', false); Config::getInstance()->log['logger_message'][] = 'screen'; -Piwik_FrontController::getInstance()->init(); +FrontController::getInstance()->init(); $query = "SELECT count(*) FROM " . Common::prefixTable('log_visit'); -$count = Piwik_FetchOne($query); +$count = Db::fetchOne($query); // when script run via browser, check for Super User & output html page to do conversion via AJAX if (!Common::isPhpCliMode()) { @@ -182,7 +184,7 @@ if ($displayNotes) { } flush(); for (; $start < $end; $start += $limit) { - $rows = Piwik_FetchAll("SELECT idvisit, location_ip, " . implode(',', array_keys($logVisitFieldsToUpdate)) . " + $rows = Db::fetchAll("SELECT idvisit, location_ip, " . implode(',', array_keys($logVisitFieldsToUpdate)) . " FROM " . Common::prefixTable('log_visit') . " LIMIT $start, $limit"); if (!count($rows)) { @@ -202,7 +204,7 @@ for (; $start < $end; $start += $limit) { continue; } - $ip = Piwik_IP::N2P($row['location_ip']); + $ip = IP::N2P($row['location_ip']); $location = $provider->getLocation(array('ip' => $ip)); if (!empty($location[Piwik_UserCountry_LocationProvider::COUNTRY_CODE_KEY])) { @@ -232,13 +234,13 @@ for (; $start < $end; $start += $limit) { $sql = "UPDATE " . Common::prefixTable('log_visit') . " SET " . implode(', ', $columnsToSet) . " WHERE idvisit = ?"; - Piwik_Query($sql, $bind); + Db::query($sql, $bind); // update log_conversion $sql = "UPDATE " . Common::prefixTable('log_conversion') . " SET " . implode(', ', $columnsToSet) . " WHERE idvisit = ?"; - Piwik_Query($sql, $bind); + Db::query($sql, $bind); } Piwik::log(round($start * 100 / $count) . "% done..."); flush(); diff --git a/misc/others/iframeWidget_localhost.php b/misc/others/iframeWidget_localhost.php index ef22366cf8..bcaef1a2b6 100644 --- a/misc/others/iframeWidget_localhost.php +++ b/misc/others/iframeWidget_localhost.php @@ -1,5 +1,7 @@ <?php use Piwik\Common; +use Piwik\FrontController; +use Piwik\Url; exit; $date = date('Y-m-d'); @@ -30,8 +32,8 @@ define('PIWIK_ENABLE_SESSION_START', false); require_once PIWIK_INCLUDE_PATH . "/index.php"; require_once PIWIK_INCLUDE_PATH . "/core/API/Request.php"; -Piwik_FrontController::getInstance()->init(); -$widgets = Piwik_GetWidgetsList(); +FrontController::getInstance()->init(); +$widgets = WidgetsList::get(); foreach ($widgets as $category => $widgetsInCategory) { echo '<h2>' . $category . '</h2>'; foreach ($widgetsInCategory as $widget) { @@ -48,7 +50,7 @@ foreach ($widgets as $category => $widgetsInCategory) { } $widgetUrl[$name] = $value; } - $widgetUrl = Piwik_Url::getQueryStringFromParameters($widgetUrl); + $widgetUrl = Url::getQueryStringFromParameters($widgetUrl); echo '<div id="widgetIframe"><iframe width="500" height="350" src="' . $widgetUrl . '" scrolling="no" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>'; diff --git a/misc/others/test_cookies_GenerateHundredsWebsitesAndVisits.php b/misc/others/test_cookies_GenerateHundredsWebsitesAndVisits.php index 2af3cab420..e9c6b32449 100644 --- a/misc/others/test_cookies_GenerateHundredsWebsitesAndVisits.php +++ b/misc/others/test_cookies_GenerateHundredsWebsitesAndVisits.php @@ -3,6 +3,7 @@ // Used initially to test how to handle cookies for this use case (see http://dev.piwik.org/trac/ticket/409) use Piwik\Piwik; use Piwik\Common; +use Piwik\FrontController; exit; @@ -14,7 +15,7 @@ require_once PIWIK_INCLUDE_PATH . "/index.php"; require_once PIWIK_INCLUDE_PATH . "/core/API/Request.php"; require_once PIWIK_INCLUDE_PATH . "/libs/PiwikTracker/PiwikTracker.php"; -Piwik_FrontController::getInstance()->init(); +FrontController::getInstance()->init(); Piwik::setUserIsSuperUser(); $count = 100; for ($i = 0; $i <= $count; $i++) { diff --git a/misc/others/test_generateLotsVisitsWebsites.php b/misc/others/test_generateLotsVisitsWebsites.php index abc4115ea6..260b146851 100644 --- a/misc/others/test_generateLotsVisitsWebsites.php +++ b/misc/others/test_generateLotsVisitsWebsites.php @@ -2,6 +2,7 @@ use Piwik\Config; use Piwik\Piwik; use Piwik\Common; +use Piwik\FrontController; define('PIWIK_INCLUDE_PATH', realpath(dirname(__FILE__) . "/../..")); define('PIWIK_ENABLE_DISPATCH', false); @@ -11,7 +12,7 @@ require_once PIWIK_INCLUDE_PATH . "/index.php"; require_once PIWIK_INCLUDE_PATH . "/core/API/Request.php"; require_once PIWIK_INCLUDE_PATH . "/libs/PiwikTracker/PiwikTracker.php"; -Piwik_FrontController::getInstance()->init(); +FrontController::getInstance()->init(); // SECURITY: DO NOT DELETE THIS LINE! if (!Common::isPhpCliMode()) { @@ -30,7 +31,7 @@ class Piwik_StressTests_CopyLogs $config = Config::getInstance(); $config->log['log_only_when_debug_parameter'] = 0; $config->log['logger_message'] = array("logger_message" => "screen"); - Piwik::createLogObject(); + \Piwik\Log::make(); } function run() @@ -8,6 +8,8 @@ * @package Piwik */ use Piwik\Piwik; +use Piwik\Timer; +use Piwik\Tracker; $GLOBALS['PIWIK_TRACKER_DEBUG'] = false; $GLOBALS['PIWIK_TRACKER_DEBUG_FORCE_SCHEDULED_TASKS'] = false; @@ -64,17 +66,17 @@ if ($GLOBALS['PIWIK_TRACKER_DEBUG'] === true) { require_once PIWIK_INCLUDE_PATH . '/core/Loader.php'; require_once PIWIK_INCLUDE_PATH . '/core/ErrorHandler.php'; require_once PIWIK_INCLUDE_PATH . '/core/ExceptionHandler.php'; - $timer = new Piwik_Timer(); + $timer = new Timer(); set_error_handler('Piwik_ErrorHandler'); set_exception_handler('Piwik_ExceptionHandler'); Common::printDebug("Debug enabled - Input parameters: <br/>" . var_export($_GET, true)); Piwik_Tracker_Db::enableProfiling(); Piwik::createConfigObject(); - Piwik::createLogObject(); + \Piwik\Log::make(); } if (!defined('PIWIK_ENABLE_TRACKING') || PIWIK_ENABLE_TRACKING) { - $process = new Piwik_Tracker(); + $process = new Tracker(); try { $process->main(); } catch (Exception $e) { diff --git a/plugins/API/API.php b/plugins/API/API.php index e85974fd8e..74c7c011de 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -8,6 +8,8 @@ * @category Piwik_Plugins * @package Piwik_API */ +use Piwik\API\Request; +use Piwik\API\Proxy; use Piwik\DataTable\Filter\ColumnDelete; use Piwik\DataTable\Row; use Piwik\Metrics; @@ -16,6 +18,7 @@ use Piwik\Common; use Piwik\Config; use Piwik\Date; use Piwik\DataTable; +use Piwik\Version; use Piwik\Plugin; use Piwik\Translate; @@ -105,7 +108,7 @@ class Piwik_API_API public function getPiwikVersion() { Piwik::checkUserHasSomeViewAccess(); - return Piwik_Version::VERSION; + return Version::VERSION; } /** @@ -143,7 +146,7 @@ class Piwik_API_API 'segment' => 'visitIp', 'acceptedValues' => '13.54.122.1, etc.', 'sqlSegment' => 'log_visit.location_ip', - 'sqlFilter' => array('Piwik_IP', 'P2N'), + 'sqlFilter' => array('IP', 'P2N'), 'permission' => $isAuthenticatedWithViewAccess, ); $segments[] = array( @@ -470,7 +473,7 @@ class Piwik_API_API // load the data $className = 'Piwik_' . $plugin . '_API'; $params['columns'] = implode(',', $columns); - $dataTable = Piwik_API_Proxy::getInstance()->call($className, 'get', $params); + $dataTable = Proxy::getInstance()->call($className, 'get', $params); // make sure the table has all columns $array = ($dataTable instanceof DataTable\Map ? $dataTable->getArray() : array($dataTable)); foreach ($array as $table) { @@ -567,7 +570,7 @@ class Piwik_API_API $result = array(); foreach ($urls as $url) { - $req = new Piwik_API_Request($url . '&format=php&serialize=0'); + $req = new Request($url . '&format=php&serialize=0'); $result[] = $req->process(); } return $result; @@ -618,7 +621,7 @@ class Piwik_API_API $requestLastVisits .= "&filter_limit=1000"; } - $request = new Piwik_API_Request($requestLastVisits); + $request = new Request($requestLastVisits); $table = $request->process(); if (empty($table)) { throw new Exception("There was no data to suggest for $segmentName"); diff --git a/plugins/API/Controller.php b/plugins/API/Controller.php index 16d8f9dd1f..ed4addae2c 100644 --- a/plugins/API/Controller.php +++ b/plugins/API/Controller.php @@ -8,14 +8,19 @@ * @category Piwik_Plugins * @package Piwik_API */ +use Piwik\API\DocumentationGenerator; +use Piwik\API\Request; +use Piwik\API\Proxy; use Piwik\Config; use Piwik\Common; +use Piwik\Controller; +use Piwik\View; /** * * @package Piwik_API */ -class Piwik_API_Controller extends Piwik_Controller +class Piwik_API_Controller extends Controller { function index() { @@ -23,23 +28,23 @@ class Piwik_API_Controller extends Piwik_Controller if (!isset($_GET['filter_limit'])) { $_GET['filter_limit'] = Config::getInstance()->General['API_datatable_default_limit']; } - $request = new Piwik_API_Request('token_auth=' . Common::getRequestVar('token_auth', 'anonymous', 'string')); + $request = new Request('token_auth=' . Common::getRequestVar('token_auth', 'anonymous', 'string')); echo $request->process(); } public function listAllMethods() { - $ApiDocumentation = new Piwik_API_DocumentationGenerator(); + $ApiDocumentation = new DocumentationGenerator(); echo $ApiDocumentation->getAllInterfaceString($outputExampleUrls = true, $prefixUrls = Common::getRequestVar('prefixUrl', '')); } public function listAllAPI() { - $view = new Piwik_View("@API/listAllAPI"); + $view = new View("@API/listAllAPI"); $this->setGeneralVariablesView($view); - $ApiDocumentation = new Piwik_API_DocumentationGenerator(); - $view->countLoadedAPI = Piwik_API_Proxy::getInstance()->getCountRegisteredClasses(); + $ApiDocumentation = new DocumentationGenerator(); + $view->countLoadedAPI = Proxy::getInstance()->getCountRegisteredClasses(); $view->list_api_methods_with_links = $ApiDocumentation->getAllInterfaceString(); echo $view->render(); } diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php index a008c82025..b30a3d7901 100644 --- a/plugins/API/ProcessedReport.php +++ b/plugins/API/ProcessedReport.php @@ -1,4 +1,5 @@ <?php +use Piwik\API\Request; use Piwik\DataTable\Simple; use Piwik\DataTable\Row; use Piwik\Metrics; @@ -7,6 +8,8 @@ use Piwik\Piwik; use Piwik\Common; use Piwik\Date; use Piwik\DataTable; +use Piwik\Url; +use Piwik\Timer; use Piwik\Site; /** @@ -243,7 +246,7 @@ class Piwik_API_ProcessedReport $apiParameters = false, $idGoal = false, $language = false, $showTimer = true, $hideMetricsDoc = false, $idSubtable = false, $showRawMetrics = false) { - $timer = new Piwik_Timer(); + $timer = new Timer(); if (empty($apiParameters)) { $apiParameters = array(); } @@ -273,8 +276,8 @@ class Piwik_API_ProcessedReport )); if (!empty($segment)) $parameters['segment'] = $segment; - $url = Piwik_Url::getQueryStringFromParameters($parameters); - $request = new Piwik_API_Request($url); + $url = Url::getQueryStringFromParameters($parameters); + $request = new Request($url); try { /** @var DataTable */ $dataTable = $request->process(); diff --git a/plugins/API/RowEvolution.php b/plugins/API/RowEvolution.php index ec6b3c06fc..21ab108c8d 100644 --- a/plugins/API/RowEvolution.php +++ b/plugins/API/RowEvolution.php @@ -8,6 +8,9 @@ * @category Piwik_Plugins * @package Piwik_API */ +use Piwik\API\DataTableManipulator\LabelFilter; +use Piwik\API\ResponseBuilder; +use Piwik\API\Request; use Piwik\DataTable\Filter\CalculateEvolutionFilter; use Piwik\DataTable\Filter\SafeDecodeLabel; use Piwik\DataTable\Row; @@ -15,6 +18,7 @@ use Piwik\Period; use Piwik\Piwik; use Piwik\Common; use Piwik\DataTable; +use Piwik\Url; /** * This class generates a Row evolution dataset, from input request @@ -36,7 +40,7 @@ class Piwik_API_RowEvolution throw new Exception("Row evolutions can not be processed with this combination of \'date\' and \'period\' parameters."); } - $label = Piwik_API_ResponseBuilder::unsanitizeLabelParameter($label); + $label = ResponseBuilder::unsanitizeLabelParameter($label); $labels = Piwik::getArrayFromApiParameter($label); @@ -80,7 +84,7 @@ class Piwik_API_RowEvolution foreach ($table->getRows() as $row) { $label = $row->getColumn('label'); if (isset($labelsToIndex[$label])) { - $row->setMetadata(Piwik_API_DataTableManipulator_LabelFilter::FLAG_IS_ROW_EVOLUTION, $labelsToIndex[$label]); + $row->setMetadata(LabelFilter::FLAG_IS_ROW_EVOLUTION, $labelsToIndex[$label]); } } } @@ -155,7 +159,7 @@ class Piwik_API_RowEvolution // if we have a recursive label and no url, use the path if (!$urlFound) { - $actualLabel = str_replace(Piwik_API_DataTableManipulator_LabelFilter::SEPARATOR_RECURSIVE_LABEL, ' - ', $label); + $actualLabel = str_replace(LabelFilter::SEPARATOR_RECURSIVE_LABEL, ' - ', $label); } $return = array( @@ -237,9 +241,9 @@ class Piwik_API_RowEvolution $parameters['filter_add_columns_when_show_all_columns'] = '1'; } - $url = Piwik_Url::getQueryStringFromParameters($parameters); + $url = Url::getQueryStringFromParameters($parameters); - $request = new Piwik_API_Request($url); + $request = new Request($url); try { $dataTable = $request->process(); @@ -450,7 +454,7 @@ class Piwik_API_RowEvolution } /** - * Returns the row in a datatable by its Piwik_API_DataTableManipulator_LabelFilter::FLAG_IS_ROW_EVOLUTION metadata. + * Returns the row in a datatable by its LabelFilter::FLAG_IS_ROW_EVOLUTION metadata. * * @param DataTable $table * @param int $labelIdx @@ -461,7 +465,7 @@ class Piwik_API_RowEvolution $labelIdx = (int)$labelIdx; foreach ($table->getRows() as $row) { - if ($row->getMetadata(Piwik_API_DataTableManipulator_LabelFilter::FLAG_IS_ROW_EVOLUTION) === $labelIdx) + if ($row->getMetadata(LabelFilter::FLAG_IS_ROW_EVOLUTION) === $labelIdx) { return $row; } @@ -476,6 +480,6 @@ class Piwik_API_RowEvolution */ private function cleanOriginalLabel($label) { - return str_replace(Piwik_API_DataTableManipulator_LabelFilter::SEPARATOR_RECURSIVE_LABEL, ' - ', $label); + return str_replace(LabelFilter::SEPARATOR_RECURSIVE_LABEL, ' - ', $label); } } diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php index 0906c0cbd3..f333277c03 100644 --- a/plugins/Actions/Actions.php +++ b/plugins/Actions/Actions.php @@ -8,9 +8,11 @@ * @category Piwik_Plugins * @package Piwik_Actions */ +use Piwik\API\Request; use Piwik\ArchiveProcessor; use Piwik\Piwik; use Piwik\Common; +use Piwik\ViewDataTable; use Piwik\Plugin; use Piwik\SegmentExpression; use Piwik\Site; @@ -156,7 +158,7 @@ class Piwik_Actions extends Plugin ) { $sql = Piwik_Tracker_Action::getSqlSelectActionId(); $bind = array($valueToMatch, $valueToMatch, $actionType); - $idAction = Piwik_FetchOne($sql, $bind); + $idAction = Db::fetchOne($sql, $bind); // if the action is not found, we hack -100 to ensure it tries to match against an integer // otherwise binding idaction_name to "false" returns some rows for some reasons (in case &segment=pageTitle==VÄ›trnásssssss) if (empty($idAction)) { @@ -523,24 +525,24 @@ class Piwik_Actions extends Plugin function addWidgets() { - Piwik_AddWidget('Actions_Actions', 'Actions_SubmenuPages', 'Actions', 'getPageUrls'); - Piwik_AddWidget('Actions_Actions', 'Actions_WidgetPageTitles', 'Actions', 'getPageTitles'); - Piwik_AddWidget('Actions_Actions', 'Actions_SubmenuOutlinks', 'Actions', 'getOutlinks'); - Piwik_AddWidget('Actions_Actions', 'Actions_SubmenuDownloads', 'Actions', 'getDownloads'); - Piwik_AddWidget('Actions_Actions', 'Actions_WidgetPagesEntry', 'Actions', 'getEntryPageUrls'); - Piwik_AddWidget('Actions_Actions', 'Actions_WidgetPagesExit', 'Actions', 'getExitPageUrls'); - Piwik_AddWidget('Actions_Actions', 'Actions_WidgetEntryPageTitles', 'Actions', 'getEntryPageTitles'); - Piwik_AddWidget('Actions_Actions', 'Actions_WidgetExitPageTitles', 'Actions', 'getExitPageTitles'); + WidgetsList::add('Actions_Actions', 'Actions_SubmenuPages', 'Actions', 'getPageUrls'); + WidgetsList::add('Actions_Actions', 'Actions_WidgetPageTitles', 'Actions', 'getPageTitles'); + WidgetsList::add('Actions_Actions', 'Actions_SubmenuOutlinks', 'Actions', 'getOutlinks'); + WidgetsList::add('Actions_Actions', 'Actions_SubmenuDownloads', 'Actions', 'getDownloads'); + WidgetsList::add('Actions_Actions', 'Actions_WidgetPagesEntry', 'Actions', 'getEntryPageUrls'); + WidgetsList::add('Actions_Actions', 'Actions_WidgetPagesExit', 'Actions', 'getExitPageUrls'); + WidgetsList::add('Actions_Actions', 'Actions_WidgetEntryPageTitles', 'Actions', 'getEntryPageTitles'); + WidgetsList::add('Actions_Actions', 'Actions_WidgetExitPageTitles', 'Actions', 'getExitPageTitles'); if ($this->isSiteSearchEnabled()) { - Piwik_AddWidget('Actions_SubmenuSitesearch', 'Actions_WidgetSearchKeywords', 'Actions', 'getSiteSearchKeywords'); + WidgetsList::add('Actions_SubmenuSitesearch', 'Actions_WidgetSearchKeywords', 'Actions', 'getSiteSearchKeywords'); if (self::isCustomVariablesPluginsEnabled()) { - Piwik_AddWidget('Actions_SubmenuSitesearch', 'Actions_WidgetSearchCategories', 'Actions', 'getSiteSearchCategories'); + WidgetsList::add('Actions_SubmenuSitesearch', 'Actions_WidgetSearchCategories', 'Actions', 'getSiteSearchCategories'); } - Piwik_AddWidget('Actions_SubmenuSitesearch', 'Actions_WidgetSearchNoResultKeywords', 'Actions', 'getSiteSearchNoResultKeywords'); - Piwik_AddWidget('Actions_SubmenuSitesearch', 'Actions_WidgetPageUrlsFollowingSearch', 'Actions', 'getPageUrlsFollowingSiteSearch'); - Piwik_AddWidget('Actions_SubmenuSitesearch', 'Actions_WidgetPageTitlesFollowingSearch', 'Actions', 'getPageTitlesFollowingSiteSearch'); + WidgetsList::add('Actions_SubmenuSitesearch', 'Actions_WidgetSearchNoResultKeywords', 'Actions', 'getSiteSearchNoResultKeywords'); + WidgetsList::add('Actions_SubmenuSitesearch', 'Actions_WidgetPageUrlsFollowingSearch', 'Actions', 'getPageUrlsFollowingSiteSearch'); + WidgetsList::add('Actions_SubmenuSitesearch', 'Actions_WidgetPageTitlesFollowingSearch', 'Actions', 'getPageTitlesFollowingSiteSearch'); } } @@ -660,7 +662,7 @@ class Piwik_Actions extends Plugin // so users can see that they can set it to 1 (see #3365) $result['custom_parameters'] = array('flat' => 0); - if (Piwik_ViewDataTable::shouldLoadExpanded()) { + if (ViewDataTable::shouldLoadExpanded()) { $result['show_expanded'] = true; $result['filters'][] = function ($dataTable) { @@ -764,7 +766,7 @@ class Piwik_Actions extends Plugin { // link to the page, not just the report, but only if not a widget $widget = Common::getRequestVar('widget', false); - $reportUrl = Piwik_API_Request::getCurrentUrlWithoutGenericFilters(array( + $reportUrl = Request::getCurrentUrlWithoutGenericFilters(array( 'module' => 'Actions', 'action' => $widget === false ? 'indexEntryPageUrls' : 'getEntryPageUrls' )); @@ -793,7 +795,7 @@ class Piwik_Actions extends Plugin { // link to the page, not just the report, but only if not a widget $widget = Common::getRequestVar('widget', false); - $reportUrl = Piwik_API_Request::getCurrentUrlWithoutGenericFilters(array( + $reportUrl = Request::getCurrentUrlWithoutGenericFilters(array( 'module' => 'Actions', 'action' => $widget === false ? 'indexExitPageUrls' : 'getExitPageUrls' )); @@ -901,7 +903,7 @@ class Piwik_Actions extends Plugin { // link to the page, not just the report, but only if not a widget $widget = Common::getRequestVar('widget', false); - $reportUrl = Piwik_API_Request::getCurrentUrlWithoutGenericFilters(array( + $reportUrl = Request::getCurrentUrlWithoutGenericFilters(array( 'module' => 'Actions', 'action' => $widget === false ? 'indexPageTitles' : 'getPageTitles' )); diff --git a/plugins/Actions/Archiver.php b/plugins/Actions/Archiver.php index 987bf5104a..dc6242dd95 100644 --- a/plugins/Actions/Archiver.php +++ b/plugins/Actions/Archiver.php @@ -13,6 +13,7 @@ use Piwik\DataTable\Manager; use Piwik\DataTable\Row\DataTableSummaryRow; use Piwik\Metrics; use Piwik\DataTable; +use Piwik\RankingQuery; use Piwik\PluginsArchiver; /** @@ -215,7 +216,7 @@ class Piwik_Actions_Archiver extends PluginsArchiver $rankingQuery = false; if ($rankingQueryLimit > 0) { - $rankingQuery = new Piwik_RankingQuery($rankingQueryLimit); + $rankingQuery = new RankingQuery($rankingQueryLimit); $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW); $rankingQuery->addLabelColumn(array('idaction', 'name')); $rankingQuery->addColumn(array('url_prefix', Metrics::INDEX_NB_UNIQ_VISITORS)); @@ -294,7 +295,7 @@ class Piwik_Actions_Archiver extends PluginsArchiver { $rankingQuery = false; if ($rankingQueryLimit > 0) { - $rankingQuery = new Piwik_RankingQuery($rankingQueryLimit); + $rankingQuery = new RankingQuery($rankingQueryLimit); $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW); $rankingQuery->addLabelColumn('idaction'); $rankingQuery->addColumn(Metrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS); @@ -345,7 +346,7 @@ class Piwik_Actions_Archiver extends PluginsArchiver { $rankingQuery = false; if ($rankingQueryLimit > 0) { - $rankingQuery = new Piwik_RankingQuery($rankingQueryLimit); + $rankingQuery = new RankingQuery($rankingQueryLimit); $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW); $rankingQuery->addLabelColumn('idaction'); $rankingQuery->addColumn(Metrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS); @@ -391,7 +392,7 @@ class Piwik_Actions_Archiver extends PluginsArchiver { $rankingQuery = false; if ($rankingQueryLimit > 0) { - $rankingQuery = new Piwik_RankingQuery($rankingQueryLimit); + $rankingQuery = new RankingQuery($rankingQueryLimit); $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW); $rankingQuery->addLabelColumn('idaction'); $rankingQuery->addColumn(Metrics::INDEX_PAGE_SUM_TIME_SPENT, 'sum'); diff --git a/plugins/Actions/Controller.php b/plugins/Actions/Controller.php index f90ad12f28..36002fe2de 100644 --- a/plugins/Actions/Controller.php +++ b/plugins/Actions/Controller.php @@ -8,13 +8,16 @@ * @category Piwik_Plugins * @package Piwik_Actions */ +use Piwik\Controller; +use Piwik\ViewDataTable; +use Piwik\View; /** * Actions controller * * @package Piwik_Actions */ -class Piwik_Actions_Controller extends Piwik_Controller +class Piwik_Actions_Controller extends Controller { // // Actions that render whole pages @@ -22,28 +25,28 @@ class Piwik_Actions_Controller extends Piwik_Controller public function indexPageUrls($fetch = false) { - return Piwik_View::singleReport( + return View::singleReport( Piwik_Translate('Actions_SubmenuPages'), $this->getPageUrls(true), $fetch); } public function indexEntryPageUrls($fetch = false) { - return Piwik_View::singleReport( + return View::singleReport( Piwik_Translate('Actions_SubmenuPagesEntry'), $this->getEntryPageUrls(true), $fetch); } public function indexExitPageUrls($fetch = false) { - return Piwik_View::singleReport( + return View::singleReport( Piwik_Translate('Actions_SubmenuPagesExit'), $this->getExitPageUrls(true), $fetch); } public function indexSiteSearch() { - $view = new Piwik_View('@Actions/indexSiteSearch'); + $view = new View('@Actions/indexSiteSearch'); $view->keywords = $this->getSiteSearchKeywords(true); $view->noResultKeywords = $this->getSiteSearchNoResultKeywords(true); @@ -59,21 +62,21 @@ class Piwik_Actions_Controller extends Piwik_Controller public function indexPageTitles($fetch = false) { - return Piwik_View::singleReport( + return View::singleReport( Piwik_Translate('Actions_SubmenuPageTitles'), $this->getPageTitles(true), $fetch); } public function indexDownloads($fetch = false) { - return Piwik_View::singleReport( + return View::singleReport( Piwik_Translate('Actions_SubmenuDownloads'), $this->getDownloads(true), $fetch); } public function indexOutlinks($fetch = false) { - return Piwik_View::singleReport( + return View::singleReport( Piwik_Translate('Actions_SubmenuOutlinks'), $this->getOutlinks(true), $fetch); } @@ -84,66 +87,66 @@ class Piwik_Actions_Controller extends Piwik_Controller public function getPageUrls($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getEntryPageUrls($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getExitPageUrls($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getSiteSearchKeywords($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getSiteSearchNoResultKeywords($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getSiteSearchCategories($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getPageUrlsFollowingSiteSearch($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getPageTitlesFollowingSiteSearch($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getPageTitles($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getEntryPageTitles($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getExitPageTitles($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getDownloads($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getOutlinks($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } } diff --git a/plugins/Annotations/Controller.php b/plugins/Annotations/Controller.php index f632ab5ae8..739ec5deeb 100755 --- a/plugins/Annotations/Controller.php +++ b/plugins/Annotations/Controller.php @@ -8,14 +8,17 @@ * @category Piwik_Plugins * @package Piwik_Annotations */ +use Piwik\API\Request; use Piwik\Common; +use Piwik\Controller; +use Piwik\View; /** * Controller for the Annotations plugin. * * @package Piwik_Annotations */ -class Piwik_Annotations_Controller extends Piwik_Controller +class Piwik_Annotations_Controller extends Controller { /** * Controller action that returns HTML displaying annotations for a site and @@ -56,9 +59,9 @@ class Piwik_Annotations_Controller extends Piwik_Controller } // create & render the view - $view = new Piwik_View('@Annotations/getAnnotationManager'); + $view = new View('@Annotations/getAnnotationManager'); - $allAnnotations = Piwik_API_Request::processRequest( + $allAnnotations = Request::processRequest( 'Annotations.getAll', array('date' => $date, 'period' => $period, 'lastN' => $lastN)); $view->annotations = empty($allAnnotations[$idSite]) ? array() : $allAnnotations[$idSite]; @@ -104,11 +107,11 @@ class Piwik_Annotations_Controller extends Piwik_Controller if ($_SERVER["REQUEST_METHOD"] == "POST") { $this->checkTokenInUrl(); - $view = new Piwik_View('@Annotations/saveAnnotation'); + $view = new View('@Annotations/saveAnnotation'); // NOTE: permissions checked in API method // save the annotation - $view->annotation = Piwik_API_Request::processRequest("Annotations.save"); + $view->annotation = Request::processRequest("Annotations.save"); echo $view->render(); } @@ -147,7 +150,7 @@ class Piwik_Annotations_Controller extends Piwik_Controller } // add the annotation. NOTE: permissions checked in API method - Piwik_API_Request::processRequest("Annotations.add", array('date' => $date)); + Request::processRequest("Annotations.add", array('date' => $date)); $managerDate = Common::getRequestVar('managerDate', false); $managerPeriod = Common::getRequestVar('managerPeriod', false); @@ -178,7 +181,7 @@ class Piwik_Annotations_Controller extends Piwik_Controller $this->checkTokenInUrl(); // delete annotation. NOTE: permissions checked in API method - Piwik_API_Request::processRequest("Annotations.delete"); + Request::processRequest("Annotations.delete"); echo $this->getAnnotationManager($fetch = true); } @@ -205,11 +208,11 @@ class Piwik_Annotations_Controller extends Piwik_Controller public function getEvolutionIcons() { // get annotation the count - $annotationCounts = Piwik_API_Request::processRequest( + $annotationCounts = Request::processRequest( "Annotations.getAnnotationCountForDates", array('getAnnotationText' => 1)); // create & render the view - $view = new Piwik_View('@Annotations/getEvolutionIcons'); + $view = new View('@Annotations/getEvolutionIcons'); $view->annotationCounts = reset($annotationCounts); // only one idSite allowed for this action echo $view->render(); diff --git a/plugins/AnonymizeIP/AnonymizeIP.php b/plugins/AnonymizeIP/AnonymizeIP.php index 7d6ce520a9..79af7308a5 100644 --- a/plugins/AnonymizeIP/AnonymizeIP.php +++ b/plugins/AnonymizeIP/AnonymizeIP.php @@ -10,6 +10,7 @@ */ use Piwik\Config; use Piwik\Common; +use Piwik\Version; use Piwik\Plugin; /** @@ -28,7 +29,7 @@ class Piwik_AnonymizeIP extends Plugin 'description' => Piwik_Translate('AnonymizeIP_PluginDescription'), 'author' => 'Piwik', 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, + 'version' => Version::VERSION, ); } diff --git a/plugins/CoreAdminHome/API.php b/plugins/CoreAdminHome/API.php index fe6772fe09..6877d8ac90 100644 --- a/plugins/CoreAdminHome/API.php +++ b/plugins/CoreAdminHome/API.php @@ -15,6 +15,7 @@ use Piwik\Piwik; use Piwik\Config; use Piwik\Common; use Piwik\Date; +use Piwik\TaskScheduler; use Piwik\Site; /** @@ -43,7 +44,7 @@ class Piwik_CoreAdminHome_API public function runScheduledTasks() { Piwik::checkUserIsSuperUser(); - return Piwik_TaskScheduler::runTasks(); + return TaskScheduler::runTasks(); } public function getKnownSegmentsToArchive() @@ -173,7 +174,7 @@ class Piwik_CoreAdminHome_API $query = "DELETE FROM $table " . " WHERE ( $sql ) " . " AND idsite IN (" . $sqlIdSites . ")"; - Piwik_Query($query, $bind); + Db::query($query, $bind); } // Update piwik_site.ts_created @@ -183,7 +184,7 @@ class Piwik_CoreAdminHome_API AND ts_created > ?"; $minDateSql = $minDate->subDay(1)->getDatetime(); $bind = array($minDateSql, $minDateSql); - Piwik_Query($query, $bind); + Db::query($query, $bind); // Force to re-process data for these websites in the next archive.php cron run $invalidatedIdSites = Piwik_CoreAdminHome_API::getWebsiteIdsToInvalidate(); diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php index 5bae81c756..7ccf51921e 100644 --- a/plugins/CoreAdminHome/Controller.php +++ b/plugins/CoreAdminHome/Controller.php @@ -8,17 +8,22 @@ * @category Piwik_Plugins * @package Piwik_CoreAdminHome */ +use Piwik\API\ResponseBuilder; use Piwik\ArchiveProcessor\Rules; use Piwik\Config; +use Piwik\Controller\Admin; use Piwik\Piwik; use Piwik\Common; +use Piwik\Nonce; +use Piwik\View; +use Piwik\Url; use Piwik\Site; /** * * @package Piwik_CoreAdminHome */ -class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin +class Piwik_CoreAdminHome_Controller extends Admin { const LOGO_HEIGHT = 300; const LOGO_SMALL_HEIGHT = 100; @@ -31,7 +36,7 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin public function generalSettings() { Piwik::checkUserHasSomeAdminAccess(); - $view = new Piwik_View('@CoreAdminHome/generalSettings'); + $view = new View('@CoreAdminHome/generalSettings'); if (Piwik::isUserIsSuperUser()) { $enableBrowserTriggerArchiving = Rules::isBrowserTriggerEnabled(); @@ -78,7 +83,7 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin public function setGeneralSettings() { Piwik::checkUserIsSuperUser(); - $response = new Piwik_API_ResponseBuilder(Common::getRequestVar('format')); + $response = new ResponseBuilder(Common::getRequestVar('format')); try { $this->checkTokenInUrl(); $enableBrowserTriggerArchiving = Common::getRequestVar('enableBrowserTriggerArchiving'); @@ -112,7 +117,7 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin // update trusted host settings $trustedHosts = Common::getRequestVar('trustedHosts', false, 'json'); if ($trustedHosts !== false) { - Piwik_Url::saveTrustedHostnameInConfig($trustedHosts); + Url::saveTrustedHostnameInConfig($trustedHosts); } $config->forceSave(); @@ -130,7 +135,7 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin */ public function trackingCodeGenerator() { - $view = new Piwik_View('@CoreAdminHome/trackingCodeGenerator'); + $view = new View('@CoreAdminHome/trackingCodeGenerator'); $this->setBasicVariablesView($view); $view->topMenu = Piwik_GetTopMenu(); @@ -170,15 +175,15 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin $nonce = Common::getRequestVar('nonce', false); $language = Common::getRequestVar('language', ''); - if ($nonce !== false && Piwik_Nonce::verifyNonce('Piwik_OptOut', $nonce)) { - Piwik_Nonce::discardNonce('Piwik_OptOut'); + if ($nonce !== false && Nonce::verifyNonce('Piwik_OptOut', $nonce)) { + Nonce::discardNonce('Piwik_OptOut'); Piwik_Tracker_IgnoreCookie::setIgnoreCookie(); $trackVisits = !$trackVisits; } - $view = new Piwik_View('@CoreAdminHome/optOut'); + $view = new View('@CoreAdminHome/optOut'); $view->trackVisits = $trackVisits; - $view->nonce = Piwik_Nonce::getNonce('Piwik_OptOut', 3600); + $view->nonce = Nonce::getNonce('Piwik_OptOut', 3600); $view->language = Piwik_LanguagesManager_API::getInstance()->isLanguageAvailable($language) ? $language : Piwik_LanguagesManager::getLanguageCodeForCurrentUser(); diff --git a/plugins/CoreAdminHome/CoreAdminHome.php b/plugins/CoreAdminHome/CoreAdminHome.php index 39a4f08199..8b4aece240 100644 --- a/plugins/CoreAdminHome/CoreAdminHome.php +++ b/plugins/CoreAdminHome/CoreAdminHome.php @@ -12,6 +12,7 @@ use Piwik\DataAccess\ArchiveSelector; use Piwik\DataAccess\ArchiveTableCreator; use Piwik\Piwik; use Piwik\Date; +use Piwik\ScheduledTask; use Piwik\Plugin; /** @@ -36,19 +37,19 @@ class Piwik_CoreAdminHome extends Plugin public function getScheduledTasks(&$tasks) { // general data purge on older archive tables, executed daily - $purgeArchiveTablesTask = new Piwik_ScheduledTask ($this, + $purgeArchiveTablesTask = new ScheduledTask ($this, 'purgeOutdatedArchives', null, new Piwik_ScheduledTime_Daily(), - Piwik_ScheduledTask::HIGH_PRIORITY); + ScheduledTask::HIGH_PRIORITY); $tasks[] = $purgeArchiveTablesTask; // lowest priority since tables should be optimized after they are modified - $optimizeArchiveTableTask = new Piwik_ScheduledTask ($this, + $optimizeArchiveTableTask = new ScheduledTask ($this, 'optimizeArchiveTable', null, new Piwik_ScheduledTime_Daily(), - Piwik_ScheduledTask::LOWEST_PRIORITY); + ScheduledTask::LOWEST_PRIORITY); $tasks[] = $optimizeArchiveTableTask; } @@ -104,6 +105,6 @@ class Piwik_CoreAdminHome extends Plugin function optimizeArchiveTable() { $archiveTables = ArchiveTableCreator::getTablesArchivesInstalled(); - Piwik_OptimizeTables($archiveTables); + Db::optimizeTables($archiveTables); } } diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php index c95b5d61ce..8d52088cae 100644 --- a/plugins/CoreHome/Controller.php +++ b/plugins/CoreHome/Controller.php @@ -8,16 +8,23 @@ * @category Piwik_Plugins * @package Piwik_CoreHome */ +use Piwik\API\Request; use Piwik\Piwik; use Piwik\Common; use Piwik\Date; +use Piwik\AssetManager; +use Piwik\Controller; +use Piwik\FrontController; +use Piwik\View; +use Piwik\Url; +use Piwik\UpdateCheck; use Piwik\Site; /** * * @package Piwik_CoreHome */ -class Piwik_CoreHome_Controller extends Piwik_Controller +class Piwik_CoreHome_Controller extends Controller { function getDefaultAction() { @@ -52,13 +59,13 @@ class Piwik_CoreHome_Controller extends Piwik_Controller throw new Exception("Preventing infinite recursion..."); } $view = $this->getDefaultIndexView(); - $view->content = Piwik_FrontController::getInstance()->fetchDispatch($controllerName, $actionName); + $view->content = FrontController::getInstance()->fetchDispatch($controllerName, $actionName); echo $view->render(); } protected function getDefaultIndexView() { - $view = new Piwik_View('@CoreHome/getDefaultIndexView'); + $view = new View('@CoreHome/getDefaultIndexView'); $this->setGeneralVariablesView($view); $view->menu = Piwik_GetMenu(); $view->content = ''; @@ -104,7 +111,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller */ public function getCss() { - $cssMergedFile = Piwik_AssetManager::getMergedCssFileLocation(); + $cssMergedFile = AssetManager::getMergedCssFileLocation(); Piwik::serveStaticFile($cssMergedFile, "text/css"); } @@ -116,7 +123,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller */ public function getJs() { - $jsMergedFile = Piwik_AssetManager::getMergedJsFileLocation(); + $jsMergedFile = AssetManager::getMergedJsFileLocation(); Piwik::serveStaticFile($jsMergedFile, "application/javascript; charset=UTF-8"); } @@ -140,7 +147,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller { $rowEvolution = $this->makeRowEvolution($isMulti = false); self::$rowEvolutionCache = $rowEvolution; - $view = new Piwik_View('@CoreHome/getRowEvolutionPopover'); + $view = new View('@CoreHome/getRowEvolutionPopover'); echo $rowEvolution->renderPopover($this, $view); } @@ -149,7 +156,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller { $rowEvolution = $this->makeRowEvolution($isMulti = true); self::$rowEvolutionCache = $rowEvolution; - $view = new Piwik_View('@CoreHome/getMultiRowEvolutionPopover'); + $view = new View('@CoreHome/getMultiRowEvolutionPopover'); echo $rowEvolution->renderPopover($this, $view); } @@ -191,9 +198,9 @@ class Piwik_CoreHome_Controller extends Piwik_Controller $this->checkTokenInUrl(); // perform check (but only once every 10s) - Piwik_UpdateCheck::check($force = false, Piwik_UpdateCheck::UI_CLICK_CHECK_INTERVAL); + UpdateCheck::check($force = false, UpdateCheck::UI_CLICK_CHECK_INTERVAL); - $view = new Piwik_View('@CoreHome/checkForUpdates'); + $view = new View('@CoreHome/checkForUpdates'); $this->setGeneralVariablesView($view); echo $view->render(); } @@ -203,7 +210,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller */ public function getDonateForm() { - $view = new Piwik_View('@CoreHome/getDonateForm'); + $view = new View('@CoreHome/getDonateForm'); if (Common::getRequestVar('widget', false) && Piwik::isUserIsSuperUser() ) { @@ -217,7 +224,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller */ public function getPromoVideo() { - $view = new Piwik_View('@CoreHome/getPromoVideo'); + $view = new View('@CoreHome/getPromoVideo'); $view->shareText = Piwik_Translate('CoreHome_SharePiwikShort'); $view->shareTextLong = Piwik_Translate('CoreHome_SharePiwikLong'); $view->promoVideoUrl = 'http://www.youtube.com/watch?v=OslfF_EH81g'; @@ -229,7 +236,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller */ public function redirectToPaypal() { - $parameters = Piwik_API_Request::getRequestArrayFromString($request = null); + $parameters = Request::getRequestArrayFromString($request = null); foreach ($parameters as $name => $param) { if ($name == 'idSite' || $name == 'module' @@ -239,7 +246,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller } } - $url = "https://www.paypal.com/cgi-bin/webscr?".Piwik_Url::getQueryStringFromParameters($parameters); + $url = "https://www.paypal.com/cgi-bin/webscr?".Url::getQueryStringFromParameters($parameters); header("Location: $url"); exit; diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php index 56c4dbbfd2..d568007482 100644 --- a/plugins/CoreHome/CoreHome.php +++ b/plugins/CoreHome/CoreHome.php @@ -33,8 +33,8 @@ class Piwik_CoreHome extends Plugin */ public function addWidgets() { - Piwik_AddWidget('Example Widgets', 'CoreHome_SupportPiwik', 'CoreHome', 'getDonateForm'); - Piwik_AddWidget('Example Widgets', 'Installation_Welcome', 'CoreHome', 'getPromoVideo'); + WidgetsList::add('Example Widgets', 'CoreHome_SupportPiwik', 'CoreHome', 'getDonateForm'); + WidgetsList::add('Example Widgets', 'Installation_Welcome', 'CoreHome', 'getPromoVideo'); } public function getCssFiles(&$cssFiles) diff --git a/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php b/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php index e8625a2e07..bbfc80832f 100644 --- a/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php +++ b/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php @@ -9,6 +9,7 @@ * @package Piwik_CoreHome */ use Piwik\Common; +use Piwik\ViewDataTable; /** * MULTI ROW EVOLUTION @@ -76,7 +77,7 @@ class Piwik_CoreHome_DataTableRowAction_MultiRowEvolution * Generic method to get an evolution graph or a sparkline for the row evolution popover. * Do as much as possible from outside the controller. * - * @return Piwik_ViewDataTable + * @return ViewDataTable */ public function getRowEvolutionGraph() { diff --git a/plugins/CoreHome/DataTableRowAction/RowEvolution.php b/plugins/CoreHome/DataTableRowAction/RowEvolution.php index 3b3bea686c..694a64c641 100644 --- a/plugins/CoreHome/DataTableRowAction/RowEvolution.php +++ b/plugins/CoreHome/DataTableRowAction/RowEvolution.php @@ -8,9 +8,13 @@ * @category Piwik_Plugins * @package Piwik_CoreHome */ +use Piwik\API\ResponseBuilder; +use Piwik\API\Request; use Piwik\Common; use Piwik\Metrics; use Piwik\Date; +use Piwik\ViewDataTable; +use Piwik\Url; /** * ROW EVOLUTION @@ -78,7 +82,7 @@ class Piwik_CoreHome_DataTableRowAction_RowEvolution $this->apiMethod = Common::getRequestVar('apiMethod', '', 'string'); if (empty($this->apiMethod)) throw new Exception("Parameter apiMethod not set."); - $this->label = Piwik_API_ResponseBuilder::getLabelFromRequest($_GET); + $this->label = ResponseBuilder::getLabelFromRequest($_GET); $this->label = $this->label[0]; if ($this->label === '') throw new Exception("Parameter label not set."); @@ -95,7 +99,7 @@ class Piwik_CoreHome_DataTableRowAction_RowEvolution list($this->date, $lastN) = Piwik_ViewDataTable_GenerateGraphHTML_ChartEvolution::getDateRangeAndLastN($this->period, $end); } - $this->segment = Piwik_ViewDataTable::getRawSegmentFromRequest(); + $this->segment = ViewDataTable::getRawSegmentFromRequest(); $this->loadEvolutionReport(); } @@ -154,9 +158,9 @@ class Piwik_CoreHome_DataTableRowAction_RowEvolution $parameters['column'] = $column; } - $url = Piwik_Url::getQueryStringFromParameters($parameters); + $url = Url::getQueryStringFromParameters($parameters); - $request = new Piwik_API_Request($url); + $request = new Request($url); $report = $request->process(); $this->extractEvolutionReport($report); @@ -174,12 +178,12 @@ class Piwik_CoreHome_DataTableRowAction_RowEvolution /** * Generic method to get an evolution graph or a sparkline for the row evolution popover. * Do as much as possible from outside the controller. - * @return Piwik_ViewDataTable + * @return ViewDataTable */ public function getRowEvolutionGraph() { // set up the view data table - $view = Piwik_ViewDataTable::factory($this->graphType); + $view = ViewDataTable::factory($this->graphType); $view->setDataTable($this->dataTable); $view->init('CoreHome', 'getRowEvolutionGraph', $this->apiMethod); diff --git a/plugins/CoreHome/javascripts/datatable_rowactions.js b/plugins/CoreHome/javascripts/datatable_rowactions.js index 5aea12e4b1..233fa34683 100644 --- a/plugins/CoreHome/javascripts/datatable_rowactions.js +++ b/plugins/CoreHome/javascripts/datatable_rowactions.js @@ -164,7 +164,7 @@ DataTable_RowAction.prototype.trigger = function (tr, e, subTableLabel) { label = label.trim(); // if we have received the event from the sub table, add the label if (subTableLabel) { - var separator = ' > '; // Piwik_API_DataTableManipulator_LabelFilter::SEPARATOR_RECURSIVE_LABEL + var separator = ' > '; // LabelFilter::SEPARATOR_RECURSIVE_LABEL label += separator + subTableLabel.trim(); } diff --git a/plugins/CoreHome/templates/_siteSelect.twig b/plugins/CoreHome/templates/_siteSelect.twig index 80d337828b..e78b93b0bd 100644 --- a/plugins/CoreHome/templates/_siteSelect.twig +++ b/plugins/CoreHome/templates/_siteSelect.twig @@ -4,14 +4,14 @@ * - allSitesItemText The text to use for the 'All Websites' option. Default = 'All Websites'. * - allWebsitesLinkLocation The location of the 'All Websites' option. Can be 'top' or 'bottom'. Default = 'bottom'. * - showSelectedSite false if the currently selected site should be excluded from the list of sites. Default = false. - * - sites The list of sites to use. By default, the first N sites are used. They are retrieved in Piwik_View. + * - sites The list of sites to use. By default, the first N sites are used. They are retrieved in View. * - show_autocompleter Whether to show the autocompleter or not. Default true. * - switchSiteOnSelect Whether to change the page w/ a new idSite value when a site is selected, or not. * Default = true. * - inputName If set, a hidden <input> w/ name == $inputName is created which will hold the selected site's ID. For * use with <form> elements. - * - siteName The currently selected site name. Defaults to the first name in $sites set by Piwik_View. - * - idSite The currently selected idSite. Defaults to the first id in $sites set by Piwik_View. + * - siteName The currently selected site name. Defaults to the first name in $sites set by View. + * - idSite The currently selected idSite. Defaults to the first id in $sites set by View. #} {% set sitesSelector_allWebsitesLink %} <div class="custom_select_all" style="clear: both"> diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php index ff0900073e..c1156cce99 100644 --- a/plugins/CorePluginsAdmin/Controller.php +++ b/plugins/CorePluginsAdmin/Controller.php @@ -8,15 +8,18 @@ * @category Piwik_Plugins * @package Piwik_CorePluginsAdmin */ +use Piwik\Controller\Admin; use Piwik\Piwik; use Piwik\Common; use Piwik\Config; +use Piwik\View; +use Piwik\Url; /** * * @package Piwik_CorePluginsAdmin */ -class Piwik_CorePluginsAdmin_Controller extends Piwik_Controller_Admin +class Piwik_CorePluginsAdmin_Controller extends Admin { function extend() { @@ -41,7 +44,7 @@ class Piwik_CorePluginsAdmin_Controller extends Piwik_Controller_Admin protected function configureView($template) { Piwik::checkUserIsSuperUser(); - $view = new Piwik_View($template); + $view = new View($template); $this->setBasicVariablesView($view); $this->displayWarningIfConfigFileNotWritable($view); return $view; @@ -115,7 +118,7 @@ class Piwik_CorePluginsAdmin_Controller extends Piwik_Controller_Admin protected function redirectAfterModification($redirectAfter) { if ($redirectAfter) { - Piwik_Url::redirectToReferer(); + Url::redirectToReferer(); } } diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php index 11e0c9c7d1..8d427b9813 100644 --- a/plugins/CoreUpdater/Controller.php +++ b/plugins/CoreUpdater/Controller.php @@ -8,16 +8,24 @@ * @category Piwik_Plugins * @package Piwik_CoreUpdater */ +use Piwik\API\Request; use Piwik\ArchiveProcessor\Rules; use Piwik\Config; use Piwik\Piwik; use Piwik\Common; +use Piwik\Controller; +use Piwik\Http; +use Piwik\Piwik_Updater; +use Piwik\View; +use Piwik\Version; +use Piwik\UpdateCheck; +use Piwik\Unzip; /** * * @package Piwik_CoreUpdater */ -class Piwik_CoreUpdater_Controller extends Piwik_Controller +class Piwik_CoreUpdater_Controller extends Controller { const CONFIG_FILE_BACKUP = '/config/global.ini.auto-backup-before-update.php'; const PATH_TO_EXTRACT_LATEST_VERSION = '/tmp/latest/'; @@ -41,8 +49,8 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller $newVersion = $this->checkNewVersionIsAvailableOrDie(); - $view = new Piwik_View('@CoreUpdater/newVersionAvailable'); - $view->piwik_version = Piwik_Version::VERSION; + $view = new View('@CoreUpdater/newVersionAvailable'); + $view->piwik_version = Version::VERSION; $view->piwik_new_version = $newVersion; $view->piwik_latest_version_url = self::getLatestZipUrl($newVersion); $view->can_auto_update = Piwik::canAutoUpdate(); @@ -90,10 +98,10 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller public function oneClickResults() { - Piwik_API_Request::reloadAuthUsingTokenAuth($_POST); + Request::reloadAuthUsingTokenAuth($_POST); Piwik::checkUserIsSuperUser(); - $view = new Piwik_View('@CoreUpdater/oneClickResults'); + $view = new View('@CoreUpdater/oneClickResults'); $view->coreError = Common::getRequestVar('error', '', 'string', $_POST); $view->feedbackMessages = safe_unserialize(Common::unsanitizeInputValue(Common::getRequestVar('messages', '', 'string', $_POST))); echo $view->render(); @@ -101,9 +109,9 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller private function checkNewVersionIsAvailableOrDie() { - $newVersion = Piwik_UpdateCheck::isNewestVersionAvailable(); + $newVersion = UpdateCheck::isNewestVersionAvailable(); if (!$newVersion) { - throw new Exception(Piwik_TranslateException('CoreUpdater_ExceptionAlreadyLatestVersion', Piwik_Version::VERSION)); + throw new Exception(Piwik_TranslateException('CoreUpdater_ExceptionAlreadyLatestVersion', Version::VERSION)); } return $newVersion; } @@ -115,7 +123,7 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller // we catch exceptions in the caller (i.e., oneClickUpdate) $url = self::getLatestZipUrl($this->newVersion) . '?cb=' . $this->newVersion; - $fetched = Piwik_Http::fetchRemoteFile($url, $this->pathPiwikZip); + $fetched = Http::fetchRemoteFile($url, $this->pathPiwikZip); } private function oneClick_Unpack() @@ -127,7 +135,7 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller Piwik::unlinkRecursive($this->pathRootExtractedPiwik, true); } - $archive = Piwik_Unzip::factory('PclZip', $this->pathPiwikZip); + $archive = Unzip::factory('PclZip', $this->pathPiwikZip); if (0 == ($archive_files = $archive->extract($pathExtracted))) { throw new Exception(Piwik_TranslateException('CoreUpdater_ExceptionArchiveIncompatible', $archive->errorInfo())); @@ -241,8 +249,8 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller $cli = Common::isPhpCliMode() ? '_cli' : ''; $welcomeTemplate = '@CoreUpdater/runUpdaterAndExit_welcome' . $cli; $doneTemplate = '@CoreUpdater/runUpdaterAndExit_done' . $cli; - $viewWelcome = new Piwik_View($welcomeTemplate); - $viewDone = new Piwik_View($doneTemplate); + $viewWelcome = new View($welcomeTemplate); + $viewDone = new View($doneTemplate); $sqlQueries = $updater->getSqlQueriesToExecute(); if (Common::isPhpCliMode()) { @@ -274,7 +282,7 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller private function doWelcomeUpdates($view, $componentsWithUpdateFile) { - $view->new_piwik_version = Piwik_Version::VERSION; + $view->new_piwik_version = Version::VERSION; $view->commandUpgradePiwik = "<br /><code>php " . Common::getPathToPiwikRoot() . "/index.php -- \"module=CoreUpdater\" </code>"; $pluginNamesToUpdate = array(); $coreToUpdate = false; diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php index 99c7e4029d..b682a705d5 100644 --- a/plugins/CoreUpdater/CoreUpdater.php +++ b/plugins/CoreUpdater/CoreUpdater.php @@ -10,6 +10,10 @@ */ use Piwik\Piwik; use Piwik\Common; +use Piwik\FrontController; +use Piwik\Piwik_Updater; +use Piwik\Version; +use Piwik\UpdateCheck; use Piwik\Plugin; /** @@ -32,7 +36,7 @@ class Piwik_CoreUpdater extends Plugin public static function getComponentUpdates(Piwik_Updater $updater) { - $updater->addComponentToCheck('core', Piwik_Version::VERSION); + $updater->addComponentToCheck('core', Version::VERSION); $plugins = \Piwik\PluginsManager::getInstance()->getLoadedPlugins(); foreach ($plugins as $pluginName => $plugin) { $updater->addComponentToCheck($pluginName, $plugin->getVersion()); @@ -52,7 +56,7 @@ class Piwik_CoreUpdater extends Plugin $action = Common::getRequestVar('action', '', 'string'); $updater = new Piwik_Updater(); - $updater->addComponentToCheck('core', Piwik_Version::VERSION); + $updater->addComponentToCheck('core', Version::VERSION); $updates = $updater->getComponentsWithNewVersion(); if (!empty($updates)) { Piwik::deleteAllCacheOnUpdate(); @@ -64,7 +68,7 @@ class Piwik_CoreUpdater extends Plugin && !($module == 'LanguagesManager' && $action == 'saveLanguage') ) { - if (Piwik_FrontController::shouldRethrowException()) { + if (FrontController::shouldRethrowException()) { throw new Exception("Piwik and/or some plugins have been upgraded to a new version. \n". "--> Please run the update process first. See documentation: http://piwik.org/docs/update/ \n"); } else { @@ -75,6 +79,6 @@ class Piwik_CoreUpdater extends Plugin public function updateCheck() { - Piwik_UpdateCheck::check(); + UpdateCheck::check(); } } diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php index 654cf22835..198f7a8889 100644 --- a/plugins/CustomVariables/Archiver.php +++ b/plugins/CustomVariables/Archiver.php @@ -3,6 +3,8 @@ use Piwik\Common; use Piwik\Config; use Piwik\DataAccess\LogAggregator; use Piwik\Metrics; +use Piwik\DataArray; +use Piwik\Tracker; use Piwik\PluginsArchiver; /** @@ -21,7 +23,7 @@ class Piwik_CustomVariables_Archiver extends PluginsArchiver const CUSTOM_VARIABLE_RECORD_NAME = 'CustomVariables_valueByName'; /** - * @var Piwik_DataArray + * @var DataArray */ protected $dataArray; protected $maximumRowsInDataTableLevelZero; @@ -37,9 +39,9 @@ class Piwik_CustomVariables_Archiver extends PluginsArchiver public function archiveDay() { - $this->dataArray = new Piwik_DataArray(); + $this->dataArray = new DataArray(); - for ($i = 1; $i <= Piwik_Tracker::MAX_CUSTOM_VARIABLES; $i++) { + for ($i = 1; $i <= Tracker::MAX_CUSTOM_VARIABLES; $i++) { $this->aggregateCustomVariable($i); } @@ -190,7 +192,7 @@ class Piwik_CustomVariables_Archiver extends PluginsArchiver $dataArray = &$this->dataArray->getDataArray(); foreach ($dataArray as $key => &$row) { if (!self::isReservedKey($key) - && Piwik_DataArray::isRowActions($row) + && DataArray::isRowActions($row) ) { unset($row[Metrics::INDEX_NB_UNIQ_VISITORS]); unset($row[Metrics::INDEX_NB_VISITS]); diff --git a/plugins/CustomVariables/Controller.php b/plugins/CustomVariables/Controller.php index 867988a79b..6c6054f418 100644 --- a/plugins/CustomVariables/Controller.php +++ b/plugins/CustomVariables/Controller.php @@ -8,22 +8,25 @@ * @category Piwik_Plugins * @package Piwik_CustomVariables */ +use Piwik\Controller; +use Piwik\ViewDataTable; +use Piwik\View; /** * @package Piwik_CustomVariables */ -class Piwik_CustomVariables_Controller extends Piwik_Controller +class Piwik_CustomVariables_Controller extends Controller { public function index($fetch = false) { - return Piwik_View::singleReport( + return View::singleReport( Piwik_Translate('CustomVariables_CustomVariables'), $this->getCustomVariables(true), $fetch); } public function getCustomVariables($fetch = false) { - $view = Piwik_ViewDataTable::factory(); + $view = ViewDataTable::factory(); $view->init($this->pluginName, __FUNCTION__, "CustomVariables.getCustomVariables", "getCustomVariablesValuesFromNameId"); $this->setPeriodVariablesView($view); @@ -39,7 +42,7 @@ class Piwik_CustomVariables_Controller extends Piwik_Controller public function getCustomVariablesValuesFromNameId($fetch = false) { - $view = Piwik_ViewDataTable::factory(); + $view = ViewDataTable::factory(); $view->init($this->pluginName, __FUNCTION__, 'CustomVariables.getCustomVariablesValuesFromNameId'); $this->configureView($view); diff --git a/plugins/CustomVariables/CustomVariables.php b/plugins/CustomVariables/CustomVariables.php index 971a967b8e..362d453aa2 100644 --- a/plugins/CustomVariables/CustomVariables.php +++ b/plugins/CustomVariables/CustomVariables.php @@ -9,6 +9,7 @@ * @package Piwik_CustomVariables */ use Piwik\ArchiveProcessor; +use Piwik\Tracker; use Piwik\Plugin; /** @@ -42,7 +43,7 @@ class Piwik_CustomVariables extends Plugin public function addWidgets() { - Piwik_AddWidget('General_Visitors', 'CustomVariables_CustomVariables', 'CustomVariables', 'getCustomVariables'); + WidgetsList::add('General_Visitors', 'CustomVariables_CustomVariables', 'CustomVariables', 'getCustomVariables'); } public function addMenus() @@ -79,7 +80,7 @@ class Piwik_CustomVariables extends Plugin public function getSegmentsMetadata(&$segments) { - for ($i = 1; $i <= Piwik_Tracker::MAX_CUSTOM_VARIABLES; $i++) { + for ($i = 1; $i <= Tracker::MAX_CUSTOM_VARIABLES; $i++) { $segments[] = array( 'type' => 'dimension', 'category' => 'CustomVariables_CustomVariables', diff --git a/plugins/DBStats/Controller.php b/plugins/DBStats/Controller.php index 7596dc4106..8194c29cc4 100644 --- a/plugins/DBStats/Controller.php +++ b/plugins/DBStats/Controller.php @@ -8,13 +8,16 @@ * @category Piwik_Plugins * @package Piwik_DBStats */ +use Piwik\Controller\Admin; use Piwik\Piwik; +use Piwik\ViewDataTable; +use Piwik\View; /** * * @package Piwik_DBStats */ -class Piwik_DBStats_Controller extends Piwik_Controller_Admin +class Piwik_DBStats_Controller extends Admin { /** * Returns the index for this plugin. Shows every other report defined by this plugin, @@ -26,7 +29,7 @@ class Piwik_DBStats_Controller extends Piwik_Controller_Admin public function index() { Piwik::checkUserIsSuperUser(); - $view = new Piwik_View('@DBStats/index'); + $view = new View('@DBStats/index'); $this->setBasicVariablesView($view); $view->databaseUsageSummary = $this->getDatabaseUsageSummary(true); @@ -248,7 +251,7 @@ class Piwik_DBStats_Controller extends Piwik_Controller_Admin 'estimated_size' => Piwik_Translate('DBStats_EstimatedSize') ); - $view = Piwik_ViewDataTable::factory($viewType); + $view = ViewDataTable::factory($viewType); $view->init($this->pluginName, $function, "DBStats.$function"); $view->setSortedColumn('label', $orderDir); $view->setLimit($limit); diff --git a/plugins/DBStats/DBStats.php b/plugins/DBStats/DBStats.php index 770e00f0ed..955c0b6812 100644 --- a/plugins/DBStats/DBStats.php +++ b/plugins/DBStats/DBStats.php @@ -10,6 +10,7 @@ */ use Piwik\Piwik; use Piwik\Date; +use Piwik\ScheduledTask; use Piwik\Plugin; /** @@ -45,12 +46,12 @@ class Piwik_DBStats extends Plugin */ public function getScheduledTasks(&$tasks) { - $cacheDataByArchiveNameReportsTask = new Piwik_ScheduledTask( + $cacheDataByArchiveNameReportsTask = new ScheduledTask( $this, 'cacheDataByArchiveNameReports', null, new Piwik_ScheduledTime_Weekly(), - Piwik_ScheduledTask::LOWEST_PRIORITY + ScheduledTask::LOWEST_PRIORITY ); $tasks[] = $cacheDataByArchiveNameReportsTask; } diff --git a/plugins/DBStats/MySQLMetadataProvider.php b/plugins/DBStats/MySQLMetadataProvider.php index c7701e6023..c21f6f6009 100755 --- a/plugins/DBStats/MySQLMetadataProvider.php +++ b/plugins/DBStats/MySQLMetadataProvider.php @@ -51,7 +51,7 @@ class Piwik_DBStats_MySQLMetadataProvider mysql_close($link); $status = explode(" ", $status); } else { - $fullStatus = Piwik_FetchAssoc('SHOW STATUS'); + $fullStatus = Db::fetchAssoc('SHOW STATUS'); if (empty($fullStatus)) { throw new Exception('Error, SHOW STATUS failed'); } @@ -86,7 +86,7 @@ class Piwik_DBStats_MySQLMetadataProvider if (!is_null($this->tableStatuses) && isset($this->tableStatuses[$prefixed])) { return $this->tableStatuses[$prefixed]; } else { - return Piwik_FetchRow("SHOW TABLE STATUS LIKE ?", array($prefixed)); + return Db::fetchRow("SHOW TABLE STATUS LIKE ?", array($prefixed)); } } @@ -105,7 +105,7 @@ class Piwik_DBStats_MySQLMetadataProvider $tablesPiwik = Piwik::getTablesInstalled(); $this->tableStatuses = array(); - foreach (Piwik_FetchAll("SHOW TABLE STATUS") as $t) { + foreach (Db::fetchAll("SHOW TABLE STATUS") as $t) { if (in_array($t['Name'], $tablesPiwik)) { $this->tableStatuses[$t['Name']] = $t; } @@ -232,7 +232,7 @@ class Piwik_DBStats_MySQLMetadataProvider $sql = "SELECT name as 'label', COUNT(*) as 'row_count'$extraCols FROM {$status['Name']} GROUP BY name"; $table = new DataTable(); - $table->addRowsFromSimpleArray(Piwik_FetchAll($sql)); + $table->addRowsFromSimpleArray(Db::fetchAll($sql)); $reduceArchiveRowName = array($this, 'reduceArchiveRowName'); $table->filter('GroupBy', array('label', $reduceArchiveRowName)); @@ -275,7 +275,7 @@ class Piwik_DBStats_MySQLMetadataProvider static $fixedSizeColumnLength = null; if (is_null($fixedSizeColumnLength)) { $fixedSizeColumnLength = 0; - foreach (Piwik_FetchAll("SHOW COLUMNS FROM " . $status['Name']) as $column) { + foreach (Db::fetchAll("SHOW COLUMNS FROM " . $status['Name']) as $column) { $columnType = $column['Type']; if (($paren = strpos($columnType, '(')) !== false) { diff --git a/plugins/Dashboard/API.php b/plugins/Dashboard/API.php index 83a5c0b804..b3231c7bdc 100644 --- a/plugins/Dashboard/API.php +++ b/plugins/Dashboard/API.php @@ -155,7 +155,7 @@ class Piwik_Dashboard_API $module = $widget->parameters->module; $action = $widget->parameters->action; - return Piwik_IsWidgetDefined($module, $action); + return WidgetsList::isDefined($module, $action); } private function widgetIsNotHidden($widget) diff --git a/plugins/Dashboard/Controller.php b/plugins/Dashboard/Controller.php index 0f6cca6d00..c3743500b1 100644 --- a/plugins/Dashboard/Controller.php +++ b/plugins/Dashboard/Controller.php @@ -10,13 +10,15 @@ use Piwik\DataTable\Renderer\Json; use Piwik\Piwik; use Piwik\Common; +use Piwik\Controller; +use Piwik\View; /** * Dashboard Controller * * @package Piwik_Dashboard */ -class Piwik_Dashboard_Controller extends Piwik_Controller +class Piwik_Dashboard_Controller extends Controller { /** * @var Piwik_Dashboard @@ -32,10 +34,10 @@ class Piwik_Dashboard_Controller extends Piwik_Controller protected function _getDashboardView($template) { - $view = new Piwik_View($template); + $view = new View($template); $this->setGeneralVariablesView($view); - $view->availableWidgets = Common::json_encode(Piwik_GetWidgetsList()); + $view->availableWidgets = Common::json_encode(WidgetsList::get()); $view->availableLayouts = $this->getAvailableLayouts(); $view->dashboardId = Common::getRequestVar('idDashboard', 1, 'int'); @@ -68,7 +70,7 @@ class Piwik_Dashboard_Controller extends Piwik_Controller $this->checkTokenInUrl(); Json::sendHeaderJSON(); - echo Common::json_encode(Piwik_GetWidgetsList()); + echo Common::json_encode(WidgetsList::get()); } public function getDashboardLayout() @@ -111,7 +113,7 @@ class Piwik_Dashboard_Controller extends Piwik_Controller $paramsBind = array($login, $idDashboard, $layout, $layout); $query = sprintf('INSERT INTO %s (login, iddashboard, layout) VALUES (?,?,?) ON DUPLICATE KEY UPDATE layout=?', Common::prefixTable('user_dashboard')); - Piwik_Query($query, $paramsBind); + Db::query($query, $paramsBind); } /** @@ -126,7 +128,7 @@ class Piwik_Dashboard_Controller extends Piwik_Controller $paramsBind = array($name, $login, $idDashboard); $query = sprintf('UPDATE %s SET name = ? WHERE login = ? AND iddashboard = ?', Common::prefixTable('user_dashboard')); - Piwik_Query($query, $paramsBind); + Db::query($query, $paramsBind); } /** @@ -146,7 +148,7 @@ class Piwik_Dashboard_Controller extends Piwik_Controller if ($idDashboard != 1) { $query = sprintf('DELETE FROM %s WHERE iddashboard = ? AND login = ?', Common::prefixTable('user_dashboard')); - Piwik_Query($query, array($idDashboard, Piwik::getCurrentUserLogin())); + Db::query($query, array($idDashboard, Piwik::getCurrentUserLogin())); } } @@ -196,7 +198,7 @@ class Piwik_Dashboard_Controller extends Piwik_Controller $query = sprintf('INSERT INTO %s (login, iddashboard, name, layout) VALUES (?, ?, ?, ?)', Common::prefixTable('user_dashboard')); - Piwik_Query($query, array($user, $nextId, $name, $layout)); + Db::query($query, array($user, $nextId, $name, $layout)); Json::sendHeaderJSON(); echo Common::json_encode($nextId); @@ -206,7 +208,7 @@ class Piwik_Dashboard_Controller extends Piwik_Controller { $nextIdQuery = sprintf('SELECT MAX(iddashboard)+1 FROM %s WHERE login = ?', Common::prefixTable('user_dashboard')); - $nextId = Piwik_FetchOne($nextIdQuery, array($login)); + $nextId = Db::fetchOne($nextIdQuery, array($login)); if (empty($nextId)) { $nextId = 1; @@ -234,7 +236,7 @@ class Piwik_Dashboard_Controller extends Piwik_Controller $query = sprintf('INSERT INTO %s (login, iddashboard, name, layout) VALUES (?, ?, ?, ?)', Common::prefixTable('user_dashboard')); - Piwik_Query($query, array($user, $nextId, $name, $layout)); + Db::query($query, array($user, $nextId, $name, $layout)); Json::sendHeaderJSON(); echo Common::json_encode($nextId); @@ -278,7 +280,7 @@ class Piwik_Dashboard_Controller extends Piwik_Controller $paramsBind = array('', '1', $layout, $layout); $query = sprintf('INSERT INTO %s (login, iddashboard, layout) VALUES (?,?,?) ON DUPLICATE KEY UPDATE layout=?', Common::prefixTable('user_dashboard')); - Piwik_Query($query, $paramsBind); + Db::query($query, $paramsBind); } } diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php index 25fb766226..c019a49573 100644 --- a/plugins/Dashboard/Dashboard.php +++ b/plugins/Dashboard/Dashboard.php @@ -46,7 +46,7 @@ class Piwik_Dashboard extends Plugin $paramsBind = array($login, $idDashboard); $query = sprintf('SELECT layout FROM %s WHERE login = ? AND iddashboard = ?', Common::prefixTable('user_dashboard')); - $return = Piwik_FetchAll($query, $paramsBind); + $return = Db::fetchAll($query, $paramsBind); if (count($return) == 0) { return false; @@ -96,7 +96,7 @@ class Piwik_Dashboard extends Plugin public function getAllDashboards($login) { - $dashboards = Piwik_FetchAll('SELECT iddashboard, name, layout + $dashboards = Db::fetchAll('SELECT iddashboard, name, layout FROM ' . Common::prefixTable('user_dashboard') . ' WHERE login = ? ORDER BY iddashboard', array($login)); @@ -161,7 +161,7 @@ class Piwik_Dashboard extends Plugin if (isset($widget->parameters->module)) { $controllerName = $widget->parameters->module; $controllerAction = $widget->parameters->action; - if (!Piwik_IsWidgetDefined($controllerName, $controllerAction)) { + if (!WidgetsList::isDefined($controllerName, $controllerAction)) { unset($row[$widgetId]); } } else { @@ -240,7 +240,7 @@ class Piwik_Dashboard extends Plugin public function deleteDashboardLayout($userLogin) { - Piwik_Query('DELETE FROM ' . Common::prefixTable('user_dashboard') . ' WHERE login = ?', array($userLogin)); + Db::query('DELETE FROM ' . Common::prefixTable('user_dashboard') . ' WHERE login = ?', array($userLogin)); } public function install() @@ -254,7 +254,7 @@ class Piwik_Dashboard extends Plugin layout TEXT NOT NULL, PRIMARY KEY ( login , iddashboard ) ) DEFAULT CHARSET=utf8 "; - Piwik_Exec($sql); + Db::exec($sql); } catch (Exception $e) { // mysql code error 1050:table already exists // see bug #153 http://dev.piwik.org/trac/ticket/153 @@ -266,6 +266,6 @@ class Piwik_Dashboard extends Plugin public function uninstall() { - Piwik_DropTables(Common::prefixTable('user_dashboard')); + Db::dropTables(Common::prefixTable('user_dashboard')); } } diff --git a/plugins/DevicesDetection/Controller.php b/plugins/DevicesDetection/Controller.php index ae94f95375..d9b0136b77 100644 --- a/plugins/DevicesDetection/Controller.php +++ b/plugins/DevicesDetection/Controller.php @@ -1,6 +1,9 @@ <?php use Piwik\Piwik; use Piwik\Common; +use Piwik\Controller; +use Piwik\ViewDataTable; +use Piwik\View; /** * Piwik - Open source web analytics @@ -11,7 +14,7 @@ use Piwik\Common; * @category Piwik_Plugins * @package Piwik_DevicesDetection */ -class Piwik_DevicesDetection_Controller extends Piwik_Controller +class Piwik_DevicesDetection_Controller extends Controller { /** The set of related reports displayed under the 'Operating Systems' header. */ @@ -33,7 +36,7 @@ class Piwik_DevicesDetection_Controller extends Piwik_Controller public function index($fetch = false) { - $view = new Piwik_View('@DevicesDetection/index'); + $view = new View('@DevicesDetection/index'); $view->deviceTypes = $view->deviceModels = $view->deviceBrands = $view->osReport = $view->browserReport = "blank"; $view->deviceTypes = $this->getType(true); $view->deviceBrands = $this->getBrand(true); @@ -120,7 +123,7 @@ class Piwik_DevicesDetection_Controller extends Piwik_Controller protected function getStandardDataTableUserSettings($currentControllerAction, $APItoCall, $defaultDatatableType = null) { - $view = Piwik_ViewDataTable::factory($defaultDatatableType); + $view = ViewDataTable::factory($defaultDatatableType); $view->init($this->pluginName, $currentControllerAction, $APItoCall); $view->disableSearchBox(); $view->disableExcludeLowPopulation(); @@ -136,7 +139,7 @@ class Piwik_DevicesDetection_Controller extends Piwik_Controller { Piwik::checkUserIsSuperUser(); $q = "SELECT idvisit, config_debug_ua FROM " . Common::prefixTable("log_visit"); - $res = Piwik_FetchAll($q); + $res = Db::fetchAll($q); foreach ($res as $rec) { $UAParser = new UserAgentParserEnhanced($rec['config_debug_ua']); $UAParser->parse(); @@ -174,7 +177,7 @@ class Piwik_DevicesDetection_Controller extends Piwik_Controller "config_device_model = " . (isset($uaDetails['config_device_model']) ? "'" . $uaDetails['config_device_model'] . "'" : "NULL") . " ," . "config_device_brand = " . (isset($uaDetails['config_device_brand']) ? "'" . $uaDetails['config_device_brand'] . "'" : "NULL") . " WHERE idvisit = " . $idVisit; - Piwik_Query($q); + Db::query($q); } } diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php index 7129ee581b..f70fba50fa 100644 --- a/plugins/DevicesDetection/DevicesDetection.php +++ b/plugins/DevicesDetection/DevicesDetection.php @@ -130,7 +130,7 @@ class Piwik_DevicesDetection extends Plugin list($category, $name, $controllerName, $controllerAction) = $report; if ($category == false) continue; - Piwik_AddWidget($category, $name, $controllerName, $controllerAction); + WidgetsList::add($category, $name, $controllerName, $controllerAction); } } @@ -194,12 +194,12 @@ class Piwik_DevicesDetection extends Plugin ADD `config_device_type` TINYINT( 10 ) NULL DEFAULT NULL AFTER `config_browser_version` , ADD `config_device_brand` VARCHAR( 100 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `config_device_type` , ADD `config_device_model` VARCHAR( 100 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `config_device_brand`"; - Piwik_Exec($q1); + Db::exec($q1); // conditionaly add this column if (@Config::getInstance()->Debug['store_user_agent_in_visit']) { $q2 = "ALTER TABLE `" . Common::prefixTable("log_visit") . "` ADD `config_debug_ua` VARCHAR( 512 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `config_device_model`"; - Piwik_Exec($q2); + Db::exec($q2); } } catch (Exception $e) { if (!Zend_Registry::get('db')->isErrNo($e, '1060')) { diff --git a/plugins/ExampleAPI/API.php b/plugins/ExampleAPI/API.php index d4a0febccf..214d73eac5 100644 --- a/plugins/ExampleAPI/API.php +++ b/plugins/ExampleAPI/API.php @@ -11,6 +11,7 @@ use Piwik\DataTable\Row; use Piwik\Piwik; use Piwik\DataTable; +use Piwik\Version; /** * The ExampleAPI is useful to developers building a custom Piwik plugin. @@ -61,7 +62,7 @@ class Piwik_ExampleAPI_API public function getPiwikVersion() { Piwik::checkUserHasSomeViewAccess(); - return Piwik_Version::VERSION; + return Version::VERSION; } /** diff --git a/plugins/ExamplePlugin/Controller.php b/plugins/ExamplePlugin/Controller.php index 3e6c557130..0bebd89e57 100644 --- a/plugins/ExamplePlugin/Controller.php +++ b/plugins/ExamplePlugin/Controller.php @@ -10,12 +10,14 @@ */ use Piwik\Piwik; use Piwik\Common; +use Piwik\Controller; +use Piwik\View; /** * * @package Piwik_ExamplePlugin */ -class Piwik_ExamplePlugin_Controller extends Piwik_Controller +class Piwik_ExamplePlugin_Controller extends Controller { /** * Go to /piwik/?module=ExamplePlugin&action=helloWorld to execute this method @@ -54,7 +56,7 @@ class Piwik_ExamplePlugin_Controller extends Piwik_Controller */ public function piwikDownloads() { - $view = new Piwik_View('@ExamplePlugin/piwikDownloads'); + $view = new View('@ExamplePlugin/piwikDownloads'); $this->setGeneralVariablesView($view); echo $view->render(); } @@ -81,7 +83,7 @@ class Piwik_ExamplePlugin_Controller extends Piwik_Controller $out .= '<h3>Misc</h3>'; $out .= '<code>Piwik_AddMenu( $mainMenuName, $subMenuName, $url );</code> - Adds an entry to the menu in the Piwik interface (See the example in the <a href="https://github.com/piwik/piwik/blob/1.0/plugins/UserCountry/UserCountry.php#L76">UserCountry Plugin file</a>)<br />'; - $out .= '<code>Piwik_AddWidget( $widgetCategory, $widgetName, $controllerName, $controllerAction, $customParameters = array());</code> - Adds a widget that users can add in the dashboard, or export using the Widgets link at the top of the screen. See the example in the <a href="https://github.com/piwik/piwik/blob/1.0/plugins/UserCountry/UserCountry.php#L70">UserCountry Plugin file</a> or any other plugin)<br />'; + $out .= '<code>WidgetsList::add( $widgetCategory, $widgetName, $controllerName, $controllerAction, $customParameters = array());</code> - Adds a widget that users can add in the dashboard, or export using the Widgets link at the top of the screen. See the example in the <a href="https://github.com/piwik/piwik/blob/1.0/plugins/UserCountry/UserCountry.php#L70">UserCountry Plugin file</a> or any other plugin)<br />'; $out .= '<code>Common::prefixTable("site")</code> = <b>' . Common::prefixTable("site") . '</b><br />'; @@ -94,15 +96,15 @@ class Piwik_ExamplePlugin_Controller extends Piwik_Controller $out .= '<h2>Execute SQL queries</h2>'; $txtQuery = "SELECT token_auth FROM " . Common::prefixTable('user') . " WHERE login = ?"; - $result = Piwik_FetchOne($txtQuery, array('anonymous')); - $out .= '<code>Piwik_FetchOne("' . $txtQuery . '", array("anonymous"))</code> = <b>' . var_export($result, true) . '</b><br />'; + $result = Db::fetchOne($txtQuery, array('anonymous')); + $out .= '<code>Db::fetchOne("' . $txtQuery . '", array("anonymous"))</code> = <b>' . var_export($result, true) . '</b><br />'; $out .= '<br />'; - $query = Piwik_Query($txtQuery, array('anonymous')); + $query = Db::query($txtQuery, array('anonymous')); $fetched = $query->fetch(); $token_auth = $fetched['token_auth']; - $out .= '<code>$query = Piwik_Query("' . $txtQuery . '", array("anonymous"))</code><br />'; + $out .= '<code>$query = Db::query("' . $txtQuery . '", array("anonymous"))</code><br />'; $out .= '<code>$fetched = $query->fetch();</code><br />'; $out .= 'At this point, we have: <code>$fetched[\'token_auth\'] == <b>' . var_export($token_auth, true) . '</b></code><br />'; diff --git a/plugins/ExamplePlugin/ExamplePlugin.php b/plugins/ExamplePlugin/ExamplePlugin.php index 7fc7a2cc09..bb7c968452 100644 --- a/plugins/ExamplePlugin/ExamplePlugin.php +++ b/plugins/ExamplePlugin/ExamplePlugin.php @@ -51,8 +51,8 @@ class Piwik_ExamplePlugin extends Plugin { // we register the widgets so they appear in the "Add a new widget" window in the dashboard // Note that the first two parameters can be either a normal string, or an index to a translation string - Piwik_AddWidget('ExamplePlugin_exampleWidgets', 'ExamplePlugin_exampleWidget', 'ExamplePlugin', 'exampleWidget'); - Piwik_AddWidget('ExamplePlugin_exampleWidgets', 'ExamplePlugin_photostreamMatt', 'ExamplePlugin', 'photostreamMatt'); - Piwik_AddWidget('ExamplePlugin_exampleWidgets', 'ExamplePlugin_piwikForumVisits', 'ExamplePlugin', 'piwikDownloads'); + WidgetsList::add('ExamplePlugin_exampleWidgets', 'ExamplePlugin_exampleWidget', 'ExamplePlugin', 'exampleWidget'); + WidgetsList::add('ExamplePlugin_exampleWidgets', 'ExamplePlugin_photostreamMatt', 'ExamplePlugin', 'photostreamMatt'); + WidgetsList::add('ExamplePlugin_exampleWidgets', 'ExamplePlugin_piwikForumVisits', 'ExamplePlugin', 'piwikDownloads'); } } diff --git a/plugins/ExampleRssWidget/Controller.php b/plugins/ExampleRssWidget/Controller.php index 41e6691f9d..aaa53a7ef1 100644 --- a/plugins/ExampleRssWidget/Controller.php +++ b/plugins/ExampleRssWidget/Controller.php @@ -8,12 +8,13 @@ * @category Piwik_Plugins * @package Piwik_ExampleRssWidget */ +use Piwik\Controller; /** * * @package Piwik_ExampleRssWidget */ -class Piwik_ExampleRssWidget_Controller extends Piwik_Controller +class Piwik_ExampleRssWidget_Controller extends Controller { public function rssPiwik() { diff --git a/plugins/ExampleRssWidget/ExampleRssWidget.php b/plugins/ExampleRssWidget/ExampleRssWidget.php index 72831e6d0b..a0f7b33dca 100644 --- a/plugins/ExampleRssWidget/ExampleRssWidget.php +++ b/plugins/ExampleRssWidget/ExampleRssWidget.php @@ -34,7 +34,7 @@ class Piwik_ExampleRssWidget extends Plugin public function addWidgets() { - Piwik_AddWidget('Example Widgets', 'Piwik.org Blog', 'ExampleRssWidget', 'rssPiwik'); - Piwik_AddWidget('Example Widgets', 'Piwik Changelog', 'ExampleRssWidget', 'rssChangelog'); + WidgetsList::add('Example Widgets', 'Piwik.org Blog', 'ExampleRssWidget', 'rssPiwik'); + WidgetsList::add('Example Widgets', 'Piwik Changelog', 'ExampleRssWidget', 'rssChangelog'); } } diff --git a/plugins/ExampleUI/API.php b/plugins/ExampleUI/API.php index 5857ef112b..3730c54eba 100644 --- a/plugins/ExampleUI/API.php +++ b/plugins/ExampleUI/API.php @@ -44,7 +44,7 @@ class Piwik_ExampleUI_API AND date < ? GROUP BY date ORDER BY date ASC"; - //$result = Piwik_FetchAll($query, array($dateStart, $dateEnd)); + //$result = Db::fetchAll($query, array($dateStart, $dateEnd)); // to keep things simple, we generate the data foreach ($period->getSubperiods() as $subPeriod) { $server1 = mt_rand(50, 90); diff --git a/plugins/ExampleUI/Controller.php b/plugins/ExampleUI/Controller.php index 5ee8ffddd7..ffb9342830 100644 --- a/plugins/ExampleUI/Controller.php +++ b/plugins/ExampleUI/Controller.php @@ -9,15 +9,18 @@ * @package Piwik_ExampleUI */ use Piwik\Common; +use Piwik\Controller; +use Piwik\ViewDataTable; +use Piwik\View; /** * @package Piwik_ExampleUI */ -class Piwik_ExampleUI_Controller extends Piwik_Controller +class Piwik_ExampleUI_Controller extends Controller { function dataTables() { - $view = Piwik_ViewDataTable::factory('table'); + $view = ViewDataTable::factory('table'); $view->init($this->pluginName, __FUNCTION__, 'ExampleUI.getTemperatures'); $view->setColumnTranslation('value', "Temperature in °C"); $view->setColumnTranslation('label', "Hour of day"); @@ -39,7 +42,7 @@ class Piwik_ExampleUI_Controller extends Piwik_Controller function echoEvolutionGraph() { - $view = Piwik_ViewDataTable::factory('graphEvolution'); + $view = ViewDataTable::factory('graphEvolution'); $view->init($this->pluginName, __FUNCTION__, 'ExampleUI.getTemperaturesEvolution'); $view->setColumnTranslation('server1', "Temperature server piwik.org"); $view->setColumnTranslation('server2', "Temperature server dev.piwik.org"); @@ -49,7 +52,7 @@ class Piwik_ExampleUI_Controller extends Piwik_Controller function barGraph() { - $view = Piwik_ViewDataTable::factory('graphVerticalBar'); + $view = ViewDataTable::factory('graphVerticalBar'); $view->init($this->pluginName, __FUNCTION__, 'ExampleUI.getTemperatures'); $view->setColumnTranslation('value', "Temperature"); $view->setAxisYUnit('°C'); @@ -60,7 +63,7 @@ class Piwik_ExampleUI_Controller extends Piwik_Controller function pieGraph() { - $view = Piwik_ViewDataTable::factory('graphPie'); + $view = ViewDataTable::factory('graphPie'); $view->init($this->pluginName, __FUNCTION__, 'ExampleUI.getPlanetRatios'); $view->setColumnsToDisplay('value'); $view->setColumnTranslation('value', "times the diameter of Earth"); @@ -84,7 +87,7 @@ class Piwik_ExampleUI_Controller extends Piwik_Controller function echoSimpleTagClouds() { - $view = Piwik_ViewDataTable::factory('cloud'); + $view = ViewDataTable::factory('cloud'); $view->init($this->pluginName, __FUNCTION__, 'ExampleUI.getPlanetRatios'); $view->setColumnsToDisplay(array('label', 'value')); $view->setColumnTranslation('value', "times the diameter of Earth"); @@ -94,7 +97,7 @@ class Piwik_ExampleUI_Controller extends Piwik_Controller function echoAdvancedTagClouds() { - $view = Piwik_ViewDataTable::factory('cloud'); + $view = ViewDataTable::factory('cloud'); $view->init($this->pluginName, __FUNCTION__, 'ExampleUI.getPlanetRatiosWithLogos'); $view->setDisplayLogoInTagCloud(true); $view->disableFooterExceptExportIcons(); @@ -105,7 +108,7 @@ class Piwik_ExampleUI_Controller extends Piwik_Controller function sparklines() { - $view = new Piwik_View('@ExampleUI/sparklines'); + $view = new View('@ExampleUI/sparklines'); $view->urlSparkline1 = $this->getUrlSparkline('generateSparkline', array('server' => 'server1', 'rand' => mt_rand())); $view->urlSparkline2 = $this->getUrlSparkline('generateSparkline', array('server' => 'server2', 'rand' => mt_rand())); echo $view->render(); @@ -114,7 +117,7 @@ class Piwik_ExampleUI_Controller extends Piwik_Controller function generateSparkline() { $serverRequested = Common::getRequestVar('server', ''); - $view = Piwik_ViewDataTable::factory('sparkline'); + $view = ViewDataTable::factory('sparkline'); $view->init($this->pluginName, __FUNCTION__, 'ExampleUI.getTemperaturesEvolution'); $view->setColumnsToDisplay($serverRequested); $this->renderView($view); diff --git a/plugins/Feedback/Controller.php b/plugins/Feedback/Controller.php index 243a36bacd..3a43559d6f 100644 --- a/plugins/Feedback/Controller.php +++ b/plugins/Feedback/Controller.php @@ -11,17 +11,24 @@ use Piwik\Config; use Piwik\Piwik; use Piwik\Common; +use Piwik\Controller; +use Piwik\IP; +use Piwik\Mail; +use Piwik\Nonce; +use Piwik\View; +use Piwik\Version; +use Piwik\Url; /** * * @package Piwik_Feedback */ -class Piwik_Feedback_Controller extends Piwik_Controller +class Piwik_Feedback_Controller extends Controller { function index() { - $view = new Piwik_View('@Feedback/index'); - $view->nonce = Piwik_Nonce::getNonce('Piwik_Feedback.sendFeedback', 3600); + $view = new View('@Feedback/index'); + $view->nonce = Nonce::getNonce('Piwik_Feedback.sendFeedback', 3600); echo $view->render(); } @@ -36,7 +43,7 @@ class Piwik_Feedback_Controller extends Piwik_Controller $category = Common::getRequestVar('category', '', 'string'); $nonce = Common::getRequestVar('nonce', '', 'string'); - $view = new Piwik_View('@Feedback/sendFeedback'); + $view = new View('@Feedback/sendFeedback'); $view->feedbackEmailAddress = Config::getInstance()->General['feedback_email_address']; try { $minimumBodyLength = 40; @@ -53,19 +60,19 @@ class Piwik_Feedback_Controller extends Piwik_Controller if (preg_match('/https?:/i', $body)) { throw new Exception(Piwik_TranslateException('Feedback_ExceptionNoUrls')); } - if (!Piwik_Nonce::verifyNonce('Piwik_Feedback.sendFeedback', $nonce)) { + if (!Nonce::verifyNonce('Piwik_Feedback.sendFeedback', $nonce)) { throw new Exception(Piwik_TranslateException('General_ExceptionNonceMismatch')); } - Piwik_Nonce::discardNonce('Piwik_Feedback.sendFeedback'); + Nonce::discardNonce('Piwik_Feedback.sendFeedback'); - $mail = new Piwik_Mail(); + $mail = new Mail(); $mail->setFrom(Common::unsanitizeInputValue($email)); $mail->addTo($view->feedbackEmailAddress, 'Piwik Team'); $mail->setSubject('[ Feedback form - Piwik ] ' . $category); $mail->setBodyText(Common::unsanitizeInputValue($body) . "\n" - . 'Piwik ' . Piwik_Version::VERSION . "\n" - . 'IP: ' . Piwik_IP::getIpFromHeader() . "\n" - . 'URL: ' . Piwik_Url::getReferer() . "\n"); + . 'Piwik ' . Version::VERSION . "\n" + . 'IP: ' . IP::getIpFromHeader() . "\n" + . 'URL: ' . Url::getReferer() . "\n"); @$mail->send(); } catch (Exception $e) { $view->errorString = $e->getMessage(); diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php index db754b3bb3..2f5be105ba 100644 --- a/plugins/Goals/API.php +++ b/plugins/Goals/API.php @@ -65,7 +65,7 @@ class Piwik_Goals_API return array(); } Piwik::checkUserHasViewAccess($idSite); - $goals = Piwik_FetchAll("SELECT * + $goals = Db::fetchAll("SELECT * FROM " . Common::prefixTable('goal') . " WHERE idsite IN (" . implode(", ", $idSite) . ") AND deleted = 0"); @@ -194,12 +194,12 @@ class Piwik_Goals_API public function deleteGoal($idSite, $idGoal) { Piwik::checkUserHasAdminAccess($idSite); - Piwik_Query("UPDATE " . Common::prefixTable('goal') . " + Db::query("UPDATE " . Common::prefixTable('goal') . " SET deleted = 1 WHERE idsite = ? AND idgoal = ?", array($idSite, $idGoal)); - Piwik_DeleteAllRows(Common::prefixTable("log_conversion"), "WHERE idgoal = ?", 100000, array($idGoal)); + Db::deleteAllRows(Common::prefixTable("log_conversion"), "WHERE idgoal = ?", 100000, array($idGoal)); Piwik_Tracker_Cache::regenerateCacheWebsiteAttributes($idSite); } diff --git a/plugins/Goals/Archiver.php b/plugins/Goals/Archiver.php index 96792174c1..000de7d136 100644 --- a/plugins/Goals/Archiver.php +++ b/plugins/Goals/Archiver.php @@ -12,6 +12,7 @@ use Piwik\DataAccess\LogAggregator; use Piwik\Metrics; use Piwik\DataTable; +use Piwik\DataArray; use Piwik\PluginsArchiver; class Piwik_Goals_Archiver extends PluginsArchiver @@ -108,7 +109,7 @@ class Piwik_Goals_Archiver extends PluginsArchiver } $totalConversions = $totalRevenue = 0; - $goals = new Piwik_DataArray(); + $goals = new DataArray(); $visitsToConversions = $daysToConversions = array(); $conversionMetrics = $this->getLogAggregator()->getConversionsMetricFields(); @@ -161,7 +162,7 @@ class Piwik_Goals_Archiver extends PluginsArchiver $this->getProcessor()->insertNumericRecords($metrics); } - protected function getConversionsNumericMetrics(Piwik_DataArray $goals) + protected function getConversionsNumericMetrics(DataArray $goals) { $numericRecords = array(); $goals = $goals->getDataArray(); @@ -246,14 +247,14 @@ class Piwik_Goals_Archiver extends PluginsArchiver { foreach ($this->getEcommerceIdGoals() as $ecommerceType) { foreach ($this->dimensionRecord as $dimension => $record) { - $this->itemReports[$dimension][$ecommerceType] = new Piwik_DataArray(); + $this->itemReports[$dimension][$ecommerceType] = new DataArray(); } } } protected function recordItemReports() { - /** @var Piwik_DataArray $array */ + /** @var DataArray $array */ foreach ($this->itemReports as $dimension => $itemAggregatesByType) { foreach ($itemAggregatesByType as $ecommerceType => $itemAggregate) { $recordName = $this->dimensionRecord[$dimension]; diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php index 64ab750b6b..953f73cf51 100644 --- a/plugins/Goals/Controller.php +++ b/plugins/Goals/Controller.php @@ -8,16 +8,21 @@ * @category Piwik_Plugins * @package Piwik_Goals */ +use Piwik\API\Request; use Piwik\DataTable\Filter\AddColumnsProcessedMetricsGoal; use Piwik\Piwik; use Piwik\Common; use Piwik\DataTable; +use Piwik\Controller; +use Piwik\FrontController; +use Piwik\ViewDataTable; +use Piwik\View; /** * * @package Piwik_Goals */ -class Piwik_Goals_Controller extends Piwik_Controller +class Piwik_Goals_Controller extends Controller { const CONVERSION_RATE_PRECISION = 1; @@ -92,14 +97,14 @@ class Piwik_Goals_Controller extends Piwik_Controller $_GET['filterEcommerce'] = Common::getRequestVar('filterEcommerce', 1, 'int'); $_GET['widget'] = 1; $_GET['segment'] = 'visitEcommerceStatus!=none'; - $output = Piwik_FrontController::getInstance()->dispatch('Live', 'getVisitorLog', array($fetch)); + $output = FrontController::getInstance()->dispatch('Live', 'getVisitorLog', array($fetch)); $_GET = $saveGET; return $output; } protected function getGoalReportView($idGoal = false) { - $view = new Piwik_View('@Goals/getGoalReportView'); + $view = new View('@Goals/getGoalReportView'); if ($idGoal == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER) { $goalDefinition['name'] = Piwik_Translate('Goals_Ecommerce'); $goalDefinition['allow_multiple'] = true; @@ -171,7 +176,7 @@ class Piwik_Goals_Controller extends Piwik_Controller protected function getOverviewView() { - $view = new Piwik_View('@Goals/getOverviewView'); + $view = new View('@Goals/getOverviewView'); $this->setGeneralVariablesView($view); $view->graphEvolution = $this->getEvolutionGraph(true, array('nb_conversions')); @@ -183,7 +188,7 @@ class Piwik_Goals_Controller extends Piwik_Controller $view->urlSparklineRevenue = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('revenue'), 'idGoal' => '')); // Pass empty idGoal will return Goal overview - $request = new Piwik_API_Request("method=Goals.get&format=original&idGoal="); + $request = new Request("method=Goals.get&format=original&idGoal="); $datatable = $request->process(); $dataRow = $datatable->getFirstRow(); $view->nb_conversions = $dataRow->getColumn('nb_conversions'); @@ -225,7 +230,7 @@ class Piwik_Goals_Controller extends Piwik_Controller public function addNewGoal() { - $view = new Piwik_View('@Goals/addNewGoal'); + $view = new View('@Goals/addNewGoal'); $this->setGeneralVariablesView($view); $view->userCanEditGoals = Piwik::isUserHasAdminAccess($this->idSite); $view->onlyShowAddNewGoal = true; @@ -312,7 +317,7 @@ class Piwik_Goals_Controller extends Piwik_Controller } $topDimensions = array(); foreach ($topDimensionsToLoad as $dimensionName => $apiMethod) { - $request = new Piwik_API_Request("method=$apiMethod + $request = new Request("method=$apiMethod &format=original &filter_update_columns_when_show_all_goals=1 &idGoal=" . AddColumnsProcessedMetricsGoal::GOALS_FULL_TABLE . " @@ -348,7 +353,7 @@ class Piwik_Goals_Controller extends Piwik_Controller protected function getMetricsForGoal($idGoal) { - $request = new Piwik_API_Request("method=Goals.get&format=original&idGoal=$idGoal"); + $request = new Request("method=Goals.get&format=original&idGoal=$idGoal"); $datatable = $request->process(); $dataRow = $datatable->getFirstRow(); $nbConversions = $dataRow->getColumn('nb_conversions'); @@ -454,26 +459,26 @@ class Piwik_Goals_Controller extends Piwik_Controller public function getItemsSku($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getItemsName($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getItemsCategory($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getVisitsUntilConversion($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getDaysToConversion($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } } diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php index cd9857e3fd..a12ce89280 100644 --- a/plugins/Goals/Goals.php +++ b/plugins/Goals/Goals.php @@ -11,6 +11,7 @@ use Piwik\ArchiveProcessor; use Piwik\Piwik; use Piwik\Common; +use Piwik\TranslationWriter; use Piwik\Plugin; use Piwik\Site; @@ -102,7 +103,7 @@ class Piwik_Goals extends Plugin */ function deleteSiteGoals($idSite) { - Piwik_Query("DELETE FROM " . Common::prefixTable('goal') . " WHERE idsite = ? ", array($idSite)); + Db::query("DELETE FROM " . Common::prefixTable('goal') . " WHERE idsite = ? ", array($idSite)); } /** @@ -418,19 +419,19 @@ class Piwik_Goals extends Plugin // Ecommerce widgets $site = new Site($idSite); if ($site->isEcommerceEnabled()) { - Piwik_AddWidget('Goals_Ecommerce', 'Goals_EcommerceOverview', 'Goals', 'widgetGoalReport', array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER)); - Piwik_AddWidget('Goals_Ecommerce', 'Goals_EcommerceLog', 'Goals', 'getEcommerceLog'); + WidgetsList::add('Goals_Ecommerce', 'Goals_EcommerceOverview', 'Goals', 'widgetGoalReport', array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER)); + WidgetsList::add('Goals_Ecommerce', 'Goals_EcommerceLog', 'Goals', 'getEcommerceLog'); foreach ($this->ecommerceReports as $widget) { - Piwik_AddWidget('Goals_Ecommerce', $widget[0], $widget[1], $widget[2]); + WidgetsList::add('Goals_Ecommerce', $widget[0], $widget[1], $widget[2]); } } // Goals widgets - Piwik_AddWidget('Goals_Goals', 'Goals_GoalsOverview', 'Goals', 'widgetGoalsOverview'); + WidgetsList::add('Goals_Goals', 'Goals_GoalsOverview', 'Goals', 'widgetGoalsOverview'); $goals = Piwik_Goals_API::getInstance()->getGoals($idSite); if (count($goals) > 0) { foreach ($goals as $goal) { - Piwik_AddWidget('Goals_Goals', Common::sanitizeInputValue($goal['name']), 'Goals', 'widgetGoalReport', array('idGoal' => $goal['idgoal'])); + WidgetsList::add('Goals_Goals', Common::sanitizeInputValue($goal['name']), 'Goals', 'widgetGoalReport', array('idGoal' => $goal['idgoal'])); } } } @@ -465,7 +466,7 @@ class Piwik_Goals extends Plugin } Piwik_AddMenu($mainGoalMenu, 'Goals_GoalsOverview', array('module' => 'Goals', 'action' => 'index'), true, 2); foreach ($goals as $goal) { - Piwik_AddMenu($mainGoalMenu, str_replace('%', '%%', Piwik_TranslationWriter::clean($goal['name'])), array('module' => 'Goals', 'action' => 'goalReport', 'idGoal' => $goal['idgoal'])); + Piwik_AddMenu($mainGoalMenu, str_replace('%', '%%', TranslationWriter::clean($goal['name'])), array('module' => 'Goals', 'action' => 'goalReport', 'idGoal' => $goal['idgoal'])); } } } diff --git a/plugins/ImageGraph/API.php b/plugins/ImageGraph/API.php index b2811772f0..dafd9d9399 100644 --- a/plugins/ImageGraph/API.php +++ b/plugins/ImageGraph/API.php @@ -283,7 +283,7 @@ class Piwik_ImageGraph_API $plottedMetric = reset($ordinateColumns); // when no labels are specified, getRowEvolution returns the top N=filter_limit row evolutions - // rows are sorted using filter_sort_column (see Piwik_API_DataTableGenericFilter for more info) + // rows are sorted using filter_sort_column (see DataTableGenericFilter for more info) if (!$labels) { $savedFilterSortColumnValue = Common::getRequestVar('filter_sort_column', ''); $_GET['filter_sort_column'] = $plottedMetric; diff --git a/plugins/ImageGraph/Controller.php b/plugins/ImageGraph/Controller.php index cd7700ef23..a36d520b8e 100644 --- a/plugins/ImageGraph/Controller.php +++ b/plugins/ImageGraph/Controller.php @@ -1,6 +1,8 @@ <?php use Piwik\Piwik; use Piwik\Common; +use Piwik\Controller; +use Piwik\View; /** * Piwik - Open source web analytics @@ -12,7 +14,7 @@ use Piwik\Common; * @package Piwik_ImageGraph */ -class Piwik_ImageGraph_Controller extends Piwik_Controller +class Piwik_ImageGraph_Controller extends Controller { // Call metadata reports, and draw the default graph for each report. public function index() @@ -34,7 +36,7 @@ class Piwik_ImageGraph_Controller extends Piwik_Controller ); } } - $view = new Piwik_View('@ImageGraph/index'); + $view = new View('@ImageGraph/index'); $view->titleAndUrls = $plot; echo $view->render(); } @@ -44,7 +46,7 @@ class Piwik_ImageGraph_Controller extends Piwik_Controller { Piwik::checkUserIsSuperUser(); - $view = new Piwik_View('@ImageGraph/testAllSizes'); + $view = new View('@ImageGraph/testAllSizes'); $this->setGeneralVariablesView($view); $period = Common::getRequestVar('period', 'day', 'string'); diff --git a/plugins/ImageGraph/ImageGraph.php b/plugins/ImageGraph/ImageGraph.php index 3a2f56bb58..6181877fb7 100644 --- a/plugins/ImageGraph/ImageGraph.php +++ b/plugins/ImageGraph/ImageGraph.php @@ -1,6 +1,8 @@ <?php use Piwik\Common; use Piwik\Period; +use Piwik\Controller; +use Piwik\Url; use Piwik\Plugin; use Piwik\Site; use Piwik\Config; @@ -28,7 +30,7 @@ class Piwik_ImageGraph extends Plugin public function getInformation() { - $suffix = ' Debug: <a href="' . Piwik_Url::getCurrentQueryStringWithParametersModified( + $suffix = ' Debug: <a href="' . Url::getCurrentQueryStringWithParametersModified( array('module' => 'ImageGraph', 'action' => 'index')) . '">All images</a>'; $info = parent::getInformation(); $info['description'] .= ' ' . $suffix; @@ -90,7 +92,7 @@ class Piwik_ImageGraph extends Plugin $dateForMultiplePeriodGraph = $dateForSinglePeriodGraph; } else { $periodForMultiplePeriodGraph = $periodForSinglePeriodGraph; - $dateForMultiplePeriodGraph = Piwik_Controller::getDateRangeRelativeToEndDate( + $dateForMultiplePeriodGraph = Controller::getDateRangeRelativeToEndDate( $periodForSinglePeriodGraph, 'last' . self::GRAPH_EVOLUTION_LAST_PERIODS, $dateForSinglePeriodGraph, @@ -135,7 +137,7 @@ class Piwik_ImageGraph extends Plugin $parameters['idSubtable'] = $idSubtable; } - $report['imageGraphUrl'] = $urlPrefix . Piwik_Url::getQueryStringFromParameters($parameters); + $report['imageGraphUrl'] = $urlPrefix . Url::getQueryStringFromParameters($parameters); // thanks to API.getRowEvolution, reports with dimensions can now be plotted using an evolution graph // however, most reports with a fixed set of dimension values are excluded @@ -148,7 +150,7 @@ class Piwik_ImageGraph extends Plugin && $reportWithDimensionsSupportsEvolution) { $parameters['period'] = $periodForMultiplePeriodGraph; $parameters['date'] = $dateForMultiplePeriodGraph; - $report['imageGraphEvolutionUrl'] = $urlPrefix . Piwik_Url::getQueryStringFromParameters($parameters); + $report['imageGraphEvolutionUrl'] = $urlPrefix . Url::getQueryStringFromParameters($parameters); } } } diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index 5fcfcbe39a..f661b3dd98 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -8,18 +8,27 @@ * @category Piwik_Plugins * @package Piwik_Installation */ +use Piwik\API\Request; +use Piwik\Controller\Admin; use Piwik\DataAccess\ArchiveTableCreator; +use Piwik\Db\Adapter; use Piwik\Piwik; use Piwik\Config; use Piwik\Common; use Piwik\Access; +use Piwik\Http; +use Piwik\Piwik_Updater; +use Piwik\View; +use Piwik\Version; +use Piwik\Url; +use Piwik\ProxyHeaders; /** * Installation controller * * @package Piwik_Installation */ -class Piwik_Installation_Controller extends Piwik_Controller_Admin +class Piwik_Installation_Controller extends Admin { // public so plugins can add/delete installation steps public $steps = array( @@ -286,7 +295,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin Piwik::createAnonymousUser(); $updater = new Piwik_Updater(); - $updater->recordComponentSuccessfullyUpdated('core', Piwik_Version::VERSION); + $updater->recordComponentSuccessfullyUpdated('core', Version::VERSION); $view->tablesCreated = true; $view->showNextStep = true; } @@ -327,7 +336,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin 'email' => $form->getSubmitValue('email'), 'security' => $form->getSubmitValue('subscribe_newsletter_security'), 'community' => $form->getSubmitValue('subscribe_newsletter_community'), - 'url' => Piwik_Url::getCurrentUrlWithoutQueryString(), + 'url' => Url::getCurrentUrlWithoutQueryString(), ); if ($params['security'] == '1' || $params['community'] == '1' @@ -340,7 +349,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin } $url .= '?' . http_build_query($params, '', '&'); try { - Piwik_Http::sendHttpRequest($url, $timeout = 2); + Http::sendHttpRequest($url, $timeout = 2); } catch (Exception $e) { // e.g., disable_functions = fsockopen; allow_url_open = Off } @@ -378,7 +387,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin $url = urlencode($form->getSubmitValue('url')); $ecommerce = (int)$form->getSubmitValue('ecommerce'); - $request = new Piwik_API_Request(" + $request = new Request(" method=SitesManager.addSite &siteName=$name &urls=$url @@ -425,11 +434,11 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin $idSite = $this->session->site_idSite; // Load the Tracking code and help text from the SitesManager - $viewTrackingHelp = new Piwik_View('@SitesManager/_displayJavascriptCode'); + $viewTrackingHelp = new View('@SitesManager/_displayJavascriptCode'); $viewTrackingHelp->displaySiteName = $siteName; - $viewTrackingHelp->jsTag = Piwik::getJavascriptCode($idSite, Piwik_Url::getCurrentUrlWithoutFileName()); + $viewTrackingHelp->jsTag = Piwik::getJavascriptCode($idSite, Url::getCurrentUrlWithoutFileName()); $viewTrackingHelp->idSite = $idSite; - $viewTrackingHelp->piwikUrl = Piwik_Url::getCurrentUrlWithoutFileName(); + $viewTrackingHelp->piwikUrl = Url::getCurrentUrlWithoutFileName(); $view->trackingHelp = $viewTrackingHelp->render(); $view->displaySiteName = $siteName; @@ -478,7 +487,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin { Piwik::checkUserIsSuperUser(); - $view = new Piwik_View('@Installation/systemCheckPage'); + $view = new View('@Installation/systemCheckPage'); $this->setBasicVariablesView($view); $view->duringInstall = false; @@ -501,7 +510,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin $this->createDbFromSessionInformation(); Piwik::setUserIsSuperUser(); - Piwik::createLogObject(); + \Piwik\Log::make(); } /** @@ -552,7 +561,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin { $language = Common::getRequestVar('language'); Piwik_LanguagesManager::setLanguageForSession($language); - Piwik_Url::redirectToReferer(); + Url::redirectToReferer(); } /** @@ -594,7 +603,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin $message = Piwik_Translate('Installation_ErrorInvalidState', array('<br /><b>', '</b>', - '<a href=\'' . Common::sanitizeInputValue(Piwik_Url::getCurrentUrlWithoutFileName()) . '\'>', + '<a href=\'' . Common::sanitizeInputValue(Url::getCurrentUrlWithoutFileName()) . '\'>', '</a>') ); Piwik::exitWithErrorMessage($message); @@ -653,7 +662,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin $trustedHosts = array(); // extract host from the request header - if (($host = $this->extractHost('http://' . Piwik_Url::getHost())) !== false) { + if (($host = $this->extractHost('http://' . Url::getHost())) !== false) { $trustedHosts[] = $host; } @@ -733,7 +742,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin $infos['pdo_ok'] = true; } - $infos['adapters'] = Piwik_Db_Adapter::getAdapters(); + $infos['adapters'] = Adapter::getAdapters(); $needed_functions = array( 'debug_backtrace', @@ -780,7 +789,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin } } - $infos['openurl'] = Piwik_Http::getTransportMethod(); + $infos['openurl'] = Http::getTransportMethod(); $infos['gd_ok'] = Piwik::isGdExtensionEnabled(); @@ -827,14 +836,14 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin $infos['tracker_status'] = Common::getRequestVar('trackerStatus', 0, 'int'); - $infos['protocol'] = Piwik_ProxyHeaders::getProtocolInformation(); + $infos['protocol'] = ProxyHeaders::getProtocolInformation(); if (!Piwik::isHttps() && $infos['protocol'] !== null) { $infos['general_infos']['assume_secure_protocol'] = '1'; } - if (count($headers = Piwik_ProxyHeaders::getProxyClientHeaders()) > 0) { + if (count($headers = ProxyHeaders::getProxyClientHeaders()) > 0) { $infos['general_infos']['proxy_client_headers'] = $headers; } - if (count($headers = Piwik_ProxyHeaders::getProxyHostHeaders()) > 0) { + if (count($headers = ProxyHeaders::getProxyHostHeaders()) > 0) { $infos['general_infos']['proxy_host_headers'] = $headers; } @@ -902,7 +911,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin /** * Utility function, sets up a view that will display system check info. * - * @param Piwik_View $view + * @param View $view */ private function setupSystemCheckView($view) { @@ -967,7 +976,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin } // delete the temporary rows that were created - Piwik_Exec("DELETE FROM `$optionTable` WHERE option_name IN ('" . implode("','", $testOptionNames) . "')"); + Db::exec("DELETE FROM `$optionTable` WHERE option_name IN ('" . implode("','", $testOptionNames) . "')"); return $result; } diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php index d10f3b5a49..8939ace24e 100644 --- a/plugins/Installation/FormDatabaseSetup.php +++ b/plugins/Installation/FormDatabaseSetup.php @@ -8,14 +8,16 @@ * @category Piwik_Plugins * @package Piwik_Installation */ +use Piwik\Db\Adapter; use Piwik\Piwik; use Piwik\Common; +use Piwik\QuickForm2; /** * * @package Piwik_Installation */ -class Piwik_Installation_FormDatabaseSetup extends Piwik_QuickForm2 +class Piwik_Installation_FormDatabaseSetup extends QuickForm2 { function __construct($id = 'databasesetupform', $method = 'post', $attributes = null, $trackSubmit = false) { @@ -29,7 +31,7 @@ class Piwik_Installation_FormDatabaseSetup extends Piwik_QuickForm2 $checkUserPrivilegesClass = 'Piwik_Installation_FormDatabaseSetup_Rule_checkUserPrivileges'; HTML_QuickForm2_Factory::registerRule('checkUserPrivileges', $checkUserPrivilegesClass); - $availableAdapters = Piwik_Db_Adapter::getAdapters(); + $availableAdapters = Adapter::getAdapters(); $adapters = array(); foreach ($availableAdapters as $adapter => $port) { $adapters[$adapter] = $adapter; @@ -88,7 +90,7 @@ class Piwik_Installation_FormDatabaseSetup extends Piwik_QuickForm2 } $adapter = $this->getSubmitValue('adapter'); - $port = Piwik_Db_Adapter::getDefaultPortForAdapter($adapter); + $port = Adapter::getDefaultPortForAdapter($adapter); $dbInfos = array( 'host' => $this->getSubmitValue('host'), @@ -113,7 +115,7 @@ class Piwik_Installation_FormDatabaseSetup extends Piwik_QuickForm2 try { @Piwik::createDatabaseObject($dbInfos); } catch (Zend_Db_Adapter_Exception $e) { - $db = Piwik_Db_Adapter::factory($adapter, $dbInfos, $connect = false); + $db = Adapter::factory($adapter, $dbInfos, $connect = false); // database not found, we try to create it if ($db->isErrNo($e, '1049')) { diff --git a/plugins/Installation/FormFirstWebsiteSetup.php b/plugins/Installation/FormFirstWebsiteSetup.php index d44151f1b5..31c3e4cf4a 100644 --- a/plugins/Installation/FormFirstWebsiteSetup.php +++ b/plugins/Installation/FormFirstWebsiteSetup.php @@ -8,12 +8,13 @@ * @category Piwik_Plugins * @package Piwik_Installation */ +use Piwik\QuickForm2; /** * * @package Piwik_Installation */ -class Piwik_Installation_FormFirstWebsiteSetup extends Piwik_QuickForm2 +class Piwik_Installation_FormFirstWebsiteSetup extends QuickForm2 { function __construct($id = 'websitesetupform', $method = 'post', $attributes = null, $trackSubmit = false) { diff --git a/plugins/Installation/FormGeneralSetup.php b/plugins/Installation/FormGeneralSetup.php index 23f1dbce94..bd2504588a 100644 --- a/plugins/Installation/FormGeneralSetup.php +++ b/plugins/Installation/FormGeneralSetup.php @@ -9,12 +9,13 @@ * @package Piwik_Installation */ use Piwik\Piwik; +use Piwik\QuickForm2; /** * * @package Piwik_Installation */ -class Piwik_Installation_FormGeneralSetup extends Piwik_QuickForm2 +class Piwik_Installation_FormGeneralSetup extends QuickForm2 { function __construct($id = 'generalsetupform', $method = 'post', $attributes = null, $trackSubmit = false) { diff --git a/plugins/Installation/View.php b/plugins/Installation/View.php index e2db289eb1..84a8d631cf 100644 --- a/plugins/Installation/View.php +++ b/plugins/Installation/View.php @@ -8,12 +8,13 @@ * @category Piwik_Plugins * @package Piwik_Installation */ +use Piwik\View; /** * * @package Piwik_Installation */ -class Piwik_Installation_View extends Piwik_View +class Piwik_Installation_View extends View { public function __construct($subtemplatePath, $installationSteps, $currentStepName) { diff --git a/plugins/LanguagesManager/API.php b/plugins/LanguagesManager/API.php index bda2419908..d42d5cdfc4 100644 --- a/plugins/LanguagesManager/API.php +++ b/plugins/LanguagesManager/API.php @@ -161,7 +161,7 @@ class Piwik_LanguagesManager_API { Piwik::checkUserIsSuperUserOrTheUser($login); Piwik::checkUserIsNotAnonymous(); - return Piwik_FetchOne('SELECT language FROM ' . Common::prefixTable('user_language') . + return Db::fetchOne('SELECT language FROM ' . Common::prefixTable('user_language') . ' WHERE login = ? ', array($login)); } @@ -180,7 +180,7 @@ class Piwik_LanguagesManager_API return false; } $paramsBind = array($login, $languageCode, $languageCode); - Piwik_Query('INSERT INTO ' . Common::prefixTable('user_language') . + Db::query('INSERT INTO ' . Common::prefixTable('user_language') . ' (login, language) VALUES (?,?) ON DUPLICATE KEY UPDATE language=?', diff --git a/plugins/LanguagesManager/Controller.php b/plugins/LanguagesManager/Controller.php index 6685b511e4..212293ce79 100644 --- a/plugins/LanguagesManager/Controller.php +++ b/plugins/LanguagesManager/Controller.php @@ -11,11 +11,13 @@ */ use Piwik\Piwik; use Piwik\Common; +use Piwik\Controller; +use Piwik\Url; /** * @package Piwik_LanguagesManager */ -class Piwik_LanguagesManager_Controller extends Piwik_Controller +class Piwik_LanguagesManager_Controller extends Controller { /** * anonymous = in the session @@ -36,6 +38,6 @@ class Piwik_LanguagesManager_Controller extends Piwik_Controller Piwik_LanguagesManager_API::getInstance()->setLanguageForUser($currentUser, $language); } } - Piwik_Url::redirectToReferer(); + Url::redirectToReferer(); } } diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php index 1d0bc24ed9..5b848784bd 100644 --- a/plugins/LanguagesManager/LanguagesManager.php +++ b/plugins/LanguagesManager/LanguagesManager.php @@ -12,6 +12,8 @@ use Piwik\Config; use Piwik\Piwik; use Piwik\Common; +use Piwik\Cookie; +use Piwik\View; use Piwik\Plugin; use Piwik\Translate; @@ -71,7 +73,7 @@ class Piwik_LanguagesManager extends Plugin */ private function getLanguagesSelector() { - $view = new Piwik_View("@LanguagesManager/getLanguagesSelector"); + $view = new View("@LanguagesManager/getLanguagesSelector"); $view->languages = Piwik_LanguagesManager_API::getInstance()->getAvailableLanguageNames(); $view->currentLanguageCode = self::getLanguageCodeForCurrentUser(); $view->currentLanguageName = self::getLanguageNameForCurrentUser(); @@ -90,7 +92,7 @@ class Piwik_LanguagesManager extends Plugin public function deleteUserLanguage($userLogin) { - Piwik_Query('DELETE FROM ' . Common::prefixTable('user_language') . ' WHERE login = ?', $userLogin); + Db::query('DELETE FROM ' . Common::prefixTable('user_language') . ' WHERE login = ?', $userLogin); } /** @@ -105,7 +107,7 @@ class Piwik_LanguagesManager extends Plugin language VARCHAR( 10 ) NOT NULL , PRIMARY KEY ( login ) ) DEFAULT CHARSET=utf8 "; - Piwik_Exec($sql); + Db::exec($sql); } catch (Exception $e) { // mysql code error 1050:table already exists // see bug #153 http://dev.piwik.org/trac/ticket/153 @@ -120,7 +122,7 @@ class Piwik_LanguagesManager extends Plugin */ public function uninstall() { - Piwik_DropTables(Common::prefixTable('user_language')); + Db::dropTables(Common::prefixTable('user_language')); } /** @@ -178,7 +180,7 @@ class Piwik_LanguagesManager extends Plugin static public function getLanguageForSession() { $cookieName = Config::getInstance()->General['language_cookie_name']; - $cookie = new Piwik_Cookie($cookieName); + $cookie = new Cookie($cookieName); if ($cookie->isCookieFound()) { return $cookie->get('language'); } @@ -198,7 +200,7 @@ class Piwik_LanguagesManager extends Plugin } $cookieName = Config::getInstance()->General['language_cookie_name']; - $cookie = new Piwik_Cookie($cookieName, 0); + $cookie = new Cookie($cookieName, 0); $cookie->set('language', $languageCode); $cookie->save(); } diff --git a/plugins/Live/API.php b/plugins/Live/API.php index 8a739a0b17..4fd3ab3b91 100644 --- a/plugins/Live/API.php +++ b/plugins/Live/API.php @@ -18,6 +18,7 @@ use Piwik\Piwik; use Piwik\Common; use Piwik\Date; use Piwik\DataTable; +use Piwik\Tracker; use Piwik\Segment; use Piwik\Site; @@ -93,7 +94,7 @@ class Piwik_Live_API $segment = new Segment($segment, $idSite); $query = $segment->getSelectQuery($select, $from, $where, $bind); - $data = Piwik_FetchAll($query['sql'], $query['bind']); + $data = Db::fetchAll($query['sql'], $query['bind']); // These could be unset for some reasons, ensure they are set to 0 if (empty($data[0]['actions'])) { @@ -416,7 +417,7 @@ class Piwik_Live_API ORDER BY $orderByParent "; try { - $data = Piwik_FetchAll($sql, $subQuery['bind']); + $data = Db::fetchAll($sql, $subQuery['bind']); } catch (Exception $e) { echo $e->getMessage(); exit; @@ -458,7 +459,7 @@ class Piwik_Live_API $idVisit = $visitorDetailsArray['idVisit']; $sqlCustomVariables = ''; - for ($i = 1; $i <= Piwik_Tracker::MAX_CUSTOM_VARIABLES; $i++) { + for ($i = 1; $i <= Tracker::MAX_CUSTOM_VARIABLES; $i++) { $sqlCustomVariables .= ', custom_var_k' . $i . ', custom_var_v' . $i; } // The second join is a LEFT join to allow returning records that don't have a matching page title @@ -484,12 +485,12 @@ class Piwik_Live_API ORDER BY server_time ASC LIMIT 0, $actionsLimit "; - $actionDetails = Piwik_FetchAll($sql, array($idVisit)); + $actionDetails = Db::fetchAll($sql, array($idVisit)); foreach ($actionDetails as $actionIdx => &$actionDetail) { $actionDetail =& $actionDetails[$actionIdx]; $customVariablesPage = array(); - for ($i = 1; $i <= Piwik_Tracker::MAX_CUSTOM_VARIABLES; $i++) { + for ($i = 1; $i <= Tracker::MAX_CUSTOM_VARIABLES; $i++) { if (!empty($actionDetail['custom_var_k' . $i])) { $cvarKey = $actionDetail['custom_var_k' . $i]; $cvarKey = $this->getCustomVariablePrettyKey($cvarKey); @@ -551,7 +552,7 @@ class Piwik_Live_API ORDER BY server_time ASC LIMIT 0, $actionsLimit "; - $goalDetails = Piwik_FetchAll($sql, array($idVisit)); + $goalDetails = Db::fetchAll($sql, array($idVisit)); $sql = "SELECT case idgoal when " . Piwik_Tracker_GoalManager::IDGOAL_CART . " then '" . Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART . "' else '" . Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER . "' end as type, @@ -569,7 +570,7 @@ class Piwik_Live_API AND idgoal <= " . Piwik_Tracker_GoalManager::IDGOAL_ORDER . " ORDER BY server_time ASC LIMIT 0, $actionsLimit"; - $ecommerceDetails = Piwik_FetchAll($sql, array($idVisit)); + $ecommerceDetails = Db::fetchAll($sql, array($idVisit)); foreach ($ecommerceDetails as &$ecommerceDetail) { if ($ecommerceDetail['type'] == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART) { @@ -616,7 +617,7 @@ class Piwik_Live_API : Piwik_Tracker_GoalManager::ITEM_IDORDER_ABANDONED_CART ); - $itemsDetails = Piwik_FetchAll($sql, $bind); + $itemsDetails = Db::fetchAll($sql, $bind); foreach ($itemsDetails as &$detail) { if ($detail['price'] == round($detail['price'])) { $detail['price'] = round($detail['price']); diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php index 69c94fdf87..0420f85615 100644 --- a/plugins/Live/Controller.php +++ b/plugins/Live/Controller.php @@ -8,14 +8,18 @@ * @category Piwik_Plugins * @package Piwik_Live */ +use Piwik\API\Request; use Piwik\Common; use Piwik\Piwik; use Piwik\Config; +use Piwik\Controller; +use Piwik\ViewDataTable; +use Piwik\View; /** * @package Piwik_Live */ -class Piwik_Live_Controller extends Piwik_Controller +class Piwik_Live_Controller extends Controller { const SIMPLE_VISIT_COUNT_WIDGET_LAST_MINUTES_CONFIG_KEY = 'live_widget_visitor_count_last_minutes'; @@ -26,7 +30,7 @@ class Piwik_Live_Controller extends Piwik_Controller public function widget($fetch = false) { - $view = new Piwik_View('@Live/index'); + $view = new View('@Live/index'); $view->idSite = $this->idSite; $view = $this->setCounters($view); $view->liveRefreshAfterMs = (int)Config::getInstance()->General['live_widget_refresh_after_seconds'] * 1000; @@ -39,9 +43,9 @@ class Piwik_Live_Controller extends Piwik_Controller { $lastMinutes = Config::getInstance()->General[self::SIMPLE_VISIT_COUNT_WIDGET_LAST_MINUTES_CONFIG_KEY]; - $lastNData = Piwik_API_Request::processRequest('Live.getCounters', array('lastMinutes' => $lastMinutes)); + $lastNData = Request::processRequest('Live.getCounters', array('lastMinutes' => $lastMinutes)); - $view = new Piwik_View('@Live/getSimpleLastVisitCount'); + $view = new View('@Live/getSimpleLastVisitCount'); $view->lastMinutes = $lastMinutes; $view->visitors = Piwik::getPrettyNumber($lastNData[0]['visitors']); $view->visits = Piwik::getPrettyNumber($lastNData[0]['visits']); @@ -62,13 +66,13 @@ class Piwik_Live_Controller extends Piwik_Controller public function ajaxTotalVisitors($fetch = false) { - $view = new Piwik_View('@Live/ajaxTotalVisitors'); + $view = new View('@Live/ajaxTotalVisitors'); $view = $this->setCounters($view); $view->idSite = $this->idSite; return $this->render($view, $fetch); } - private function render(Piwik_View $view, $fetch) + private function render(View $view, $fetch) { $rendered = $view->render(); if ($fetch) { @@ -79,7 +83,7 @@ class Piwik_Live_Controller extends Piwik_Controller public function indexVisitorLog() { - $view = new Piwik_View('@Live/indexVisitorLog.twig'); + $view = new View('@Live/indexVisitorLog.twig'); $view->filterEcommerce = Common::getRequestVar('filterEcommerce', 0, 'int'); $view->visitorLog = $this->getVisitorLog($fetch = true); echo $view->render(); @@ -87,7 +91,7 @@ class Piwik_Live_Controller extends Piwik_Controller public function getVisitorLog($fetch = false) { - $view = Piwik_ViewDataTable::factory(); + $view = ViewDataTable::factory(); $view->init($this->pluginName, __FUNCTION__, 'Live.getLastVisitsDetails' @@ -129,10 +133,10 @@ class Piwik_Live_Controller extends Piwik_Controller // hack, ensure we load today's visits by default $_GET['date'] = 'today'; $_GET['period'] = 'day'; - $view = new Piwik_View('@Live/getLastVisitsStart'); + $view = new View('@Live/getLastVisitsStart'); $view->idSite = $this->idSite; - $api = new Piwik_API_Request("method=Live.getLastVisitsDetails&idSite={$this->idSite}&filter_limit=10&format=php&serialize=0&disable_generic_filters=1"); + $api = new Request("method=Live.getLastVisitsDetails&idSite={$this->idSite}&filter_limit=10&format=php&serialize=0&disable_generic_filters=1"); $visitors = $api->process(); $view->visitors = $visitors; @@ -141,7 +145,7 @@ class Piwik_Live_Controller extends Piwik_Controller private function setCounters($view) { - $segment = Piwik_ViewDataTable::getRawSegmentFromRequest(); + $segment = ViewDataTable::getRawSegmentFromRequest(); $last30min = Piwik_Live_API::getInstance()->getCounters($this->idSite, $lastMinutes = 30, $segment); $last30min = $last30min[0]; $today = Piwik_Live_API::getInstance()->getCounters($this->idSite, $lastMinutes = 24 * 60, $segment); diff --git a/plugins/Live/Live.php b/plugins/Live/Live.php index ba6bf5b219..4cd54520ef 100644 --- a/plugins/Live/Live.php +++ b/plugins/Live/Live.php @@ -46,9 +46,9 @@ class Piwik_Live extends Plugin public function addWidget() { - Piwik_AddWidget('Live!', 'Live_VisitorsInRealTime', 'Live', 'widget'); - Piwik_AddWidget('Live!', 'Live_VisitorLog', 'Live', 'getVisitorLog'); - Piwik_AddWidget('Live!', 'Live_RealTimeVisitorCount', 'Live', 'getSimpleLastVisitCount'); + WidgetsList::add('Live!', 'Live_VisitorsInRealTime', 'Live', 'widget'); + WidgetsList::add('Live!', 'Live_VisitorLog', 'Live', 'getVisitorLog'); + WidgetsList::add('Live!', 'Live_RealTimeVisitorCount', 'Live', 'getSimpleLastVisitCount'); } } diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index df7edf761d..db31fe886f 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -10,6 +10,8 @@ */ use Piwik\Piwik; use Piwik\Common; +use Piwik\IP; +use Piwik\Tracker; /** * @see plugins/Referers/functions.php @@ -168,7 +170,7 @@ class Piwik_Live_Visitor function getIp() { if (isset($this->details['location_ip'])) { - return Piwik_IP::N2P($this->details['location_ip']); + return IP::N2P($this->details['location_ip']); } return false; } @@ -319,7 +321,7 @@ class Piwik_Live_Visitor function getCustomVariables() { $customVariables = array(); - for ($i = 1; $i <= Piwik_Tracker::MAX_CUSTOM_VARIABLES; $i++) { + for ($i = 1; $i <= Tracker::MAX_CUSTOM_VARIABLES; $i++) { if (!empty($this->details['custom_var_k' . $i])) { $customVariables[$i] = array( 'customVariableName' . $i => $this->details['custom_var_k' . $i], diff --git a/plugins/Login/Auth.php b/plugins/Login/Auth.php index 1f643b2843..4280321be3 100644 --- a/plugins/Login/Auth.php +++ b/plugins/Login/Auth.php @@ -48,7 +48,7 @@ class Piwik_Login_Auth implements Auth return new AuthResult(AuthResult::SUCCESS_SUPERUSER_AUTH_CODE, $rootLogin, $this->token_auth); } - $login = Piwik_FetchOne( + $login = Db::fetchOne( 'SELECT login FROM ' . Common::prefixTable('user') . ' WHERE token_auth = ?', @@ -67,7 +67,7 @@ class Piwik_Login_Auth implements Auth } $login = $this->login; - $userToken = Piwik_FetchOne( + $userToken = Db::fetchOne( 'SELECT token_auth FROM ' . Common::prefixTable('user') . ' WHERE login = ?', diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php index 28aa0e285c..4aebcd3a86 100644 --- a/plugins/Login/Controller.php +++ b/plugins/Login/Controller.php @@ -11,6 +11,15 @@ use Piwik\Config; use Piwik\Piwik; use Piwik\Common; +use Piwik\Controller; +use Piwik\Cookie; +use Piwik\IP; +use Piwik\Mail; +use Piwik\Nonce; +use Piwik\View; +use Piwik\Url; +use Piwik\QuickForm2; +use Piwik\Session; require_once PIWIK_INCLUDE_PATH . '/core/Config.php'; @@ -19,7 +28,7 @@ require_once PIWIK_INCLUDE_PATH . '/core/Config.php'; * * @package Piwik_Login */ -class Piwik_Login_Controller extends Piwik_Controller +class Piwik_Login_Controller extends Controller { /** * Generate hash on user info and password @@ -65,7 +74,7 @@ class Piwik_Login_Controller extends Piwik_Controller $form = new Piwik_Login_FormLogin(); if ($form->validate()) { $nonce = $form->getSubmitValue('form_nonce'); - if (Piwik_Nonce::verifyNonce('Piwik_Login.login', $nonce)) { + if (Nonce::verifyNonce('Piwik_Login.login', $nonce)) { $login = $form->getSubmitValue('form_login'); $password = $form->getSubmitValue('form_password'); $rememberMe = $form->getSubmitValue('form_rememberme') == '1'; @@ -80,7 +89,7 @@ class Piwik_Login_Controller extends Piwik_Controller } } - $view = new Piwik_View('@Login/login'); + $view = new View('@Login/login'); $view->AccessErrorString = $messageNoAccess; $view->infoMessage = nl2br($infoMessage); $view->addForm($form); @@ -92,7 +101,7 @@ class Piwik_Login_Controller extends Piwik_Controller /** * Configure common view properties * - * @param Piwik_View $view + * @param View $view */ private function configureView($view) { @@ -103,7 +112,7 @@ class Piwik_Login_Controller extends Piwik_Controller $view->forceSslLogin = Config::getInstance()->General['force_ssl_login']; // crsf token: don't trust the submitted value; generate/fetch it from session data - $view->nonce = Piwik_Nonce::getNonce('Piwik_Login.login'); + $view->nonce = Nonce::getNonce('Piwik_Login.login'); } /** @@ -153,9 +162,9 @@ class Piwik_Login_Controller extends Piwik_Controller 'md5Password' => $md5Password, 'rememberMe' => $rememberMe, ); - Piwik_Nonce::discardNonce('Piwik_Login.login'); + Nonce::discardNonce('Piwik_Login.login'); Piwik_PostEvent('Login.initSession', array(&$info)); - Piwik_Url::redirectToUrl($urlToRedirect); + Url::redirectToUrl($urlToRedirect); } protected function getMessageExceptionNoAccess() @@ -182,7 +191,7 @@ class Piwik_Login_Controller extends Piwik_Controller $form = new Piwik_Login_FormResetPassword(); if ($form->validate()) { $nonce = $form->getSubmitValue('form_nonce'); - if (Piwik_Nonce::verifyNonce('Piwik_Login.login', $nonce)) { + if (Nonce::verifyNonce('Piwik_Login.login', $nonce)) { $formErrors = $this->resetPasswordFirstStep($form); if (empty($formErrors)) { $infoMessage = Piwik_Translate('Login_ConfirmationLinkSent'); @@ -196,7 +205,7 @@ class Piwik_Login_Controller extends Piwik_Controller $formErrors = $formData['errors']; } - $view = new Piwik_View('@Login/resetPassword'); + $view = new View('@Login/resetPassword'); $view->infoMessage = $infoMessage; $view->formErrors = $formErrors; echo $view->render(); @@ -205,7 +214,7 @@ class Piwik_Login_Controller extends Piwik_Controller /** * Saves password reset info and sends confirmation email. * - * @param Piwik_QuickForm2 $form + * @param QuickForm2 $form * @return array Error message(s) if an error occurs. */ private function resetPasswordFirstStep($form) @@ -262,13 +271,13 @@ class Piwik_Login_Controller extends Piwik_Controller // construct a password reset token from user information $resetToken = self::generatePasswordResetToken($user); - $ip = Piwik_IP::getIpFromHeader(); - $url = Piwik_Url::getCurrentUrlWithoutQueryString() + $ip = IP::getIpFromHeader(); + $url = Url::getCurrentUrlWithoutQueryString() . "?module=Login&action=confirmResetPassword&login=" . urlencode($login) . "&resetToken=" . urlencode($resetToken); // send email with new password - $mail = new Piwik_Mail(); + $mail = new Mail(); $mail->addTo($email, $login); $mail->setSubject(Piwik_Translate('Login_MailTopicPasswordChange')); $bodyText = str_replace( @@ -447,10 +456,10 @@ class Piwik_Login_Controller extends Piwik_Controller static public function clearSession() { $authCookieName = Config::getInstance()->General['login_cookie_name']; - $cookie = new Piwik_Cookie($authCookieName); + $cookie = new Cookie($authCookieName); $cookie->delete(); - Piwik_Session::expireSessionCookie(); + Session::expireSessionCookie(); } /** @@ -467,7 +476,7 @@ class Piwik_Login_Controller extends Piwik_Controller if (empty($logoutUrl)) { Piwik::redirectToModule('CoreHome'); } else { - Piwik_Url::redirectToUrl($logoutUrl); + Url::redirectToUrl($logoutUrl); } } @@ -484,10 +493,10 @@ class Piwik_Login_Controller extends Piwik_Controller && !Piwik::isHttps() ) { $url = 'https://' - . Piwik_Url::getCurrentHost() - . Piwik_Url::getCurrentScriptName() - . Piwik_Url::getCurrentQueryString(); - Piwik_Url::redirectToUrl($url); + . Url::getCurrentHost() + . Url::getCurrentScriptName() + . Url::getCurrentQueryString(); + Url::redirectToUrl($url); } } } diff --git a/plugins/Login/FormLogin.php b/plugins/Login/FormLogin.php index a90146f47e..229288e713 100644 --- a/plugins/Login/FormLogin.php +++ b/plugins/Login/FormLogin.php @@ -8,12 +8,13 @@ * @category Piwik_Plugins * @package Piwik_Login */ +use Piwik\QuickForm2; /** * * @package Piwik_Login */ -class Piwik_Login_FormLogin extends Piwik_QuickForm2 +class Piwik_Login_FormLogin extends QuickForm2 { function __construct($id = 'login_form', $method = 'post', $attributes = null, $trackSubmit = false) { diff --git a/plugins/Login/FormResetPassword.php b/plugins/Login/FormResetPassword.php index 0411beddbb..abbe1bd4a1 100644 --- a/plugins/Login/FormResetPassword.php +++ b/plugins/Login/FormResetPassword.php @@ -8,12 +8,13 @@ * @category Piwik_Plugins * @package Piwik_Login */ +use Piwik\QuickForm2; /** * * @package Piwik_Login */ -class Piwik_Login_FormResetPassword extends Piwik_QuickForm2 +class Piwik_Login_FormResetPassword extends QuickForm2 { function __construct($id = 'resetpasswordform', $method = 'post', $attributes = null, $trackSubmit = false) { diff --git a/plugins/Login/Login.php b/plugins/Login/Login.php index 7208328074..b8718f93d5 100644 --- a/plugins/Login/Login.php +++ b/plugins/Login/Login.php @@ -10,6 +10,9 @@ */ use Piwik\Config; use Piwik\Piwik; +use Piwik\Cookie; +use Piwik\Piwik_Option; +use Piwik\Session; use Piwik\Plugin; /** @@ -74,7 +77,7 @@ class Piwik_Login extends Plugin $authCookieName = Config::getInstance()->General['login_cookie_name']; $authCookieExpiry = 0; $authCookiePath = Config::getInstance()->General['login_cookie_path']; - $authCookie = new Piwik_Cookie($authCookieName, $authCookieExpiry, $authCookiePath); + $authCookie = new Cookie($authCookieName, $authCookieExpiry, $authCookiePath); $defaultLogin = 'anonymous'; $defaultTokenAuth = 'anonymous'; if ($authCookie->isCookieFound()) { @@ -107,7 +110,7 @@ class Piwik_Login extends Plugin $authCookieName = Config::getInstance()->General['login_cookie_name']; $authCookieExpiry = $rememberMe ? time() + Config::getInstance()->General['login_cookie_expire'] : 0; $authCookiePath = Config::getInstance()->General['login_cookie_path']; - $cookie = new Piwik_Cookie($authCookieName, $authCookieExpiry, $authCookiePath); + $cookie = new Cookie($authCookieName, $authCookieExpiry, $authCookiePath); if (!$authResult->isValid()) { $cookie->delete(); throw new Exception(Piwik_Translate('Login_LoginPasswordNotCorrect')); @@ -119,7 +122,7 @@ class Piwik_Login extends Plugin $cookie->setHttpOnly(true); $cookie->save(); - @Piwik_Session::regenerateId(); + @Session::regenerateId(); // remove password reset entry if it exists self::removePasswordResetInfo($login); diff --git a/plugins/MobileMessaging/Controller.php b/plugins/MobileMessaging/Controller.php index a97641ed0c..0054d62912 100644 --- a/plugins/MobileMessaging/Controller.php +++ b/plugins/MobileMessaging/Controller.php @@ -9,8 +9,11 @@ * @package Piwik_MobileMessaging */ +use Piwik\Controller\Admin; use Piwik\Piwik; use Piwik\Common; +use Piwik\IP; +use Piwik\View; require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php'; @@ -18,7 +21,7 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php'; * * @package Piwik_MobileMessaging */ -class Piwik_MobileMessaging_Controller extends Piwik_Controller_Admin +class Piwik_MobileMessaging_Controller extends Admin { /* * Mobile Messaging Settings tab : @@ -31,7 +34,7 @@ class Piwik_MobileMessaging_Controller extends Piwik_Controller_Admin { Piwik::checkUserIsNotAnonymous(); - $view = new Piwik_View('@MobileMessaging/index'); + $view = new View('@MobileMessaging/index'); $view->isSuperUser = Piwik::isUserIsSuperUser(); @@ -63,7 +66,7 @@ class Piwik_MobileMessaging_Controller extends Piwik_Controller_Admin $view->defaultCountry = Common::getCountry( Piwik_LanguagesManager::getLanguageCodeForCurrentUser(), true, - Piwik_IP::getIpFromHeader() + IP::getIpFromHeader() ); $view->phoneNumbers = $mobileMessagingAPI->getPhoneNumbers(); diff --git a/plugins/MobileMessaging/MobileMessaging.php b/plugins/MobileMessaging/MobileMessaging.php index 840ae48abc..532e511d73 100644 --- a/plugins/MobileMessaging/MobileMessaging.php +++ b/plugins/MobileMessaging/MobileMessaging.php @@ -9,6 +9,7 @@ * @package Piwik_MobileMessaging */ use Piwik\Piwik; +use Piwik\View; use Piwik\Plugin; /** @@ -216,7 +217,7 @@ class Piwik_MobileMessaging extends Plugin return; } - $view = new Piwik_View('@MobileMessaging/reportParametersPDFReports'); + $view = new View('@MobileMessaging/reportParametersPDFReports'); $view->reportType = self::MOBILE_TYPE; $view->phoneNumbers = Piwik_MobileMessaging_API::getInstance()->getActivatedPhoneNumbers(); $out .= $view->render(); diff --git a/plugins/MobileMessaging/ReportRenderer/Exception.php b/plugins/MobileMessaging/ReportRenderer/Exception.php index c6cdacf36b..cc5b137a38 100644 --- a/plugins/MobileMessaging/ReportRenderer/Exception.php +++ b/plugins/MobileMessaging/ReportRenderer/Exception.php @@ -8,12 +8,13 @@ * @category Piwik_Plugins * @package Piwik_MobileMessaging_ReportRenderer */ +use Piwik\ReportRenderer; /** * * @package Piwik_MobileMessaging_ReportRenderer */ -class Piwik_MobileMessaging_ReportRenderer_Exception extends Piwik_ReportRenderer +class Piwik_MobileMessaging_ReportRenderer_Exception extends ReportRenderer { private $rendering = ""; @@ -29,7 +30,7 @@ class Piwik_MobileMessaging_ReportRenderer_Exception extends Piwik_ReportRendere public function sendToDisk($filename) { - return Piwik_ReportRenderer::writeFile( + return ReportRenderer::writeFile( $filename, Piwik_MobileMessaging_ReportRenderer_Sms::SMS_FILE_EXTENSION, $this->rendering @@ -38,7 +39,7 @@ class Piwik_MobileMessaging_ReportRenderer_Exception extends Piwik_ReportRendere public function sendToBrowserDownload($filename) { - Piwik_ReportRenderer::sendToBrowser( + ReportRenderer::sendToBrowser( $filename, Piwik_MobileMessaging_ReportRenderer_Sms::SMS_FILE_EXTENSION, Piwik_MobileMessaging_ReportRenderer_Sms::SMS_CONTENT_TYPE, @@ -48,7 +49,7 @@ class Piwik_MobileMessaging_ReportRenderer_Exception extends Piwik_ReportRendere public function sendToBrowserInline($filename) { - Piwik_ReportRenderer::inlineToBrowser( + ReportRenderer::inlineToBrowser( Piwik_MobileMessaging_ReportRenderer_Sms::SMS_CONTENT_TYPE, $this->rendering ); diff --git a/plugins/MobileMessaging/ReportRenderer/Sms.php b/plugins/MobileMessaging/ReportRenderer/Sms.php index 68bc22691a..5c89166ea2 100644 --- a/plugins/MobileMessaging/ReportRenderer/Sms.php +++ b/plugins/MobileMessaging/ReportRenderer/Sms.php @@ -9,13 +9,15 @@ * @package Piwik_MobileMessaging_ReportRenderer */ use Piwik\Common; +use Piwik\View; +use Piwik\ReportRenderer; use Piwik\Site; /** * * @package Piwik_MobileMessaging_ReportRenderer */ -class Piwik_MobileMessaging_ReportRenderer_Sms extends Piwik_ReportRenderer +class Piwik_MobileMessaging_ReportRenderer_Sms extends ReportRenderer { const FLOAT_REGEXP = '/[-+]?[0-9]*[\.,]?[0-9]+/'; const SMS_CONTENT_TYPE = 'text/plain'; @@ -30,17 +32,17 @@ class Piwik_MobileMessaging_ReportRenderer_Sms extends Piwik_ReportRenderer public function sendToDisk($filename) { - return Piwik_ReportRenderer::writeFile($filename, self::SMS_FILE_EXTENSION, $this->rendering); + return ReportRenderer::writeFile($filename, self::SMS_FILE_EXTENSION, $this->rendering); } public function sendToBrowserDownload($filename) { - Piwik_ReportRenderer::sendToBrowser($filename, self::SMS_FILE_EXTENSION, self::SMS_CONTENT_TYPE, $this->rendering); + ReportRenderer::sendToBrowser($filename, self::SMS_FILE_EXTENSION, self::SMS_CONTENT_TYPE, $this->rendering); } public function sendToBrowserInline($filename) { - Piwik_ReportRenderer::inlineToBrowser(self::SMS_CONTENT_TYPE, $this->rendering); + ReportRenderer::inlineToBrowser(self::SMS_CONTENT_TYPE, $this->rendering); } public function getRenderedReport() @@ -114,7 +116,7 @@ class Piwik_MobileMessaging_ReportRenderer_Sms extends Piwik_ReportRenderer $siteHasECommerce[$idSite] = Site::isEcommerceEnabledFor($idSite); } - $view = new Piwik_View('@MobileMessaging/SMSReport'); + $view = new View('@MobileMessaging/SMSReport'); $view->assign("isGoalPluginEnabled", $isGoalPluginEnabled); $view->assign("reportRows", $dataRows); $view->assign("reportRowsMetadata", $reportRowsMetadata); diff --git a/plugins/MobileMessaging/SMSProvider/Clockwork.php b/plugins/MobileMessaging/SMSProvider/Clockwork.php index faf5effbc7..29a153c6da 100644 --- a/plugins/MobileMessaging/SMSProvider/Clockwork.php +++ b/plugins/MobileMessaging/SMSProvider/Clockwork.php @@ -9,6 +9,8 @@ * @package Piwik_MobileMessaging_SMSProvider */ +use Piwik\Http; + require_once PIWIK_INCLUDE_PATH . "/plugins/MobileMessaging/APIException.php"; /** * @@ -70,8 +72,8 @@ class Piwik_MobileMessaging_SMSProvider_Clockwork extends Piwik_MobileMessaging_ $timeout = self::SOCKET_TIMEOUT; try { - $result = Piwik_Http::sendHttpRequestBy( - Piwik_Http::getTransportMethod(), + $result = Http::sendHttpRequestBy( + Http::getTransportMethod(), $url, $timeout, $userAgent = null, diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php index 2906edc981..6e4feeba76 100755 --- a/plugins/MultiSites/API.php +++ b/plugins/MultiSites/API.php @@ -8,12 +8,14 @@ * @category Piwik_Plugins * @package Piwik_MultiSites */ +use Piwik\API\Request; use Piwik\Archive; use Piwik\DataTable\Filter\CalculateEvolutionFilter; use Piwik\Period\Range; use Piwik\Piwik; use Piwik\Common; use Piwik\DataTable; +use Piwik\TaskScheduler; use Piwik\Site; /** @@ -132,7 +134,7 @@ class Piwik_MultiSites_API return $idSites; } $idSites = array(); - $sites = Piwik_API_Request::processRequest('SitesManager.getPatternMatchSites', + $sites = Request::processRequest('SitesManager.getPatternMatchSites', array('pattern' => $pattern, // added because caller could overwrite these 'serialize' => 0, @@ -180,7 +182,7 @@ class Piwik_MultiSites_API // Hack: when this API function is called as a Scheduled Task, Super User status is enforced. // This means this function would return ALL websites in all cases. // Instead, we make sure that only the right set of data is returned - && !Piwik_TaskScheduler::isTaskBeingExecuted() + && !TaskScheduler::isTaskBeingExecuted() ) { Site::setSites( Piwik_SitesManager_API::getInstance()->getAllSites() @@ -298,7 +300,7 @@ class Piwik_MultiSites_API // filter rows without visits // note: if only one website is queried and there are no visits, we can not remove the row otherwise - // Piwik_API_ResponseBuilder throws 'Call to a member function getColumns() on a non-object' + // ResponseBuilder throws 'Call to a member function getColumns() on a non-object' if ($multipleWebsitesRequested // We don't delete the 0 visits row, if "Enhanced" mode is on. && !$enhanced) { diff --git a/plugins/MultiSites/Controller.php b/plugins/MultiSites/Controller.php index 4986ba1abc..fd7ee849c8 100644 --- a/plugins/MultiSites/Controller.php +++ b/plugins/MultiSites/Controller.php @@ -13,13 +13,15 @@ use Piwik\Piwik; use Piwik\Common; use Piwik\Config; use Piwik\Date; +use Piwik\Controller; +use Piwik\View; use Piwik\Site; /** * * @package Piwik_MultiSites */ -class Piwik_MultiSites_Controller extends Piwik_Controller +class Piwik_MultiSites_Controller extends Controller { protected $orderBy = 'visits'; protected $order = 'desc'; @@ -122,7 +124,7 @@ class Piwik_MultiSites_Controller extends Piwik_Controller $this->applyPrettyMoney($digestableData); - $view = new Piwik_View("@MultiSites/getSitesInfo"); + $view = new View("@MultiSites/getSitesInfo"); $view->isWidgetized = $isWidgetized; $view->sitesData = array_values($digestableData); $view->evolutionBy = $this->evolutionBy; diff --git a/plugins/Overlay/Controller.php b/plugins/Overlay/Controller.php index d3bd8ab3b0..b034173e43 100644 --- a/plugins/Overlay/Controller.php +++ b/plugins/Overlay/Controller.php @@ -1,8 +1,11 @@ <?php +use Piwik\API\Request; use Piwik\Metrics; use Piwik\Piwik; use Piwik\Config; use Piwik\Common; +use Piwik\Controller; +use Piwik\View; /** * Piwik - Open source web analytics @@ -14,7 +17,7 @@ use Piwik\Common; * @package Piwik_Overlay */ -class Piwik_Overlay_Controller extends Piwik_Controller +class Piwik_Overlay_Controller extends Controller { /** The index of the plugin */ @@ -27,7 +30,7 @@ class Piwik_Overlay_Controller extends Piwik_Controller $template = '@Overlay/index_noframe'; } - $view = new Piwik_View($template); + $view = new View($template); $this->setGeneralVariablesView($view); @@ -57,7 +60,7 @@ class Piwik_Overlay_Controller extends Piwik_Controller $path = Piwik_Actions_ArchivingHelper::getActionExplodedNames($normalizedCurrentUrl, Piwik_Tracker_Action::TYPE_ACTION_URL); $path = array_map('urlencode', $path); $label = implode('>', $path); - $request = new Piwik_API_Request( + $request = new Request( 'method=Actions.getPageUrls' . '&idSite=' . urlencode($idSite) . '&date=' . urlencode($date) @@ -103,7 +106,7 @@ class Piwik_Overlay_Controller extends Piwik_Controller } // render template - $view = new Piwik_View('@Overlay/renderSidebar'); + $view = new View('@Overlay/renderSidebar'); $view->data = $data; $view->location = $page; $view->normalizedUrl = $normalizedCurrentUrl; @@ -197,7 +200,7 @@ class Piwik_Overlay_Controller extends Piwik_Controller $message = Piwik_Translate('Overlay_RedirectUrlError', array($url, "\n")); $message = nl2br(htmlentities($message)); - $view = new Piwik_View('@Overlay/showErrorWrongDomain'); + $view = new View('@Overlay/showErrorWrongDomain'); $view->message = $message; if (Piwik::isUserHasAdminAccess($idSite)) { @@ -224,7 +227,7 @@ class Piwik_Overlay_Controller extends Piwik_Controller */ public function notifyParentIframe() { - $view = new Piwik_View('@Overlay/notifyParentIframe'); + $view = new View('@Overlay/notifyParentIframe'); echo $view->render(); } diff --git a/plugins/PDFReports/API.php b/plugins/PDFReports/API.php index 4826fe8c80..7c07598430 100644 --- a/plugins/PDFReports/API.php +++ b/plugins/PDFReports/API.php @@ -11,6 +11,8 @@ use Piwik\Piwik; use Piwik\Common; use Piwik\Date; +use Piwik\ReportRenderer; +use Piwik\ReportRenderer\Html; use Piwik\Site; use Piwik\Translate; @@ -251,7 +253,7 @@ class Piwik_PDFReports_API } // Joining with the site table to work around pre-1.3 where reports could still be linked to a deleted site - $reports = Piwik_FetchAll("SELECT * + $reports = Db::fetchAll("SELECT * FROM " . Common::prefixTable('report') . " JOIN " . Common::prefixTable('site') . " USING (idsite) @@ -434,17 +436,17 @@ class Piwik_PDFReports_API $outputFilename = $reportRenderer->sendToDisk($outputFilename); $additionalFiles = array(); - if ($reportRenderer instanceof Piwik_ReportRenderer_Html) { + if ($reportRenderer instanceof Html) { foreach ($processedReports as &$report) { if ($report['displayGraph']) { $additionalFile = array(); $additionalFile['filename'] = $report['metadata']['name'] . '.png'; $additionalFile['cid'] = $report['metadata']['uniqueId']; $additionalFile['content'] = - Piwik_ReportRenderer::getStaticGraph( + ReportRenderer::getStaticGraph( $report['metadata'], - Piwik_ReportRenderer_Html::IMAGE_GRAPH_WIDTH, - Piwik_ReportRenderer_Html::IMAGE_GRAPH_HEIGHT, + Html::IMAGE_GRAPH_WIDTH, + Html::IMAGE_GRAPH_HEIGHT, $report['evolutionGraph'], $segment ); diff --git a/plugins/PDFReports/Controller.php b/plugins/PDFReports/Controller.php index 4e7e8c1644..3eed377084 100644 --- a/plugins/PDFReports/Controller.php +++ b/plugins/PDFReports/Controller.php @@ -10,18 +10,20 @@ */ use Piwik\Piwik; use Piwik\Common; +use Piwik\Controller; +use Piwik\View; /** * * @package Piwik_PDFReports */ -class Piwik_PDFReports_Controller extends Piwik_Controller +class Piwik_PDFReports_Controller extends Controller { const DEFAULT_REPORT_TYPE = Piwik_PDFReports::EMAIL_TYPE; public function index() { - $view = new Piwik_View('@PDFReports/index'); + $view = new View('@PDFReports/index'); $this->setGeneralVariablesView($view); $view->countWebsites = count(Piwik_SitesManager_API::getInstance()->getSitesIdWithAtLeastViewAccess()); diff --git a/plugins/PDFReports/PDFReports.php b/plugins/PDFReports/PDFReports.php index 69ddb3d498..f9eb619ea1 100644 --- a/plugins/PDFReports/PDFReports.php +++ b/plugins/PDFReports/PDFReports.php @@ -12,6 +12,11 @@ use Piwik\Piwik; use Piwik\Common; use Piwik\Config; use Piwik\Date; +use Piwik\Mail; +use Piwik\View; +use Piwik\ScheduledTime; +use Piwik\ScheduledTask; +use Piwik\ReportRenderer; use Piwik\Plugin; use Piwik\Site; @@ -30,7 +35,7 @@ class Piwik_PDFReports extends Plugin const DISPLAY_FORMAT_TABLES_ONLY = 4; // Display only tables for all reports const DEFAULT_DISPLAY_FORMAT = self::DISPLAY_FORMAT_GRAPHS_ONLY_FOR_KEY_METRICS; - const DEFAULT_REPORT_FORMAT = Piwik_ReportRenderer::HTML_FORMAT; + const DEFAULT_REPORT_FORMAT = ReportRenderer::HTML_FORMAT; const DEFAULT_PERIOD = 'week'; const DEFAULT_HOUR = '0'; @@ -55,8 +60,8 @@ class Piwik_PDFReports extends Plugin ); static private $managedReportFormats = array( - Piwik_ReportRenderer::HTML_FORMAT => 'plugins/Zeitgeist/images/html_icon.png', - Piwik_ReportRenderer::PDF_FORMAT => 'plugins/UserSettings/images/plugins/pdf.gif' + ReportRenderer::HTML_FORMAT => 'plugins/Zeitgeist/images/html_icon.png', + ReportRenderer::PDF_FORMAT => 'plugins/UserSettings/images/plugins/pdf.gif' ); /** @@ -233,9 +238,9 @@ class Piwik_PDFReports extends Plugin $reportFormat = $notificationInfo[Piwik_PDFReports_API::REPORT_KEY]['format']; $outputType = $notificationInfo[Piwik_PDFReports_API::OUTPUT_TYPE_INFO_KEY]; - $reportRenderer = Piwik_ReportRenderer::factory($reportFormat); + $reportRenderer = ReportRenderer::factory($reportFormat); - if ($reportFormat == Piwik_ReportRenderer::HTML_FORMAT) { + if ($reportFormat == ReportRenderer::HTML_FORMAT) { $reportRenderer->setRenderImageInline($outputType != Piwik_PDFReports_API::OUTPUT_SAVE_ON_DISK); } } @@ -262,7 +267,7 @@ class Piwik_PDFReports extends Plugin $message = Piwik_Translate('PDFReports_EmailHello'); $subject = Piwik_Translate('General_Report') . ' ' . $reportTitle . " - " . $prettyDate; - $mail = new Piwik_Mail(); + $mail = new Mail(); $mail->setSubject($subject); $fromEmailName = Config::getInstance()->branding['use_custom_logo'] ? Piwik_Translate('CoreHome_WebAnalyticsReports') @@ -392,7 +397,7 @@ class Piwik_PDFReports extends Plugin static public function template_reportParametersPDFReports(&$out) { - $view = new Piwik_View('@PDFReports/reportParametersPDFReports'); + $view = new View('@PDFReports/reportParametersPDFReports'); $view->currentUserEmail = Piwik::getCurrentUserEmail(); $view->displayFormats = self::getDisplayFormats(); $view->reportType = self::EMAIL_TYPE; @@ -414,7 +419,7 @@ class Piwik_PDFReports extends Plugin { $arbitraryDateInUTC = Date::factory('2011-01-01'); foreach (Piwik_PDFReports_API::getInstance()->getReports() as $report) { - if (!$report['deleted'] && $report['period'] != Piwik_ScheduledTime::PERIOD_NEVER) { + if (!$report['deleted'] && $report['period'] != ScheduledTime::PERIOD_NEVER) { $midnightInSiteTimezone = date( 'H', @@ -426,9 +431,9 @@ class Piwik_PDFReports extends Plugin $hourInUTC = (24 - $midnightInSiteTimezone + $report['hour']) % 24; - $schedule = Piwik_ScheduledTime::getScheduledTimeForPeriod($report['period']); + $schedule = ScheduledTime::getScheduledTimeForPeriod($report['period']); $schedule->setHour($hourInUTC); - $tasks[] = new Piwik_ScheduledTask ( + $tasks[] = new ScheduledTask ( Piwik_PDFReports_API::getInstance(), 'sendReport', $report['idreport'], $schedule @@ -508,7 +513,7 @@ class Piwik_PDFReports extends Plugin public function deleteUserReport($userLogin) { - Piwik_Query('DELETE FROM ' . Common::prefixTable('report') . ' WHERE login = ?', $userLogin); + Db::query('DELETE FROM ' . Common::prefixTable('report') . ' WHERE login = ?', $userLogin); } public function install() @@ -533,7 +538,7 @@ class Piwik_PDFReports extends Plugin ) DEFAULT CHARSET=utf8'; try { foreach ($queries as $query) { - Piwik_Exec($query); + Db::exec($query); } } catch (Exception $e) { if (!Zend_Registry::get('db')->isErrNo($e, '1050')) { @@ -577,10 +582,10 @@ class Piwik_PDFReports extends Plugin static public function getPeriodToFrequency() { return array( - Piwik_ScheduledTime::PERIOD_NEVER => Piwik_Translate('General_Never'), - Piwik_ScheduledTime::PERIOD_DAY => Piwik_Translate('General_Daily'), - Piwik_ScheduledTime::PERIOD_WEEK => Piwik_Translate('General_Weekly'), - Piwik_ScheduledTime::PERIOD_MONTH => Piwik_Translate('General_Monthly'), + ScheduledTime::PERIOD_NEVER => Piwik_Translate('General_Never'), + ScheduledTime::PERIOD_DAY => Piwik_Translate('General_Daily'), + ScheduledTime::PERIOD_WEEK => Piwik_Translate('General_Weekly'), + ScheduledTime::PERIOD_MONTH => Piwik_Translate('General_Monthly'), ); } @@ -591,11 +596,11 @@ class Piwik_PDFReports extends Plugin static public function getPeriodToFrequencyAsAdjective() { return array( - Piwik_ScheduledTime::PERIOD_DAY => Piwik_Translate('General_DailyReport'), - Piwik_ScheduledTime::PERIOD_WEEK => Piwik_Translate('General_WeeklyReport'), - Piwik_ScheduledTime::PERIOD_MONTH => Piwik_Translate('General_MonthlyReport'), - Piwik_ScheduledTime::PERIOD_YEAR => Piwik_Translate('General_YearlyReport'), - Piwik_ScheduledTime::PERIOD_RANGE => Piwik_Translate('General_RangeReports'), + ScheduledTime::PERIOD_DAY => Piwik_Translate('General_DailyReport'), + ScheduledTime::PERIOD_WEEK => Piwik_Translate('General_WeeklyReport'), + ScheduledTime::PERIOD_MONTH => Piwik_Translate('General_MonthlyReport'), + ScheduledTime::PERIOD_YEAR => Piwik_Translate('General_YearlyReport'), + ScheduledTime::PERIOD_RANGE => Piwik_Translate('General_RangeReports'), ); } } diff --git a/plugins/PleineLune/PleineLune.php b/plugins/PleineLune/PleineLune.php index 12b581bdc1..b19ed3e288 100644 --- a/plugins/PleineLune/PleineLune.php +++ b/plugins/PleineLune/PleineLune.php @@ -8,6 +8,7 @@ * @category Piwik_Plugins * @package Piwik_PleineLune */ +use Piwik\AssetManager; use Piwik\Plugin; /** @@ -19,7 +20,7 @@ class Piwik_PleineLune extends Plugin public function getListHooksRegistered() { return array( - Piwik_AssetManager::CSS_IMPORT_EVENT => 'getCssFiles', + AssetManager::CSS_IMPORT_EVENT => 'getCssFiles', ); } diff --git a/plugins/PrivacyManager/Controller.php b/plugins/PrivacyManager/Controller.php index a3af0246be..c11fb5d7f0 100644 --- a/plugins/PrivacyManager/Controller.php +++ b/plugins/PrivacyManager/Controller.php @@ -9,15 +9,18 @@ * @package Piwik_PrivacyManager */ use Piwik\Config; +use Piwik\Controller\Admin; use Piwik\Piwik; use Piwik\Common; use Piwik\Date; +use Piwik\View; +use Piwik\TaskScheduler; /** * * @package Piwik_PrivacyManager */ -class Piwik_PrivacyManager_Controller extends Piwik_Controller_Admin +class Piwik_PrivacyManager_Controller extends Admin { const ANONYMIZE_IP_PLUGIN_NAME = "AnonymizeIP"; @@ -90,7 +93,7 @@ class Piwik_PrivacyManager_Controller extends Piwik_Controller_Admin public function getDatabaseSize() { Piwik::checkUserIsSuperUser(); - $view = new Piwik_View('@PrivacyManager/getDatabaseSize'); + $view = new View('@PrivacyManager/getDatabaseSize'); $forceEstimate = Common::getRequestVar('forceEstimate', 0); $view->dbStats = $this->getDeleteDBSizeEstimate($getSettingsFromQuery = true, $forceEstimate); @@ -112,7 +115,7 @@ class Piwik_PrivacyManager_Controller extends Piwik_Controller_Admin public function privacySettings() { Piwik::checkUserHasSomeAdminAccess(); - $view = new Piwik_View('@PrivacyManager/privacySettings'); + $view = new View('@PrivacyManager/privacySettings'); if (Piwik::isUserIsSuperUser()) { $view->deleteData = $this->getDeleteDataInfo(); @@ -229,7 +232,7 @@ class Piwik_PrivacyManager_Controller extends Piwik_Controller_Admin { Piwik::checkUserIsSuperUser(); $deleteDataInfos = array(); - $taskScheduler = new Piwik_TaskScheduler(); + $taskScheduler = new TaskScheduler(); $deleteDataInfos["config"] = Piwik_PrivacyManager::getPurgeDataSettings(); $deleteDataInfos["deleteTables"] = "<br/>" . implode(", ", Piwik_PrivacyManager_LogDataPurger::getDeleteTableLogTables()); diff --git a/plugins/PrivacyManager/LogDataPurger.php b/plugins/PrivacyManager/LogDataPurger.php index 6d7a06b951..d4fa491b43 100755 --- a/plugins/PrivacyManager/LogDataPurger.php +++ b/plugins/PrivacyManager/LogDataPurger.php @@ -11,6 +11,7 @@ use Piwik\Piwik; use Piwik\Common; use Piwik\Date; +use Piwik\Db; /** * Purges the log_visit, log_conversion and related tables of old visit data. @@ -73,7 +74,7 @@ class Piwik_PrivacyManager_LogDataPurger foreach ($logTables as $logTable) { // deleting from log_action must be handled differently, so we do it later if ($logTable != Common::prefixTable('log_action')) { - Piwik_DeleteAllRows($logTable, $where, $this->maxRowsToDeletePerQuery, array($maxIdVisit)); + Db::deleteAllRows($logTable, $where, $this->maxRowsToDeletePerQuery, array($maxIdVisit)); } } @@ -86,7 +87,7 @@ class Piwik_PrivacyManager_LogDataPurger } // optimize table overhead after deletion - Piwik_OptimizeTables($logTables); + Db::optimizeTables($logTables); } /** @@ -138,7 +139,7 @@ class Piwik_PrivacyManager_LogDataPurger // delete before unlocking tables so there's no chance a new log row that references an // unused action will be inserted. $this->deleteUnusedActions(); - $this->unlockLogTables(); + Db::unlockAllTables(); } /** @@ -150,7 +151,7 @@ class Piwik_PrivacyManager_LogDataPurger $logVisit = Common::prefixTable("log_visit"); // get max idvisit - $maxIdVisit = Piwik_FetchOne("SELECT MAX(idvisit) FROM $logVisit"); + $maxIdVisit = Db::fetchOne("SELECT MAX(idvisit) FROM $logVisit"); if (empty($maxIdVisit)) { return false; } @@ -165,13 +166,13 @@ class Piwik_PrivacyManager_LogDataPurger ORDER BY idvisit DESC LIMIT 1"; - return Piwik_SegmentedFetchFirst($sql, $maxIdVisit, 0, -self::$selectSegmentSize); + return Db::segmentedFetchFirst($sql, $maxIdVisit, 0, -self::$selectSegmentSize); } private function getLogTableDeleteCount($table, $maxIdVisit) { $sql = "SELECT COUNT(*) FROM $table WHERE idvisit <= ?"; - return (int)Piwik_FetchOne($sql, array($maxIdVisit)); + return (int)Db::fetchOne($sql, array($maxIdVisit)); } private function createTempTable() @@ -180,7 +181,7 @@ class Piwik_PrivacyManager_LogDataPurger idaction INT(11), PRIMARY KEY (idaction) )"; - Piwik_Query($sql); + Db::query($sql); } private function getMaxIdsInLogTables() @@ -191,7 +192,7 @@ class Piwik_PrivacyManager_LogDataPurger $result = array(); foreach ($tables as $table) { $idCol = $idColumns[$table]; - $result[$table] = Piwik_FetchOne("SELECT MAX($idCol) FROM " . Common::prefixTable($table)); + $result[$table] = Db::fetchOne("SELECT MAX($idCol) FROM " . Common::prefixTable($table)); } return $result; @@ -214,10 +215,10 @@ class Piwik_PrivacyManager_LogDataPurger $finish = $maxIds[$table]; } else { $start = $maxIds[$table]; - $finish = Piwik_FetchOne("SELECT MAX($idCol) FROM " . Common::prefixTable($table)); + $finish = Db::fetchOne("SELECT MAX($idCol) FROM " . Common::prefixTable($table)); } - Piwik_SegmentedQuery($sql, $start, $finish, self::$selectSegmentSize); + Db::segmentedQuery($sql, $start, $finish, self::$selectSegmentSize); } } @@ -231,7 +232,7 @@ class Piwik_PrivacyManager_LogDataPurger private function lockLogTables() { - Piwik_LockTables( + Db::lockTables( $readLocks = Common::prefixTables('log_conversion', 'log_link_visit_action', 'log_visit', @@ -240,11 +241,6 @@ class Piwik_PrivacyManager_LogDataPurger ); } - private function unlockLogTables() - { - Piwik_UnlockAllTables(); - } - private function deleteUnusedActions() { list($logActionTable, $tempTableName) = Common::prefixTables("log_action", self::TEMP_TABLE_NAME); @@ -254,7 +250,7 @@ class Piwik_PrivacyManager_LogDataPurger LEFT JOIN $tempTableName tmp ON tmp.idaction = $logActionTable.idaction WHERE tmp.idaction IS NULL"; - Piwik_Query($deleteSql); + Db::query($deleteSql); } private function getIdActionColumns() diff --git a/plugins/PrivacyManager/PrivacyManager.php b/plugins/PrivacyManager/PrivacyManager.php index 710232001b..4d01b4850a 100644 --- a/plugins/PrivacyManager/PrivacyManager.php +++ b/plugins/PrivacyManager/PrivacyManager.php @@ -13,6 +13,7 @@ use Piwik\Metrics; use Piwik\Piwik; use Piwik\Common; use Piwik\Date; +use Piwik\ScheduledTask; use Piwik\Plugin; /** @@ -70,13 +71,13 @@ class Piwik_PrivacyManager extends Plugin // both tasks are low priority so they will execute after most others, but not lowest, so // they will execute before the optimize tables task - $purgeReportDataTask = new Piwik_ScheduledTask( - $this, 'deleteReportData', null, new Piwik_ScheduledTime_Daily(), Piwik_ScheduledTask::LOW_PRIORITY + $purgeReportDataTask = new ScheduledTask( + $this, 'deleteReportData', null, new Piwik_ScheduledTime_Daily(), ScheduledTask::LOW_PRIORITY ); $tasks[] = $purgeReportDataTask; - $purgeLogDataTask = new Piwik_ScheduledTask( - $this, 'deleteLogData', null, new Piwik_ScheduledTime_Daily(), Piwik_ScheduledTask::LOW_PRIORITY + $purgeLogDataTask = new ScheduledTask( + $this, 'deleteLogData', null, new Piwik_ScheduledTime_Daily(), ScheduledTask::LOW_PRIORITY ); $tasks[] = $purgeLogDataTask; } @@ -390,7 +391,7 @@ class Piwik_PrivacyManager extends Plugin private static function getMaxGoalId() { - return Piwik_FetchOne("SELECT MAX(idgoal) FROM " . Common::prefixTable('goal')); + return Db::fetchOne("SELECT MAX(idgoal) FROM " . Common::prefixTable('goal')); } } diff --git a/plugins/PrivacyManager/ReportsPurger.php b/plugins/PrivacyManager/ReportsPurger.php index a8ed8c3bfa..af527b6142 100755 --- a/plugins/PrivacyManager/ReportsPurger.php +++ b/plugins/PrivacyManager/ReportsPurger.php @@ -11,6 +11,7 @@ use Piwik\DataAccess\ArchiveTableCreator; use Piwik\Piwik; use Piwik\Date; +use Piwik\Db; /** * Purges archived reports and metrics that are considered old. @@ -107,18 +108,18 @@ class Piwik_PrivacyManager_ReportsPurger if (!empty($oldBlobTables)) { // if no reports should be kept, drop tables, otherwise drop individual reports if (empty($this->reportPeriodsToKeep) && !$this->keepSegmentReports) { - Piwik_DropTables($oldBlobTables); + Db::dropTables($oldBlobTables); } else { foreach ($oldBlobTables as $table) { $where = $this->getBlobTableWhereExpr($oldNumericTables, $table); if (!empty($where)) { $where = "WHERE $where"; } - Piwik_DeleteAllRows($table, $where, $this->maxRowsToDeletePerQuery); + Db::deleteAllRows($table, $where, $this->maxRowsToDeletePerQuery); } if ($optimize) { - Piwik_OptimizeTables($oldBlobTables); + Db::optimizeTables($oldBlobTables); } } } @@ -129,15 +130,15 @@ class Piwik_PrivacyManager_ReportsPurger if ($this->keepBasicMetrics == 1 && !empty($this->metricsToKeep)) { $where = "WHERE name NOT IN ('" . implode("','", $this->metricsToKeep) . "') AND name NOT LIKE 'done%'"; foreach ($oldNumericTables as $table) { - Piwik_DeleteAllRows($table, $where, $this->maxRowsToDeletePerQuery); + Db::deleteAllRows($table, $where, $this->maxRowsToDeletePerQuery); } if ($optimize) { - Piwik_OptimizeTables($oldNumericTables); + Db::optimizeTables($oldNumericTables); } } else // drop numeric tables { - Piwik_DropTables($oldNumericTables); + Db::dropTables($oldNumericTables); } } } @@ -249,7 +250,7 @@ class Piwik_PrivacyManager_ReportsPurger private function getNumericTableDeleteCount($table) { - $maxIdArchive = Piwik_FetchOne("SELECT MAX(idarchive) FROM $table"); + $maxIdArchive = Db::fetchOne("SELECT MAX(idarchive) FROM $table"); $sql = "SELECT COUNT(*) FROM $table @@ -258,13 +259,13 @@ class Piwik_PrivacyManager_ReportsPurger AND idarchive >= ? AND idarchive < ?"; - $segments = Piwik_SegmentedFetchOne($sql, 0, $maxIdArchive, self::$selectSegmentSize); + $segments = Db::segmentedFetchOne($sql, 0, $maxIdArchive, self::$selectSegmentSize); return array_sum($segments); } private function getBlobTableDeleteCount($oldNumericTables, $table) { - $maxIdArchive = Piwik_FetchOne("SELECT MAX(idarchive) FROM $table"); + $maxIdArchive = Db::fetchOne("SELECT MAX(idarchive) FROM $table"); $sql = "SELECT COUNT(*) FROM $table @@ -272,7 +273,7 @@ class Piwik_PrivacyManager_ReportsPurger AND idarchive >= ? AND idarchive < ?"; - $segments = Piwik_SegmentedFetchOne($sql, 0, $maxIdArchive, self::$selectSegmentSize); + $segments = Db::segmentedFetchOne($sql, 0, $maxIdArchive, self::$selectSegmentSize); return array_sum($segments); } @@ -312,7 +313,7 @@ class Piwik_PrivacyManager_ReportsPurger foreach ($numericTables as $table) { $tableDate = ArchiveTableCreator::getDateFromTableName($table); - $maxIdArchive = Piwik_FetchOne("SELECT MAX(idarchive) FROM $table"); + $maxIdArchive = Db::fetchOne("SELECT MAX(idarchive) FROM $table"); $sql = "SELECT idarchive FROM $table @@ -322,7 +323,7 @@ class Piwik_PrivacyManager_ReportsPurger AND idarchive < ?"; $this->segmentArchiveIds[$tableDate] = array(); - foreach (Piwik_SegmentedFetchAll($sql, 0, $maxIdArchive, self::$selectSegmentSize) as $row) { + foreach (Db::segmentedFetchAll($sql, 0, $maxIdArchive, self::$selectSegmentSize) as $row) { $this->segmentArchiveIds[$tableDate][] = $row['idarchive']; } } diff --git a/plugins/Provider/Controller.php b/plugins/Provider/Controller.php index f59b8d1b29..078e10fb52 100644 --- a/plugins/Provider/Controller.php +++ b/plugins/Provider/Controller.php @@ -8,12 +8,14 @@ * @category Piwik_Plugins * @package Piwik_Provider */ +use Piwik\Controller; +use Piwik\ViewDataTable; /** * * @package Piwik_Provider */ -class Piwik_Provider_Controller extends Piwik_Controller +class Piwik_Provider_Controller extends Controller { /** * Provider @@ -22,7 +24,7 @@ class Piwik_Provider_Controller extends Piwik_Controller */ function getProvider($fetch = false) { - $view = Piwik_ViewDataTable::factory(); + $view = ViewDataTable::factory(); $view->init($this->pluginName, __FUNCTION__, "Provider.getProvider"); $this->setPeriodVariablesView($view); diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php index fe448e7395..834c85034e 100644 --- a/plugins/Provider/Provider.php +++ b/plugins/Provider/Provider.php @@ -9,6 +9,8 @@ * @package Piwik_Provider */ use Piwik\Common; +use Piwik\FrontController; +use Piwik\IP; use Piwik\Plugin; use Piwik\ArchiveProcessor; @@ -67,7 +69,7 @@ class Piwik_Provider extends Plugin // if the column already exist do not throw error. Could be installed twice... try { - Piwik_Exec($query); + Db::exec($query); } catch (Exception $e) { if (!Zend_Registry::get('db')->isErrNo($e, '1060')) { throw $e; @@ -80,12 +82,12 @@ class Piwik_Provider extends Plugin { // add column hostname / hostname ext in the visit table $query = "ALTER TABLE `" . Common::prefixTable('log_visit') . "` DROP `location_provider`"; - Piwik_Exec($query); + Db::exec($query); } function addWidget() { - Piwik_AddWidget('General_Visitors', 'Provider_WidgetProviders', 'Provider', 'getProvider'); + WidgetsList::add('General_Visitors', 'Provider_WidgetProviders', 'Provider', 'getProvider'); } function addMenu() @@ -109,7 +111,7 @@ class Piwik_Provider extends Plugin return; } - $ip = Piwik_IP::N2P($visitorInfo['location_ip']); + $ip = IP::N2P($visitorInfo['location_ip']); // In case the IP was anonymized, we should not continue since the DNS reverse lookup will fail and this will slow down tracking if (substr($ip, -2, 2) == '.0') { @@ -180,14 +182,14 @@ class Piwik_Provider extends Plugin */ private function getHost($ip) { - return trim(strtolower(@Piwik_IP::getHostByAddr($ip))); + return trim(strtolower(@IP::getHostByAddr($ip))); } static public function footerUserCountry(&$out) { $out = '<div> <h2>' . Piwik_Translate('Provider_WidgetProviders') . '</h2>'; - $out .= Piwik_FrontController::getInstance()->fetchDispatch('Provider', 'getProvider'); + $out .= FrontController::getInstance()->fetchDispatch('Provider', 'getProvider'); $out .= '</div>'; } diff --git a/plugins/Proxy/Controller.php b/plugins/Proxy/Controller.php index 9f49505e97..6633a70f5d 100644 --- a/plugins/Proxy/Controller.php +++ b/plugins/Proxy/Controller.php @@ -10,13 +10,16 @@ */ use Piwik\Piwik; use Piwik\Common; +use Piwik\AssetManager; +use Piwik\Controller; +use Piwik\Url; /** * Controller for proxy services * * @package Piwik_Proxy */ -class Piwik_Proxy_Controller extends Piwik_Controller +class Piwik_Proxy_Controller extends Controller { const TRANSPARENT_PNG_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEUAAACnej3aAAAAAXRSTlMAQObYZgAAAApJREFUCNdjYAAAAAIAAeIhvDMAAAAASUVORK5CYII='; @@ -28,7 +31,7 @@ class Piwik_Proxy_Controller extends Piwik_Controller */ public function getCss() { - $cssMergedFile = Piwik_AssetManager::getMergedCssFileLocation(); + $cssMergedFile = AssetManager::getMergedCssFileLocation(); Piwik::serveStaticFile($cssMergedFile, "text/css"); } @@ -40,7 +43,7 @@ class Piwik_Proxy_Controller extends Piwik_Controller */ public function getJs() { - $jsMergedFile = Piwik_AssetManager::getMergedJsFileLocation(); + $jsMergedFile = AssetManager::getMergedJsFileLocation(); Piwik::serveStaticFile($jsMergedFile, "application/javascript; charset=UTF-8"); } @@ -55,8 +58,8 @@ class Piwik_Proxy_Controller extends Piwik_Controller $url = Common::getRequestVar('url', '', 'string', $_GET); // validate referrer - $referrer = Piwik_Url::getReferer(); - if (empty($referrer) || !Piwik_Url::isLocalUrl($referrer)) { + $referrer = Url::getReferer(); + if (empty($referrer) || !Url::isLocalUrl($referrer)) { die('Invalid Referer detected - This means that your web browser is not sending the "Referer URL" which is required to proceed with the redirect. Verify your browser settings and add-ons, to check why your browser is not sending this referer. diff --git a/plugins/Proxy/Proxy.php b/plugins/Proxy/Proxy.php index fc404bfd2e..47d085a70c 100644 --- a/plugins/Proxy/Proxy.php +++ b/plugins/Proxy/Proxy.php @@ -8,6 +8,7 @@ * @category Piwik_Plugins * @package Piwik_Proxy */ +use Piwik\Version; use Piwik\Plugin; /** @@ -30,7 +31,7 @@ class Piwik_Proxy extends Plugin 'description' => 'Proxy services', 'author' => 'Piwik', 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, + 'version' => Version::VERSION, 'translationAvailable' => false, ); } diff --git a/plugins/Referers/API.php b/plugins/Referers/API.php index a8dba84e0d..495a73f53f 100644 --- a/plugins/Referers/API.php +++ b/plugins/Referers/API.php @@ -8,6 +8,7 @@ * @category Piwik_Plugins * @package Piwik_Referers */ +use Piwik\API\ResponseBuilder; use Piwik\Archive; use Piwik\DataTable\Row; use Piwik\Metrics; @@ -211,7 +212,7 @@ class Piwik_Referers_API $request['serialize'] = 0; // Apply generic filters - $response = new Piwik_API_ResponseBuilder($format = 'original', $request); + $response = new ResponseBuilder($format = 'original', $request); $table = $response->getResponse($table); // If period=lastX we only keep the first resultset as we want to return a plain list diff --git a/plugins/Referers/Archiver.php b/plugins/Referers/Archiver.php index dd7a795e9e..4da6a19d07 100644 --- a/plugins/Referers/Archiver.php +++ b/plugins/Referers/Archiver.php @@ -2,6 +2,7 @@ use Piwik\Common; use Piwik\Config; use Piwik\Metrics; +use Piwik\DataArray; use Piwik\PluginsArchiver; /** @@ -29,7 +30,7 @@ class Piwik_Referers_Archiver extends PluginsArchiver protected $columnToSortByBeforeTruncation; protected $maximumRowsInDataTableLevelZero; protected $maximumRowsInSubDataTable; - /* @var array[Piwik_DataArray] $arrays */ + /* @var array[DataArray] $arrays */ protected $arrays = array(); protected $distinctUrls = array(); @@ -44,7 +45,7 @@ class Piwik_Referers_Archiver extends PluginsArchiver public function archiveDay() { foreach ($this->getRecordNames() as $record) { - $this->arrays[$record] = new Piwik_DataArray(); + $this->arrays[$record] = new DataArray(); } $query = $this->getLogAggregator()->queryVisitsByDimension(array("referer_type", "referer_name", "referer_keyword", "referer_url")); $this->aggregateFromVisits($query); @@ -127,7 +128,7 @@ class Piwik_Referers_Archiver extends PluginsArchiver /** * @param $name - * @return Piwik_DataArray + * @return DataArray */ protected function getDataArray($name) { @@ -149,7 +150,7 @@ class Piwik_Referers_Archiver extends PluginsArchiver } foreach ($this->arrays as $dataArray) { - /* @var Piwik_DataArray $dataArray */ + /* @var DataArray $dataArray */ $dataArray->enrichMetricsWithConversions(); } } diff --git a/plugins/Referers/Controller.php b/plugins/Referers/Controller.php index 97d920e175..072fc1ec4a 100644 --- a/plugins/Referers/Controller.php +++ b/plugins/Referers/Controller.php @@ -8,20 +8,25 @@ * @category Piwik_Plugins * @package Piwik_Referers */ +use Piwik\API\Request; use Piwik\Metrics; use Piwik\Period\Range; use Piwik\Piwik; use Piwik\Common; +use Piwik\Controller; +use Piwik\ViewDataTable; +use Piwik\View; +use Piwik\Url; /** * * @package Piwik_Referers */ -class Piwik_Referers_Controller extends Piwik_Controller +class Piwik_Referers_Controller extends Controller { function index() { - $view = new Piwik_View('@Referers/index'); + $view = new View('@Referers/index'); $view->graphEvolutionReferers = $this->getEvolutionGraph(true, Common::REFERER_TYPE_DIRECT_ENTRY, array('nb_visits')); $view->nameGraphEvolutionReferers = 'ReferersgetEvolutionGraph'; @@ -124,7 +129,7 @@ class Piwik_Referers_Controller extends Piwik_Controller function getSearchEnginesAndKeywords() { - $view = new Piwik_View('@Referers/getSearchEnginesAndKeywords'); + $view = new View('@Referers/getSearchEnginesAndKeywords'); $view->searchEngines = $this->getSearchEngines(true); $view->keywords = $this->getKeywords(true); echo $view->render(); @@ -132,7 +137,7 @@ class Piwik_Referers_Controller extends Piwik_Controller function getRefererType($fetch = false) { - $view = Piwik_ViewDataTable::factory('tableAllColumns'); + $view = ViewDataTable::factory('tableAllColumns'); $view->init($this->pluginName, __FUNCTION__, 'Referers.getRefererType', @@ -179,7 +184,7 @@ class Piwik_Referers_Controller extends Piwik_Controller */ public function getAll($fetch = false) { - $view = Piwik_ViewDataTable::factory(); + $view = ViewDataTable::factory(); $view->init($this->pluginName, __FUNCTION__, 'Referers.getAll'); $view->disableExcludeLowPopulation(); $view->setColumnTranslation('label', Piwik_Translate('Referers_Referrer')); @@ -235,7 +240,7 @@ class Piwik_Referers_Controller extends Piwik_Controller function getKeywords($fetch = false) { - $view = Piwik_ViewDataTable::factory(); + $view = ViewDataTable::factory(); $view->init($this->pluginName, __FUNCTION__, 'Referers.getKeywords', 'getSearchEnginesFromKeywordId' @@ -253,7 +258,7 @@ class Piwik_Referers_Controller extends Piwik_Controller function getSearchEnginesFromKeywordId($fetch = false) { - $view = Piwik_ViewDataTable::factory(); + $view = ViewDataTable::factory(); $view->init($this->pluginName, __FUNCTION__, 'Referers.getSearchEnginesFromKeywordId' ); @@ -267,7 +272,7 @@ class Piwik_Referers_Controller extends Piwik_Controller function getSearchEngines($fetch = false) { - $view = Piwik_ViewDataTable::factory(); + $view = ViewDataTable::factory(); $view->init($this->pluginName, __FUNCTION__, 'Referers.getSearchEngines', 'getKeywordsFromSearchEngineId' @@ -286,7 +291,7 @@ class Piwik_Referers_Controller extends Piwik_Controller function getKeywordsFromSearchEngineId($fetch = false) { - $view = Piwik_ViewDataTable::factory(); + $view = ViewDataTable::factory(); $view->init($this->pluginName, __FUNCTION__, 'Referers.getKeywordsFromSearchEngineId' ); @@ -299,7 +304,7 @@ class Piwik_Referers_Controller extends Piwik_Controller function indexWebsites($fetch = false) { - $view = new Piwik_View('@Referers/indexWebsites'); + $view = new View('@Referers/indexWebsites'); $view->websites = $this->getWebsites(true); $view->socials = $this->getSocials(true); if ($fetch) { @@ -311,7 +316,7 @@ class Piwik_Referers_Controller extends Piwik_Controller function getWebsites($fetch = false) { - $view = Piwik_ViewDataTable::factory(); + $view = ViewDataTable::factory(); $view->init($this->pluginName, __FUNCTION__, 'Referers.getWebsites', 'getUrlsFromWebsiteId' @@ -329,7 +334,7 @@ class Piwik_Referers_Controller extends Piwik_Controller function getSocials($fetch = false) { - $view = Piwik_ViewDataTable::factory('graphPie'); + $view = ViewDataTable::factory('graphPie'); $view->init($this->pluginName, __FUNCTION__, 'Referers.getSocials', 'getUrlsForSocial'); $view->disableExcludeLowPopulation(); $view->setLimit(10); @@ -348,7 +353,7 @@ class Piwik_Referers_Controller extends Piwik_Controller function getUrlsForSocial($fetch = false) { - $view = Piwik_ViewDataTable::factory(); + $view = ViewDataTable::factory(); $view->init($this->pluginName, __FUNCTION__, 'Referers.getUrlsForSocial'); $view->disableExcludeLowPopulation(); $view->setLimit(10); @@ -362,14 +367,14 @@ class Piwik_Referers_Controller extends Piwik_Controller function indexCampaigns($fetch = false) { - return Piwik_View::singleReport( + return View::singleReport( Piwik_Translate('Referers_Campaigns'), $this->getCampaigns(true), $fetch); } function getCampaigns($fetch = false) { - $view = Piwik_ViewDataTable::factory(); + $view = ViewDataTable::factory(); $view->init($this->pluginName, __FUNCTION__, 'Referers.getCampaigns', 'getKeywordsFromCampaignId' @@ -391,7 +396,7 @@ class Piwik_Referers_Controller extends Piwik_Controller function getKeywordsFromCampaignId($fetch = false) { - $view = Piwik_ViewDataTable::factory(); + $view = ViewDataTable::factory(); $view->init($this->pluginName, __FUNCTION__, 'Referers.getKeywordsFromCampaignId' ); @@ -406,7 +411,7 @@ class Piwik_Referers_Controller extends Piwik_Controller function getUrlsFromWebsiteId($fetch = false) { - $view = Piwik_ViewDataTable::factory(); + $view = ViewDataTable::factory(); $view->init($this->pluginName, __FUNCTION__, 'Referers.getUrlsFromWebsiteId' ); @@ -427,7 +432,7 @@ class Piwik_Referers_Controller extends Piwik_Controller // we disable the queued filters because here we want to get the visits coming from search engines // if the filters were applied we would have to look up for a label looking like "Search Engines" // which is not good when we have translations - $dataTableReferersType = Piwik_API_Request::processRequest( + $dataTableReferersType = Request::processRequest( "Referers.getRefererType", array('disable_queued_filters' => '1', 'date' => $date)); $nameToColumnId = array( @@ -548,7 +553,7 @@ class Piwik_Referers_Controller extends Piwik_Controller . '&method=Actions.getPageUrls' . '&filter_limit=50' . '&format=original'; - $request = new Piwik_API_Request($topPageUrlRequest); + $request = new Request($topPageUrlRequest); $request = $request->process(); $tables = $request->getArray(); @@ -566,7 +571,7 @@ class Piwik_Referers_Controller extends Piwik_Controller $url = $topPageUrl; // HTML - $api = Piwik_Url::getCurrentUrlWithoutFileName() + $api = Url::getCurrentUrlWithoutFileName() . '?module=API&method=Referers.getKeywordsForPageUrl' . '&format=php' . '&filter_limit=10' @@ -711,9 +716,9 @@ function DisplayTopKeywords($url = "") /** * Utility method that calculates evolution values for a set of current & past values - * and sets properties on a Piwik_View w/ HTML that displays the evolution percents. + * and sets properties on a View w/ HTML that displays the evolution percents. * - * @param Piwik_View $view The view to set properties on. + * @param View $view The view to set properties on. * @param string $date The date of the current values. * @param array $currentValues Array mapping view property names w/ present values. * @param string $lastPeriodDate The date of the period in the past. diff --git a/plugins/Referers/Referers.php b/plugins/Referers/Referers.php index 449bc0ce41..cc8642df6e 100644 --- a/plugins/Referers/Referers.php +++ b/plugins/Referers/Referers.php @@ -208,15 +208,15 @@ class Piwik_Referers extends Plugin */ function addWidgets() { - Piwik_AddWidget('Referers_Referers', 'Referers_WidgetKeywords', 'Referers', 'getKeywords'); - Piwik_AddWidget('Referers_Referers', 'Referers_WidgetExternalWebsites', 'Referers', 'getWebsites'); - Piwik_AddWidget('Referers_Referers', 'Referers_WidgetSocials', 'Referers', 'getSocials'); - Piwik_AddWidget('Referers_Referers', 'Referers_WidgetSearchEngines', 'Referers', 'getSearchEngines'); - Piwik_AddWidget('Referers_Referers', 'Referers_WidgetCampaigns', 'Referers', 'getCampaigns'); - Piwik_AddWidget('Referers_Referers', 'Referers_WidgetOverview', 'Referers', 'getRefererType'); - Piwik_AddWidget('Referers_Referers', 'Referers_WidgetGetAll', 'Referers', 'getAll'); + WidgetsList::add('Referers_Referers', 'Referers_WidgetKeywords', 'Referers', 'getKeywords'); + WidgetsList::add('Referers_Referers', 'Referers_WidgetExternalWebsites', 'Referers', 'getWebsites'); + WidgetsList::add('Referers_Referers', 'Referers_WidgetSocials', 'Referers', 'getSocials'); + WidgetsList::add('Referers_Referers', 'Referers_WidgetSearchEngines', 'Referers', 'getSearchEngines'); + WidgetsList::add('Referers_Referers', 'Referers_WidgetCampaigns', 'Referers', 'getCampaigns'); + WidgetsList::add('Referers_Referers', 'Referers_WidgetOverview', 'Referers', 'getRefererType'); + WidgetsList::add('Referers_Referers', 'Referers_WidgetGetAll', 'Referers', 'getAll'); if (Piwik::isSegmentationEnabled()) { - Piwik_AddWidget('SEO', 'Referers_WidgetTopKeywordsForPages', 'Referers', 'getKeywordsForPage'); + WidgetsList::add('SEO', 'Referers_WidgetTopKeywordsForPages', 'Referers', 'getKeywordsForPage'); } } diff --git a/plugins/SEO/Controller.php b/plugins/SEO/Controller.php index b509264871..207d92a179 100644 --- a/plugins/SEO/Controller.php +++ b/plugins/SEO/Controller.php @@ -10,12 +10,14 @@ */ use Piwik\Common; use Piwik\DataTable\Renderer; +use Piwik\Controller; +use Piwik\View; use Piwik\Site; /** * @package Piwik_SEO */ -class Piwik_SEO_Controller extends Piwik_Controller +class Piwik_SEO_Controller extends Controller { function getRank() { @@ -34,7 +36,7 @@ class Piwik_SEO_Controller extends Piwik_Controller $dataTable = Piwik_SEO_API::getInstance()->getRank($url); - $view = new Piwik_View('@SEO/getRank'); + $view = new View('@SEO/getRank'); $view->urlToRank = Piwik_SEO_RankChecker::extractDomainFromUrl($url); $renderer = Renderer::factory('php'); diff --git a/plugins/SEO/MajesticClient.php b/plugins/SEO/MajesticClient.php index 250fa0025b..34f16a038e 100644 --- a/plugins/SEO/MajesticClient.php +++ b/plugins/SEO/MajesticClient.php @@ -9,6 +9,7 @@ * @package Piwik_SEO */ use Piwik\Common; +use Piwik\Http; /** * Client for Majestic SEO's HTTP API. @@ -57,7 +58,7 @@ class Piwik_SEO_MajesticClient 'items' => '1', 'item0' => $siteDomain )); - $apiResponse = Piwik_Http::sendHttpRequest($apiUrl, $timeout); + $apiResponse = Http::sendHttpRequest($apiUrl, $timeout); $result = array( 'backlink_count' => false, diff --git a/plugins/SEO/RankChecker.php b/plugins/SEO/RankChecker.php index aa4d44c87e..cdc858176c 100644 --- a/plugins/SEO/RankChecker.php +++ b/plugins/SEO/RankChecker.php @@ -9,6 +9,7 @@ * @package Piwik_SEO */ use Piwik\Piwik; +use Piwik\Http; /** * The functions below are derived/adapted from GetRank.org's @@ -56,7 +57,7 @@ class Piwik_SEO_RankChecker private function getPage($url) { try { - return str_replace(' ', ' ', Piwik_Http::sendHttpRequest($url, $timeout = 10, @$_SERVER['HTTP_USER_AGENT'])); + return str_replace(' ', ' ', Http::sendHttpRequest($url, $timeout = 10, @$_SERVER['HTTP_USER_AGENT'])); } catch (Exception $e) { return ''; } diff --git a/plugins/SEO/SEO.php b/plugins/SEO/SEO.php index e41c93385c..9d5b68efe9 100644 --- a/plugins/SEO/SEO.php +++ b/plugins/SEO/SEO.php @@ -8,6 +8,7 @@ * @category Piwik_Plugins * @package Piwik_SEO */ +use Piwik\Version; use Piwik\Plugin; /** @@ -24,7 +25,7 @@ class Piwik_SEO extends Plugin 'description' => 'This Plugin extracts and displays SEO metrics: Alexa web ranking, Google Pagerank, number of Indexed pages and backlinks of the currently selected website.', 'author' => 'Piwik', 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, + 'version' => Version::VERSION, ); } @@ -39,6 +40,6 @@ class Piwik_SEO extends Plugin function addWidgets() { - Piwik_AddWidget('SEO', 'SEO_SeoRankings', 'SEO', 'getRank'); + WidgetsList::add('SEO', 'SEO_SeoRankings', 'SEO', 'getRank'); } } diff --git a/plugins/SecurityInfo/Controller.php b/plugins/SecurityInfo/Controller.php index c9b307bba4..7195185fdd 100644 --- a/plugins/SecurityInfo/Controller.php +++ b/plugins/SecurityInfo/Controller.php @@ -8,12 +8,14 @@ * @category Piwik_Plugins * @package Piwik_SecurityInfo */ +use Piwik\Controller\Admin; use Piwik\Piwik; +use Piwik\View; /** * @package Piwik_SecurityInfo */ -class Piwik_SecurityInfo_Controller extends Piwik_Controller_Admin +class Piwik_SecurityInfo_Controller extends Admin { function index() { @@ -35,7 +37,7 @@ class Piwik_SecurityInfo_Controller extends Piwik_Controller_Admin unset($results['test_results']['Core']['post_max_size']); unset($results['test_results']['Core']['upload_max_filesize']); - $view = new Piwik_View('@SecurityInfo/index'); + $view = new View('@SecurityInfo/index'); $this->setBasicVariablesView($view); $view->results = $results; echo $view->render(); diff --git a/plugins/SecurityInfo/PhpSecInfo/Test/Application/php.php b/plugins/SecurityInfo/PhpSecInfo/Test/Application/php.php index 3199cb3167..98b170f427 100644 --- a/plugins/SecurityInfo/PhpSecInfo/Test/Application/php.php +++ b/plugins/SecurityInfo/PhpSecInfo/Test/Application/php.php @@ -5,6 +5,8 @@ * @package PhpSecInfo * @author Piwik */ +use Piwik\Http; +use Piwik\UpdateCheck; /** * require the PhpSecInfo_Test_Application class @@ -30,9 +32,9 @@ class PhpSecInfo_Test_Application_Php extends PhpSecInfo_Test_Application $this->current_value = PHP_VERSION; $url = 'http://php.net/releases/?serialize=1&version=5'; - $timeout = Piwik_UpdateCheck::SOCKET_TIMEOUT; + $timeout = UpdateCheck::SOCKET_TIMEOUT; try { - $latestVersion = Piwik_Http::sendHttpRequest($url, $timeout); + $latestVersion = Http::sendHttpRequest($url, $timeout); $versionInfo = safe_unserialize($latestVersion); $this->recommended_value = $versionInfo['version']; } catch (Exception $e) { diff --git a/plugins/SecurityInfo/PhpSecInfo/Test/Application/piwik.php b/plugins/SecurityInfo/PhpSecInfo/Test/Application/piwik.php index 16e7fbf42f..e3aa84f16b 100644 --- a/plugins/SecurityInfo/PhpSecInfo/Test/Application/piwik.php +++ b/plugins/SecurityInfo/PhpSecInfo/Test/Application/piwik.php @@ -5,6 +5,8 @@ * @package PhpSecInfo * @author Piwik */ +use Piwik\Version; +use Piwik\UpdateCheck; /** * require the PhpSecInfo_Test_Application class @@ -27,9 +29,9 @@ class PhpSecInfo_Test_Application_Piwik extends PhpSecInfo_Test_Application function _retrieveCurrentValue() { - $this->current_value = Piwik_Version::VERSION; + $this->current_value = Version::VERSION; - $this->recommended_value = Piwik_GetOption(Piwik_UpdateCheck::LATEST_VERSION); + $this->recommended_value = Piwik_GetOption(UpdateCheck::LATEST_VERSION); } function _execTest() diff --git a/plugins/SecurityInfo/PhpSecInfo/Test/Test_Application.php b/plugins/SecurityInfo/PhpSecInfo/Test/Test_Application.php index af97310aad..c87b9d2856 100644 --- a/plugins/SecurityInfo/PhpSecInfo/Test/Test_Application.php +++ b/plugins/SecurityInfo/PhpSecInfo/Test/Test_Application.php @@ -5,6 +5,7 @@ * @package PhpSecInfo * @author Anthon Pang */ +use Piwik\Http; /** * require the main PhpSecInfo class @@ -36,7 +37,7 @@ class PhpSecInfo_Test_Application extends PhpSecInfo_Test */ function isTestable() { - return Piwik_Http::getTransportMethod() !== null; + return Http::getTransportMethod() !== null; } function getMoreInfoURL() diff --git a/plugins/SegmentEditor/Controller.php b/plugins/SegmentEditor/Controller.php index bafab7ac46..4083369ece 100644 --- a/plugins/SegmentEditor/Controller.php +++ b/plugins/SegmentEditor/Controller.php @@ -10,16 +10,18 @@ */ use Piwik\Piwik; use Piwik\Common; +use Piwik\Controller; +use Piwik\View; /** * @package Piwik_SegmentEditor */ -class Piwik_SegmentEditor_Controller extends Piwik_Controller +class Piwik_SegmentEditor_Controller extends Controller { public function getSelector() { - $view = new Piwik_View('@SegmentEditor/getSelector'); + $view = new View('@SegmentEditor/getSelector'); $idSite = Common::getRequestVar('idSite'); $this->setGeneralVariablesView($view); $segments = Piwik_API_API::getInstance()->getSegmentsMetadata($idSite); diff --git a/plugins/SegmentEditor/SegmentEditor.php b/plugins/SegmentEditor/SegmentEditor.php index a4f54d01e7..0d539b078f 100644 --- a/plugins/SegmentEditor/SegmentEditor.php +++ b/plugins/SegmentEditor/SegmentEditor.php @@ -9,6 +9,7 @@ * @package Piwik_SegmentEditor */ use Piwik\Common; +use Piwik\Version; use Piwik\Plugin; /** @@ -25,7 +26,7 @@ class Piwik_SegmentEditor extends Plugin 'description' => 'Create and reuse custom visitor Segments with the Segment Editor.', 'author' => 'Piwik', 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, + 'version' => Version::VERSION, ); } @@ -84,7 +85,7 @@ class Piwik_SegmentEditor extends Plugin ) DEFAULT CHARSET=utf8'; try { foreach ($queries as $query) { - Piwik_Exec($query); + Db::exec($query); } } catch (Exception $e) { if (!Zend_Registry::get('db')->isErrNo($e, '1050')) { diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php index edc66625e6..47b3e44f1d 100644 --- a/plugins/SitesManager/API.php +++ b/plugins/SitesManager/API.php @@ -12,6 +12,9 @@ use Piwik\Piwik; use Piwik\Common; use Piwik\Access; use Piwik\Date; +use Piwik\IP; +use Piwik\Url; +use Piwik\TaskScheduler; use Piwik\Site; /** @@ -69,7 +72,7 @@ class Piwik_SitesManager_API Piwik::checkUserHasViewAccess($idSite); if (empty($piwikUrl)) { - $piwikUrl = Piwik_Url::getCurrentUrlWithoutFileName(); + $piwikUrl = Url::getCurrentUrlWithoutFileName(); } $piwikUrl = Common::sanitizeInputValues($piwikUrl); @@ -170,7 +173,7 @@ class Piwik_SitesManager_API */ private function getSitesId() { - $result = Piwik_FetchAll("SELECT idsite FROM " . Common::prefixTable('site')); + $result = Db::fetchAll("SELECT idsite FROM " . Common::prefixTable('site')); $idSites = array(); foreach ($result as $idSite) { $idSites[] = $idSite['idsite']; @@ -225,7 +228,7 @@ class Piwik_SitesManager_API if (empty($timestamp)) $timestamp = time(); $time = Date::factory((int)$timestamp)->getDatetime(); - $result = Piwik_FetchAll(" + $result = Db::fetchAll(" SELECT idsite FROM @@ -321,7 +324,7 @@ class Piwik_SitesManager_API // but during scheduled task execution, we sometimes want to restrict sites to // a different login than the superuser. && (Piwik::isUserIsSuperUserOrTheUser($_restrictSitesToLogin) - || Piwik_TaskScheduler::isTaskBeingExecuted()) + || TaskScheduler::isTaskBeingExecuted()) ) { $accessRaw = Access::getInstance()->getRawSitesWithSomeViewAccess($_restrictSitesToLogin); $sitesId = array(); @@ -681,12 +684,12 @@ class Piwik_SitesManager_API */ public function getIpsForRange($ipRange) { - $range = Piwik_IP::getIpsForRange($ipRange); + $range = IP::getIpsForRange($ipRange); if ($range === false) { return false; } - return array(Piwik_IP::N2P($range[0]), Piwik_IP::N2P($range[1])); + return array(IP::N2P($range[0]), IP::N2P($range[1])); } /** @@ -1164,7 +1167,7 @@ class Piwik_SitesManager_API public function getUniqueSiteTimezones() { Piwik::checkUserIsSuperUser(); - $results = Piwik_FetchAll("SELECT distinct timezone FROM " . Common::prefixTable('site')); + $results = Db::fetchAll("SELECT distinct timezone FROM " . Common::prefixTable('site')); $timezones = array(); foreach ($results as $result) { $timezones[] = $result['timezone']; @@ -1237,7 +1240,7 @@ class Piwik_SitesManager_API */ private function isValidIp($ip) { - return Piwik_IP::getIpsForRange($ip) !== false; + return IP::getIpsForRange($ip) !== false; } /** diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php index afbd9d21ed..3a8f339693 100644 --- a/plugins/SitesManager/Controller.php +++ b/plugins/SitesManager/Controller.php @@ -8,24 +8,29 @@ * @category Piwik_Plugins * @package Piwik_SitesManager */ +use Piwik\API\ResponseBuilder; +use Piwik\Controller\Admin; use Piwik\DataTable\Renderer\Json; use Piwik\Piwik; use Piwik\Common; use Piwik\Date; +use Piwik\IP; +use Piwik\View; +use Piwik\Url; use Piwik\Site; /** * * @package Piwik_SitesManager */ -class Piwik_SitesManager_Controller extends Piwik_Controller_Admin +class Piwik_SitesManager_Controller extends Admin { /** * Main view showing listing of websites and settings */ public function index() { - $view = new Piwik_View('@SitesManager/index'); + $view = new View('@SitesManager/index'); if (Piwik::isUserIsSuperUser()) { $sites = Piwik_SitesManager_API::getInstance()->getAllSites(); @@ -70,7 +75,7 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin $view->globalKeepURLFragments = Piwik_SitesManager_API::getInstance()->getKeepURLFragmentsGlobal(); - $view->currentIpAddress = Piwik_IP::getIpFromHeader(); + $view->currentIpAddress = IP::getIpFromHeader(); $view->showAddSite = (boolean)Common::getRequestVar('showaddsite', false); @@ -83,7 +88,7 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin */ public function setGlobalSettings() { - $response = new Piwik_API_ResponseBuilder(Common::getRequestVar('format')); + $response = new ResponseBuilder(Common::getRequestVar('format')); try { $this->checkTokenInUrl(); @@ -122,8 +127,8 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin { $idSite = Common::getRequestVar('idSite'); Piwik::checkUserHasViewAccess($idSite); - $jsTag = Piwik::getJavascriptCode($idSite, Piwik_Url::getCurrentUrlWithoutFileName()); - $view = new Piwik_View('@SitesManager/displayJavascriptCode'); + $jsTag = Piwik::getJavascriptCode($idSite, Url::getCurrentUrlWithoutFileName()); + $view = new View('@SitesManager/displayJavascriptCode'); $this->setBasicVariablesView($view); $view->idSite = $idSite; $site = new Site($idSite); @@ -149,7 +154,7 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin */ function displayAlternativeTagsHelp() { - $view = new Piwik_View('@SitesManager/displayAlternativeTagsHelp'); + $view = new View('@SitesManager/displayAlternativeTagsHelp'); $view->idSite = Common::getRequestVar('idSite'); $url = Common::getRequestVar('piwikUrl', '', 'string'); if (empty($url) diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php index ac04dac368..4b4e034750 100644 --- a/plugins/Transitions/API.php +++ b/plugins/Transitions/API.php @@ -19,6 +19,8 @@ use Piwik\Period\Day; use Piwik\Piwik; use Piwik\Common; use Piwik\DataTable; +use Piwik\DataArray; +use Piwik\RankingQuery; use Piwik\Segment; use Piwik\SegmentExpression; use Piwik\Site; @@ -286,7 +288,7 @@ class Piwik_Transitions_API $types[Piwik_Tracker_Action::TYPE_OUTLINK] = 'outlinks'; $types[Piwik_Tracker_Action::TYPE_DOWNLOAD] = 'downloads'; - $rankingQuery = new Piwik_RankingQuery($limitBeforeGrouping ? $limitBeforeGrouping : $this->limitBeforeGrouping); + $rankingQuery = new RankingQuery($limitBeforeGrouping ? $limitBeforeGrouping : $this->limitBeforeGrouping); $rankingQuery->addLabelColumn(array('name', 'url_prefix')); $rankingQuery->partitionResultIntoMultipleGroups('type', array_keys($types)); @@ -343,7 +345,7 @@ class Piwik_Transitions_API */ public function queryExternalReferrers($idaction, $actionType, $logAggregator, $limitBeforeGrouping = false) { - $rankingQuery = new Piwik_RankingQuery($limitBeforeGrouping ? $limitBeforeGrouping : $this->limitBeforeGrouping); + $rankingQuery = new RankingQuery($limitBeforeGrouping ? $limitBeforeGrouping : $this->limitBeforeGrouping); // we generate a single column that contains the interesting data for each referrer. // the reason we cannot group by referer_* becomes clear when we look at search engine keywords. @@ -401,7 +403,7 @@ class Piwik_Transitions_API } //FIXMEA refactor after integration tests written - $array = new Piwik_DataArray($referrerData, $referrerSubData); + $array = new DataArray($referrerData, $referrerSubData); return Day::getDataTableFromDataArray($array); } @@ -416,7 +418,7 @@ class Piwik_Transitions_API */ protected function queryInternalReferrers($idaction, $actionType, $logAggregator, $limitBeforeGrouping = false) { - $rankingQuery = new Piwik_RankingQuery($limitBeforeGrouping ? $limitBeforeGrouping : $this->limitBeforeGrouping); + $rankingQuery = new RankingQuery($limitBeforeGrouping ? $limitBeforeGrouping : $this->limitBeforeGrouping); $rankingQuery->addLabelColumn(array('name', 'url_prefix')); $rankingQuery->setColumnToMarkExcludedRows('is_self'); $rankingQuery->partitionResultIntoMultipleGroups('action_partition', array(0, 1, 2)); @@ -588,7 +590,7 @@ class Piwik_Transitions_API } } - // if there's no data for referrers, Piwik_API_ResponseBuilder::handleMultiDimensionalArray + // if there's no data for referrers, ResponseBuilder::handleMultiDimensionalArray // does not detect the multi dimensional array and the data is rendered differently, which // causes an exception. if (count($report['referrers']) == 0) { diff --git a/plugins/Transitions/Controller.php b/plugins/Transitions/Controller.php index 01b72bb7ff..5178b1923f 100644 --- a/plugins/Transitions/Controller.php +++ b/plugins/Transitions/Controller.php @@ -8,11 +8,13 @@ * @category Piwik_Plugins * @package Piwik_Transitions */ +use Piwik\Controller; +use Piwik\View; /** * @package Piwik_Transitions */ -class Piwik_Transitions_Controller extends Piwik_Controller +class Piwik_Transitions_Controller extends Controller { /** @@ -74,7 +76,7 @@ class Piwik_Transitions_Controller extends Piwik_Controller */ public function renderPopover() { - $view = new Piwik_View('@Transitions/renderPopover'); + $view = new View('@Transitions/renderPopover'); $view->translations = $this->getTranslations(); echo $view->render(); } diff --git a/plugins/Transitions/javascripts/transitions.js b/plugins/Transitions/javascripts/transitions.js index 14ccd28a19..6f0a633bec 100644 --- a/plugins/Transitions/javascripts/transitions.js +++ b/plugins/Transitions/javascripts/transitions.js @@ -47,7 +47,7 @@ DataTable_RowActions_Transitions.prototype.trigger = function (tr, e, subTableLa }; DataTable_RowAction.prototype.performAction = function (label, tr, e) { - var separator = ' > '; // Piwik_API_DataTableManipulator_LabelFilter::SEPARATOR_RECURSIVE_LABEL + var separator = ' > '; // LabelFilter::SEPARATOR_RECURSIVE_LABEL var labelParts = label.split(separator); for (var i = 0; i < labelParts.length; i++) { labelParts[i] = $.trim(decodeURIComponent(labelParts[i])); diff --git a/plugins/UserCountry/Archiver.php b/plugins/UserCountry/Archiver.php index 129da79557..4544f2b764 100644 --- a/plugins/UserCountry/Archiver.php +++ b/plugins/UserCountry/Archiver.php @@ -12,6 +12,7 @@ use Piwik\ArchiveProcessor\Day; use Piwik\Metrics; use Piwik\DataTable; +use Piwik\DataArray; use Piwik\PluginsArchiver; class Piwik_UserCountry_Archiver extends PluginsArchiver @@ -44,7 +45,7 @@ class Piwik_UserCountry_Archiver extends PluginsArchiver public function archiveDay() { foreach($this->dimensions as $dimension) { - $this->arrays[$dimension] = new Piwik_DataArray(); + $this->arrays[$dimension] = new DataArray(); } $this->aggregateFromVisits(); $this->aggregateFromConversions(); @@ -64,7 +65,7 @@ class Piwik_UserCountry_Archiver extends PluginsArchiver $this->makeRegionCityLabelsUnique($row); $this->rememberCityLatLong($row); - /* @var $dataArray Piwik_DataArray */ + /* @var $dataArray DataArray */ foreach ($this->arrays as $dimension => $dataArray) { $dataArray->sumMetricsVisits($row[$dimension], $row); } @@ -113,13 +114,13 @@ class Piwik_UserCountry_Archiver extends PluginsArchiver while ($row = $query->fetch()) { $this->makeRegionCityLabelsUnique($row); - /* @var $dataArray Piwik_DataArray */ + /* @var $dataArray DataArray */ foreach ($this->arrays as $dimension => $dataArray) { $dataArray->sumMetricsGoals($row[$dimension], $row); } } - /* @var $dataArray Piwik_DataArray */ + /* @var $dataArray DataArray */ foreach ($this->arrays as $dataArray) { $dataArray->enrichMetricsWithConversions(); } diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php index 9c547ee6dc..1fcd911832 100644 --- a/plugins/UserCountry/Controller.php +++ b/plugins/UserCountry/Controller.php @@ -8,19 +8,25 @@ * @category Piwik_Plugins * @package Piwik_UserCountry */ +use Piwik\Controller\Admin; use Piwik\DataTable\Renderer\Json; use Piwik\Piwik; use Piwik\Common; +use Piwik\Http; +use Piwik\IP; +use Piwik\ViewDataTable; +use Piwik\View; +use Piwik\Url; /** * * @package Piwik_UserCountry */ -class Piwik_UserCountry_Controller extends Piwik_Controller_Admin +class Piwik_UserCountry_Controller extends Admin { function index() { - $view = new Piwik_View('@UserCountry/index'); + $view = new View('@UserCountry/index'); $view->urlSparklineCountries = $this->getUrlSparkline('getLastDistinctCountriesGraph'); $view->numberDistinctCountries = $this->getNumberOfDistinctCountries(true); @@ -36,13 +42,13 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin function adminIndex() { Piwik::checkUserIsSuperUser(); - $view = new Piwik_View('@UserCountry/adminIndex'); + $view = new View('@UserCountry/adminIndex'); $allProviderInfo = Piwik_UserCountry_LocationProvider::getAllProviderInfo( $newline = '<br/>', $includeExtra = true); $view->locationProviders = $allProviderInfo; $view->currentProviderId = Piwik_UserCountry_LocationProvider::getCurrentProviderId(); - $view->thisIP = Piwik_IP::getIpFromHeader(); + $view->thisIP = IP::getIpFromHeader(); $geoIPDatabasesInstalled = Piwik_UserCountry_LocationProvider_GeoIp::isDatabaseInstalled(); $view->geoIPDatabasesInstalled = $geoIPDatabasesInstalled; @@ -72,7 +78,7 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin $this->setUpdaterManageVars($view); $this->setBasicVariablesView($view); - Piwik_Controller_Admin::setBasicVariablesAdminView($view); + Admin::setBasicVariablesAdminView($view); echo $view->render(); } @@ -102,7 +108,7 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin Json::sendHeaderJSON(); $outputPath = Piwik_UserCountry_LocationProvider_GeoIp::getPathForGeoIpDatabase('GeoIPCity.dat') . '.gz'; try { - $result = Piwik_Http::downloadChunk( + $result = Http::downloadChunk( $url = Piwik_UserCountry_LocationProvider_GeoIp::GEO_LITE_URL, $outputPath, $continue = Common::getRequestVar('continue', true, 'int') @@ -136,7 +142,7 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin */ private function getGeoIpUpdaterManageScreen() { - $view = new Piwik_View('@UserCountry/getGeoIpUpdaterManageScreen'); + $view = new View('@UserCountry/getGeoIpUpdaterManageScreen'); $view->geoIPDatabasesInstalled = true; $this->setUpdaterManageVars($view); return $view->render(); @@ -145,7 +151,7 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin /** * Sets some variables needed by the _updaterManage.twig template. * - * @param Piwik_View $view + * @param View $view */ private function setUpdaterManageVars($view) { @@ -242,7 +248,7 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin $outputPath = Piwik_UserCountry_LocationProvider_GeoIp::getPathForGeoIpDatabase($filename); // download part of the file - $result = Piwik_Http::downloadChunk( + $result = Http::downloadChunk( $url, $outputPath, Common::getRequestVar('continue', true, 'int')); // if the file is done @@ -304,7 +310,7 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin throw new Exception("Invalid provider ID: '$providerId'."); } - $location = $provider->getLocation(array('ip' => Piwik_IP::getIpFromHeader(), + $location = $provider->getLocation(array('ip' => IP::getIpFromHeader(), 'lang' => Common::getBrowserLanguage(), 'disable_fallbacks' => true)); $location = Piwik_UserCountry_LocationProvider::prettyFormatLocation( @@ -380,7 +386,7 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin $APItoCall, $defaultDatatableType = null) { - $view = Piwik_ViewDataTable::factory($defaultDatatableType); + $view = ViewDataTable::factory($defaultDatatableType); $view->init($this->pluginName, $currentControllerAction, $APItoCall); $view->disableExcludeLowPopulation(); @@ -427,7 +433,7 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin if (!$this->isGeoIPWorking()) { $params = array('module' => 'UserCountry', 'action' => 'adminIndex'); $footerMessage .= ' ' . Piwik_Translate('UserCountry_NoDataForGeoIPReport2', array( - '<a target="_blank" href="' . Piwik_Url::getCurrentQueryStringWithParametersModified($params) . '">', + '<a target="_blank" href="' . Url::getCurrentQueryStringWithParametersModified($params) . '">', '</a>', '<a target="_blank" href="http://dev.maxmind.com/geoip/geolite?rId=piwik">', '</a>' diff --git a/plugins/UserCountry/GeoIPAutoUpdater.php b/plugins/UserCountry/GeoIPAutoUpdater.php index dea98daa0f..d981e47b6d 100755 --- a/plugins/UserCountry/GeoIPAutoUpdater.php +++ b/plugins/UserCountry/GeoIPAutoUpdater.php @@ -11,6 +11,9 @@ use Piwik\Piwik; use Piwik\Common; use Piwik\Date; +use Piwik\Http; +use Piwik\Unzip; +use Piwik\ScheduledTask; /** * Used to automatically update installed GeoIP databases, and manages the updater's @@ -96,7 +99,7 @@ class Piwik_UserCountry_GeoIPAutoUpdater // download zipped file to misc dir try { - $success = Piwik_Http::sendHttpRequest($url, $timeout = 3600, $userAgent = null, $zippedOutputPath); + $success = Http::sendHttpRequest($url, $timeout = 3600, $userAgent = null, $zippedOutputPath); } catch (Exception $ex) { throw new Exception("Piwik_UserCountry_GeoIPAutoUpdater: failed to download '$url' to " . "'$zippedOutputPath': " . $ex->getMessage()); @@ -138,7 +141,7 @@ class Piwik_UserCountry_GeoIPAutoUpdater // extract file if (substr($path, -7, 7) == '.tar.gz') { // find the .dat file in the tar archive - $unzip = Piwik_Unzip::factory('tar.gz', $path); + $unzip = Unzip::factory('tar.gz', $path); $content = $unzip->listContent(); if (empty($content)) { @@ -172,7 +175,7 @@ class Piwik_UserCountry_GeoIPAutoUpdater fwrite($fd, $unzipped); fclose($fd); } else if (substr($path, -3, 3) == '.gz') { - $unzip = Piwik_Unzip::factory('gz', $path); + $unzip = Unzip::factory('gz', $path); $success = $unzip->extract($outputPath); if ($success !== true) { @@ -242,7 +245,7 @@ class Piwik_UserCountry_GeoIPAutoUpdater /** * Creates a ScheduledTask instance based on set option values. * - * @return Piwik_ScheduledTask + * @return ScheduledTask */ public static function makeScheduledTask() { @@ -264,7 +267,7 @@ class Piwik_UserCountry_GeoIPAutoUpdater break; } - return new Piwik_ScheduledTask($instance, 'update', null, $schedulePeriod, Piwik_ScheduledTask::LOWEST_PRIORITY); + return new ScheduledTask($instance, 'update', null, $schedulePeriod, ScheduledTask::LOWEST_PRIORITY); } /** diff --git a/plugins/UserCountry/LocationProvider.php b/plugins/UserCountry/LocationProvider.php index 153247a252..5fb24a4dd2 100755 --- a/plugins/UserCountry/LocationProvider.php +++ b/plugins/UserCountry/LocationProvider.php @@ -9,6 +9,7 @@ * @package Piwik_UserCountry */ use Piwik\Common; +use Piwik\IP; /** * @see plugins/UserCountry/LocationProvider/Default.php @@ -179,7 +180,7 @@ abstract class Piwik_UserCountry_LocationProvider * 'status' - Either self::NOT_INSTALLED, self::INSTALLED or self::BROKEN. * 'statusMessage' - If the status is self::BROKEN, then the message describes why. * 'location' - A pretty formatted location of the current IP address - * (Piwik_IP::getIpFromHeader()). + * (IP::getIpFromHeader()). * * An example result: * array( @@ -216,7 +217,7 @@ abstract class Piwik_UserCountry_LocationProvider $workingOrError = $provider->isWorking(); if ($workingOrError === true) // if the implementation is configured correctly, get the location { - $locInfo = array('ip' => Piwik_IP::getIpFromHeader(), + $locInfo = array('ip' => IP::getIpFromHeader(), 'lang' => Common::getBrowserLanguage(), 'disable_fallbacks' => true); @@ -439,9 +440,9 @@ abstract class Piwik_UserCountry_LocationProvider protected function getIpFromInfo($info) { $ip = $info['ip']; - if (Piwik_IP::isMappedIPv4($ip)) { - return Piwik_IP::getIPv4FromMappedIPv6($ip); - } else if (Piwik_IP::isIPv6($ip)) // IPv6 is not supported (yet) + if (IP::isMappedIPv4($ip)) { + return IP::getIPv4FromMappedIPv6($ip); + } else if (IP::isIPv6($ip)) // IPv6 is not supported (yet) { return false; } else { diff --git a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php index 382ee9a319..ab3942974f 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php @@ -10,6 +10,7 @@ */ use Piwik\Common; +use Piwik\IP; /** * A LocationProvider that uses an GeoIP module installed in an HTTP Server. @@ -66,7 +67,7 @@ class Piwik_UserCountry_LocationProvider_GeoIp_ServerBased extends Piwik_UserCou // geoip modules that are built into servers can't use a forced IP. in this case we try // to fallback to another version. - $myIP = Piwik_IP::getIpFromHeader(); + $myIP = IP::getIpFromHeader(); if (!self::isSameOrAnonymizedIp($ip, $myIP) && (!isset($info['disable_fallbacks']) || !$info['disable_fallbacks']) diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php index 72c7cbda9b..008345a785 100644 --- a/plugins/UserCountry/UserCountry.php +++ b/plugins/UserCountry/UserCountry.php @@ -98,10 +98,10 @@ class Piwik_UserCountry extends Plugin $widgetCityLabel = Piwik_Translate('UserCountry_WidgetLocation') . ' (' . Piwik_Translate('UserCountry_City') . ')'; - Piwik_AddWidget('General_Visitors', $widgetContinentLabel, 'UserCountry', 'getContinent'); - Piwik_AddWidget('General_Visitors', $widgetCountryLabel, 'UserCountry', 'getCountry'); - Piwik_AddWidget('General_Visitors', $widgetRegionLabel, 'UserCountry', 'getRegion'); - Piwik_AddWidget('General_Visitors', $widgetCityLabel, 'UserCountry', 'getCity'); + WidgetsList::add('General_Visitors', $widgetContinentLabel, 'UserCountry', 'getContinent'); + WidgetsList::add('General_Visitors', $widgetCountryLabel, 'UserCountry', 'getCountry'); + WidgetsList::add('General_Visitors', $widgetRegionLabel, 'UserCountry', 'getRegion'); + WidgetsList::add('General_Visitors', $widgetCityLabel, 'UserCountry', 'getCity'); } function addMenu() diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php index f9f52e8233..a70e3a83d7 100644 --- a/plugins/UserCountryMap/Controller.php +++ b/plugins/UserCountryMap/Controller.php @@ -8,8 +8,12 @@ * @category Piwik_Plugins * @package Piwik_UserCountryMap */ +use Piwik\API\Request; use Piwik\Piwik; use Piwik\Common; +use Piwik\Controller; +use Piwik\ViewDataTable; +use Piwik\View; use Piwik\Site; use Piwik\Config; @@ -17,7 +21,7 @@ use Piwik\Config; * * @package Piwik_UserCountryMap */ -class Piwik_UserCountryMap_Controller extends Piwik_Controller +class Piwik_UserCountryMap_Controller extends Controller { // By default plot up to the last 30 days of visitors on the map, for low traffic sites @@ -34,10 +38,10 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller $date = Common::getRequestVar('date'); $token_auth = Piwik::getCurrentUserTokenAuth(); - $view = new Piwik_View('@UserCountryMap/visitorMap'); + $view = new View('@UserCountryMap/visitorMap'); // request visits summary - $request = new Piwik_API_Request( + $request = new Request( 'method=VisitsSummary.get&format=PHP' . '&idSite=' . $idSite . '&period=' . $period @@ -107,7 +111,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller Piwik::checkUserHasViewAccess($idSite); $token_auth = Piwik::getCurrentUserTokenAuth(); - $view = new Piwik_View('@UserCountryMap/realtimeMap'); + $view = new View('@UserCountryMap/realtimeMap'); $view->mapIsStandaloneNotWidget = $standalone; @@ -153,7 +157,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller { $params['format'] = 'json'; $params['showRawMetrics'] = 1; - $segment = Piwik_ViewDataTable::getRawSegmentFromRequest(); + $segment = ViewDataTable::getRawSegmentFromRequest(); if(!empty($segment)) { $params['segment'] = $segment; } @@ -171,7 +175,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller private function getMetrics($idSite, $period, $date, $token_auth) { - $request = new Piwik_API_Request( + $request = new Request( 'method=API.getMetadata&format=PHP' . '&apiModule=UserCountry&apiAction=getCountry' . '&idSite=' . $idSite @@ -203,7 +207,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller . "&period=" . $period . "&date=" . $date . "&token_auth=" . $token_auth - . "&segment=" . Piwik_ViewDataTable::getRawSegmentFromRequest() + . "&segment=" . ViewDataTable::getRawSegmentFromRequest() . "&enable_filter_excludelowpop=1" . "&showRawMetrics=1"; diff --git a/plugins/UserCountryMap/UserCountryMap.php b/plugins/UserCountryMap/UserCountryMap.php index 1659288d1c..ac9255a303 100644 --- a/plugins/UserCountryMap/UserCountryMap.php +++ b/plugins/UserCountryMap/UserCountryMap.php @@ -8,6 +8,8 @@ * @category Piwik_Plugins * @package Piwik_UserCountryMap */ +use Piwik\FrontController; +use Piwik\Version; use Piwik\Plugin; /** @@ -26,14 +28,14 @@ class Piwik_UserCountryMap extends Plugin 'description' => 'This plugin provides the widgets Visitor Map and Real-time Map. Note: Requires the UserCountry plugin enabled.', 'author' => 'Piwik', 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION + 'version' => Version::VERSION ); } public function postLoad() { - Piwik_AddWidget('General_Visitors', Piwik_Translate('UserCountryMap_VisitorMap'), 'UserCountryMap', 'visitorMap'); - Piwik_AddWidget('Live!', Piwik_Translate('UserCountryMap_RealTimeMap'), 'UserCountryMap', 'realtimeMap'); + WidgetsList::add('General_Visitors', Piwik_Translate('UserCountryMap_VisitorMap'), 'UserCountryMap', 'visitorMap'); + WidgetsList::add('Live!', Piwik_Translate('UserCountryMap_RealTimeMap'), 'UserCountryMap', 'realtimeMap'); Piwik_AddAction('template_leftColumnUserCountry', array('Piwik_UserCountryMap', 'insertMapInLocationReport')); } @@ -41,7 +43,7 @@ class Piwik_UserCountryMap extends Plugin static public function insertMapInLocationReport(&$out) { $out = '<h2>' . Piwik_Translate('UserCountryMap_VisitorMap') . '</h2>'; - $out .= Piwik_FrontController::getInstance()->fetchDispatch('UserCountryMap', 'visitorMap'); + $out .= FrontController::getInstance()->fetchDispatch('UserCountryMap', 'visitorMap'); } /** diff --git a/plugins/UserSettings/Archiver.php b/plugins/UserSettings/Archiver.php index 40f6b94eb3..cdfa858d6e 100644 --- a/plugins/UserSettings/Archiver.php +++ b/plugins/UserSettings/Archiver.php @@ -13,6 +13,7 @@ use Piwik\Common; use Piwik\DataAccess\LogAggregator; use Piwik\Metrics; use Piwik\DataTable; +use Piwik\DataArray; use Piwik\PluginsArchiver; require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php'; @@ -125,7 +126,7 @@ class Piwik_UserSettings_Archiver extends PluginsArchiver { $query = $this->getLogAggregator()->queryVisitsByDimension( array("label" => self::LANGUAGE_DIMENSION) ); $languageCodes = array_keys(Common::getLanguagesList()); - $metricsByLanguage = new Piwik_DataArray(); + $metricsByLanguage = new DataArray(); while ($row = $query->fetch()) { $code = Common::extractLanguageCodeFromBrowserLanguage($row['label'], $languageCodes); $metricsByLanguage->sumMetricsVisits($code, $row); diff --git a/plugins/UserSettings/Controller.php b/plugins/UserSettings/Controller.php index 515eacf118..086cd020e7 100644 --- a/plugins/UserSettings/Controller.php +++ b/plugins/UserSettings/Controller.php @@ -8,16 +8,19 @@ * @category Piwik_Plugins * @package Piwik_UserSettings */ +use Piwik\Controller; +use Piwik\ViewDataTable; +use Piwik\View; /** * * @package Piwik_UserSettings */ -class Piwik_UserSettings_Controller extends Piwik_Controller +class Piwik_UserSettings_Controller extends Controller { public function index() { - $view = new Piwik_View('@UserSettings/index'); + $view = new View('@UserSettings/index'); $view->dataTablePlugin = $this->getPlugin(true); $view->dataTableResolution = $this->getResolution(true); @@ -33,56 +36,56 @@ class Piwik_UserSettings_Controller extends Piwik_Controller public function getResolution($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getConfiguration($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getOS($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getOSFamily($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getMobileVsDesktop($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getBrowserVersion($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getBrowser($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getBrowserType($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getWideScreen($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getPlugin($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getLanguage($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } } diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php index ce5a37f707..618f8fdfd9 100644 --- a/plugins/UserSettings/UserSettings.php +++ b/plugins/UserSettings/UserSettings.php @@ -355,7 +355,7 @@ class Piwik_UserSettings extends Plugin foreach ($this->reportMetadata as $report) { list($category, $name, $controllerName, $controllerAction) = $report; if ($category == false) continue; - Piwik_AddWidget($category, $name, $controllerName, $controllerAction); + WidgetsList::add($category, $name, $controllerName, $controllerAction); } } diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php index c4c8dc0806..0eeda5be60 100644 --- a/plugins/UsersManager/API.php +++ b/plugins/UsersManager/API.php @@ -485,7 +485,7 @@ class Piwik_UsersManager_API */ public function userExists($userLogin) { - $count = Piwik_FetchOne("SELECT count(*) + $count = Db::fetchOne("SELECT count(*) FROM " . Common::prefixTable("user") . " WHERE login = ?", $userLogin); return $count != 0; @@ -500,7 +500,7 @@ class Piwik_UsersManager_API public function userEmailExists($userEmail) { Piwik::checkUserIsNotAnonymous(); - $count = Piwik_FetchOne("SELECT count(*) + $count = Db::fetchOne("SELECT count(*) FROM " . Common::prefixTable("user") . " WHERE email = ?", $userEmail); return $count != 0 diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php index 506c6e6acc..9bc778c6ff 100644 --- a/plugins/UsersManager/Controller.php +++ b/plugins/UsersManager/Controller.php @@ -8,16 +8,20 @@ * @category Piwik_Plugins * @package Piwik_UsersManager */ +use Piwik\API\ResponseBuilder; +use Piwik\Controller\Admin; use Piwik\Piwik; use Piwik\Common; use Piwik\Config; +use Piwik\View; +use Piwik\Url; use Piwik\Site; /** * * @package Piwik_UsersManager */ -class Piwik_UsersManager_Controller extends Piwik_Controller_Admin +class Piwik_UsersManager_Controller extends Admin { static function orderByName($a, $b) { @@ -31,7 +35,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin { Piwik::checkUserIsNotAnonymous(); - $view = new Piwik_View('@UsersManager/index'); + $view = new View('@UsersManager/index'); $IdSitesAdmin = Piwik_SitesManager_API::getInstance()->getSitesIdWithAdminAccess(); $idSiteSelected = 1; @@ -123,7 +127,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin { Piwik::checkUserIsNotAnonymous(); - $view = new Piwik_View('@UsersManager/userSettings'); + $view = new View('@UsersManager/userSettings'); $userLogin = Piwik::getCurrentUserLogin(); if (Piwik::isUserIsSuperUser()) { @@ -164,7 +168,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin $view->ignoreCookieSet = Piwik_Tracker_IgnoreCookie::isIgnoreCookieFound(); $this->initViewAnonymousUserSettings($view); - $view->piwikHost = Piwik_Url::getCurrentHost(); + $view->piwikHost = Url::getCurrentHost(); $this->setBasicVariablesView($view); echo $view->render(); } @@ -181,7 +185,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin /** * The Super User can modify Anonymous user settings - * @param Piwik_View $view + * @param View $view */ protected function initViewAnonymousUserSettings($view) { @@ -226,7 +230,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin */ public function recordAnonymousUserSettings() { - $response = new Piwik_API_ResponseBuilder(Common::getRequestVar('format')); + $response = new ResponseBuilder(Common::getRequestVar('format')); try { Piwik::checkUserIsSuperUser(); $this->checkTokenInUrl(); @@ -253,7 +257,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin */ public function recordUserSettings() { - $response = new Piwik_API_ResponseBuilder(Common::getRequestVar('format')); + $response = new ResponseBuilder(Common::getRequestVar('format')); try { $this->checkTokenInUrl(); @@ -275,7 +279,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin } // UI disables password change on invalid host, but check here anyway - if (!Piwik_Url::isValidHost() + if (!Url::isValidHost() && $newPassword !== false ) { throw new Exception("Cannot change password with untrusted hostname!"); diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php index 8d2aeb7a57..3c3b0a761a 100644 --- a/plugins/UsersManager/UsersManager.php +++ b/plugins/UsersManager/UsersManager.php @@ -9,6 +9,7 @@ * @package Piwik_UsersManager */ use Piwik\Piwik; +use Piwik\Piwik_Option; use Piwik\Plugin; /** diff --git a/plugins/VisitFrequency/API.php b/plugins/VisitFrequency/API.php index 08d37c30b2..7e77d561ec 100644 --- a/plugins/VisitFrequency/API.php +++ b/plugins/VisitFrequency/API.php @@ -8,6 +8,7 @@ * @category Piwik_Plugins * @package Piwik_VisitFrequency */ +use Piwik\API\Request; use Piwik\Piwik; use Piwik\SegmentExpression; @@ -43,7 +44,7 @@ class Piwik_VisitFrequency_API 'format' => 'original', 'serialize' => 0 // tests set this to 1 ); - $table = Piwik_API_Request::processRequest('VisitsSummary.get', $params); + $table = Request::processRequest('VisitsSummary.get', $params); $this->prefixColumns($table, $period); return $table; } diff --git a/plugins/VisitFrequency/Controller.php b/plugins/VisitFrequency/Controller.php index c9362959cc..77baa6b539 100644 --- a/plugins/VisitFrequency/Controller.php +++ b/plugins/VisitFrequency/Controller.php @@ -8,18 +8,21 @@ * @category Piwik_Plugins * @package Piwik_VisitFrequency */ +use Piwik\API\Request; use Piwik\Piwik; use Piwik\Common; +use Piwik\Controller; +use Piwik\View; /** * * @package Piwik_VisitFrequency */ -class Piwik_VisitFrequency_Controller extends Piwik_Controller +class Piwik_VisitFrequency_Controller extends Controller { function index() { - $view = new Piwik_View('@VisitFrequency/index'); + $view = new View('@VisitFrequency/index'); $view->graphEvolutionVisitFrequency = $this->getEvolutionGraph(true, array('nb_visits_returning')); $this->setSparklinesAndNumbers($view); echo $view->render(); @@ -27,7 +30,7 @@ class Piwik_VisitFrequency_Controller extends Piwik_Controller public function getSparklines() { - $view = new Piwik_View('@VisitFrequency/getSparklines'); + $view = new View('@VisitFrequency/getSparklines'); $this->setSparklinesAndNumbers($view); echo $view->render(); } @@ -99,7 +102,7 @@ class Piwik_VisitFrequency_Controller extends Piwik_Controller protected function getSummary() { $requestString = "method=VisitFrequency.get&format=original"; - $request = new Piwik_API_Request($requestString); + $request = new Request($requestString); return $request->process(); } } diff --git a/plugins/VisitFrequency/VisitFrequency.php b/plugins/VisitFrequency/VisitFrequency.php index ee5c0ecd2a..95586de73e 100644 --- a/plugins/VisitFrequency/VisitFrequency.php +++ b/plugins/VisitFrequency/VisitFrequency.php @@ -56,8 +56,8 @@ class Piwik_VisitFrequency extends Plugin function addWidgets() { - Piwik_AddWidget('General_Visitors', 'VisitFrequency_WidgetOverview', 'VisitFrequency', 'getSparklines'); - Piwik_AddWidget('General_Visitors', 'VisitFrequency_WidgetGraphReturning', 'VisitFrequency', 'getEvolutionGraph', array('columns' => array('nb_visits_returning'))); + WidgetsList::add('General_Visitors', 'VisitFrequency_WidgetOverview', 'VisitFrequency', 'getSparklines'); + WidgetsList::add('General_Visitors', 'VisitFrequency_WidgetGraphReturning', 'VisitFrequency', 'getEvolutionGraph', array('columns' => array('nb_visits_returning'))); } function addMenu() diff --git a/plugins/VisitTime/Archiver.php b/plugins/VisitTime/Archiver.php index fd6c1dcc8b..77b7659d9b 100644 --- a/plugins/VisitTime/Archiver.php +++ b/plugins/VisitTime/Archiver.php @@ -10,6 +10,7 @@ */ use Piwik\Date; +use Piwik\DataArray; use Piwik\PluginsArchiver; class Piwik_VisitTime_Archiver extends PluginsArchiver @@ -47,7 +48,7 @@ class Piwik_VisitTime_Archiver extends PluginsArchiver $this->getProcessor()->insertBlobRecord(self::LOCAL_TIME_RECORD_NAME, $this->getProcessor()->getDataTableFromDataArray($array)->getSerialized()); } - protected function convertTimeToLocalTimezone(Piwik_DataArray &$array) + protected function convertTimeToLocalTimezone(DataArray &$array) { $date = Date::factory($this->getProcessor()->getDateStart()->getDateStartUTC())->toString(); $timezone = $this->getProcessor()->getSite()->getTimezone(); @@ -58,16 +59,16 @@ class Piwik_VisitTime_Archiver extends PluginsArchiver $hourInTz = (int)Date::factory($datetime, $timezone)->toString('H'); $converted[$hourInTz] = $stats; } - return new Piwik_DataArray($converted); + return new DataArray($converted); } - private function ensureAllHoursAreSet( Piwik_DataArray &$array) + private function ensureAllHoursAreSet( DataArray &$array) { $data = $array->getDataArray(); for ($i = 0; $i <= 23; $i++) { if (empty($data[$i])) { - $array->sumMetricsVisits( $i, Piwik_DataArray::makeEmptyRow()); + $array->sumMetricsVisits( $i, DataArray::makeEmptyRow()); } } } diff --git a/plugins/VisitTime/Controller.php b/plugins/VisitTime/Controller.php index 600262625c..1cc2169741 100644 --- a/plugins/VisitTime/Controller.php +++ b/plugins/VisitTime/Controller.php @@ -8,16 +8,19 @@ * @category Piwik_Plugins * @package Piwik_VisitTime */ +use Piwik\Controller; +use Piwik\ViewDataTable; +use Piwik\View; /** * * @package Piwik_VisitTime */ -class Piwik_VisitTime_Controller extends Piwik_Controller +class Piwik_VisitTime_Controller extends Controller { public function index() { - $view = new Piwik_View('@VisitTime/index'); + $view = new View('@VisitTime/index'); $view->dataTableVisitInformationPerLocalTime = $this->getVisitInformationPerLocalTime(true); $view->dataTableVisitInformationPerServerTime = $this->getVisitInformationPerServerTime(true); echo $view->render(); @@ -25,16 +28,16 @@ class Piwik_VisitTime_Controller extends Piwik_Controller public function getVisitInformationPerServerTime($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getVisitInformationPerLocalTime($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } public function getByDayOfWeek($fetch = false) { - return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); + return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch); } } diff --git a/plugins/VisitTime/VisitTime.php b/plugins/VisitTime/VisitTime.php index 4d73dd8ae0..d654eeb947 100644 --- a/plugins/VisitTime/VisitTime.php +++ b/plugins/VisitTime/VisitTime.php @@ -76,9 +76,9 @@ class Piwik_VisitTime extends Plugin function addWidgets() { - Piwik_AddWidget('VisitsSummary_VisitsSummary', 'VisitTime_WidgetLocalTime', 'VisitTime', 'getVisitInformationPerLocalTime'); - Piwik_AddWidget('VisitsSummary_VisitsSummary', 'VisitTime_WidgetServerTime', 'VisitTime', 'getVisitInformationPerServerTime'); - Piwik_AddWidget('VisitsSummary_VisitsSummary', 'VisitTime_VisitsByDayOfWeek', 'VisitTime', 'getByDayOfWeek'); + WidgetsList::add('VisitsSummary_VisitsSummary', 'VisitTime_WidgetLocalTime', 'VisitTime', 'getVisitInformationPerLocalTime'); + WidgetsList::add('VisitsSummary_VisitsSummary', 'VisitTime_WidgetServerTime', 'VisitTime', 'getVisitInformationPerServerTime'); + WidgetsList::add('VisitsSummary_VisitsSummary', 'VisitTime_VisitsByDayOfWeek', 'VisitTime', 'getByDayOfWeek'); } function addMenu() diff --git a/plugins/VisitorGenerator/Controller.php b/plugins/VisitorGenerator/Controller.php index 1a4f9facd0..f0275b3348 100644 --- a/plugins/VisitorGenerator/Controller.php +++ b/plugins/VisitorGenerator/Controller.php @@ -9,16 +9,22 @@ * @package Piwik_VisitorGenerator */ use Piwik\ArchiveProcessor\Rules; +use Piwik\Controller\Admin; use Piwik\Piwik; use Piwik\Common; use Piwik\Date; +use Piwik\Http; +use Piwik\Nonce; +use Piwik\View; +use Piwik\Url; +use Piwik\Timer; use Piwik\Site; /** * * @package Piwik_VisitorGenerator */ -class Piwik_VisitorGenerator_Controller extends Piwik_Controller_Admin +class Piwik_VisitorGenerator_Controller extends Admin { public function index() { @@ -26,10 +32,10 @@ class Piwik_VisitorGenerator_Controller extends Piwik_Controller_Admin $sitesList = Piwik_SitesManager_API::getInstance()->getSitesWithAdminAccess(); - $view = new Piwik_View('@VisitorGenerator/index'); + $view = new View('@VisitorGenerator/index'); $this->setBasicVariablesView($view); $view->assign('sitesList', $sitesList); - $view->nonce = Piwik_Nonce::getNonce('Piwik_VisitorGenerator.generate'); + $view->nonce = Nonce::getNonce('Piwik_VisitorGenerator.generate'); $view->countActionsPerRun = count($this->getAccessLog()); $view->accessLogPath = $this->getAccessLogPath(); echo $view->render(); @@ -51,11 +57,11 @@ class Piwik_VisitorGenerator_Controller extends Piwik_Controller_Admin Piwik::checkUserIsSuperUser(); $nonce = Common::getRequestVar('form_nonce', '', 'string', $_POST); if (Common::getRequestVar('choice', 'no') != 'yes' || - !Piwik_Nonce::verifyNonce('Piwik_VisitorGenerator.generate', $nonce) + !Nonce::verifyNonce('Piwik_VisitorGenerator.generate', $nonce) ) { Piwik::redirectToModule('VisitorGenerator', 'index'); } - Piwik_Nonce::discardNonce('Piwik_VisitorGenerator.generate'); + Nonce::discardNonce('Piwik_VisitorGenerator.generate'); $daysToCompute = Common::getRequestVar('daysToCompute', 1, 'int'); @@ -65,7 +71,7 @@ class Piwik_VisitorGenerator_Controller extends Piwik_Controller_Admin Piwik::setMaxExecutionTime(0); - $timer = new Piwik_Timer; + $timer = new Timer; $time = time() - ($daysToCompute - 1) * 86400; $nbActionsTotal = 0; @@ -83,7 +89,7 @@ class Piwik_VisitorGenerator_Controller extends Piwik_Controller_Admin $browserArchiving = Rules::isBrowserTriggerEnabled(); // Init view - $view = new Piwik_View('@VisitorGenerator/generate'); + $view = new View('@VisitorGenerator/generate'); $this->setBasicVariablesView($view); $view->assign('browserArchivingEnabled', $browserArchiving); $view->assign('timer', $timer); @@ -114,7 +120,7 @@ class Piwik_VisitorGenerator_Controller extends Piwik_Controller_Admin "fr-ch", "fr", ); - $prefix = Piwik_Url::getCurrentUrlWithoutFileName() . "piwik.php"; + $prefix = Url::getCurrentUrlWithoutFileName() . "piwik.php"; $count = 0; foreach ($logs as $log) { if (!preg_match('/^(\S+) \S+ \S+ \[(.*?)\] "GET (\S+.*?)" \d+ \d+ "(.*?)" "(.*?)"/', $log, $m)) { @@ -150,7 +156,7 @@ class Piwik_VisitorGenerator_Controller extends Piwik_Controller_Admin $acceptLanguage = $acceptLanguages[$count % count($acceptLanguages)]; - if ($output = Piwik_Http::sendHttpRequest($url, $timeout = 5, $ua, $path = null, $follow = 0, $acceptLanguage)) { + if ($output = Http::sendHttpRequest($url, $timeout = 5, $ua, $path = null, $follow = 0, $acceptLanguage)) { $count++; } } diff --git a/plugins/VisitorInterest/Controller.php b/plugins/VisitorInterest/Controller.php index cecb7fd61c..b3a658f5c8 100644 --- a/plugins/VisitorInterest/Controller.php +++ b/plugins/VisitorInterest/Controller.php @@ -9,15 +9,18 @@ * @package Piwik_VisitorInterest */ use Piwik\Metrics; +use Piwik\Controller; +use Piwik\ViewDataTable; +use Piwik\View; /** * @package Piwik_VisitorInterest */ -class Piwik_VisitorInterest_Controller extends Piwik_Controller +class Piwik_VisitorInterest_Controller extends Controller { public function index() { - $view = new Piwik_View('@VisitorInterest/index'); + $view = new View('@VisitorInterest/index'); $view->dataTableNumberOfVisitsPerVisitDuration = $this->getNumberOfVisitsPerVisitDuration(true); $view->dataTableNumberOfVisitsPerPage = $this->getNumberOfVisitsPerPage(true); $view->dataTableNumberOfVisitsByVisitNum = $this->getNumberOfVisitsByVisitCount(true); @@ -27,7 +30,7 @@ class Piwik_VisitorInterest_Controller extends Piwik_Controller public function getNumberOfVisitsPerVisitDuration($fetch = false) { - $view = Piwik_ViewDataTable::factory('cloud'); + $view = ViewDataTable::factory('cloud'); $view->init($this->pluginName, __FUNCTION__, "VisitorInterest.getNumberOfVisitsPerVisitDuration"); $view->setColumnsToDisplay(array('label', 'nb_visits')); @@ -45,7 +48,7 @@ class Piwik_VisitorInterest_Controller extends Piwik_Controller public function getNumberOfVisitsPerPage($fetch = false) { - $view = Piwik_ViewDataTable::factory('cloud'); + $view = ViewDataTable::factory('cloud'); $view->init($this->pluginName, __FUNCTION__, "VisitorInterest.getNumberOfVisitsPerPage"); $view->setColumnsToDisplay(array('label', 'nb_visits')); $view->setSortedColumn('label', 'asc'); @@ -69,7 +72,7 @@ class Piwik_VisitorInterest_Controller extends Piwik_Controller */ public function getNumberOfVisitsByVisitCount($fetch = false) { - $view = Piwik_ViewDataTable::factory(); + $view = ViewDataTable::factory(); $view->init($this->pluginName, __FUNCTION__, "VisitorInterest.getNumberOfVisitsByVisitCount"); $view->setColumnsToDisplay(array('label', 'nb_visits', 'nb_visits_percentage')); $view->setSortedColumn('label', 'asc'); @@ -95,7 +98,7 @@ class Piwik_VisitorInterest_Controller extends Piwik_Controller */ public function getNumberOfVisitsByDaysSinceLast($fetch = false) { - $view = Piwik_ViewDataTable::factory(); + $view = ViewDataTable::factory(); $view->init($this->pluginName, __FUNCTION__, 'VisitorInterest.getNumberOfVisitsByDaysSinceLast'); $view->setColumnsToDisplay(array('label', 'nb_visits')); $view->setSortedColumn('label', 'asc'); diff --git a/plugins/VisitorInterest/VisitorInterest.php b/plugins/VisitorInterest/VisitorInterest.php index a503253e1c..12cc0b79c1 100644 --- a/plugins/VisitorInterest/VisitorInterest.php +++ b/plugins/VisitorInterest/VisitorInterest.php @@ -9,6 +9,7 @@ * @package Piwik_VisitorInterest */ use Piwik\ArchiveProcessor; +use Piwik\FrontController; use Piwik\Plugin; /** @@ -95,10 +96,10 @@ class Piwik_VisitorInterest extends Plugin function addWidgets() { - Piwik_AddWidget('General_Visitors', 'VisitorInterest_WidgetLengths', 'VisitorInterest', 'getNumberOfVisitsPerVisitDuration'); - Piwik_AddWidget('General_Visitors', 'VisitorInterest_WidgetPages', 'VisitorInterest', 'getNumberOfVisitsPerPage'); - Piwik_AddWidget('General_Visitors', 'VisitorInterest_visitsByVisitCount', 'VisitorInterest', 'getNumberOfVisitsByVisitCount'); - Piwik_AddWidget('General_Visitors', 'VisitorInterest_WidgetVisitsByDaysSinceLast', 'VisitorInterest', 'getNumberOfVisitsByDaysSinceLast'); + WidgetsList::add('General_Visitors', 'VisitorInterest_WidgetLengths', 'VisitorInterest', 'getNumberOfVisitsPerVisitDuration'); + WidgetsList::add('General_Visitors', 'VisitorInterest_WidgetPages', 'VisitorInterest', 'getNumberOfVisitsPerPage'); + WidgetsList::add('General_Visitors', 'VisitorInterest_visitsByVisitCount', 'VisitorInterest', 'getNumberOfVisitsByVisitCount'); + WidgetsList::add('General_Visitors', 'VisitorInterest_WidgetVisitsByDaysSinceLast', 'VisitorInterest', 'getNumberOfVisitsByDaysSinceLast'); } function addMenu() @@ -139,7 +140,7 @@ class Piwik_VisitorInterest extends Plugin $out = '</div> <div id="rightcolumn"> '; - $out .= Piwik_FrontController::getInstance()->fetchDispatch('VisitorInterest', 'index'); + $out .= FrontController::getInstance()->fetchDispatch('VisitorInterest', 'index'); $out .= '</div>'; } } diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php index bc30a1e6aa..fc32e77e9e 100644 --- a/plugins/VisitsSummary/Controller.php +++ b/plugins/VisitsSummary/Controller.php @@ -8,21 +8,25 @@ * @category Piwik_Plugins * @package Piwik_VisitsSummary */ +use Piwik\API\Request; use Piwik\DataTable\Row; use Piwik\Piwik; use Piwik\Common; use Piwik\DataTable; +use Piwik\Controller; +use Piwik\ViewDataTable; +use Piwik\View; use Piwik\Site; /** * * @package Piwik_VisitsSummary */ -class Piwik_VisitsSummary_Controller extends Piwik_Controller +class Piwik_VisitsSummary_Controller extends Controller { public function index() { - $view = new Piwik_View('@VisitsSummary/index'); + $view = new View('@VisitsSummary/index'); $this->setPeriodVariablesView($view); $view->graphEvolutionVisitsSummary = $this->getEvolutionGraph(true, array('nb_visits')); $this->setSparklinesAndNumbers($view); @@ -31,7 +35,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller public function getSparklines() { - $view = new Piwik_View('@VisitsSummary/getSparklines'); + $view = new View('@VisitsSummary/getSparklines'); $this->setPeriodVariablesView($view); $this->setSparklinesAndNumbers($view); echo $view->render(); @@ -98,7 +102,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller // we disable filters for example "search for pattern", in the case this method is called // by a method that already calls the API with some generic filters applied "&disable_generic_filters=1"; - $request = new Piwik_API_Request($requestString); + $request = new Request($requestString); $result = $request->process(); return empty($result) ? new DataTable() : $result; } @@ -108,7 +112,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller $requestString = "method=VisitsSummary.getVisits" . "&format=original" . "&disable_generic_filters=1"; - $request = new Piwik_API_Request($requestString); + $request = new Request($requestString); return $request->process(); } @@ -134,7 +138,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller $dataTableVisit = self::getVisitsSummary(); $dataRow = $dataTableVisit->getRowsCount() == 0 ? new Row() : $dataTableVisit->getFirstRow(); - $dataTableActions = Piwik_Actions_API::getInstance()->get($idSite, Common::getRequestVar('period'), Common::getRequestVar('date'), Piwik_ViewDataTable::getRawSegmentFromRequest()); + $dataTableActions = Piwik_Actions_API::getInstance()->get($idSite, Common::getRequestVar('period'), Common::getRequestVar('date'), ViewDataTable::getRawSegmentFromRequest()); $dataActionsRow = $dataTableActions->getRowsCount() == 0 ? new Row() : $dataTableActions->getFirstRow(); diff --git a/plugins/VisitsSummary/VisitsSummary.php b/plugins/VisitsSummary/VisitsSummary.php index fec9352492..70da748a5e 100644 --- a/plugins/VisitsSummary/VisitsSummary.php +++ b/plugins/VisitsSummary/VisitsSummary.php @@ -58,9 +58,9 @@ class Piwik_VisitsSummary extends Plugin function addWidgets() { - Piwik_AddWidget('VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetLastVisits', 'VisitsSummary', 'getEvolutionGraph', array('columns' => array('nb_visits'))); - Piwik_AddWidget('VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetVisits', 'VisitsSummary', 'getSparklines'); - Piwik_AddWidget('VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetOverviewGraph', 'VisitsSummary', 'index'); + WidgetsList::add('VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetLastVisits', 'VisitsSummary', 'getEvolutionGraph', array('columns' => array('nb_visits'))); + WidgetsList::add('VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetVisits', 'VisitsSummary', 'getSparklines'); + WidgetsList::add('VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetOverviewGraph', 'VisitsSummary', 'index'); } function addMenu() diff --git a/plugins/Widgetize/Controller.php b/plugins/Widgetize/Controller.php index dad2506936..c7e80a2464 100644 --- a/plugins/Widgetize/Controller.php +++ b/plugins/Widgetize/Controller.php @@ -8,25 +8,29 @@ * @category Piwik_Plugins * @package Piwik_Widgetize */ +use Piwik\API\Request; use Piwik\Common; +use Piwik\Controller; +use Piwik\FrontController; +use Piwik\View; /** * * @package Piwik_Widgetize */ -class Piwik_Widgetize_Controller extends Piwik_Controller +class Piwik_Widgetize_Controller extends Controller { public function index() { - $view = new Piwik_View('@Widgetize/index'); - $view->availableWidgets = Common::json_encode(Piwik_GetWidgetsList()); + $view = new View('@Widgetize/index'); + $view->availableWidgets = Common::json_encode(WidgetsList::get()); $this->setGeneralVariablesView($view); echo $view->render(); } public function testJsInclude1() { - $view = new Piwik_View('@Widgetize/testJsInclude1'); + $view = new View('@Widgetize/testJsInclude1'); $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=UserSettings&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday'; $view->url2 = '?module=Widgetize&action=js&moduleToWidgetize=API&actionToWidgetize=index&method=ExamplePlugin.getGoldenRatio&format=original'; echo $view->render(); @@ -34,7 +38,7 @@ class Piwik_Widgetize_Controller extends Piwik_Controller public function testJsInclude2() { - $view = new Piwik_View('@Widgetize/testJsInclude2'); + $view = new View('@Widgetize/testJsInclude2'); $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=UserSettings&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday'; $view->url2 = '?module=Widgetize&action=js&moduleToWidgetize=UserCountry&actionToWidgetize=getCountry&idSite=1&period=day&date=yesterday&viewDataTable=cloud&show_footer=0'; $view->url3 = '?module=Widgetize&action=js&moduleToWidgetize=Referers&actionToWidgetize=getKeywords&idSite=1&period=day&date=yesterday&viewDataTable=table&show_footer=0'; @@ -43,16 +47,16 @@ class Piwik_Widgetize_Controller extends Piwik_Controller public function iframe() { - Piwik_API_Request::reloadAuthUsingTokenAuth(); + Request::reloadAuthUsingTokenAuth(); $this->init(); $controllerName = Common::getRequestVar('moduleToWidgetize'); $actionName = Common::getRequestVar('actionToWidgetize'); $parameters = array($fetch = true); - $outputDataTable = Piwik_FrontController::getInstance()->fetchDispatch($controllerName, $actionName, $parameters); + $outputDataTable = FrontController::getInstance()->fetchDispatch($controllerName, $actionName, $parameters); if ($controllerName == 'Dashboard' && $actionName == 'index') { - $view = new Piwik_View('@Widgetize/iframe_empty'); + $view = new View('@Widgetize/iframe_empty'); } else { - $view = new Piwik_View('@Widgetize/iframe'); + $view = new View('@Widgetize/iframe'); } $this->setGeneralVariablesView($view); $view->setXFrameOptions('allow'); diff --git a/tests/LocalTracker.php b/tests/LocalTracker.php index 69dd3b2f4d..321f0171c4 100755 --- a/tests/LocalTracker.php +++ b/tests/LocalTracker.php @@ -1,6 +1,7 @@ <?php use Piwik\Config; +use Piwik\Tracker; $GLOBALS['PIWIK_TRACKER_DEBUG'] = false; $GLOBALS['PIWIK_TRACKER_DEBUG_FORCE_SCHEDULED_TASKS'] = false; @@ -43,9 +44,9 @@ class Piwik_LocalTracker extends PiwikTracker // unset cached values Piwik_Tracker_Cache::$trackerCache = null; - Piwik_Tracker::setForceIp(null); - Piwik_Tracker::setForceDateTime(null); - Piwik_Tracker::setForceVisitorId(null); + Tracker::setForceIp(null); + Tracker::setForceDateTime(null); + Tracker::setForceVisitorId(null); // save some values $plugins = Config::getInstance()->Plugins['Plugins']; @@ -58,8 +59,8 @@ class Piwik_LocalTracker extends PiwikTracker // modify config $GLOBALS['PIWIK_TRACKER_MODE'] = true; $GLOBALS['PIWIK_TRACKER_LOCAL_TRACKING'] = true; - Piwik_Tracker::$initTrackerMode = false; - Piwik_Tracker::setTestEnvironment($testEnvironmentArgs, $method); + Tracker::$initTrackerMode = false; + Tracker::setTestEnvironment($testEnvironmentArgs, $method); // set language $oldLang = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : ''; @@ -76,7 +77,7 @@ class Piwik_LocalTracker extends PiwikTracker // do tracking and capture output ob_start(); - $localTracker = new Piwik_Tracker(); + $localTracker = new Tracker(); $localTracker->main($requests); $output = ob_get_contents(); diff --git a/tests/PHPUnit/BaseFixture.php b/tests/PHPUnit/BaseFixture.php index 8cf6bb377d..ef9a8afa77 100644 --- a/tests/PHPUnit/BaseFixture.php +++ b/tests/PHPUnit/BaseFixture.php @@ -9,6 +9,8 @@ use Piwik\Config; use Piwik\Common; use Piwik\Access; use Piwik\Date; +use Piwik\Url; +use Piwik\ReportRenderer; use Piwik\Site; /** @@ -85,7 +87,7 @@ abstract class Test_Piwik_BaseFixture extends PHPUnit_Framework_Assert */ public static function getRootUrl() { - $piwikUrl = Piwik_Url::getCurrentUrlWithoutFileName(); + $piwikUrl = Url::getCurrentUrlWithoutFileName(); $pathBeforeRoot = 'tests'; // Running from a plugin @@ -221,7 +223,7 @@ abstract class Test_Piwik_BaseFixture extends PHPUnit_Framework_Assert 'day', // overridden in getApiForTestingScheduledReports() 0, Piwik_PDFReports::EMAIL_TYPE, - Piwik_ReportRenderer::HTML_FORMAT, // overridden in getApiForTestingScheduledReports() + ReportRenderer::HTML_FORMAT, // overridden in getApiForTestingScheduledReports() $availableReportIds, array(Piwik_PDFReports::DISPLAY_FORMAT_PARAMETER => Piwik_PDFReports::DISPLAY_FORMAT_TABLES_ONLY) ); @@ -258,7 +260,7 @@ abstract class Test_Piwik_BaseFixture extends PHPUnit_Framework_Assert 'day', // overridden in getApiForTestingScheduledReports() 0, Piwik_PDFReports::EMAIL_TYPE, - Piwik_ReportRenderer::HTML_FORMAT, // overridden in getApiForTestingScheduledReports() + ReportRenderer::HTML_FORMAT, // overridden in getApiForTestingScheduledReports() $availableReportIds, array(Piwik_PDFReports::DISPLAY_FORMAT_PARAMETER => Piwik_PDFReports::DISPLAY_FORMAT_TABLES_AND_GRAPHS) ); @@ -270,7 +272,7 @@ abstract class Test_Piwik_BaseFixture extends PHPUnit_Framework_Assert 'day', 0, Piwik_PDFReports::EMAIL_TYPE, - Piwik_ReportRenderer::HTML_FORMAT, + ReportRenderer::HTML_FORMAT, array('Actions_getPageTitles'), array( Piwik_PDFReports::DISPLAY_FORMAT_PARAMETER => Piwik_PDFReports::DISPLAY_FORMAT_GRAPHS_ONLY, diff --git a/tests/PHPUnit/BenchmarkTestCase.php b/tests/PHPUnit/BenchmarkTestCase.php index d89fd58846..846f2a0c43 100755 --- a/tests/PHPUnit/BenchmarkTestCase.php +++ b/tests/PHPUnit/BenchmarkTestCase.php @@ -50,7 +50,7 @@ abstract class BenchmarkTestCase extends IntegrationTestCase Common::$cachedTablePrefix = null; } - Piwik_Query("USE " . $dbName); + Db::query("USE " . $dbName); $installedFixture = Piwik_GetOption('benchmark_fixture_name'); } catch (Exception $ex) { // ignore diff --git a/tests/PHPUnit/Core/API/ResponseBuilderTest.php b/tests/PHPUnit/Core/API/ResponseBuilderTest.php index 01c67f56df..eda4b553fd 100644 --- a/tests/PHPUnit/Core/API/ResponseBuilderTest.php +++ b/tests/PHPUnit/Core/API/ResponseBuilderTest.php @@ -5,6 +5,8 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\API\ResponseBuilder; + class API_ResponseBuilderTest extends PHPUnit_Framework_TestCase { /** @@ -24,7 +26,7 @@ class API_ResponseBuilderTest extends PHPUnit_Framework_TestCase "thirdElement"); $expected = json_encode($input); - $actual = Piwik_API_ResponseBuilder::convertMultiDimensionalArrayToJson($input); + $actual = ResponseBuilder::convertMultiDimensionalArrayToJson($input); $this->assertEquals($expected, $actual); } @@ -46,7 +48,7 @@ class API_ResponseBuilderTest extends PHPUnit_Framework_TestCase "thirdElement" => "isThird"); $expected = json_encode($input); - $actual = Piwik_API_ResponseBuilder::convertMultiDimensionalArrayToJson($input); + $actual = ResponseBuilder::convertMultiDimensionalArrayToJson($input); $this->assertEquals($expected, $actual); } @@ -72,7 +74,7 @@ class API_ResponseBuilderTest extends PHPUnit_Framework_TestCase ); $expected = json_encode($input); - $actual = Piwik_API_ResponseBuilder::convertMultiDimensionalArrayToJson($input); + $actual = ResponseBuilder::convertMultiDimensionalArrayToJson($input); $this->assertEquals($expected, $actual); } } diff --git a/tests/PHPUnit/Core/ArchiveProcessingTest.php b/tests/PHPUnit/Core/ArchiveProcessingTest.php index 5a36a79de3..e29bdc0d56 100644 --- a/tests/PHPUnit/Core/ArchiveProcessingTest.php +++ b/tests/PHPUnit/Core/ArchiveProcessingTest.php @@ -432,7 +432,7 @@ class ArchiveProcessingTest extends DatabaseTestCase protected function _checkTableIsExpected($table, $data) { - $fetched = Piwik_FetchAll('SELECT * FROM ' . $table); + $fetched = Db::fetchAll('SELECT * FROM ' . $table); foreach ($data as $id => $row) { $this->assertEquals($fetched[$id]['idsite'], $data[$id][0], "record $id is not {$data[$id][0]}"); $this->assertEquals($fetched[$id]['url'], $data[$id][1], "Record $id bug, not {$data[$id][1]} BUT {$fetched[$id]['url']}"); @@ -441,7 +441,7 @@ class ArchiveProcessingTest extends DatabaseTestCase protected function _checkTableIsExpectedBlob($table, $data) { - $fetched = Piwik_FetchAll('SELECT * FROM ' . $table); + $fetched = Db::fetchAll('SELECT * FROM ' . $table); foreach ($data as $id => $row) { $this->assertEquals($fetched[$id]['idarchive'], $data[$id][0], "record $id idarchive is not '{$data[$id][0]}'"); $this->assertEquals($fetched[$id]['name'], $data[$id][1], "record $id name is not '{$data[$id][1]}'"); diff --git a/tests/PHPUnit/Core/AssetManagerTest.php b/tests/PHPUnit/Core/AssetManagerTest.php index 24cd73244b..84d2f0d330 100644 --- a/tests/PHPUnit/Core/AssetManagerTest.php +++ b/tests/PHPUnit/Core/AssetManagerTest.php @@ -5,6 +5,8 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\AssetManager; + class AssetManagerTest extends PHPUnit_Framework_TestCase { /** @@ -37,6 +39,6 @@ class AssetManagerTest extends PHPUnit_Framework_TestCase 'plugins/abc', ); - $this->assertEquals($expected, Piwik_AssetManager::prioritySort($buckets, $data)); + $this->assertEquals($expected, AssetManager::prioritySort($buckets, $data)); } } diff --git a/tests/PHPUnit/Core/DataTableTest.php b/tests/PHPUnit/Core/DataTableTest.php index d558e12c08..5568c259e2 100644 --- a/tests/PHPUnit/Core/DataTableTest.php +++ b/tests/PHPUnit/Core/DataTableTest.php @@ -10,7 +10,7 @@ use Piwik\Common; use Piwik\DataTable; use Piwik\DataTable\Manager; use Piwik\DataTable\Row; - +use Piwik\Timer; class DataTableTest extends PHPUnit_Framework_TestCase { @@ -226,7 +226,7 @@ class DataTableTest extends PHPUnit_Framework_TestCase public function testRow() { $columns = array('test_column' => 145, - 092582495 => new Piwik_Timer, + 092582495 => new Timer, 'super' => array('this column has an array value, amazing')); $metadata = array('logo' => 'piwik.png', 'super' => array('this column has an array value, amazing')); diff --git a/tests/PHPUnit/Core/HttpTest.php b/tests/PHPUnit/Core/HttpTest.php index 3d3ab62b8c..5fe4945abd 100644 --- a/tests/PHPUnit/Core/HttpTest.php +++ b/tests/PHPUnit/Core/HttpTest.php @@ -5,6 +5,8 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Http; + class HttpTest extends PHPUnit_Framework_TestCase { /** @@ -26,8 +28,8 @@ class HttpTest extends PHPUnit_Framework_TestCase */ public function testFetchRemoteFile($method) { - $this->assertNotNull(Piwik_Http::getTransportMethod()); - $version = Piwik_Http::sendHttpRequestBy($method, 'http://api.piwik.org/1.0/getLatestVersion/', 5); + $this->assertNotNull(Http::getTransportMethod()); + $version = Http::sendHttpRequestBy($method, 'http://api.piwik.org/1.0/getLatestVersion/', 5); $this->assertTrue((boolean)preg_match('/^([0-9.]+)$/', $version)); } @@ -38,7 +40,7 @@ class HttpTest extends PHPUnit_Framework_TestCase public function testFetchApiLatestVersion() { $destinationPath = PIWIK_USER_PATH . '/tmp/latest/LATEST'; - Piwik_Http::fetchRemoteFile('http://api.piwik.org/1.0/getLatestVersion/', $destinationPath, 3); + Http::fetchRemoteFile('http://api.piwik.org/1.0/getLatestVersion/', $destinationPath, 3); $this->assertFileExists($destinationPath); $this->assertGreaterThan(0, filesize($destinationPath)); } @@ -50,7 +52,7 @@ class HttpTest extends PHPUnit_Framework_TestCase public function testFetchLatestZip() { $destinationPath = PIWIK_USER_PATH . '/tmp/latest/latest.zip'; - Piwik_Http::fetchRemoteFile('http://builds.piwik.org/latest.zip', $destinationPath, 3); + Http::fetchRemoteFile('http://builds.piwik.org/latest.zip', $destinationPath, 3); $this->assertFileExists($destinationPath); $this->assertGreaterThan(0, filesize($destinationPath)); } @@ -62,7 +64,7 @@ class HttpTest extends PHPUnit_Framework_TestCase */ public function testCustomByteRange($method) { - $result = Piwik_Http::sendHttpRequestBy( + $result = Http::sendHttpRequestBy( $method, 'http://builds.piwik.org/latest.zip', 5, @@ -95,7 +97,7 @@ class HttpTest extends PHPUnit_Framework_TestCase return; // not supported w/ this method } - $result = Piwik_Http::sendHttpRequestBy( + $result = Http::sendHttpRequestBy( $method, 'http://builds.piwik.org/latest.zip', 5, diff --git a/tests/PHPUnit/Core/IPTest.php b/tests/PHPUnit/Core/IPTest.php index 49a4741ca4..e05db2946b 100644 --- a/tests/PHPUnit/Core/IPTest.php +++ b/tests/PHPUnit/Core/IPTest.php @@ -1,6 +1,7 @@ <?php use Piwik\Config; use Piwik\Common; +use Piwik\IP; /** * Piwik - Open source web analytics @@ -60,7 +61,7 @@ class IPTest extends PHPUnit_Framework_TestCase */ public function testSanitizeIp($ip, $expected) { - $this->assertEquals($expected, Piwik_IP::sanitizeIp($ip)); + $this->assertEquals($expected, IP::sanitizeIp($ip)); } /** @@ -101,7 +102,7 @@ class IPTest extends PHPUnit_Framework_TestCase */ public function testSanitizeIpRange($ip, $expected) { - $this->assertEquals($expected, Piwik_IP::sanitizeIpRange($ip)); + $this->assertEquals($expected, IP::sanitizeIpRange($ip)); } /** @@ -132,7 +133,7 @@ class IPTest extends PHPUnit_Framework_TestCase */ public function testP2N($P, $N) { - $this->assertEquals($N, Piwik_IP::P2N($P)); + $this->assertEquals($N, IP::P2N($P)); } /** @@ -169,7 +170,7 @@ class IPTest extends PHPUnit_Framework_TestCase */ public function testP2NInvalidInput($P) { - $this->assertEquals("\x00\x00\x00\x00", Piwik_IP::P2N($P)); + $this->assertEquals("\x00\x00\x00\x00", IP::P2N($P)); } /** @@ -209,7 +210,7 @@ class IPTest extends PHPUnit_Framework_TestCase */ public function testN2P($P, $N) { - $this->assertEquals($P, Piwik_IP::N2P($N), "$P vs" . Piwik_IP::N2P($N)); + $this->assertEquals($P, IP::N2P($N), "$P vs" . IP::N2P($N)); } /** @@ -219,7 +220,7 @@ class IPTest extends PHPUnit_Framework_TestCase */ public function testN2PinvalidInput($N) { - $this->assertEquals("0.0.0.0", Piwik_IP::N2P($N), bin2hex($N)); + $this->assertEquals("0.0.0.0", IP::N2P($N), bin2hex($N)); } /** @@ -229,7 +230,7 @@ class IPTest extends PHPUnit_Framework_TestCase */ public function testPrettyPrint($P, $N) { - $this->assertEquals($P, Piwik_IP::prettyPrint($N), "$P vs" . Piwik_IP::N2P($N)); + $this->assertEquals($P, IP::prettyPrint($N), "$P vs" . IP::N2P($N)); } /** @@ -239,7 +240,7 @@ class IPTest extends PHPUnit_Framework_TestCase */ public function testPrettyPrintInvalidInput($N) { - $this->assertEquals("0.0.0.0", Piwik_IP::prettyPrint($N), bin2hex($N)); + $this->assertEquals("0.0.0.0", IP::prettyPrint($N), bin2hex($N)); } /** @@ -298,7 +299,7 @@ class IPTest extends PHPUnit_Framework_TestCase */ public function testIsIPv4($ip, $bool) { - $this->assertEquals($bool, Piwik_IP::isIPv4($ip), bin2hex($ip)); + $this->assertEquals($bool, IP::isIPv4($ip), bin2hex($ip)); } /** @@ -355,7 +356,7 @@ class IPTest extends PHPUnit_Framework_TestCase */ public function testLong2ip($N, $P) { - $this->assertEquals($P, Piwik_IP::long2ip($N), bin2hex($N)); + $this->assertEquals($P, IP::long2ip($N), bin2hex($N)); // this is our compatibility function $this->assertEquals($P, Common::long2ip($N), bin2hex($N)); } @@ -447,7 +448,7 @@ class IPTest extends PHPUnit_Framework_TestCase */ public function testGetIpsForRange($range, $expected) { - $this->assertEquals($expected, Piwik_IP::getIpsForRange($range)); + $this->assertEquals($expected, IP::getIpsForRange($range)); } /** @@ -549,13 +550,13 @@ class IPTest extends PHPUnit_Framework_TestCase { foreach ($test as $ip => $expected) { // range as a string - $this->assertEquals($expected, Piwik_IP::isIpInRange(Piwik_IP::P2N($ip), array($range)), "$ip in $range"); + $this->assertEquals($expected, IP::isIpInRange(IP::P2N($ip), array($range)), "$ip in $range"); // range as an array(low, high) - $aRange = Piwik_IP::getIpsForRange($range); - $aRange[0] = Piwik_IP::N2P($aRange[0]); - $aRange[1] = Piwik_IP::N2P($aRange[1]); - $this->assertEquals($expected, Piwik_IP::isIpInRange(Piwik_IP::P2N($ip), array($aRange)), "$ip in $range"); + $aRange = IP::getIpsForRange($range); + $aRange[0] = IP::N2P($aRange[0]); + $aRange[1] = IP::N2P($aRange[1]); + $this->assertEquals($expected, IP::isIpInRange(IP::P2N($ip), array($aRange)), "$ip in $range"); } } @@ -589,7 +590,7 @@ class IPTest extends PHPUnit_Framework_TestCase $_SERVER['HTTP_X_FORWARDED_FOR'] = $test[1]; Config::getInstance()->General['proxy_client_headers'] = array($test[2]); Config::getInstance()->General['proxy_ips'] = array($test[3]); - $this->assertEquals($test[4], Piwik_IP::getIpFromHeader(), $description); + $this->assertEquals($test[4], IP::getIpFromHeader(), $description); } /** @@ -616,7 +617,7 @@ class IPTest extends PHPUnit_Framework_TestCase */ public function testGetNonProxyIpFromHeader($ip) { - $this->assertEquals($ip, Piwik_IP::getNonProxyIpFromHeader($ip, array())); + $this->assertEquals($ip, IP::getNonProxyIpFromHeader($ip, array())); } /** @@ -629,7 +630,7 @@ class IPTest extends PHPUnit_Framework_TestCase // 1.1.1.1 is not a trusted proxy $_SERVER['REMOTE_ADDR'] = '1.1.1.1'; $_SERVER['HTTP_X_FORWARDED_FOR'] = ''; - $this->assertEquals('1.1.1.1', Piwik_IP::getNonProxyIpFromHeader('1.1.1.1', array('HTTP_X_FORWARDED_FOR'))); + $this->assertEquals('1.1.1.1', IP::getNonProxyIpFromHeader('1.1.1.1', array('HTTP_X_FORWARDED_FOR'))); } /** @@ -643,14 +644,14 @@ class IPTest extends PHPUnit_Framework_TestCase $_SERVER['REMOTE_ADDR'] = '1.1.1.1'; $_SERVER['HTTP_X_FORWARDED_FOR'] = $ip; - $this->assertEquals($ip, Piwik_IP::getNonProxyIpFromHeader('1.1.1.1', array('HTTP_X_FORWARDED_FOR'))); + $this->assertEquals($ip, IP::getNonProxyIpFromHeader('1.1.1.1', array('HTTP_X_FORWARDED_FOR'))); $_SERVER['HTTP_X_FORWARDED_FOR'] = '1.2.3.4, ' . $ip; - $this->assertEquals($ip, Piwik_IP::getNonProxyIpFromHeader('1.1.1.1', array('HTTP_X_FORWARDED_FOR'))); + $this->assertEquals($ip, IP::getNonProxyIpFromHeader('1.1.1.1', array('HTTP_X_FORWARDED_FOR'))); // misconfiguration $_SERVER['HTTP_X_FORWARDED_FOR'] = $ip . ', 1.1.1.1'; - $this->assertEquals($ip, Piwik_IP::getNonProxyIpFromHeader('1.1.1.1', array('HTTP_X_FORWARDED_FOR'))); + $this->assertEquals($ip, IP::getNonProxyIpFromHeader('1.1.1.1', array('HTTP_X_FORWARDED_FOR'))); } /** @@ -676,10 +677,10 @@ class IPTest extends PHPUnit_Framework_TestCase public function testGetLastIpFromList($csv, $expected) { // without excluded IPs - $this->assertEquals($expected, Piwik_IP::getLastIpFromList($csv)); + $this->assertEquals($expected, IP::getLastIpFromList($csv)); // with excluded Ips - $this->assertEquals($expected, Piwik_IP::getLastIpFromList($csv . ', 10.10.10.10', array('10.10.10.10'))); + $this->assertEquals($expected, IP::getLastIpFromList($csv . ', 10.10.10.10', array('10.10.10.10'))); } /** @@ -689,11 +690,11 @@ class IPTest extends PHPUnit_Framework_TestCase public function testGetHostByAddr() { $hosts = array('localhost', 'localhost.localdomain', strtolower(@php_uname('n')), '127.0.0.1'); - $this->assertTrue(in_array(strtolower(Piwik_IP::getHostByAddr('127.0.0.1')), $hosts), '127.0.0.1 -> localhost'); + $this->assertTrue(in_array(strtolower(IP::getHostByAddr('127.0.0.1')), $hosts), '127.0.0.1 -> localhost'); if (!Common::isWindows() || PHP_VERSION >= '5.3') { $hosts = array('ip6-localhost', 'localhost', 'localhost.localdomain', strtolower(@php_uname('n')), '::1'); - $this->assertTrue(in_array(strtolower(Piwik_IP::getHostByAddr('::1')), $hosts), '::1 -> ip6-localhost'); + $this->assertTrue(in_array(strtolower(IP::getHostByAddr('::1')), $hosts), '::1 -> ip6-localhost'); } } @@ -728,7 +729,7 @@ class IPTest extends PHPUnit_Framework_TestCase */ public function testPhpCompatInetNtop($k, $v) { - $this->assertEquals($k, php_compat_inet_ntop(pack('H*', $v))); + $this->assertEquals($k, IP::php_compat_inet_ntop(pack('H*', $v))); if (!Common::isWindows()) { $this->assertEquals($k, @inet_ntop(pack('H*', $v))); } @@ -804,7 +805,7 @@ class IPTest extends PHPUnit_Framework_TestCase */ public function testPhpCompatInetPton($k, $v) { - $this->assertEquals($v, bin2hex(php_compat_inet_pton($k))); + $this->assertEquals($v, bin2hex(IP::php_compat_inet_pton($k))); if (!Common::isWindows()) { $this->assertEquals($v, bin2hex(@inet_pton($k))); } diff --git a/tests/PHPUnit/Core/NonceTest.php b/tests/PHPUnit/Core/NonceTest.php index a776cee77e..d60bfdf78a 100644 --- a/tests/PHPUnit/Core/NonceTest.php +++ b/tests/PHPUnit/Core/NonceTest.php @@ -1,5 +1,6 @@ <?php use Piwik\Config; +use Piwik\Nonce; /** * Piwik - Open source web analytics @@ -33,6 +34,6 @@ class NonceTest extends PHPUnit_Framework_TestCase Config::getInstance()->General['enable_trusted_host_check'] = 0; $_SERVER['HTTP_HOST'] = $host; Config::getInstance()->General['trusted_hosts'] = array('example.com'); - $this->assertEquals($expected, Piwik_Nonce::getAcceptableOrigins(), $host); + $this->assertEquals($expected, Nonce::getAcceptableOrigins(), $host); } } diff --git a/tests/PHPUnit/Core/OptionTest.php b/tests/PHPUnit/Core/OptionTest.php index 83625cfbae..5b02863323 100644 --- a/tests/PHPUnit/Core/OptionTest.php +++ b/tests/PHPUnit/Core/OptionTest.php @@ -6,6 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ use Piwik\Common; +use Piwik\Piwik_Option; require_once "Option.php"; @@ -21,11 +22,11 @@ class OptionTest extends DatabaseTestCase $this->assertFalse(Piwik_Option::getInstance()->get('anonymous_defaultReport')); // populate table, expect '1' (i.e., found) - Piwik_Query("INSERT INTO " . Common::prefixTable('option') . " VALUES ('anonymous_defaultReport', '1', false)"); + Db::query("INSERT INTO " . Common::prefixTable('option') . " VALUES ('anonymous_defaultReport', '1', false)"); $this->assertSame('1', Piwik_Option::getInstance()->get('anonymous_defaultReport')); // delete row (bypassing API), expect '1' (i.e., from cache) - Piwik_Query("DELETE FROM " . Common::prefixTable('option') . " WHERE option_name = ?", array('anonymous_defaultReport')); + Db::query("DELETE FROM " . Common::prefixTable('option') . " WHERE option_name = ?", array('anonymous_defaultReport')); $this->assertSame('1', Piwik_Option::getInstance()->get('anonymous_defaultReport')); // force cache reload, expect false (i.e., not found) @@ -43,11 +44,11 @@ class OptionTest extends DatabaseTestCase $this->assertFalse(Piwik_GetOption('anonymous_defaultReport')); // populate table, expect '1' (i.e., found) - Piwik_Query("INSERT INTO " . Common::prefixTable('option') . " VALUES ('anonymous_defaultReport', '1',true)"); + Db::query("INSERT INTO " . Common::prefixTable('option') . " VALUES ('anonymous_defaultReport', '1',true)"); $this->assertSame('1', Piwik_GetOption('anonymous_defaultReport')); // delete row (bypassing API), expect '1' (i.e., from cache) - Piwik_Query("DELETE FROM " . Common::prefixTable('option') . " WHERE option_name = ?", array('anonymous_defaultReport')); + Db::query("DELETE FROM " . Common::prefixTable('option') . " WHERE option_name = ?", array('anonymous_defaultReport')); $this->assertSame('1', Piwik_GetOption('anonymous_defaultReport')); // force cache reload, expect false (i.e., not found) diff --git a/tests/PHPUnit/Core/Plugin/ConfigTest.php b/tests/PHPUnit/Core/Plugin/ConfigTest.php index db9421b94a..e706206b1c 100644 --- a/tests/PHPUnit/Core/Plugin/ConfigTest.php +++ b/tests/PHPUnit/Core/Plugin/ConfigTest.php @@ -5,6 +5,8 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Plugin\Config; + class Plugin_ConfigTest extends PHPUnit_Framework_TestCase { @@ -25,7 +27,7 @@ class Plugin_ConfigTest extends PHPUnit_Framework_TestCase */ function testLoadWithNoConfig() { - $objectUnderTest = new Piwik_Plugin_Config('ExamplePlugin'); + $objectUnderTest = new Config('ExamplePlugin'); $this->assertFalse($objectUnderTest->load(), 'load() with no config should fail'); } @@ -37,7 +39,7 @@ class Plugin_ConfigTest extends PHPUnit_Framework_TestCase */ function testLoadAlternatePath() { - $objectUnderTest = new Piwik_Plugin_Config('ExamplePlugin', 'local.config.sample.php'); + $objectUnderTest = new Config('ExamplePlugin', 'local.config.sample.php'); $config = $objectUnderTest->load(); $this->assertTrue($config !== false); @@ -56,7 +58,7 @@ class Plugin_ConfigTest extends PHPUnit_Framework_TestCase $dir = PIWIK_USER_PATH . '/plugins/ExamplePlugin/config'; @copy($dir . '/local.config.sample.php', $dir . '/local.config.php'); - $objectUnderTest = new Piwik_Plugin_Config('ExamplePlugin'); + $objectUnderTest = new Config('ExamplePlugin'); $config = $objectUnderTest->load(); $this->assertTrue($config !== false); @@ -76,13 +78,13 @@ class Plugin_ConfigTest extends PHPUnit_Framework_TestCase 1, 'mixed', array('a'), 'b' => 'c' ); - $objectUnderTest = new Piwik_Plugin_Config('ExamplePlugin'); + $objectUnderTest = new Config('ExamplePlugin'); $objectUnderTest->store($config); $path = PIWIK_USER_PATH . '/plugins/ExamplePlugin/config/local.config.php'; $this->assertTrue(file_exists($path)); - $objectUnderTest = new Piwik_Plugin_Config('ExamplePlugin'); + $objectUnderTest = new Config('ExamplePlugin'); $newConfig = $objectUnderTest->load(); $this->assertTrue($config !== false); diff --git a/tests/PHPUnit/Core/PluginsFunctions/WidgetsListTest.php b/tests/PHPUnit/Core/PluginsFunctions/WidgetsListTest.php index 5bb375bd69..31b2cfc06c 100644 --- a/tests/PHPUnit/Core/PluginsFunctions/WidgetsListTest.php +++ b/tests/PHPUnit/Core/PluginsFunctions/WidgetsListTest.php @@ -7,6 +7,7 @@ */ use Piwik\Access; +use Piwik\WidgetsList; class WidgetsListTest extends DatabaseTestCase { @@ -28,9 +29,9 @@ class WidgetsListTest extends DatabaseTestCase IntegrationTestCase::loadAllPlugins(); - Piwik_WidgetsList::_reset(); - $widgets = Piwik_GetWidgetsList(); - Piwik_WidgetsList::_reset(); + WidgetsList::_reset(); + $widgets = WidgetsList::get(); + WidgetsList::_reset(); // number of main categories $this->assertEquals(12, count($widgets)); @@ -75,9 +76,9 @@ class WidgetsListTest extends DatabaseTestCase IntegrationTestCase::loadAllPlugins(); - Piwik_WidgetsList::_reset(); - $widgets = Piwik_GetWidgetsList(); - Piwik_WidgetsList::_reset(); + WidgetsList::_reset(); + $widgets = WidgetsList::get(); + WidgetsList::_reset(); // number of main categories $this->assertEquals(12, count($widgets)); @@ -112,9 +113,9 @@ class WidgetsListTest extends DatabaseTestCase IntegrationTestCase::loadAllPlugins(); - Piwik_WidgetsList::_reset(); - $widgets = Piwik_GetWidgetsList(); - Piwik_WidgetsList::_reset(); + WidgetsList::_reset(); + $widgets = WidgetsList::get(); + WidgetsList::_reset(); // number of main categories $this->assertEquals(13, count($widgets)); diff --git a/tests/PHPUnit/Core/RankingQueryTest.php b/tests/PHPUnit/Core/RankingQueryTest.php index 833efbfd0d..8ee1040499 100644 --- a/tests/PHPUnit/Core/RankingQueryTest.php +++ b/tests/PHPUnit/Core/RankingQueryTest.php @@ -6,6 +6,8 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\RankingQuery; + class RankingQueryTest extends PHPUnit_Framework_TestCase { @@ -15,7 +17,7 @@ class RankingQueryTest extends PHPUnit_Framework_TestCase */ public function testBasic() { - $query = new Piwik_RankingQuery(); + $query = new RankingQuery(); $query->addLabelColumn('label'); $query->addColumn('column'); $query->addColumn('columnSum', 'sum'); @@ -56,7 +58,7 @@ class RankingQueryTest extends PHPUnit_Framework_TestCase */ public function testExcludeRows() { - $query = new Piwik_RankingQuery(20); + $query = new RankingQuery(20); $query->addLabelColumn('label'); $query->setColumnToMarkExcludedRows('exclude_marker'); @@ -94,7 +96,7 @@ class RankingQueryTest extends PHPUnit_Framework_TestCase */ public function testPartitionResult() { - $query = new Piwik_RankingQuery(1000); + $query = new RankingQuery(1000); $query->addLabelColumn('label'); $query->partitionResultIntoMultipleGroups('partition', array(1, 2, 3)); @@ -133,7 +135,7 @@ class RankingQueryTest extends PHPUnit_Framework_TestCase } /** - * @param Piwik_RankingQuery $rankingQuery + * @param RankingQuery $rankingQuery * @param string $innerQuerySql * @param string $expected */ diff --git a/tests/PHPUnit/Core/ScheduledTaskTest.php b/tests/PHPUnit/Core/ScheduledTaskTest.php index b58c4df6fa..7bb26624d9 100644 --- a/tests/PHPUnit/Core/ScheduledTaskTest.php +++ b/tests/PHPUnit/Core/ScheduledTaskTest.php @@ -5,6 +5,8 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\ScheduledTask; + require_once PIWIK_INCLUDE_PATH . '/plugins/PDFReports/PDFReports.php'; class ScheduledTaskTest extends PHPUnit_Framework_TestCase @@ -15,7 +17,7 @@ class ScheduledTaskTest extends PHPUnit_Framework_TestCase */ public function testGetClassName() { - $scheduledTask = new Piwik_ScheduledTask (new Piwik_PDFReports(), null, null, null); + $scheduledTask = new ScheduledTask (new Piwik_PDFReports(), null, null, null); $this->assertEquals('Piwik_PDFReports', $scheduledTask->getClassName()); } @@ -39,7 +41,7 @@ class ScheduledTaskTest extends PHPUnit_Framework_TestCase */ public function testGetTaskName($expectedTaskName, $className, $methodName, $methodParameter) { - $this->assertEquals($expectedTaskName, Piwik_ScheduledTask::getTaskName($className, $methodName, $methodParameter)); + $this->assertEquals($expectedTaskName, ScheduledTask::getTaskName($className, $methodName, $methodParameter)); } } diff --git a/tests/PHPUnit/Core/SqlTest.php b/tests/PHPUnit/Core/SqlTest.php index 14aebbf22c..9bb3a41e2b 100755 --- a/tests/PHPUnit/Core/SqlTest.php +++ b/tests/PHPUnit/Core/SqlTest.php @@ -12,12 +12,12 @@ class SqlTest extends DatabaseTestCase parent::setUp(); // create two myisam tables - Piwik_Exec("CREATE TABLE table1 (a INT) ENGINE=MYISAM"); - Piwik_Exec("CREATE TABLE table2 (b INT) ENGINE=MYISAM"); + Db::exec("CREATE TABLE table1 (a INT) ENGINE=MYISAM"); + Db::exec("CREATE TABLE table2 (b INT) ENGINE=MYISAM"); // create two innodb tables - Piwik_Exec("CREATE TABLE table3 (c INT) ENGINE=InnoDB"); - Piwik_Exec("CREATE TABLE table4 (d INT) ENGINE=InnoDB"); + Db::exec("CREATE TABLE table3 (c INT) ENGINE=InnoDB"); + Db::exec("CREATE TABLE table4 (d INT) ENGINE=InnoDB"); } public function tearDown() @@ -32,12 +32,12 @@ class SqlTest extends DatabaseTestCase public function testOptimize() { // make sure optimizing myisam tables works - $this->assertTrue(Piwik_OptimizeTables(array('table1', 'table2')) !== false); + $this->assertTrue(Db::optimizeTables(array('table1', 'table2')) !== false); // make sure optimizing both myisam & innodb results in optimizations - $this->assertTrue(Piwik_OptimizeTables(array('table1', 'table2', 'table3', 'table4')) !== false); + $this->assertTrue(Db::optimizeTables(array('table1', 'table2', 'table3', 'table4')) !== false); // make sure innodb tables are skipped - $this->assertTrue(Piwik_OptimizeTables(array('table3', 'table4')) === false); + $this->assertTrue(Db::optimizeTables(array('table3', 'table4')) === false); } } diff --git a/tests/PHPUnit/Core/TaskSchedulerTest.php b/tests/PHPUnit/Core/TaskSchedulerTest.php index df32496940..d25d7265e8 100644 --- a/tests/PHPUnit/Core/TaskSchedulerTest.php +++ b/tests/PHPUnit/Core/TaskSchedulerTest.php @@ -6,6 +6,8 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ use Piwik\EventDispatcher; +use Piwik\TaskScheduler; +use Piwik\ScheduledTask; class TaskSchedulerTest extends PHPUnit_Framework_TestCase { @@ -50,11 +52,11 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase public function testGetTimetableFromOptionValue($expectedTimetable, $option) { $getTimetableFromOptionValue = new ReflectionMethod( - 'Piwik_TaskScheduler', 'getTimetableFromOptionValue' + 'TaskScheduler', 'getTimetableFromOptionValue' ); $getTimetableFromOptionValue->setAccessible(true); - $this->assertEquals($expectedTimetable, $getTimetableFromOptionValue->invoke(new Piwik_TaskScheduler(), $option)); + $this->assertEquals($expectedTimetable, $getTimetableFromOptionValue->invoke(new TaskScheduler(), $option)); } /** @@ -79,11 +81,11 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase public function testTaskHasBeenScheduledOnce($expectedDecision, $taskName, $timetable) { $taskHasBeenScheduledOnce = new ReflectionMethod( - 'Piwik_TaskScheduler', 'taskHasBeenScheduledOnce' + 'TaskScheduler', 'taskHasBeenScheduledOnce' ); $taskHasBeenScheduledOnce->setAccessible(true); - $this->assertEquals($expectedDecision, $taskHasBeenScheduledOnce->invoke(new Piwik_TaskScheduler(), $taskName, $timetable)); + $this->assertEquals($expectedDecision, $taskHasBeenScheduledOnce->invoke(new TaskScheduler(), $taskName, $timetable)); } /** @@ -109,7 +111,7 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase { self::stubPiwikOption($timetable); - $this->assertEquals($expectedTime, Piwik_TaskScheduler::getScheduledTimeForMethod($className, $methodName, $methodParameter)); + $this->assertEquals($expectedTime, TaskScheduler::getScheduledTimeForMethod($className, $methodName, $methodParameter)); self::resetPiwikOption(); } @@ -142,11 +144,11 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase public function testTaskShouldBeExecuted($expectedDecision, $taskName, $timetable) { $taskShouldBeExecuted = new ReflectionMethod( - 'Piwik_TaskScheduler', 'taskShouldBeExecuted' + 'TaskScheduler', 'taskShouldBeExecuted' ); $taskShouldBeExecuted->setAccessible(true); - $this->assertEquals($expectedDecision, $taskShouldBeExecuted->invoke(new Piwik_TaskScheduler(), $taskName, $timetable)); + $this->assertEquals($expectedDecision, $taskShouldBeExecuted->invoke(new TaskScheduler(), $taskName, $timetable)); } /** @@ -172,12 +174,12 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase $mock = $this->getMock('TaskSchedulerTest', array($methodName)); $mock->expects($this->once())->method($methodName)->with($this->equalTo($parameterValue)); - $executeTask = new ReflectionMethod('Piwik_TaskScheduler', 'executeTask'); + $executeTask = new ReflectionMethod('TaskScheduler', 'executeTask'); $executeTask->setAccessible(true); $this->assertNotEmpty($executeTask->invoke( - new Piwik_TaskScheduler(), - new Piwik_ScheduledTask ($mock, $methodName, $parameterValue, new Piwik_ScheduledTime_Daily()) + new TaskScheduler(), + new ScheduledTask ($mock, $methodName, $parameterValue, new Piwik_ScheduledTime_Daily()) )); } @@ -193,9 +195,9 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase ->method('getTime') ->will($this->returnValue($systemTime)); - $scheduledTaskOne = new Piwik_ScheduledTask ($this, 'scheduledTaskOne', null, $dailySchedule); - $scheduledTaskTwo = new Piwik_ScheduledTask ($this, 'scheduledTaskTwo', 1, $dailySchedule); - $scheduledTaskThree = new Piwik_ScheduledTask ($this, 'scheduledTaskThree', null, $dailySchedule); + $scheduledTaskOne = new ScheduledTask ($this, 'scheduledTaskOne', null, $dailySchedule); + $scheduledTaskTwo = new ScheduledTask ($this, 'scheduledTaskTwo', 1, $dailySchedule); + $scheduledTaskThree = new ScheduledTask ($this, 'scheduledTaskThree', null, $dailySchedule); $caseOneExpectedTable = array( 'TaskSchedulerTest.scheduledTaskOne' => $scheduledTaskOne->getRescheduledTime(), @@ -255,7 +257,7 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase // configured tasks array( $scheduledTaskOne, -// $scheduledTaskTwo, Not configured anymore (ie. not returned after Piwik_TaskScheduler::GET_TASKS_EVENT is issued) +// $scheduledTaskTwo, Not configured anymore (ie. not returned after TaskScheduler::GET_TASKS_EVENT is issued) $scheduledTaskThree, ) ), @@ -286,7 +288,7 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase \Piwik\PluginsManager::getInstance()->unloadPlugins(); // make sure the get tasks event returns our configured tasks - Piwik_AddAction(Piwik_TaskScheduler::GET_TASKS_EVENT, function(&$tasks) use($configuredTasks) { + Piwik_AddAction(TaskScheduler::GET_TASKS_EVENT, function(&$tasks) use($configuredTasks) { $tasks = $configuredTasks; }); @@ -294,7 +296,7 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase self::stubPiwikOption(serialize($timetableBeforeTaskExecution)); // execute tasks - $executionResults = Piwik_TaskScheduler::runTasks(); + $executionResults = TaskScheduler::runTasks(); // assert methods are executed $executedTasks = array(); @@ -305,12 +307,12 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase $this->assertEquals($expectedExecutedTasks, $executedTasks); // assert the timetable is correctly updated - $getTimetableFromOptionTable = new ReflectionMethod('Piwik_TaskScheduler', 'getTimetableFromOptionTable'); + $getTimetableFromOptionTable = new ReflectionMethod('TaskScheduler', 'getTimetableFromOptionTable'); $getTimetableFromOptionTable->setAccessible(true); - $this->assertEquals($expectedTimetable, $getTimetableFromOptionTable->invoke(new Piwik_TaskScheduler())); + $this->assertEquals($expectedTimetable, $getTimetableFromOptionTable->invoke(new TaskScheduler())); // restore loaded plugins & piwik options - EventDispatcher::getInstance()->clearObservers(Piwik_TaskScheduler::GET_TASKS_EVENT); + EventDispatcher::getInstance()->clearObservers(TaskScheduler::GET_TASKS_EVENT); \Piwik\PluginsManager::getInstance()->loadPlugins($plugins); self::resetPiwikOption(); } @@ -327,7 +329,7 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase private static function getReflectedPiwikOptionInstance() { - $piwikOptionInstance = new ReflectionProperty('Piwik_Option', 'instance'); + $piwikOptionInstance = new ReflectionProperty('Option', 'instance'); $piwikOptionInstance->setAccessible(true); return $piwikOptionInstance; } diff --git a/tests/PHPUnit/Core/Tracker/VisitTest.php b/tests/PHPUnit/Core/Tracker/VisitTest.php index 762900a935..23eed1d310 100644 --- a/tests/PHPUnit/Core/Tracker/VisitTest.php +++ b/tests/PHPUnit/Core/Tracker/VisitTest.php @@ -6,6 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ use Piwik\Access; +use Piwik\IP; class Tracker_VisitTest extends DatabaseTestCase { @@ -78,7 +79,7 @@ class Tracker_VisitTest extends DatabaseTestCase // test that IPs within the range, or the given IP, are excluded foreach ($tests as $ip => $expected) { - $testIpIsExcluded = Piwik_IP::P2N($ip); + $testIpIsExcluded = IP::P2N($ip); $excluded = new Test_Piwik_Tracker_VisitExcluded_public($request, $testIpIsExcluded); $this->assertSame($expected, $excluded->public_isVisitorIpExcluded($testIpIsExcluded)); diff --git a/tests/PHPUnit/Core/TranslationWriterTest.php b/tests/PHPUnit/Core/TranslationWriterTest.php index c508bc2728..6198ce32d9 100644 --- a/tests/PHPUnit/Core/TranslationWriterTest.php +++ b/tests/PHPUnit/Core/TranslationWriterTest.php @@ -1,5 +1,6 @@ <?php use Piwik\Common; +use Piwik\TranslationWriter; /** * Piwik - Open source web analytics @@ -37,7 +38,7 @@ class TranslationWriterTest extends PHPUnit_Framework_TestCase */ public function testClean($data, $expected) { - $this->assertEquals($expected, Piwik_TranslationWriter::clean($data)); + $this->assertEquals($expected, TranslationWriter::clean($data)); } /** @@ -67,7 +68,7 @@ class TranslationWriterTest extends PHPUnit_Framework_TestCase if (Common::isWindows() && $data == "\n") { return; } - $this->assertEquals($expected, Piwik_TranslationWriter::quote($data)); + $this->assertEquals($expected, TranslationWriter::quote($data)); } /** @@ -77,7 +78,7 @@ class TranslationWriterTest extends PHPUnit_Framework_TestCase public function testGetTranslationPathInvalidLang() { try { - $path = Piwik_TranslationWriter::getTranslationPath('../index'); + $path = TranslationWriter::getTranslationPath('../index'); } catch (Exception $e) { return; } @@ -91,7 +92,7 @@ class TranslationWriterTest extends PHPUnit_Framework_TestCase public function testGetTranslationPathInvalidBasePath() { try { - $path = Piwik_TranslationWriter::getTranslationPath('en', 'core'); + $path = TranslationWriter::getTranslationPath('en', 'core'); } catch (Exception $e) { return; } @@ -105,11 +106,11 @@ class TranslationWriterTest extends PHPUnit_Framework_TestCase public function testGetTranslationPath() { // implicit base path - $this->assertEquals(PIWIK_INCLUDE_PATH . '/lang/en.php', Piwik_TranslationWriter::getTranslationPath('en')); + $this->assertEquals(PIWIK_INCLUDE_PATH . '/lang/en.php', TranslationWriter::getTranslationPath('en')); // explicit base path - $this->assertEquals(PIWIK_INCLUDE_PATH . '/lang/en.php', Piwik_TranslationWriter::getTranslationPath('en', 'lang')); - $this->assertEquals(PIWIK_INCLUDE_PATH . '/tmp/en.php', Piwik_TranslationWriter::getTranslationPath('en', 'tmp')); + $this->assertEquals(PIWIK_INCLUDE_PATH . '/lang/en.php', TranslationWriter::getTranslationPath('en', 'lang')); + $this->assertEquals(PIWIK_INCLUDE_PATH . '/tmp/en.php', TranslationWriter::getTranslationPath('en', 'tmp')); } /** @@ -119,7 +120,7 @@ class TranslationWriterTest extends PHPUnit_Framework_TestCase public function testLoadTranslationInvalidLang() { try { - $translations = Piwik_TranslationWriter::loadTranslation('a'); + $translations = TranslationWriter::loadTranslation('a'); } catch (Exception $e) { return; } @@ -135,7 +136,7 @@ class TranslationWriterTest extends PHPUnit_Framework_TestCase require PIWIK_INCLUDE_PATH . '/lang/en.php'; $this->assertTrue(is_array($translations)); - $englishTranslations = Piwik_TranslationWriter::loadTranslation('en'); + $englishTranslations = TranslationWriter::loadTranslation('en'); $this->assertEquals(count($translations), count($englishTranslations)); $this->assertEquals(0, count(array_diff($translations, $englishTranslations))); @@ -148,7 +149,7 @@ class TranslationWriterTest extends PHPUnit_Framework_TestCase */ public function testSaveTranslation() { - $path = Piwik_TranslationWriter::getTranslationPath('en', 'tmp'); + $path = TranslationWriter::getTranslationPath('en', 'tmp'); $translations = array( 'General_Locale' => 'en_CA.UTF-8', @@ -159,7 +160,7 @@ class TranslationWriterTest extends PHPUnit_Framework_TestCase @unlink($path); - $rc = Piwik_TranslationWriter::saveTranslation($translations, $path); + $rc = TranslationWriter::saveTranslation($translations, $path); $this->assertNotEquals(false, $rc); $contents = file_get_contents($path); diff --git a/tests/PHPUnit/Core/UnzipTest.php b/tests/PHPUnit/Core/UnzipTest.php index 8ec666dd79..221c420991 100644 --- a/tests/PHPUnit/Core/UnzipTest.php +++ b/tests/PHPUnit/Core/UnzipTest.php @@ -5,6 +5,8 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Unzip; + class UnzipTest extends PHPUnit_Framework_TestCase { /** @@ -19,7 +21,7 @@ class UnzipTest extends PHPUnit_Framework_TestCase $filename = dirname(__FILE__) . '/Unzip/' . $test . '.zip'; if (class_exists('ZipArchive', false)) { - $unzip = Piwik_Unzip::factory('ZipArchive', $filename); + $unzip = Unzip::factory('ZipArchive', $filename); $res = $unzip->extract($extractDir); $this->assertEquals(1, count($res)); $this->assertFileExists($extractDir . $test . '.txt'); @@ -36,7 +38,7 @@ class UnzipTest extends PHPUnit_Framework_TestCase unlink($extractDir . $test . '.txt'); } - $unzip = Piwik_Unzip::factory('PclZip', $filename); + $unzip = Unzip::factory('PclZip', $filename); $res = $unzip->extract($extractDir); $this->assertEquals(1, count($res)); $this->assertFileExists($extractDir . $test . '.txt'); diff --git a/tests/PHPUnit/Core/UpdaterTest.php b/tests/PHPUnit/Core/UpdaterTest.php index 546a9891b6..8dc33e10ed 100644 --- a/tests/PHPUnit/Core/UpdaterTest.php +++ b/tests/PHPUnit/Core/UpdaterTest.php @@ -5,6 +5,8 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Piwik_Updater; + class UpdaterTest extends DatabaseTestCase { /** diff --git a/tests/PHPUnit/Core/UrlTest.php b/tests/PHPUnit/Core/UrlTest.php index 1866d74128..12fb22033c 100644 --- a/tests/PHPUnit/Core/UrlTest.php +++ b/tests/PHPUnit/Core/UrlTest.php @@ -1,5 +1,6 @@ <?php use Piwik\Config; +use Piwik\Url; /** * Piwik - Open source web analytics @@ -15,18 +16,18 @@ class UrlTest extends PHPUnit_Framework_TestCase */ public function testAllMethods() { - $this->assertEquals(Piwik_Url::getCurrentQueryStringWithParametersModified(array()), Piwik_Url::getCurrentQueryString()); - $this->assertEquals(Piwik_Url::getCurrentUrl(), Piwik_Url::getCurrentUrlWithoutQueryString()); - $this->assertEquals(Piwik_Url::getCurrentUrl(), Piwik_Url::getCurrentScheme() . '://' . Piwik_Url::getCurrentHost() . Piwik_Url::getCurrentScriptName()); + $this->assertEquals(Url::getCurrentQueryStringWithParametersModified(array()), Url::getCurrentQueryString()); + $this->assertEquals(Url::getCurrentUrl(), Url::getCurrentUrlWithoutQueryString()); + $this->assertEquals(Url::getCurrentUrl(), Url::getCurrentScheme() . '://' . Url::getCurrentHost() . Url::getCurrentScriptName()); $_SERVER['QUERY_STRING'] = 'q=test'; - $parameters = array_keys(Piwik_Url::getArrayFromCurrentQueryString()); + $parameters = array_keys(Url::getArrayFromCurrentQueryString()); $parametersNameToValue = array(); foreach ($parameters as $name) { $parametersNameToValue[$name] = null; } - $this->assertEquals('', Piwik_Url::getCurrentQueryStringWithParametersModified($parametersNameToValue)); + $this->assertEquals('', Url::getCurrentQueryStringWithParametersModified($parametersNameToValue)); } /** @@ -67,7 +68,7 @@ class UrlTest extends PHPUnit_Framework_TestCase Config::getInstance()->General['proxy_host_headers'] = array($test[2]); Config::getInstance()->General['proxy_ips'] = array($test[3]); Config::getInstance()->General['enable_trusted_host_check'] = 0; - $this->assertEquals($test[4], Piwik_Url::getCurrentHost(), $description); + $this->assertEquals($test[4], Url::getCurrentHost(), $description); } /** @@ -139,7 +140,7 @@ class UrlTest extends PHPUnit_Framework_TestCase Config::getInstance()->General['enable_trusted_host_check'] = 1; Config::getInstance()->General['trusted_hosts'] = array($httphost); $urlToTest = $testurl; - $this->assertEquals($result, Piwik_Url::isLocalUrl($urlToTest)); + $this->assertEquals($result, Url::isLocalUrl($urlToTest)); } /** @@ -179,7 +180,7 @@ class UrlTest extends PHPUnit_Framework_TestCase Config::getInstance()->General['trusted_hosts'] = array($host); - $url = Piwik_Url::getCurrentUrlWithoutFilename(); + $url = Url::getCurrentUrlWithoutFilename(); $this->assertEquals($expected, $url); } @@ -211,7 +212,7 @@ class UrlTest extends PHPUnit_Framework_TestCase $_SERVER['REQUEST_URI'] = $uri; $_SERVER['PATH_INFO'] = $pathInfo; - $scriptPathName = Piwik_Url::getCurrentScriptName(); + $scriptPathName = Url::getCurrentScriptName(); $this->assertEquals($expected, $scriptPathName); } } @@ -249,7 +250,7 @@ class UrlTest extends PHPUnit_Framework_TestCase { Config::getInstance()->General['enable_trusted_host_check'] = 1; Config::getInstance()->General['trusted_hosts'] = $trustedHosts; - $this->assertEquals($expected, Piwik_Url::isValidHost($host), $description); + $this->assertEquals($expected, Url::isValidHost($host), $description); } /** @@ -259,6 +260,6 @@ class UrlTest extends PHPUnit_Framework_TestCase public function testGetReferer() { $_SERVER['HTTP_REFERER'] = 'http://www.piwik.org'; - $this->assertEquals('http://www.piwik.org', Piwik_Url::getReferer()); + $this->assertEquals('http://www.piwik.org', Url::getReferer()); } } diff --git a/tests/PHPUnit/DatabaseTestCase.php b/tests/PHPUnit/DatabaseTestCase.php index ba848c85fd..d0f2cb2b39 100644 --- a/tests/PHPUnit/DatabaseTestCase.php +++ b/tests/PHPUnit/DatabaseTestCase.php @@ -9,6 +9,7 @@ use Piwik\Config; use Piwik\DataAccess\ArchiveTableCreator; use Piwik\DataTable\Manager; use Piwik\Piwik; +use Piwik\Piwik_Option; use Piwik\Site; /** @@ -43,7 +44,7 @@ class DatabaseTestCase extends PHPUnit_Framework_TestCase Piwik::createDatabaseObject(); Piwik::createTables(); - Piwik::createLogObject(); + \Piwik\Log::make(); // \Piwik\PluginsManager::getInstance()->loadPlugins(array()); IntegrationTestCase::loadAllPlugins(); diff --git a/tests/PHPUnit/Fixtures/InvalidVisits.php b/tests/PHPUnit/Fixtures/InvalidVisits.php index a424f05c6d..144227e1c0 100644 --- a/tests/PHPUnit/Fixtures/InvalidVisits.php +++ b/tests/PHPUnit/Fixtures/InvalidVisits.php @@ -5,6 +5,7 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Http; /** * Adds one site and sends several invalid tracking requests. The result should be @@ -47,7 +48,7 @@ class Test_Piwik_Fixture_InvalidVisits extends Test_Piwik_BaseFixture // Trigger empty request $trackerUrl = self::getTrackerUrl(); - $response = Piwik_Http::fetchRemoteFile($trackerUrl); + $response = Http::fetchRemoteFile($trackerUrl); self::assertTrue(strpos($response, 'is a free open source web') !== false, 'Piwik empty request response not correct: ' . $response); $t = self::getTracker($idSite, $dateTime, $defaultInit = true); diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php index 3f9a92e021..8d3fe8d225 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php @@ -6,6 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ use Piwik\Common; +use Piwik\FrontController; require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php'; @@ -58,7 +59,7 @@ class Test_Piwik_Fixture_ManySitesImportedLogsWithXssAttempts extends Test_Piwik // collect widgets to add to the layout $groupedWidgets = array(); $dashboard = 0; - foreach (Piwik_GetWidgetsList() as $category => $widgets) { + foreach (WidgetsList::get() as $category => $widgets) { foreach ($widgets as $widget) { if ($widget['uniqueId'] == 'widgetSEOgetRank' || $widget['uniqueId'] == 'widgetReferersgetKeywordsForPage' @@ -89,7 +90,7 @@ class Test_Piwik_Fixture_ManySitesImportedLogsWithXssAttempts extends Test_Piwik $_GET['name'] = self::makeXssContent('dashboard name' . $id); $_GET['layout'] = Common::json_encode($layout); $_GET['idDashboard'] = $id + 1; - Piwik_FrontController::getInstance()->fetchDispatch('Dashboard', 'saveLayout'); + FrontController::getInstance()->fetchDispatch('Dashboard', 'saveLayout'); } $_GET = $oldGet; diff --git a/tests/PHPUnit/Integration/AnnotationsTest.php b/tests/PHPUnit/Integration/AnnotationsTest.php index d37d18a359..b7322b5a92 100755 --- a/tests/PHPUnit/Integration/AnnotationsTest.php +++ b/tests/PHPUnit/Integration/AnnotationsTest.php @@ -6,6 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\API\Request; use Piwik\Access; class AnnotationsTest extends IntegrationTestCase @@ -312,14 +313,14 @@ class AnnotationsTest extends IntegrationTestCase if ($checkException) { try { - $request = new Piwik_API_Request($request); + $request = new Request($request); $request->process(); $this->fail($failMessage); } catch (Exception $ex) { // pass } } else { - $request = new Piwik_API_Request($request); + $request = new Request($request); $request->process(); } } diff --git a/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php b/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php index cc0f41eede..9d19a52a05 100755 --- a/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php +++ b/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php @@ -5,6 +5,7 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\API\Proxy; /** * This tests the output of the API plugin API @@ -22,7 +23,7 @@ class Test_Piwik_Integration_ApiGetReportMetadata extends IntegrationTestCase // From Piwik 1.5, we hide Goals.getConversions and other get* methods via @ignore, but we // ensure that they still work. This hack allows the API proxy to let us generate example // URLs for the ignored functions - Piwik_API_Proxy::getInstance()->setHideIgnoredFunctions(false); + Proxy::getInstance()->setHideIgnoredFunctions(false); } public function tearDown() @@ -30,7 +31,7 @@ class Test_Piwik_Integration_ApiGetReportMetadata extends IntegrationTestCase parent::tearDown(); // reset that value after the test - Piwik_API_Proxy::getInstance()->setHideIgnoredFunctions(true); + Proxy::getInstance()->setHideIgnoredFunctions(true); } public function getOutputPrefix() diff --git a/tests/PHPUnit/Integration/AutoSuggestAPITest.php b/tests/PHPUnit/Integration/AutoSuggestAPITest.php index 5b97695dd0..1433c3ce66 100644 --- a/tests/PHPUnit/Integration/AutoSuggestAPITest.php +++ b/tests/PHPUnit/Integration/AutoSuggestAPITest.php @@ -5,6 +5,7 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\API\Request; use Piwik\Date; /** @@ -76,7 +77,7 @@ class Test_Piwik_Integration_AutoSuggestAPITest extends IntegrationTestCase public function testAnotherApi($api, $params) { // Get the top segment value - $request = new Piwik_API_Request( + $request = new Request( 'method=API.getSuggestedValuesForSegment' . '&segmentName=' . $params['segmentToComplete'] . '&idSite=' . $params['idSite'] diff --git a/tests/PHPUnit/Integration/LabelFilterTest.php b/tests/PHPUnit/Integration/LabelFilterTest.php index 0141761bed..3a345c018c 100644 --- a/tests/PHPUnit/Integration/LabelFilterTest.php +++ b/tests/PHPUnit/Integration/LabelFilterTest.php @@ -7,7 +7,7 @@ */ /** - * Tests the class Piwik_API_DataTableManipulator_LabelFilter. + * Tests the class LabelFilter. * This is not possible as unit test, since it loads data from the archive. */ class Test_Piwik_Integration_LabelFilter extends IntegrationTestCase diff --git a/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php b/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php index 6d809c5b8a..ea3c0f764d 100755 --- a/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php +++ b/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php @@ -5,6 +5,7 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\API\Proxy; use Piwik\Archive; /** @@ -23,12 +24,12 @@ class Test_Piwik_Integration_OneVisitorTwoVisits extends IntegrationTestCase public function setUp() { - Piwik_API_Proxy::getInstance()->setHideIgnoredFunctions(false); + Proxy::getInstance()->setHideIgnoredFunctions(false); } public function tearDown() { - Piwik_API_Proxy::getInstance()->setHideIgnoredFunctions(true); + Proxy::getInstance()->setHideIgnoredFunctions(true); } /** diff --git a/tests/PHPUnit/Integration/TrackingAPI_SetVisitorIdTest.php b/tests/PHPUnit/Integration/TrackingAPI_SetVisitorIdTest.php index e956272a66..4b18c616b8 100644 --- a/tests/PHPUnit/Integration/TrackingAPI_SetVisitorIdTest.php +++ b/tests/PHPUnit/Integration/TrackingAPI_SetVisitorIdTest.php @@ -5,6 +5,7 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\API\Proxy; /** * This test tests that when using &cid=, the visitor ID is enforced @@ -16,12 +17,12 @@ class Test_Piwik_Integration_TrackingAPI_SetVisitorId extends IntegrationTestCas public function setUp() { - Piwik_API_Proxy::getInstance()->setHideIgnoredFunctions(false); + Proxy::getInstance()->setHideIgnoredFunctions(false); } public function tearDown() { - Piwik_API_Proxy::getInstance()->setHideIgnoredFunctions(true); + Proxy::getInstance()->setHideIgnoredFunctions(true); } /** diff --git a/tests/PHPUnit/Integration/VisitsInPast_InvalidateOldReportsTest.php b/tests/PHPUnit/Integration/VisitsInPast_InvalidateOldReportsTest.php index d93876413a..ac6f7e5c01 100644 --- a/tests/PHPUnit/Integration/VisitsInPast_InvalidateOldReportsTest.php +++ b/tests/PHPUnit/Integration/VisitsInPast_InvalidateOldReportsTest.php @@ -5,6 +5,7 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\API\Request; /** * Track visits before website creation date and test that Piwik handles them correctly. @@ -69,16 +70,16 @@ class Test_Piwik_Integration_VisitsInPast_InvalidateOldReports extends Integrati // 1) Invalidate old reports for the 2 websites // Test invalidate 1 date only - $r = new Piwik_API_Request("module=API&method=CoreAdminHome.invalidateArchivedReports&idSites=4,5,6,55,-1,s',1&dates=2010-01-03"); + $r = new Request("module=API&method=CoreAdminHome.invalidateArchivedReports&idSites=4,5,6,55,-1,s',1&dates=2010-01-03"); ($r->process()); // Test invalidate comma separated dates - $r = new Piwik_API_Request("module=API&method=CoreAdminHome.invalidateArchivedReports&idSites=" . $idSite . "," . $idSite2 . "&dates=2010-01-06,2009-10-30"); + $r = new Request("module=API&method=CoreAdminHome.invalidateArchivedReports&idSites=" . $idSite . "," . $idSite2 . "&dates=2010-01-06,2009-10-30"); ($r->process()); // test invalidate date in the past - $r = new Piwik_API_Request("module=API&method=CoreAdminHome.invalidateArchivedReports&idSites=" . $idSite2 . "&dates=2009-06-29"); + $r = new Request("module=API&method=CoreAdminHome.invalidateArchivedReports&idSites=" . $idSite2 . "&dates=2009-06-29"); ($r->process()); // invalidate a date more recent to check the date is only updated when it's earlier than current - $r = new Piwik_API_Request("module=API&method=CoreAdminHome.invalidateArchivedReports&idSites=" . $idSite2 . "&dates=2010-03-03"); + $r = new Request("module=API&method=CoreAdminHome.invalidateArchivedReports&idSites=" . $idSite2 . "&dates=2010-03-03"); ($r->process()); // 2) Call API again, with an older date, which should now return data diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php index 6385057d3b..e7ec7bd6c9 100755 --- a/tests/PHPUnit/IntegrationTestCase.php +++ b/tests/PHPUnit/IntegrationTestCase.php @@ -5,6 +5,9 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\API\DocumentationGenerator; +use Piwik\API\Request; +use Piwik\API\Proxy; use Piwik\ArchiveProcessor\Rules; use Piwik\Config; use Piwik\DataAccess\ArchiveTableCreator; @@ -12,6 +15,8 @@ use Piwik\DataTable\Manager; use Piwik\Piwik; use Piwik\Common; use Piwik\Access; +use Piwik\Piwik_Option; +use Piwik\ReportRenderer; use Piwik\Site; use Piwik\Translate; @@ -158,7 +163,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase Piwik::createDatabaseObject(); Piwik::createTables(); - Piwik::createLogObject(); + \Piwik\Log::make(); \Piwik\PluginsManager::getInstance()->loadPlugins(array()); } catch (Exception $e) { @@ -354,7 +359,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase 'fileExtension' => 'html', 'otherRequestParameters' => array( 'idReport' => 1, - 'reportFormat' => Piwik_ReportRenderer::HTML_FORMAT, + 'reportFormat' => ReportRenderer::HTML_FORMAT, 'outputType' => Piwik_PDFReports_API::OUTPUT_RETURN ) ) @@ -377,7 +382,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase 'fileExtension' => 'pdf', 'otherRequestParameters' => array( 'idReport' => 1, - 'reportFormat' => Piwik_ReportRenderer::PDF_FORMAT, + 'reportFormat' => ReportRenderer::PDF_FORMAT, 'outputType' => Piwik_PDFReports_API::OUTPUT_RETURN ) ) @@ -437,7 +442,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase 'fileExtension' => 'html', 'otherRequestParameters' => array( 'idReport' => 4, - 'reportFormat' => Piwik_ReportRenderer::HTML_FORMAT, + 'reportFormat' => ReportRenderer::HTML_FORMAT, 'outputType' => Piwik_PDFReports_API::OUTPUT_RETURN ) ) @@ -488,9 +493,9 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase { // Get the URLs to query against the API for all functions starting with get* $skipped = $requestUrls = array(); - $apiMetadata = new Piwik_API_DocumentationGenerator; - foreach (Piwik_API_Proxy::getInstance()->getMetadata() as $class => $info) { - $moduleName = Piwik_API_Proxy::getInstance()->getModuleNameFromClassName($class); + $apiMetadata = new DocumentationGenerator; + foreach (Proxy::getInstance()->getMetadata() as $class => $info) { + $moduleName = Proxy::getInstance()->getModuleNameFromClassName($class); foreach ($info as $methodName => $infoMethod) { $apiId = $moduleName . '.' . $methodName; @@ -543,7 +548,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase // set idSubtable if subtable API is set if ($supertableApi !== false) { - $request = new Piwik_API_Request(array( + $request = new Request(array( 'module' => 'API', 'method' => $supertableApi, 'idSite' => $parametersToSet['idSite'], @@ -711,7 +716,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase // except for that particular test that we care about dates! && $isTestLogImportReverseChronological; - $request = new Piwik_API_Request($requestUrl); + $request = new Request($requestUrl); $dateTime = Common::getRequestVar('date', '', 'string', Common::getArrayFromQueryString($requestUrl)); list($processedFilePath, $expectedFilePath) = $this->getProcessedAndExpectedPaths($testName, $apiId); @@ -1071,7 +1076,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase { $result = array(); foreach (Piwik::getTablesInstalled() as $tableName) { - $result[$tableName] = Piwik_FetchAll("SELECT * FROM $tableName"); + $result[$tableName] = Db::fetchAll("SELECT * FROM $tableName"); } return $result; } @@ -1096,7 +1101,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase $createSql = Piwik::getTableCreateSql($tableType); $createSql = str_replace(Common::prefixTable($tableType), $table, $createSql); - Piwik_Query($createSql); + Db::query($createSql); } if (empty($rows)) { @@ -1122,7 +1127,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase } $sql = "INSERT INTO $table VALUES " . implode(',', $rowsSql); - Piwik_Query($sql); + Db::query($sql); } } @@ -1132,7 +1137,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase public static function deleteArchiveTables() { foreach (ArchiveTableCreator::getTablesArchivesInstalled() as $table) { - Piwik_Query("DROP TABLE IF EXISTS $table"); + Db::query("DROP TABLE IF EXISTS $table"); } ArchiveTableCreator::refreshTableList($forceReload = true); diff --git a/tests/PHPUnit/MockPiwikOption.php b/tests/PHPUnit/MockPiwikOption.php index 58bfda20c1..ed5dde3eb7 100644 --- a/tests/PHPUnit/MockPiwikOption.php +++ b/tests/PHPUnit/MockPiwikOption.php @@ -5,6 +5,8 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Piwik_Option; + class MockPiwikOption extends Piwik_Option { private $forcedOptionValue = false; diff --git a/tests/PHPUnit/Plugins/AnonymizeIPTest.php b/tests/PHPUnit/Plugins/AnonymizeIPTest.php index a164403130..c9a18a45cd 100644 --- a/tests/PHPUnit/Plugins/AnonymizeIPTest.php +++ b/tests/PHPUnit/Plugins/AnonymizeIPTest.php @@ -5,6 +5,8 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\IP; + require_once 'AnonymizeIP/AnonymizeIP.php'; class AnonymizeIPTest extends PHPUnit_Framework_TestCase @@ -39,21 +41,21 @@ class AnonymizeIPTest extends PHPUnit_Framework_TestCase { // each IP is tested with 0 to 4 octets masked for ($maskLength = 0; $maskLength <= 4; $maskLength++) { - $res = Piwik_AnonymizeIP::applyIPMask(Piwik_IP::P2N($ip), $maskLength); + $res = Piwik_AnonymizeIP::applyIPMask(IP::P2N($ip), $maskLength); $this->assertEquals($expected[$maskLength], $res, "Got " . bin2hex($res) . ", Expected " . bin2hex($expected[$maskLength])); } // edge case (bounds check) - $this->assertEquals("\x00\x00\x00\x00", Piwik_AnonymizeIP::applyIPMask(Piwik_IP::P2N($ip), 5)); + $this->assertEquals("\x00\x00\x00\x00", Piwik_AnonymizeIP::applyIPMask(IP::P2N($ip), 5)); // mask IPv4 mapped addresses for ($maskLength = 0; $maskLength <= 4; $maskLength++) { - $res = Piwik_AnonymizeIP::applyIPMask(Piwik_IP::P2N('::ffff:' . $ip), $maskLength); + $res = Piwik_AnonymizeIP::applyIPMask(IP::P2N('::ffff:' . $ip), $maskLength); $this->assertEquals($res, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff" . $expected[$maskLength], "Got " . bin2hex($res) . ", Expected " . bin2hex($expected[$maskLength])); } - $this->assertEquals("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x00\x00\x00\x00\x00", Piwik_AnonymizeIP::applyIPMask(Piwik_IP::P2N('::ffff:' . $ip), 5)); + $this->assertEquals("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x00\x00\x00\x00\x00", Piwik_AnonymizeIP::applyIPMask(IP::P2N('::ffff:' . $ip), 5)); // edge case (bounds check) - $this->assertEquals("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", Piwik_AnonymizeIP::applyIPMask(Piwik_IP::P2N('2001::ffff:' . $ip), 17)); + $this->assertEquals("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", Piwik_AnonymizeIP::applyIPMask(IP::P2N('2001::ffff:' . $ip), 17)); } } diff --git a/tests/PHPUnit/Plugins/LanguagesManagerTest.php b/tests/PHPUnit/Plugins/LanguagesManagerTest.php index 4f12ebcf63..fb0ca7012c 100755 --- a/tests/PHPUnit/Plugins/LanguagesManagerTest.php +++ b/tests/PHPUnit/Plugins/LanguagesManagerTest.php @@ -6,6 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ use Piwik\Common; +use Piwik\TranslationWriter; require_once 'LanguagesManager/API.php'; @@ -156,7 +157,7 @@ class Test_LanguagesManager extends PHPUnit_Framework_TestCase } if (isset($cleanedStrings[$stringLabel])) { $currentString = $cleanedStrings[$stringLabel]; - $decoded = Piwik_TranslationWriter::clean($currentString); + $decoded = TranslationWriter::clean($currentString); if ($currentString != $decoded) { self::$errors[] = "$language: found encoded entities in $stringLabel, converting entities to characters"; $writeCleanedFile = true; @@ -174,12 +175,12 @@ class Test_LanguagesManager extends PHPUnit_Framework_TestCase self::$errors[] = "$language: General_LayoutDirection must be rtl or ltr"; } if ($writeCleanedFile) { - $path = Piwik_TranslationWriter::getTranslationPath($language, 'tmp'); + $path = TranslationWriter::getTranslationPath($language, 'tmp'); // Reorder cleaned up translations as the same order as en.php uksort($cleanedStrings, array($this, 'sortTranslationsKeys')); - Piwik_TranslationWriter::saveTranslation($cleanedStrings, $path); + TranslationWriter::saveTranslation($cleanedStrings, $path); $output[] = (implode("\n", self::$errors) . "\n" . 'Translation file errors detected in ' . $language . '... Wrote cleaned translation file in: ' . $path . ". You can copy the cleaned files to /lang/\n"); diff --git a/tests/PHPUnit/Plugins/MultiSitesTest.php b/tests/PHPUnit/Plugins/MultiSitesTest.php index 63d952c8a6..e71f2e1031 100644 --- a/tests/PHPUnit/Plugins/MultiSitesTest.php +++ b/tests/PHPUnit/Plugins/MultiSitesTest.php @@ -28,7 +28,7 @@ class MultiSitesTest extends DatabaseTestCase /** * Testing that getOne returns a row even when there are no data - * This is necessary otherwise Piwik_API_ResponseBuilder throws 'Call to a member function getColumns() on a non-object' + * This is necessary otherwise ResponseBuilder throws 'Call to a member function getColumns() on a non-object' * * @group Plugins * @group MultiSites diff --git a/tests/PHPUnit/Plugins/PDFReportsTest.php b/tests/PHPUnit/Plugins/PDFReportsTest.php index 7d2fc3edfd..cc61ddf161 100644 --- a/tests/PHPUnit/Plugins/PDFReportsTest.php +++ b/tests/PHPUnit/Plugins/PDFReportsTest.php @@ -6,6 +6,8 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ use Piwik\Access; +use Piwik\ScheduledTime; +use Piwik\ScheduledTask; use Piwik\Site; require_once 'PDFReports/PDFReports.php'; @@ -40,7 +42,7 @@ class PDFReportsTest extends DatabaseTestCase 'idsite' => $this->idSite, 'description' => 'test description"', 'type' => 'email', - 'period' => Piwik_ScheduledTime::PERIOD_DAY, + 'period' => ScheduledTime::PERIOD_DAY, 'hour' => '4', 'format' => 'pdf', 'reports' => array('UserCountry_getCountry'), @@ -54,7 +56,7 @@ class PDFReportsTest extends DatabaseTestCase $dataWebsiteTwo = $data; $dataWebsiteTwo['idsite'] = 2; - $dataWebsiteTwo['period'] = Piwik_ScheduledTime::PERIOD_MONTH; + $dataWebsiteTwo['period'] = ScheduledTime::PERIOD_MONTH; self::addReport($dataWebsiteTwo); @@ -268,7 +270,7 @@ class PDFReportsTest extends DatabaseTestCase Piwik_PDFReports_API::getInstance()->addReport( 1, '', - Piwik_ScheduledTime::PERIOD_DAY, + ScheduledTime::PERIOD_DAY, 0, Piwik_MobileMessaging::MOBILE_TYPE, Piwik_MobileMessaging::SMS_FORMAT, @@ -344,7 +346,7 @@ class PDFReportsTest extends DatabaseTestCase // test no exception is raised when a scheduled report is set to never send $report6 = self::getMonthlyEmailReportData($this->idSite); $report6['idreport'] = 6; - $report6['period'] = Piwik_ScheduledTime::PERIOD_NEVER; + $report6['period'] = ScheduledTime::PERIOD_NEVER; $report6['deleted'] = 0; $stubbedPDFReportsAPI = $this->getMock('Piwik_PDFReports_API'); @@ -376,10 +378,10 @@ class PDFReportsTest extends DatabaseTestCase $scheduleTask4->setHour(15); // site is UTC-6.5, configured to be sent at 8h $expectedTasks = array( - new Piwik_ScheduledTask (Piwik_PDFReports_API::getInstance(), 'sendReport', 1, $scheduleTask1), - new Piwik_ScheduledTask (Piwik_PDFReports_API::getInstance(), 'sendReport', 2, $scheduleTask2), - new Piwik_ScheduledTask (Piwik_PDFReports_API::getInstance(), 'sendReport', 4, $scheduleTask3), - new Piwik_ScheduledTask (Piwik_PDFReports_API::getInstance(), 'sendReport', 5, $scheduleTask4), + new ScheduledTask (Piwik_PDFReports_API::getInstance(), 'sendReport', 1, $scheduleTask1), + new ScheduledTask (Piwik_PDFReports_API::getInstance(), 'sendReport', 2, $scheduleTask2), + new ScheduledTask (Piwik_PDFReports_API::getInstance(), 'sendReport', 4, $scheduleTask3), + new ScheduledTask (Piwik_PDFReports_API::getInstance(), 'sendReport', 5, $scheduleTask4), ); $pdfReportPlugin = new Piwik_PDFReports(); @@ -448,7 +450,7 @@ class PDFReportsTest extends DatabaseTestCase return array( 'idsite' => $idSite, 'description' => 'test description"', - 'period' => Piwik_ScheduledTime::PERIOD_DAY, + 'period' => ScheduledTime::PERIOD_DAY, 'hour' => '7', 'type' => 'email', 'format' => 'pdf', @@ -467,7 +469,7 @@ class PDFReportsTest extends DatabaseTestCase return array( 'idsite' => $idSite, 'description' => 'very very long and possibly truncated description. very very long and possibly truncated description. very very long and possibly truncated description. very very long and possibly truncated description. very very long and possibly truncated description. ', - 'period' => Piwik_ScheduledTime::PERIOD_MONTH, + 'period' => ScheduledTime::PERIOD_MONTH, 'hour' => '0', 'type' => 'email', 'format' => 'pdf', diff --git a/tests/PHPUnit/Plugins/PrivacyManagerTest.php b/tests/PHPUnit/Plugins/PrivacyManagerTest.php index c9cdbf8684..90ab77b367 100755 --- a/tests/PHPUnit/Plugins/PrivacyManagerTest.php +++ b/tests/PHPUnit/Plugins/PrivacyManagerTest.php @@ -13,6 +13,7 @@ use Piwik\DataTable\Manager; use Piwik\Piwik; use Piwik\Common; use Piwik\Date; +use Piwik\Piwik_Option; use Piwik\Site; require_once 'PrivacyManager/PrivacyManager.php'; @@ -117,7 +118,7 @@ class PrivacyManagerTest extends IntegrationTestCase ArchiveTableCreator::clear(); $tempTableName = Common::prefixTable(Piwik_PrivacyManager_LogDataPurger::TEMP_TABLE_NAME); - Piwik_Query("DROP TABLE IF EXISTS " . $tempTableName); + Db::query("DROP TABLE IF EXISTS " . $tempTableName); } /** @@ -261,7 +262,7 @@ class PrivacyManagerTest extends IntegrationTestCase { Piwik::truncateAllTables(); foreach (ArchiveTableCreator::getTablesArchivesInstalled() as $table) { - Piwik_Exec("DROP TABLE $table"); + Db::exec("DROP TABLE $table"); } // get purge data prediction @@ -332,7 +333,7 @@ class PrivacyManagerTest extends IntegrationTestCase $this->assertEquals($janRowCount, $tableCount); // January if($janRowCount != $tableCount) { - var_export(Piwik_FetchAll("SELECT * FROM " . Common::prefixTable($tableName) )); + var_export(Db::fetchAll("SELECT * FROM " . Common::prefixTable($tableName) )); } // check february numerics not deleted @@ -506,7 +507,7 @@ class PrivacyManagerTest extends IntegrationTestCase $purger = Piwik_PrivacyManager_LogDataPurger::make($this->settings, true); - $this->unusedIdAction = Piwik_FetchOne( + $this->unusedIdAction = Db::fetchOne( "SELECT idaction FROM " . Common::prefixTable('log_action') . " WHERE name = ?", array('whatever.com/_40')); $this->assertTrue($this->unusedIdAction > 0); @@ -518,7 +519,7 @@ class PrivacyManagerTest extends IntegrationTestCase $this->assertEquals(22, $this->_getTableCount('log_action')); // January // check that the unused action still exists - $count = Piwik_FetchOne( + $count = Db::fetchOne( "SELECT COUNT(*) FROM " . Common::prefixTable('log_action') . " WHERE idaction = ?", array($this->unusedIdAction)); $this->assertEquals(1, $count); @@ -723,11 +724,11 @@ class PrivacyManagerTest extends IntegrationTestCase foreach ($archiveTables['numeric'] as $table) { $realTable = Common::prefixTable($table); $sql = "DELETE FROM $realTable WHERE name NOT IN ('" . implode("','", $metricsToSave) . "') AND name NOT LIKE 'done%'"; - Piwik_Query($sql); + Db::query($sql); } foreach ($archiveTables['blob'] as $table) { $realTable = Common::prefixTable($table); - Piwik_Query("DELETE FROM $realTable WHERE name NOT IN ('VisitorInterest_timeGap')"); + Db::query("DELETE FROM $realTable WHERE name NOT IN ('VisitorInterest_timeGap')"); } // add garbage metrics @@ -738,15 +739,15 @@ class PrivacyManagerTest extends IntegrationTestCase VALUES (10000,?,1,?,?,?,?,?)"; // one metric for jan & one for feb - Piwik_Query(sprintf($sql, Common::prefixTable($archiveTables['numeric'][0])), + Db::query(sprintf($sql, Common::prefixTable($archiveTables['numeric'][0])), array(self::GARBAGE_FIELD, $janDate1, $janDate1, $janDate1, 1, 100)); - Piwik_Query(sprintf($sql, Common::prefixTable($archiveTables['numeric'][1])), + Db::query(sprintf($sql, Common::prefixTable($archiveTables['numeric'][1])), array(self::GARBAGE_FIELD, $febDate1, $febDate1, $febDate1, 1, 200)); // add garbage reports - Piwik_Query(sprintf($sql, Common::prefixTable($archiveTables['blob'][0])), + Db::query(sprintf($sql, Common::prefixTable($archiveTables['blob'][0])), array(self::GARBAGE_FIELD, $janDate1, $janDate1, $janDate1, 10, 'blobval')); - Piwik_Query(sprintf($sql, Common::prefixTable($archiveTables['blob'][1])), + Db::query(sprintf($sql, Common::prefixTable($archiveTables['blob'][1])), array(self::GARBAGE_FIELD, $febDate1, $febDate1, $febDate1, 20, 'blobval')); } @@ -760,7 +761,7 @@ class PrivacyManagerTest extends IntegrationTestCase $this->assertEquals(27, $this->_getTableCount('log_action')); $archiveTables = self::_getArchiveTableNames(); -// var_export(Piwik_FetchAll("SELECT * FROM " . Common::prefixTable($archiveTables['numeric'][0]))); +// var_export(Db::fetchAll("SELECT * FROM " . Common::prefixTable($archiveTables['numeric'][0]))); $janMetricCount = $this->_getExpectedNumericArchiveCountJan(); $this->assertEquals($janMetricCount, $this->_getTableCount($archiveTables['numeric'][0])); // January @@ -832,7 +833,7 @@ class PrivacyManagerTest extends IntegrationTestCase VALUES (1, 'abc', NOW(), 15, $unusedIdAction, $unusedIdAction, $unusedIdAction, $unusedIdAction, 1000)"; - Piwik_Query($sql); + Db::query($sql); } protected function _setTimeToRun() @@ -847,7 +848,7 @@ class PrivacyManagerTest extends IntegrationTestCase protected function _getTableCount($tableName, $where = '') { $sql = "SELECT COUNT(*) FROM " . Common::prefixTable($tableName) . " $where"; - return Piwik_FetchOne($sql); + return Db::fetchOne($sql); } protected function _tableExists($tableName) @@ -855,7 +856,7 @@ class PrivacyManagerTest extends IntegrationTestCase $dbName = Config::getInstance()->database['dbname']; $sql = "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = ? AND table_name = ?"; - return Piwik_FetchOne($sql, array($dbName, Common::prefixTable($tableName))) == 1; + return Db::fetchOne($sql, array($dbName, Common::prefixTable($tableName))) == 1; } protected static function _getArchiveTableNames() diff --git a/tests/PHPUnit/UI/UIIntegrationTest.php b/tests/PHPUnit/UI/UIIntegrationTest.php index 04cd86d70b..4fd0e6066e 100644 --- a/tests/PHPUnit/UI/UIIntegrationTest.php +++ b/tests/PHPUnit/UI/UIIntegrationTest.php @@ -7,6 +7,7 @@ */ use Piwik\Piwik; use Piwik\Access; +use Piwik\AssetManager; /** * Tests UI code by grabbing screenshots of webpages and comparing with expected files. @@ -41,7 +42,7 @@ class Test_Piwik_Integration_UIIntegrationTest extends IntegrationTestCase parent::setUpBeforeClass(); - Piwik_AssetManager::removeMergedAssets(); + AssetManager::removeMergedAssets(); // launch archiving so tests don't run out of time Piwik_VisitsSummary_API::getInstance()->get(self::$fixture->idSite, 'year', '2012-08-09'); diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php index 2aacac155b..de5a9d532f 100644 --- a/tests/PHPUnit/bootstrap.php +++ b/tests/PHPUnit/bootstrap.php @@ -4,6 +4,8 @@ //$_SERVER['REQUEST_URI'] = '/piwik-master/index.php'; //$_SERVER['HTTP_HOST'] = 'localhost'; +use Piwik\Http; + if (!defined("PIWIK_PATH_TEST_TO_ROOT")) { define('PIWIK_PATH_TEST_TO_ROOT', realpath(dirname(__FILE__) . '/../..')); } @@ -94,7 +96,7 @@ Try again. // Now testing if the webserver is running $piwikServerUrl = Test_Piwik_BaseFixture::getRootUrl(); try { - $fetched = Piwik_Http::sendHttpRequest($piwikServerUrl, $timeout = 3); + $fetched = Http::sendHttpRequest($piwikServerUrl, $timeout = 3); } catch (Exception $e) { $fetched = "ERROR fetching: " . $e->getMessage(); } diff --git a/tests/PHPUnit/proxy/index.php b/tests/PHPUnit/proxy/index.php index 9ecf0050f6..ec23250d00 100644 --- a/tests/PHPUnit/proxy/index.php +++ b/tests/PHPUnit/proxy/index.php @@ -4,6 +4,9 @@ * Used by tests/PHPUnit/Integration/ImportLogsTest.php and tests/PHPUnit/Integration/UITest.php */ +use Piwik\FrontController; +use Piwik\Tracker; + $GLOBALS['PIWIK_CONFIG_TEST_ENVIRONMENT'] = true; $GLOBALS['PIWIK_ACCESS_IS_SUPERUSER'] = true; $GLOBALS['PIWIK_ACCESS_SUPERUSER_LOGIN'] = 'superUserLogin'; @@ -22,14 +25,14 @@ require_once PIWIK_INCLUDE_PATH . '/core/EventDispatcher.php'; Piwik_Visualization_Cloud::$debugDisableShuffle = true; -Piwik_Tracker::setTestEnvironment(); +Tracker::setTestEnvironment(); Piwik_Tracker_Cache::deleteTrackerCache(); // Disable index.php dispatch since we do it manually below define('PIWIK_ENABLE_DISPATCH', false); include PIWIK_INCLUDE_PATH . '/index.php'; -$controller = new Piwik_FrontController; +$controller = new FrontController; $controller->init(); $controller->dispatch(); diff --git a/tests/PHPUnit/proxy/piwik.php b/tests/PHPUnit/proxy/piwik.php index 866038ba82..a7693cc3f7 100755 --- a/tests/PHPUnit/proxy/piwik.php +++ b/tests/PHPUnit/proxy/piwik.php @@ -13,6 +13,8 @@ // calling us waits for the full request to process before unblocking use Piwik\Config; use Piwik\DataTable\Manager; +use Piwik\Piwik_Option; +use Piwik\Tracker; use Piwik\Site; ob_start(); @@ -37,7 +39,7 @@ $trackerPlugins[] = 'DevicesDetection'; Config::getInstance()->Plugins_Tracker['Plugins_Tracker'] = $trackerPlugins; Piwik_UserCountry_LocationProvider_GeoIp::$geoIPDatabaseDir = 'tests/lib/geoip-files'; -Piwik_Tracker::setTestEnvironment(); +Tracker::setTestEnvironment(); Manager::getInstance()->deleteAll(); Piwik_Option::getInstance()->clearCache(); Site::clearCache(); |