diff options
| -rw-r--r-- | plugins/CoreAdminHome/CustomLogo.php | 2 | ||||
| -rw-r--r-- | plugins/CoreUpdater/SystemSettings.php | 2 | ||||
| -rw-r--r-- | plugins/CoreVisualizations/Visualizations/Sparklines.php | 2 | ||||
| -rw-r--r-- | plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php | 2 | ||||
| -rw-r--r-- | plugins/ExampleUI/Reports/GetPlanetRatios.php | 5 | ||||
| -rw-r--r-- | plugins/ExampleUI/Reports/GetTemperatures.php | 4 | ||||
| -rw-r--r-- | plugins/UsersManager/Controller.php | 6 |
7 files changed, 10 insertions, 13 deletions
diff --git a/plugins/CoreAdminHome/CustomLogo.php b/plugins/CoreAdminHome/CustomLogo.php index e8dfffe3e6..97f384e3b6 100644 --- a/plugins/CoreAdminHome/CustomLogo.php +++ b/plugins/CoreAdminHome/CustomLogo.php @@ -108,7 +108,7 @@ class CustomLogo $directoryWritable = is_writable($directoryWritingTo); $logoFilesWriteable = is_writeable(PIWIK_DOCUMENT_ROOT . '/' . $pathUserLogo) && is_writeable(PIWIK_DOCUMENT_ROOT . '/' . $this->getPathUserSvgLogo()) - && is_writeable(PIWIK_DOCUMENT_ROOT . '/' . $this->getPathUserLogoSmall());; + && is_writeable(PIWIK_DOCUMENT_ROOT . '/' . $this->getPathUserLogoSmall()); $isCustomLogoWritable = ($logoFilesWriteable || $directoryWritable) && $this->isFileUploadEnabled(); diff --git a/plugins/CoreUpdater/SystemSettings.php b/plugins/CoreUpdater/SystemSettings.php index ba769ca3ac..b42ae603b1 100644 --- a/plugins/CoreUpdater/SystemSettings.php +++ b/plugins/CoreUpdater/SystemSettings.php @@ -80,7 +80,7 @@ class SystemSettings extends \Piwik\Settings\Plugin\SystemSettings $field->validate = function ($channel) use ($releaseChannels) { if (!$releaseChannels->isValidReleaseChannelId($channel)) { throw new \Exception('Release channel is not valid'); - }; + } }; $field->inlineHelp = Piwik::translate('CoreAdminHome_DevelopmentProcess') diff --git a/plugins/CoreVisualizations/Visualizations/Sparklines.php b/plugins/CoreVisualizations/Visualizations/Sparklines.php index 02e29a716d..942defc1c2 100644 --- a/plugins/CoreVisualizations/Visualizations/Sparklines.php +++ b/plugins/CoreVisualizations/Visualizations/Sparklines.php @@ -132,7 +132,7 @@ class Sparklines extends ViewDataTable foreach ($comparisons->getRows() as $comparisonRow) { $segment = $comparisonRow->getMetadata('compareSegment'); if ($segment === false) { - $segment = Request::getRawSegmentFromRequest() ?: '';; + $segment = Request::getRawSegmentFromRequest() ?: ''; } $date = $comparisonRow->getMetadata('compareDate'); diff --git a/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php b/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php index 7ce15e6350..e226644985 100644 --- a/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php +++ b/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php @@ -59,7 +59,7 @@ class CronArchivingLastRunCheck implements Diagnostic if (empty($lastRunTime)) { $comment = $this->translator->translate('Diagnostics_CronArchivingHasNotRun') . '<br/><br/>' . $this->translator->translate('Diagnostics_CronArchivingRunDetails', - [$coreArchiveShort, $mailto, $commandToRerun, '<a href="https://matomo.org/docs/setup-auto-archiving/" target="_blank" rel="noreferrer noopener">', '</a>']);; + [$coreArchiveShort, $mailto, $commandToRerun, '<a href="https://matomo.org/docs/setup-auto-archiving/" target="_blank" rel="noreferrer noopener">', '</a>']); return [DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_ERROR, $comment)]; } diff --git a/plugins/ExampleUI/Reports/GetPlanetRatios.php b/plugins/ExampleUI/Reports/GetPlanetRatios.php index df18f9027c..22c6d60c44 100644 --- a/plugins/ExampleUI/Reports/GetPlanetRatios.php +++ b/plugins/ExampleUI/Reports/GetPlanetRatios.php @@ -8,7 +8,6 @@ namespace Piwik\Plugins\ExampleUI\Reports; -use Piwik\Plugin\Report; use Piwik\Plugin\ViewDataTable; use Piwik\Plugins\CoreVisualizations\Visualizations\Cloud; use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Pie; @@ -33,7 +32,7 @@ class GetPlanetRatios extends Base public function getDefaultTypeViewDataTable() { - return PIE::ID; + return Pie::ID; } public function configureWidgets(WidgetsList $widgetsList, ReportWidgetFactory $factory) @@ -56,7 +55,7 @@ class GetPlanetRatios extends Base { $view->config->addTranslation('value', 'times the diameter of Earth'); - if ($view->isViewDataTableId(PIE::ID)) { + if ($view->isViewDataTableId(Pie::ID)) { $view->config->columns_to_display = array('value'); $view->config->selectable_columns = array('value'); diff --git a/plugins/ExampleUI/Reports/GetTemperatures.php b/plugins/ExampleUI/Reports/GetTemperatures.php index cf14b0a2e6..adc2e3fbda 100644 --- a/plugins/ExampleUI/Reports/GetTemperatures.php +++ b/plugins/ExampleUI/Reports/GetTemperatures.php @@ -9,12 +9,10 @@ namespace Piwik\Plugins\ExampleUI\Reports; use Piwik\Piwik; -use Piwik\Plugin\Report; use Piwik\Plugin\ViewDataTable; use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Bar; use Piwik\Plugin\Manager as PluginManager; use Piwik\Report\ReportWidgetFactory; -use Piwik\View; use Piwik\Widget\WidgetsList; /** @@ -57,7 +55,7 @@ class GetTemperatures extends Base public function configureView(ViewDataTable $view) { - if ($view->isViewDataTableId(BAR::ID)) { + if ($view->isViewDataTableId(Bar::ID)) { $view->config->y_axis_unit = '°C'; $view->config->show_footer = false; diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php index 3d67327469..49fb7bd563 100644 --- a/plugins/UsersManager/Controller.php +++ b/plugins/UsersManager/Controller.php @@ -433,9 +433,9 @@ class Controller extends ControllerAdmin private function processPasswordChange($userLogin) { $email = Common::getRequestVar('email'); - $password = Common::getRequestvar('password', false); - $passwordBis = Common::getRequestvar('passwordBis', false); - $passwordCurrent = Common::getRequestvar('passwordConfirmation', false); + $password = Common::getRequestVar('password', false); + $passwordBis = Common::getRequestVar('passwordBis', false); + $passwordCurrent = Common::getRequestVar('passwordConfirmation', false); $newPassword = false; if (!empty($password) || !empty($passwordBis)) { |