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

11
www/analytics/plugins/Installation/FormFirstWebsiteSetup.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
@ -12,6 +12,7 @@ namespace Piwik\Plugins\Installation;
use HTML_QuickForm2_DataSource_Array;
use HTML_QuickForm2_Factory;
use HTML_QuickForm2_Rule;
use Piwik\Access;
use Piwik\Piwik;
use Piwik\Plugins\SitesManager\API;
use Piwik\QuickForm2;
@ -31,7 +32,7 @@ class FormFirstWebsiteSetup extends QuickForm2
HTML_QuickForm2_Factory::registerRule('checkTimezone', 'Piwik\Plugins\Installation\Rule_isValidTimezone');
$urlExample = 'http://example.org';
$javascriptOnClickUrlExample = "javascript:if(this.value=='$urlExample'){this.value='http://';} this.style.color='black';";
$javascriptOnClickUrlExample = "javascript:if (this.value=='$urlExample'){this.value='http://';} this.style.color='black';";
$timezones = API::getInstance()->getTimezonesList();
$timezones = array_merge(array('No timezone' => Piwik::translate('SitesManager_SelectACity')), $timezones);
@ -59,7 +60,7 @@ class FormFirstWebsiteSetup extends QuickForm2
1 => Piwik::translate('SitesManager_EnableEcommerce'),
));
$this->addElement('submit', 'submit', array('value' => Piwik::translate('General_Next') . ' »', 'class' => 'submit'));
$this->addElement('submit', 'submit', array('value' => Piwik::translate('General_Next') . ' »', 'class' => 'btn btn-lg'));
// default values
$this->addDataSource(new HTML_QuickForm2_DataSource_Array(array(
@ -79,7 +80,9 @@ class Rule_isValidTimezone extends HTML_QuickForm2_Rule
try {
$timezone = $this->owner->getValue();
if (!empty($timezone)) {
API::getInstance()->setDefaultTimezone($timezone);
Access::doAsSuperUser(function () use ($timezone) {
API::getInstance()->setDefaultTimezone($timezone);
});
}
} catch (\Exception $e) {
return false;