From 50404f3b23b7fd6aeae4c9d2f6df0ea25e984e66 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 3 May 2016 19:03:09 +0200
Subject: WIP
---
modules/webinterface/config.json | 4 -
.../lang/de/templates/httpd-restart.json | 4 -
modules/webinterface/lang/de/templates/https.json | 12 ---
.../webinterface/lang/de/templates/passwords.json | 7 --
modules/webinterface/lang/en/module.json | 3 -
.../lang/en/templates/httpd-restart.json | 4 -
modules/webinterface/lang/en/templates/https.json | 12 ---
.../webinterface/lang/en/templates/passwords.json | 7 --
modules/webinterface/page.inc.php | 85 ----------------------
modules/webinterface/templates/httpd-restart.html | 6 --
modules/webinterface/templates/https.html | 60 ---------------
modules/webinterface/templates/passwords.html | 25 -------
12 files changed, 229 deletions(-)
delete mode 100644 modules/webinterface/config.json
delete mode 100644 modules/webinterface/lang/de/templates/httpd-restart.json
delete mode 100644 modules/webinterface/lang/de/templates/https.json
delete mode 100644 modules/webinterface/lang/de/templates/passwords.json
delete mode 100644 modules/webinterface/lang/en/module.json
delete mode 100644 modules/webinterface/lang/en/templates/httpd-restart.json
delete mode 100644 modules/webinterface/lang/en/templates/https.json
delete mode 100644 modules/webinterface/lang/en/templates/passwords.json
delete mode 100644 modules/webinterface/page.inc.php
delete mode 100644 modules/webinterface/templates/httpd-restart.html
delete mode 100644 modules/webinterface/templates/https.html
delete mode 100644 modules/webinterface/templates/passwords.html
(limited to 'modules/webinterface')
diff --git a/modules/webinterface/config.json b/modules/webinterface/config.json
deleted file mode 100644
index 6c189b63..00000000
--- a/modules/webinterface/config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "category":"main.content",
- "enabled":"true"
-}
diff --git a/modules/webinterface/lang/de/templates/httpd-restart.json b/modules/webinterface/lang/de/templates/httpd-restart.json
deleted file mode 100644
index e995a251..00000000
--- a/modules/webinterface/lang/de/templates/httpd-restart.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "lang_applyingSettings": "Anwenden der Einstellungen",
- "lang_installAndRestart": "Zertifikat installieren und Webserver neustarten"
-}
\ No newline at end of file
diff --git a/modules/webinterface/lang/de/templates/https.json b/modules/webinterface/lang/de/templates/https.json
deleted file mode 100644
index 621343e3..00000000
--- a/modules/webinterface/lang/de/templates/https.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "lang_HttpsIsDisabled": "HTTPS ist derzeit deaktiviert",
- "lang_caChain": "Optional k\u00f6nnen Sie hier die zum Zertifikat geh\u00f6rende Zertifikatkette (CA-Chain) einf\u00fcgen. Dies wird ben\u00f6tigt, wenn das Zertifikat nicht direkt von einer der in Browsern mitgeliferten CAs signiert wurde. Die Datei enth\u00e4lt ein oder meherere Zertifikatsbl\u00f6cke, im gleichen Format wie das oben gezeigte Zertifikat.",
- "lang_certificate": "Bitte f\u00fcgen Sie hier das Zertifikat ein. Das Zertifikat wird im Base64-codierten x509-Format erwartet (manchmal pem genannt). Es sieht in etwa wie folgt aus:",
- "lang_customCert": "Eigenes Zertifikat verwenden",
- "lang_description": "Hier k\u00f6nnen Sie festlegen, ob das Web-Interface auch per HTTPS erreichbar sein soll, und welches Zertifikat daf\u00fcr verwendet werden soll.",
- "lang_httpsSettings": "HTTPS-Konfiguration",
- "lang_noHttps": "HTTPS wieder deaktivieren, aktuelles Zertifikat l\u00f6schen",
- "lang_privateKey": "Bitte f\u00fcgen Sie hier den privaten Schl\u00fcssel ein, der zum obigen Zertifikat geh\u00f6rt. Er muss ebenfalls im \"pem\"-Format vorliegen, und sieht wie folgt aus:",
- "lang_randomCert": "Neues selbstsigniertes Zertifikat generieren",
- "lang_save": "Speichern"
-}
\ No newline at end of file
diff --git a/modules/webinterface/lang/de/templates/passwords.json b/modules/webinterface/lang/de/templates/passwords.json
deleted file mode 100644
index 17c156c3..00000000
--- a/modules/webinterface/lang/de/templates/passwords.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "lang_description": "Legen Sie fest, ob Passwortfelder in der Web-Schnittstelle maskiert werden, oder ob Ihr Inhalt sichtbar sein soll. Wenn Sie die Schnittstelle in einer sicheren Umgebung nutzen (keine neugierigen Augen), kann dies den Komfort erh\u00f6hen. Das Passwortfeld der Anmeldemaske ist von dieser Einstellung ausgenommen.",
- "lang_hidePasswords": "Passw\u00f6rter maskieren",
- "lang_passwordFields": "Passwortfelder",
- "lang_save": "Speichern",
- "lang_showPasswords": "Passw\u00f6rter anzeigen"
-}
\ No newline at end of file
diff --git a/modules/webinterface/lang/en/module.json b/modules/webinterface/lang/en/module.json
deleted file mode 100644
index dde5ac86..00000000
--- a/modules/webinterface/lang/en/module.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "module_name": "Web Interface"
-}
\ No newline at end of file
diff --git a/modules/webinterface/lang/en/templates/httpd-restart.json b/modules/webinterface/lang/en/templates/httpd-restart.json
deleted file mode 100644
index 0a7d4aea..00000000
--- a/modules/webinterface/lang/en/templates/httpd-restart.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "lang_applyingSettings": "Applying settings",
- "lang_installAndRestart": "Installing certificate and restarting web server"
-}
\ No newline at end of file
diff --git a/modules/webinterface/lang/en/templates/https.json b/modules/webinterface/lang/en/templates/https.json
deleted file mode 100644
index 64631a9a..00000000
--- a/modules/webinterface/lang/en/templates/https.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "lang_HttpsIsDisabled": "HTTPS is currently disabled",
- "lang_caChain": "Here you can paste an optional certificate chain. It should only be required if you have a certificate that was not directly signed by a certificate authority known by the browsers. It should contain one or more certificate blocks, looking just like the certificate above.",
- "lang_certificate": "Please paste your certificate below. It has to be in base64 encoded x509 format (sometimes called pem). It should look something like this:",
- "lang_customCert": "Supply own certificate",
- "lang_description": "Here you can set whether the web interface should be accessible via https. You can chose if you want to use a random self signed certificate, or supply your own.",
- "lang_httpsSettings": "HTTPS settings",
- "lang_noHttps": "Disable HTTPS, delete current certificate",
- "lang_privateKey": "Please paste the private key belonging to the certificate here. It has to be in \"pem\" format too, which should look like this:",
- "lang_randomCert": "Genenrate new self-signed certificate",
- "lang_save": "Save"
-}
\ No newline at end of file
diff --git a/modules/webinterface/lang/en/templates/passwords.json b/modules/webinterface/lang/en/templates/passwords.json
deleted file mode 100644
index 2db88ae2..00000000
--- a/modules/webinterface/lang/en/templates/passwords.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "lang_description": "Set whether password fields should be masked or not. The password field of the login page to the web interface is always masked.",
- "lang_hidePasswords": "Mask passwords",
- "lang_passwordFields": "Password fields",
- "lang_save": "Save",
- "lang_showPasswords": "Show passwords"
-}
\ No newline at end of file
diff --git a/modules/webinterface/page.inc.php b/modules/webinterface/page.inc.php
deleted file mode 100644
index c301dec9..00000000
--- a/modules/webinterface/page.inc.php
+++ /dev/null
@@ -1,85 +0,0 @@
-actionConfigureHttps();
- break;
- case 'password':
- $this->actionShowHidePassword();
- break;
- }
- }
-
- private function actionConfigureHttps()
- {
- $task = false;
- switch (Request::post('mode')) {
- case 'off':
- $task = $this->setHttpsOff();
- break;
- case 'random':
- $task = $this->setHttpsRandomCert();
- break;
- case 'custom':
- $task = $this->setHttpsCustomCert();
- break;
- }
- if (isset($task['id'])) {
- Session::set('https-id', $task['id']);
- Util::redirect('?do=WebInterface&show=httpsupdate');
- }
- }
-
- private function actionShowHidePassword()
- {
- Property::setPasswordFieldType(Request::post('mode') === 'show' ? 'text' : 'password');
- Util::redirect('?do=WebInterface');
- }
-
- protected function doRender()
- {
- Render::setTitle(Dictionary::translate('lang_titleWebinterface'));
- if (Request::get('show') === 'httpsupdate') {
- Render::addTemplate('httpd-restart', array('taskid' => Session::get('https-id')));
- }
- Render::addTemplate('https', array('httpsEnabled' => file_exists('/etc/lighttpd/server.pem')));
- $data = array();
- if (Property::getPasswordFieldType() === 'text')
- $data['selected_show'] = 'checked';
- else
- $data['selected_hide'] = 'checked';
- Render::addTemplate('passwords', $data);
- }
-
- private function setHttpsOff()
- {
- return Taskmanager::submit('LighttpdHttps', array());
- }
-
- private function setHttpsRandomCert()
- {
- return Taskmanager::submit('LighttpdHttps', array(
- 'proxyip' => Property::getServerIp()
- ));
- }
-
- private function setHttpsCustomCert()
- {
- return Taskmanager::submit('LighttpdHttps', array(
- 'importcert' => Request::post('certificate', 'bla'),
- 'importkey' => Request::post('privatekey', 'bla'),
- 'importchain' => Request::post('cachain', '')
- ));
- }
-
-}
diff --git a/modules/webinterface/templates/httpd-restart.html b/modules/webinterface/templates/httpd-restart.html
deleted file mode 100644
index cc84aafb..00000000
--- a/modules/webinterface/templates/httpd-restart.html
+++ /dev/null
@@ -1,6 +0,0 @@
-