diff options
Diffstat (limited to 'plugins/Installation')
-rw-r--r-- | plugins/Installation/Controller.php | 52 | ||||
-rw-r--r-- | plugins/Installation/FormDatabaseSetup.php | 32 | ||||
-rw-r--r-- | plugins/Installation/FormFirstWebsiteSetup.php | 32 | ||||
-rw-r--r-- | plugins/Installation/FormGeneralSetup.php | 32 | ||||
-rw-r--r-- | plugins/Installation/Installation.php | 32 | ||||
-rw-r--r-- | plugins/Installation/View.php | 32 |
6 files changed, 106 insertions, 106 deletions
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index fdd6f7c395..0489738dc0 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -1,20 +1,20 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik_Installation
- */
-
+<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik_Installation + */ + require_once "View.php"; -require_once "Installation/View.php";
-
-/**
- *
- * @package Piwik_Installation
+require_once "Installation/View.php"; + +/** + * + * @package Piwik_Installation */ class Piwik_Installation_Controller extends Piwik_Controller { @@ -191,7 +191,7 @@ class Piwik_Installation_Controller extends Piwik_Controller { Piwik::createTables(); Piwik::createAnonymousUser(); - Piwik::createTablesIndex();
+ Piwik::createTablesIndex(); $view->tablesCreated = true; $view->showNextStep = true; @@ -303,8 +303,8 @@ class Piwik_Installation_Controller extends Piwik_Controller $view->websiteName = urldecode($_SESSION['site_name']); -
- $jsTag = Piwik::getJavascriptCode($_SESSION['site_idSite'], Piwik_Url::getCurrentUrlWithoutFileName());
+ + $jsTag = Piwik::getJavascriptCode($_SESSION['site_idSite'], Piwik_Url::getCurrentUrlWithoutFileName()); $view->javascriptTag = $jsTag; $view->showNextStep = true; @@ -353,7 +353,7 @@ class Piwik_Installation_Controller extends Piwik_Controller } protected function writeConfigFileFromSession() - {
+ { $configFile = "; <?php exit; ?> DO NOT REMOVE THIS LINE\n"; $configFile .= "; file automatically generated during the piwik installation process\n"; @@ -522,12 +522,12 @@ class Piwik_Installation_Controller extends Piwik_Controller return $infos; } -}
-
-
-/**
- *
- * @package Piwik_Installation
+} + + +/** + * + * @package Piwik_Installation */ class Piwik_FakeAccess_SetSuperUser { function checkUserIsSuperUser() diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php index 33ed85a8a8..9ac6461b9e 100644 --- a/plugins/Installation/FormDatabaseSetup.php +++ b/plugins/Installation/FormDatabaseSetup.php @@ -1,19 +1,19 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik_Installation
- */
-
-require_once "modules/Form.php";
-
-/**
- *
- * @package Piwik_Installation
+<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik_Installation + */ + +require_once "modules/Form.php"; + +/** + * + * @package Piwik_Installation */ class Piwik_Installation_FormDatabaseSetup extends Piwik_Form { diff --git a/plugins/Installation/FormFirstWebsiteSetup.php b/plugins/Installation/FormFirstWebsiteSetup.php index e23d1f3ce2..952c5fb8c0 100644 --- a/plugins/Installation/FormFirstWebsiteSetup.php +++ b/plugins/Installation/FormFirstWebsiteSetup.php @@ -1,19 +1,19 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik_Installation
- */
-
-require_once "modules/Form.php";
-
-/**
- *
- * @package Piwik_Installation
+<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik_Installation + */ + +require_once "modules/Form.php"; + +/** + * + * @package Piwik_Installation */ class Piwik_Installation_FormFirstWebsiteSetup extends Piwik_Form { diff --git a/plugins/Installation/FormGeneralSetup.php b/plugins/Installation/FormGeneralSetup.php index 59c87faa53..8d90d9da9d 100644 --- a/plugins/Installation/FormGeneralSetup.php +++ b/plugins/Installation/FormGeneralSetup.php @@ -1,19 +1,19 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik_Installation
- */
-
-require_once "modules/Form.php";
-
-/**
- *
- * @package Piwik_Installation
+<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik_Installation + */ + +require_once "modules/Form.php"; + +/** + * + * @package Piwik_Installation */ class Piwik_Installation_FormGeneralSetup extends Piwik_Form { diff --git a/plugins/Installation/Installation.php b/plugins/Installation/Installation.php index 7e3a65abec..c98fa764a7 100644 --- a/plugins/Installation/Installation.php +++ b/plugins/Installation/Installation.php @@ -1,20 +1,20 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik_Installation
- */
-
+<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik_Installation + */ + + +require_once "Installation/Controller.php"; -require_once "Installation/Controller.php";
-
-/**
- *
- * @package Piwik_Installation
+/** + * + * @package Piwik_Installation */ class Piwik_Installation extends Piwik_Plugin { diff --git a/plugins/Installation/View.php b/plugins/Installation/View.php index 0b5c6e050b..c42807f97c 100644 --- a/plugins/Installation/View.php +++ b/plugins/Installation/View.php @@ -1,19 +1,19 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik_Installation
- */
-
-
-/**
- *
- * @package Piwik_Installation
- */
+<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik_Installation + */ + + +/** + * + * @package Piwik_Installation + */ class Piwik_Install_View extends Piwik_View { protected $mainTemplate = 'Installation/templates/structure.tpl'; |