coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

update Piwik to version 2.16 (fixes #91)

Browse source
This commit is contained in:
oliver 2016-04-10 18:55:57 +02:00
commit d885a4baa9
5833 changed files with 418860 additions and 226988 deletions
Download patch file Download diff file Expand all files Collapse all files

191
www/analytics/plugins/CorePluginsAdmin/Controller.php
View file

@ -1,6 +1,6 @@
<?php
/**
* Piwik - Open source web analytics
* Piwik - free/libre analytics platform
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@ -8,8 +8,10 @@
*/
namespace Piwik\Plugins\CorePluginsAdmin;
use Exception;
use Piwik\API\Request;
use Piwik\Common;
use Piwik\Exception\MissingFilePermissionException;
use Piwik\Filechecks;
use Piwik\Filesystem;
use Piwik\Nonce;
@ -17,13 +19,11 @@ use Piwik\Notification;
use Piwik\Piwik;
use Piwik\Plugin;
use Piwik\Settings\Manager as SettingsManager;
use Piwik\Translation\Translator;
use Piwik\Url;
use Piwik\View;
use Piwik\Version;
use Exception;
use Piwik\View;
/**
*/
class Controller extends Plugin\ControllerAdmin
{
const UPDATE_NONCE = 'CorePluginsAdmin.updatePlugin';
@ -35,6 +35,50 @@ class Controller extends Plugin\ControllerAdmin
private $validSortMethods = array('popular', 'newest', 'alpha');
private $defaultSortMethod = 'popular';
/**
* @var Translator
*/
private $translator;
public function __construct(Translator $translator)
{
$this->translator = $translator;
parent::__construct();
}
public function marketplace()
{
self::dieIfMarketplaceIsDisabled();
$show = Common::getRequestVar('show', 'plugins', 'string');
$query = Common::getRequestVar('query', '', 'string', $_POST);
$sort = Common::getRequestVar('sort', $this->defaultSortMethod, 'string');
if (!in_array($sort, $this->validSortMethods)) {
$sort = $this->defaultSortMethod;
}
$mode = Common::getRequestVar('mode', 'admin', 'string');
if (!in_array($mode, array('user', 'admin'))) {
$mode = 'admin';
}
$view = $this->configureView('@CorePluginsAdmin/marketplace');
$marketplace = new Marketplace();
$showThemes = ($show === 'themes');
$view->plugins = $marketplace->searchPlugins($query, $sort, $showThemes);
$view->showThemes = $showThemes;
$view->mode = $mode;
$view->query = $query;
$view->sort = $sort;
$view->installNonce = Nonce::getNonce(static::INSTALL_NONCE);
$view->updateNonce = Nonce::getNonce(static::UPDATE_NONCE);
$view->isSuperUser = Piwik::hasUserSuperUserAccess();
return $view->render();
}
private function createUpdateOrInstallView($template, $nonceName)
{
static::dieIfMarketplaceIsDisabled();
@ -88,7 +132,7 @@ class Controller extends Plugin\ControllerAdmin
$nonce = Common::getRequestVar('nonce', null, 'string');
if (!Nonce::verifyNonce(static::INSTALL_NONCE, $nonce)) {
throw new \Exception(Piwik::translate('General_ExceptionNonceMismatch'));
throw new \Exception($this->translator->translate('General_ExceptionNonceMismatch'));
}
Nonce::discardNonce(static::INSTALL_NONCE);
@ -148,6 +192,30 @@ class Controller extends Plugin\ControllerAdmin
return $view->render();
}
/**
* @deprecated
*/
public function browsePlugins()
{
$this->redirectToIndex('CorePluginsAdmin', 'marketplace');
}
/**
* @deprecated
*/
public function browseThemes()
{
$this->redirectToIndex('CorePluginsAdmin', 'marketplace', null, null, null, array('show' => 'themes'));
}
/**
* @deprecated
*/
public function userBrowsePlugins()
{
$this->redirectToIndex('CorePluginsAdmin', 'marketplace', null, null, null, array('mode' => 'user'));
}
private function dieIfMarketplaceIsDisabled()
{
if (!CorePluginsAdmin::isMarketplaceEnabled()) {
@ -167,54 +235,6 @@ class Controller extends Plugin\ControllerAdmin
}
}
private function createBrowsePluginsOrThemesView($template, $themesOnly)
{
static::dieIfMarketplaceIsDisabled();
$query = Common::getRequestVar('query', '', 'string', $_POST);
$sort = Common::getRequestVar('sort', $this->defaultSortMethod, 'string');
if (!in_array($sort, $this->validSortMethods)) {
$sort = $this->defaultSortMethod;
}
$view = $this->configureView('@CorePluginsAdmin/' . $template);
$marketplace = new Marketplace();
$view->plugins = $marketplace->searchPlugins($query, $sort, $themesOnly);
$view->query = $query;
$view->sort = $sort;
$view->installNonce = Nonce::getNonce(static::INSTALL_NONCE);
$view->updateNonce = Nonce::getNonce(static::UPDATE_NONCE);
$view->isSuperUser = Piwik::hasUserSuperUserAccess();
return $view;
}
public function browsePlugins()
{
$view = $this->createBrowsePluginsOrThemesView('browsePlugins', $themesOnly = false);
return $view->render();
}
public function browseThemes()
{
$view = $this->createBrowsePluginsOrThemesView('browseThemes', $themesOnly = true);
return $view->render();
}
public function extend()
{
static::dieIfMarketplaceIsDisabled();
$view = $this->configureView('@CorePluginsAdmin/extend');
$view->installNonce = Nonce::getNonce(static::INSTALL_NONCE);
$view->isSuperUser = Piwik::hasUserSuperUserAccess();
return $view->render();
}
private function createPluginsOrThemesView($template, $themesOnly)
{
Piwik::checkUserHasSuperUserAccess();
@ -227,7 +247,7 @@ class Controller extends Plugin\ControllerAdmin
$view->deactivateNonce = Nonce::getNonce(static::DEACTIVATE_NONCE);
$view->pluginsInfo = $this->getPluginsInfo($themesOnly);
$users = \Piwik\Plugins\UsersManager\API::getInstance()->getUsers();
$users = Request::processRequest('UsersManager.getUsers');
$view->otherUsersCount = count($users) - 1;
$view->themeEnabled = \Piwik\Plugin\Manager::getInstance()->getThemeEnabled()->getPluginName();
@ -242,7 +262,10 @@ class Controller extends Plugin\ControllerAdmin
try {
$marketplace = new Marketplace();
$view->marketplacePluginNames = $marketplace->getAvailablePluginNames($themesOnly);
$view->pluginsHavingUpdate = $marketplace->getPluginsHavingUpdate($themesOnly);
$pluginsHavingUpdate = $marketplace->getPluginsHavingUpdate(true);
$themesHavingUpdate = $marketplace->getPluginsHavingUpdate(false);
$view->pluginsHavingUpdate = $pluginsHavingUpdate + $themesHavingUpdate;
} catch(Exception $e) {
// curl exec connection error (ie. server not connected to internet)
}
@ -283,28 +306,33 @@ class Controller extends Plugin\ControllerAdmin
protected function getPluginsInfo($themesOnly = false)
{
$pluginManager = \Piwik\Plugin\Manager::getInstance();
$plugins = $pluginManager->returnLoadedPluginsInfo();
$plugins = $pluginManager->loadAllPluginsAndGetTheirInfo();
foreach ($plugins as $pluginName => &$plugin) {
$plugin['isCorePlugin'] = $pluginManager->isPluginBundledWithCore($pluginName);
if (!empty($plugin['info']['description'])) {
$plugin['info']['description'] = $this->translator->translate($plugin['info']['description']);
}
if (!isset($plugin['info'])) {
$suffix = Piwik::translate('CorePluginsAdmin_PluginNotWorkingAlternative');
$suffix = $this->translator->translate('CorePluginsAdmin_PluginNotWorkingAlternative');
// If the plugin has been renamed, we do not show message to ask user to update plugin
if($pluginName != Request::renameModule($pluginName)) {
list($pluginNameRenamed, $methodName) = Request::getRenamedModuleAndAction($pluginName, 'index');
if ($pluginName != $pluginNameRenamed) {
$suffix = "You may uninstall the plugin or manually delete the files in piwik/plugins/$pluginName/";
}
$description = '<strong><em>'
. Piwik::translate('CorePluginsAdmin_PluginNotCompatibleWith', array($pluginName, self::getPiwikVersion()))
. $this->translator->translate('CorePluginsAdmin_PluginNotCompatibleWith', array($pluginName, self::getPiwikVersion()))
. '</strong><br/>'
. $suffix
. '</em>';
$plugin['info'] = array(
'description' => $description,
'version' => Piwik::translate('General_Unknown'),
'version' => $this->translator->translate('General_Unknown'),
'theme' => false,
);
}
@ -334,6 +362,8 @@ class Controller extends Plugin\ControllerAdmin
public function safemode($lastError = array())
{
$this->tryToRepairPiwik();
if (empty($lastError)) {
$lastError = array(
'message' => Common::getRequestVar('error_message', null, 'string'),
@ -359,15 +389,15 @@ class Controller extends Plugin\ControllerAdmin
return $message;
}
if(Common::isPhpCliMode()) {
Piwik_ExitWithMessage("Error:" . var_export($lastError, true));
if (Common::isPhpCliMode()) { // TODO: I can't find how this will ever get called / safeMode is never set for Console
throw new Exception("Error: " . var_export($lastError, true));
}
$view = new View('@CorePluginsAdmin/safemode');
$view->lastError = $lastError;
$view->isSuperUser = Piwik::hasUserSuperUserAccess();
$view->isAnonymousUser = Piwik::isUserIsAnonymous();
$view->plugins = Plugin\Manager::getInstance()->returnLoadedPluginsInfo();
$view->plugins = Plugin\Manager::getInstance()->loadAllPluginsAndGetTheirInfo();
$view->deactivateNonce = Nonce::getNonce(static::DEACTIVATE_NONCE);
$view->uninstallNonce = Nonce::getNonce(static::UNINSTALL_NONCE);
$view->emailSuperUser = implode(',', Piwik::getAllSuperUserAccessEmailAddresses());
@ -401,17 +431,17 @@ class Controller extends Plugin\ControllerAdmin
$actionToRedirect = 'themes';
}
$message = Piwik::translate('CorePluginsAdmin_SuccessfullyActicated', array($pluginName));
if (SettingsManager::hasPluginSettingsForCurrentUser($pluginName)) {
$message = $this->translator->translate('CorePluginsAdmin_SuccessfullyActicated', array($pluginName));
if (SettingsManager::hasSystemPluginSettingsForCurrentUser($pluginName)) {
$target = sprintf('<a href="index.php%s#%s">',
Url::getCurrentQueryStringWithParametersModified(array('module' => 'CoreAdminHome', 'action' => 'pluginSettings')),
Url::getCurrentQueryStringWithParametersModified(array('module' => 'CoreAdminHome', 'action' => 'adminPluginSettings')),
$pluginName);
$message .= ' ' . Piwik::translate('CorePluginsAdmin_ChangeSettingsPossible', array($target, '</a>'));
$message .= ' ' . $this->translator->translate('CorePluginsAdmin_ChangeSettingsPossible', array($target, '</a>'));
}
$notification = new Notification($message);
$notification->raw = true;
$notification->title = Piwik::translate('General_WellDone');
$notification->title = $this->translator->translate('General_WellDone');
$notification->context = Notification::CONTEXT_SUCCESS;
Notification\Manager::notify('CorePluginsAdmin_PluginActivated', $notification);
@ -439,11 +469,15 @@ class Controller extends Plugin\ControllerAdmin
$path = Filesystem::getPathToPiwikRoot() . '/plugins/' . $pluginName . '/';
$messagePermissions = Filechecks::getErrorMessageMissingPermissions($path);
$messageIntro = Piwik::translate("Warning: \"%s\" could not be uninstalled. Piwik did not have enough permission to delete the files in $path. ",
$messageIntro = $this->translator->translate("Warning: \"%s\" could not be uninstalled. Piwik did not have enough permission to delete the files in $path. ",
$pluginName);
$exitMessage = $messageIntro . "<br/><br/>" . $messagePermissions;
$exitMessage = $messageIntro . "<br/><br/>" . $messagePermissions;
$exitMessage .= "<br> Or manually delete this directory (using FTP or SSH access)";
Piwik_ExitWithMessage($exitMessage, $optionalTrace = false, $optionalLinks = false, $optionalLinkBack = true);
$ex = new MissingFilePermissionException($exitMessage);
$ex->setIsHtmlMessage();
throw $ex;
}
$this->redirectAfterModification($redirectAfter);
@ -456,7 +490,7 @@ class Controller extends Plugin\ControllerAdmin
$nonce = Common::getRequestVar('nonce', null, 'string');
if (!Nonce::verifyNonce($nonceName, $nonce)) {
throw new \Exception(Piwik::translate('General_ExceptionNonceMismatch'));
throw new \Exception($this->translator->translate('General_ExceptionNonceMismatch'));
}
Nonce::discardNonce($nonceName);
@ -475,7 +509,16 @@ class Controller extends Plugin\ControllerAdmin
private function getPluginNamesHavingSettingsForCurrentUser()
{
return array_keys(SettingsManager::getPluginSettingsForCurrentUser());
return SettingsManager::getPluginNamesHavingSystemSettings();
}
private function tryToRepairPiwik()
{
// in case any opcaches etc were not cleared after an update for instance. Might prevent from getting the
// error again
try {
Filesystem::deleteAllCacheOnUpdate();
} catch (Exception $e) {}
}
}