summaryrefslogtreecommitdiffstats
path: root/modules-available/internetaccess
diff options
context:
space:
mode:
Diffstat (limited to 'modules-available/internetaccess')
-rw-r--r--modules-available/internetaccess/config.json3
-rw-r--r--modules-available/internetaccess/lang/de/messages.json4
-rw-r--r--modules-available/internetaccess/lang/de/permissions.json3
-rw-r--r--modules-available/internetaccess/lang/de/template-tags.json17
-rw-r--r--modules-available/internetaccess/lang/en/messages.json4
-rw-r--r--modules-available/internetaccess/lang/en/module.json3
-rw-r--r--modules-available/internetaccess/lang/en/permissions.json3
-rw-r--r--modules-available/internetaccess/lang/en/template-tags.json17
-rw-r--r--modules-available/internetaccess/lang/pt/messages.json4
-rw-r--r--modules-available/internetaccess/page.inc.php62
-rw-r--r--modules-available/internetaccess/permissions/permissions.json5
-rw-r--r--modules-available/internetaccess/style.css3
-rw-r--r--modules-available/internetaccess/templates/_page.html38
-rw-r--r--modules-available/internetaccess/templates/restart.html22
14 files changed, 0 insertions, 188 deletions
diff --git a/modules-available/internetaccess/config.json b/modules-available/internetaccess/config.json
deleted file mode 100644
index 110f8b67..00000000
--- a/modules-available/internetaccess/config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "category": "main.content"
-} \ No newline at end of file
diff --git a/modules-available/internetaccess/lang/de/messages.json b/modules-available/internetaccess/lang/de/messages.json
deleted file mode 100644
index 1b075f70..00000000
--- a/modules-available/internetaccess/lang/de/messages.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "settings-updated": "Einstellungen wurden aktualisiert",
- "invalid-action": "Ung\u00fcltige Aktion: {{0}}"
-} \ No newline at end of file
diff --git a/modules-available/internetaccess/lang/de/permissions.json b/modules-available/internetaccess/lang/de/permissions.json
deleted file mode 100644
index 78d9e67c..00000000
--- a/modules-available/internetaccess/lang/de/permissions.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "configuration.safe": "Konfiguration speichern."
-} \ No newline at end of file
diff --git a/modules-available/internetaccess/lang/de/template-tags.json b/modules-available/internetaccess/lang/de/template-tags.json
deleted file mode 100644
index b583783f..00000000
--- a/modules-available/internetaccess/lang/de/template-tags.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "lang_automatic": "Automatisch",
- "lang_description": "Hier k\u00f6nnen Sie konfigurieren, wie der Satellitenserver auf das Internet zugreifen soll. Dies wird in erster Linie f\u00fcr das Aktualisieren des Systems sowie das Synchronisieren von Virtuellen Maschinen mit dem Zentralserver verwendet. Gegenw\u00e4rtig wird neben Direktzugriff noch SOCKS4\/5 unterst\u00fctzt.",
- "lang_internetAccess": "Internetzugriff",
- "lang_manual": "Manuelle Angabe",
- "lang_manualProxyConfig": "Wenn Sie einen SOCKS-Proxy manuell konfigurieren m\u00f6chten, geben Sie bitte hier die Verbindungsdaten an.",
- "lang_no": "Keiner",
- "lang_proxyAddress": "Adresse",
- "lang_proxyPassword": "Passwort",
- "lang_proxyPort": "Port",
- "lang_proxyType": "Proxy Typ",
- "lang_proxyUsername": "Benutzername",
- "lang_restartFailed": "Neustart eines oder mehrerer Dienste fehlgeschlagen!",
- "lang_restarting": "Neustart",
- "lang_save": "Speichern",
- "lang_serviceRestart": "Neustarten der Dienste"
-} \ No newline at end of file
diff --git a/modules-available/internetaccess/lang/en/messages.json b/modules-available/internetaccess/lang/en/messages.json
deleted file mode 100644
index 6a1af968..00000000
--- a/modules-available/internetaccess/lang/en/messages.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "settings-updated": "Settings have been updated",
- "invalid-action": "Invalid action: {{0}}"
-} \ No newline at end of file
diff --git a/modules-available/internetaccess/lang/en/module.json b/modules-available/internetaccess/lang/en/module.json
deleted file mode 100644
index f0c2f72f..00000000
--- a/modules-available/internetaccess/lang/en/module.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "module_name": "Internet Access"
-} \ No newline at end of file
diff --git a/modules-available/internetaccess/lang/en/permissions.json b/modules-available/internetaccess/lang/en/permissions.json
deleted file mode 100644
index afe8325d..00000000
--- a/modules-available/internetaccess/lang/en/permissions.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "configuration.safe": "Safe configuration."
-} \ No newline at end of file
diff --git a/modules-available/internetaccess/lang/en/template-tags.json b/modules-available/internetaccess/lang/en/template-tags.json
deleted file mode 100644
index 2ac50527..00000000
--- a/modules-available/internetaccess/lang/en/template-tags.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "lang_automatic": "Auto",
- "lang_description": "Here you can configure how the satellite server has to access the internet.",
- "lang_internetAccess": "Internet Access",
- "lang_manual": "Manual",
- "lang_manualProxyConfig": "If you want to configure a proxy server manually, please supply the credentials here.",
- "lang_no": "None",
- "lang_proxyAddress": "Address",
- "lang_proxyPassword": "Password",
- "lang_proxyPort": "Port",
- "lang_proxyType": "Proxy type",
- "lang_proxyUsername": "User",
- "lang_restartFailed": "Restarting one or more services failed!",
- "lang_restarting": "Restarting",
- "lang_save": "Save",
- "lang_serviceRestart": "Restart of services"
-} \ No newline at end of file
diff --git a/modules-available/internetaccess/lang/pt/messages.json b/modules-available/internetaccess/lang/pt/messages.json
deleted file mode 100644
index af5b9b22..00000000
--- a/modules-available/internetaccess/lang/pt/messages.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "settings-updated": "As configura\u00e7\u00f5es foram atualizadas",
- "invalid-action": "A\u00e7\u00e3o inv\u00e1lida: {{0}}"
-} \ No newline at end of file
diff --git a/modules-available/internetaccess/page.inc.php b/modules-available/internetaccess/page.inc.php
deleted file mode 100644
index a92ba3e3..00000000
--- a/modules-available/internetaccess/page.inc.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-class Page_InternetAccess extends Page
-{
-
- protected function doPreprocess()
- {
- User::load();
-
- if (!User::isLoggedIn()) {
- Message::addError('main.no-permission');
- Util::redirect('?do=Main');
- }
-
- $action = Request::any('action', 'show');
-
- if ($action == 'save') {
- if (User::hasPermission("configuration.safe")) {
- if (isset($_POST['PROXY_CONF'])) {
- $data = array();
- foreach (array('PROXY_CONF', 'PROXY_ADDR', 'PROXY_PORT', 'PROXY_USERNAME', 'PROXY_PASSWORD') as $key) {
- $data[$key] = Request::post($key, '');
- }
- if (!FileUtil::arrayToFile(CONFIG_PROXY_CONF, $data)) {
- Message::addError('main.error-write', CONFIG_PROXY_CONF);
- Util::redirect();
- } else {
- Message::addSuccess('settings-updated');
- Taskmanager::release(Taskmanager::submit('ReloadProxy'));
- $taskids = array();
- Trigger::stopDaemons(null, $taskids);
- $taskids = array();
- Trigger::startDaemons(null, $taskids);
- Session::set('ia-restart', $taskids);
- Util::redirect('?do=InternetAccess&show=update');
- }
- }
- }
- }
- }
-
- protected function doRender()
- {
- if (Request::any('show') === 'update') {
- $taskids = Session::get('ia-restart');
- if (is_array($taskids)) {
- Render::addTemplate('restart', $taskids);
- } else {
- Message::addError('invalid-action', 'Restart');
- }
- }
- $data = FileUtil::fileToArray(CONFIG_PROXY_CONF);
- if (!isset($data['PROXY_CONF']))
- $data['PROXY_CONF'] = 'AUTO';
- $data['selected_' . $data['PROXY_CONF']] = 'selected';
-
- $data['allowedSave'] = User::hasPermission("configuration.safe");
-
- Render::addTemplate('_page', $data);
- }
-
-}
diff --git a/modules-available/internetaccess/permissions/permissions.json b/modules-available/internetaccess/permissions/permissions.json
deleted file mode 100644
index 09652e51..00000000
--- a/modules-available/internetaccess/permissions/permissions.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "configuration.safe": {
- "location-aware": false
- }
-} \ No newline at end of file
diff --git a/modules-available/internetaccess/style.css b/modules-available/internetaccess/style.css
deleted file mode 100644
index 77fa7213..00000000
--- a/modules-available/internetaccess/style.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.input-group-addon {
- min-width:150px;
-}
diff --git a/modules-available/internetaccess/templates/_page.html b/modules-available/internetaccess/templates/_page.html
deleted file mode 100644
index 1413e280..00000000
--- a/modules-available/internetaccess/templates/_page.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<h1>{{lang_internetAccess}}</h1>
-
-<form action="?do=InternetAccess&amp;action=save" method="post">
- <input type="text" name="prevent_autofill" id="prevent_autofill" value="" style="position:absolute;top:-2000px" tabindex="-1">
- <input type="password" name="password_fake" id="password_fake" value="" style="position:absolute;top:-2000px" tabindex="-1">
- <input type="hidden" name="token" value="{{token}}">
- <p>{{lang_description}}</p>
- <div class="input-group">
- <span class="input-group-addon">{{lang_proxyType}}</span>
- <select name="PROXY_CONF" class="form-control">
- <option value="AUTO" {{selected_AUTO}}>{{lang_automatic}} (dns-wpad)</option>
- <option value="NO" {{selected_NO}}>{{lang_no}}</option>
- <option value="YES" {{selected_YES}}>{{lang_manual}}</option>
- </select>
- </div>
- <br>
- <p>{{lang_manualProxyConfig}}</p>
- <div class="input-group">
- <span class="input-group-addon">{{lang_proxyAddress}} *</span>
- <input name="PROXY_ADDR" value="{{PROXY_ADDR}}" type="text" class="form-control">
- </div>
- <div class="input-group">
- <span class="input-group-addon">{{lang_proxyPort}} *</span>
- <input name="PROXY_PORT" value="{{PROXY_PORT}}" type="text" class="form-control">
- </div>
- <div class="input-group">
- <span class="input-group-addon">{{lang_proxyUsername}}</span>
- <input name="PROXY_USERNAME" value="{{PROXY_USERNAME}}" type="text" class="form-control">
- </div>
- <div class="input-group">
- <span class="input-group-addon">{{lang_proxyPassword}}</span>
- <input name="PROXY_PASSWORD" value="{{PROXY_PASSWORD}}" type="{{password_type}}" class="form-control">
- </div>
- <br/>
- <div class="text-right">
- <button {{^allowedSave}}disabled{{/allowedSave}} class="btn btn-primary" type="submit"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button>
- </div>
-</form>
diff --git a/modules-available/internetaccess/templates/restart.html b/modules-available/internetaccess/templates/restart.html
deleted file mode 100644
index effe1feb..00000000
--- a/modules-available/internetaccess/templates/restart.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="panel panel-default">
- <div class="panel-heading">{{lang_serviceRestart}}</div>
- <div class="panel-body">
- <div data-tm-id="{{syncid}}" data-tm-log="messages" data-tm-callback="restartCb">{{lang_restarting}} syncdaemon</div>
- <div data-tm-id="{{dmsdid}}" data-tm-log="messages" data-tm-callback="restartCb">{{lang_restarting}} dmsd</div>
- <div data-tm-id="{{ldadpid}}" data-tm-log="messages" data-tm-callback="restartCb">{{lang_restarting}} ldadp</div>
- <div id="restartfailed" class="alert alert-danger" style="display:none">
- {{lang_restartFailed}}
- </div>
- </div>
-</div>
-
-<script type="text/javascript">
- function restartCb(task)
- {
- if (!task || !task.statusCode)
- return;
- if (task.statusCode === 'TASK_ERROR') {
- $('#restartfailed').show('slow');
- }
- }
-</script>