WIP

9 files changed, 0 insertions, 158 deletions

diff --git a/modules/internetaccess/config.json b/modules/internetaccess/config.json
deleted file mode 100644
index 6c189b63..00000000
--- a/modules/internetaccess/config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"category":"main.content",
-	"enabled":"true"
-}
diff --git a/modules/internetaccess/lang/de/templates/_page.json b/modules/internetaccess/lang/de/templates/_page.json
deleted file mode 100644
index 61e324a8..00000000
--- a/modules/internetaccess/lang/de/templates/_page.json
+++ /dev/null
@@ -1,14 +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_save": "Speichern"
-}
\ No newline at end of file
diff --git a/modules/internetaccess/lang/de/templates/restart.json b/modules/internetaccess/lang/de/templates/restart.json
deleted file mode 100644
index 899a1d28..00000000
--- a/modules/internetaccess/lang/de/templates/restart.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "lang_restartFailed": "Neustart eines oder mehrerer Dienste fehlgeschlagen!",
-    "lang_restarting": "Neustart",
-    "lang_serviceRestart": "Neustarten der Dienste"
-}
\ No newline at end of file
diff --git a/modules/internetaccess/lang/en/module.json b/modules/internetaccess/lang/en/module.json
deleted file mode 100644
index f0c2f72f..00000000
--- a/modules/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/internetaccess/lang/en/templates/_page.json b/modules/internetaccess/lang/en/templates/_page.json
deleted file mode 100644
index c02ca4f5..00000000
--- a/modules/internetaccess/lang/en/templates/_page.json
+++ /dev/null
@@ -1,14 +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_save": "Save"
-}
\ No newline at end of file
diff --git a/modules/internetaccess/lang/en/templates/restart.json b/modules/internetaccess/lang/en/templates/restart.json
deleted file mode 100644
index badad460..00000000
--- a/modules/internetaccess/lang/en/templates/restart.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "lang_restartFailed": "Restarting one or more services failed!",
-    "lang_restarting": "Restarting",
-    "lang_serviceRestart": "Restart of services"
-}
\ No newline at end of file
diff --git a/modules/internetaccess/page.inc.php b/modules/internetaccess/page.inc.php
deleted file mode 100644
index b949be26..00000000
--- a/modules/internetaccess/page.inc.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-class Page_InternetAccess extends Page
-{
-
-	protected function doPreprocess()
-	{
-		User::load();
-		if (!User::hasPermission('superadmin')) {
-			Message::addError('no-permission');
-			Util::redirect('?do=Main');
-		}
-		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('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';
-		Render::addTemplate('_page', $data);
-	}
-
-}
diff --git a/modules/internetaccess/templates/_page.html b/modules/internetaccess/templates/_page.html
deleted file mode 100644
index a2aaddac..00000000
--- a/modules/internetaccess/templates/_page.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<h1>{{lang_internetAccess}}</h1>
-
-<form action="?do=InternetAccess" method="post">
-	<input type="text" name="prevent_autofill" id="prevent_autofill" value="" style="display:none;">
-	<input type="password" name="password_fake" id="password_fake" value="" style="display:none;">
-	<input type="hidden" name="token" value="{{token}}">
-	<div class="panel panel-default">
-		<div class="panel-heading">{{lang_internetAccess}}</div>
-		<div class="panel-body">
-			<p>{{lang_description}}</p>
-			<div class="input-group">
-				<span class="input-group-addon slx-ga">{{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 slx-ga">{{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 slx-ga">{{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 slx-ga">{{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 slx-ga">{{lang_proxyPassword}}</span>
-				<input name="PROXY_PASSWORD" value="{{PROXY_PASSWORD}}" type="{{password_type}}" class="form-control">
-			</div>
-			<button class="btn btn-primary" type="submit">{{lang_save}}</button>
-		</div>
-	</div>
-</form>
diff --git a/modules/internetaccess/templates/restart.html b/modules/internetaccess/templates/restart.html
deleted file mode 100644
index effe1feb..00000000
--- a/modules/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>