From fabd73989661246c8b03a847311e92432fdeed41 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 22 Aug 2022 21:01:01 +0200 Subject: [PATCH] =?UTF-8?q?11.6.00-dev001=20configuration=20du=20proxy=20a?= =?UTF-8?q?u=20d=C3=A9marrage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core.php | 2 +- core/module/install/install.php | 12 ++ core/module/install/view/index/index.php | 140 ++++++++++++++--------- 3 files changed, 102 insertions(+), 52 deletions(-) diff --git a/core/core.php b/core/core.php index b5e91b49..52b71f06 100644 --- a/core/core.php +++ b/core/core.php @@ -47,7 +47,7 @@ class common { // Numéro de version const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/'; - const ZWII_VERSION = '11.6.00-dev'; + const ZWII_VERSION = '11.6.00-dev001'; const ZWII_UPDATE_CHANNEL = "test"; public static $actions = []; diff --git a/core/module/install/install.php b/core/module/install/install.php index 38e5a93a..3be2b81c 100644 --- a/core/module/install/install.php +++ b/core/module/install/install.php @@ -22,6 +22,12 @@ class install extends common { 'update' => self::GROUP_ADMIN ]; + // Type de proxy + public static $proxyType = [ + 'tcp://' => 'TCP', + 'http://' => 'HTTP' + ]; + // Thèmes proposés à l'installation public static $themes = []; @@ -98,6 +104,12 @@ class install extends common { $this->setData(['module', 'blog', 'posts', 'mon-deuxieme-article', 'userId', $userId]); $this->setData(['module', 'blog', 'posts', 'mon-troisieme-article', 'userId', $userId]); } + + // Sauvegarder la configuration du Proxy + $this->setData(['config', 'proxyType', $this->getInput('installProxyType') ]); + $this->setData(['config', 'proxyUrl', $this->getInput('installProxyUrl') ]); + $this->setData(['config', 'proxyPort', $this->getInput('installProxyPort', helper::FILTER_INT)]); + // Images exemples livrées dans tous les cas try { // Décompression dans le dossier de fichier temporaires diff --git a/core/module/install/view/index/index.php b/core/module/install/view/index/index.php index 2fc17213..9c189dda 100644 --- a/core/module/install/view/index/index.php +++ b/core/module/install/view/index/index.php @@ -1,56 +1,94 @@

Renseignez les champs ci-dessous pour finaliser l'installation.

- 'off', - 'label' => 'Identifiant' - ]); ?> -
-
- 'off', - 'label' => 'Mot de passe' - ]); ?> -
-
- 'off', - 'label' => 'Confirmation' - ]); ?> -
-
- 'off', - 'label' => 'Adresse mail' - ]); ?> -
-
- 'off', - 'label' => 'Prénom' - ]); ?> -
-
- 'off', - 'label' => 'Nom' - ]); ?> -
-
-
-
- 'Thème' - ]); ?> -
-
-
-
- false - ]); - ?> -
-
+