diff options
Diffstat (limited to 'plugins/Installation/FormFirstWebsiteSetup.php')
| -rw-r--r-- | plugins/Installation/FormFirstWebsiteSetup.php | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/plugins/Installation/FormFirstWebsiteSetup.php b/plugins/Installation/FormFirstWebsiteSetup.php index 115b859a95..65f2666263 100644 --- a/plugins/Installation/FormFirstWebsiteSetup.php +++ b/plugins/Installation/FormFirstWebsiteSetup.php @@ -16,20 +16,6 @@ */ class Piwik_Installation_FormFirstWebsiteSetup extends Piwik_Form { - function validate() - { - try { - $timezone = $this->getSubmitValue('timezone'); - if(!empty($timezone)) - { - Piwik_SitesManager_API::getInstance()->setDefaultTimezone($timezone); - } - } catch(Exception $e) { - $this->_errors['timezone'] = Piwik_Translate('General_NotValid', Piwik_Translate('Installation_Timezone')); - } - return parent::validate(); - } - function init() { $urlToGoAfter = 'index.php' . Piwik_Url::getCurrentQueryString(); @@ -37,14 +23,9 @@ class Piwik_Installation_FormFirstWebsiteSetup extends Piwik_Form $urlExample = 'http://example.org'; $javascriptOnClickUrlExample = "\"javascript:if(this.value=='$urlExample'){this.value='http://';} this.style.color='black';\""; - $timezones = Piwik_SitesManager_API::getInstance()->getTimezonesList(); - $timezones = array_merge(array('No timezone' => Piwik_Translate('SitesManager_SelectACity')), $timezones); - $formElements = array( - array('text', 'siteName', Piwik_Translate('Installation_SetupWebSiteName')), - array('text', 'url', Piwik_Translate('Installation_SetupWebSiteURL'), "style='color:rgb(153, 153, 153);' value=$urlExample onfocus=".$javascriptOnClickUrlExample." onclick=".$javascriptOnClickUrlExample), - array('select', 'timezone', Piwik_Translate('Installation_Timezone'), $timezones), - + array('text', 'siteName', 'website name'), + array('text', 'url', 'website URL', "style='color:rgb(153, 153, 153);' value=$urlExample onfocus=".$javascriptOnClickUrlExample." onclick=".$javascriptOnClickUrlExample), ); $this->addElements( $formElements ); @@ -54,13 +35,6 @@ class Piwik_Installation_FormFirstWebsiteSetup extends Piwik_Form $formRules[] = array($row[1], Piwik_Translate('General_Required', $row[2]), 'required'); } - - $submitTimezone = $this->getSubmitValue('timezone'); - if(!$this->isSubmitted() - || !empty($submitTimezone)) - { - $this->setSelected('timezone', $submitTimezone); - } $this->addRules( $formRules ); $this->addElement('submit', 'submit', Piwik_Translate('Installation_SubmitGo')); |