diff options
Diffstat (limited to 'core')
52 files changed, 0 insertions, 64 deletions
diff --git a/core/Access.php b/core/Access.php index bd3dbbb6a1..00093e6e4f 100644 --- a/core/Access.php +++ b/core/Access.php @@ -289,7 +289,6 @@ class Access ); } - /** * Returns an array of ID sites for which the user has a VIEW access only. * diff --git a/core/AssetManager/UIAsset/InMemoryUIAsset.php b/core/AssetManager/UIAsset/InMemoryUIAsset.php index f3e3d47b6e..961537a384 100644 --- a/core/AssetManager/UIAsset/InMemoryUIAsset.php +++ b/core/AssetManager/UIAsset/InMemoryUIAsset.php @@ -45,7 +45,6 @@ class InMemoryUIAsset extends UIAsset return false; } - public function writeContent($content) { $this->content = $content; diff --git a/core/AssetManager/UIAssetMinifier.php b/core/AssetManager/UIAssetMinifier.php index ad8bbb61a9..5f738092cc 100644 --- a/core/AssetManager/UIAssetMinifier.php +++ b/core/AssetManager/UIAssetMinifier.php @@ -23,7 +23,6 @@ class UIAssetMinifier extends Singleton parent::__construct(); } - /** * Indicates if the provided JavaScript content has already been minified or not. * The heuristic is based on a custom ratio : (size of file) / (number of lines). diff --git a/core/CliMulti.php b/core/CliMulti.php index f8b855d774..ac826c6ea2 100644 --- a/core/CliMulti.php +++ b/core/CliMulti.php @@ -211,7 +211,6 @@ class CliMulti { return SettingsPiwik::rewriteTmpPathWithInstanceId($dir); } - private function executeAsyncCli($url, Output $output, $cmdId) { $this->processes[] = new Process($cmdId); diff --git a/core/Config.php b/core/Config.php index f71baa710a..8183b3fdc2 100644 --- a/core/Config.php +++ b/core/Config.php @@ -637,7 +637,6 @@ class Config extends Singleton return false; } - /** * Write user configuration file * diff --git a/core/CronArchive.php b/core/CronArchive.php index 1549392876..b6a3dffdb0 100644 --- a/core/CronArchive.php +++ b/core/CronArchive.php @@ -689,7 +689,6 @@ class CronArchive $date = $this->getApiDateParameter($idSite, $period, $lastTimestampWebsiteProcessed); $url .= $this->getVisitsRequestUrl($idSite, $period, $date); - $url .= self::APPEND_TO_API_REQUEST; $visitsInLastPeriods = $visitsLastPeriod = 0; diff --git a/core/DataAccess/ArchivePurger.php b/core/DataAccess/ArchivePurger.php index ffb00905cf..e0f94409a1 100644 --- a/core/DataAccess/ArchivePurger.php +++ b/core/DataAccess/ArchivePurger.php @@ -93,5 +93,4 @@ class ArchivePurger } - } diff --git a/core/DataAccess/ArchiveSelector.php b/core/DataAccess/ArchiveSelector.php index ea406dafaf..fde4431d54 100644 --- a/core/DataAccess/ArchiveSelector.php +++ b/core/DataAccess/ArchiveSelector.php @@ -294,5 +294,4 @@ class ArchiveSelector " value = '" . ArchiveWriter::DONE_OK_TEMPORARY . "'))"; } - } diff --git a/core/DataFiles/SearchEngines.php b/core/DataFiles/SearchEngines.php index f8f69c8540..f171ab40a4 100644 --- a/core/DataFiles/SearchEngines.php +++ b/core/DataFiles/SearchEngines.php @@ -456,7 +456,6 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) { 'image.search.smt.docomo.ne.jp' => array('Google', 'MT'), 'gfsoso.com' => array('Google', 'q'), - // Google Earth // - 2010-09-13: are these redirects now? 'www.googleearth.de' => array('Google'), @@ -703,7 +702,6 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) { 'search.myway.com' => array('MyWebSearch'), 'search.mywebsearch.com' => array('MyWebSearch'), - // Najdi 'www.najdi.si' => array('Najdi.si', 'q', 'search.jsp?q={k}'), @@ -982,7 +980,6 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) { 'video.search.yahoo.co.jp' => array('Yahoo! Japan Videos', 'p', 'search?p={k}'), 'image.search.yahoo.co.jp' => array('Yahoo! Japan Images', 'p', 'search?p={k}'), - // Yahoo 'search.yahoo.com' => array('Yahoo!', array('p', 'q'), 'search?p={k}'), // '*.search.yahoo.com' => array('Yahoo!'), // see built-in helper in Common.php diff --git a/core/DataTable/Renderer/Tsv.php b/core/DataTable/Renderer/Tsv.php index 79a8cd6a23..cfffbf24a0 100644 --- a/core/DataTable/Renderer/Tsv.php +++ b/core/DataTable/Renderer/Tsv.php @@ -8,7 +8,6 @@ */ namespace Piwik\DataTable\Renderer; - /** * TSV export * diff --git a/core/DataTable/Renderer/Xml.php b/core/DataTable/Renderer/Xml.php index 055aa673da..a18e475d04 100644 --- a/core/DataTable/Renderer/Xml.php +++ b/core/DataTable/Renderer/Xml.php @@ -370,7 +370,6 @@ class Xml extends Renderer continue; } - // Handing case idgoal=7, creating a new array for that one $rowAttribute = ''; if (strstr($rowId, '=') !== false) { diff --git a/core/DataTable/TableNotFoundException.php b/core/DataTable/TableNotFoundException.php index e722d96b55..a8e181deaf 100644 --- a/core/DataTable/TableNotFoundException.php +++ b/core/DataTable/TableNotFoundException.php @@ -8,7 +8,6 @@ */ namespace Piwik\DataTable; - class TableNotFoundException extends \Exception { diff --git a/core/Db/Adapter.php b/core/Db/Adapter.php index 4df8cb403e..6bafa3a653 100644 --- a/core/Db/Adapter.php +++ b/core/Db/Adapter.php @@ -8,7 +8,6 @@ */ namespace Piwik\Db; - use Piwik\Loader; use Zend_Db_Table; diff --git a/core/Db/BatchInsert.php b/core/Db/BatchInsert.php index 6dd02d5ee6..858dad4e38 100644 --- a/core/Db/BatchInsert.php +++ b/core/Db/BatchInsert.php @@ -205,7 +205,6 @@ class BatchInsert return false; } - /** * Create CSV (or other delimited) files * diff --git a/core/Db/Schema.php b/core/Db/Schema.php index c54389fd75..e210de5835 100644 --- a/core/Db/Schema.php +++ b/core/Db/Schema.php @@ -29,7 +29,6 @@ class Schema extends Singleton */ private $schema = null; - /** * Get schema class name * diff --git a/core/Db/Schema/Mysql.php b/core/Db/Schema/Mysql.php index 6b04fa1f40..43a42f167d 100644 --- a/core/Db/Schema/Mysql.php +++ b/core/Db/Schema/Mysql.php @@ -132,7 +132,6 @@ class Mysql implements SchemaInterface ) ENGINE=$engine DEFAULT CHARSET=utf8 ", - 'log_action' => "CREATE TABLE {$prefixTables}log_action ( idaction INTEGER(10) UNSIGNED NOT NULL AUTO_INCREMENT, name TEXT, diff --git a/core/DeviceDetectorCache.php b/core/DeviceDetectorCache.php index 70a6f68bb7..2c637aa95e 100644 --- a/core/DeviceDetectorCache.php +++ b/core/DeviceDetectorCache.php @@ -41,7 +41,6 @@ class DeviceDetectorCache extends CacheFile implements \DeviceDetector\Cache\Cac return parent::get($id); } - /** * A function to store content a cache entry. * diff --git a/core/Filechecks.php b/core/Filechecks.php index ab25ae7d9d..33d0ed0696 100644 --- a/core/Filechecks.php +++ b/core/Filechecks.php @@ -117,7 +117,6 @@ class Filechecks $manifest = PIWIK_INCLUDE_PATH . '/config/manifest.inc.php'; - if (file_exists($manifest)) { require_once $manifest; } diff --git a/core/Log.php b/core/Log.php index db3961923d..4e505f7b63 100644 --- a/core/Log.php +++ b/core/Log.php @@ -365,7 +365,6 @@ class Log extends Singleton $this->currentLogLevel = $logLevel; } - public function getLogLevel() { return $this->currentLogLevel; diff --git a/core/Menu/MenuMain.php b/core/Menu/MenuMain.php index aed7760752..5f27f3229e 100644 --- a/core/Menu/MenuMain.php +++ b/core/Menu/MenuMain.php @@ -8,7 +8,6 @@ */ namespace Piwik\Menu; - /** * @deprecated since 2.4.0 * @see MenuReporting diff --git a/core/Menu/MenuTop.php b/core/Menu/MenuTop.php index 86fc1ab0c6..55c09c57af 100644 --- a/core/Menu/MenuTop.php +++ b/core/Menu/MenuTop.php @@ -9,7 +9,6 @@ namespace Piwik\Menu; use Piwik\Piwik; - /** * Contains menu entries for the Top menu (the menu at the very top of the page). * Plugins can implement the `configureTopMenu()` method of the `Menu` plugin class to add, rename of remove diff --git a/core/Metrics.php b/core/Metrics.php index 8ac04a9a39..4af30600d3 100644 --- a/core/Metrics.php +++ b/core/Metrics.php @@ -8,7 +8,6 @@ */ namespace Piwik; - use Piwik\Cache\LanguageAwareStaticCache; use Piwik\Cache\PluginAwareStaticCache; diff --git a/core/Period.php b/core/Period.php index bff447dc5e..868ead7f13 100644 --- a/core/Period.php +++ b/core/Period.php @@ -92,7 +92,6 @@ abstract class Period && $period != 'range'; } - /** * Returns the first day of the period. * diff --git a/core/Period/Factory.php b/core/Period/Factory.php index abf4c9aed0..b490956531 100644 --- a/core/Period/Factory.php +++ b/core/Period/Factory.php @@ -39,7 +39,6 @@ class Factory $date = Date::factory($date); } - switch ($period) { case 'day': return new Day($date); @@ -78,7 +77,6 @@ class Factory throw new Exception($message); } - /** * Creates a Period instance using a period, date and timezone. * diff --git a/core/Period/Week.php b/core/Period/Week.php index 80aba977c1..f7b7264943 100644 --- a/core/Period/Week.php +++ b/core/Period/Week.php @@ -8,7 +8,6 @@ */ namespace Piwik\Period; - use Piwik\Period; use Piwik\Piwik; diff --git a/core/Piwik.php b/core/Piwik.php index c723c541ca..4c4f6fba74 100644 --- a/core/Piwik.php +++ b/core/Piwik.php @@ -381,7 +381,6 @@ class Piwik return false; } - /** * Returns true if the current user has Super User access. * @@ -743,7 +742,6 @@ class Piwik return false; } - /** * Returns the class name of an object without its namespace. * @@ -757,7 +755,6 @@ class Piwik return end($parts); } - /** * Post an event to Piwik's event dispatcher which will execute the event's observers. * diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php index 994aabc6e7..baf63c5cb2 100644 --- a/core/Plugin/Manager.php +++ b/core/Plugin/Manager.php @@ -562,7 +562,6 @@ class Manager extends Singleton return $plugins; } - protected static function isManifestFileFound($path) { return file_exists($path . "/" . MetadataLoader::PLUGIN_JSON_FILENAME); @@ -602,7 +601,6 @@ class Manager extends Singleton return false; } - /** * Load the specified plugins. * @@ -804,7 +802,6 @@ class Manager extends Singleton return $ignored; } - /** * Returns the name of all plugins found in this Piwik instance * (including those not enabled and themes) @@ -822,7 +819,6 @@ class Manager extends Singleton return $pluginsToLoad; } - /** * Loads the plugin filename and instantiates the plugin with the given name, eg. UserCountry * diff --git a/core/Profiler.php b/core/Profiler.php index 6eeba2c973..e9297464ee 100644 --- a/core/Profiler.php +++ b/core/Profiler.php @@ -8,7 +8,6 @@ */ namespace Piwik; - /** * Class Profiler helps with measuring memory, and profiling the database. * To enable set in your config.ini.php diff --git a/core/ProxyHeaders.php b/core/ProxyHeaders.php index 5cd8e74edd..3cefeb238c 100644 --- a/core/ProxyHeaders.php +++ b/core/ProxyHeaders.php @@ -8,7 +8,6 @@ */ namespace Piwik; - /** * Proxy headers * diff --git a/core/ProxyHttp.php b/core/ProxyHttp.php index ec62eca296..cb1fa654d3 100644 --- a/core/ProxyHttp.php +++ b/core/ProxyHttp.php @@ -193,7 +193,6 @@ class ProxyHttp !empty($autoAppendFile); } - /** * Workaround IE bug when downloading certain document types over SSL and * cache control headers are present, e.g., @@ -220,7 +219,6 @@ class ProxyHttp } } - /** * Set response header, e.g., HTTP/1.0 200 Ok * diff --git a/core/SettingsServer.php b/core/SettingsServer.php index 6c172c3ecf..fc9d5f6bc1 100644 --- a/core/SettingsServer.php +++ b/core/SettingsServer.php @@ -40,7 +40,6 @@ class SettingsServer return !empty($GLOBALS['PIWIK_TRACKER_MODE']); } - /** * Returns `true` if running on Microsoft IIS 7 (or above), `false` if otherwise. * diff --git a/core/TaskScheduler.php b/core/TaskScheduler.php index 602c1987a6..6d94d591a1 100644 --- a/core/TaskScheduler.php +++ b/core/TaskScheduler.php @@ -82,7 +82,6 @@ class TaskScheduler extends Singleton return self::getInstance()->doRunTasks(); } - // for backwards compatibility private function collectTasksRegisteredViaEvent() { diff --git a/core/Tracker.php b/core/Tracker.php index d3c750ac62..7f9304feca 100644 --- a/core/Tracker.php +++ b/core/Tracker.php @@ -890,7 +890,6 @@ class Tracker return $isAuthenticated; } - protected function runScheduledTasksIfAllowed($isAuthenticated) { // Do not run schedule task if we are importing logs @@ -914,5 +913,4 @@ class Tracker return file_get_contents("php://input"); } - } diff --git a/core/Tracker/Db/Mysqli.php b/core/Tracker/Db/Mysqli.php index 2cd5e5f141..78e2d9ee29 100644 --- a/core/Tracker/Db/Mysqli.php +++ b/core/Tracker/Db/Mysqli.php @@ -27,7 +27,6 @@ class Mysqli extends Db protected $charset; protected $activeTransaction = false; - /** * Builds the DB object * diff --git a/core/Tracker/GoalManager.php b/core/Tracker/GoalManager.php index c7e55747d3..fbc73381aa 100644 --- a/core/Tracker/GoalManager.php +++ b/core/Tracker/GoalManager.php @@ -828,7 +828,6 @@ class GoalManager return $match; } - /** * @param ConversionDimension[] $dimensions * @param string $hook diff --git a/core/Tracker/PageUrl.php b/core/Tracker/PageUrl.php index 083141a249..1d8486eda0 100644 --- a/core/Tracker/PageUrl.php +++ b/core/Tracker/PageUrl.php @@ -63,7 +63,6 @@ class PageUrl return $url; } - /** * Returns the array of parameters names that must be excluded from the Query String in all tracked URLs * @static @@ -96,7 +95,6 @@ class PageUrl return $parametersToExclude; } - /** * Returns true if URL fragments should be removed for a specific site, * false if otherwise. diff --git a/core/Tracker/TableLogAction.php b/core/Tracker/TableLogAction.php index 979aaf8a5e..6ebc6d60ff 100644 --- a/core/Tracker/TableLogAction.php +++ b/core/Tracker/TableLogAction.php @@ -13,7 +13,6 @@ use Piwik\Common; use Piwik\SegmentExpression; use Piwik\Tracker; - /** * This class is used to query Action IDs from the log_action table. * @@ -176,7 +175,6 @@ class TableLogAction return array($fieldNameToActionId, $fieldNamesToInsert); } - /** * Convert segment expression to an action ID or an SQL expression. * diff --git a/core/Translate/Filter/ByBaseTranslations.php b/core/Translate/Filter/ByBaseTranslations.php index 755c669e2b..8a2e095d95 100644 --- a/core/Translate/Filter/ByBaseTranslations.php +++ b/core/Translate/Filter/ByBaseTranslations.php @@ -9,7 +9,6 @@ namespace Piwik\Translate\Filter; - /** */ class ByBaseTranslations extends FilterAbstract diff --git a/core/Translate/Filter/ByParameterCount.php b/core/Translate/Filter/ByParameterCount.php index 72f7fd24d4..74be50d26d 100644 --- a/core/Translate/Filter/ByParameterCount.php +++ b/core/Translate/Filter/ByParameterCount.php @@ -9,7 +9,6 @@ namespace Piwik\Translate\Filter; - /** */ class ByParameterCount extends FilterAbstract diff --git a/core/Translate/Filter/EmptyTranslations.php b/core/Translate/Filter/EmptyTranslations.php index 3c67f1f50d..75e3e6536f 100644 --- a/core/Translate/Filter/EmptyTranslations.php +++ b/core/Translate/Filter/EmptyTranslations.php @@ -9,7 +9,6 @@ namespace Piwik\Translate\Filter; - /** */ class EmptyTranslations extends FilterAbstract diff --git a/core/Translate/Filter/EncodedEntities.php b/core/Translate/Filter/EncodedEntities.php index 58b7d08471..b7e3d6a54e 100644 --- a/core/Translate/Filter/EncodedEntities.php +++ b/core/Translate/Filter/EncodedEntities.php @@ -9,7 +9,6 @@ namespace Piwik\Translate\Filter; - use Piwik\Translate; /** diff --git a/core/Translate/Filter/UnnecassaryWhitespaces.php b/core/Translate/Filter/UnnecassaryWhitespaces.php index b104b30a1c..61211fc8ab 100644 --- a/core/Translate/Filter/UnnecassaryWhitespaces.php +++ b/core/Translate/Filter/UnnecassaryWhitespaces.php @@ -9,7 +9,6 @@ namespace Piwik\Translate\Filter; - /** */ class UnnecassaryWhitespaces extends FilterAbstract diff --git a/core/Translate/Validate/CoreTranslations.php b/core/Translate/Validate/CoreTranslations.php index 68de662f23..9fbfc39b8d 100644 --- a/core/Translate/Validate/CoreTranslations.php +++ b/core/Translate/Validate/CoreTranslations.php @@ -9,7 +9,6 @@ namespace Piwik\Translate\Validate; - use Piwik\Common; /** diff --git a/core/Translate/Writer.php b/core/Translate/Writer.php index 391decdc89..617b8b9552 100644 --- a/core/Translate/Writer.php +++ b/core/Translate/Writer.php @@ -207,7 +207,6 @@ class Writer return sprintf('%s/%s/%s.json', PIWIK_INCLUDE_PATH, $base, $lang); } - /** * Converts translations to a string that can be written to a file * diff --git a/core/Unzip/Gzip.php b/core/Unzip/Gzip.php index aa7d07f315..16f08abf0a 100755 --- a/core/Unzip/Gzip.php +++ b/core/Unzip/Gzip.php @@ -9,7 +9,6 @@ namespace Piwik\Unzip; - /** * Unzip implementation for .gz files. * diff --git a/core/Unzip/PclZip.php b/core/Unzip/PclZip.php index 4d0ce536a9..b0ce4b3a75 100644 --- a/core/Unzip/PclZip.php +++ b/core/Unzip/PclZip.php @@ -8,7 +8,6 @@ */ namespace Piwik\Unzip; - /** * @see libs/PclZip */ diff --git a/core/Updates/1.2.5-rc7.php b/core/Updates/1.2.5-rc7.php index 94671da038..85ce3792f1 100644 --- a/core/Updates/1.2.5-rc7.php +++ b/core/Updates/1.2.5-rc7.php @@ -31,4 +31,3 @@ class Updates_1_2_5_rc7 extends Updates } } - diff --git a/core/Updates/1.5-b1.php b/core/Updates/1.5-b1.php index 4157a8c115..9661fe3213 100644 --- a/core/Updates/1.5-b1.php +++ b/core/Updates/1.5-b1.php @@ -9,7 +9,6 @@ namespace Piwik\Updates; - use Piwik\Common; use Piwik\Updater; use Piwik\Updates; diff --git a/core/Updates/1.9-b16.php b/core/Updates/1.9-b16.php index ceded83024..d6b1c04a09 100755 --- a/core/Updates/1.9-b16.php +++ b/core/Updates/1.9-b16.php @@ -29,7 +29,6 @@ class Updates_1_9_b16 extends Updates CHANGE `idaction_url` `idaction_url` INT( 10 ) UNSIGNED NULL DEFAULT NULL' => false, - 'ALTER TABLE `' . Common::prefixTable('log_visit') . '` ADD visit_total_searches SMALLINT(5) UNSIGNED NOT NULL AFTER `visit_total_actions`' => 1060, diff --git a/core/Updates/1.9-b19.php b/core/Updates/1.9-b19.php index da223fabb6..87d46f856a 100755 --- a/core/Updates/1.9-b19.php +++ b/core/Updates/1.9-b19.php @@ -33,7 +33,6 @@ class Updates_1_9_b19 extends Updates { Updater::updateDatabase(__FILE__, self::getSql()); - try { \Piwik\Plugin\Manager::getInstance()->activatePlugin('Transitions'); } catch (\Exception $e) { diff --git a/core/Updates/2.3.0-rc2.php b/core/Updates/2.3.0-rc2.php index 55219b4f92..052a314a86 100644 --- a/core/Updates/2.3.0-rc2.php +++ b/core/Updates/2.3.0-rc2.php @@ -22,5 +22,4 @@ class Updates_2_3_0_rc2 extends Updates ServerFilesGenerator::createHtAccessFiles(); } - } diff --git a/core/UrlHelper.php b/core/UrlHelper.php index 485b5ec7bf..70807a8601 100644 --- a/core/UrlHelper.php +++ b/core/UrlHelper.php @@ -234,7 +234,6 @@ class UrlHelper return $result; } - /** * Extracts a keyword from a raw not encoded URL. * Will only extract keyword if a known search engine has been detected. |