+
+
+
+
+
+
+
+
+{{lang_legend}}
+
+
++ + {{lang_showLong}} +
++ + {{lang_downloadLong}} +
++ + {{lang_rebuildLong}} +
++ + {{lang_rebuildOutdatedLong}} +
++ + {{lang_editLong}} +
+
+
+ {{lang_deleteLong}}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules-available/sysconfig/templates/ad-finish.html b/modules-available/sysconfig/templates/ad-finish.html
new file mode 100644
index 00000000..f73cad9d
--- /dev/null
+++ b/modules-available/sysconfig/templates/ad-finish.html
@@ -0,0 +1,29 @@
+
+
+
++ {{lang_adStarted}} +
+ +
+
+{{lang_generateModule}}
++ + + diff --git a/modules-available/sysconfig/templates/ad-selfsearch.html b/modules-available/sysconfig/templates/ad-selfsearch.html new file mode 100644 index 00000000..76952dc3 --- /dev/null +++ b/modules-available/sysconfig/templates/ad-selfsearch.html @@ -0,0 +1,112 @@ +
+ {{lang_dnLookup}} +
+ +
+
+{{lang_onProblemSearchBase}}
+LDAP Self-Query
+
+
++
+
+
+
+
+
+
diff --git a/modules-available/sysconfig/templates/ad-start.html b/modules-available/sysconfig/templates/ad-start.html
new file mode 100644
index 00000000..98546140
--- /dev/null
+++ b/modules-available/sysconfig/templates/ad-start.html
@@ -0,0 +1,121 @@
+
+ {{lang_adText1}}
+
+ {{lang_adText2}}
+
+ {{lang_adText3}}
+
dsquery user -name "Username"+
+ {{lang_adText4}} +
+ +{{lang_asteriskMandatory}} + + + +
+
+
+
+
+
+
+
diff --git a/modules-available/sysconfig/templates/ad_ldap-checkconnection.html b/modules-available/sysconfig/templates/ad_ldap-checkconnection.html
new file mode 100644
index 00000000..5925829a
--- /dev/null
+++ b/modules-available/sysconfig/templates/ad_ldap-checkconnection.html
@@ -0,0 +1,91 @@
+
+
+
++ {{lang_connectionWait}} +
+ +
+
+
+
+
+Port Check
++
+
+
+
+
+
+
+
diff --git a/modules-available/sysconfig/templates/ad_ldap-checkcredentials.html b/modules-available/sysconfig/templates/ad_ldap-checkcredentials.html
new file mode 100644
index 00000000..0586209b
--- /dev/null
+++ b/modules-available/sysconfig/templates/ad_ldap-checkcredentials.html
@@ -0,0 +1,67 @@
++ {{lang_connectionWait}} +
+ +
+
+{{lang_onProblemSearchBase}}
+LDAP Test-Query
++
+
+
+
+
+
+
diff --git a/modules-available/sysconfig/templates/branding-check.html b/modules-available/sysconfig/templates/branding-check.html
new file mode 100644
index 00000000..8f6ef055
--- /dev/null
+++ b/modules-available/sysconfig/templates/branding-check.html
@@ -0,0 +1,26 @@
++ {{lang_brandingInfo}} +
+
+ {{#svg}}
+ 
+ {{/svg}}
+
+
+ {{/svg}}
+
+ {{#png}}
+ 
+ {{/png}}
+
+
+
+ {{/png}}
+{{error}}
+
+
+
diff --git a/modules-available/sysconfig/templates/branding-start.html b/modules-available/sysconfig/templates/branding-start.html
new file mode 100644
index 00000000..09b9ca27
--- /dev/null
+++ b/modules-available/sysconfig/templates/branding-start.html
@@ -0,0 +1,25 @@
++ {{lang_branding}} +
+ + diff --git a/modules-available/sysconfig/templates/cfg-finish.html b/modules-available/sysconfig/templates/cfg-finish.html new file mode 100644 index 00000000..a6e51996 --- /dev/null +++ b/modules-available/sysconfig/templates/cfg-finish.html @@ -0,0 +1,12 @@ ++ {{lang_configurationSuccess}} +
+ + diff --git a/modules-available/sysconfig/templates/cfg-start.html b/modules-available/sysconfig/templates/cfg-start.html new file mode 100644 index 00000000..50f366ea --- /dev/null +++ b/modules-available/sysconfig/templates/cfg-start.html @@ -0,0 +1,39 @@ + diff --git a/modules-available/sysconfig/templates/config-module-list.html b/modules-available/sysconfig/templates/config-module-list.html new file mode 100644 index 00000000..6cd77f9e --- /dev/null +++ b/modules-available/sysconfig/templates/config-module-list.html @@ -0,0 +1,17 @@ + \ No newline at end of file diff --git a/modules-available/sysconfig/templates/custom-filelist.html b/modules-available/sysconfig/templates/custom-filelist.html new file mode 100644 index 00000000..3ad241dd --- /dev/null +++ b/modules-available/sysconfig/templates/custom-filelist.html @@ -0,0 +1,16 @@ + + +| {{name}} | + {{/isdir}} + {{^isdir}} +{{name}} | +{{size}} | + {{/isdir}} +|
{{lang_customModuleInfo1}}
+ +{{lang_customModuleInfo2}}
+ + diff --git a/modules-available/sysconfig/templates/ldap-finish.html b/modules-available/sysconfig/templates/ldap-finish.html new file mode 100644 index 00000000..a735e792 --- /dev/null +++ b/modules-available/sysconfig/templates/ldap-finish.html @@ -0,0 +1,29 @@ ++ {{lang_ldapStarted}} +
+ +
+
+{{lang_generateModule}}
++ + + diff --git a/modules-available/sysconfig/templates/ldap-start.html b/modules-available/sysconfig/templates/ldap-start.html new file mode 100644 index 00000000..7892b63f --- /dev/null +++ b/modules-available/sysconfig/templates/ldap-start.html @@ -0,0 +1,101 @@ +
+ {{lang_ldapText1}}
+
+ {{lang_ldapText2}}
+
+
diff --git a/modules-available/sysconfig/templates/sshconfig-start.html b/modules-available/sysconfig/templates/sshconfig-start.html
new file mode 100644
index 00000000..2aa409d3
--- /dev/null
+++ b/modules-available/sysconfig/templates/sshconfig-start.html
@@ -0,0 +1,27 @@
+
+
diff --git a/modules-available/sysconfig/templates/start.html b/modules-available/sysconfig/templates/start.html
new file mode 100644
index 00000000..f55a5501
--- /dev/null
+++ b/modules-available/sysconfig/templates/start.html
@@ -0,0 +1,12 @@
+
+
+
+{{lang_moduleChoose}}
+ +{{#modules}} +
+
+{{/modules}}
diff --git a/modules-available/sysconfignew/config.json b/modules-available/sysconfignew/config.json
new file mode 100644
index 00000000..4da67ef8
--- /dev/null
+++ b/modules-available/sysconfignew/config.json
@@ -0,0 +1,3 @@
+{
+ "enabled":"true"
+}
diff --git a/modules-available/sysconfignew/lang/en/module.json b/modules-available/sysconfignew/lang/en/module.json
new file mode 100644
index 00000000..3ec89616
--- /dev/null
+++ b/modules-available/sysconfignew/lang/en/module.json
@@ -0,0 +1,23 @@
+{
+ "lang_back": "Back",
+ "lang_cancel": "Cancel",
+ "lang_cannotOpen": "could no be opened",
+ "lang_changeLink": "Change link",
+ "lang_compilingIpxe": "Compiling iPXE",
+ "lang_configName": "Name",
+ "lang_configsDescription": "Here it is possible to create a system configuration by choosing the desired modules.",
+ "lang_configurations": "Configurations",
+ "lang_create": "Create",
+ "lang_edit": "Edit",
+ "lang_file": "File",
+ "lang_leavingMessage": "You have unsaved changes on your module.",
+ "lang_loading": "Loading",
+ "lang_modules": "Modules",
+ "lang_modulesDescription": "Here it is possible to create a system module through an editor.",
+ "lang_name": "Name",
+ "lang_new": "New",
+ "lang_newConfig": "New Config",
+ "lang_newModule": "New Module",
+ "lang_remove": "Remove",
+ "lang_save": "Save"
+}
\ No newline at end of file
diff --git a/modules-available/sysconfignew/lang/pt/module.json b/modules-available/sysconfignew/lang/pt/module.json
new file mode 100644
index 00000000..af0d7ad7
--- /dev/null
+++ b/modules-available/sysconfignew/lang/pt/module.json
@@ -0,0 +1,23 @@
+{
+ "lang_back": "Voltar",
+ "lang_cancel": "Cancelar",
+ "lang_cannotOpen": "n\u00e3o p\u00f4de ser aberto",
+ "lang_changeLink": "Mudar link",
+ "lang_compilingIpxe": "Compilando iPXE",
+ "lang_configName": "Nome",
+ "lang_configsDescription": "Aqui \u00e9 poss\u00edvel criar uma configura\u00e7\u00e3o do sistema escolhendo os m\u00f3dulos desejados.",
+ "lang_configurations": "Configura\u00e7\u00f5es",
+ "lang_create": "Criar",
+ "lang_edit": "Editar",
+ "lang_file": "Arquivo",
+ "lang_leavingMessage": "Voc\u00ea possui mudan\u00e7as n\u00e3o salvas no seu m\u00f3dulo.",
+ "lang_loading": "Carregando",
+ "lang_modules": "M\u00f3dulos",
+ "lang_modulesDescription": "Aqui \u00e9 poss\u00edvel criar um m\u00f3dulo do sistema atrav\u00e9s de um editor.",
+ "lang_name": "Nome",
+ "lang_new": "Novo",
+ "lang_newConfig": "Nova Configura\u00e7\u00e3o",
+ "lang_newModule": "Novo M\u00f3dulo",
+ "lang_remove": "Remover",
+ "lang_save": "Salvar"
+}
\ No newline at end of file
diff --git a/modules-available/sysconfignew/page.inc.php b/modules-available/sysconfignew/page.inc.php
new file mode 100644
index 00000000..105ad6c7
--- /dev/null
+++ b/modules-available/sysconfignew/page.inc.php
@@ -0,0 +1,113 @@
+tmconfigs = $this->tmpath . '/configs';
+ $this->tmmodules = $this->tmpath . '/modules';
+ }
+
+
+ protected function doRender(){
+ $module = $_GET['module'];
+ if(isset($module)){
+ Render::addTemplate('module-editor',array(
+ "module" => $module
+ ));
+ }else{
+ if(is_dir($this->tmpath)){
+ $configs = array();
+ $modules = array();
+
+ foreach($this->listDirectory($this->tmconfigs) as $key => $value)
+ $configs[] = array(
+ "name" => $value
+ );
+
+ foreach($this->listDirectory($this->tmmodules) as $key => $value)
+ $modules[] = array(
+ "name" => $value
+ );
+
+ $data = array(
+ "configs" => $configs,
+ "modules" => $modules
+ );
+ Render::addTemplate('_pagenew',$data);
+ }else{
+ Message::addError('no-tm-scripts');
+ }
+ }
+ }
+
+ protected function doAjax(){
+ $request = $_GET['request'];
+ switch($request){
+ case "module-contents":
+ $path = $this->tmpath . '/modules/' . Request::get('module');
+ $data = $this->getDirContents($path);
+ $json = json_encode($data);
+ print_r($json);
+ break;
+ case "configs":
+ $this->tmconfigs = $this->tmpath . '/configs';
+ $this->tmmodules = $this->tmpath . '/modules';
+ $userModules = $this->listDirectory($this->tmconfigs . '/' . Request::get('config'));
+ $modules = array();
+ foreach($this->listDirectory($this->tmmodules) as $key => $value){
+ $chosen = (in_array($value, $userModules)) ? true : false;
+ $modules[] = array(
+ "name" => $value,
+ "chosen" => $chosen
+ );
+ }
+
+ foreach ($modules as $module) {
+ $class = ($module['chosen']) ? "select-item select-item-selected" : "select-item";
+ $ret .= "";
+ }
+
+ echo $ret;
+ break;
+ }
+
+ }
+
+ private function getDirContents($path){
+ $ret = array();
+ foreach ($this->listDirectory($path) as $key => $value) {
+ if(is_dir($path . "/" . $value)){
+ $ret["dir_" . $value] = $this->getDirContents($path . "/" . $value);
+ }else{
+ if(is_link($path . "/" . $value)){
+ $ret["link_" . $value] = readlink($path . "/" . $value);
+ }else{
+ if(mime_content_type($path . "/" . $value) == "text/plain"){
+ $ret["file_" . $value] = file_get_contents($path . "/" . $value);
+ }else{
+ $ret["lock_" . $value] = " oops";
+ }
+ }
+ }
+ }
+ return $ret;
+ }
+
+ private function listDirectory($path){
+ return array_diff(scandir($path), array('..', '.'));
+ }
+
+}
diff --git a/modules-available/sysconfignew/templates/_pagenew.html b/modules-available/sysconfignew/templates/_pagenew.html
new file mode 100644
index 00000000..98881ae3
--- /dev/null
+++ b/modules-available/sysconfignew/templates/_pagenew.html
@@ -0,0 +1,190 @@
+
+ {{title}} {{lang_add}}
+
+
+ {{description}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules-available/sysconfignew/templates/module-editor.html b/modules-available/sysconfignew/templates/module-editor.html
new file mode 100644
index 00000000..3ea28bf8
--- /dev/null
+++ b/modules-available/sysconfignew/templates/module-editor.html
@@ -0,0 +1,269 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{lang_configurations}}
+
+ {{lang_configsDescription}}
+
+ | {{lang_configName}} | ++ | + + + {{#configs}} + |
|---|---|---|
| {{name}} | ++ + | ++ + | +
+
+
+
+
+
+
+
+
+
+ {{lang_modules}}
+
+ {{lang_modulesDescription}}
+
+ | {{lang_configName}} | ++ | + + + {{#modules}} + |
|---|---|---|
| {{name}} | ++ + | ++ + | +
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules-available/syslog/config.json b/modules-available/syslog/config.json
new file mode 100644
index 00000000..650ab2fe
--- /dev/null
+++ b/modules-available/syslog/config.json
@@ -0,0 +1,4 @@
+{
+ "category":"main.status",
+ "enabled":"true"
+}
diff --git a/modules-available/syslog/lang/de/module.json b/modules-available/syslog/lang/de/module.json
new file mode 100644
index 00000000..b9e8de49
--- /dev/null
+++ b/modules-available/syslog/lang/de/module.json
@@ -0,0 +1,4 @@
+{
+ "module_name": "Client-Log",
+ "page_title": "Lognachrichten gebooteter Clients"
+}
diff --git a/modules-available/syslog/lang/de/templates/page-syslog.json b/modules-available/syslog/lang/de/templates/page-syslog.json
new file mode 100644
index 00000000..49e94602
--- /dev/null
+++ b/modules-available/syslog/lang/de/templates/page-syslog.json
@@ -0,0 +1,10 @@
+{
+ "lang_client": "Client",
+ "lang_clientLog": "Client Log",
+ "lang_details": "Details",
+ "lang_event": "Ereignis",
+ "lang_filter": "Filter",
+ "lang_go": "Go",
+ "lang_not": "not",
+ "lang_when": "Wann"
+}
\ No newline at end of file
diff --git a/modules-available/syslog/lang/en/module.json b/modules-available/syslog/lang/en/module.json
new file mode 100644
index 00000000..70107d9c
--- /dev/null
+++ b/modules-available/syslog/lang/en/module.json
@@ -0,0 +1,11 @@
+{
+ "lang_client": "Client",
+ "lang_clientLog": "Client Log",
+ "lang_details": "Details",
+ "lang_event": "Event",
+ "lang_filter": "Filter",
+ "lang_go": "go",
+ "lang_not": "no",
+ "lang_when": "When",
+ "module_name": "Server Log"
+}
\ No newline at end of file
diff --git a/modules-available/syslog/lang/en/templates/page-syslog.json b/modules-available/syslog/lang/en/templates/page-syslog.json
new file mode 100644
index 00000000..71f61693
--- /dev/null
+++ b/modules-available/syslog/lang/en/templates/page-syslog.json
@@ -0,0 +1,10 @@
+{
+ "lang_client": "Client",
+ "lang_clientLog": "Client Log",
+ "lang_details": "Details",
+ "lang_event": "Event",
+ "lang_filter": "Filter",
+ "lang_go": "Go",
+ "lang_not": "not",
+ "lang_when": "When"
+}
\ No newline at end of file
diff --git a/modules-available/syslog/lang/pt/module.json b/modules-available/syslog/lang/pt/module.json
new file mode 100644
index 00000000..0f7c5356
--- /dev/null
+++ b/modules-available/syslog/lang/pt/module.json
@@ -0,0 +1,11 @@
+{
+ "lang_client": "Cliente",
+ "lang_clientLog": "Log dos Clientes",
+ "lang_details": "Detalhes",
+ "lang_event": "Evento",
+ "lang_filter": "Filtro",
+ "lang_go": "Ir",
+ "lang_not": "n\u00e3o",
+ "lang_when": "Quando",
+ "module_name": "Log do Servidor"
+}
\ No newline at end of file
diff --git a/modules-available/syslog/page.inc.php b/modules-available/syslog/page.inc.php
new file mode 100644
index 00000000..43a9bd28
--- /dev/null
+++ b/modules-available/syslog/page.inc.php
@@ -0,0 +1,94 @@
+exec();
+ while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+ $day = date('d.m.Y', $row['dateline']);
+ if ($day === $today) {
+ $day = Dictionary::translate('today');
+ } elseif ($day === $yesterday) {
+ $day = Dictionary::translate('yesterday');
+ }
+ $row['date'] = $day . date(' H:i', $row['dateline']);
+ $row['icon'] = $this->eventToIconName($row['logtypeid']);
+ $lines[] = $row;
+ }
+
+ $paginate->render('page-syslog', array(
+ 'filter' => $filter,
+ 'not' => $not,
+ 'list' => $lines
+ ));
+ }
+
+ private function eventToIconName($event)
+ {
+ switch ($event) {
+ case 'session-open':
+ return 'glyphicon-log-in';
+ case 'session-close':
+ return 'glyphicon-log-out';
+ case 'partition-swap':
+ return 'glyphicon-info-sign';
+ case 'partition-temp':
+ case 'smartctl-realloc':
+ return 'glyphicon-exclamation-sign';
+ default:
+ return 'glyphicon-minus';
+ }
+ }
+
+}
diff --git a/modules-available/syslog/templates/page-syslog.html b/modules-available/syslog/templates/page-syslog.html
new file mode 100644
index 00000000..98e94291
--- /dev/null
+++ b/modules-available/syslog/templates/page-syslog.html
@@ -0,0 +1,58 @@
+
+ {{lang_back}}
+
+
+
+
+ {{module}}
+
+
+
+
+
+
+
+ {{lang_clientLog}}
+ +{{{pagenav}}} +| + | {{lang_when}} | +{{lang_client}} | +{{lang_event}} | +{{lang_details}} | + + + {{#list}} +
|---|---|---|---|---|
| + | {{date}} | +{{clientip}} | +{{description}} | +{{#extra}}
+ »
+ {{extra}}
+ {{/extra}} |
+
', htmlspecialchars(substr($data, $start)), ''; + } + + protected function ajaxLdadpLog() + { + $files = glob('/var/log/ldadp/*.log', GLOB_NOSORT); + if ($files === false || empty($files)) echo('No logs found'); + $now = time(); + foreach ($files as $file) { + $mod = filemtime($file); + if ($now - $mod > 86400) continue; + // New enough - handle + preg_match(',/(\d+)\.log,', $file, $out); + $module = ConfigModule::get($out[1]); + if ($module === false) { + echo '
Module ', $out[1], '
'; + } else { + echo 'Module ', htmlspecialchars($module->title()), '
'; + } + $fh = @fopen($file, 'r'); + if ($fh === false) { + echo 'Error opening log file'; + continue; + } + fseek($fh, -5000, SEEK_END); + $data = fread($fh, 5000); + @fclose($fh); + if ($data === false) { + echo '
Error reading from log file'; + continue; + } + if (strlen($data) < 4990) { + $start = 0; + } else { + $start = strpos($data, "\n") + 1; + } + echo '
', htmlspecialchars(substr($data, $start)), ''; + } + } + + protected function ajaxNetstat() + { + $taskId = Taskmanager::submit('Netstat'); + if ($taskId === false) + return; + $status = Taskmanager::waitComplete($taskId, 3500); + + if (isset($status['data']['messages'])) + $data = $status['data']['messages']; + else + $data = 'Taskmanager error'; + + echo '
', htmlspecialchars($data), ''; + } + + protected function ajaxPsList() + { + $taskId = Taskmanager::submit('PsList'); + if ($taskId === false) + return; + $status = Taskmanager::waitComplete($taskId, 3500); + + if (isset($status['data']['messages'])) + $data = $status['data']['messages']; + else + $data = 'Taskmanager error'; + + echo '
', htmlspecialchars($data), ''; + } + + private function usageColor($percent) + { + if ($percent <= 50) { + $r = $b = $percent / 3; + $g = (100 - $percent * (50 / 80)); + } elseif ($percent <= 70) { + $r = 55 + ($percent - 50) * (30 / 20); + $g = 60; + $b = 0; + } else { + $r = ($percent - 70) / 3 + 90; + $g = (100 - $percent) * (60 / 30); + $b = 0; + } + $r = dechex(round($r * 2.55)); + $g = dechex(round($g * 2.55)); + $b = dechex(round($b * 2.55)); + return sprintf("%02s%02s%02s", $r, $g, $b); + } + +} diff --git a/modules-available/systemstatus/templates/_page.html b/modules-available/systemstatus/templates/_page.html new file mode 100644 index 00000000..51aa5b55 --- /dev/null +++ b/modules-available/systemstatus/templates/_page.html @@ -0,0 +1,129 @@ +{{#rebootTask}} +
Reboot...
+{{/rebootTask}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{lang_space}}
+
+
+
+
+
+
+
+
+
+
+ {{lang_services}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{lang_addressConfiguration}}
+
+
+
+
+
+
+
+
+
+
+ {{lang_system}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{lang_maintenance}}
+
+
+
+
+
+ {{lang_advanced}}
+ +
+
+
+ {{lang_dmsdLog}}
+
+
+
+
+
+
+
+ {{lang_ldadpLog}}
+
+
+
+
+
+
+
+ netstat -tulpn
+
+
+
+
+
+
+
+
diff --git a/modules-available/systemstatus/templates/addresses.html b/modules-available/systemstatus/templates/addresses.html
new file mode 100644
index 00000000..ce92c4d5
--- /dev/null
+++ b/modules-available/systemstatus/templates/addresses.html
@@ -0,0 +1,8 @@
+
+ ps auxf
+
+
+
+
+| {{ip}} | +({{iface}}) | +
+ {{#system}}
+ {{lang_systemPartition}}
+
+
+{{lang_capacity}}: {{size}}
+ {{lang_free}}: {{free}}
+ {{/system}}
+ {{^system}}
+ {{lang_systemStoreError}}
+ {{/system}}
+
+ {{#store}}
+ {{lang_vmStore}}
+
+
+
+{{#notConfigured}}
+{{lang_capacity}}: {{size}}
+ {{lang_free}}: {{free}}
+ {{/store}}
+ {{^store}}
+ {{lang_vmStoreError}}
+ {{/store}}
+{{lang_storeNotConfigured}}
+{{/notConfigured}}
+{{#storeMissing}}
+{{lang_storeMissingExpected}} {{storeMissing}}
+{{/storeMissing}}
+{{#wrongStore}}
+{{lang_foundStore}} {{wrongStore}}
+{{/wrongStore}}
+{{lang_goToStoreConf}}
+
diff --git a/modules-available/systemstatus/templates/services.html b/modules-available/systemstatus/templates/services.html
new file mode 100644
index 00000000..6c4f0b93
--- /dev/null
+++ b/modules-available/systemstatus/templates/services.html
@@ -0,0 +1,6 @@
+{{#ldadpError}}
+{{ldadpError}}
+{{/ldadpError}}
+{{^ldadpError}}
+LDAP-AD-Proxy: OK
+{{/ldadpError}}
diff --git a/modules-available/systemstatus/templates/systeminfo.html b/modules-available/systemstatus/templates/systeminfo.html
new file mode 100644
index 00000000..ed4a1532
--- /dev/null
+++ b/modules-available/systemstatus/templates/systeminfo.html
@@ -0,0 +1,115 @@
+
+ {{lang_uptimeOS}}: {{uptime}}
+
+
+
+ {{lang_cpuLoad}}
+ {{#cpuLoadOk}}
+
+
+
+{{lang_average}}: {{cpuLoad}}%
+ {{lang_onlyOS}}: {{cpuSystem}}%
+ {{lang_logicCPUs}}: {{cpuCount}}
+ {{/cpuLoadOk}}
+ {{^cpuLoadOk}}
+ {{lang_notDetermined}}
+ {{/cpuLoadOk}}
+
+ {{lang_ramUsage}}
+ {{#memTotal}}
+
+
+
+{{lang_total}}: {{memTotal}}
+ {{lang_free}}: {{memFree}}
+ {{/memTotal}}
+ {{^memTotal}}
+ {{lang_notDetermined}}
+ {{/memTotal}}
+
+ {{lang_swapUsage}}
+ {{#memTotal}}
+
+
+
+
+
+{{#swapWarning}}
+{{lang_total}}: {{swapTotal}}
+ {{lang_occupied}}: {{swapUsed}}
+ {{/memTotal}}
+ {{^memTotal}}
+ {{lang_notDetermined}}
+ {{/memTotal}}
+
+ {{lang_attention}} {{lang_swapWarning}}
+
+{{/swapWarning}}
+
+
diff --git a/modules-available/translation/config.json b/modules-available/translation/config.json
new file mode 100644
index 00000000..6c189b63
--- /dev/null
+++ b/modules-available/translation/config.json
@@ -0,0 +1,4 @@
+{
+ "category":"main.content",
+ "enabled":"true"
+}
diff --git a/modules-available/translation/lang/de/templates/_page.json b/modules-available/translation/lang/de/templates/_page.json
new file mode 100644
index 00000000..639697de
--- /dev/null
+++ b/modules-available/translation/lang/de/templates/_page.json
@@ -0,0 +1,9 @@
+{
+ "lang_adminInfo": "In diesem Abschnitt k\u00f6nnen Sie die JSON-Tags, die \u00fcbersetzten Texte durch die Website verwendet wird, enth\u00e4lt zu \u00e4ndern. Um dies zu tun, w\u00e4hlen Sie eine Vorlage aus, um ihre jeweiligen Tags \u00e4ndern. Alternativ klicken Sie auf den Link unten, um die Nachrichten der Website \u00e4ndern.",
+ "lang_editConfigModule": "Konfigurationsmodulbezeichnungsphrasen editieren",
+ "lang_editHardcoded": "Hardcoded-Texte bearbeiten",
+ "lang_editMessages": "Nachrichten bearbeiten",
+ "lang_editSettings": "Einstellungstexte bearbeiten",
+ "lang_editTemplates": "Template-Texte bearbeiten",
+ "lang_langAdministration": "Sprache Verwaltung"
+}
\ No newline at end of file
diff --git a/modules-available/translation/lang/de/templates/edit.json b/modules-available/translation/lang/de/templates/edit.json
new file mode 100644
index 00000000..671e51d8
--- /dev/null
+++ b/modules-available/translation/lang/de/templates/edit.json
@@ -0,0 +1,12 @@
+{
+ "lang_back": "Z\u00fcruck",
+ "lang_createTag": "TAG schafen",
+ "lang_deleteTAG": "L\u00f6schen",
+ "lang_englishTAG": "Englisch TAG",
+ "lang_germanTAG": "Deutsch TAG",
+ "lang_newTAG": "Neue Tag",
+ "lang_portugueseTAG": "Portugiesisch TAG",
+ "lang_save": "Speichern",
+ "lang_templateAdminHelp": "Hier k\u00f6nnen Sie die verwendeten Texte und S\u00e4tze \u00fcbersetzen.",
+ "lang_templateHint": "Hinweis: Gelbe Linie zeigt eine \u00dcbersetzung fehlt und roten Linien zeigen ein Tag wird nicht von das Template verwendet."
+}
\ No newline at end of file
diff --git a/modules-available/translation/lang/de/templates/template-list.json b/modules-available/translation/lang/de/templates/template-list.json
new file mode 100644
index 00000000..5d6945bc
--- /dev/null
+++ b/modules-available/translation/lang/de/templates/template-list.json
@@ -0,0 +1,5 @@
+{
+ "lang_adminInfo": "Dies ist eine Liste aller Templates. Die \u0022Status\u0022-Spalte zeigt an, wenn f\u00fcr ein Template \u00fcbersetzungen fehlen, oder veraltete Tags definiert sind.",
+ "lang_langAdministration": "Templates",
+ "lang_status": "Status"
+}
\ No newline at end of file
diff --git a/modules-available/translation/lang/en/module.json b/modules-available/translation/lang/en/module.json
new file mode 100644
index 00000000..07bdb07e
--- /dev/null
+++ b/modules-available/translation/lang/en/module.json
@@ -0,0 +1,16 @@
+{
+ "lang_adminInfo": "In this section you can change the JSON tags that contains the translated texts used by the site. To do this, select a template below to modify their respective tags. Alternatively, click the link below to change the messages of the site.",
+ "lang_back": "Back",
+ "lang_deleteTAG": "Delete",
+ "lang_editHardcoded": "Edit hardcoded strings",
+ "lang_editMessages": "Edit Messages",
+ "lang_editModules": "Edit Module Translations",
+ "lang_editSettings": "Edit configuration variables related strings",
+ "lang_langAdministration": "Language Administration",
+ "lang_module": "Module",
+ "lang_save": "Save",
+ "lang_status": "Status",
+ "lang_templateAdminHelp": "Here you can translate and edit phrases and texts.",
+ "lang_templateHint": "Hint: Yellow lines indicate a translation is missing and red lines indicate a tag is not being used by the template.",
+ "module_name": "Translation"
+}
\ No newline at end of file
diff --git a/modules-available/translation/lang/en/templates/_page.json b/modules-available/translation/lang/en/templates/_page.json
new file mode 100644
index 00000000..5a48b696
--- /dev/null
+++ b/modules-available/translation/lang/en/templates/_page.json
@@ -0,0 +1,9 @@
+{
+ "lang_adminInfo": "In this section you can change the JSON tags that contains the translated texts used by the site. To do this, select a template below to modify their respective tags. Alternatively, click the link below to change the messages of the site.",
+ "lang_editConfigModule": "Edit config module strings",
+ "lang_editHardcoded": "Edit hardcoded strings",
+ "lang_editMessages": "Edit Messages",
+ "lang_editSettings": "Edit configuration variables related strings",
+ "lang_editTemplates": "Edit template strings",
+ "lang_langAdministration": "Language Administration"
+}
\ No newline at end of file
diff --git a/modules-available/translation/lang/en/templates/edit.json b/modules-available/translation/lang/en/templates/edit.json
new file mode 100644
index 00000000..05c6697a
--- /dev/null
+++ b/modules-available/translation/lang/en/templates/edit.json
@@ -0,0 +1,12 @@
+{
+ "lang_back": "Back",
+ "lang_createTag": "Create TAG",
+ "lang_deleteTAG": "Delete",
+ "lang_englishTAG": "English TAG",
+ "lang_germanTAG": "German TAG",
+ "lang_newTAG": "New TAG",
+ "lang_portugueseTAG": "Portuguese TAG",
+ "lang_save": "Save",
+ "lang_templateAdminHelp": "Here you can translate and edit phrases and texts.",
+ "lang_templateHint": "Hint: Yellow lines indicate a translation is missing and red lines indicate a tag is not being used by the template."
+}
\ No newline at end of file
diff --git a/modules-available/translation/lang/en/templates/template-list.json b/modules-available/translation/lang/en/templates/template-list.json
new file mode 100644
index 00000000..e3feb70b
--- /dev/null
+++ b/modules-available/translation/lang/en/templates/template-list.json
@@ -0,0 +1,5 @@
+{
+ "lang_adminInfo": "This is a list of all templates. The \u0022status\u0022-column tells if there are translations missing, or unused tags are defined.",
+ "lang_langAdministration": "Templates",
+ "lang_status": "Status"
+}
\ No newline at end of file
diff --git a/modules-available/translation/lang/pt/module.json b/modules-available/translation/lang/pt/module.json
new file mode 100644
index 00000000..14964c89
--- /dev/null
+++ b/modules-available/translation/lang/pt/module.json
@@ -0,0 +1,16 @@
+{
+ "lang_adminInfo": "Nesta se\u00e7\u00e3o \u00e9 poss\u00edvel alterar as TAGs de JSON que cont\u00e9m os textos traduzidos utilizados no site. Para fazer isto, selecione um template abaixo para modificar suas respectivas TAGs. Alternativamente, clique no link abaixo para alterar as mensagens do site.",
+ "lang_back": "Voltar",
+ "lang_deleteTAG": "Excluir",
+ "lang_editHardcoded": "Editar Textos Hardcoded",
+ "lang_editMessages": "Editar Mensagens",
+ "lang_editModules": "Editar Tradu\u00e7\u00f5es dos M\u00f3dulos",
+ "lang_editSettings": "Editar Textos das Vari\u00e1veis de Configura\u00e7\u00e3o",
+ "lang_langAdministration": "Administra\u00e7\u00e3o da L\u00edngua",
+ "lang_module": "M\u00f3dulo",
+ "lang_save": "Salvar",
+ "lang_status": "Status",
+ "lang_templateAdminHelp": "Aqui voc\u00ea pode traduzir e editar frases e textos.",
+ "lang_templateHint": "Dica: linhas amarelas indicam que uma tradu\u00e7\u00e3o est\u00e1 faltando e linhas vermelhas indicam que uma tag n\u00e3o \u00e9 utilizada pelo template.",
+ "module_name": "Tradu\u00e7\u00f5es"
+}
\ No newline at end of file
diff --git a/modules-available/translation/page.inc.php b/modules-available/translation/page.inc.php
new file mode 100644
index 00000000..3548f727
--- /dev/null
+++ b/modules-available/translation/page.inc.php
@@ -0,0 +1,597 @@
+updateJson();
+ Util::redirect('?do=Translation');
+ }
+ if (Request::post('delete')) {
+ $this->deleteTag(Request::post('path'), Request::post('delete'));
+ Util::redirect('?do=Translation'); // TODO: Ajax post for delete so we stay on the page
+ }
+
+ $this->template = Request::get('template');
+ $this->page = Request::get('page');
+ }
+
+ protected function doRender()
+ {
+ $langs = Dictionary::getLanguages(true);
+
+ //load the page accordingly to the link
+ switch ($this->page) {
+ case 'messages':
+ //renders the message edit page
+ Render::addTemplate('edit', array(
+ 'path' => 'messages',
+ 'langs' => $langs,
+ 'tags' => $this->loadMessageEditArray()
+ ));
+ break;
+ case 'hardcoded':
+ //renders the hardcoded messages edit page
+ Render::addTemplate('edit', array(
+ 'path' => 'messages-hardcoded',
+ 'langs' => $langs,
+ 'tags' => $this->loadHardcodedStringEditArray()
+ ));
+ break;
+ case 'settings':
+ //renders the settings related edit page
+ Render::addTemplate('edit', array(
+ 'path' => 'cat_setting',
+ 'langs' => $langs,
+ 'tags' => $this->loadCategoriesArray()
+ ));
+ Render::addTemplate('edit', array(
+ 'path' => 'setting',
+ 'langs' => $langs,
+ 'tags' => $this->loadSettingsArray()
+ ));
+ break;
+ case 'config-module':
+ //renders the hardcoded messages edit page
+ Render::addTemplate('edit', array(
+ 'path' => 'config-module',
+ 'langs' => $langs,
+ 'tags' => $this->buildTranslationTable('config-module')
+ ));
+ break;
+ case 'template':
+ $this->template = Util::safePath($this->template);
+ if ($this->template === false) {
+ Message::addError('invalid-path');
+ Util::redirect('?do=Translation');
+ }
+ //renders the tag edition page
+ Render::addTemplate('edit', array(
+ 'path' => 'modules/' . $this->template,
+ 'langs' => $langs,
+ 'tags' => $this->loadTemplateEditArray($this->template)
+ ));
+ break;
+ case 'templates':
+ //renders the template selection page
+ Render::addTemplate('template-list', array(
+ 'table' => $this->loadTemplatesList(),
+ ));
+ break;
+ case 'modules':
+ Render::addTemplate('module-list', array(
+ 'table' => $this->loadModuleTable()
+ ));
+ break;
+ default:
+ //renders main page with selection of what part to edit
+ Render::addTemplate('_page');
+ }
+ }
+
+ private function loadModuleTable(){
+ $table = array();
+
+ $modules = $this->loadModuleList();
+
+ foreach ($modules as $module) {
+ $msgs = $this->checkModuleTranslation($module);
+ $table[] = array(
+ 'module' => $module,
+ 'status' => $msgs
+ );
+ }
+
+ sort($table);
+ return $table;
+ }
+
+ private function loadModuleEdit(){
+ $table = array();
+ $tags = array_flip($this->loadModuleTags($this->module));
+ foreach ($this->langs as $lang) {
+ $tags = array_merge($tags, Dictionary::getArray($this->module,$lang['cc']));
+ }
+ foreach ($tags as $tag => $value) {
+ $langArray = array();
+ $class = '';
+ foreach ($this->langs as $lang) {
+ $translations = Dictionary::getArray($this->module,$lang['cc']);
+ $langArray[] = array(
+ 'lang' => $lang['cc'],
+ 'placeholder' => 'TAG - ' . $lang['name'],
+ 'translation' => $translations[$tag]
+ );
+ if(!in_array($tag, $this->loadModuleTags($this->module)))
+ $class = 'danger';
+ else if(!$translations[$tag])
+ $class = 'warning';
+ }
+ $table[] = array(
+ 'tag' => $tag,
+ 'class' => $class,
+ 'langs' => $langArray
+ );
+ }
+
+ return $table;
+ }
+
+ private function loadModuleList(){
+ // Return an array with the modules and the tags data
+ $list = array();
+ $list = array_diff(scandir('modules/'), array('..', '.'));
+ return $list;
+ }
+
+ private function loadModuleTags($module){
+ // Return an array with the module language tags
+ $path = "modules/" . $module . "templates/";
+ $files = array_diff(scandir($path), array('..', '.'));
+ $tags = array();
+ foreach ($files as $file) {
+ $content = file_get_contents($path . $file);
+ preg_match_all('/{{(lang_.*?)}}/s', $content, $matches);
+ if (isset($matches[1]) && is_array($matches[1])){
+ $tags = array_merge($tags,array_unique($matches[1]));
+ }
+ }
+ return array_unique($tags);
+ }
+
+ private function checkModuleTranslation($module){
+ $tags = $this->loadModuleTags($module);
+ $translation = array();
+ $msgs = '';
+ foreach ($this->langs as $key => $lang) {
+ $translation = Dictionary::getArray($module,$lang['cc']);
+ $matches = 0;
+ $unused = 0;
+ $expected = count($tags);
+ foreach ($translation as $key => $value) {
+ if(!in_array($key, $tags))
+ $unused ++;
+ else if(!empty($value))
+ $matches ++;
+
+ }
+
+ $diff = $expected - $matches;
+ $msg = "";
+ if ($diff > 0)
+ $msg .= $diff . " JSON tag(s) are missing";
+ if ($diff > 0 && $unused > 0)
+ $msg .= ""; + if ($unused > 0) + $msg .= $unused . " JSON tag(s) are not being used"; + if(!empty($msg)) + $msgs .= "
{$lang['name']}: $msg
";
+ }
+ if(empty($msgs))
+ $msgs = 'OK';
+ return $msgs;
+ }
+ /**
+ * Load the main table with all the website's templates and it's informations
+ * @return array with the templates' information
+ */
+ private function loadTemplatesList()
+ {
+ $table = array();
+
+ //loads every template
+ $files = $this->listTemplates();
+ $langs = Dictionary::getLanguages(true);
+
+ //checks the JSON tags from every language
+ foreach ($files as $file) {
+ $tags = $this->loadTemplateTags($file['path']);
+ // Don't list templates without lang tags
+ if (empty($tags))
+ continue;
+ $msgs = '';
+ foreach ($langs as $lang) {
+ $msg = $this->checkJson($file['path'], $lang['cc'], $tags);
+ if (!empty($msg))
+ $msgs .= "{$lang['name']}:$msg
";
+ }
+ if (empty($msgs))
+ $msgs = 'OK';
+ $table[] = array(
+ 'template' => $file['name'],
+ 'link' => $file['name'],
+ 'status' => $msgs
+ );
+ }
+ sort($table);
+ return $table;
+ }
+
+ /**
+ * Finds and returns all the website's templates
+ * @return array
+ */
+ private function listTemplates()
+ {
+ $files = array();
+ $dir = 'modules/';
+ $objects = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir));
+ foreach ($objects as $name => $object) {
+ if (substr($name, -5) === '.html') {
+ $files[] = array(
+ 'path' => substr($name, 0, -5),
+ 'name' => substr($name, strlen($dir), -5)
+ );
+ }
+ }
+ return $files;
+ }
+
+ /**
+ * Finds and returns all PHP files of slxadmin
+ * @return array of all php files
+ */
+ private function listPhp()
+ {
+ $php = array();
+ $dir = '.';
+ $objects = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir));
+ foreach ($objects as $name => $object) {
+ if (substr($name, -4) === '.php') {
+ $php[] = $name;
+ }
+ }
+ return $php;
+ }
+
+ /**
+ * Checks the JSON tags from a template
+ * @param string the template's path
+ * @param string the selected language
+ * @param string tags that should be in the json file
+ * @return string|boolean the information about the JSON tags, false if template has no lang-tags
+ */
+ private function checkJson($path, $lang, $expectedTags)
+ {
+ //if there was not a valid template's path
+ if (!$path) {
+ return "Translation missing";
+ }
+ // How many tags do we expect in the translation
+ $htmlCount = count($expectedTags);
+
+ //initialize the count variables
+ $matchCount = 0;
+ $unusedCount = 0;
+
+ //loads the JSON tags and count the matches
+ $json = Dictionary::getArray(substr($path, strlen("modules/")), $lang);
+ //return print_r($json) . "\nvs\n" . print_r($expectedTags);
+ foreach ($json as $key => $value) {
+ if (!in_array($key, $expectedTags)) {
+ $unusedCount++;
+ } else if (!empty($value)) {
+ $matchCount++;
+ }
+ }
+ $diff = $htmlCount - $matchCount;
+
+ if ($diff == 0 && $unusedCount == 0)
+ return '';
+ //build the return string
+ $str = "";
+ if ($diff > 0)
+ $str .= $diff . " JSON tag(s) are missing";
+ if ($diff > 0 && $unusedCount > 0)
+ $str .= ""; + if ($unusedCount > 0) + $str .= $unusedCount . " JSON tag(s) are not being used"; + return $str; + } + + /** + * Get array to pass to edit page with all the tags and translations for the given template + * @param string $path the template's path + * @return array the information about the JSON tags + */ + private function loadTemplateEditArray($path) + { + $tags = $this->loadTemplateTags($path); + if ($tags === false) + return false; + return $this->buildTranslationTable("modules/" . $path, $tags); + } + + /** + * Load array of tags used in given template. + * @param string $path the path of the template, relative to templates/, without .html extension. + * @return array all tags in template + */ + private function loadTemplateTags($path) + { + $templateFile = "$path.html"; + //checks if the template is valid + if (!file_exists($templateFile)) { + Message::addError('invalid-template', $templateFile); + return false; + } + + //finds every mustache tag within the html template + $htmlTemplate = file_get_contents($templateFile); + preg_match_all('/{{(lang_.*?)}}/s', $htmlTemplate, $matches); + if (!isset($matches[1]) || !is_array($matches[1])) + return array(); + return array_unique($matches[1]); + } + + /** + * Load array of tags and translations of all messages + * @return array the information about the JSON tags + */ + private function loadMessageEditArray() + { + $tags = $this->loadTagsFromPhp('/Message\s*::\s*add\w+\s*\(\s*[\'"](.*?)[\'"]\s*[\)\,]/i'); + if ($tags === false) + return false; + return $this->buildTranslationTable('messages', $tags); + } + + /** + * Load array of tags and translations of all strings found in the php files. + * @return array the information about the JSON tags + */ + private function loadHardcodedStringEditArray() + { + $tags = $this->loadTagsFromPhp('/Dictionary\s*::\s*translate\s*\(\s*[\'"]([^\'"]*?)[\'"]\s*\)/i'); + if ($tags === false) + return false; + return $this->buildTranslationTable('messages-hardcoded', $tags); + } + + /** + * Load array of tags used in all the php files, by given regexp. Capture group 1 should return + * the exact tag name. + * @param string $regexp regular expression matching all tags in capture group 1 + * @return array of all tags found + */ + private function loadTagsFromPhp($regexp) + { + // Get all php files, so we can find all strings that need to be translated + $php = $this->listPhp(); + $tags = array(); + // Now find all tags in all php files. Only works for literal usage, not something like $foo = 'bar'; Dictionary::translate($foo); + foreach ($php as $file) { + $content = @file_get_contents($file); + if ($content === false || preg_match_all($regexp, $content, $out) < 1) + continue; + foreach ($out[1] as $id) { + $tags[$id] = true; + } + } + return array_keys($tags); + } + + private function buildTranslationTable($path, $requiredTags = false) + { + // All languages + $langArray = Dictionary::getLanguages(); + + $tags = array(); + if ($requiredTags !== false) { + foreach ($requiredTags as $tagName) { + $tags[$tagName] = array('tag' => $tagName); + foreach ($langArray as $lang) { + $tags[$tagName]['langs'][$lang]['lang'] = $lang; + $tags[$tagName]['missing'] = count($langArray); + } + } + } + // Finds every JSON tag within the JSON language files + foreach ($langArray as $lang) { + $jsonTags = Dictionary::getArray($path, $lang, true); + if (!is_array($jsonTags)) + continue; + foreach ($jsonTags as $tag => $translation) { + $tags[$tag]['langs'][$lang]['translation'] = $translation; + $tags[$tag]['langs'][$lang]['lang'] = $lang; + if (strpos($translation, "\n") !== false) + $tags[$tag]['langs'][$lang]['big'] = true; + $tags[$tag]['tag'] = $tag; + if (!isset($tags[$tag]['missing'])) + $tags[$tag]['missing'] = 0; + if (!empty($translation)) + $tags[$tag]['missing'] --; + } + } + // Fill the blanks + foreach ($langArray as $lang) { + foreach (array_keys($tags) as $tagName) { + if (!isset($tags[$tagName]['langs'][$lang])) + $tags[$tagName]['langs'][$lang]['lang'] = $lang; + } + } + // Finally remove $lang from the keys so mustache will iterate over them via {{#..}} + foreach ($tags as &$tag) { + $tag['langs'] = array_values($tag['langs']); + if ($requiredTags !== false) + $tag['class'] = $this->getTagColor($tag['missing']); + } + return array_values($tags); + } + + /** + * Change the color of the table line according to the tag status + * @param string the JSON's path + * @param string the selected tag + * @return string the css class of the line + */ + private function getTagColor($missingCount) + { + //return danger in case the tag is not found in the template + if ($missingCount < 0) + return 'danger'; + + //return warning in case at least one of the tag's values is empty + if ($missingCount > 0) + return 'warning'; + //if it's ok don't change the class + return ''; + } + + /** + * Updates a JSON file with it's new tags or/and tags values + */ + private function updateJson() + { + $langArray = Dictionary::getLanguages(); + foreach ($langArray as $lang) { + $json[$lang] = array(); + } + + //find the tag requests to change the file + foreach ($_POST as $key => $value) { + $str = explode('#', $key, 3); + if (count($str) !== 3 || $str[0] !== 'lang') + continue; + $lang = $str[1]; + $tag = trim($str[2]); + if (!isset($json[$lang])) { + Message::addWarning('i18n-invalid-lang', $lang); + continue; + } + if (empty($tag)) { + Message::addWarning('i18n-empty-tag'); + continue; + } + $value = trim($value); + if ($tag !== 'newtag') { + if (empty($value)) { + unset($json[$lang][$tag]); + } else { + $json[$lang][$tag] = $value; + } + } else { + if (!empty($value)) // TODO: Error message if new tag's name collides with existing + $json[$lang][$_REQUEST['newtag']] = $value; + } + } + + // JSON_PRETTY_PRINT is only available starting with php 5.4.0.... Use upgradephp's json_encode + require_once('inc/up_json_encode.php'); + + //saves the new values on the file + foreach ($json as $key => $array) { + $path = Util::safePath('lang/' . $key . '/' . Request::post('path') . '.json'); + if ($path === false) { + Message::addError('invalid-path'); + Util::redirect('?do=Translation'); + } + @mkdir(dirname($path), 0755, true); + ksort($array); // Sort by key, so the diff on the output is cleaner + $json = up_json_encode($array, JSON_PRETTY_PRINT); // Also for better diffability of the json files, we pretty print + //exits the function in case the action was unsuccessful + if (@file_put_contents($path, $json) === false) { + Message::addError('invalid-template'); + return; + } + } + Message::addSuccess('updated-tags'); + } + + /** + * Delete a specific JSON tag from a JSON files + * @var string the JSON's file path + * @var the JSON tag to be deleted + * @return boolean if the action was not successful + */ + private function deleteTag($path, $tag) + { + // JSON_PRETTY_PRINT is only available starting with php 5.4.0.... Use upgradephp's json_encode + require_once('inc/up_json_encode.php'); + + //delete the tag from every language file + $langArray = Dictionary::getLanguages(); + foreach ($langArray as $lang) { + $json = Dictionary::getArray($path, $lang); + unset($json[$tag]); + $result = file_put_contents('lang/' . $lang . '/' . $path . '.json', up_json_encode($json, JSON_PRETTY_PRINT)); + //add warning and exit in case the action was unsuccessful + if ($result === false) { + Message::addWarning('unsuccessful-action'); + return false; + } + } + Message::addSuccess('deleted-tag'); + } + + /** + * Load all settings categories for editing. + * + * @return array + */ + private function loadCategoriesArray() + { + $want = array(); + $res = Database::simpleQuery("SELECT catid FROM cat_setting ORDER BY catid ASC"); + while ($row = $res->fetch(PDO::FETCH_ASSOC)) { + $want[] = 'cat_' . $row['catid']; + } + return $this->buildTranslationTable('settings/cat_setting', $want); + } + + /** + * Load all settings categories for editing. + * + * @return array + */ + private function loadSettingsArray() + { + $want = array(); + $res = Database::simpleQuery("SELECT setting FROM setting ORDER BY setting ASC"); + while ($row = $res->fetch(PDO::FETCH_ASSOC)) { + $want[] = $row['setting']; + } + return $this->buildTranslationTable('settings/setting', $want); + } + +} diff --git a/modules-available/translation/templates/_page.html b/modules-available/translation/templates/_page.html new file mode 100644 index 00000000..52a4c94b --- /dev/null +++ b/modules-available/translation/templates/_page.html @@ -0,0 +1,17 @@ +
+
diff --git a/modules-available/translation/templates/edit.html b/modules-available/translation/templates/edit.html
new file mode 100644
index 00000000..dc01deb6
--- /dev/null
+++ b/modules-available/translation/templates/edit.html
@@ -0,0 +1,71 @@
+
+ {{lang_langAdministration}}
+
+
+
+{{lang_adminInfo}}
+ +
+
+
diff --git a/modules-available/translation/templates/module-list.html b/modules-available/translation/templates/module-list.html
new file mode 100644
index 00000000..037a21bc
--- /dev/null
+++ b/modules-available/translation/templates/module-list.html
@@ -0,0 +1,32 @@
+
+
+
+ {{path}}
+
+
+
+ {{lang_templateAdminHelp}}
+
+ {{lang_templateHint}}
+
+
+
+
+
+ {{lang_langAdministration}}
+
+
+
+{{lang_adminInfo}}
+
+
+
+
+
+
+
diff --git a/modules-available/translation/templates/template-list.html b/modules-available/translation/templates/template-list.html
new file mode 100644
index 00000000..881fc5af
--- /dev/null
+++ b/modules-available/translation/templates/template-list.html
@@ -0,0 +1,32 @@
+| {{lang_module}} | +{{lang_status}} | +
|---|---|
| {{module}} | +{{{status}}} | +
+
+
+ {{lang_langAdministration}}
+
+
+
+{{lang_adminInfo}}
+
+
+
+
+
+
+
diff --git a/modules-available/usermanagement/config.json b/modules-available/usermanagement/config.json
new file mode 100644
index 00000000..b9fc3ad3
--- /dev/null
+++ b/modules-available/usermanagement/config.json
@@ -0,0 +1,5 @@
+{
+ "category":"main.users",
+ "enabled":"true",
+ "permission":"0"
+}
diff --git a/modules-available/usermanagement/lang/en/module.json b/modules-available/usermanagement/lang/en/module.json
new file mode 100644
index 00000000..a8114ffc
--- /dev/null
+++ b/modules-available/usermanagement/lang/en/module.json
@@ -0,0 +1,19 @@
+{
+ "lang_cancelConfirm": "Do you really want to delete this users?",
+ "lang_close": "Close",
+ "lang_create": "Create",
+ "lang_edit": "Edit",
+ "lang_editUser": "Edit User",
+ "lang_email": "Email",
+ "lang_login": "Login",
+ "lang_operations": "Operation",
+ "lang_password": "Password",
+ "lang_remove": "Remove",
+ "lang_save": "Save",
+ "lang_telephone": "Telephone",
+ "lang_userAdmin": "Administrator",
+ "lang_userInfo": "On this section, you will be able to create website users, besides editing or removing existing users.",
+ "lang_userPage": "Users",
+ "lang_username": "Username",
+ "module_name": "Management"
+}
\ No newline at end of file
diff --git a/modules-available/usermanagement/lang/en/templates/user-management.json b/modules-available/usermanagement/lang/en/templates/user-management.json
new file mode 100644
index 00000000..61225f55
--- /dev/null
+++ b/modules-available/usermanagement/lang/en/templates/user-management.json
@@ -0,0 +1,18 @@
+{
+ "lang_cancelConfirm": "Do you really want to delete this users?",
+ "lang_close": "Close",
+ "lang_create": "Create",
+ "lang_edit": "Edit",
+ "lang_editUser": "Edit User",
+ "lang_email": "Email",
+ "lang_login": "Login",
+ "lang_operations": "Operation",
+ "lang_password": "Password",
+ "lang_remove": "Remove",
+ "lang_save": "Save",
+ "lang_telephone": "Telephone",
+ "lang_userAdmin": "Administrator",
+ "lang_userInfo": "On this section, you will be able to create website users, besides editing or removing existing users.",
+ "lang_userPage": "Users",
+ "lang_username": "Username"
+}
\ No newline at end of file
diff --git a/modules-available/usermanagement/lang/pt/module.json b/modules-available/usermanagement/lang/pt/module.json
new file mode 100644
index 00000000..d892e5c5
--- /dev/null
+++ b/modules-available/usermanagement/lang/pt/module.json
@@ -0,0 +1,19 @@
+{
+ "lang_cancelConfirm": "Deseja realmente remover o usu\u00e1rio?",
+ "lang_close": "Fechar",
+ "lang_create": "Criar",
+ "lang_edit": "Editar",
+ "lang_editUser": "Editar Usu\u00e1rio",
+ "lang_email": "Email",
+ "lang_login": "Login",
+ "lang_operations": "Opera\u00e7\u00f5es",
+ "lang_password": "Senha",
+ "lang_remove": "Remover",
+ "lang_save": "Salvar",
+ "lang_telephone": "Telefone",
+ "lang_userAdmin": "Administrador",
+ "lang_userInfo": "Nesta se\u00e7\u00e3o voc\u00ea poder\u00e1 criar usu\u00e1rios para o site, al\u00e9m de editar as informa\u00e7\u00f5es ou remover usu\u00e1rios existentes.",
+ "lang_userPage": "Usu\u00e1rios",
+ "lang_username": "Nome do Usu\u00e1rio",
+ "module_name": "Gerenciamento"
+}
\ No newline at end of file
diff --git a/modules-available/usermanagement/page.inc.php b/modules-available/usermanagement/page.inc.php
new file mode 100644
index 00000000..01b5f755
--- /dev/null
+++ b/modules-available/usermanagement/page.inc.php
@@ -0,0 +1,109 @@
+page = $p;
+ else
+ $this->page = 1;
+
+ switch(Request::post('action')){
+ case "editAdmin":
+ $this->edit(Request::post('userid'),Request::post('username'),Request::post('phone'),Request::post('email'), 1);
+ break;
+ case "edit":
+ $this->edit(Request::post('userid'),Request::post('username'),Request::post('phone'),Request::post('email'), 4);
+ break;
+ case "create":
+ $this->create(Request::post('login'),Request::post('username'),Request::post('pass'),Request::post('phone'),Request::post('email'), 4);
+ break;
+ case "delete":
+ $this->delete(Request::post('userid'));
+ break;
+ }
+
+ if(isset($_POST['userid']))
+ $this->deb = $_POST['userid'];
+
+ if (!User::hasPermission('superadmin')) {
+ Message::addError('no-permission');
+ Util::redirect('?do=Main');
+ }
+
+ }
+
+ protected function doRender()
+ {
+ // load every user
+ $admin = array();
+ $users = array();
+ $res = Database::simpleQuery("SELECT userid, login, fullname, phone, email, permissions FROM user ORDER BY userid DESC");
+ while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+ if ($row['permissions'] == 1 )
+ $admin = array($row['userid'],$row['login'],$row['fullname'],$row['phone'],$row['email']);
+ else
+ $users[] = array(
+ 'id' => $row['userid'],
+ 'username' => $row['login'],
+ 'name' => $row['fullname'],
+ 'telephone' => $row['phone'],
+ 'email' => $row['email']
+ );
+ }
+
+ //$pag = new Paginate($users,$this->page);
+
+ Render::addTemplate('user-management', array(
+ 'admin_id' => $admin[0],
+ 'admin_username' => $admin[1],
+ 'admin_name' => $admin[2],
+ 'admin_telephone' => $admin[3],
+ 'admin_email' => $admin[4]
+ //'users' => $pag->getItems(),
+ //'pages' => $pag->getPagination()
+ ));
+ }
+
+ private function edit($userid, $newname, $newphone, $newemail, $newpermissions){
+ $data = array (
+ 'user' => $userid,
+ 'name' => $newname,
+ 'phone' => $newphone,
+ 'email' => $newemail,
+ 'permissions' => $newpermissions
+ );
+ Database::exec ( 'UPDATE user SET fullname = :name, phone = :phone, email = :email, permissions = :permissions WHERE userid = :user', $data );
+ Message::addSuccess('update-user');
+ }
+
+ private function create($login, $username, $password, $phone, $email){
+ $data = array (
+ 'login' => $login,
+ 'pass' => Crypto::hash6 ( $password ),
+ 'name' => $username,
+ 'phone' => $phone,
+ 'email' => $email
+ );
+ User::addUser($data);
+ }
+
+ private function delete($userid){
+ $data = array (
+ 'userid' => $userid
+ );
+ Database::exec ( 'DELETE FROM setting_partition WHERE user = :userid', $data );
+ Database::exec ( 'DELETE FROM setting_user WHERE user = :userid', $data );
+ Database::exec ( 'DELETE FROM setting_values WHERE user = :userid', $data );
+ Database::exec ( 'DELETE FROM user WHERE userid = :userid', $data );
+ Message::addSuccess('delete-user');
+ }
+
+}
diff --git a/modules-available/usermanagement/templates/user-management.html b/modules-available/usermanagement/templates/user-management.html
new file mode 100644
index 00000000..fc14355f
--- /dev/null
+++ b/modules-available/usermanagement/templates/user-management.html
@@ -0,0 +1,127 @@
+| Template | +{{lang_status}} | +
|---|---|
| {{template}} | +{{{status}}} | +
+
+
+
+
+
+
+ {{lang_userAdmin}}
+ | ID | +{{lang_login}} | +{{lang_username}} | +{{lang_telephone}} | +{{lang_email}} | ++ |
|---|---|---|---|---|---|
+
+
+
+{{#users}}
+
+
+ {{lang_userPage}}
+
+
+ + {{lang_userInfo}} +
+ +| ID | +{{lang_login}} | +{{lang_operations}} | +|||
|---|---|---|---|---|---|
| + | + | + + + | +|||
+
|
+ |||||
+
+{{/users}}
\ No newline at end of file
diff --git a/modules-available/vmstore/config.json b/modules-available/vmstore/config.json
new file mode 100644
index 00000000..f2abe27c
--- /dev/null
+++ b/modules-available/vmstore/config.json
@@ -0,0 +1,4 @@
+{
+ "category":"main.settings",
+ "enabled":"true"
+}
diff --git a/modules-available/vmstore/lang/de/templates/mount.json b/modules-available/vmstore/lang/de/templates/mount.json
new file mode 100644
index 00000000..dbc75281
--- /dev/null
+++ b/modules-available/vmstore/lang/de/templates/mount.json
@@ -0,0 +1,5 @@
+{
+ "lang_back": "Zur\u00fcck",
+ "lang_configure": "Konfigurieren",
+ "lang_vmLocationConfiguration": "VM Speicherort wird konfiguriert"
+}
\ No newline at end of file
diff --git a/modules-available/vmstore/lang/de/templates/page-vmstore.json b/modules-available/vmstore/lang/de/templates/page-vmstore.json
new file mode 100644
index 00000000..bb2c0634
--- /dev/null
+++ b/modules-available/vmstore/lang/de/templates/page-vmstore.json
@@ -0,0 +1,17 @@
+{
+ "lang_close": "Schlie\u00dfen",
+ "lang_intern": "Intern",
+ "lang_nfsHelp1": "Ben\u00f6tigt wird ein NFSv4\/3-Share, der f\u00fcr den Satelliten-Server schreibbar, und f\u00fcr die Arbeitsstationen lesbar ist. Beispielkonfiguration auf dem NFS-Server, wenn der Satelliten-Server die Adresse 1.2.3.4 hat:",
+ "lang_nfsHelp2": "Alternative Konfiguration mittels all_sqash. In diesem Fall muss das Verzeichnis auf dem Server dem Benutzer mit der uid 1234 geh\u00f6ren:",
+ "lang_noAdditionalInformation": "Keine weitere Konfiguration notwendig",
+ "lang_password": "Passwort",
+ "lang_readOnly": "Nur-Lese-Zugangsdaten",
+ "lang_readWrite": "Lese\/Schreib-Zugangsdaten",
+ "lang_save": "Speichern",
+ "lang_username": "Benutzerkennung",
+ "lang_vmLocation": "VM Speicherort",
+ "lang_vmLocationChoose": "Bitte w\u00e4hlen Sie, wo die Images der Virtuellen Maschinen gespeichert werden sollen.",
+ "lang_vmLocationHelp1": "F\u00fcr Testzwecke k\u00f6nnen die VMs direkt auf dem Satellitenserver gespeichert werden. Sofern Sie jedoch die ausgelieferte Satelliten-vmdk betreiben bedenken Sie bitte, dass Sie dann nur ca. 100GB Speicher zur Verf\u00fcgung haben.",
+ "lang_vmLocationHelp2": "Im Produktivbetrieb bietet es sich an, hierf\u00fcr einen performanten Netzwerkspeicher zu benutzen. Dieser Netzwerkspeicher kann per NFS oder CIFS\/SMB eingebunden werden. In jedem Fall muss sichergestellt werden, dass der Satellitenserver zum Hinzuf\u00fcgen neuer Virtueller Maschinen Schreibzugriff auf diesen Netzwerkspeicher hat. Bei der Nutzung von NFSv3 kann dies IP-Basiert eingerichtet werden, f\u00fcr die Nutzung von CIFS\/SMB k\u00f6nnen Sie Zugangsdaten angaben, die zum Schreiben berechtigen.",
+ "lang_vmLocationHelp3": "Die bwLehrpool-Clients brauchen lediglich Lesezugriff auf den Netzwerkspeicher (und sollten aus Sicherheitsgr\u00fcnden auch wirklich nur lesen k\u00f6nnen). Bei CIFS\/SMB erreichen Sie dies am einfachsten, indem Sie passwortlosen Gastzugriff mit Leserechten auf die Freigabe erlauben."
+}
\ No newline at end of file
diff --git a/modules-available/vmstore/lang/en/module.json b/modules-available/vmstore/lang/en/module.json
new file mode 100644
index 00000000..9d11656f
--- /dev/null
+++ b/modules-available/vmstore/lang/en/module.json
@@ -0,0 +1,21 @@
+{
+ "lang_back": "Back",
+ "lang_close": "Close",
+ "lang_configure": "Configure",
+ "lang_intern": "Intern",
+ "lang_nfsHelp1": "An NFSv3-Share is required. It should be readable by all the workstations, and writable for the satellite server. An example, assuming the satellite server has IP address 1.2.3.4:",
+ "lang_nfsHelp2": "Alternate configuration using all_squash. The exported directory should be owned (and be writable) by the user with uid 1234.",
+ "lang_noAdditionalInformation": "No additional cofiguration required",
+ "lang_password": "Password",
+ "lang_readOnly": "Read-only Access",
+ "lang_readWrite": "Read\/Write Access",
+ "lang_save": "Save",
+ "lang_username": "Username",
+ "lang_vmLocation": "VM Location",
+ "lang_vmLocationChoose": "Please choose where the images of virtual machines will be stored.",
+ "lang_vmLocationConfiguration": "VM Location is being configured",
+ "lang_vmLocationHelp1": "For test purposes, the VMs can be stored directly on the Satellite server. However, if you operate the delivered satellite vmdk please remember that you have only about 100GB of memory.",
+ "lang_vmLocationHelp2": "In productive operation, it makes sense for this to use a high-performance network storage. This network storage can be integrated via NFS or CIFS \/ SMB. In any case, it must be ensured that the satellite server has write access to this network storage to add a new Virtual Machine . When using NFSv3 this can be set up IP-based, for the use of CIFS \/ SMB, you can access data disclosures that would entitle them to write.",
+ "lang_vmLocationHelp3": "The bwLehrpool clients only need read access to the network storage (and for security reasons, really can only read). In CIFS \/ SMB You can do this most easily by allowing passwordless guest access with read access to the share.",
+ "module_name": "Virtual Machine"
+}
\ No newline at end of file
diff --git a/modules-available/vmstore/lang/en/templates/mount.json b/modules-available/vmstore/lang/en/templates/mount.json
new file mode 100644
index 00000000..29814430
--- /dev/null
+++ b/modules-available/vmstore/lang/en/templates/mount.json
@@ -0,0 +1,5 @@
+{
+ "lang_back": "Back",
+ "lang_configure": "Configure",
+ "lang_vmLocationConfiguration": "VM location is configured"
+}
\ No newline at end of file
diff --git a/modules-available/vmstore/lang/en/templates/page-vmstore.json b/modules-available/vmstore/lang/en/templates/page-vmstore.json
new file mode 100644
index 00000000..23ddbbd3
--- /dev/null
+++ b/modules-available/vmstore/lang/en/templates/page-vmstore.json
@@ -0,0 +1,17 @@
+{
+ "lang_close": "Close",
+ "lang_intern": "Intern",
+ "lang_nfsHelp1": "An NFSv4\/3-Share is required. It should be readable by all the workstations, and writable for the satellite server. An example, assuming the satellite server has IP address 1.2.3.4:",
+ "lang_nfsHelp2": "Alternate configuration using all_squash. The exported directory should be owned (and be writable) by the user with uid 1234.",
+ "lang_noAdditionalInformation": "No additional cofiguration required",
+ "lang_password": "Password",
+ "lang_readOnly": "Read-only Access",
+ "lang_readWrite": "Read\/Write Access",
+ "lang_save": "Save",
+ "lang_username": "Username",
+ "lang_vmLocation": "VM Location",
+ "lang_vmLocationChoose": "Please choose where the images of virtual machines will be stored.",
+ "lang_vmLocationHelp1": "For test purposes, the VMs can be stored directly on the Satellite server. However, if you operate the delivered satellite vmdk please remember that you have only about 100GB of memory.",
+ "lang_vmLocationHelp2": "In productive operation, it makes sense for this to use a high-performance network storage. This network storage can be integrated via NFS or CIFS \/ SMB. In any case, it must be ensured that the satellite server has write access to this network storage to add a new Virtual Machine . When using NFSv3 this can be set up IP-based, for the use of CIFS \/ SMB, you can access data disclosures that would entitle them to write.",
+ "lang_vmLocationHelp3": "The bwLehrpool clients only need read access to the network storage (and for security reasons, really can only read). In CIFS \/ SMB You can do this most easily by allowing passwordless guest access with read access to the share."
+}
\ No newline at end of file
diff --git a/modules-available/vmstore/lang/pt/module.json b/modules-available/vmstore/lang/pt/module.json
new file mode 100644
index 00000000..1aa7fdaf
--- /dev/null
+++ b/modules-available/vmstore/lang/pt/module.json
@@ -0,0 +1,21 @@
+{
+ "lang_back": "Voltar",
+ "lang_close": "Fechar",
+ "lang_configure": "configurar",
+ "lang_intern": "Iterna",
+ "lang_nfsHelp1": "\u00c9 necess\u00e1rio um NFSv3-Share. Ele deve poder ser lido por todas as esta\u00e7\u00f5es de trabalho, e poder ser escrito pelo server. Um exemplo, assumindo que o server possui endere\u00e7o ip 1.2.3.4:",
+ "lang_nfsHelp2": "Configura\u00e7\u00e3o alternativa usando all_squash. O usu\u00e1rio com uid 1234 deve possuir ( e poder escrever em ) o diret\u00f3rio exportado.",
+ "lang_noAdditionalInformation": "Nenhuma configura\u00e7\u00e3o adicional necess\u00e1ria",
+ "lang_password": "Senha",
+ "lang_readOnly": "Acesso Somente Leitura",
+ "lang_readWrite": "Acesso Leitura\/Escrita",
+ "lang_save": "Salvar",
+ "lang_username": "Nome de Usu\u00e1rio",
+ "lang_vmLocation": "Localiza\u00e7\u00e3o da VM",
+ "lang_vmLocationChoose": "Por favor, escolha aonde as imagens das m\u00e1quinas virtuais ser\u00e3o armazenadas.",
+ "lang_vmLocationConfiguration": "Localiza\u00e7\u00e3o da VM \u00e9 configurada",
+ "lang_vmLocationHelp1": "Para fins de teste, as VMs podem ser armazenados diretamente no servidor sat\u00e9lite. No entanto, se voc\u00ea operar o vmdk do sat\u00e9lite entregue por favor lembre-se que voc\u00ea tem apenas cerca de 100 GB de mem\u00f3ria.",
+ "lang_vmLocationHelp2": "Em opera\u00e7\u00e3o, faz sentido para este usar um armazenamento de rede de alto desempenho. Este armazenamento de rede pode ser integrado atrav\u00e9s de NFS ou CIFS \/ SMB. Em qualquer caso, deve-se assegurar de que o servidor de sat\u00e9lite tenha acesso de grava\u00e7\u00e3o para este armazenamento de rede para poder adicionar uma nova m\u00e1quina virtual. Ao utilizar NFSv3 este pode ser configurado com base em IP, para o uso de CIFS \/ SMB, voc\u00ea pode acessar as divulga\u00e7\u00f5es de dados que lhe permitiria escrever.",
+ "lang_vmLocationHelp3": "Os clientes bwLehrpool s\u00f3 precisam ter acesso de leitura ao armazenamento de rede (e por raz\u00f5es de seguran\u00e7a, realmente s\u00f3 pode ler). Em CIFS \/ SMB Voc\u00ea pode fazer isso mais facilmente, permitindo o acesso a visitantes sem senha com acesso de leitura.",
+ "module_name": "M\u00e1quina Virtual"
+}
\ No newline at end of file
diff --git a/modules-available/vmstore/page.inc.php b/modules-available/vmstore/page.inc.php
new file mode 100644
index 00000000..81f92ee3
--- /dev/null
+++ b/modules-available/vmstore/page.inc.php
@@ -0,0 +1,63 @@
+setStore();
+ }
+ }
+
+ protected function doRender()
+ {
+ $action = Request::post('action');
+ if ($action === 'setstore' && !Taskmanager::isFailed($this->mountTask)) {
+ Render::addTemplate('mount', array(
+ 'task' => $this->mountTask['id']
+ ));
+ return;
+ }
+ $vmstore = Property::getVmStoreConfig();
+ if (isset($vmstore['storetype'])) {
+ $vmstore['pre-' . $vmstore['storetype']] = 'checked';
+ }
+ Render::addTemplate('page-vmstore', $vmstore);
+ }
+
+ private function setStore()
+ {
+ foreach (array('storetype', 'nfsaddr', 'cifsaddr', 'cifsuser', 'cifspasswd', 'cifsuserro', 'cifspasswdro') as $key) {
+ $vmstore[$key] = trim(Request::post($key, ''));
+ }
+ $storetype = $vmstore['storetype'];
+ if (!in_array($storetype, array('internal', 'nfs', 'cifs'))) {
+ Message::addError('value-invalid', 'type', $storetype);
+ Util::redirect('?do=VmStore');
+ }
+ // Validate syntax of nfs/cifs
+ if ($storetype === 'nfs' && !preg_match('#^\S+:\S+$#is', $vmstore['nfsaddr'])) {
+ Message::addError('value-invalid', 'nfsaddr', $vmstore['nfsaddr']);
+ Util::redirect('?do=VmStore');
+ }
+ $vmstore['cifsaddr'] = str_replace('\\', '/', $vmstore['cifsaddr']);
+ if ($storetype === 'cifs' && !preg_match('#^//\S+/.+$#is', $vmstore['cifsaddr'])) {
+ Message::addError('value-invalid', 'nfsaddr', $vmstore['nfsaddr']);
+ Util::redirect('?do=VmStore');
+ }
+ $this->mountTask = Trigger::mount($vmstore);
+ TaskmanagerCallback::addCallback($this->mountTask, 'manualMount', $vmstore);
+ }
+
+}
\ No newline at end of file
diff --git a/modules-available/vmstore/templates/mount.html b/modules-available/vmstore/templates/mount.html
new file mode 100644
index 00000000..eabee81a
--- /dev/null
+++ b/modules-available/vmstore/templates/mount.html
@@ -0,0 +1,25 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/modules-available/vmstore/templates/page-vmstore.html b/modules-available/vmstore/templates/page-vmstore.html
new file mode 100644
index 00000000..fe2c5225
--- /dev/null
+++ b/modules-available/vmstore/templates/page-vmstore.html
@@ -0,0 +1,111 @@
+
+
+
+ {{lang_vmLocationConfiguration}}
+
+
+
+
+ + + +
+{{lang_configure}}
+
+ + + + +
+
+
+
+
+
+
+
diff --git a/modules-available/webinterface/config.json b/modules-available/webinterface/config.json
new file mode 100644
index 00000000..6c189b63
--- /dev/null
+++ b/modules-available/webinterface/config.json
@@ -0,0 +1,4 @@
+{
+ "category":"main.content",
+ "enabled":"true"
+}
diff --git a/modules-available/webinterface/lang/de/templates/httpd-restart.json b/modules-available/webinterface/lang/de/templates/httpd-restart.json
new file mode 100644
index 00000000..e995a251
--- /dev/null
+++ b/modules-available/webinterface/lang/de/templates/httpd-restart.json
@@ -0,0 +1,4 @@
+{
+ "lang_applyingSettings": "Anwenden der Einstellungen",
+ "lang_installAndRestart": "Zertifikat installieren und Webserver neustarten"
+}
\ No newline at end of file
diff --git a/modules-available/webinterface/lang/de/templates/https.json b/modules-available/webinterface/lang/de/templates/https.json
new file mode 100644
index 00000000..621343e3
--- /dev/null
+++ b/modules-available/webinterface/lang/de/templates/https.json
@@ -0,0 +1,12 @@
+{
+ "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-available/webinterface/lang/de/templates/passwords.json b/modules-available/webinterface/lang/de/templates/passwords.json
new file mode 100644
index 00000000..17c156c3
--- /dev/null
+++ b/modules-available/webinterface/lang/de/templates/passwords.json
@@ -0,0 +1,7 @@
+{
+ "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-available/webinterface/lang/en/module.json b/modules-available/webinterface/lang/en/module.json
new file mode 100644
index 00000000..dde5ac86
--- /dev/null
+++ b/modules-available/webinterface/lang/en/module.json
@@ -0,0 +1,3 @@
+{
+ "module_name": "Web Interface"
+}
\ No newline at end of file
diff --git a/modules-available/webinterface/lang/en/templates/httpd-restart.json b/modules-available/webinterface/lang/en/templates/httpd-restart.json
new file mode 100644
index 00000000..0a7d4aea
--- /dev/null
+++ b/modules-available/webinterface/lang/en/templates/httpd-restart.json
@@ -0,0 +1,4 @@
+{
+ "lang_applyingSettings": "Applying settings",
+ "lang_installAndRestart": "Installing certificate and restarting web server"
+}
\ No newline at end of file
diff --git a/modules-available/webinterface/lang/en/templates/https.json b/modules-available/webinterface/lang/en/templates/https.json
new file mode 100644
index 00000000..64631a9a
--- /dev/null
+++ b/modules-available/webinterface/lang/en/templates/https.json
@@ -0,0 +1,12 @@
+{
+ "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-available/webinterface/lang/en/templates/passwords.json b/modules-available/webinterface/lang/en/templates/passwords.json
new file mode 100644
index 00000000..2db88ae2
--- /dev/null
+++ b/modules-available/webinterface/lang/en/templates/passwords.json
@@ -0,0 +1,7 @@
+{
+ "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-available/webinterface/page.inc.php b/modules-available/webinterface/page.inc.php
new file mode 100644
index 00000000..c301dec9
--- /dev/null
+++ b/modules-available/webinterface/page.inc.php
@@ -0,0 +1,85 @@
+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-available/webinterface/templates/httpd-restart.html b/modules-available/webinterface/templates/httpd-restart.html
new file mode 100644
index 00000000..cc84aafb
--- /dev/null
+++ b/modules-available/webinterface/templates/httpd-restart.html
@@ -0,0 +1,6 @@
+
+
+
+
+
diff --git a/modules-available/webinterface/templates/https.html b/modules-available/webinterface/templates/https.html
new file mode 100644
index 00000000..c6161cd6
--- /dev/null
+++ b/modules-available/webinterface/templates/https.html
@@ -0,0 +1,60 @@
+
diff --git a/modules-available/webinterface/templates/passwords.html b/modules-available/webinterface/templates/passwords.html
new file mode 100644
index 00000000..f9fda016
--- /dev/null
+++ b/modules-available/webinterface/templates/passwords.html
@@ -0,0 +1,25 @@
+
diff --git a/modules/adduser/config.json b/modules/adduser/config.json
deleted file mode 100644
index 4da67ef8..00000000
--- a/modules/adduser/config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "enabled":"true"
-}
diff --git a/modules/adduser/lang/de/templates/page-adduser.json b/modules/adduser/lang/de/templates/page-adduser.json
deleted file mode 100644
index 0f446025..00000000
--- a/modules/adduser/lang/de/templates/page-adduser.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "lang_confirmation": "Wiederholen",
- "lang_createUser": "Benutzer anlegen",
- "lang_fullName": "Vollst\u00e4ndiger Name",
- "lang_password": "Passwort",
- "lang_telephone": "Telefon",
- "lang_username": "Benutzerkennung"
-}
\ No newline at end of file
diff --git a/modules/adduser/lang/en/module.json b/modules/adduser/lang/en/module.json
deleted file mode 100644
index 170c12f6..00000000
--- a/modules/adduser/lang/en/module.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "lang_confirmation": "Confirm Password",
- "lang_createUser": "Create User",
- "lang_fullName": "Fullname",
- "lang_password": "Password",
- "lang_telephone": "Telephone",
- "lang_username": "Username"
-}
\ No newline at end of file
diff --git a/modules/adduser/lang/en/templates/page-adduser.json b/modules/adduser/lang/en/templates/page-adduser.json
deleted file mode 100644
index 42bae6dc..00000000
--- a/modules/adduser/lang/en/templates/page-adduser.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "lang_confirmation": "Confirm Password",
- "lang_createUser": "Create User",
- "lang_fullName": "Full Name",
- "lang_password": "Password",
- "lang_telephone": "Telephone",
- "lang_username": "Username"
-}
\ No newline at end of file
diff --git a/modules/adduser/lang/pt/module.json b/modules/adduser/lang/pt/module.json
deleted file mode 100644
index 524f3dd5..00000000
--- a/modules/adduser/lang/pt/module.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "lang_confirmation": "Confirmar Senha",
- "lang_createUser": "Criar Usu\u00e1rio",
- "lang_fullName": "Nome Completo",
- "lang_password": "Senha",
- "lang_telephone": "Telefone",
- "lang_username": "Nome de Usu\u00e1rio"
-}
\ No newline at end of file
diff --git a/modules/adduser/page.inc.php b/modules/adduser/page.inc.php
deleted file mode 100644
index c236cb6f..00000000
--- a/modules/adduser/page.inc.php
+++ /dev/null
@@ -1,60 +0,0 @@
- $_POST['user'],
- 'pass' => Crypto::hash6($_POST['pass1']),
- 'fullname' => $_POST['fullname'],
- 'phone' => $_POST['phone'],
- 'email' => $_POST['email'],
- );
- if (Database::exec('INSERT INTO user SET login = :user, passwd = :pass, fullname = :fullname, phone = :phone, email = :email', $data) != 1) {
- Util::traceError('Could not create new user in DB');
- }
- // Make it superadmin if first user. This method sucks as it's a race condition but hey...
- $ret = Database::queryFirst('SELECT Count(*) AS num FROM user');
- if ($ret !== false && $ret['num'] == 1) {
- Database::exec('UPDATE user SET permissions = 1');
- EventLog::clear();
- EventLog::info('Created first user ' . $_POST['user']);
- } else {
- EventLog::info(User::getName() . ' created user ' . $_POST['user']);
- }
- Message::addInfo('adduser-success');
- Util::redirect('?do=Session&action=login');
- }
- }
- }
-
- protected function doRender()
- {
- // No user was added, check if current user is allowed to add a new user
- // Currently you can only add users if there is no user yet. :)
- if (!User::hasPermission('superadmin') && Database::queryFirst('SELECT userid FROM user LIMIT 1') !== false) {
- Message::addError('adduser-disabled');
- } else {
-
- Render::setTitle(Dictionary::translate('lang_createUser'));
- Render::addTemplate('page-adduser', $_POST);
- }
- }
-
-}
diff --git a/modules/adduser/templates/page-adduser.html b/modules/adduser/templates/page-adduser.html
deleted file mode 100644
index 0b097890..00000000
--- a/modules/adduser/templates/page-adduser.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
\ No newline at end of file
diff --git a/modules/backup/config.json b/modules/backup/config.json
deleted file mode 100644
index 6c189b63..00000000
--- a/modules/backup/config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "category":"main.content",
- "enabled":"true"
-}
diff --git a/modules/backup/lang/de/module.json b/modules/backup/lang/de/module.json
deleted file mode 100644
index a0dbdf27..00000000
--- a/modules/backup/lang/de/module.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "module_name": "Sichern/Wiederherstellen",
- "page_title": "Sichern und wiederherstellen"
-}
diff --git a/modules/backup/lang/de/templates/_page.json b/modules/backup/lang/de/templates/_page.json
deleted file mode 100644
index 5e3efea2..00000000
--- a/modules/backup/lang/de/templates/_page.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "lang_backup": "Sichern",
- "lang_backupDescription": "Hier k\u00f6nnen Sie die Konfiguration des Satellitenservers sichern. Dies beinhaltet die Datenbank \u00fcber alle Virtuellen Maschinen, Veranstaltungen, Authentifizerungsmodule, Passw\u00f6rter, Proxies, den konfigurierten VM-Store sowie weitere Konfiguration des MiniLinux.\r\nDie Festplattenabbilder der Virtuellen Maschinen auf dem VM-Store werden hierbei nicht gesichert. Eventuelle Backups des Stores m\u00fcssen separat durchgef\u00fchrt werden.",
- "lang_backupRestore": "Sichern und Wiederherstellen",
- "lang_browseForFile": "Durchsuchen",
- "lang_download": "Herunterladen",
- "lang_dozmodExplanation": "Die Datenbank des Dozentenmoduls wiederherstellen. Dazu geh\u00f6ren die Metadaten der Virtuellen Maschinen, die Veranstaltungen, etc. Bitte beachten Sie, dass hierzu auf dem konfigurierten VM-Store die passenden VM-Abbilder vorliegen m\u00fcssen, da diese extern gespeichert werden. Wenn sich der Servername oder die -adresse ge\u00e4ndert haben stellen Sie bitte sicher, dass die relativen Pfade innerhalb des Netzlaufwerks gleich geblieben sind. Ansonsten werden die wiederhergestellten VMs nicht verwendbar sein.",
- "lang_restore": "Hochladen",
- "lang_restoreDescription": "Hier k\u00f6nnen Sie ein Backup der Konfiguration wieder einspielen. Bitte beachten Sie, dass der Server dabei neu gestartet wird, daher sollten Sie dies m\u00f6glichst durchf\u00fchren, wenn das System nicht genutzt wird, und keine Dozenten Veranstaltungen oder Virtuelle Labore erstellen oder hoch-\/herunterladen. Bitte beachten Sie, dass dabei auch das urspr\u00fcngliche Passwort der Weboberfl\u00e4che wiederhergestellt wird.",
- "lang_restoreDozmodConfig": "Dozentenmodul-Konfiguration wiederherstellen",
- "lang_restoreSystemConfig": "Systemkonfiguration wiederherstellen",
- "lang_selectFile": "Bitte w\u00e4hlen Sie ein Backup-Archiv",
- "lang_systemExplanation": "Die Grundkonfiguration des Satelliten wiederherstellen: Authentifizierungmethode, Passw\u00f6rter, Proxies, VM-Storage, etc.\r\nACHTUNG: Wenn Sie ein Backup von vor WS15\/16 einspielen (Backup-Format vor Version 10), wird die Systemkonfiguration in jedem Fall wiederhergestellt, auch wenn Sie diesen Haken nicht setzen."
-}
\ No newline at end of file
diff --git a/modules/backup/lang/de/templates/restore.json b/modules/backup/lang/de/templates/restore.json
deleted file mode 100644
index 6b3a7cdd..00000000
--- a/modules/backup/lang/de/templates/restore.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "lang_backup": "Sichern...",
- "lang_reboot": "Systemneustart",
- "lang_restoreConfig": "Konfiguration wiederherstellen",
- "lang_restoreFailed": "Wiederherstellung der Konfiguration fehlgeschlagen.",
- "lang_stopping": "Stoppe",
- "lang_waitReboot": "Warte auf Reboot."
-}
\ No newline at end of file
diff --git a/modules/backup/lang/en/module.json b/modules/backup/lang/en/module.json
deleted file mode 100644
index c9379ffd..00000000
--- a/modules/backup/lang/en/module.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "lang_backup": "Backup",
- "lang_backupDescription": "Here you can backup the complete configuration of this satellite server.",
- "lang_backupRestore": "Backup and restore",
- "lang_download": "Download",
- "lang_file": "File",
- "lang_reboot": "System reboot",
- "lang_restore": "Upload",
- "lang_restoreConfig": "Restore config",
- "lang_restoreDescription": "Here you can restore a configuration backup. Please note that this will reboot the server, so it is advised to do this while nobody is using the system. Please note that this will also restore the password for the web interface that was active when the configuration backup was created.",
- "lang_restoreFailed": "Restoring configuration failed.",
- "lang_stopping": "Stopping",
- "module_name": "Backup"
-}
\ No newline at end of file
diff --git a/modules/backup/lang/en/templates/_page.json b/modules/backup/lang/en/templates/_page.json
deleted file mode 100644
index 799c6168..00000000
--- a/modules/backup/lang/en/templates/_page.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "lang_backup": "Backup",
- "lang_backupDescription": "Here you can backup the complete configuration of this satellite server. This includes lecture and virtual machine meta data. The HDD images of the virtual machines on the vm store are not included in this backup, because of their size. If desired, the store needs to be backed up manually.",
- "lang_backupRestore": "Backup and restore",
- "lang_browseForFile": "Browse",
- "lang_download": "Download",
- "lang_dozmodExplanation": "This restores all the virtual machine and lecture meta data created using the \"Dozentenmodul\". Please make sure the VM-storage configured still contains all the VM-Images associated with the virtual machines. If the location of the storage changed, make sure the relative pathes on the share are still the same, otherwise the virtual machines won't be usable.",
- "lang_restore": "Upload",
- "lang_restoreDescription": "Here you can restore a configuration backup. Please note that this will reboot the server, so it is advised to do this while nobody is using the system. Please note that this will also restore the password for the web interface that was active when the configuration backup was created.",
- "lang_restoreDozmodConfig": "Restore Dozentenmodul config",
- "lang_restoreSystemConfig": "Restore system config",
- "lang_selectFile": "Please select a backup archive",
- "lang_systemExplanation": "Restore basic configuration like authentication method, passwords, vm storage location, proxy config, etc. WARNING: If you restore a configuration backup that was made before WS15\/16 (backup format version <10), the system configuration will be restored regardless of this check mark."
-}
\ No newline at end of file
diff --git a/modules/backup/lang/en/templates/restore.json b/modules/backup/lang/en/templates/restore.json
deleted file mode 100644
index 5a5f6f64..00000000
--- a/modules/backup/lang/en/templates/restore.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "lang_backup": "Backup...",
- "lang_reboot": "System reboot",
- "lang_restoreConfig": "Restore config",
- "lang_restoreFailed": "Restoring configuration failed.",
- "lang_stopping": "Stopping",
- "lang_waitReboot": "Waiting for reboot."
-}
\ No newline at end of file
diff --git a/modules/backup/lang/pt/module.json b/modules/backup/lang/pt/module.json
deleted file mode 100644
index 5077cbfa..00000000
--- a/modules/backup/lang/pt/module.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "lang_backup": "Backup",
- "lang_backupDescription": "Aqui voc\u00ea pode fazer um backup completo da configura\u00e7\u00e3o deste server.",
- "lang_backupRestore": "Backup e Recupera\u00e7\u00e3o",
- "lang_download": "Baixar",
- "lang_file": "Arquivo",
- "lang_reboot": "Reinicializar Sistema",
- "lang_restore": "Carregar",
- "lang_restoreConfig": "Recuperar Configura\u00e7\u00e3o",
- "lang_restoreDescription": "Aqui voc\u00ea pode recuperar um backup de configura\u00e7\u00e3o. Por favor note que isso ir\u00e1 reinicializar o servidor, portanto \u00e9 recomendado faz\u00ea-lo quando ningu\u00e9m estiver utilizando o sistema. Por favor note que isso tamb\u00e9m ir\u00e1 recuperar a senha da interface web que estava ativa quando a configura\u00e7\u00e3o de backup foi criada.",
- "lang_restoreFailed": "Recupera\u00e7\u00e3o da configura\u00e7\u00e3o falhou",
- "lang_stopping": "Parando",
- "module_name": "Backup"
-}
\ No newline at end of file
diff --git a/modules/backup/page.inc.php b/modules/backup/page.inc.php
deleted file mode 100644
index 4095f875..00000000
--- a/modules/backup/page.inc.php
+++ /dev/null
@@ -1,164 +0,0 @@
-action = Request::post('action');
- if ($this->action === 'backup') {
- $this->backup();
- } elseif ($this->action === 'restore') {
- $this->restore();
- }
- }
-
- protected function doRender()
- {
- Render::setTitle(Dictionary::translate('lang_titleBackup'));
- if ($this->action === 'restore') {
- Render::addTemplate('restore', $this->templateData);
- } else {
- Render::addScriptBottom('fileselect');
- Render::addTemplate('_page');
- }
- }
-
- private function backup()
- {
- $task = Taskmanager::submit('BackupRestore', array('mode' => 'backup'));
- if (!isset($task['id'])) {
- Message::addError('backup-failed');
- Util::redirect('?do=Backup');
- }
- $task = Taskmanager::waitComplete($task, 30000);
- if (!Taskmanager::isFinished($task) || !isset($task['data']['backupFile'])) {
- Taskmanager::addErrorMessage($task);
- Util::redirect('?do=Backup');
- }
- while ((@ob_get_level()) > 0)
- @ob_end_clean();
- $fh = @fopen($task['data']['backupFile'], 'rb');
- if ($fh === false) {
- Message::addError('error-read', $task['data']['backupFile']);
- Util::redirect('?do=Backup');
- }
- Header('Content-Type: application/octet-stream', true);
- Header('Content-Disposition: attachment; filename=' . 'satellite-backup_v' . Database::getExpectedSchemaVersion() . '_' . date('Y.m.d-H.i.s') . '.tgz');
- Header('Content-Length: ' . @filesize($task['data']['backupFile']));
- while (!feof($fh)) {
- $data = fread($fh, 16000);
- if ($data === false) {
- EventLog::failure('Could not stream system backup to browser - backup corrupted!');
- die("\r\n\nDOWNLOAD INTERRUPTED!\n");
- }
- echo $data;
- @ob_flush();
- @flush();
- }
- @fclose($fh);
- @unlink($task['data']['backupFile']);
- die();
- }
-
- private function restore()
- {
- if (!isset($_FILES['backupfile'])) {
- Message::addError('missing-file');
- Util::redirect('?do=Backup');
- }
- if ($_FILES['backupfile']['error'] != UPLOAD_ERR_OK) {
- Message::addError('upload-failed', Util::uploadErrorString($_FILES['backupfile']['error']));
- Util::redirect('?do=Backup');
- }
- $tempfile = '/tmp/bwlp-' . mt_rand(1, 100000) . '-' . crc32($_SERVER['REMOTE_ADDR']) . '.tgz';
- if (!move_uploaded_file($_FILES['backupfile']['tmp_name'], $tempfile)) {
- Message::addError('error-write', $tempfile);
- Util::redirect('?do=Backup');
- }
- // Got uploaded file, now shut down all the daemons etc.
- $parent = Trigger::stopDaemons(null, $this->templateData);
- // Unmount store
- $task = Taskmanager::submit('MountVmStore', array(
- 'address' => 'null',
- 'type' => 'images',
- 'parentTask' => $parent,
- 'failOnParentFail' => false
- ));
- if (isset($task['id'])) {
- $this->templateData['mountid'] = $task['id'];
- $parent = $task['id'];
- }
- EventLog::info('Creating backup, v' . Database::getExpectedSchemaVersion() . ' on ' . Property::getServerIp());
- // Finally run restore
- $task = Taskmanager::submit('BackupRestore', array(
- 'mode' => 'restore',
- 'backupFile' => $tempfile,
- 'parentTask' => $parent,
- 'failOnParentFail' => false,
- 'restoreOpenslx' => Request::post('restore_openslx', 'off') === 'on',
- 'restoreDozmod' => Request::post('restore_dozmod', 'off') === 'on',
- ));
- if (isset($task['id'])) {
- $this->templateData['restoreid'] = $task['id'];
- $parent = $task['id'];
- TaskmanagerCallback::addCallback($task, 'dbRestored');
- }
- // Wait a bit
- $task = Taskmanager::submit('SleepTask', array(
- 'seconds' => 3,
- 'parentTask' => $parent,
- 'failOnParentFail' => false
- ));
- if (isset($task['id']))
- $parent = $task['id'];
- // Reboot
- $task = Taskmanager::submit('Reboot', array(
- 'parentTask' => $parent,
- 'failOnParentFail' => false
- ));
- // Leave this comment so the i18n scanner finds it:
- // Message::addSuccess('restore-done');
- if (isset($task['id']))
- $this->templateData['rebootid'] = $task['id'];
- }
- private function stopDaemons($parent)
- {
- $task = Taskmanager::submit('SyncdaemonLauncher', array(
- 'operation' => 'stop',
- 'parentTask' => $parent,
- 'failOnParentFail' => false
- ));
- if (isset($task['id'])) {
- $this->templateData['syncid'] = $task['id'];
- $parent = $task['id'];
- }
- $task = Taskmanager::submit('DozmodLauncher', array(
- 'operation' => 'stop',
- 'parentTask' => $parent,
- 'failOnParentFail' => false
- ));
- if (isset($task['id'])) {
- $this->templateData['dmsdid'] = $task['id'];
- $parent = $task['id'];
- }
- $task = Taskmanager::submit('LdadpLauncher', array(
- 'ids' => array(),
- 'parentTask' => $parent,
- 'failOnParentFail' => false
- ));
- if (isset($task['id'])) {
- $this->templateData['ldadpid'] = $task['id'];
- $parent = $task['id'];
- }
- return $parent;
- }
-}
diff --git a/modules/backup/templates/_page.html b/modules/backup/templates/_page.html
deleted file mode 100644
index 47b5a174..00000000
--- a/modules/backup/templates/_page.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{{lang_applyingSettings}}
+
+
+{{lang_installAndRestart}}
+ {{lang_backupRestore}}
- - - - \ No newline at end of file diff --git a/modules/backup/templates/restore.html b/modules/backup/templates/restore.html deleted file mode 100644 index 4494a993..00000000 --- a/modules/backup/templates/restore.html +++ /dev/null @@ -1,62 +0,0 @@ -
-
-
-
diff --git a/modules/baseconfig/config.json b/modules/baseconfig/config.json
deleted file mode 100644
index b72e9c23..00000000
--- a/modules/baseconfig/config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "category": "main.settings",
- "enabled": true
-}
diff --git a/modules/baseconfig/lang/de/cat_setting.json b/modules/baseconfig/lang/de/cat_setting.json
deleted file mode 100644
index b8cb6935..00000000
--- a/modules/baseconfig/lang/de/cat_setting.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "cat_1": "Inaktivit\u00e4t und Abschaltung",
- "cat_2": "Internetzugriff",
- "cat_3": "Zeitsynchronisation",
- "cat_4": "Grundsystem",
- "cat_5": "Gemeinsames Netzlaufwerk",
- "cat_6": "Unkategorisiert",
- "cat_7": "vmchooser"
-}
\ No newline at end of file
diff --git a/modules/baseconfig/lang/de/setting.json b/modules/baseconfig/lang/de/setting.json
deleted file mode 100644
index af1007be..00000000
--- a/modules/baseconfig/lang/de/setting.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "SLX_ADDONS": "Zu ladende Addons. Zur Zeit steht nur *vmware* zur Verf\u00fcgung.",
- "SLX_BENCHMARK_VM": "Tragen Sie hier den exakten Namen einer Veranstaltung, wie sie im *vmchooser* auftaucht ein, um diese VM nach dem Booten automatisch zu starten. Dies ist n\u00fctzlich f\u00fcr Bootzeitmessungen. Feld leer lassen, um Funktion zu deaktivieren.",
- "SLX_BIOS_CLOCK": "Legt fest, ob und wie die interne Uhr des Rechners im Bezug auf die Systemzeit des \/MiniLinux\/ gesetzt werden soll.\r\n*off* = Die interne Uhr des Rechners wird nicht ver\u00e4ndert.\r\n*local* = Die interne Uhr wird auf die Lokalzeit gesetzt. Bevorzugt wenn z.B. noch eine native Windows-Installation auf dem PC vorhanden ist.\r\n*utc* = Die interne Uhr wird auf die \/Koordinierte Weltzeit\/ gesetzt. Dies ist die g\u00e4ngige Einstellung in einem reinen Linux-Umfeld.",
- "SLX_COMMON_SHARE_AUTH": "Authentifizierungsmethode f\u00fcr das gemeinsame Netzlaufwerk. *guest* bedeutet, dass keine Authentifizierung notwendig ist, *user* bedeutet, dass die Credentials des angemeldeten Benutzers verwendet werden.",
- "SLX_COMMON_SHARE_PATH": "Netzwerkpfad des gemeinsamen Netzlaufwerks. Es werden NFS (keine Authentifizierung) und CIFS\/SMB (mit und ohne Authentifizierung) unterst\u00fctzt.",
- "SLX_DEMO_PASS": "Passwort f\u00fcr den eingebauten *demo*-Account. Leer lassen, um das Einloggen zu verbieten.\r\nDas Passwort wird wie das root-Passwort nur gehasht an den Client \u00fcbertragen.",
- "SLX_LOGOUT_TIMEOUT": "Zeit \/in Sekunden\/, die eine Benutzersitzung ohne Aktion sein darf, bevor sie beendet wird.Feld leer lassen, um die Funktion zu deaktivieren.",
- "SLX_NET_DOMAIN": "DNS-Dom\u00e4ne, in die sich die Clients eingliedern, sofern der DHCP Server keine solche vorgibt.",
- "SLX_NTP_SERVER": "Adresse des NTP-Zeitservers. Es k\u00f6nnen mehrere Server mit Leerzeichen getrennt angegeben werden.Die Server werden der Reihe nach angefragt, bis ein antwortender Server gefunden wird.",
- "SLX_PROXY_BLACKLIST": "Adressen bzw. Adressbereiche, f\u00fcr die der Proxyserver nicht verwendet werden soll (z.B. der Adressbereich der Einrichtung). G\u00fcltige Angaben sind einzelne IP-Adressen, sowie IP-Bereiche in CIDR-Notation (z.B. 1.2.0.0\/16). Mehrere Angaben k\u00f6nnen durch Leerzeichen getrennt werden.",
- "SLX_PROXY_IP": "Die Adresse des zu verwendenden Proxy Servers.",
- "SLX_PROXY_MODE": "Legt fest, ob zum Zugriff aufs Internet ein Proxy-Server ben\u00f6tigt wird.\r\n*off* = keinen Proxy benutzen.\r\n*on* = Proxy immer benutzen.\r\n*auto* = Proxy nur benutzen, wenn sich der Client-PC in einem privaten Adressbereich befindet.",
- "SLX_PROXY_PORT": "Der Port des zu verwendenden Proxy Servers.",
- "SLX_PROXY_TYPE": "Art des Proxys: *socks4*, *socks5*, *http-connect* (HTTP Proxy mit Unterst\u00fctzung der CONNECT-Methode), *http-relay* (Klassischer HTTP Proxy)",
- "SLX_REMOTE_LOG_SESSIONS": "Legt fest, ob Logins und Logouts der Benutzer an den Satelliten gemeldet werden sollen.\r\n*yes* = Mit Benutzerkennung loggen\r\n*anonymous* = Anonym loggen\r\n*no* = Nicht loggen",
- "SLX_ROOT_PASS": "Das root-Passwort des Grundsystems. Wird nur f\u00fcr Diagnosezwecke am Client ben\u00f6tigt.\r\nFeld leer lassen, um root-Logins zu verbieten.\r\n\/Hinweis\/: Das Passwort wird im Klartext in der lokalen Datenbank hinterlegt, jedoch immer gehasht an die Clients \u00fcbermittelt (SHA-512 mit Salt). Wenn Sie das Passwort auch im Satelliten nicht im Klartext speichern wollen, k\u00f6nnen Sie hier auch ein vorgehashtes Passwort eintragen (im *$6$....*-Format).",
- "SLX_SHUTDOWN_SCHEDULE": "Feste Uhrzeit, zu der sich die Rechner ausschalten, auch wenn noch ein Benutzer aktiv ist.Mehrere Zeitpunkte k\u00f6nnen durch Leerzeichen getrennt angegeben werden.",
- "SLX_SHUTDOWN_TIMEOUT": "Zeit in Sekunden, nach dem ein Rechner abgeschaltet wird, sofern kein Benutzer angemeldet ist.Feld leer lassen, um die Funktion zu deaktivieren.",
- "SLX_VMCHOOSER_FORLOCATION": "Legt das Verhalten fest, wenn es Veranstaltungen gibt, die an einen bestimmten Ort\/Raum gebunden sind.\r\n*IGNORE*: Mit den restlichen, globalen Veranstaltungen alphabetisch sortiert auflisten.\r\n*BUMP*: Die spezifischen Veranstaltungen oben auflisten, die globalen darunter.\r\n*EXCLUSIVE*: Spezifische Veranstaltungen oben auflisten, globale Veranstaltungen zun\u00e4chst ausblenden. Die globalen Veranstaltungen befinden sich unter einem eingeklappten Listenknoten.",
- "SLX_VMCHOOSER_TAB": "Bestimmt, welcher Karteireiter im vmchooser standardm\u00e4\u00dfig ausgew\u00e4hlt wird.\r\n*0*: Native Linux-Sessions\r\n*1*: Nutzerspezifische Kurse\r\n*2*: Alle Kurse\r\n*AUTO*: Hat der Rechner beschr\u00e4nkte Ressourcen, werden die Linux-Sitzungen angezeigt, sonst alle Kurse\r\n\r\nHat der Benutzer ein persistentes Home-Verzeichnis, wirkt sich diese Einstellung nur beim ersten Anmelden aus. Bei sp\u00e4teren Sitzungen markiert der vmchooser die zuletzt gestartete Sitzung und wechselt zum entsprechenden Karteireiter.",
- "SLX_VMCHOOSER_TEMPLATES": "Legt fest, wie Veranstaltungen in der Sortierung behandelt werden, welche auf eine VM linken, die eine Vorlage ist.\r\n*IGNORE*: Wie regul\u00e4re Veranstaltungen behandeln\r\n*BUMP*: Weiter oben in der Liste einsortieren"
-}
\ No newline at end of file
diff --git a/modules/baseconfig/lang/de/templates/_page.json b/modules/baseconfig/lang/de/templates/_page.json
deleted file mode 100644
index 0f4819b4..00000000
--- a/modules/baseconfig/lang/de/templates/_page.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "lang_basicConfiguration": "Basiskonfiguration",
- "lang_catUser": "Benutzerverwaltung",
- "lang_clientRelatedConfig": "Die Optionen auf dieser Seite beziehen sich auf das Verhalten der bwLehrpool-Clients.",
- "lang_close": "Schlie\u00dfen",
- "lang_create": "Schaffen",
- "lang_delete": "L\u00f6schen",
- "lang_help": "Hilfe",
- "lang_newUser": "Neuer Benutzer",
- "lang_partitionMountPoint": "Mount Point",
- "lang_reset": "Zur\u00fccksetzen",
- "lang_save": "Speichern",
- "lang_userName": "Benutzername",
- "lang_userPasswd": "Passwort"
-}
\ No newline at end of file
diff --git a/modules/baseconfig/lang/en/cat_setting.json b/modules/baseconfig/lang/en/cat_setting.json
deleted file mode 100644
index 7c0ab654..00000000
--- a/modules/baseconfig/lang/en/cat_setting.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "cat_1": "Inactivity and Shutdown",
- "cat_2": "Internet Access",
- "cat_3": "Time Synchronization",
- "cat_4": "Basic System",
- "cat_5": "Common network share",
- "cat_6": "Uncategorized",
- "cat_7": "vmchooser"
-}
\ No newline at end of file
diff --git a/modules/baseconfig/lang/en/module.json b/modules/baseconfig/lang/en/module.json
deleted file mode 100644
index 9345c27c..00000000
--- a/modules/baseconfig/lang/en/module.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "lang_basicConfiguration": "Basic Configuration",
- "lang_catPartition": "Partition Managment",
- "lang_catUser": "User Managment",
- "lang_close": "Close",
- "lang_confirm": "Would you like to save the settings on [ \/srv\/openslx\/www\/boot\/config ] ?",
- "lang_create": "Create",
- "lang_delete": "Delete",
- "lang_help": "Help",
- "lang_helpId": "Partition Id",
- "lang_helpMountPoint": "Must be a directory: \/example\/directory\/",
- "lang_helpOptions": "Currently, only option 'bootable' is available",
- "lang_helpSize": "Must be in Gigabytes e.g. 15G",
- "lang_newPartition": "New Partition",
- "lang_newUser": "New User",
- "lang_partitionId": "Id",
- "lang_partitionMountPoint": "Mount Point",
- "lang_partitionOptions": "Options",
- "lang_partitionSize": "Size",
- "lang_reset": "Reset",
- "lang_resetConfirm": "Do you really wish to reset the variable to their default values?",
- "lang_resetDefault": "Reset Default",
- "lang_save": "Save",
- "lang_userName": "Username",
- "lang_userPasswd": "Password",
- "module_name": "Variables"
-}
\ No newline at end of file
diff --git a/modules/baseconfig/lang/en/setting.json b/modules/baseconfig/lang/en/setting.json
deleted file mode 100644
index 36ac6e8c..00000000
--- a/modules/baseconfig/lang/en/setting.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "SLX_ADDONS": "Addons to load. Currently, only *vmware* is available.",
- "SLX_BENCHMARK_VM": "If non-empty, this should be the exact display name of an entry in *vmchooser*, so it will be automatically started after bootup. Useful for benchmarking.",
- "SLX_BIOS_CLOCK": "Specifies whether and how the internal clock of the computer should be set in relation to the system time of the \/MiniLinux\/.\r\n*off* = The internal clock of the computer is not changed.\r\n*local* = The internal clock is set to local time. Preferably if, for example, there is still a native Windows installation available on the PC.\r\n*utc* = The internal clock is set to the \/Coordinated Universal Time\/. This is the most common setup in a pure Linux environment.",
- "SLX_COMMON_SHARE_AUTH": "Athentication method for the common network share. *guest* means no authentication (public share), *user* means the user's credentials will be used.",
- "SLX_COMMON_SHARE_PATH": "Path of network share. Supported are NFS (no authentication only) and CIFS\/SMB (with and without authentication).",
- "SLX_DEMO_PASS": "Password for the *demo* account. Leave empty to disallow logging in as the demo user.\r\nLike the root password, the demo user's password will be sent to the client in its hashed form.",
- "SLX_LOGOUT_TIMEOUT": "Time \/in seconds\/, in which a user session may remain without action before it is terminated.Leave field blank to disable the function.",
- "SLX_NET_DOMAIN": "DNS domain in which the client integrate, provided the DHCP server does not specifies such.",
- "SLX_NTP_SERVER": "Address of the NTP time server. Multiple servers can be specified separated by spaces.The servers are queried in sequence until a responding server is found.",
- "SLX_PROXY_BLACKLIST": "Address or addresses ranges in which the proxy server is not used (for example the address range of the device). Valid entries are individual IP addresses and IP ranges in CIDR notation (for example 1.2.0.0\/16). Multiple selections can be separated by spaces.",
- "SLX_PROXY_IP": "The address to use for the proxy server.",
- "SLX_PROXY_MODE": "Determines whether a proxy server is required to access the Internet.\r\n*off* = do not use a Proxy.\r\n*on* = Always use proxy.\r\n*auto* = Only use proxy when the client PC is in a private address space.",
- "SLX_PROXY_PORT": "The port to use for the proxy server.",
- "SLX_PROXY_TYPE": "Type of the proxy.*socks4*, *socks5*, *http-connect* (HTTP proxy with support from the CONNECT method), *http-relay* (Classic HTTP proxy)",
- "SLX_REMOTE_LOG_SESSIONS": "Determines whether logins and logouts of the users should be reported to the satellite.\r\n*yes* = log with user ID\r\n*anonymous* = anonymous logging\r\n*no* = no logging",
- "SLX_ROOT_PASS": "The root password of the client system. Only required for diagnostic purposes on the client.Leave field blank to disallow root logins.\r\n\/Hint\/: The password SHA-512-with-salt hashed before it's being sent to the client. It's only stored in clear text on the Satellite Server. If you want to have it hashed on the server too, you can supply a pre-hashed passoword in \/$6$...$...\/-format.",
- "SLX_SHUTDOWN_SCHEDULE": "Fixed time to turn off the computer, even if there is a user active.Several times can be specified, separated by spaces.",
- "SLX_SHUTDOWN_TIMEOUT": "Time in seconds after which a computer is switched off, if no user is logged on.Leave blank to disable the function.",
- "SLX_VMCHOOSER_FORLOCATION": "Defines how lectures special to the user's location are handled in the vmchooser.\r\n*IGNORE*: Sort them alphabetically among the global lectures.\r\n*BUMP*: Put them atop the global lectures.\r\n*EXCLUSIVE*: Put them atop the global lectures and aditionally collapse the node which contains the global lectures.",
- "SLX_VMCHOOSER_TAB": "Defines which tab is show by default, if the user doesn't have stored a last used session on his persistent home directory.\r\n*0*: Native Linux sessions\r\n*1*: User specific lectures\r\n*2*: All lectures\r\n*AUTO*: If the computer has low system specs, show the Linux sessions, otherwise, show all lectures",
- "SLX_VMCHOOSER_TEMPLATES": "Defines how lectures that link to template VMs are treated wrt sorting.\r\n*IGNORE*: Sort among regular lectures\r\n*BUMP*: Move to top of list"
-}
\ No newline at end of file
diff --git a/modules/baseconfig/lang/en/templates/_page.json b/modules/baseconfig/lang/en/templates/_page.json
deleted file mode 100644
index 6429a835..00000000
--- a/modules/baseconfig/lang/en/templates/_page.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "lang_basicConfiguration": "Basic Configuration",
- "lang_clientRelatedConfig": "The options on this page are related to the bwLehrpool client machines.",
- "lang_close": "Close",
- "lang_reset": "Reset",
- "lang_save": "Save"
-}
\ No newline at end of file
diff --git a/modules/baseconfig/lang/pt/module.json b/modules/baseconfig/lang/pt/module.json
deleted file mode 100644
index 0ac0a075..00000000
--- a/modules/baseconfig/lang/pt/module.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "lang_basicConfiguration": "Configura\u00e7\u00e3o B\u00e1sica",
- "lang_catPartition": "Gerenciamento de Parti\u00e7\u00f5es",
- "lang_catUser": "Gerenciamente de Usu\u00e1rios",
- "lang_close": "Fechar",
- "lang_confirm": "Voc\u00ea deseja salvar configura\u00e7\u00f5es em [ \/srv\/openslx\/www\/boot\/default\/config ] ?",
- "lang_create": "Criar",
- "lang_delete": "Deletar",
- "lang_help": "Ajuda",
- "lang_helpId": "Id da parti\u00e7\u00e3o",
- "lang_helpMountPoint": "Precisa ser um diret\u00f3rio: \/exemplo\/diret\u00f3rio\/",
- "lang_helpOptions": "Atualmente, apenas a op\u00e7\u00e3o 'bootable' est\u00e1 dispon\u00edvel",
- "lang_helpSize": "Precisa estar em Gigabytes, por exemplo 15G",
- "lang_newPartition": "Nova Parti\u00e7\u00e3o",
- "lang_newUser": "Novo Usu\u00e1rio",
- "lang_partitionId": "Id",
- "lang_partitionMountPoint": "Mount Point",
- "lang_partitionOptions": "Op\u00e7\u00f5es",
- "lang_partitionSize": "Tamanho",
- "lang_reset": "Limpar",
- "lang_resetConfirm": "Voc\u00ea realmente deseja restaurar as vari\u00e1veis para seus valores padr\u00f5es?",
- "lang_resetDefault": "Restaurar Padr\u00e3o",
- "lang_save": "Salvar",
- "lang_userName": "Nome",
- "lang_userPasswd": "Senha",
- "module_name": "Vari\u00e1veis"
-}
\ No newline at end of file
diff --git a/modules/baseconfig/page.inc.php b/modules/baseconfig/page.inc.php
deleted file mode 100644
index 8f914376..00000000
--- a/modules/baseconfig/page.inc.php
+++ /dev/null
@@ -1,129 +0,0 @@
-qry_extra[] = array(
- 'name' => 'distroid',
- 'value' => (int)$_REQUEST['distroid'],
- 'table' => 'setting_distro',
- );
- if (isset($_REQUEST['locationid'])) {
- $this->qry_extra[] = array(
- 'name' => 'locationid',
- 'value' => (int)$_REQUEST['locationid'],
- 'table' => 'setting_location',
- );
- }
- }
-
- if (isset($_POST['setting']) && is_array($_POST['setting'])) {
- if (User::hasPermission('superadmin')) {
- // Build variables for specific sub-settings
- $qry_insert = '';
- $qry_values = '';
- foreach ($this->qry_extra as $item) {
- $qry_insert = ', ' . $item['name'];
- $qry_values = ', :' . $item['name'];
- }
- // Load all existing config options to validate input
- $res = Database::simpleQuery('SELECT setting, validator FROM setting');
- while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
- $key = $row['setting'];
- $validator = $row['validator'];
- $displayValue = (isset($_POST['setting'][$key]) ? $_POST['setting'][$key] : '');
- // Validate data first!
- $mangledValue = Validator::validate($validator, $displayValue);
- if ($mangledValue === false) {
- Message::addWarning('value-invalid', $key, $displayValue);
- continue;
- }
- // Now put into DB
- Database::exec("INSERT INTO setting_global (setting, value, displayvalue $qry_insert)
- VALUES (:key, :value, :displayvalue $qry_values)
- ON DUPLICATE KEY UPDATE value = :value, displayvalue = :displayvalue",
- $this->qry_extra + array(
- 'key' => $key,
- 'value' => $mangledValue,
- 'displayvalue' => $displayValue
- )
- );
- }
- Message::addSuccess('settings-updated');
- Util::redirect('?do=BaseConfig');
- }
- }
- }
-
- protected function doRender()
- {
- if (!User::hasPermission('superadmin')) {
- Message::addError('no-permission');
- Util::redirect('?do=Main');
- }
- // Build left joins for specific settings
- $joins = '';
- foreach ($this->qry_extra as $item) {
- $joins .= " LEFT JOIN {$item['table']} ";
- }
- // List global config option
- $settings = array();
- $res = Database::simpleQuery('SELECT cat_setting.catid, setting.setting, setting.defaultvalue, setting.permissions, setting.validator, tbl.displayvalue
- FROM setting
- INNER JOIN cat_setting USING (catid)
- LEFT JOIN setting_global AS tbl USING (setting)
- ORDER BY cat_setting.sortval ASC, setting.setting ASC');
- while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
- $row['description'] = Util::markup(Page::translate($row['setting'], 'setting'));
- if (is_null($row['displayvalue'])) $row['displayvalue'] = $row['defaultvalue'];
- $row['item'] = $this->makeInput($row['validator'], $row['setting'], $row['displayvalue']);
- $settings[$row['catid']]['settings'][] = $row;
- if (!isset($settings[$row['catid']]['category_id'])) {
- $settings[$row['catid']]['category_name'] = Page::translate('cat_' . $row['catid'], 'cat_setting');
- $settings[$row['catid']]['category_id'] = $row['catid'];
- }
- }
- Render::addTemplate('_page', array(
- 'categories' => array_values($settings)
- ));
- }
-
- /**
- * Create html snippet for setting, based on given validator
- * @param type $validator
- * @return boolean
- */
- private function makeInput($validator, $setting, $current)
- {
- $parts = explode(':', $validator, 2);
- if ($parts[0] === 'list') {
- $items = explode('|', $parts[1]);
- $ret = '';
- }
- // Password field guessing
- if (stripos($validator, 'password') !== false) {
- $type = Property::getPasswordFieldType();
- } else {
- $type = 'text';
- }
- // Fallback: single line input
- return '';
- }
-
-}
diff --git a/modules/baseconfig/templates/_page.html b/modules/baseconfig/templates/_page.html
deleted file mode 100644
index 273ee50c..00000000
--- a/modules/baseconfig/templates/_page.html
+++ /dev/null
@@ -1,188 +0,0 @@
-{{lang_backup}}
-
-
-
-
-
-
- {{lang_stopping}} syncdaemon
- {{lang_stopping}} dmsd
- {{lang_stopping}} ldadp
- {{lang_stopping}} vmstore
- {{lang_restoreConfig}}
- {{lang_reboot}}
- {{lang_basicConfiguration}}
-{{lang_clientRelatedConfig}}
- --
- - - - - - diff --git a/modules/citymanagement/config.json b/modules/citymanagement/config.json deleted file mode 100644 index aff54b3a..00000000 --- a/modules/citymanagement/config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "enabled":"false", - "permission":"0" -} diff --git a/modules/citymanagement/lang/en/module.json b/modules/citymanagement/lang/en/module.json deleted file mode 100644 index ba6c5c44..00000000 --- a/modules/citymanagement/lang/en/module.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "lang_cancelConfirm": "Do you really want to remove this city?", - "lang_cityInfo": "Here you can create new cities for the website, besides editing or removing the existing ones", - "lang_cityPage": "Manage cities", - "lang_cityname": "City name", - "lang_close": "Close", - "lang_create": "Create", - "lang_edit": "Edit", - "lang_editcity": "Edit City", - "lang_operations": "Operations", - "lang_remove": "Remove", - "lang_save": "Save", - "module_name": "Management" -} \ No newline at end of file diff --git a/modules/citymanagement/lang/en/templates/citymanagement.json b/modules/citymanagement/lang/en/templates/citymanagement.json deleted file mode 100644 index 27bb60c0..00000000 --- a/modules/citymanagement/lang/en/templates/citymanagement.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "lang_cancelConfirm": "Do you really want to remove this city?", - "lang_cityInfo":"Here you can create new cities for the website, besides editing or removing the existing ones", - "lang_cityPage":"Manage cities", - "lang_cityname":"City name", - "lang_close": "Close", - "lang_create": "Create", - "lang_edit":"Edit", - "lang_editcity":"Edit City", - "lang_operations": "Operations", - "lang_remove": "Remove", - "lang_save": "Save" -} diff --git a/modules/citymanagement/lang/pt/module.json b/modules/citymanagement/lang/pt/module.json deleted file mode 100644 index c514f437..00000000 --- a/modules/citymanagement/lang/pt/module.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "lang_cancelConfirm": "Deseja realmente remover a cidade?", - "lang_cityInfo": "Nesta se\u00e7\u00e3o voc\u00ea poder\u00e1 criar cidades para o site, al\u00e9m de editar ou remover cidades existentes", - "lang_cityPage": "Gerenciar cidades", - "lang_cityname": "Nome da cidade", - "lang_close": "Fechar", - "lang_create": "Criar", - "lang_edit": "Editar", - "lang_editcity": "Editar Cidade", - "lang_operations": "Opera\u00e7\u00f5es", - "lang_remove": "Remover", - "lang_save": "Salvar", - "module_name": "Gerenciamento" -} \ No newline at end of file diff --git a/modules/citymanagement/page.inc.php b/modules/citymanagement/page.inc.php deleted file mode 100644 index acc30bf9..00000000 --- a/modules/citymanagement/page.inc.php +++ /dev/null @@ -1,81 +0,0 @@ -page = $p; - else - $this->page = 1; - switch(Request::post('action')){ - case "edit": - $this->edit(Request::post('cityid'),Request::post('name')); - break; - case "create": - $this->create(Request::post('name')); - break; - case "delete": - $this->delete(Request::post('cityid')); - break; - } - - - if (!User::hasPermission('superadmin')) { - Message::addError('no-permission'); - Util::redirect('?do=Main'); - } - - } - - protected function doRender() - { - // load every city - $cities = array(); - $res = Database::simpleQuery("SELECT cityid, name FROM cities ORDER BY cityid DESC"); - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { - $cities[] = array( - 'id' => $row['cityid'], - 'name' => $row['name'], - ); - } - - $pag = new Pagination($cities,$this->page); - - Render::addTemplate('page-citymanagement', array( - 'cities' => $pag->getItems(), - 'pages' => $pag->getPagination() - )); - } - - private function edit($cityid, $newname){ - $data = array ( - 'cityid' => $cityid, - 'name' => $newname, - ); - Database::exec ( 'UPDATE cities SET name = :name WHERE cityid = :cityid', $data ); - Message::addSuccess('update-city'); - } - - private function create($name){ - $data = array ( - 'name' => $name, - ); - Database::exec('INSERT INTO cities(name) VALUES( :name )',$data); - Message::addSuccess('add-city'); - } - - private function delete($cityid){ - $data = array ( - 'cityid' => $cityid - ); - Database::exec ( 'DELETE FROM cities WHERE cityid = :cityid', $data ); - Message::addSuccess('delete-city'); - } -} diff --git a/modules/citymanagement/templates/page-citymanagement.html b/modules/citymanagement/templates/page-citymanagement.html deleted file mode 100644 index 6d7750cf..00000000 --- a/modules/citymanagement/templates/page-citymanagement.html +++ /dev/null @@ -1,77 +0,0 @@ -
-
-
-
-{{#cities}}
-
-
- {{lang_cityPage}}
-
-
- - {{lang_cityInfo}} -
- -| ID | -{{lang_cityname}} | -{{lang_operations}} | -|||
|---|---|---|---|---|---|
| - | - | - - - | -|||
-
|
- |||||
-
-{{/cities}}
diff --git a/modules/dozmod/config.json b/modules/dozmod/config.json
deleted file mode 100644
index 6c189b63..00000000
--- a/modules/dozmod/config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "category":"main.content",
- "enabled":"true"
-}
diff --git a/modules/dozmod/lang/de/templates/images-delete.json b/modules/dozmod/lang/de/templates/images-delete.json
deleted file mode 100644
index 8c54e4d1..00000000
--- a/modules/dozmod/lang/de/templates/images-delete.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "lang_delButton": "Gew\u00e4hlte Images endg\u00fcltig l\u00f6schen",
- "lang_delete": "L\u00f6schen",
- "lang_description": "Diese Liste zeigt Images, die entweder abgelaufen sind, oder deren Datei besch\u00e4digt, verschoben oder gel\u00f6scht wurde. Diese Images sind zur Zeit im Lehrpool nicht verf\u00fcgbar, ihre endg\u00fcltige L\u00f6schung muss aber manuell best\u00e4tigt werden, um gr\u00f6\u00dfere Katastrophen durch Softwarefehler, verstellte Systemuhren etc. zu vermeiden.",
- "lang_hasNewer": "Neuere Version existiert",
- "lang_heading": "Zu l\u00f6schende Image-Versionen",
- "lang_image": "VM",
- "lang_owner": "Besitzer",
- "lang_size": "Gr\u00f6\u00dfe",
- "lang_subHeading": "Images, die abgelaufen oder besch\u00e4digt sind",
- "lang_version": "Version vom"
-}
\ No newline at end of file
diff --git a/modules/dozmod/lang/de/templates/mailconfig.json b/modules/dozmod/lang/de/templates/mailconfig.json
deleted file mode 100644
index 4509c3c7..00000000
--- a/modules/dozmod/lang/de/templates/mailconfig.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "lang_asteriskRequired": "Felder mit (*) sind erforderlich",
- "lang_host": "Host",
- "lang_mailConfig": "SMTP-Konfiguration zum Versenden von Mails",
- "lang_mailConfigHeadline": "EMail-Konfiguration",
- "lang_mailDescription": "F\u00fcllen Sie die folgenden Felder aus, wenn sie m\u00f6chten, dass Dozenten Benachrichtigungen per Mail bekommen, falls eine von ihnen genutzte oder erstellte VM oder Veranstaltung abl\u00e4uft. Um diese Funktion zu deaktivieren, lassen Sie eines der mit (*) gekennzeichneten Felder leer. Wenn das hier angegebene E-Mail-Konto nur zum Versenden von Mails genutzt wird, sollten Sie einen Auto-Responder einrichten f\u00fcr den Fall, dass ein Dozent auf eine der automatisch generierten Mails antwortet (bzw. eine explizit angegebene Reply-To Adresse ignoriert).",
- "lang_password": "Passwort",
- "lang_port": "Port",
- "lang_replyTo": "Reply-To Adresse (z.B. Helpdesk)",
- "lang_save": "Konfiguration speichern",
- "lang_senderAddress": "Absenderadresse",
- "lang_senderName": "Absender Anzeigename",
- "lang_ssl": "SSL-Modus",
- "lang_sslExplicit": "Explizites SSL (\"STARTTLS\")",
- "lang_sslImplicit": "Implizites SSL",
- "lang_sslNone": "Kein SSL",
- "lang_test": "Test-Mail senden",
- "lang_testConfiguration": "Um die Konfiguration zu testen, geben Sie hier eine Empf\u00e4ngeradresse ein",
- "lang_testRecipient": "Empf\u00e4nger",
- "lang_username": "Benutzername (SMTP-Auth)"
-}
\ No newline at end of file
diff --git a/modules/dozmod/lang/de/templates/orglist.json b/modules/dozmod/lang/de/templates/orglist.json
deleted file mode 100644
index 938429f0..00000000
--- a/modules/dozmod/lang/de/templates/orglist.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "lang_canLogin": "Nutzer dieser Einrichtung k\u00f6nnen sich am Satelliten anmelden",
- "lang_organization": "Einrichtung",
- "lang_organizationList": "Liste der Einrichtungen",
- "lang_organizationListHeader": "Nutzungsrechte f\u00fcr den Satelliten festlegen"
-}
\ No newline at end of file
diff --git a/modules/dozmod/lang/de/templates/userlist.json b/modules/dozmod/lang/de/templates/userlist.json
deleted file mode 100644
index e9e33cc2..00000000
--- a/modules/dozmod/lang/de/templates/userlist.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "lang_canLogin": "Dieser Benutzer kann sich am Satelilten anmelden",
- "lang_email": "EMail",
- "lang_emailNotifications": "EMail-Benachrichtigungen aktiviert",
- "lang_lastLogin": "Letzte Anmeldung",
- "lang_organization": "Organisation",
- "lang_superUser": "Ist SuperUser (darf alle Veranstaltungen und VMs bearbeiten\/l\u00f6schen)",
- "lang_user": "Benutzername",
- "lang_userList": "Benutzerliste",
- "lang_userListDescription": "Hier k\u00f6nnen Sie individuelle Nutzer zu \"Super-Usern\" machen. Diese haben im Dozentenmodul auf alle Veranstaltungen und VMs Vollzugriff, unabh\u00e4ngig von den gesetzten Berechtigungen. Au\u00dferdem k\u00f6nnen Sie hier Benutzer vom Zugriff mittels des Dozentenmoduls ausschlie\u00dfen.",
- "lang_userListHeader": "Dem Satelliten bekannte Benutzer"
-}
\ No newline at end of file
diff --git a/modules/dozmod/lang/en/module.json b/modules/dozmod/lang/en/module.json
deleted file mode 100644
index e42d21ea..00000000
--- a/modules/dozmod/lang/en/module.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "module_name": "Tutor Module"
-}
\ No newline at end of file
diff --git a/modules/dozmod/lang/en/templates/images-delete.json b/modules/dozmod/lang/en/templates/images-delete.json
deleted file mode 100644
index fcc8c7e7..00000000
--- a/modules/dozmod/lang/en/templates/images-delete.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "lang_delButton": "Permanently delete selected images",
- "lang_delete": "Delete",
- "lang_description": "This list shows images that reached their expire date, or where the image file in the file system is damaged or missing. You need to manually confirm the deletion of these files for safety reasons (software bugs, wrong system time, etc.).",
- "lang_hasNewer": "Newer version exists",
- "lang_heading": "Images marked for deletion",
- "lang_image": "VM",
- "lang_owner": "Owner",
- "lang_size": "Size",
- "lang_subHeading": "Expired or damaged images",
- "lang_version": "Version timestamp"
-}
\ No newline at end of file
diff --git a/modules/dozmod/lang/en/templates/mailconfig.json b/modules/dozmod/lang/en/templates/mailconfig.json
deleted file mode 100644
index 0c0dcd7f..00000000
--- a/modules/dozmod/lang/en/templates/mailconfig.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "lang_asteriskRequired": "Fields marked with (*) are required",
- "lang_host": "Host",
- "lang_mailConfig": "SMTP configuration for sending mails",
- "lang_mailConfigHeadline": "email configuration",
- "lang_mailDescription": "Fill in the following fields if you want to notify tutors\/professors\/lecturers about expiring VMs and lectures. If you leave one of the required fields blank, the feature will be disabled.",
- "lang_password": "Password",
- "lang_port": "Port",
- "lang_replyTo": "Reply-To address",
- "lang_save": "Save configuration",
- "lang_senderAddress": "Sender address",
- "lang_senderName": "Sender's display name",
- "lang_ssl": "SSL mode",
- "lang_sslExplicit": "Explicit SSL (\"STARTTLS\")",
- "lang_sslImplicit": "Implicit SSL",
- "lang_sslNone": "No SSL",
- "lang_test": "Send test mail",
- "lang_testConfiguration": "To test the configuration, enter a recipient address here",
- "lang_testRecipient": "Recipient",
- "lang_username": "User name (SMTP auth)"
-}
\ No newline at end of file
diff --git a/modules/dozmod/lang/en/templates/orglist.json b/modules/dozmod/lang/en/templates/orglist.json
deleted file mode 100644
index 37b89e02..00000000
--- a/modules/dozmod/lang/en/templates/orglist.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "lang_canLogin": "Members of this organization can login",
- "lang_organization": "Organization",
- "lang_organizationList": "List of organizations",
- "lang_organizationListHeader": "Set access permissions for organizations"
-}
\ No newline at end of file
diff --git a/modules/dozmod/lang/en/templates/userlist.json b/modules/dozmod/lang/en/templates/userlist.json
deleted file mode 100644
index 615f1b14..00000000
--- a/modules/dozmod/lang/en/templates/userlist.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "lang_canLogin": "This user can login to this satellite",
- "lang_email": "E-Mail",
- "lang_emailNotifications": "E-Mail notifications enabled",
- "lang_lastLogin": "Last login",
- "lang_organization": "Organization",
- "lang_superUser": "Is super user (can edit\/delete all lectures and VMs)",
- "lang_user": "User name",
- "lang_userList": "User list",
- "lang_userListDescription": "Here you can promote \"super users\", which will have all permissions in the \"Dozenzenmodul\". You can also ban users from accessing this server via the \"Dozentenmodul\".",
- "lang_userListHeader": "Users known to this satellite"
-}
\ No newline at end of file
diff --git a/modules/dozmod/page.inc.php b/modules/dozmod/page.inc.php
deleted file mode 100644
index f98d8952..00000000
--- a/modules/dozmod/page.inc.php
+++ /dev/null
@@ -1,252 +0,0 @@
-mailHandler();
- }
- if ($action === 'delimages') {
- $result = $this->handleDeleteImages();
- if (!empty($result)) {
- Message::addInfo('delete-images', $result);
- }
- Util::redirect('?do=DozMod');
- }
- }
-
- protected function doRender()
- {
- $this->listDeletePendingImages();
- // Mail config
- $conf = Database::queryFirst('SELECT value FROM sat.configuration WHERE parameter = :param', array('param' => 'mailconfig'));
- if ($conf != null) {
- $conf = @json_decode($conf['value'], true);
- if (is_array($conf)) {
- $conf['set_' . $conf['ssl']] = 'selected="selected"';
- }
- }
- Render::addTemplate('mailconfig', $conf);
- // User list for making people admin
- $this->listUsers();
- $this->listOrganizations();
- }
-
- private function listDeletePendingImages()
- {
- $res = Database::simpleQuery("SELECT b.displayname,"
- . " own.firstname, own.lastname, own.email,"
- . " v.imageversionid, v.createtime, v.filesize, v.deletestate,"
- . " lat.expiretime AS latexptime, lat.deletestate AS latdelstate"
- . " FROM sat.imageversion v"
- . " INNER JOIN sat.imagebase b ON (b.imagebaseid = v.imagebaseid)"
- . " INNER JOIN sat.user own ON (b.ownerid = own.userid)"
- . " LEFT JOIN sat.imageversion lat ON (b.latestversionid = lat.imageversionid)"
- . " WHERE v.deletestate <> 'KEEP'"
- . " ORDER BY b.displayname ASC, v.createtime ASC");
- $NOW = time();
- $rows = array();
- while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
- if ($row['latexptime'] > $NOW && $row['latdelstate'] === 'KEEP') {
- $row['hasNewerClass'] = 'glyphicon-ok green';
- } else {
- $row['hasNewerClass'] = 'glyphicon-remove red';
- }
- if ($row['deletestate'] === 'WANT_DELETE') {
- $row['name_extra_class'] = 'slx-strike';
- }
- $row['version'] = date('d.m.Y H:i:s', $row['createtime']);
- $row['filesize'] = Util::readableFileSize($row['filesize']);
- $rows[] = $row;
- }
- if (empty($rows))
- return;
- Render::addTemplate('images-delete', array('images' => $rows));
- }
-
- private function cleanMailArray()
- {
- $keys = array('host', 'port', 'ssl', 'senderAddress', 'replyTo', 'username', 'password', 'serverName');
- $data = array();
- foreach ($keys as $key) {
- $data[$key] = Request::post($key, '');
- settype($data[$key], 'string');
- if (is_numeric($data[$key])) {
- settype($data[$key], 'int');
- }
- }
- return $data;
- }
-
- protected function doAjax()
- {
- if (!User::hasPermission('superadmin'))
- return;
-
- $action = Request::post('action');
- if ($action === 'mail') {
- $this->handleTestMail();
- } elseif ($action === 'setmail' || $action === 'setsu' || $action == 'setlogin') {
- $this->setUserOption($action);
- } elseif ($action === 'setorglogin') {
- $this->setOrgOption($action);
- } elseif ($action === 'delimages') {
- die($this->handleDeleteImages());
- }
- }
-
- private function handleDeleteImages()
- {
- $images = Request::post('images', false);
- if (is_array($images)) {
- foreach ($images as $image => $val) {
- if (strtolower($val) !== 'on')
- continue;
- Database::exec("UPDATE sat.imageversion SET deletestate = 'WANT_DELETE'"
- . " WHERE deletestate = 'SHOULD_DELETE' AND imageversionid = :imageversionid", array(
- 'imageversionid' => $image
- ));
- }
- if (!empty($images)) {
- $ret = Download::asStringPost('http://127.0.0.1:9080/do/delete-images', false, 2, $code);
- if ($code == 999) {
- $ret .= "\nConnection to DMSD failed.";
- }
- return $ret;
- }
- }
- return false;
- }
-
- private function handleTestMail()
- {
- $do = Request::post('button');
- if ($do === 'test') {
- // Prepare array
- $data = $this->cleanMailArray();
- Header('Content-Type: text/plain; charset=utf-8');
- $data['recipient'] = Request::post('recipient', '');
- if (!preg_match('/.+@.+\..+/', $data['recipient'])) {
- $result = 'No recipient given!';
- } else {
- $result = Download::asStringPost('http://127.0.0.1:9080/do/mailtest', $data, 2, $code);
- }
- die($result);
- }
- }
-
- private function mailHandler()
- {
- // Check action
- $do = Request::post('button');
- if ($do === 'save') {
- // Prepare array
- $data = $this->cleanMailArray();
- $data = json_encode($data);
- Database::exec('INSERT INTO sat.configuration (parameter, value)'
- . ' VALUES (:param, :value)'
- . ' ON DUPLICATE KEY UPDATE value = VALUES(value)', array(
- 'param' => 'mailconfig',
- 'value' => $data
- ));
- Message::addSuccess('mail-config-saved');
- }
- Util::redirect('?do=DozMod');
- }
-
- private function listUsers()
- {
- $res = Database::simpleQuery('SELECT userid, firstname, lastname, email, lastlogin, user.canlogin, issuperuser, emailnotifications,'
- . ' organization.displayname AS orgname FROM sat.user'
- . ' LEFT JOIN sat.organization USING (organizationid)'
- . ' ORDER BY lastname ASC, firstname ASC');
- $rows = array();
- while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
- $row['canlogin'] = $this->checked($row['canlogin']);
- $row['issuperuser'] = $this->checked($row['issuperuser']);
- $row['emailnotifications'] = $this->checked($row['emailnotifications']);
- $row['lastlogin'] = date('d.m.Y', $row['lastlogin']);
- $rows[] = $row;
- }
- Render::addTemplate('userlist', array('users' => $rows));
- }
-
- private function listOrganizations()
- {
- $res = Database::simpleQuery('SELECT organizationid, displayname, canlogin FROM sat.organization'
- . ' ORDER BY displayname ASC');
- $rows = array();
- while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
- $row['canlogin'] = $this->checked($row['canlogin']);
- $rows[] = $row;
- }
- Render::addTemplate('orglist', array('organizations' => $rows));
- }
-
- private function checked($val)
- {
- if ($val)
- return 'checked="checked"';
- return '';
- }
-
- private function setUserOption($option)
- {
- $val = (string) Request::post('value', '-');
- if ($val !== '1' && $val !== '0')
- die('Nein');
- if ($option === 'setmail') {
- $field = 'emailnotifications';
- } elseif ($option === 'setsu') {
- $field = 'issuperuser';
- } elseif ($option === 'setlogin') {
- $field = 'canlogin';
- } else {
- die('Unknown');
- }
- $user = (string) Request::post('userid', '?');
- $ret = Database::exec("UPDATE sat.user SET $field = :onoff WHERE userid = :userid", array(
- 'userid' => $user,
- 'onoff' => $val
- ));
- error_log("Setting $field to $val for $user - affected: $ret");
- if ($ret === false)
- die('Error');
- if ($ret == 0)
- die(1 - $val);
- die($val);
- }
-
- private function setOrgOption($option)
- {
- $val = (string) Request::post('value', '-');
- if ($val !== '1' && $val !== '0')
- die('Nein');
- if ($option === 'setorglogin') {
- $field = 'canlogin';
- } else {
- die('Unknown');
- }
- $ret = Database::exec("UPDATE sat.organization SET $field = :onoff WHERE organizationid = :organizationid", array(
- 'organizationid' => (string) Request::post('organizationid', ''),
- 'onoff' => $val
- ));
- if ($ret === false)
- die('Error');
- if ($ret === 0)
- die(1 - $val);
- die($val);
- }
-
-}
diff --git a/modules/dozmod/templates/images-delete.html b/modules/dozmod/templates/images-delete.html
deleted file mode 100644
index c4cbfd34..00000000
--- a/modules/dozmod/templates/images-delete.html
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-{{lang_heading}}
- -
-
-
-
\ No newline at end of file
diff --git a/modules/dozmod/templates/mailconfig.html b/modules/dozmod/templates/mailconfig.html
deleted file mode 100644
index b19776c0..00000000
--- a/modules/dozmod/templates/mailconfig.html
+++ /dev/null
@@ -1,91 +0,0 @@
-
- {{lang_subHeading}}
-
-
-
-{{lang_description}}
-
-
-
-
- {{lang_mailConfigHeadline}}
- -
-
-
-
\ No newline at end of file
diff --git a/modules/dozmod/templates/orglist.html b/modules/dozmod/templates/orglist.html
deleted file mode 100644
index d325cc4d..00000000
--- a/modules/dozmod/templates/orglist.html
+++ /dev/null
@@ -1,51 +0,0 @@
-
- {{lang_mailConfig}}
-
-
-
-{{lang_mailDescription}}
-[BETA] Diese Funktionalität ist neu. Wir bitten um Nachsicht, falls es Situationen gibt, in denen zu viele - oder zu wenige Nachrichten verschickt werden.
- -{{lang_organizationList}}
- -
-
-
-
\ No newline at end of file
diff --git a/modules/dozmod/templates/userlist.html b/modules/dozmod/templates/userlist.html
deleted file mode 100644
index a76eae5e..00000000
--- a/modules/dozmod/templates/userlist.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
- {{lang_organizationListHeader}}
-
-
-
-
-
-
-
-
- | {{lang_organization}} | -- |
|---|---|
| {{displayname}} | -- |
{{lang_userList}}
- -
-
-
-
\ No newline at end of file
diff --git a/modules/eventlog/config.json b/modules/eventlog/config.json
deleted file mode 100644
index 650ab2fe..00000000
--- a/modules/eventlog/config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "category":"main.status",
- "enabled":"true"
-}
diff --git a/modules/eventlog/lang/de/templates/_page.json b/modules/eventlog/lang/de/templates/_page.json
deleted file mode 100644
index b1a292e6..00000000
--- a/modules/eventlog/lang/de/templates/_page.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "lang_details": "Details",
- "lang_event": "Ereignis",
- "lang_eventLog": "Ereignisprotokoll",
- "lang_when": "Wann"
-}
\ No newline at end of file
diff --git a/modules/eventlog/lang/en/module.json b/modules/eventlog/lang/en/module.json
deleted file mode 100644
index a0f6afa6..00000000
--- a/modules/eventlog/lang/en/module.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "lang_details": "Details",
- "lang_event": "Event",
- "lang_eventLog": "Server Log",
- "lang_when": "When",
- "module_name": "Client Log"
-}
\ No newline at end of file
diff --git a/modules/eventlog/lang/en/templates/_page.json b/modules/eventlog/lang/en/templates/_page.json
deleted file mode 100644
index 21ec64ea..00000000
--- a/modules/eventlog/lang/en/templates/_page.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "lang_details": "Details",
- "lang_event": "Event",
- "lang_eventLog": "Event log",
- "lang_when": "When"
-}
\ No newline at end of file
diff --git a/modules/eventlog/lang/pt/module.json b/modules/eventlog/lang/pt/module.json
deleted file mode 100644
index 4fcf321a..00000000
--- a/modules/eventlog/lang/pt/module.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "lang_details": "Detalhes",
- "lang_event": "Evento",
- "lang_eventLog": "Log dos Eventos",
- "lang_when": "Quando",
- "module_name": "Log dos Clientes"
-}
\ No newline at end of file
diff --git a/modules/eventlog/page.inc.php b/modules/eventlog/page.inc.php
deleted file mode 100644
index 7cfc8a55..00000000
--- a/modules/eventlog/page.inc.php
+++ /dev/null
@@ -1,70 +0,0 @@
-exec();
- while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
- $day = date('d.m.Y', $row['dateline']);
- if ($day === $today) {
- $day = Dictionary::translate('today');
- } elseif ($day === $yesterday) {
- $day = Dictionary::translate('yesterday');
- }
- $row['date'] = $day . date(' H:i', $row['dateline']);
- $row['icon'] = $this->typeToIcon($row['logtypeid']);
- $row['color'] = $this->typeToColor($row['logtypeid']);
- $lines[] = $row;
- }
-
- $paginate->render('_page', array(
- 'list' => $lines
- ));
- }
-
- private function typeToIcon($type)
- {
- switch ($type) {
- case 'info':
- return 'ok';
- case 'warning':
- return 'exclamation-sign';
- case 'failure':
- return 'remove';
- default:
- return 'question-sign';
- }
- }
-
- private function typeToColor($type)
- {
- switch ($type) {
- case 'info':
- return '';
- case 'warning':
- return 'orange';
- case 'failure':
- return 'red';
- default:
- return '';
- }
- }
-
-}
diff --git a/modules/eventlog/templates/_page.html b/modules/eventlog/templates/_page.html
deleted file mode 100644
index 2e657805..00000000
--- a/modules/eventlog/templates/_page.html
+++ /dev/null
@@ -1,41 +0,0 @@
-
- {{lang_userListHeader}}
-
-
-
-{{lang_userListDescription}}
-
-
-
-
-
- | {{lang_user}} | -{{lang_organization}} | -{{lang_lastLogin}} | -{{lang_email}} | -- | - | - |
|---|---|---|---|---|---|---|
| {{lastname}}, {{firstname}} | -{{orgname}} | -{{lastlogin}} | -{{email}} | -- | - | - |
{{lang_eventLog}}
-{{{pagenav}}} -| - | {{lang_when}} | -{{lang_event}} | -{{lang_details}} | - - - {{#list}} -
|---|---|---|---|
| - | {{date}} | -{{description}} | -{{#extra}}
- »
- {{extra}}
- {{/extra}} |
-
-
-
-
-
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 @@
-{{lang_internetAccess}}
-
-
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 @@
-
- Gerenciamento de Imagens
-
-
-
-
-
- Imagens em azul indicam imagens criadas pelo usuário
-
-
-
-
-
-
-
- -
- {{#deactives}}
-
- {{name}} - {{/deactives}} -
-
-
-
-
-
-
- -
-
- {{#actives}}
-
- {{name}} - {{/actives}} -
-
-
-
diff --git a/modules/locations/config.json b/modules/locations/config.json
deleted file mode 100644
index 6c189b63..00000000
--- a/modules/locations/config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "category":"main.content",
- "enabled":"true"
-}
diff --git a/modules/locations/lang/de/templates/location-subnets.json b/modules/locations/lang/de/templates/location-subnets.json
deleted file mode 100644
index 6caa1991..00000000
--- a/modules/locations/lang/de/templates/location-subnets.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "lang_addNewSubnet": "Neues Subnetz hinzuf\u00fcgen",
- "lang_assignSubnetExplanation": "Rechner, die in einen der hier aufgef\u00fchrten Adressbereiche fallen, werden diesem Ort zugeschrieben und erhalten damit z.B. f\u00fcr diesen Raum angepasste Veranstaltungslisten.",
- "lang_assignedSubnets": "Zugeordnete Subnetze bzw. IP-Bereiche",
- "lang_deleteChildLocations": "Untergeordnete Orte ebenfalls l\u00f6schen",
- "lang_deleteLocation": "Ort l\u00f6schen",
- "lang_deleteSubnet": "Bereich l\u00f6schen",
- "lang_endAddress": "Endadresse",
- "lang_locationInfo": "Details zu diesem Ort",
- "lang_locationSettings": "Raum\/Ort bearbeiten",
- "lang_matchingMachines": "Enthaltene Rechner",
- "lang_name": "Name",
- "lang_parentLocation": "\u00dcbergeordneter Ort",
- "lang_referencingLectures": "Veranstaltungen",
- "lang_save": "Speichern",
- "lang_startAddress": "Startadresse",
- "lang_subnet": "IP-Bereich"
-}
\ No newline at end of file
diff --git a/modules/locations/lang/de/templates/locations.json b/modules/locations/lang/de/templates/locations.json
deleted file mode 100644
index 3e25ef45..00000000
--- a/modules/locations/lang/de/templates/locations.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "lang_areYouSureNoUndo": "Sind Sie sicher? Diese Aktion kann nicht r\u00fcckg\u00e4ngig gemacht werden.",
- "lang_edit": "Bearbeiten",
- "lang_location": "Ort",
- "lang_locationName": "Name",
- "lang_locationsMainHeading": "Verwaltung von R\u00e4umen\/Orten",
- "lang_noParent": "Kein \u00fcbergeordneter Ort",
- "lang_save": "Speichern",
- "lang_thisListBySubnet": "Nach Subnetzen auflisten"
-}
\ No newline at end of file
diff --git a/modules/locations/lang/de/templates/subnets.json b/modules/locations/lang/de/templates/subnets.json
deleted file mode 100644
index b57f87ce..00000000
--- a/modules/locations/lang/de/templates/subnets.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "lang_endAddress": "Ende",
- "lang_listOfSubnets": "Liste der Subnetze",
- "lang_location": "Ort",
- "lang_startAddress": "Start",
- "lang_thisListByLocation": "Zur Ortsansicht"
-}
\ No newline at end of file
diff --git a/modules/locations/lang/en/module.json b/modules/locations/lang/en/module.json
deleted file mode 100644
index b2a837b6..00000000
--- a/modules/locations/lang/en/module.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "module_name": "Room\/Locations"
-}
\ No newline at end of file
diff --git a/modules/locations/lang/en/templates/location-subnets.json b/modules/locations/lang/en/templates/location-subnets.json
deleted file mode 100644
index 2ba94384..00000000
--- a/modules/locations/lang/en/templates/location-subnets.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "lang_addNewSubnet": "Add new subnet",
- "lang_assignSubnetExplanation": "Client machines which fall into an IP range listed below will be assigned to this location and will see an according lecture list (e.g. they will see lectures that are exclusively assigned to this location).",
- "lang_assignedSubnets": "Assigned subnets \/ IP ranges",
- "lang_deleteChildLocations": "Delete child locations aswell",
- "lang_deleteLocation": "Delete location",
- "lang_deleteSubnet": "Delete range",
- "lang_endAddress": "End address",
- "lang_locationInfo": "Location details",
- "lang_locationSettings": "Edit this room or location",
- "lang_matchingMachines": "Matching clients",
- "lang_name": "Name",
- "lang_parentLocation": "Parent location",
- "lang_referencingLectures": "Assigned Lectures",
- "lang_save": "Save",
- "lang_startAddress": "Start address",
- "lang_subnet": "IP range"
-}
\ No newline at end of file
diff --git a/modules/locations/lang/en/templates/locations.json b/modules/locations/lang/en/templates/locations.json
deleted file mode 100644
index db4fd0a7..00000000
--- a/modules/locations/lang/en/templates/locations.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "lang_areYouSureNoUndo": "Are you sure? This cannot be undone!",
- "lang_edit": "Edit",
- "lang_location": "Ort",
- "lang_locationName": "Name",
- "lang_locationsMainHeading": "Manage rooms and locations",
- "lang_noParent": "No parent",
- "lang_save": "Save",
- "lang_thisListBySubnet": "List by subnet"
-}
\ No newline at end of file
diff --git a/modules/locations/lang/en/templates/subnets.json b/modules/locations/lang/en/templates/subnets.json
deleted file mode 100644
index 65da254b..00000000
--- a/modules/locations/lang/en/templates/subnets.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "lang_endAddress": "End",
- "lang_listOfSubnets": "List of subnets",
- "lang_location": "Location",
- "lang_startAddress": "Start",
- "lang_thisListByLocation": "List by location"
-}
\ No newline at end of file
diff --git a/modules/locations/page.inc.php b/modules/locations/page.inc.php
deleted file mode 100644
index 60af719b..00000000
--- a/modules/locations/page.inc.php
+++ /dev/null
@@ -1,348 +0,0 @@
-action = Request::post('action');
- if ($this->action === 'updatelocation') {
- $this->updateLocation();
- } elseif ($this->action === 'addlocations') {
- $this->addLocations();
- }
- }
-
- private function addLocations()
- {
- $names = Request::post('newlocation', false);
- $parents = Request::post('newparent', false);
- if (!is_array($names) || !is_array($parents)) {
- Message::addError('empty-field');
- Util::redirect('?do=Locations');
- }
- $locs = Location::getLocations();
- $count = 0;
- foreach ($names as $idx => $name) {
- $name = trim($name);
- if (empty($name)) continue;
- $parent = isset($parents[$idx]) ? (int)$parents[$idx] : 0;
- if ($parent !== 0) {
- $ok = false;
- foreach ($locs as $loc) {
- if ($loc['locationid'] == $parent) {
- $ok = true;
- }
- }
- if (!$ok) {
- Message::addWarning('value-invalid', 'parentlocationid', $parent);
- continue;
- }
- }
- Database::exec("INSERT INTO location (parentlocationid, locationname)"
- . " VALUES (:parent, :name)", array(
- 'parent' => $parent,
- 'name' => $name
- ));
- $count++;
- }
- Message::addSuccess('added-x-entries', $count);
- Util::redirect('?do=Locations');
- }
-
- private function updateLocation()
- {
- $locationId = Request::post('locationid', false, 'integer');
- $del = Request::post('deletelocation', false, 'integer');
- if ($locationId === false) {
- Message::addError('parameter-missing', 'locationid');
- Util::redirect('?do=Locations');
- }
- $location = Database::queryFirst('SELECT locationid, parentlocationid, locationname FROM location'
- . ' WHERE locationid = :lid', array('lid' => $locationId));
- if ($location === false) {
- Message::addError('value-invalid', 'locationid', $locationId);
- Util::redirect('?do=Locations');
- }
- // Delete location?
- if ($locationId === $del) {
- $this->deleteLocation($location);
- }
- // Update subnets
- $this->updateLocationSubnets($location);
- // Insert subnets
- $this->addNewLocationSubnets($location); // TODO
- // Update location!
- $this->updateLocationData($location);
- Util::redirect('?do=Locations');
- }
-
- private function deleteLocation($location)
- {
- $locationId = (int)$location['locationid'];
- $ids = $locationId;
- if (Request::post('recursive', false) === 'on') {
- $rows = Location::queryLocations();
- $rows = Location::buildTree($rows, $locationId);
- $rows = Location::extractIds($rows);
- if (!empty($rows)) {
- $ids .= ',' . implode(',', $rows);
- }
- }
- $subs = Database::exec("DELETE FROM subnet WHERE locationid IN ($ids)");
- $locs = Database::exec("DELETE FROM location WHERE locationid IN ($ids)");
- Database::exec('UPDATE location SET parentlocationid = :newparent WHERE parentlocationid = :oldparent', array(
- 'newparent' => $location['parentlocationid'],
- 'oldparent' => $location['locationid']
- ));
- Message::addSuccess('location-deleted', $locs, $subs);
- Util::redirect('?do=Locations');
- }
-
- private function updateLocationData($location)
- {
- $locationId = (int)$location['locationid'];
- $newParent = Request::post('parentlocationid', false, 'integer');
- $newName = Request::post('locationname', false, 'string');
- if ($newName === false || preg_match('/^\s*$/', $newName)) {
- if ($newName !== false) {
- Message::addWarning('value-invalid', 'location name', $newName);
- }
- $newName = $location['locationname'];
- }
- if ($newParent === false) {
- $newParent = $location['parentlocationid'];
- } else if ($newParent !== 0) {
- $rows = Location::queryLocations();
- $all = Location::extractIds(Location::buildTree($rows));
- if (!in_array($newParent, $all) || $newParent === $locationId) {
- Message::addWarning('value-invalid', 'parent', $newParent);
- $newParent = $location['parentlocationid'];
- } else {
- $rows = Location::extractIds(Location::buildTree($rows, $locationId));
- if (in_array($newParent, $rows)) {
- Message::addWarning('value-invalid', 'parent', $newParent);
- $newParent = $location['parentlocationid'];
- }
- }
- }
- $ret = Database::exec('UPDATE location SET parentlocationid = :parent, locationname = :name'
- . ' WHERE locationid = :lid', array(
- 'lid' => $locationId,
- 'parent' => $newParent,
- 'name' => $newName
- ));
- if ($ret > 0) {
- Message::addSuccess('location-updated', $newName);
- }
- }
-
- private function updateLocationSubnets($location)
- {
- $locationId = (int)$location['locationid'];
- // Deletion first
- $dels = Request::post('deletesubnet', false);
- if (is_array($dels)) {
- $count = 0;
- $stmt = Database::prepare('DELETE FROM subnet WHERE subnetid = :id');
- foreach ($dels as $key => $value) {
- if (!is_numeric($key) || $value !== 'on') continue;
- if ($stmt->execute(array('id' => $key))) {
- $count += $stmt->rowCount();
- }
- }
- if ($count > 0) {
- Message::addInfo('subnets-deleted', $count);
- }
- }
- // Now actual updates
- // TODO: Warn on mismatch/overlap (should lie entirely in parent's subnet, not overlap with others)
- $starts = Request::post('startaddr', false);
- $ends = Request::post('endaddr', false);
- if (!is_array($starts) || !is_array($ends)) {
- return;
- }
- $count = 0;
- $stmt = Database::prepare('UPDATE subnet SET startaddr = :start, endaddr = :end'
- . ' WHERE subnetid = :id');
- foreach ($starts as $key => $start) {
- if (!isset($ends[$key]) || !is_numeric($key)) continue;
- $end = $ends[$key];
- list($startLong, $endLong) = $this->rangeToLong($start, $end);
- if ($startLong === false) {
- Message::addWarning('value-invalid', 'start addr', $start);
- }
- if ($endLong === false) {
- Message::addWarning('value-invalid', 'end addr', $start);
- }
- if ($startLong === false || $endLong === false) continue;
- if ($startLong > $endLong) {
- Message::addWarning('value-invalid', 'range', $start . ' - ' . $end);
- continue;
- }
- if ($stmt->execute(array('id' => $key, 'start' => $startLong, 'end' => $endLong))) {
- $count += $stmt->rowCount();
- }
- }
- if ($count > 0) {
- Message::addInfo('subnets-updated', $count);
- }
- }
-
- private function addNewLocationSubnets($location)
- {
- $locationId = (int)$location['locationid'];
- $starts = Request::post('newstartaddr', false);
- $ends = Request::post('newendaddr', false);
- if (!is_array($starts) || !is_array($ends)) {
- return;
- }
- $count = 0;
- $stmt = Database::prepare('INSERT INTO subnet SET startaddr = :start, endaddr = :end, locationid = :location');
- foreach ($starts as $key => $start) {
- if (!isset($ends[$key]) || !is_numeric($key)) continue;
- $end = $ends[$key];
- list($startLong, $endLong) = $this->rangeToLong($start, $end);
- if ($startLong === false) {
- Message::addWarning('value-invalid', 'new start addr', $start);
- }
- if ($endLong === false) {
- Message::addWarning('value-invalid', 'new end addr', $start);
- }
- if ($startLong === false || $endLong === false) continue;
- if ($startLong > $endLong) {
- Message::addWarning('value-invalid', 'range', $start . ' - ' . $end);
- continue;
- }
- if ($stmt->execute(array('location' => $locationId, 'start' => $startLong, 'end' => $endLong))) {
- $count += $stmt->rowCount();
- }
- }
- if ($count > 0) {
- Message::addInfo('subnets-created', $count);
- }
- }
-
- /*
- * Rendering normal pages
- */
-
- protected function doRender()
- {
- //Render::setTitle(Dictionary::translate('lang_titleBackup'));
- $getAction = Request::get('action');
- if (empty($getAction)) {
- // Until we have a main landing page?
- Util::redirect('?do=Locations&action=showlocations');
- }
- if ($getAction === 'showsubnets') {
- $res = Database::simpleQuery("SELECT subnetid, startaddr, endaddr, locationid FROM subnet");
- $rows = array();
- while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
- $row['startaddr'] = long2ip($row['startaddr']);
- $row['endaddr'] = long2ip($row['endaddr']);
- $row['locations'] = Location::getLocations($row['locationid']);
- $rows[] = $row;
- }
- Render::addTemplate('subnets', array('list' => $rows));
- } elseif ($getAction === 'showlocations') {
- $locs = Location::getLocations();
- Render::addTemplate('locations', array('list' => $locs));
- }
- }
-
- /*
- * Ajax
- */
-
- protected function doAjax()
- {
- User::load();
- if (!User::isLoggedIn()) {
- die('Unauthorized');
- }
- $action = Request::any('action');
- if ($action === 'showlocation') {
- $this->ajaxShowLocation();
- }
- }
-
- private function ajaxShowLocation()
- {
- $locationId = Request::any('locationid', 0, 'integer');
- $loc = Database::queryFirst('SELECT locationid, parentlocationid, locationname FROM location WHERE locationid = :lid',
- array('lid' => $locationId));
- if ($loc === false) {
- die('Unknown locationid');
- }
- $res = Database::simpleQuery("SELECT subnetid, startaddr, endaddr FROM subnet WHERE locationid = :lid",
- array('lid' => $locationId));
- $rows = array();
- while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
- $row['startaddr'] = long2ip($row['startaddr']);
- $row['endaddr'] = long2ip($row['endaddr']);
- $rows[] = $row;
- }
- $data = array(
- 'locationid' => $loc['locationid'],
- 'locationname' => $loc['locationname'],
- 'list' => $rows,
- 'parents' => Location::getLocations($loc['parentlocationid'], $locationId, true)
- );
- // if (moduleEnabled(DOZMOD) {
- $lectures = Database::queryFirst('SELECT Count(*) AS cnt FROM sat.lecture l '
- . ' INNER JOIN sat.lecture_x_location ll ON (l.lectureid = ll.lectureid AND ll.locationid = :lid)',
- array('lid' => $locationId));
- $data['lectures'] = $lectures['cnt'];
- // }
- // Get clients matching this location's subnet(s)
- $mres = Database::simpleQuery("SELECT lastseen, logintime FROM machine"
- . " INNER JOIN subnet ON (INET_ATON(machine.clientip) BETWEEN startaddr AND endaddr)"
- . " WHERE subnet.locationid = :lid OR machine.locationid = :lid", array('lid' => $locationId));
- $count = $online = $used = 0;
- $DL = time() - 605;
- while ($row = $mres->fetch(PDO::FETCH_ASSOC)) {
- $count++;
- if ($row['lastseen'] > $DL) {
- $online++;
- if ($row['logintime'] != 0) {
- $used++;
- }
- }
- }
- $data['machines'] = $count;
- $data['machines_online'] = $online;
- $data['machines_used'] = $used;
- $data['used_percent'] = round(100 * $used / $online);
- echo Render::parse('location-subnets', $data);
- }
-
- /*
- * Helpers
- */
-
- private function rangeToLong($start, $end)
- {
- $startLong = ip2long($start);
- $endLong = ip2long($end);
- if ($startLong !== false) {
- $startLong = sprintf("%u", $startLong);
- }
- if ($endLong !== false) {
- $endLong = sprintf("%u", $endLong);
- }
- return array($startLong, $endLong);
- }
-
-}
diff --git a/modules/locations/templates/location-subnets.html b/modules/locations/templates/location-subnets.html
deleted file mode 100644
index 76b7442a..00000000
--- a/modules/locations/templates/location-subnets.html
+++ /dev/null
@@ -1,73 +0,0 @@
-{{lang_serviceRestart}}
-
-
-{{lang_restarting}} syncdaemon
- {{lang_restarting}} dmsd
- {{lang_restarting}} ldadp
-
-
-
-
\ No newline at end of file
diff --git a/modules/locations/templates/locations.html b/modules/locations/templates/locations.html
deleted file mode 100644
index 76c8f97c..00000000
--- a/modules/locations/templates/locations.html
+++ /dev/null
@@ -1,96 +0,0 @@
-{{lang_locationSettings}}
-
- -
{{lang_locationInfo}}
-
- {{lang_referencingLectures}}: {{lectures}}
-
-
- {{lang_matchingMachines}}: {{machines}} / {{machines_online}} / {{machines_used}} ({{used_percent}}%)
-
-
-
-
-
-
-
-
diff --git a/modules/locations/templates/subnets.html b/modules/locations/templates/subnets.html
deleted file mode 100644
index 2294f42b..00000000
--- a/modules/locations/templates/subnets.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{{lang_locationsMainHeading}}
-| # | -{{lang_locationName}} | -- |
|---|---|---|
| {{locationid}} | -{{locationname}} | -- {{lang_edit}} - | -
-
-
diff --git a/modules/main/category-icons.json b/modules/main/category-icons.json
deleted file mode 100644
index 97b76eac..00000000
--- a/modules/main/category-icons.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "cities":"tower",
- "content":"th",
- "settings":"cog",
- "status":"tasks",
- "users":"user"
-}
\ No newline at end of file
diff --git a/modules/main/config.json b/modules/main/config.json
deleted file mode 100644
index 4da67ef8..00000000
--- a/modules/main/config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "enabled":"true"
-}
diff --git a/modules/main/lang/de/module.json b/modules/main/lang/de/module.json
deleted file mode 100644
index f03e52ad..00000000
--- a/modules/main/lang/de/module.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "module_name": "Dashboard",
- "page_title": "Startseite"
-}
diff --git a/modules/main/lang/de/templates/dialog-generic.json b/modules/main/lang/de/templates/dialog-generic.json
deleted file mode 100644
index ff429fdd..00000000
--- a/modules/main/lang/de/templates/dialog-generic.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "lang_next": "Weiter"
-}
\ No newline at end of file
diff --git a/modules/main/lang/de/templates/main-menu.json b/modules/main/lang/de/templates/main-menu.json
deleted file mode 100644
index 057bfcf2..00000000
--- a/modules/main/lang/de/templates/main-menu.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "lang_configurationBasic": "PXE\/Boot",
- "lang_configurationVariables": "KonfigurationsVariablen",
- "lang_dozmod": "Dozentenmodul",
- "lang_eventLog": "Server Log",
- "lang_internetAccess": "Internetzugriff",
- "lang_language": "Sprachen",
- "lang_localization": "Lokalisierung + Integration",
- "lang_locations": "R\u00e4ume\/Orte",
- "lang_login": "Anmelden",
- "lang_logout": "Abmelden",
- "lang_needsSetup": "Einrichtung unvollst\u00e4ndig",
- "lang_news": "vmChooser News",
- "lang_server": "Server",
- "lang_serverStatus": "Server Status",
- "lang_settings": "Einstellungen",
- "lang_status": "Status",
- "lang_translations": "\u00dcbersetzungen",
- "lang_vmLocation": "VM Speicherort",
- "lang_warning": "Warnung",
- "lang_webInterface": "Web-Schnittstelle"
-}
diff --git a/modules/main/lang/de/templates/messagebox-error.json b/modules/main/lang/de/templates/messagebox-error.json
deleted file mode 100644
index c44dc44f..00000000
--- a/modules/main/lang/de/templates/messagebox-error.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-
-]
\ No newline at end of file
diff --git a/modules/main/lang/de/templates/messagebox-info.json b/modules/main/lang/de/templates/messagebox-info.json
deleted file mode 100644
index 0967ef42..00000000
--- a/modules/main/lang/de/templates/messagebox-info.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/modules/main/lang/de/templates/messagebox-success.json b/modules/main/lang/de/templates/messagebox-success.json
deleted file mode 100644
index 0967ef42..00000000
--- a/modules/main/lang/de/templates/messagebox-success.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/modules/main/lang/de/templates/messagebox-warning.json b/modules/main/lang/de/templates/messagebox-warning.json
deleted file mode 100644
index 0967ef42..00000000
--- a/modules/main/lang/de/templates/messagebox-warning.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/modules/main/lang/de/templates/page-main-guest.json b/modules/main/lang/de/templates/page-main-guest.json
deleted file mode 100644
index 876fccac..00000000
--- a/modules/main/lang/de/templates/page-main-guest.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "lang_introGuest": "Dies ist das Administrations-Interface der lokalen bwLehrpool-Installation. Bitte authentifizieren Sie sich, um Einstellungen vorzunehmen.",
- "lang_login": "Anmelden",
- "lang_noExistingAccount": "Es existiert noch kein Administrator-Zugang f\u00fcr diesen Satelliten-Server.",
- "lang_register": "Registrieren",
- "lang_welcome": "Willkommen"
-}
\ No newline at end of file
diff --git a/modules/main/lang/de/templates/page-main.json b/modules/main/lang/de/templates/page-main.json
deleted file mode 100644
index a927e4ce..00000000
--- a/modules/main/lang/de/templates/page-main.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "lang_bootMenuWarning": "Das Bootmen\u00fc ist veraltet oder wurde noch nicht generiert.",
- "lang_configure": "Konfigurieren",
- "lang_intro": "Dies ist die bwLehrpool Konfigurationsoberfl\u00e4che.",
- "lang_minilinuxMissing": "Wichtige Dateien der MiniLinux-Installation fehlen.",
- "lang_numerOfImagesMarkedForDeletion": "Zur L\u00f6schung markierte Abbilder",
- "lang_systemConfiguration": "Systemkonfiguration",
- "lang_systemConfigurationNotChosen": "Es wurde noch keine Systemkonfiguration ausgew\u00e4hlt.",
- "lang_vmLocationNotSet": "Es ist noch kein Speicherort f\u00fcr die Virtuellen Maschinen festgelegt.",
- "lang_welcome": "Willkommen"
-}
\ No newline at end of file
diff --git a/modules/main/lang/en/categories.json b/modules/main/lang/en/categories.json
deleted file mode 100644
index 3d67bcfd..00000000
--- a/modules/main/lang/en/categories.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "settings": "Settings",
- "status": "Status",
- "content": "Content",
- "users": "Users"
-}
diff --git a/modules/main/lang/en/module.json b/modules/main/lang/en/module.json
deleted file mode 100644
index 613213d9..00000000
--- a/modules/main/lang/en/module.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "lang_intro": "Esta \u00e9 a interface de configura\u00e7\u00e3o do OpenSLX.",
- "lang_introGuest": "This is the administration interface of the local bwLehrpool intallation. Please authenticate yourself to adjust settings.",
- "lang_language": "Language",
- "lang_login": "Login",
- "lang_logout": "Logout",
- "lang_needsSetup": "Setup incomplete",
- "lang_next": "Next",
- "lang_noExistingAccount": "No account has been created yet. Sign up to become the administrator.",
- "lang_register": "Register",
- "lang_warning": "Warning",
- "lang_welcome": "Welcome"
-}
\ No newline at end of file
diff --git a/modules/main/lang/en/templates/dialog-generic.json b/modules/main/lang/en/templates/dialog-generic.json
deleted file mode 100644
index c7551ed3..00000000
--- a/modules/main/lang/en/templates/dialog-generic.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "lang_next": "Next"
-}
\ No newline at end of file
diff --git a/modules/main/lang/en/templates/main-menu.json b/modules/main/lang/en/templates/main-menu.json
deleted file mode 100644
index 635c7aa8..00000000
--- a/modules/main/lang/en/templates/main-menu.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "lang_backup": "Backup\/Restore",
- "lang_client": "Client",
- "lang_clientLog": "Client Log",
- "lang_clientStats": "Client statistics",
- "lang_configurationBasic": "PXE\/Boot",
- "lang_configurationVariables": "Configuration Variables",
- "lang_dozmod": "Tutor module",
- "lang_eventLog": "Server Log",
- "lang_internetAccess": "Internet access",
- "lang_language": "Language",
- "lang_localization": "Localization",
- "lang_locations": "Rooms\/Locations",
- "lang_login": "Login",
- "lang_logout": "Logout",
- "lang_needsSetup": "Setup incomplete",
- "lang_news": "vmChooser news",
- "lang_server": "Server",
- "lang_serverStatus": "Server status",
- "lang_settings": "Settings",
- "lang_status": "Status",
- "lang_translations": "Translations",
- "lang_vmLocation": "VM Location",
- "lang_warning": "Warning",
- "lang_webInterface": "Web interface",
- "lang_loggedInPrefix": "Logged in as",
- "lang_loggedInSuffix": " "
-}
diff --git a/modules/main/lang/en/templates/messagebox-warning.json b/modules/main/lang/en/templates/messagebox-warning.json
deleted file mode 100644
index 2c63c085..00000000
--- a/modules/main/lang/en/templates/messagebox-warning.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
diff --git a/modules/main/lang/en/templates/page-main-guest.json b/modules/main/lang/en/templates/page-main-guest.json
deleted file mode 100644
index 6526f5bd..00000000
--- a/modules/main/lang/en/templates/page-main-guest.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "lang_introGuest": "This is the administration interface of the local bwLehrpool intallation. Please authenticate yourself to adjust settings.",
- "lang_login": "Login",
- "lang_noExistingAccount": "No account has been created yet. Sign up to become the administrator.",
- "lang_register": "Register",
- "lang_welcome": "Welcome"
-}
\ No newline at end of file
diff --git a/modules/main/lang/en/templates/page-main.json b/modules/main/lang/en/templates/page-main.json
deleted file mode 100644
index 8031ac1c..00000000
--- a/modules/main/lang/en/templates/page-main.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "lang_bootMenuWarning": "The boot menu is outdated or has not been generated.",
- "lang_configure": "Configure",
- "lang_intro": "This is the bwLehrpool configuration interface.",
- "lang_minilinuxMissing": "Important files from the mini Linux installation are missing.",
- "lang_numerOfImagesMarkedForDeletion": "Images marked for deletion",
- "lang_systemConfiguration": "System Configuration",
- "lang_systemConfigurationNotChosen": "A system configuration has not been chosen yet.",
- "lang_vmLocationNotSet": "A location for the virtual machine is not set yet.",
- "lang_welcome": "Welcome"
-}
\ No newline at end of file
diff --git a/modules/main/lang/pt/module.json b/modules/main/lang/pt/module.json
deleted file mode 100644
index e4e35acd..00000000
--- a/modules/main/lang/pt/module.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "lang_intro": "Esta \u00e9 a interface de configura\u00e7\u00e3o do OpenSLX.",
- "lang_introGuest": "Esta \u00e9 a interface de administra\u00e7\u00e3o da instala\u00e7\u00e3o local do bwLehrpool. Por favor, autentique-se para ajustar op\u00e7\u00f5es.",
- "lang_language": "L\u00edngua",
- "lang_login": "Entrar",
- "lang_logout": "Sair",
- "lang_needsSetup": "Instala\u00e7\u00e3o incompleta",
- "lang_next": "Pr\u00f3ximo",
- "lang_noExistingAccount": "Nenhuma conta foi criada ainda. Registre-se para se tornar administrador.",
- "lang_register": "Registrar",
- "lang_translations": "Tradu\u00e7\u00f5es",
- "lang_warning": "Aten\u00e7\u00e3o",
- "lang_welcome": "Bem-vindo"
-}
diff --git a/modules/main/page.inc.php b/modules/main/page.inc.php
deleted file mode 100644
index 369d4b54..00000000
--- a/modules/main/page.inc.php
+++ /dev/null
@@ -1,64 +0,0 @@
-sysconfig = !file_exists(CONFIG_HTTP_DIR . '/default/config.tgz');
- $this->minilinux = !file_exists(CONFIG_HTTP_DIR . '/default/kernel') || !file_exists(CONFIG_HTTP_DIR . '/default/initramfs-stage31') || !file_exists(CONFIG_HTTP_DIR . '/default/stage32.sqfs');
- $this->vmstore = !is_array(Property::getVmStoreConfig());
- $this->ipxe = !preg_match('/^\d+\.\d+\.\d+\.\d+$/', Property::getServerIp());
- Property::setNeedsSetup(($this->sysconfig || $this->minilinux || $this->vmstore || $this->ipxe) ? 1 : 0);
- $res = Database::queryFirst("SELECT Count(*) AS cnt FROM sat.imageversion WHERE deletestate = 'SHOULD_DELETE'", array(), true);
- $this->delPending = isset($res['cnt']) ? $res['cnt'] : 0;
- }
- }
-
- protected function doRender()
- {
- // Render::setTitle('abc');
-
- if (!User::isLoggedIn()) {
- Render::addTemplate('page-main-guest', array(
- 'register' => (Database::queryFirst('SELECT userid FROM user LIMIT 1') === false)
- ));
- return;
- }
- // Logged in here
-
- // Load news
- $lines = array();
- $paginate = new Paginate("SELECT newsid, dateline, title, content FROM news ORDER BY dateline DESC", 10);
- $res = $paginate->exec();
- while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
- if(count($lines) >= 3) break;
- $lines[] = $row;
- }
-
- Render::addTemplate('page-main', array(
- 'user' => User::getName(),
- 'sysconfig' => $this->sysconfig,
- 'minilinux' => $this->minilinux,
- 'vmstore' => $this->vmstore,
- 'ipxe' => $this->ipxe,
- 'delpending' => $this->delPending,
- 'news' => $lines
- ));
- }
-
- protected function doAjax()
- {
- User::isLoggedIn();
- die('Status: DB running');
- }
-
-}
diff --git a/modules/main/templates/dialog-generic.html b/modules/main/templates/dialog-generic.html
deleted file mode 100644
index 5face8ce..00000000
--- a/modules/main/templates/dialog-generic.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{{lang_listOfSubnets}}
- -
-
-
\ No newline at end of file
diff --git a/modules/main/templates/footer.html b/modules/main/templates/footer.html
deleted file mode 100644
index 8cf71a5c..00000000
--- a/modules/main/templates/footer.html
+++ /dev/null
@@ -1,2 +0,0 @@
-- \ No newline at end of file diff --git a/modules/main/templates/main-menu.html b/modules/main/templates/main-menu.html deleted file mode 100644 index 65085ee6..00000000 --- a/modules/main/templates/main-menu.html +++ /dev/null @@ -1,72 +0,0 @@ - - - diff --git a/modules/main/templates/messagebox-error.html b/modules/main/templates/messagebox-error.html deleted file mode 100644 index 873716c9..00000000 --- a/modules/main/templates/messagebox-error.html +++ /dev/null @@ -1 +0,0 @@ -
{{{message}}}
diff --git a/modules/main/templates/messagebox-info.html b/modules/main/templates/messagebox-info.html
deleted file mode 100644
index eb9d518a..00000000
--- a/modules/main/templates/messagebox-info.html
+++ /dev/null
@@ -1 +0,0 @@
- {{{message}}}
diff --git a/modules/main/templates/messagebox-success.html b/modules/main/templates/messagebox-success.html
deleted file mode 100644
index 93674d69..00000000
--- a/modules/main/templates/messagebox-success.html
+++ /dev/null
@@ -1 +0,0 @@
- {{{message}}}
diff --git a/modules/main/templates/messagebox-warning.html b/modules/main/templates/messagebox-warning.html
deleted file mode 100644
index b02e2e8a..00000000
--- a/modules/main/templates/messagebox-warning.html
+++ /dev/null
@@ -1 +0,0 @@
- {{{message}}}
diff --git a/modules/main/templates/page-login.html b/modules/main/templates/page-login.html
deleted file mode 100644
index 247e9a55..00000000
--- a/modules/main/templates/page-login.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
\ No newline at end of file
diff --git a/modules/main/templates/page-main-guest.html b/modules/main/templates/page-main-guest.html
deleted file mode 100644
index 28b0d04c..00000000
--- a/modules/main/templates/page-main-guest.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
diff --git a/modules/main/templates/page-main.html b/modules/main/templates/page-main.html
deleted file mode 100644
index 39e4e74e..00000000
--- a/modules/main/templates/page-main.html
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-{{lang_welcome}}
-{{lang_introGuest}}
- {{#register}} --
-
- - {{lang_noExistingAccount}} - {{lang_register}} » - -
-
-{{lang_welcome}}, {{user}}
-{{lang_intro}}
- --
-{{#vmstore}}
-
- - {{lang_vmLocationNotSet}} - {{lang_configure}} » - -{{/vmstore}} -{{#ipxe}} -
- - {{lang_bootMenuWarning}} - {{lang_configure}} » - -{{/ipxe}} -{{#minilinux}} -
- - {{lang_minilinuxMissing}} - MiniLinux » - -{{/minilinux}} -{{#sysconfig}} -
- - {{lang_systemConfigurationNotChosen}} - {{lang_systemConfiguration}} » - -{{/sysconfig}} -{{#delpending}} -
- - {{lang_numerOfImagesMarkedForDeletion}}: {{delpending}} - -{{/delpending}} -
-
-
-
\ No newline at end of file
diff --git a/modules/main/templates/page-news.html b/modules/main/templates/page-news.html
deleted file mode 100644
index 8e400498..00000000
--- a/modules/main/templates/page-news.html
+++ /dev/null
@@ -1,57 +0,0 @@
-{{lang_listObtained}}
-
-
-
-
- {{lang_editNews}}
-
-
-
-{{lang_newsIntro}}
- -
-
diff --git a/modules/main/templates/page-syslog.html b/modules/main/templates/page-syslog.html
deleted file mode 100644
index 98e94291..00000000
--- a/modules/main/templates/page-syslog.html
+++ /dev/null
@@ -1,58 +0,0 @@
-
- {{lang_newsOld}}
-
-
-
-
-
-
- {{lang_clientLog}}
- -{{{pagenav}}} -| - | {{lang_when}} | -{{lang_client}} | -{{lang_event}} | -{{lang_details}} | - - - {{#list}} -
|---|---|---|---|---|
| - | {{date}} | -{{clientip}} | -{{description}} | -{{#extra}}
- »
- {{extra}}
- {{/extra}} |
-
-
-
-
-
-
-
-
diff --git a/modules/main/templates/pagenav.html b/modules/main/templates/pagenav.html
deleted file mode 100644
index 93194999..00000000
--- a/modules/main/templates/pagenav.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
--
- {{#pages}}
- {{#current}}
-
- {{text}} (current) - {{/current}} - {{^current}} - {{#text}} -
- {{text}} - {{/text}} - {{^text}} -
- … - {{/text}} - {{/current}} - {{/pages}} -
{{name}}
\ No newline at end of file
diff --git a/modules/minilinux/templates/filelist.html b/modules/minilinux/templates/filelist.html
deleted file mode 100644
index ca94f4d0..00000000
--- a/modules/minilinux/templates/filelist.html
+++ /dev/null
@@ -1,77 +0,0 @@
- {{#systems}}
-
-
- {{/systems}}
- {{^systems}}
-
-
- {{title}}
-
-
-
-
- {{lang_desiredVersion}}
-
-
- {{#systemChanged}}
- - {{lang_canUpdate1}} {{title}} {{lang_canUpdate2}} -
-{{lang_update}}
- {{/systemChanged}} - {{^systemChanged}} -{{lang_systemUpdated}}
- {{/systemChanged}} --
{{lang_filesInVersion}} {{version}}
--
- {{#files}}
-
-
- -- {{{download}}} -{{name}}-- {{^fileChanged}} {{lang_actual}}{{/fileChanged}} - {{#fileChanged}} {{lang_outdated}}{{/fileChanged}} --- {{#fileChanged}}{{/fileChanged}} - {{^fileChanged}}{{lang_redownload}}{{/fileChanged}} --
- {{/files}}
-
{{lang_configurationPackageNotFound}}
- {{/systems}}
-
-
diff --git a/modules/minilinux/templates/page-minilinux.html b/modules/minilinux/templates/page-minilinux.html
deleted file mode 100644
index 007e1e1b..00000000
--- a/modules/minilinux/templates/page-minilinux.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/modules/news/config.json b/modules/news/config.json
deleted file mode 100644
index 6c189b63..00000000
--- a/modules/news/config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "category":"main.content",
- "enabled":"true"
-}
diff --git a/modules/news/lang/de/templates/page-news.json b/modules/news/lang/de/templates/page-news.json
deleted file mode 100644
index 7801584d..00000000
--- a/modules/news/lang/de/templates/page-news.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "lang_activeNews": "Aktive News",
- "lang_content": "Inhalt",
- "lang_date": "Datum",
- "lang_delete": "L\u00f6schen",
- "lang_editNews": "News bearbeiten",
- "lang_latestUpdate": "Letzte Aktualisierung",
- "lang_newsIntro": "Hier haben Sie die M\u00f6glichkeit, die von bwLehrpool-Clients angezeigten News zu editieren.",
- "lang_newsOld": "Alte News",
- "lang_save": "Speichern",
- "lang_show": "Ansehen",
- "lang_title": "Titel"
-}
\ No newline at end of file
diff --git a/modules/news/lang/en/module.json b/modules/news/lang/en/module.json
deleted file mode 100644
index 5acbe58d..00000000
--- a/modules/news/lang/en/module.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "lang_activeNews": "News",
- "lang_content": "Content",
- "lang_date": "Date",
- "lang_delete": "Delete",
- "lang_latestUpdate": "Last Update",
- "lang_newsOld": "Old News",
- "lang_save": "Save",
- "lang_show": "Show",
- "lang_title": "Title",
- "module_name": "News"
-}
\ No newline at end of file
diff --git a/modules/news/lang/en/templates/page-news.json b/modules/news/lang/en/templates/page-news.json
deleted file mode 100644
index df63658c..00000000
--- a/modules/news/lang/en/templates/page-news.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "lang_content": "Content",
- "lang_date": "Date",
- "lang_delete": "Delete",
- "lang_editNews": "Edit news",
- "lang_latestUpdate": "Latest update",
- "lang_newsIntro": "Here you have the possibility to edit the news displayed to the bwLehrpool clients.",
- "lang_newsOld": "Old News",
- "lang_save": "Save",
- "lang_show": "Show",
- "lang_title": "Title"
-}
\ No newline at end of file
diff --git a/modules/news/lang/pt/module.json b/modules/news/lang/pt/module.json
deleted file mode 100644
index e1997fce..00000000
--- a/modules/news/lang/pt/module.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "lang_activeNews": "Novidades",
- "lang_content": "Conte\u00fado",
- "lang_date": "Data",
- "lang_delete": "Excluir",
- "lang_latestUpdate": "\u00daltima Atualiza\u00e7\u00e3o",
- "lang_newsIntro": "Aqui voc\u00ea tem a possibilidade de editar as novidades que s\u00e3o mostradas para os clientes do bwLehrpool.",
- "lang_newsOld": "Antigas",
- "lang_save": "Salvar",
- "lang_show": "Mostrar",
- "lang_title": "T\u00edtulo",
- "module_name": "Novidades"
-}
\ No newline at end of file
diff --git a/modules/news/page.inc.php b/modules/news/page.inc.php
deleted file mode 100644
index 9bbadc4f..00000000
--- a/modules/news/page.inc.php
+++ /dev/null
@@ -1,167 +0,0 @@
-newsId = false;
- $this->newsTitle = false;
- $this->newsContent = false;
- $this->newsDate = false;
- } elseif ($action === 'show') {
- // show news
- if (!$this->loadNews(Request::any('newsid'))) {
- Message::addError('news-empty');
- }
- } elseif ($action === 'save') {
- // save to DB
- if (!$this->saveNews()) {
- // re-set the fields we got
- Request::post('news-title') ? $this->newsTitle = Request::post('news-title') : $this->newsTitle = false;
- Request::post('news-content') ? $this->newsContent = Request::post('news-content') : $this->newsContent = false;
- } else {
- Message::addSuccess('news-save-success');
- Util::redirect('?do=News');
- }
- } elseif ($action === 'delete') {
- // delete it
- $this->delNews(Request::post('newsid'));
- } else {
- // unknown action, redirect user
- Message::addError('invalid-action', $action);
- Util::redirect('?do=News');
- }
- }
-
- /**
- * Implementation of the abstract doRender function
- *
- * Fetch the list of news from the database and paginate it.
- *
- */
- protected function doRender()
- {
- // fetch the list of the older news
- $lines = array();
- $paginate = new Paginate("SELECT newsid, dateline, title, content FROM news ORDER BY dateline DESC", 10);
- $res = $paginate->exec();
- while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
- $row['date'] = date('d.m.Y H:i', $row['dateline']);
-
- if ($row['newsid'] == $this->newsId) $row['active'] = "active";
- $lines[] = $row;
- }
- $paginate->render('page-news', array(
- 'token' => Session::get('token'),
- 'latestDate' => ($this->newsDate ? date('d.m.Y H:i', $this->newsDate) : '--'),
- 'latestContent' => $this->newsContent,
- 'latestTitle' => $this->newsTitle,
- 'list' => $lines ));
-
- }
- /**
- * Loads the news with the given ID into the form.
- *
- * @param int $newsId ID of the news to be shown.
- * @return boolean true if loading that news worked
- *
- */
- private function loadNews($newsId)
- {
- // check to see if we need to request a specific newsid
- if ($newsId !== false) {
- $row = Database::queryFirst("SELECT newsid, title, content, dateline FROM news WHERE newsid = :newsid LIMIT 1", array(
- 'newsid' => $newsId
- ));
- } else {
- $row = Database::queryFirst("SELECT newsid, title, content, dateline FROM news ORDER BY dateline DESC LIMIT 1");
- }
-
- // fetch the news to be shown
- if ($row !== false) {
- $this->newsId = $row['newsid'];
- $this->newsTitle = $row['title'];
- $this->newsContent = $row['content'];
- $this->newsDate = $row['dateline'];
- }
- return $row !== false;
- }
-
- /**
- * Save the given $newsTitle and $newsContent as POST'ed into the database.
- *
- */
- private function saveNews()
- {
- // check if news content were set by the user
- $newsTitle = Request::post('news-title');
- $newsContent = Request::post('news-content');
- if ($newsContent !== '' && $newsTitle !== '') {
- // we got title and content, save it to DB
- Database::exec("INSERT INTO news (dateline, title, content) VALUES (:dateline, :title, :content)", array(
- 'dateline' => time(),
- 'title' => $newsTitle,
- 'content' => $newsContent
- ));
- return true;
- } else {
- Message::addError('empty-field');
- return false;
- }
- }
-
- /**
- * Delete the news entry with ID $newsId
- *
- * @param int $newsId ID of the entry to be deleted.
- */
- private function delNews($newsId)
- {
- // sanity check: is newsId even numeric?
- if (!is_numeric($newsId)) {
- Message::addError('value-invalid', 'newsid', $newsId);
- } else {
- // check passed - do delete
- Database::exec("DELETE FROM news WHERE newsid = :newsid LIMIT 1", array(
- 'newsid' => $newsId
- ));
- Message::addSuccess('news-del-success');
- }
- Util::redirect('?do=News');
- }
-
-}
\ No newline at end of file
diff --git a/modules/news/templates/page-news.html b/modules/news/templates/page-news.html
deleted file mode 100644
index 8e400498..00000000
--- a/modules/news/templates/page-news.html
+++ /dev/null
@@ -1,57 +0,0 @@
-{{lang_listObtained}}
-
-
-
-
-
- {{lang_editNews}}
-
-
-
-{{lang_newsIntro}}
- -
-
diff --git a/modules/serversetup/config.json b/modules/serversetup/config.json
deleted file mode 100644
index f2abe27c..00000000
--- a/modules/serversetup/config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "category":"main.settings",
- "enabled":"true"
-}
diff --git a/modules/serversetup/lang/de/templates/ipaddress.json b/modules/serversetup/lang/de/templates/ipaddress.json
deleted file mode 100644
index eb3d34d3..00000000
--- a/modules/serversetup/lang/de/templates/ipaddress.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "lang_active": "Aktiv",
- "lang_bootAddress": "Boot-Adresse des Servers",
- "lang_bootHint": "Das Bootmen\u00fc muss nach einer \u00c4nderung der IP-Adresse neu generiert werden. In der Regel geschieht dies automatisch, der Vorgang kann in der Sektion Bootmen\u00fc allerdings auch manuell ausgel\u00f6st werden.",
- "lang_chooseIP": "Bitte w\u00e4hlen Sie die IP-Adresse, \u00fcber die der Server von den Clients zum Booten angesprochen werden soll.",
- "lang_set": "Setzen"
-}
\ No newline at end of file
diff --git a/modules/serversetup/lang/de/templates/ipxe.json b/modules/serversetup/lang/de/templates/ipxe.json
deleted file mode 100644
index edce0b5e..00000000
--- a/modules/serversetup/lang/de/templates/ipxe.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "lang_bootBehavior": "Standard-Bootverhalten",
- "lang_bootInfo": "Hier k\u00f6nnen Anpassungen am Erscheinungsbild des Bootmen\u00fcs vorgenommen werden.",
- "lang_bootMenu": "Bootmen\u00fc",
- "lang_bootMenuCreate": "Bootmen\u00fc erzeugen",
- "lang_close": "Schlie\u00dfen",
- "lang_compile": "Kompilieren",
- "lang_customEntry": "Eigener Eintrag",
- "lang_example": "Beispiel",
- "lang_localHDD": "Lokale HDD",
- "lang_masterPassword": "Master-Passwort",
- "lang_masterPasswordHelp": "Das Master-Passwort wird ben\u00f6tigt, um einen Booteintrag direkt am Client tempor\u00e4r durch Dr\u00fccken der Tab-Taste zu editieren. Da dies f\u00fcr Manipulation am Client genutzt werden kann, sollte diese Funktion unbedingt mit einem Passwort gesch\u00fctzt werden.",
- "lang_menuCustom": "Benutzerdefinierter Men\u00fczusatz",
- "lang_menuCustomHint1": "Hier haben Sie die M\u00f6glichkeit, eigenen Men\u00fc-Code zum angezeigten PXE-Men\u00fc hinzuzuf\u00fcgen, um z.B. auf weitere PXE-Server zu verweisen. Das Format entspricht dem syslinux Men\u00fcformat.",
- "lang_menuCustomHint2": "Sie k\u00f6nnen ein oder mehrere Eintr\u00e4ge erzeugen. Wenn Sie einen Eintrag erzeugen m\u00f6chten, der automatisch gestartet wird, wenn der Benutzer keine Auswahl t\u00e4tigt, vergeben Sie als",
- "lang_menuCustomHint3": "und w\u00e4hlen Sie als Standard-Bootverhalten ebenfalls custom.",
- "lang_menuDisplayTime": "Anzeigedauer des Men\u00fcs",
- "lang_seconds": "Sekunden"
-}
\ No newline at end of file
diff --git a/modules/serversetup/lang/de/templates/ipxe_update.json b/modules/serversetup/lang/de/templates/ipxe_update.json
deleted file mode 100644
index b984de19..00000000
--- a/modules/serversetup/lang/de/templates/ipxe_update.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "lang_generationFailed": "Erzeugen des Bootmen\u00fcs fehlgeschlagen. Der Netzwerkboot von bwLehrpool wird wahrscheinlich nicht funktionieren. Wenn Sie den Fehler nicht selbst beheben k\u00f6nnen, melden Sie bitte obenstehende Fehlermeldung an das bwLehrpool-Projekt.",
- "lang_menuGeneration": "Erzeugen des Bootmen\u00fcs"
-}
\ No newline at end of file
diff --git a/modules/serversetup/lang/en/module.json b/modules/serversetup/lang/en/module.json
deleted file mode 100644
index c7c06098..00000000
--- a/modules/serversetup/lang/en/module.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "lang_active": "Active",
- "lang_bootAddress": "Boot Address of the Server",
- "lang_bootBehavior": "Default Boot Behavior",
- "lang_bootHint": "The Boot menu must be recreated after changing the IP address. Usually this is done automatically, but the process can also be triggered manually in the section of the boot menu.",
- "lang_bootInfo": "Here adjustments can be made to the appearance of the boot menu.",
- "lang_bootMenu": "Boot Menu",
- "lang_bootMenuCreate": "Create Boot Menu",
- "lang_cancel": "Cancel",
- "lang_chooseIP": "Please select the IP address that the client server will use to boot.",
- "lang_close": "Close",
- "lang_compile": "Compile",
- "lang_compilingIpxe": "Compiling iPXE",
- "lang_customScript": "Custom Script",
- "lang_download": "Download",
- "lang_example": "Example",
- "lang_extension": "Extension",
- "lang_ipxeInfo": "Here it is possible to compile and download iPXE for USB using a custom script.",
- "lang_ipxeWarning": "If this is your first time compiling, it may take 1 to 4 minutes to finish.",
- "lang_loading": "Loading",
- "lang_localHDD": "Local HDD",
- "lang_menuCustom": "Custom Extra Menu",
- "lang_menuCustomHint1": "Here you have the opportunity to add your own menu code to the displayed PXE menu, eg to refer to other PXE server. The format corresponds to the syslinux menu format.",
- "lang_menuCustomHint2": "You can create one or more entries. If you want to create an entry that starts automatically when the user makes a selection, assign as",
- "lang_menuCustomHint3": "and select as the default boot behavior my-entry as well.",
- "lang_menuDisplayTime": "Menu Display Time",
- "lang_mountIpxe": "Mount iPXE",
- "lang_restoreDefault": "Restore Default",
- "lang_saveScript": "Save Script",
- "lang_seconds": "Seconds",
- "lang_set": "Set",
- "lang_success": "Successfully create file:",
- "module_name": "iPXE \/ Boot Menu"
-}
\ No newline at end of file
diff --git a/modules/serversetup/lang/en/templates/ipaddress.json b/modules/serversetup/lang/en/templates/ipaddress.json
deleted file mode 100644
index 699aeacc..00000000
--- a/modules/serversetup/lang/en/templates/ipaddress.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "lang_active": "Active",
- "lang_bootAddress": "Boot Address of the Server",
- "lang_bootHint": "The Boot menu must be recreated after changing the IP address. Usually this is done automatically, but the process can also be triggered manually in the section of the boot menu.",
- "lang_chooseIP": "Please select the IP address that the client server will use to boot.",
- "lang_set": "Set"
-}
\ No newline at end of file
diff --git a/modules/serversetup/lang/en/templates/ipxe.json b/modules/serversetup/lang/en/templates/ipxe.json
deleted file mode 100644
index 70c17f43..00000000
--- a/modules/serversetup/lang/en/templates/ipxe.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "lang_bootBehavior": "Default Boot Behavior",
- "lang_bootInfo": "Here adjustments can be made to the appearance of the boot menu.",
- "lang_bootMenu": "Boot Menu",
- "lang_bootMenuCreate": "Create Boot Menu",
- "lang_cancel": "Cancel",
- "lang_close": "Close",
- "lang_compile": "Compile",
- "lang_compilingIpxe": "Compiling iPXE",
- "lang_customEntry": "Custom entry",
- "lang_customScript": "Custom script",
- "lang_download": "Download",
- "lang_example": "Example",
- "lang_extension": "Extension",
- "lang_ipxeInfo": "Here it is possible to compile iPXE using a custom script.",
- "lang_ipxeWarning": "If this is your first time compiling, it may take 1 to 4 minutes to finish.",
- "lang_loading": "Loading",
- "lang_localHDD": "Local HDD",
- "lang_masterPassword": "Master password",
- "lang_masterPasswordHelp": "The master password is required to edit a boot menu entry. This should be set for security reasons.",
- "lang_menuCustom": "Custom Extra Menu",
- "lang_menuCustomHint1": "Here you have the opportunity to add your own menu code to the displayed PXE menu, eg to refer to other PXE server. The format corresponds to the syslinux menu format.",
- "lang_menuCustomHint2": "You can create one or more entries. If you want to create an entry that starts automatically when the user makes a selection, assign as",
- "lang_menuCustomHint3": "and select as the default boot behavior custom as well.",
- "lang_menuDisplayTime": "Menu Display Time",
- "lang_mountIpxe": "Mount iPXE",
- "lang_restoreDefault": "Restore Default",
- "lang_saveScript": "Save Script",
- "lang_seconds": "Seconds",
- "lang_success": "Successfully create file:"
-}
diff --git a/modules/serversetup/lang/en/templates/ipxe_update.json b/modules/serversetup/lang/en/templates/ipxe_update.json
deleted file mode 100644
index b33b12dd..00000000
--- a/modules/serversetup/lang/en/templates/ipxe_update.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "lang_generationFailed": "Could not generate boot menu. The bwLehrpool-System might not work properly. If you can't fix the problem, please report the error message above to the bwLehrpool project.",
- "lang_menuGeneration": "Generating boot menu..."
-}
\ No newline at end of file
diff --git a/modules/serversetup/lang/pt/module.json b/modules/serversetup/lang/pt/module.json
deleted file mode 100644
index e0e5a2b6..00000000
--- a/modules/serversetup/lang/pt/module.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- "lang_active": "Ativo",
- "lang_bootAddress": "Endere\u00e7o Boot do Servidor",
- "lang_bootBehavior": "Comportamento Padr\u00e3o de Boot",
- "lang_bootHint": "O menu de boot deve ser recriado ap\u00f3s alterar o endere\u00e7o IP. Geralmente isso \u00e9 feito automaticamente, mas o processo tamb\u00e9m pode ser acionado manualmente na se\u00e7\u00e3o do menu de boot.",
- "lang_bootInfo": "Aqui ajustes podem ser feitos na apar\u00eancia do menu de boot.",
- "lang_bootMenu": "Menu de Boot",
- "lang_bootMenuCreate": "Criar Menu de Boot",
- "lang_cancel": "Cancelar",
- "lang_chooseIP": "Por favor, selecione o endere\u00e7o IP que o servidor do cliente utilizar\u00e1 realizar o boot.",
- "lang_close": "Fechar",
- "lang_compile": "Compilar",
- "lang_compileIso": "Compilar .iso",
- "lang_compileKkpxe": "Compilar .kkpxe",
- "lang_compileUsb": "Compilar .usb",
- "lang_compilingIpxe": "Compilando iPXE",
- "lang_customScript": "Script Customizado",
- "lang_download": "Baixar",
- "lang_example": "Exemplo",
- "lang_extension": "Extens\u00e3o",
- "lang_ipxeAdv": "Gerar iPXE no Modo Avan\u00e7ado",
- "lang_ipxeInfo": "Aqui \u00e9 poss\u00edvel compilar e baixar o iPXE utilizando um script customiz\u00e1vel.",
- "lang_ipxeSmp": "Gerar iPXE no Modo Simples",
- "lang_ipxeSmpInfo": "Aqui voc\u00ea pode escolher gerar o iPXE escolhendo apenas uma das extens\u00f5es abaixo",
- "lang_ipxeWarning": "Se esta for a primeira vez compilando, poder\u00e1 levar entre 1 e 4 minutos para que termine.",
- "lang_loading": "Carregando",
- "lang_localHDD": "HDD Local",
- "lang_menuCustom": "Menu Adicional Customizado",
- "lang_menuCustomHint1": "Aqui voc\u00ea tem a oportunidade de adicionar seu pr\u00f3prio c\u00f3digo de menu para o menu PXE exibido, por exemplo, para se referir a outro servidor PXE. O formato corresponde ao formato de menu syslinux.",
- "lang_menuCustomHint2": "Voc\u00ea pode criar uma ou mais entradas. Se voc\u00ea quiser criar uma entrada que \u00e9 iniciada automaticamente quando o usu\u00e1rio faz uma sele\u00e7\u00e3o, atribua como",
- "lang_menuCustomHint3": "e selecione como o comportamento de boot padr\u00e3o tamb\u00e9m my-entry.",
- "lang_menuDisplayTime": "Tempo de Exibi\u00e7\u00e3o do Menu",
- "lang_mountIpxe": "Montar iPXE",
- "lang_restoreDefault": "Restaurar Padr\u00e3o",
- "lang_saveScript": "Salvar Script",
- "lang_seconds": "Segundos",
- "lang_set": "Definir",
- "lang_success": "Arquivo criado com sucesso:",
- "module_name": "iPXE \/ Boot Menu"
-}
\ No newline at end of file
diff --git a/modules/serversetup/lang/pt/templates/ipxe-adv.json b/modules/serversetup/lang/pt/templates/ipxe-adv.json
deleted file mode 100644
index 19d120ad..00000000
--- a/modules/serversetup/lang/pt/templates/ipxe-adv.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "lang_bootBehavior": "Comportamento Padr\u00e3o de Boot",
- "lang_bootInfo": "Aqui ajustes podem ser feitos na apar\u00eancia do menu de boot.",
- "lang_bootMenu": "Menu de Boot",
- "lang_bootMenuCreate": "Criar Menu de Boot",
- "lang_cancel": "Cancelar",
- "lang_close": "Fechar",
- "lang_compile": "Compilar",
- "lang_compilingIpxe": "Compilando iPXE",
- "lang_customScript": "Script Customizado",
- "lang_download": "Baixar",
- "lang_example": "Exemplo",
- "lang_extension": "Extens\u00e3o",
- "lang_ipxeInfo": "Aqui \u00e9 poss\u00edvel compilar e baixar o iPXE utilizando um script customiz\u00e1vel.",
- "lang_ipxeWarning": "Se esta for a primeira vez compilando, poder\u00e1 levar entre 1 e 4 minutos para que termine.",
- "lang_loading": "Carregando",
- "lang_localHDD": "HDD Local",
- "lang_menuCustom": "Menu Adicional Customizado",
- "lang_menuCustomHint1": "Aqui voc\u00ea tem a oportunidade de adicionar seu pr\u00f3prio c\u00f3digo de menu para o menu PXE exibido, por exemplo, para se referir a outro servidor PXE. O formato corresponde ao formato de menu syslinux.",
- "lang_menuCustomHint2": "Voc\u00ea pode criar uma ou mais entradas. Se voc\u00ea quiser criar uma entrada que \u00e9 iniciada automaticamente quando o usu\u00e1rio faz uma sele\u00e7\u00e3o, atribua como",
- "lang_menuCustomHint3": "e selecione como o comportamento de boot padr\u00e3o tamb\u00e9m my-entry.",
- "lang_menuDisplayTime": "Tempo de Exibi\u00e7\u00e3o do Menu",
- "lang_mountIpxe": "Montar iPXE",
- "lang_restoreDefault": "Restaurar Padr\u00e3o",
- "lang_saveScript": "Salvar Script",
- "lang_seconds": "Segundos",
- "lang_success": "Arquivo criado com sucesso:"
-}
diff --git a/modules/serversetup/page.inc.php b/modules/serversetup/page.inc.php
deleted file mode 100644
index 289bf3d5..00000000
--- a/modules/serversetup/page.inc.php
+++ /dev/null
@@ -1,194 +0,0 @@
-currentMenu = Property::getBootMenu();
-
- if(Request::get('download') !== false){
- $this->downloadIpxe(Request::get('download'));
- }
-
- if(Request::get('defaultIpxe') !== false){
- $this->defaultIpxe(Request::get('defaultIpxe'));
- }
-
- $action = Request::post('action');
-
- if ($action === false) {
- $this->currentAddress = Property::getServerIp();
- $this->getLocalAddresses();
- }
-
- if ($action === 'ip') {
- // New address is to be set
- $this->getLocalAddresses();
- $this->updateLocalAddress();
- }
-
- if ($action === 'ipxe') {
- // iPXE stuff changes
- $this->updatePxeMenu();
- }
-
- if($action === 'save-script') {
- // Save new iPXE script
- $this->updateIpxeScript();
- }
-
- if($action === 'default-script') {
- // Restore iPXE script to default
- $this->defaultIpxe();
- }
- }
-
- protected function doRender()
- {
- Render::setTitle(Dictionary::translate('lang_serverConfiguration'));
-
- $taskid = Request::any('taskid');
- if ($taskid !== false && Taskmanager::isTask($taskid)) {
- Render::addTemplate('ipxe_update', array('taskid' => $taskid));
- }
-
- if (Request::get('advanced', 'false', 'string') === 'false') {
- Render::addTemplate('ipxe-smp');
- } else {
- Render::addTemplate('ipaddress', array(
- 'ips' => $this->taskStatus['data']['addresses']
- ));
- $data = $this->currentMenu;
- if (!isset($data['defaultentry']))
- $data['defaultentry'] = 'net';
- if ($data['defaultentry'] === 'net')
- $data['active-net'] = 'checked';
- if ($data['defaultentry'] === 'hdd')
- $data['active-hdd'] = 'checked';
- if ($data['defaultentry'] === 'custom')
- $data['active-custom'] = 'checked';
- //There is no $this->username and no pxe.embed, why do we need this?
- //Page won't load with lines below uncommented
- //$data['username'] = $this->username;
- //$data['script'] = file_get_contents("/opt/taskmanager/data/pxe.embed");
- Render::addTemplate('ipxe-adv', $data);
- }
- }
-
- // -----------------------------------------------------------------------------------------------
-
- private function getLocalAddresses()
- {
- $this->taskStatus = Taskmanager::submit('LocalAddressesList', array());
-
- if ($this->taskStatus === false) {
- $this->taskStatus['data']['addresses'] = false;
- return false;
- }
-
- if ($this->taskStatus['statusCode'] === TASK_WAITING) { // TODO: Async if just displaying
- $this->taskStatus = Taskmanager::waitComplete($this->taskStatus['id']);
- }
-
- $sortIp = array();
- foreach (array_keys($this->taskStatus['data']['addresses']) as $key) {
- $item = & $this->taskStatus['data']['addresses'][$key];
- if (!isset($item['ip']) || !preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $item['ip']) || substr($item['ip'], 0, 4) === '127.') {
- unset($this->taskStatus['data']['addresses'][$key]);
- continue;
- }
- if ($this->currentAddress === $item['ip']) {
- $item['default'] = true;
- }
- $sortIp[] = $item['ip'];
- }
- unset($item);
- array_multisort($sortIp, SORT_STRING, $this->taskStatus['data']['addresses']);
- return true;
- }
-
- private function updateLocalAddress()
- {
- $newAddress = Request::post('ip', 'none');
- $valid = false;
- foreach ($this->taskStatus['data']['addresses'] as $item) {
- if ($item['ip'] !== $newAddress)
- continue;
- $valid = true;
- break;
- }
- if ($valid) {
- Property::setServerIp($newAddress);
- global $tidIpxe;
- if (isset($tidIpxe) && $tidIpxe !== false)
- Util::redirect('?do=ServerSetup&taskid=' . $tidIpxe);
- } else {
- Message::addError('invalid-ip', $newAddress);
- }
- Util::redirect();
- }
-
- private function updatePxeMenu()
- {
- $timeout = Request::post('timeout', 10);
- if ($timeout === '')
- $timeout = 0;
- if (!is_numeric($timeout) || $timeout < 0) {
- Message::addError('value-invalid', 'timeout', $timeout);
- }
- $this->currentMenu['defaultentry'] = Request::post('defaultentry', 'net');
- $this->currentMenu['timeout'] = $timeout;
- $this->currentMenu['custom'] = Request::post('custom', '');
- $this->currentMenu['masterpasswordclear'] = Request::post('masterpassword', '');
- if (empty($this->currentMenu['masterpasswordclear']))
- $this->currentMenu['masterpassword'] = 'invalid';
- else
- $this->currentMenu['masterpassword'] = Crypto::hash6($this->currentMenu['masterpasswordclear']);
- Property::setBootMenu($this->currentMenu);
- $id = Trigger::ipxe();
- Util::redirect('?do=ServerSetup&taskid=' . $id);
- }
-
- private function downloadIpxe($ipxe){
- $file = '/opt/taskmanager/data/ipxe/src/bin/ipxe.' . $ipxe;
- if (file_exists($file)) {
- header('Content-Description: File Transfer');
- header('Content-Type: application/octet-stream');
- header('Content-Disposition: attachment; filename='.basename($file));
- header('Expires: 0');
- header('Cache-Control: must-revalidate');
- header('Pragma: public');
- header('Content-Length: ' . filesize($file));
- ob_clean();
- flush();
- readfile($file);
- exit();
- }
- }
-
- private function updateIpxeScript(){
- $newScript = Request::post('custom-script');
- file_put_contents("/opt/taskmanager/data/pxe.embed",$newScript);
- Util::redirect('?do=ServerSetup');
- }
-
- private function defaultIpxe(){
- $default = file_get_contents("/opt/taskmanager/data/pxe_default.embed");
- $default = str_replace("{{ip}}", "http://" . Property::getServerIp(), $default);
- file_put_contents("/opt/taskmanager/data/pxe.embed",$default);
- Util::redirect('?do=ServerSetup');
- }
-}
diff --git a/modules/serversetup/templates/ipaddress.html b/modules/serversetup/templates/ipaddress.html
deleted file mode 100644
index e4c1fba9..00000000
--- a/modules/serversetup/templates/ipaddress.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{{lang_ipxeSmp}}
-
- {{lang_newsOld}}
-
-
-
-
-
-
-
-
diff --git a/modules/serversetup/templates/ipxe-adv.html b/modules/serversetup/templates/ipxe-adv.html
deleted file mode 100644
index 00e9fd3a..00000000
--- a/modules/serversetup/templates/ipxe-adv.html
+++ /dev/null
@@ -1,149 +0,0 @@
-
- {{lang_bootAddress}}
-
-
-
-- {{lang_chooseIP}} -
- -
-
-
-
-
-
- {{lang_mountIpxe}}
-
-
-
- - -
-
-{{lang_ipxeInfo}}
- - -- - -
-
-
-
-
-
diff --git a/modules/serversetup/templates/ipxe-smp.html b/modules/serversetup/templates/ipxe-smp.html
deleted file mode 100644
index d126710c..00000000
--- a/modules/serversetup/templates/ipxe-smp.html
+++ /dev/null
@@ -1,62 +0,0 @@
-{{lang_ipxeAdv}}
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/serversetup/templates/ipxe_update.html b/modules/serversetup/templates/ipxe_update.html
deleted file mode 100644
index 9c598667..00000000
--- a/modules/serversetup/templates/ipxe_update.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
- {{lang_mountIpxe}}
-
-
-
-
-{{lang_ipxeSmpInfo}}
- - --
-
-
-
diff --git a/modules/session/config.json b/modules/session/config.json
deleted file mode 100644
index 4da67ef8..00000000
--- a/modules/session/config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "enabled":"true"
-}
diff --git a/modules/session/lang/de/templates/page-login.json b/modules/session/lang/de/templates/page-login.json
deleted file mode 100644
index 03576a07..00000000
--- a/modules/session/lang/de/templates/page-login.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "lang_enter": "Anmeldung",
- "lang_login": "Anmelden",
- "lang_password": "Passwort",
- "lang_register": "Registrieren",
- "lang_rememberID": "Angemeldet bleiben",
- "lang_username": "Benutzerkennung"
-}
\ No newline at end of file
diff --git a/modules/session/lang/en/module.json b/modules/session/lang/en/module.json
deleted file mode 100644
index 6df26f22..00000000
--- a/modules/session/lang/en/module.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "lang_enter": "Enter",
- "lang_login": "Login",
- "lang_password": "Password",
- "lang_register": "Register",
- "lang_rememberID": "Remember User",
- "lang_username": "Username"
-}
\ No newline at end of file
diff --git a/modules/session/lang/en/templates/page-login.json b/modules/session/lang/en/templates/page-login.json
deleted file mode 100644
index 4b192a7a..00000000
--- a/modules/session/lang/en/templates/page-login.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "lang_enter": "Enter",
- "lang_login": "Login",
- "lang_password": "Password",
- "lang_register": "Register",
- "lang_rememberID": "Remember ID",
- "lang_username": "Username"
-}
\ No newline at end of file
diff --git a/modules/session/lang/pt/module.json b/modules/session/lang/pt/module.json
deleted file mode 100644
index 3d1e19eb..00000000
--- a/modules/session/lang/pt/module.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "lang_enter": "Entrar",
- "lang_login": "Entrar",
- "lang_password": "Senha",
- "lang_register": "Registrar",
- "lang_rememberID": "Lembrar Usu\u00e1rio",
- "lang_username": "Nome de Usu\u00e1rio"
-}
\ No newline at end of file
diff --git a/modules/session/page.inc.php b/modules/session/page.inc.php
deleted file mode 100644
index ef135f9d..00000000
--- a/modules/session/page.inc.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
- {{lang_menuGeneration}}
-
-
-{{lang_menuGeneration}}
-
- {{lang_enter}}
- - - - - {{lang_register}} - - \ No newline at end of file diff --git a/modules/statistics/config.json b/modules/statistics/config.json deleted file mode 100644 index b0123727..00000000 --- a/modules/statistics/config.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "category":"main.status", - "enabled":"true", - "permission":"0" -} diff --git a/modules/statistics/lang/de/module.json b/modules/statistics/lang/de/module.json deleted file mode 100644 index 35a62cce..00000000 --- a/modules/statistics/lang/de/module.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "module_name": "Client-Statistiken", - "page_title": "Client-Statistiken" -} diff --git a/modules/statistics/lang/de/templates/clientlist.json b/modules/statistics/lang/de/templates/clientlist.json deleted file mode 100644 index a1022e69..00000000 --- a/modules/statistics/lang/de/templates/clientlist.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "lang_address": "Adresse", - "lang_clientList": "Liste ausgew\u00e4hlter Rechner", - "lang_cpuModel": "CPU", - "lang_gbRam": "RAM", - "lang_kvmSupport": "64\u2009Bit G\u00e4ste", - "lang_lastSeen": "Zuletzt gesehen", - "lang_machine": "Rechner", - "lang_machineIdle": "Der Rechner ist eingeschaltet und wird zur Zeit nicht benutzt", - "lang_machineOccupied": "Der Rechner ist eingeschaltet und wird benutzt", - "lang_machineOff": "Der Rechner ist ausgeschaltet, oder hat kein bwLehrpool gebootet", - "lang_realCores": "Kerne", - "lang_tmpGb": "HDD-Temp" -} \ No newline at end of file diff --git a/modules/statistics/lang/de/templates/cpumodels.json b/modules/statistics/lang/de/templates/cpumodels.json deleted file mode 100644 index 85cf517f..00000000 --- a/modules/statistics/lang/de/templates/cpumodels.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "lang_cpuCores": "CPU-Kerne", - "lang_modelCount": "Anzahl", - "lang_modelName": "Modellname", - "lang_modelStats": "PC-Modelle" -} \ No newline at end of file diff --git a/modules/statistics/lang/de/templates/id44.json b/modules/statistics/lang/de/templates/id44.json deleted file mode 100644 index e2660f20..00000000 --- a/modules/statistics/lang/de/templates/id44.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "lang_machineCount": "Anzahl", - "lang_partitionSize": "Gr\u00f6\u00dfe", - "lang_tempPartStats": "Tempor\u00e4re Partition" -} \ No newline at end of file diff --git a/modules/statistics/lang/de/templates/kvmstate.json b/modules/statistics/lang/de/templates/kvmstate.json deleted file mode 100644 index 3e8f1a96..00000000 --- a/modules/statistics/lang/de/templates/kvmstate.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "lang_kvmState": "Status", - "lang_kvmStats": "64\u2009Bit Gast-Support", - "lang_machineCount": "Anzahl" -} \ No newline at end of file diff --git a/modules/statistics/lang/de/templates/machine-hdds.json b/modules/statistics/lang/de/templates/machine-hdds.json deleted file mode 100644 index f2f26baf..00000000 --- a/modules/statistics/lang/de/templates/machine-hdds.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "lang_hdds": "Festplatten", - "lang_hours": "Stunden", - "lang_modelNo": "Modell", - "lang_partName": "Name", - "lang_partSize": "Gr\u00f6\u00dfe", - "lang_partType": "Typ", - "lang_pendingSectors": "Potentiell defekte Sektoren", - "lang_powerOnTime": "Betriebszeit", - "lang_reallocatedSectors": "Defekte Sektoren", - "lang_serialNo": "Serien-Nr", - "lang_total": "Gesamt" -} \ No newline at end of file diff --git a/modules/statistics/lang/de/templates/machine-main.json b/modules/statistics/lang/de/templates/machine-main.json deleted file mode 100644 index 47c3e266..00000000 --- a/modules/statistics/lang/de/templates/machine-main.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "lang_64bitSupport": "64\u2009Bit Gast-Support", - "lang_cores": "Kerne", - "lang_cpuModel": "CPU-Modell", - "lang_firstSeen": "Erste Aktivit\u00e4t", - "lang_hardwareSummary": "Hardware", - "lang_hostname": "Hostname", - "lang_ip": "IP-Adresse", - "lang_lastBoot": "Letzter Boot", - "lang_lastSeen": "Letzte Aktivit\u00e4t", - "lang_macAddr": "MAC-Adresse", - "lang_machineIdle": "Eingeschaltet, ungenutzt", - "lang_machineOccupied": "Eingeschaltet, in Verwendung", - "lang_machineOccupiedBy": "In Verwendung durch", - "lang_machineOff": "Kein bwLehrpool gestartet", - "lang_machineSummary": "Zusammenfassung", - "lang_maximumAbbrev": "Max.", - "lang_model": "Modell", - "lang_ram": "Arbeitsspeicher", - "lang_ramSlots": "Speicher-Slots", - "lang_sockets": "Sockel", - "lang_tempPart": "Temp. Partition", - "lang_usageState": "Zustand", - "lang_uuid": "UUID", - "lang_virtualCores": "Virtuelle Kerne" -} \ No newline at end of file diff --git a/modules/statistics/lang/de/templates/machine-notes.json b/modules/statistics/lang/de/templates/machine-notes.json deleted file mode 100644 index f9df1b92..00000000 --- a/modules/statistics/lang/de/templates/machine-notes.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "lang_notes": "Anmerkungen", - "lang_save": "Speichern" -} \ No newline at end of file diff --git a/modules/statistics/lang/de/templates/machine-usage.json b/modules/statistics/lang/de/templates/machine-usage.json deleted file mode 100644 index e2c9a979..00000000 --- a/modules/statistics/lang/de/templates/machine-usage.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "lang_timebarDesc": "Visuelle Darstellung der letzten Tage. Rote Abschnitte zeigen, wann der Rechner belegt war, gr\u00fcne, wann er nicht verwendet wurde, aber eingeschaltet war. Die leicht abgedunkelten Abschnitte markieren N\u00e4chte (22 bis 8 Uhr).", - "lang_usageDetails": "Nutzungsdetails" -} \ No newline at end of file diff --git a/modules/statistics/lang/de/templates/memory.json b/modules/statistics/lang/de/templates/memory.json deleted file mode 100644 index b5fdac89..00000000 --- a/modules/statistics/lang/de/templates/memory.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "lang_machineCount": "Anzahl", - "lang_memoryStats": "Arbeitsspeicher", - "lang_ramSize": "Gr\u00f6\u00dfe" -} \ No newline at end of file diff --git a/modules/statistics/lang/de/templates/newclients.json b/modules/statistics/lang/de/templates/newclients.json deleted file mode 100644 index f1353389..00000000 --- a/modules/statistics/lang/de/templates/newclients.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "lang_machine": "Client", - "lang_newMachines": "Neue Ger\u00e4te" -} \ No newline at end of file diff --git a/modules/statistics/lang/de/templates/summary.json b/modules/statistics/lang/de/templates/summary.json deleted file mode 100644 index 30189871..00000000 --- a/modules/statistics/lang/de/templates/summary.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "lang_inUseMachines": "In Verwendung", - "lang_knownMachines": "Bekannte Clients", - "lang_onlineMachines": "Gestartete Clients", - "lang_withBadSectors": "Clients mit potentiell defekten Festplatten (mehr als 10 defekte Sektoren)" -} \ No newline at end of file diff --git a/modules/statistics/lang/de/templates/syslog.json b/modules/statistics/lang/de/templates/syslog.json deleted file mode 100644 index 960de730..00000000 --- a/modules/statistics/lang/de/templates/syslog.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "lang_details": "Details", - "lang_event": "Ereignis", - "lang_logHeadline": "Logging", - "lang_more": "Mehr", - "lang_when": "Wann" -} \ No newline at end of file diff --git a/modules/statistics/lang/en/module.json b/modules/statistics/lang/en/module.json deleted file mode 100644 index b4c6db44..00000000 --- a/modules/statistics/lang/en/module.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "module_name": "Client Statistics" -} \ No newline at end of file diff --git a/modules/statistics/lang/en/templates/clientlist.json b/modules/statistics/lang/en/templates/clientlist.json deleted file mode 100644 index ae692154..00000000 --- a/modules/statistics/lang/en/templates/clientlist.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "lang_address": "Address", - "lang_clientList": "List of selected machines", - "lang_cpuModel": "CPU", - "lang_gbRam": "RAM", - "lang_kvmSupport": "64\u2009Bit guests", - "lang_lastSeen": "Last seen", - "lang_machine": "Machine", - "lang_machineIdle": "Machine is powered on and is not used", - "lang_machineOccupied": "Machine is powered on and in use", - "lang_machineOff": "Machine is powered down, or is not running bwLehrpool", - "lang_realCores": "Cores", - "lang_tmpGb": "HDD temp" -} \ No newline at end of file diff --git a/modules/statistics/lang/en/templates/cpumodels.json b/modules/statistics/lang/en/templates/cpumodels.json deleted file mode 100644 index 864933dd..00000000 --- a/modules/statistics/lang/en/templates/cpumodels.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "lang_cpuCores": "CPU cores", - "lang_modelCount": "Count", - "lang_modelName": "Model name", - "lang_modelStats": "PC models" -} \ No newline at end of file diff --git a/modules/statistics/lang/en/templates/id44.json b/modules/statistics/lang/en/templates/id44.json deleted file mode 100644 index 0d0081a8..00000000 --- a/modules/statistics/lang/en/templates/id44.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "lang_machineCount": "Count", - "lang_partitionSize": "Size", - "lang_tempPartStats": "Temporary partition" -} \ No newline at end of file diff --git a/modules/statistics/lang/en/templates/kvmstate.json b/modules/statistics/lang/en/templates/kvmstate.json deleted file mode 100644 index b4846473..00000000 --- a/modules/statistics/lang/en/templates/kvmstate.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "lang_kvmState": "State", - "lang_kvmStats": "64\u2009Bit guest support", - "lang_machineCount": "Count" -} \ No newline at end of file diff --git a/modules/statistics/lang/en/templates/machine-hdds.json b/modules/statistics/lang/en/templates/machine-hdds.json deleted file mode 100644 index 8ce6801d..00000000 --- a/modules/statistics/lang/en/templates/machine-hdds.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "lang_hdds": "Hard disk drives", - "lang_hours": "hours", - "lang_modelNo": "Model", - "lang_partName": "Name", - "lang_partSize": "Size", - "lang_partType": "Type", - "lang_pendingSectors": "Sectors pending reallocation", - "lang_powerOnTime": "Power on time", - "lang_reallocatedSectors": "Bad sectors", - "lang_serialNo": "Serial no", - "lang_total": "Total" -} \ No newline at end of file diff --git a/modules/statistics/lang/en/templates/machine-main.json b/modules/statistics/lang/en/templates/machine-main.json deleted file mode 100644 index 1addd437..00000000 --- a/modules/statistics/lang/en/templates/machine-main.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "lang_64bitSupport": "64\u2009Bit guest support", - "lang_cores": "Cores", - "lang_cpuModel": "CPU model", - "lang_firstSeen": "First seen", - "lang_hardwareSummary": "Hardware", - "lang_hostname": "Hostname", - "lang_ip": "IP address", - "lang_lastBoot": "Last boot", - "lang_lastSeen": "Last activity", - "lang_macAddr": "MAC address", - "lang_machineIdle": "Powered on, unused", - "lang_machineOccupied": "Powered on, in use", - "lang_machineOccupiedBy": "In use by", - "lang_machineOff": "bwLehrpool not running", - "lang_machineSummary": "Summary", - "lang_maximumAbbrev": "max.", - "lang_model": "Model", - "lang_ram": "Memory", - "lang_ramSlots": "Memory slots", - "lang_sockets": "Sockets", - "lang_tempPart": "Temp. partition", - "lang_usageState": "State", - "lang_uuid": "UUID", - "lang_virtualCores": "Virtual cores" -} \ No newline at end of file diff --git a/modules/statistics/lang/en/templates/machine-notes.json b/modules/statistics/lang/en/templates/machine-notes.json deleted file mode 100644 index 7a13f28a..00000000 --- a/modules/statistics/lang/en/templates/machine-notes.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "lang_notes": "Notes", - "lang_save": "Save" -} \ No newline at end of file diff --git a/modules/statistics/lang/en/templates/machine-usage.json b/modules/statistics/lang/en/templates/machine-usage.json deleted file mode 100644 index 398996f6..00000000 --- a/modules/statistics/lang/en/templates/machine-usage.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "lang_timebarDesc": "Visual representation of the last few days. Red parts mark periods where the client was occupied, green parts where the client was idle. Dimmed parts mark nights (10pm to 8am).", - "lang_usageDetails": "Detailed usage" -} \ No newline at end of file diff --git a/modules/statistics/lang/en/templates/memory.json b/modules/statistics/lang/en/templates/memory.json deleted file mode 100644 index decdd021..00000000 --- a/modules/statistics/lang/en/templates/memory.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "lang_machineCount": "Count", - "lang_memoryStats": "Memory", - "lang_ramSize": "Size" -} \ No newline at end of file diff --git a/modules/statistics/lang/en/templates/newclients.json b/modules/statistics/lang/en/templates/newclients.json deleted file mode 100644 index f7e55f3f..00000000 --- a/modules/statistics/lang/en/templates/newclients.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "lang_machine": "Client", - "lang_newMachines": "New machines" -} \ No newline at end of file diff --git a/modules/statistics/lang/en/templates/summary.json b/modules/statistics/lang/en/templates/summary.json deleted file mode 100644 index b57c290f..00000000 --- a/modules/statistics/lang/en/templates/summary.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "lang_inUseMachines": "In use", - "lang_knownMachines": "Known clients", - "lang_onlineMachines": "Online clients", - "lang_withBadSectors": "Clients with potentially bad HDDs (more than 10 reallocated sectors)" -} \ No newline at end of file diff --git a/modules/statistics/lang/en/templates/syslog.json b/modules/statistics/lang/en/templates/syslog.json deleted file mode 100644 index 6737ca68..00000000 --- a/modules/statistics/lang/en/templates/syslog.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "lang_details": "Details", - "lang_event": "Event", - "lang_logHeadline": "Logging", - "lang_more": "More", - "lang_when": "When" -} \ No newline at end of file diff --git a/modules/statistics/page.inc.php b/modules/statistics/page.inc.php deleted file mode 100644 index faf88521..00000000 --- a/modules/statistics/page.inc.php +++ /dev/null @@ -1,792 +0,0 @@ - $uuid, - 'text' => $text - )); - Message::addSuccess('notes-saved'); - Util::redirect('?do=Statistics&uuid=' . $uuid); - } - } - - protected function doRender() - { - Render::setTitle(Dictionary::translate('lang_titleClientStatistics')); - $uuid = Request::get('uuid', false, 'string'); - if ($uuid !== false) { - $this->showMachine($uuid); - return; - } - $filter = Request::get('filter', false, 'string'); - if ($filter !== false) { - $argument = Request::get('argument', false, 'string'); - $this->showMachineList($filter, $argument); - return; - } - Render::addScriptBottom('chart.min'); - Render::openTag('div', array('class' => 'row')); - $this->showSummary(); - $this->showMemory(); - $this->showId44(); - $this->showKvmState(); - $this->showLatestMachines(); - $this->showSystemModels(); - Render::closeTag('div'); - } - - private function capChart(&$json, $cutoff, $minSlice = 0.015) - { - $total = 0; - foreach ($json as $entry) { - $total += $entry['value']; - } - if ($total === 0) - return; - $cap = ceil($total * $cutoff); - $accounted = 0; - $id = 0; - foreach ($json as $entry) { - if (($accounted >= $cap || $entry['value'] / $total < $minSlice) && $id >= 3) break; - $id++; - $accounted += $entry['value']; - } - $json = array_slice($json, 0, $id); - if ($accounted / $total < 0.99) { - $json[] = array( - 'color' => '#eee', - 'label' => 'invalid', - 'value' => ($total - $accounted) - ); - } - } - - private function showSummary() - { - $cutoff = time() - 86400 * 30; - $online = time() - 610; - $known = Database::queryFirst("SELECT Count(*) AS val FROM machine WHERE lastseen > $cutoff"); - $on = Database::queryFirst("SELECT Count(*) AS val FROM machine WHERE lastseen > $online"); - $used = Database::queryFirst("SELECT Count(*) AS val FROM machine WHERE lastseen > $online AND logintime <> 0"); - $hdd = Database::queryFirst("SELECT Count(*) AS val FROM machine WHERE badsectors > 10 AND lastseen > $cutoff"); - if ($on['val'] != 0) { - $usedpercent = round($used['val'] / $on['val'] * 100); - } else { - $usedpercent = 0; - } - $data = array( - 'known' => $known['val'], - 'online' => $on['val'], - 'used' => $used['val'], - 'usedpercent' => $usedpercent, - 'badhdd' => $hdd['val'] - ); - // Graph - $cutoff = time() - 2*86400; - $res = Database::simpleQuery("SELECT dateline, data FROM statistic WHERE typeid = '~stats' AND dateline > $cutoff ORDER BY dateline ASC"); - $labels = array(); - $points1 = array('data' => array(), 'label' => 'Online', 'fillColor' => '#efe', 'strokeColor' => '#aea', 'pointColor' => '#7e7', 'pointStrokeColor' => '#fff', 'pointHighlightFill' => '#fff', 'pointHighlightStroke' => '#7e7'); - $points2 = array('data' => array(), 'label' => 'In use', 'fillColor' => '#fee', 'strokeColor' => '#eaa', 'pointColor' => '#e77', 'pointStrokeColor' => '#fff', 'pointHighlightFill' => '#fff', 'pointHighlightStroke' => '#e77'); - $sum = 0; - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { - $x = explode('#', $row['data']); - if ($sum === 0) { - $labels[] = date('H:i', $row['dateline']); - } else { - $x[1] = max($x[1], array_pop($points1['data'])); - $x[2] = max($x[2], array_pop($points2['data'])); - } - $points1['data'][] = $x[1]; - $points2['data'][] = $x[2]; - $sum++; - if ($sum === 12) { - $sum = 0; - } - } - $data['json'] = json_encode(array('labels' => $labels, 'datasets' => array($points1, $points2))); - // Draw - Render::addTemplate('summary', $data); - } - - private function showSystemModels() - { - global $STATS_COLORS; - $res = Database::simpleQuery("SELECT systemmodel, Round(AVG(realcores)) AS cores, Count(*) AS `count` FROM machine" - . " GROUP BY systemmodel ORDER BY `count` DESC, systemmodel ASC"); - $lines = array(); - $json = array(); - $id = 0; - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { - if (empty($row['systemmodel'])) continue; - settype($row['count'], 'integer'); - $row['id'] = 'systemid' . $id; - $row['urlsystemmodel'] = urlencode($row['systemmodel']); - $lines[] = $row; - $json[] = array( - 'color' => $STATS_COLORS[$id % count($STATS_COLORS)], - 'label' => 'systemid' . $id, - 'value' => $row['count'] - ); - ++$id; - } - $this->capChart($json, 0.92); - Render::addTemplate('cpumodels', array('rows' => $lines, 'json' => json_encode($json))); - } - - private function showMemory() - { - global $STATS_COLORS, $SIZE_RAM; - $res = Database::simpleQuery("SELECT mbram, Count(*) AS `count` FROM machine GROUP BY mbram"); - $lines = array(); - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { - $gb = ceil($row['mbram'] / 1024); - for ($i = 1; $i < count($SIZE_RAM); ++$i) { - if ($SIZE_RAM[$i] < $gb) continue; - if ($SIZE_RAM[$i] - $gb >= $gb - $SIZE_RAM[$i-1]) --$i; - $gb = $SIZE_RAM[$i]; - break; - } - if (isset($lines[$gb])) { - $lines[$gb] += $row['count']; - } else { - $lines[$gb] = $row['count']; - } - } - asort($lines); - $data = array('rows' => array()); - $json = array(); - $id = 0; - foreach (array_reverse($lines, true) as $k => $v) { - $data['rows'][] = array('gb' => $k, 'count' => $v, 'class' => $this->ramColorClass($k * 1024)); - $json[] = array( - 'color' => $STATS_COLORS[$id % count($STATS_COLORS)], - 'label' => (string)$k, - 'value' => $v - ); - ++$id; - } - $this->capChart($json, 0.92); - $data['json'] = json_encode($json); - Render::addTemplate('memory', $data); - } - - private function showKvmState() - { - $colors = array('UNKNOWN' => '#666', 'UNSUPPORTED' => '#ea5', 'DISABLED' => '#e55', 'ENABLED' => '#6d6'); - $res = Database::simpleQuery("SELECT kvmstate, Count(*) AS `count` FROM machine GROUP BY kvmstate ORDER BY `count` DESC"); - $lines = array(); - $json = array(); - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { - $lines[] = $row; - $json[] = array( - 'color' => isset($colors[$row['kvmstate']]) ? $colors[$row['kvmstate']] : '#000', - 'label' => $row['kvmstate'], - 'value' => $row['count'] - ); - } - Render::addTemplate('kvmstate', array('rows' => $lines, 'json' => json_encode($json))); - } - - private function showId44() - { - global $STATS_COLORS, $SIZE_ID44; - $res = Database::simpleQuery("SELECT id44mb, Count(*) AS `count` FROM machine GROUP BY id44mb"); - $lines = array(); - $total = 0; - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { - $total += $row['count']; - $gb = ceil($row['id44mb'] / 1024); - for ($i = 1; $i < count($SIZE_ID44); ++$i) { - if ($SIZE_ID44[$i] < $gb) continue; - if ($SIZE_ID44[$i] - $gb >= $gb - $SIZE_ID44[$i-1]) --$i; - $gb = $SIZE_ID44[$i]; - break; - } - if (isset($lines[$gb])) { - $lines[$gb] += $row['count']; - } else { - $lines[$gb] = $row['count']; - } - } - asort($lines); - $data = array('rows' => array()); - $json = array(); - $id = 0; - foreach (array_reverse($lines, true) as $k => $v) { - $data['rows'][] = array('gb' => $k, 'count' => $v, 'class' => $this->hddColorClass($k)); - if ($k === 0) { - $color = '#e55'; - } else { - $color = $STATS_COLORS[$id++ % count($STATS_COLORS)]; - } - $json[] = array( - 'color' => $color, - 'label' => (string)$k, - 'value' => $v - ); - } - $this->capChart($json, 0.95); - $data['json'] = json_encode($json); - Render::addTemplate('id44', $data); - } - - private function showLatestMachines() - { - $data = array('cutoff' => ceil(time() / 3600) * 3600 - 86400 * 7); - $res = Database::simpleQuery("SELECT machineuuid, clientip, hostname, firstseen, mbram, kvmstate, id44mb FROM machine" - . " WHERE firstseen > :cutoff ORDER BY firstseen DESC LIMIT 32", $data); - $rows = array(); - $count = 0; - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { - if (empty($row['hostname'])) { - $row['hostname'] = $row['clientip']; - } - $row['firstseen'] = date('d.m. H:i', $row['firstseen']); - $row['gbram'] = round(round($row['mbram'] / 500) / 2, 1); // Trial and error until we got "expected" rounding.. - $row['gbtmp'] = round($row['id44mb'] / 1024); - $row['ramclass'] = $this->ramColorClass($row['mbram']); - $row['kvmclass'] = $this->kvmColorClass($row['kvmstate']); - $row['hddclass'] = $this->hddColorClass($row['gbtmp']); - $row['kvmicon'] = $row['kvmstate'] === 'ENABLED' ? '✓' : '✗'; - if (++$count > 5) { - $row['style'] = 'display:none'; - } - $rows[] = $row; - } - Render::addTemplate('newclients', array('rows' => $rows, 'openbutton' => $count > 5)); - } - - private function showMachineList($filter, $argument) - { - global $SIZE_RAM, $SIZE_ID44; - $join = ''; - $filters = array('cpumodel', 'realcores', 'kvmstate', 'clientip', 'macaddr', 'machineuuid', 'systemmodel'); - if (in_array($filter, $filters)) { - // Simple filters mapping into db - $where = " $filter = :argument"; - $args = array('argument' => $argument); - } elseif ($filter === 'gbram') { - // Memory by rounded GB - $lower = floor($this->findBestValue($SIZE_RAM, $argument, false) * 1024 - 100); - $upper = ceil($this->findBestValue($SIZE_RAM, $argument, true) * 1024 + 100); - $where = " mbram BETWEEN $lower AND $upper"; - $args = array(); - } elseif ($filter === 'hddgb') { - // HDD by rounded GB - $lower = floor($this->findBestValue($SIZE_ID44, $argument, false) * 1024 - 100); - $upper = ceil($this->findBestValue($SIZE_ID44, $argument, true) * 1024 + 100); - $where = " id44mb BETWEEN $lower AND $upper"; - $args = array(); - } elseif ($filter === 'subnet') { - $argument = preg_replace('/[^0-9\.:]/', '', $argument); - $where = " clientip LIKE '$argument%'"; - $args = array(); - } elseif ($filter === 'badsectors') { - $where = " badsectors >= :argument "; - $args = array('argument' => $argument); - } elseif ($filter === 'state') { - if ( $argument === 'on') { - $where = " lastseen + 600 > UNIX_TIMESTAMP() "; - } elseif ($argument === 'off') { - $where = " lastseen + 600 < UNIX_TIMESTAMP() "; - } elseif ($argument === 'idle') { - $where = " lastseen + 600 > UNIX_TIMESTAMP() AND logintime = 0 "; - } elseif ($argument === 'occupied') { - $where = " lastseen + 600 > UNIX_TIMESTAMP() AND logintime <> 0 "; - } else { - Message::addError('invalid-filter'); - return; - } - } elseif ($filter === 'location') { - $where = "subnet.locationid = :lid OR machine.locationid = :lid"; - $join = " INNER JOIN subnet ON (INET_ATON(clientip) BETWEEN startaddr AND endaddr) "; - $args = array('lid' => (int)$argument); - } else { - Message::addError('invalid-filter'); - return; - } - $res = Database::simpleQuery("SELECT machineuuid, macaddr, clientip, firstseen, lastseen," - . " logintime, lastboot, realcores, mbram, kvmstate, cpumodel, id44mb, hostname, notes IS NOT NULL AS hasnotes, badsectors FROM machine" - . " $join WHERE $where ORDER BY lastseen DESC, clientip ASC", $args); - $rows = array(); - $NOW = time(); - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { - if ($NOW - $row['lastseen'] > 610) { - $row['state_off'] = true; - } elseif ($row['logintime'] == 0) { - $row['state_idle'] = true; - } else { - $row['state_occupied'] = true; - } - //$row['firstseen'] = date('d.m.Y H:i', $row['firstseen']); - $row['lastseen'] = date('d.m. H:i', $row['lastseen']); - //$row['lastboot'] = date('d.m. H:i', $row['lastboot']); - $row['gbram'] = round(round($row['mbram'] / 500) / 2, 1); // Trial and error until we got "expected" rounding.. - $row['gbtmp'] = round($row['id44mb'] / 1024); - $octets = explode('.', $row['clientip']); - if (count($octets) === 4) { - $row['subnet'] = "$octets[0].$octets[1].$octets[2]."; - $row['lastoctet'] = $octets[3]; - } - $row['ramclass'] = $this->ramColorClass($row['mbram']); - $row['kvmclass'] = $this->kvmColorClass($row['kvmstate']); - $row['hddclass'] = $this->hddColorClass($row['gbtmp']); - if (empty($row['hostname'])) $row['hostname'] = $row['clientip']; - $rows[] = $row; - } - Render::addTemplate('clientlist', array('rows' => $rows, 'filter' => $filter, 'argument' => $argument)); - } - - private function ramColorClass($mb) - { - if ($mb < 1500) - return 'danger'; - if ($mb < 2500) - return 'warning'; - return ''; - } - - private function kvmColorClass($state) - { - if ($state === 'DISABLED') - return 'danger'; - if ($state === 'UNKNOWN' || $state === 'UNSUPPORTED') - return 'warning'; - return ''; - } - - private function hddColorClass($gb) - { - if ($gb < 7) - return 'danger'; - if ($gb < 25) - return 'warning'; - return ''; - } - - private function findBestValue($array, $value, $up) - { - $best = 0; - for ($i = 0; $i < count($array); ++$i) { - if (abs($array[$i] - $value) < abs($array[$best] - $value)) { - $best = $i; - } - } - if (!$up && $best === 0) { - return $array[0]; - } - if ($up && $best + 1 === count($array)) { - return $array[$best]; - } - if ($up) { - return ($array[$best] + $array[$best + 1]) / 2; - } - return ($array[$best] + $array[$best - 1]) / 2; - } - - private function fillSessionInfo(&$row) - { - $res = Database::simpleQuery("SELECT dateline, username, data FROM statistic" - . " WHERE clientip = :ip AND typeid = '.vmchooser-session-name'" - . " AND dateline BETWEEN :start AND :end", array( - 'ip' => $row['clientip'], - 'start' => $row['logintime'] - 60, - 'end' => $row['logintime'] + 300 - )); - $session = false; - while ($r = $res->fetch(PDO::FETCH_ASSOC)) { - if ($session === false || abs($session['dateline'] - $row['logintime']) > abs($r['dateline'] - $row['logintime'])) { - $session = $r; - } - } - if ($session !== false) { - $row['session'] = $session['data']; - $row['username'] = $session['username']; - } - } - - private function showMachine($uuid) - { - $client = Database::queryFirst("SELECT machineuuid, macaddr, clientip, firstseen, lastseen, logintime, lastboot," - . " mbram, kvmstate, cpumodel, id44mb, data, hostname, notes FROM machine WHERE machineuuid = :uuid", - array('uuid' => $uuid)); - // Mangle fields - $NOW = time(); - if ($NOW - $client['lastseen'] > 610) { - $client['state_off'] = true; - } elseif ($client['logintime'] == 0) { - $client['state_idle'] = true; - } else { - $client['state_occupied'] = true; - $this->fillSessionInfo($client); - } - $client['firstseen_s'] = date('d.m.Y H:i', $client['firstseen']); - $client['lastseen_s'] = date('d.m.Y H:i', $client['lastseen']); - $uptime = $NOW - $client['lastboot']; - $client['lastboot_s'] = date('d.m.Y H:i', $client['lastboot']) . ' (Up ' . floor($uptime / 86400) . 'd ' . gmdate('H:i', $uptime) . ')'; - $client['logintime_s'] = date('d.m.Y H:i', $client['logintime']); - $client['gbram'] = round(round($client['mbram'] / 500) / 2, 1); - $client['gbtmp'] = round($client['id44mb'] / 1024); - $client['ramclass'] = $this->ramColorClass($client['mbram']); - $client['kvmclass'] = $this->kvmColorClass($client['kvmstate']); - $client['hddclass'] = $this->hddColorClass($client['gbtmp']); - // Parse the giant blob of data - $hdds = array(); - if (preg_match_all('/##### ([^#]+) #+$(.*?)^#####/ims', $client['data'] . '########', $out, PREG_SET_ORDER)) { - foreach ($out as $section) { - if ($section[1] === 'CPU') { - $this->parseCpu($client, $section[2]); - } - if ($section[1] === 'dmidecode') { - $this->parseDmiDecode($client, $section[2]); - } - if ($section[1] === 'Partition tables') { - $this->parseHdd($hdds, $section[2]); - } - if (isset($hdds['hdds']) && $section[1] === 'smartctl') { - // This currently required that the partition table section comes first... - $this->parseSmartctl($hdds['hdds'], $section[2]); - } - } - } - unset($client['data']); - // Throw output at user - Render::addTemplate('machine-main', $client); - // Sessions - $NOW = time(); - $cutoff = $NOW - 86400 * 7; - //if ($cutoff < $client['firstseen']) $cutoff = $client['firstseen']; - $scale = 100 / ($NOW - $cutoff); - $res = Database::simpleQuery("SELECT dateline, typeid, data FROM statistic" - . " WHERE dateline > :cutoff AND typeid IN ('~session-length', '~offline-length') AND machineuuid = :uuid ORDER BY dateline ASC", array( - 'cutoff' => $cutoff - 86400 * 14, - 'uuid' => $uuid - )); - $spans['rows'] = array(); - $spans['graph'] = ''; - $last = false; - $first = true; - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { - if ($first && $row['dateline'] > $cutoff && $client['lastboot'] > $cutoff) { - // Special case: offline before - $spans['graph'] .= '{{lang_clientList}}
-{{filter}} ~= {{argument}}
-
-
-| {{lang_machine}} | -{{lang_address}} | -{{lang_lastSeen}} | -{{lang_kvmSupport}} | -{{lang_gbRam}} | -{{lang_tmpGb}} | -{{lang_cpuModel}} | -
|---|---|---|---|---|---|---|
|
- {{#hasnotes}}{{/hasnotes}}
- {{#state_off}}
-
- {{/state_off}}
- {{#state_idle}}
-
- {{/state_idle}}
- {{#state_occupied}}
-
- {{/state_occupied}}
- {{hostname}}
- {{machineuuid}}
- |
- {{subnet}}{{lastoctet}} {{macaddr}} |
- {{lastseen}} | -{{kvmstate}} | -{{gbram}} GiB | -
- {{gbtmp}} GiB
- {{#badsectors}}
-
- {{badsectors}}
- {{/badsectors}}
- |
- {{lang_realCores}}: {{realcores}} {{cpumodel}} |
-
-
diff --git a/modules/statistics/templates/id44.html b/modules/statistics/templates/id44.html
deleted file mode 100644
index 730839b1..00000000
--- a/modules/statistics/templates/id44.html
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
- {{lang_modelStats}}
-
-
-
-
-
-
-
-
-
- | {{lang_modelName}} | -{{lang_cpuCores}} | -{{lang_modelCount}} | -
|---|---|---|
| - {{systemmodel}} - | -{{cores}} | -{{count}} | -
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/statistics/templates/kvmstate.html b/modules/statistics/templates/kvmstate.html
deleted file mode 100644
index 107a34f7..00000000
--- a/modules/statistics/templates/kvmstate.html
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
- {{lang_tempPartStats}}
-
-
-
-
-
-
-
-
-
- | {{lang_partitionSize}} | -{{lang_machineCount}} | -
|---|---|
| {{gb}} GiB | -{{count}} | -
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/statistics/templates/machine-hdds.html b/modules/statistics/templates/machine-hdds.html
deleted file mode 100644
index fd6cf1be..00000000
--- a/modules/statistics/templates/machine-hdds.html
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
- {{lang_kvmStats}}
-
-
-
-
-
-
-
-
-
- | {{lang_kvmState}} | -{{lang_machineCount}} | -
|---|---|
| {{kvmstate}} | -{{count}} | -
-
-
-
- {{lang_hdds}}
-
- {{#hdds}}
-
\ No newline at end of file
diff --git a/modules/statistics/templates/machine-main.html b/modules/statistics/templates/machine-main.html
deleted file mode 100644
index 8071416a..00000000
--- a/modules/statistics/templates/machine-main.html
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
- {{/hdds}}
-
-
-
- {{s_ModelFamily}} {{dev}}
-
-
- {{#s_DeviceModel}}
-
- {{lang_modelNo}}: {{s_DeviceModel}}, {{lang_serialNo}}: {{s_SerialNumber}}
- {{/s_DeviceModel}}
- {{#s_ReallocatedSectorCt}}
- {{lang_reallocatedSectors}}: {{s_ReallocatedSectorCt}}
- {{/s_ReallocatedSectorCt}}
- {{#s_CurrentPendingSector}}
- {{lang_pendingSectors}}: {{s_CurrentPendingSector}}
- {{/s_CurrentPendingSector}}
- {{#s_PowerOnHours}}
- {{lang_powerOnTime}}: {{s_PowerOnHours}} {{lang_hours}} ({{PowerOnTime}})
- {{/s_PowerOnHours}}
-
-
-
-
-
-
- | {{lang_partName}} | -{{lang_partSize}} | -{{lang_partType}} | -
|---|---|---|
| {{name}} | -{{size}} GiB | -{{type}} | -
{{lang_total}}: {{size}} GiB
-
-
-
-
- - {{hostname}} {{#hostname}}–{{/hostname}} {{clientip}} - {{#notes}}{{/notes}} -
- -
-
diff --git a/modules/statistics/templates/machine-notes.html b/modules/statistics/templates/machine-notes.html
deleted file mode 100644
index c4f97543..00000000
--- a/modules/statistics/templates/machine-notes.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
- {{lang_machineSummary}}
-
-
-
-
-
- | {{lang_uuid}} | -{{machineuuid}} | -
| {{lang_macAddr}} | -{{macaddr}} | -
| {{lang_ip}} | -{{clientip}} | -
| {{lang_hostname}} | -{{hostname}} | -
| {{lang_firstSeen}} | -{{firstseen_s}} | -
| {{lang_lastBoot}} | -{{lastboot_s}} | -
| {{lang_lastSeen}} | -{{lastseen_s}} | -
| {{lang_usageState}} | -
- {{#state_off}}
- {{lang_machineOff}}
- {{/state_off}}
- {{#state_idle}}
- {{lang_machineIdle}}
- {{/state_idle}}
- {{#state_occupied}}
- {{#username}}
- {{lang_machineOccupiedBy}} {{username}}
- {{/username}}
- {{^username}}
- {{lang_machineOccupied}}
- {{/username}}
- {{logintime_s}}
- {{/state_occupied}}
- {{#session}}
- {{session}}
- {{/session}}
- |
-
-
-
-
-
- {{lang_hardwareSummary}}
-
-
-
-
-
- | {{lang_cpuModel}} | -
- {{cpumodel}}
- {{#Sockets}}
-
- {{lang_sockets}}: {{Sockets}}, {{lang_cores}}: {{Realcores}}, {{lang_virtualCores}}: {{Virtualcores}}
-
- {{/Sockets}}
- |
-
| {{lang_model}} | -{{pcmodel}} ({{manufacturer}}) | -
| {{lang_ram}} | -- {{gbram}} GiB - {{#maxram}}({{lang_maximumAbbrev}} {{maxram}}){{/maxram}} - {{ramtype}} - | -
| {{lang_ramSlots}} | -- {{ramslotcount}}: - {{#ramslot}} - [ {{size}} ] - {{/ramslot}} - | -
| {{lang_tempPart}} | -{{gbtmp}} GiB | -
| {{lang_64bitSupport}} | -{{kvmstate}} | -
{{lang_notes}}
-
-
\ No newline at end of file
diff --git a/modules/statistics/templates/machine-usage.html b/modules/statistics/templates/machine-usage.html
deleted file mode 100644
index ffaa747b..00000000
--- a/modules/statistics/templates/machine-usage.html
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/modules/statistics/templates/memory.html b/modules/statistics/templates/memory.html
deleted file mode 100644
index f4d2ad24..00000000
--- a/modules/statistics/templates/memory.html
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
- {{lang_usageDetails}}
-
-
-
-
-
-
-
-
-
-
- | Type | -When | -Length | -
|---|---|---|
| - | {{from}} | -{{duration}} | -
-
- {{#hasrows2}}
-
-
- | Type | -When | -Length | -
|---|---|---|
| - | {{from}} | -{{duration}} | -
- {{lang_timebarDesc}}
-
-
-
\ No newline at end of file
diff --git a/modules/statistics/templates/newclients.html b/modules/statistics/templates/newclients.html
deleted file mode 100644
index 0d9c74df..00000000
--- a/modules/statistics/templates/newclients.html
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
- {{lang_memoryStats}}
-
-
-
-
-
-
-
-
-
- | {{lang_ramSize}} | -{{lang_machineCount}} | -
|---|---|
| {{gb}} GiB | -{{count}} | -
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/statistics/templates/summary.html b/modules/statistics/templates/summary.html
deleted file mode 100644
index 5f16fd89..00000000
--- a/modules/statistics/templates/summary.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
- {{lang_newMachines}}
-
-
-
-
-
- | {{lang_machine}} | -- | 64Bit | -RAM | -HDD | -
|---|---|---|---|---|
| {{hostname}} | -{{firstseen}} | -{{kvmicon}} | -{{gbram}} GiB | -{{gbtmp}} GiB | -
| - - - - - - - | -||||
-
-
diff --git a/modules/statistics/templates/syslog.html b/modules/statistics/templates/syslog.html
deleted file mode 100644
index c82cb8ac..00000000
--- a/modules/statistics/templates/syslog.html
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
- {{lang_knownMachines}}: {{known}}
- {{lang_onlineMachines}}: {{online}}
- {{lang_inUseMachines}}: {{used}} ({{usedpercent}}%)
-
- {{#badhdd}}
-
- {{/badhdd}}
-
-
-
-
-{{lang_logHeadline}}
-| - | {{lang_when}} | -{{lang_event}} | -{{lang_details}} | - - - {{#list}} -
|---|---|---|---|
| - | {{date}} | -{{description}} | -{{#extra}}
- »
- {{extra}}
- {{/extra}} |
-
-
-
-
-
diff --git a/modules/support/templates/page-support.html b/modules/support/templates/page-support.html
deleted file mode 100644
index 196e0891..00000000
--- a/modules/support/templates/page-support.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
- {{lang_faq}}
-
-
-
-
- {{#faq}}
-
-
- {{/faq}}
-
- {{lang_supIntro}}
-
-
- - - {{question}} - -
-
-
-
- {{answer}}
-
- {{lang_supIntro}}
-
-
-
-
-
- {{lang_faq}}
-
-
-
-
- {{#faq}}
- {{#highlight}}
-
-
-
- {{/highlight}}
- {{/faq}}
-
- {{lang_showall}}
-
-
- - - {{question}} - -
-
-
-
- {{answer}}
-
-
-
-
-
diff --git a/modules/sysconfig/addconfig.inc.php b/modules/sysconfig/addconfig.inc.php
deleted file mode 100644
index 8203e555..00000000
--- a/modules/sysconfig/addconfig.inc.php
+++ /dev/null
@@ -1,221 +0,0 @@
-edit = ConfigTgz::get(Request::any('edit'));
- if (self::$instance->edit === false)
- Util::traceError('Invalid config id for editing');
- Util::addRedirectParam('edit', self::$instance->edit->id());
- }
- }
-
- protected function tmError()
- {
- Message::addError('taskmanager-error');
- Util::redirect('?do=SysConfig');
- }
-
- protected function taskError($status)
- {
- if (isset($status['data']['error'])) {
- $error = $status['data']['error'];
- } elseif (isset($status['statusCode'])) {
- $error = $status['statusCode'];
- } else {
- $error = Dictionary::translate('lang_unknwonTaskManager'); // TODO: No text
- }
- Message::addError('task-error', $error);
- Util::redirect('?do=SysConfig');
- }
-
- /**
- * Called before any HTML rendering happens, so you can
- * pepare stuff, validate input, and optionally redirect
- * early if something is wrong, or you received post
- * data etc.
- */
- protected function preprocessInternal()
- {
- // void
- }
-
- /**
- * Do page rendering.
- */
- protected function renderInternal()
- {
- // void
- }
-
- /**
- * Handle ajax stuff
- */
- protected function ajaxInternal()
- {
- // void
- }
-
- public static function preprocess()
- {
- if (self::$instance === false) {
- Util::traceError('No step instance yet');
- }
- self::$instance->preprocessInternal();
- }
-
- public static function render()
- {
- if (self::$instance === false)
- Util::traceError('No step instance yet');
- if (self::$instance->edit !== false)
- Message::addInfo('replacing-config', self::$instance->edit->title());
- self::$instance->renderInternal();
- }
-
- public static function ajax()
- {
- if (self::$instance === false) {
- Util::traceError('No step instance yet');
- }
- self::$instance->ajaxInternal();
- }
-
-}
-
-/**
- * Start dialog for adding config. Ask for title,
- * show selection of modules.
- */
-class AddConfig_Start extends AddConfig_Base
-{
-
- protected function renderInternal()
- {
- $mods = ConfigModule::getList();
- $res = Database::simpleQuery("SELECT moduleid, title, moduletype, filepath FROM configtgz_module"
- . " ORDER BY title ASC"); // Move to ConfigModule
- if ($this->edit === false) {
- $active = array();
- } else {
- $active = $this->edit->getModuleIds();
- }
- $id = 0;
- $modGroups = array();
- foreach ($mods as &$mod) {
- $mod['groupid'] = 'g' . ++$id;
- $modGroups[$mod['group']] =& $mod;
- }
- unset($mod);
- while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
- if (!isset($mods[$row['moduletype']])) {
- $mods[$row['moduletype']] = array(
- 'unique' => false,
- 'group' => 'Undefined moduletype in addconfig.inc.php',
- 'groupid' => 'g' . ++$id,
- );
- $modGroups[$mods[$row['moduletype']]['group']] =& $mods[$row['moduletype']];
- }
- unset($group);
- $group =& $modGroups[$mods[$row['moduletype']]['group']];
- if (!isset($group['modules'])) {
- $group['modules'] = array();
- }
- if (empty($row['filepath']) || !file_exists($row['filepath'])) $row['missing'] = true;
- $row['active'] = in_array($row['moduleid'], $active);
- $group['modules'][] = $row;
- }
- if ($this->edit !== false) {
- $title = $this->edit->title();
- } elseif (Request::any('title')) {
- $title = Request::any('title');
- } else {
- $title = '';
- }
- foreach ($modGroups as &$mod) {
- if (!empty($mod['modules']) && $mod['unique']) {
- array_unshift($mod['modules'], array(
- 'moduleid' => 0,
- 'title' => Dictionary::translate('lang_noModuleFromThisGroup'),
- ));
- }
- }
- unset($mod);
- Render::addDialog(Dictionary::translate("lang_configurationCompilation"), false, 'cfg-start', array(
- 'step' => 'AddConfig_Finish',
- 'groups' => array_values($modGroups),
- 'title' => $title,
- 'edit' => ($this->edit !== false ? $this->edit->id() : false)
- ));
- }
-
-}
-
-/**
- * Success dialog if adding config worked.
- */
-class AddConfig_Finish extends AddConfig_Base
-{
- private $config = false;
-
- protected function preprocessInternal()
- {
- $modules = Request::post('module');
- $title = Request::post('title');
- if (!is_array($modules)) {
- Message::addError('missing-file');
- Util::redirect('?do=SysConfig&action=addconfig');
- }
- if (empty($title)) {
- Message::addError('missing-title');
- Util::redirect('?do=SysConfig&action=addconfig');
- }
- if ($this->edit === false) {
- $this->config = ConfigTgz::insert($title, $modules);
- } else {
- $this->edit->update($title, $modules);
- $this->config = $this->edit;
- }
- if ($this->config === false || $this->config->generate(true, 150) === false) {
- Message::addError('unsuccessful-action');
- Util::redirect('?do=SysConfig&action=addconfig');
- }
- }
-
- protected function renderInternal()
- {
- Render::addDialog(Dictionary::translate('lang_configurationCompilation'), false, 'cfg-finish', array(
- 'configid' => $this->config->id()
- ));
- }
-
-}
diff --git a/modules/sysconfig/addmodule.inc.php b/modules/sysconfig/addmodule.inc.php
deleted file mode 100644
index bcd8e796..00000000
--- a/modules/sysconfig/addmodule.inc.php
+++ /dev/null
@@ -1,180 +0,0 @@
-edit = ConfigModule::get(Request::any('edit'));
- if (self::$instance->edit === false)
- Util::traceError('Invalid module id for editing');
- if (!preg_match('/^' . self::$instance->edit->moduleType() . '_/', $step))
- Util::traceError('Module to edit is of different type!');
- Util::addRedirectParam('edit', self::$instance->edit->id());
- }
- }
-
- protected function tmError()
- {
- Message::addError('taskmanager-error');
- Util::redirect('?do=SysConfig');
- }
-
- protected function taskError($status)
- {
- if (isset($status['data']['error'])) {
- $error = $status['data']['error'];
- } elseif (isset($status['statusCode'])) {
- $error = $status['statusCode'];
- } else {
- $error = Dictionary::translate('lang_unknwonTaskManager');
- }
- Message::addError('task-error', $error);
- Util::redirect('?do=SysConfig');
- }
-
- /**
- * Called before any HTML rendering happens, so you can
- * pepare stuff, validate input, and optionally redirect
- * early if something is wrong, or you received post
- * data etc.
- */
- protected function preprocessInternal()
- {
- // void
- }
-
- /**
- * Do page rendering.
- */
- protected function renderInternal()
- {
- // void
- }
-
- /**
- * Handle ajax stuff
- */
- protected function ajaxInternal()
- {
- // void
- }
-
- public static function preprocess()
- {
- if (self::$instance === false) {
- Util::traceError('No step instance yet');
- }
- self::$instance->preprocessInternal();
- }
-
- public static function render()
- {
- if (self::$instance === false) {
- Util::traceError('No step instance yet');
- }
- if (self::$instance->edit !== false)
- Message::addInfo('replacing-module', self::$instance->edit->title());
- self::$instance->renderInternal();
- }
-
- public static function ajax()
- {
- if (self::$instance === false) {
- Util::traceError('No step instance yet');
- }
- self::$instance->ajaxInternal();
- }
-
-}
-
-/**
- * Start dialog for adding module. Here the user
- * selects which kind of module they want to add.
- */
-class AddModule_Start extends AddModule_Base
-{
-
- protected function renderInternal()
- {
- $title = $order = array();
- $mods = ConfigModule::getList();
- foreach ($mods as $module) {
- $title[] = $module['title'];
- $order[] = $module['sortOrder'];
- }
- array_multisort($order, SORT_ASC, $title, SORT_ASC, $mods);
- Render::addDialog(Dictionary::translate('lang_moduleAdd'), false, 'start', array('modules' => array_values($mods)));
- }
-
-}
-
-/*
- * Helper functions to set/get a batch of vars from/to post variables or a module
- */
-
-/**
- *
- * @param \ConfigModule $module
- * @param array $array
- * @param array $keys
- */
-function moduleToArray($module, &$array, $keys)
-{
- foreach ($keys as $key) {
- $array[$key] = $module->getData($key);
- }
-}
-
-/**
- *
- * @param \ConfigModule $module
- * @param array $array
- * @param array $keys
- */
-function arrayToModule($module, $array, $keys)
-{
- foreach ($keys as $key) {
- $module->setData($key, $array[$key]);
- }
-}
-/**
- *
- * @param array $array
- * @param array $keys
- */
-function postToArray(&$array, $keys, $ignoreMissing = false)
-{
- foreach ($keys as $key) {
- $val = Request::post($key, '--not-in-post');
- if ($ignoreMissing && $val === '--not-in-post') continue;
- $array[$key] = $val;
- }
-}
diff --git a/modules/sysconfig/addmodule_adauth.inc.php b/modules/sysconfig/addmodule_adauth.inc.php
deleted file mode 100644
index e295630c..00000000
--- a/modules/sysconfig/addmodule_adauth.inc.php
+++ /dev/null
@@ -1,413 +0,0 @@
-edit !== false) {
- moduleToArray($this->edit, $data, $ADAUTH_COMMON_FIELDS);
- $data['title'] = $this->edit->title();
- $data['edit'] = $this->edit->id();
- }
- postToArray($data, $ADAUTH_COMMON_FIELDS, true);
- $obdn = Request::post('originalbinddn');
- if (!empty($obdn)) {
- $data['binddn'] = $obdn;
- }
- if (preg_match('/^(.*)\:(636|3269|389|3268)$/', $data['server'], $out)) {
- $data['server'] = $out[1];
- }
- $data['step'] = 'AdAuth_CheckConnection';
- Render::addDialog(Dictionary::translate('config-module', 'adAuth_title'), false, 'ad-start', $data);
- }
-
-}
-
-class AdAuth_CheckConnection extends AddModule_Base
-{
-
- private $scanTask;
- private $server;
-
- protected function preprocessInternal()
- {
- $this->server = Request::post('server');
- $binddn = Request::post('binddn');
- $ssl = Request::post('ssl', 'off') === 'on';
- if (empty($this->server) || empty($binddn)) {
- Message::addError('empty-field');
- AddModule_Base::setStep('AdAuth_Start'); // Continues with AdAuth_Start for render()
- return;
- }
- if (preg_match('/^([^\:]+)\:(\d+)$/', $this->server, $out)) {
- $ports = array($out[2]);
- $this->server = $out[1];
- } elseif ($ssl) {
- $ports = array(636, 3269);
- } else {
- $ports = array(389, 3268);
- }
- $this->scanTask = Taskmanager::submit('PortScan', array(
- 'host' => $this->server,
- 'ports' => $ports,
- 'certificate' => Request::post('certificate', '')
- ));
- if (!isset($this->scanTask['id'])) {
- AddModule_Base::setStep('AdAuth_Start'); // Continues with AdAuth_Start for render()
- return;
- }
- }
-
- protected function renderInternal()
- {
- $data = array(
- 'edit' => Request::post('edit'),
- 'title' => Request::post('title'),
- 'server' => $this->server,
- 'searchbase' => Util::normalizeDn(Request::post('searchbase')),
- 'binddn' => Util::normalizeDn(Request::post('binddn')),
- 'bindpw' => Request::post('bindpw'),
- 'home' => Request::post('home'),
- 'homeattr' => Request::post('homeattr'),
- 'ssl' => Request::post('ssl'),
- 'certificate' => Request::post('certificate', ''),
- 'taskid' => $this->scanTask['id']
- );
- $data['prev'] = 'AdAuth_Start';
- if (preg_match('#^\w+[/\\\\]\w+$#', Request::post('binddn')) || strlen(Request::post('searchbase')) < 2) {
- $data['next'] = 'AdAuth_SelfSearch';
- } elseif (empty($data['homeattr'])) {
- $data['next'] = 'AdAuth_HomeAttrCheck';
- } else {
- $data['next'] = 'AdAuth_CheckCredentials';
- }
- Render::addDialog(Dictionary::translate('config-module', 'adAuth_title'), false, 'ad_ldap-checkconnection', $data);
- }
-
-}
-
-class AdAuth_SelfSearch extends AddModule_Base
-{
-
- private $taskIds;
- private $originalBindDn;
-
- protected function preprocessInternal()
- {
- $server = Request::post('server');
- $port = Request::post('port');
- $searchbase = Request::post('searchbase', '');
- $binddn = Request::post('binddn');
- $bindpw = Request::post('bindpw');
- $ssl = Request::post('ssl', 'off') === 'on';
- if ($ssl && !Request::post('fingerprint')) {
- Message::addError('error-read', 'fingerprint');
- AddModule_Base::setStep('AdAuth_Start'); // Continues with AdAuth_Start for render()
- return;
- }
- if (empty($server) || empty($binddn) || empty($port)) {
- Message::addError('empty-field');
- AddModule_Base::setStep('AdAuth_Start'); // Continues with AdAuth_Start for render()
- return;
- }
- $this->originalBindDn = '';
- // Fix bindDN if short name given
- //
- if ($ssl) { // Use the specific AD ports so the domain\username bind works
- $uri = "ldaps://$server:3269/";
- } else {
- $uri = "ldap://$server:3268/";
- }
- preg_match('#^\w+[/\\\\](\w+)$#', $binddn, $out);
- $user = $out[1];
- $this->originalBindDn = str_replace('/', '\\', $binddn);
- $selfSearch = Taskmanager::submit('LdapSearch', array(
- 'server' => $uri,
- 'searchbase' => $searchbase,
- 'binddn' => $this->originalBindDn,
- 'bindpw' => $bindpw,
- 'filter' => "sAMAccountName=$user"
- ));
- if (!isset($selfSearch['id'])) {
- AddModule_Base::setStep('AdAuth_Start'); // Continues with AdAuth_Start for render()
- return;
- }
- $this->taskIds['self-search'] = $selfSearch['id'];
- }
-
- protected function renderInternal()
- {
- $data = array(
- 'edit' => Request::post('edit'),
- 'title' => Request::post('title'),
- 'server' => Request::post('server'),
- 'port' => Request::post('port'),
- 'searchbase' => Request::post('searchbase'),
- 'binddn' => Request::post('binddn'),
- 'bindpw' => Request::post('bindpw'),
- 'home' => Request::post('home'),
- 'homeattr' => Request::post('homeattr'),
- 'ssl' => Request::post('ssl') === 'on',
- 'fingerprint' => Request::post('fingerprint'),
- 'certificate' => Request::post('certificate', ''),
- 'originalbinddn' => $this->originalBindDn,
- 'prev' => 'AdAuth_Start'
- );
- if (empty($data['homeattr'])) {
- $data['next'] = 'AdAuth_HomeAttrCheck';
- } else {
- $data['next'] = 'AdAuth_CheckCredentials';
- }
- Render::addDialog(Dictionary::translate('config-module', 'adAuth_title'), false, 'ad-selfsearch',
- array_merge($this->taskIds, $data));
- }
-
-}
-
-class AdAuth_HomeAttrCheck extends AddModule_Base
-{
-
- private $taskIds;
-
- protected function preprocessInternal()
- {
- $server = Request::post('server');
- $port = Request::post('port');
- $searchbase = Request::post('searchbase', '');
- $binddn = Request::post('binddn');
- $bindpw = Request::post('bindpw');
- $ssl = Request::post('ssl', 'off') === 'on';
- if ($ssl && !Request::post('fingerprint')) {
- Message::addError('error-read', 'fingerprint');
- AddModule_Base::setStep('AdAuth_Start'); // Continues with AdAuth_Start for render()
- return;
- }
- if (empty($server) || empty($binddn) || empty($port)) {
- Message::addError('empty-field');
- AddModule_Base::setStep('AdAuth_Start'); // Continues with AdAuth_Start for render()
- return;
- }
- if ($ssl) {
- $uri = "ldaps://$server:$port/";
- } else {
- $uri = "ldap://$server:$port/";
- }
- preg_match('#^(\w+=[^,]+),#', $binddn, $out);
- $filter = $out[1];
- $data = array(
- 'server' => $uri,
- 'searchbase' => $searchbase,
- 'binddn' => $binddn,
- 'bindpw' => $bindpw,
- 'filter' => $filter
- );
- $selfSearch = Taskmanager::submit('LdapSearch', $data);
- if (!isset($selfSearch['id'])) {
- AddModule_Base::setStep('AdAuth_Start'); // Continues with AdAuth_Start for render()
- return;
- }
- $this->taskIds['self-search'] = $selfSearch['id'];
- }
-
- protected function renderInternal()
- {
- Render::addDialog(Dictionary::translate('config-module', 'adAuth_title'), false, 'ad-selfsearch', array_merge($this->taskIds, array(
- 'edit' => Request::post('edit'),
- 'title' => Request::post('title'),
- 'server' => Request::post('server'),
- 'port' => Request::post('port'),
- 'searchbase' => Request::post('searchbase'),
- 'binddn' => Request::post('binddn'),
- 'bindpw' => Request::post('bindpw'),
- 'home' => Request::post('home'),
- 'homeattr' => Request::post('homeattr'),
- 'ssl' => Request::post('ssl') === 'on',
- 'fingerprint' => Request::post('fingerprint'),
- 'certificate' => Request::post('certificate', ''),
- 'originalbinddn' => Request::post('originalbinddn'),
- 'tryHomeAttr' => true,
- 'prev' => 'AdAuth_Start',
- 'next' => 'AdAuth_CheckCredentials'
- ))
- );
- }
-
-}
-
-class AdAuth_CheckCredentials extends AddModule_Base
-{
-
- private $taskIds;
-
- protected function preprocessInternal()
- {
- $server = Request::post('server');
- $port = Request::post('port');
- $searchbase = Request::post('searchbase', '');
- $binddn = Request::post('binddn');
- $bindpw = Request::post('bindpw');
- $ssl = Request::post('ssl', 'off') === 'on';
- if ($ssl && !Request::post('fingerprint')) {
- Message::addError('error-read', 'fingerprint');
- AddModule_Base::setStep('AdAuth_Start'); // Continues with AdAuth_Start for render()
- return;
- }
- if (empty($server) || empty($binddn) || empty($port)) {
- Message::addError('empty-field');
- AddModule_Base::setStep('AdAuth_Start'); // Continues with AdAuth_Start for render()
- return;
- }
- // Test query 4 users
- if ($ssl) {
- $uri = "ldaps://$server:$port/";
- } else {
- $uri = "ldap://$server:$port/";
- }
- $ldapSearch = Taskmanager::submit('LdapSearch', array(
- 'server' => $uri,
- 'searchbase' => $searchbase,
- 'binddn' => $binddn,
- 'bindpw' => $bindpw
- ));
- if (!isset($ldapSearch['id'])) {
- AddModule_Base::setStep('AdAuth_Start'); // Continues with AdAuth_Start for render()
- return;
- }
- $this->taskIds = array(
- 'tm-search' => $ldapSearch['id']
- );
- if (isset($selfSearch['id']))
- $this->taskIds['self-search'] = $selfSearch['id'];
- }
-
- protected function renderInternal()
- {
- Render::addDialog(Dictionary::translate('config-module', 'adAuth_title'), false, 'ad_ldap-checkcredentials', array_merge($this->taskIds, array(
- 'edit' => Request::post('edit'),
- 'title' => Request::post('title'),
- 'server' => Request::post('server') . ':' . Request::post('port'),
- 'searchbase' => Request::post('searchbase'),
- 'binddn' => Request::post('binddn'),
- 'bindpw' => Request::post('bindpw'),
- 'home' => Request::post('home'),
- 'homeattr' => Request::post('homeattr'),
- 'ssl' => Request::post('ssl') === 'on',
- 'fingerprint' => Request::post('fingerprint'),
- 'certificate' => Request::post('certificate', ''),
- 'originalbinddn' => Request::post('originalbinddn'),
- 'prev' => 'AdAuth_Start',
- 'next' => 'AdAuth_Finish'
- ))
- );
- }
-
-}
-
-class AdAuth_Finish extends AddModule_Base
-{
-
- private $taskIds;
-
- protected function preprocessInternal()
- {
- $binddn = Request::post('binddn');
- $searchbase = Request::post('searchbase');
- if (empty($searchbase)) {
- // If no search base was given, determine it from the dn
- $originalBindDn = str_replace('\\', '/', trim(Request::post('originalbinddn')));
- if (!preg_match('#^([^/]+)/[^/]+$#', $originalBindDn, $out)) {
- Message::addError('value-invalid', 'binddn', $originalBindDn);
- Util::redirect('?do=SysConfig&action=addmodule&step=AdAuth_Start');
- } // $out[1] is the domain
- // Find the domain in the dn
- $i = mb_stripos($binddn, '=' . $out[1] . ',');
- if ($i === false) {
- Message::addError('value-invalid', 'binddn', $out[1]);
- Util::redirect('?do=SysConfig&action=addmodule&step=AdAuth_Start');
- }
- // Now find ',' before it so we get the key
- $i = mb_strrpos(mb_substr($binddn, 0, $i), ',');
- if ($i === false)
- $i = -1;
- $searchbase = mb_substr($binddn, $i + 1);
- } else {
- $somedn = Request::post('somedn', false);
- if (!empty($somedn)) {
- $i = stripos($somedn, $searchbase);
- if ($i !== false) {
- $searchbase = substr($somedn, $i, strlen($searchbase));
- }
- }
- }
- $title = Request::post('title');
- if (empty($title))
- $title = 'AD: ' . Request::post('server');
- if ($this->edit === false)
- $module = ConfigModule::getInstance('AdAuth');
- else
- $module = $this->edit;
- $ssl = Request::post('ssl', 'off') === 'on';
- $module->setData('server', Request::post('server'));
- $module->setData('searchbase', $searchbase);
- $module->setData('binddn', $binddn);
- $module->setData('bindpw', Request::post('bindpw'));
- $module->setData('home', Request::post('home'));
- $module->setData('homeattr', Request::post('homeattr'));
- $module->setData('certificate', Request::post('certificate'));
- $module->setData('ssl', $ssl);
- if ($ssl) {
- $module->setData('fingerprint', Request::post('fingerprint', ''));
- } else {
- $module->setData('fingerprint', '');
- }
- if ($this->edit !== false)
- $ret = $module->update($title);
- else
- $ret = $module->insert($title);
- if (!$ret) {
- Message::addError('value-invalid', 'any', 'any');
- $tgz = false;
- } else {
- $parent = $this->stopOldInstance();
- $tgz = $module->generate($this->edit === false, $parent);
- }
- if ($tgz === false) {
- AddModule_Base::setStep('AdAuth_Start'); // Continues with AdAuth_Start for render()
- return;
- }
- $this->taskIds = array(
- 'tm-config' => $tgz,
- );
- }
-
- private function stopOldInstance()
- {
- if ($this->edit === false)
- return NULL;
- $list = ConfigTgz::getAllForModule($this->edit->id());
- if (!is_array($list))
- return NULL;
- $parent = NULL;
- foreach ($list as $tgz) {
- if (!$tgz->isActive())
- continue;
- $task = Trigger::ldadp($tgz->id(), $parent);
- if (isset($task['id']))
- $parent = $task['id'];
- }
- return $parent;
- }
-
- protected function renderInternal()
- {
- Render::addDialog(Dictionary::translate('config-module', 'adAuth_title'), false, 'ad-finish', $this->taskIds);
- }
-
-}
diff --git a/modules/sysconfig/addmodule_branding.inc.php b/modules/sysconfig/addmodule_branding.inc.php
deleted file mode 100644
index 67e20892..00000000
--- a/modules/sysconfig/addmodule_branding.inc.php
+++ /dev/null
@@ -1,238 +0,0 @@
- 'Branding_ProcessFile',
- 'edit' => $this->edit ? $this->edit->id() : false
- ));
- }
-
-}
-
-class Branding_ProcessFile extends AddModule_Base
-{
-
- private $task;
- private $svgFile;
- private $tarFile;
-
- protected function preprocessInternal()
- {
- $url = Request::post('url');
- if ((!isset($_FILES['file']['error']) || $_FILES['file']['error'] === UPLOAD_ERR_NO_FILE) && empty($url)) {
- Message::addError('empty-field');
- Util::redirect('?do=SysConfig&action=addmodule&step=Branding_Start');
- }
-
- $this->svgFile = tempnam(sys_get_temp_dir(), 'bwlp-');
- if (isset($_FILES['file']['error']) && $_FILES['file']['error'] !== UPLOAD_ERR_NO_FILE) {
- // Prefer uploaded image over URL (in case both are given)
- if ($_FILES['file']['error'] !== UPLOAD_ERR_OK) {
- Message::addError('upload-failed', Util::uploadErrorString($_FILES['file']['error']));
- Util::redirect('?do=SysConfig&action=addmodule&step=Branding_Start');
- }
- if (!move_uploaded_file($_FILES["file"]["tmp_name"], $this->svgFile)) {
- Message::addError('upload-failed', 'Moving temp file failed');
- Util::redirect('?do=SysConfig&action=addmodule&step=Branding_Start');
- }
- } else {
- // URL - launch task that fetches the SVG file from it
- if (strpos($url, '://') === false)
- $url = "http://$url";
- $title = false;
- if (!$this->downloadSvg($this->svgFile, $url, $title))
- Util::redirect('?do=SysConfig&action=addmodule&step=Branding_Start');
- Session::set('logo_name', $title);
- }
- chmod($this->svgFile, 0644);
- $this->tarFile = '/tmp/bwlp-' . time() . '-' . mt_rand() . '.tgz';
- $this->task = Taskmanager::submit('BrandingGenerator', array(
- 'tarFile' => $this->tarFile,
- 'svgFile' => $this->svgFile
- ));
- $this->task = Taskmanager::waitComplete($this->task, 5000);
- if (Taskmanager::isFailed($this->task)) {
- @unlink($this->svgFile);
- Taskmanager::addErrorMessage($this->task);
- Util::redirect('?do=SysConfig&action=addmodule&step=Branding_Start');
- }
- Session::set('logo_tgz', $this->tarFile);
- Session::save();
- }
-
- protected function renderInternal()
- {
- $svg = $png = false;
- if (isset($this->task['data']['pngFile']))
- $png = base64_encode(file_get_contents($this->task['data']['pngFile']));
- if (filesize($this->svgFile) < 1000000)
- $svg = base64_encode(file_get_contents($this->svgFile));
- Render::addDialog(Dictionary::translate('config-module', 'branding_title'), false, 'branding-check', array(
- 'png' => $png,
- 'svg' => $svg,
- 'error' => $this->task['data']['error'],
- 'step' => 'Branding_Finish',
- 'edit' => $this->edit ? $this->edit->id() : false,
- 'title' => $this->edit ? $this->edit->title() : false
- )
- );
- @unlink($this->svgFile);
- }
-
- /**
- * Download an svg file from the given url. This function has "wikipedia support", it tries to detect
- * URLs in wikipedia articles or thumbnails and then find the actual svg file.
- *
- * @param string $svgName file to download to
- * @param string $url url to download from
- * @return boolean true of download succeded, false on download error (also returns true if downloaded file doesn't
- * seem to be svg!)
- */
- private function downloadSvg($svgName, $url, &$title)
- {
- $title = false;
- // [wikipedia] Did someone paste a link to a thumbnail of the svg? Let's fix that...
- if (preg_match('#^(.*)/thumb/(.*\.svg)/.*\.svg#', $url, $out)) {
- $url = $out[1] . '/' . $out[2];
- }
- for ($i = 0; $i < 5; ++$i) {
- $code = 400;
- if (!Download::toFile($svgName, $url, 3, $code) || $code < 200 || $code > 299) {
- Message::addError('remote-timeout', $url, $code);
- return false;
- }
- $content = FileUtil::readFile($svgName, 25000);
- // Is svg file?
- if (strpos($content, '
- {{lang_form}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{{lang_legend}}
-
-
-- - {{lang_showLong}} -
-- - {{lang_downloadLong}} -
-- - {{lang_rebuildLong}} -
-- - {{lang_rebuildOutdatedLong}} -
-- - {{lang_editLong}} -
-
-
- {{lang_deleteLong}}
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/sysconfig/templates/ad-finish.html b/modules/sysconfig/templates/ad-finish.html
deleted file mode 100644
index f73cad9d..00000000
--- a/modules/sysconfig/templates/ad-finish.html
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-- {{lang_adStarted}} -
- -
-
-{{lang_generateModule}}
-- - - diff --git a/modules/sysconfig/templates/ad-selfsearch.html b/modules/sysconfig/templates/ad-selfsearch.html deleted file mode 100644 index 76952dc3..00000000 --- a/modules/sysconfig/templates/ad-selfsearch.html +++ /dev/null @@ -1,112 +0,0 @@ -
- {{lang_dnLookup}} -
- -
-
-{{lang_onProblemSearchBase}}
-LDAP Self-Query
-
-
--
-
-
-
-
-
-
diff --git a/modules/sysconfig/templates/ad-start.html b/modules/sysconfig/templates/ad-start.html
deleted file mode 100644
index 98546140..00000000
--- a/modules/sysconfig/templates/ad-start.html
+++ /dev/null
@@ -1,121 +0,0 @@
-
- {{lang_adText1}}
-
- {{lang_adText2}}
-
- {{lang_adText3}}
-
dsquery user -name "Username"-
- {{lang_adText4}} -
- -{{lang_asteriskMandatory}} - - - -
-
-
-
-
-
-
-
diff --git a/modules/sysconfig/templates/ad_ldap-checkconnection.html b/modules/sysconfig/templates/ad_ldap-checkconnection.html
deleted file mode 100644
index 5925829a..00000000
--- a/modules/sysconfig/templates/ad_ldap-checkconnection.html
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-- {{lang_connectionWait}} -
- -
-
-
-
-
-Port Check
--
-
-
-
-
-
-
-
diff --git a/modules/sysconfig/templates/ad_ldap-checkcredentials.html b/modules/sysconfig/templates/ad_ldap-checkcredentials.html
deleted file mode 100644
index 0586209b..00000000
--- a/modules/sysconfig/templates/ad_ldap-checkcredentials.html
+++ /dev/null
@@ -1,67 +0,0 @@
-- {{lang_connectionWait}} -
- -
-
-{{lang_onProblemSearchBase}}
-LDAP Test-Query
--
-
-
-
-
-
-
diff --git a/modules/sysconfig/templates/branding-check.html b/modules/sysconfig/templates/branding-check.html
deleted file mode 100644
index 8f6ef055..00000000
--- a/modules/sysconfig/templates/branding-check.html
+++ /dev/null
@@ -1,26 +0,0 @@
-- {{lang_brandingInfo}} -
-
- {{#svg}}
-
- {{/svg}}
-
-
- {{/svg}}
-
- {{#png}}
-
- {{/png}}
-
-
-
- {{/png}}
-{{error}}
-
-
-
diff --git a/modules/sysconfig/templates/branding-start.html b/modules/sysconfig/templates/branding-start.html
deleted file mode 100644
index 09b9ca27..00000000
--- a/modules/sysconfig/templates/branding-start.html
+++ /dev/null
@@ -1,25 +0,0 @@
-- {{lang_branding}} -
- - diff --git a/modules/sysconfig/templates/cfg-finish.html b/modules/sysconfig/templates/cfg-finish.html deleted file mode 100644 index a6e51996..00000000 --- a/modules/sysconfig/templates/cfg-finish.html +++ /dev/null @@ -1,12 +0,0 @@ -- {{lang_configurationSuccess}} -
- - diff --git a/modules/sysconfig/templates/cfg-start.html b/modules/sysconfig/templates/cfg-start.html deleted file mode 100644 index 50f366ea..00000000 --- a/modules/sysconfig/templates/cfg-start.html +++ /dev/null @@ -1,39 +0,0 @@ - diff --git a/modules/sysconfig/templates/config-module-list.html b/modules/sysconfig/templates/config-module-list.html deleted file mode 100644 index 6cd77f9e..00000000 --- a/modules/sysconfig/templates/config-module-list.html +++ /dev/null @@ -1,17 +0,0 @@ - \ No newline at end of file diff --git a/modules/sysconfig/templates/custom-filelist.html b/modules/sysconfig/templates/custom-filelist.html deleted file mode 100644 index 3ad241dd..00000000 --- a/modules/sysconfig/templates/custom-filelist.html +++ /dev/null @@ -1,16 +0,0 @@ - - -| {{name}} | - {{/isdir}} - {{^isdir}} -{{name}} | -{{size}} | - {{/isdir}} -|
{{lang_customModuleInfo1}}
- -{{lang_customModuleInfo2}}
- - diff --git a/modules/sysconfig/templates/ldap-finish.html b/modules/sysconfig/templates/ldap-finish.html deleted file mode 100644 index a735e792..00000000 --- a/modules/sysconfig/templates/ldap-finish.html +++ /dev/null @@ -1,29 +0,0 @@ -- {{lang_ldapStarted}} -
- -
-
-{{lang_generateModule}}
-- - - diff --git a/modules/sysconfig/templates/ldap-start.html b/modules/sysconfig/templates/ldap-start.html deleted file mode 100644 index 7892b63f..00000000 --- a/modules/sysconfig/templates/ldap-start.html +++ /dev/null @@ -1,101 +0,0 @@ -
- {{lang_ldapText1}}
-
- {{lang_ldapText2}}
-
-
diff --git a/modules/sysconfig/templates/sshconfig-start.html b/modules/sysconfig/templates/sshconfig-start.html
deleted file mode 100644
index 2aa409d3..00000000
--- a/modules/sysconfig/templates/sshconfig-start.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
diff --git a/modules/sysconfig/templates/start.html b/modules/sysconfig/templates/start.html
deleted file mode 100644
index f55a5501..00000000
--- a/modules/sysconfig/templates/start.html
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-{{lang_moduleChoose}}
- -{{#modules}} -
-
-{{/modules}}
diff --git a/modules/sysconfignew/config.json b/modules/sysconfignew/config.json
deleted file mode 100644
index 4da67ef8..00000000
--- a/modules/sysconfignew/config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "enabled":"true"
-}
diff --git a/modules/sysconfignew/lang/en/module.json b/modules/sysconfignew/lang/en/module.json
deleted file mode 100644
index 3ec89616..00000000
--- a/modules/sysconfignew/lang/en/module.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "lang_back": "Back",
- "lang_cancel": "Cancel",
- "lang_cannotOpen": "could no be opened",
- "lang_changeLink": "Change link",
- "lang_compilingIpxe": "Compiling iPXE",
- "lang_configName": "Name",
- "lang_configsDescription": "Here it is possible to create a system configuration by choosing the desired modules.",
- "lang_configurations": "Configurations",
- "lang_create": "Create",
- "lang_edit": "Edit",
- "lang_file": "File",
- "lang_leavingMessage": "You have unsaved changes on your module.",
- "lang_loading": "Loading",
- "lang_modules": "Modules",
- "lang_modulesDescription": "Here it is possible to create a system module through an editor.",
- "lang_name": "Name",
- "lang_new": "New",
- "lang_newConfig": "New Config",
- "lang_newModule": "New Module",
- "lang_remove": "Remove",
- "lang_save": "Save"
-}
\ No newline at end of file
diff --git a/modules/sysconfignew/lang/pt/module.json b/modules/sysconfignew/lang/pt/module.json
deleted file mode 100644
index af0d7ad7..00000000
--- a/modules/sysconfignew/lang/pt/module.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "lang_back": "Voltar",
- "lang_cancel": "Cancelar",
- "lang_cannotOpen": "n\u00e3o p\u00f4de ser aberto",
- "lang_changeLink": "Mudar link",
- "lang_compilingIpxe": "Compilando iPXE",
- "lang_configName": "Nome",
- "lang_configsDescription": "Aqui \u00e9 poss\u00edvel criar uma configura\u00e7\u00e3o do sistema escolhendo os m\u00f3dulos desejados.",
- "lang_configurations": "Configura\u00e7\u00f5es",
- "lang_create": "Criar",
- "lang_edit": "Editar",
- "lang_file": "Arquivo",
- "lang_leavingMessage": "Voc\u00ea possui mudan\u00e7as n\u00e3o salvas no seu m\u00f3dulo.",
- "lang_loading": "Carregando",
- "lang_modules": "M\u00f3dulos",
- "lang_modulesDescription": "Aqui \u00e9 poss\u00edvel criar um m\u00f3dulo do sistema atrav\u00e9s de um editor.",
- "lang_name": "Nome",
- "lang_new": "Novo",
- "lang_newConfig": "Nova Configura\u00e7\u00e3o",
- "lang_newModule": "Novo M\u00f3dulo",
- "lang_remove": "Remover",
- "lang_save": "Salvar"
-}
\ No newline at end of file
diff --git a/modules/sysconfignew/page.inc.php b/modules/sysconfignew/page.inc.php
deleted file mode 100644
index 105ad6c7..00000000
--- a/modules/sysconfignew/page.inc.php
+++ /dev/null
@@ -1,113 +0,0 @@
-tmconfigs = $this->tmpath . '/configs';
- $this->tmmodules = $this->tmpath . '/modules';
- }
-
-
- protected function doRender(){
- $module = $_GET['module'];
- if(isset($module)){
- Render::addTemplate('module-editor',array(
- "module" => $module
- ));
- }else{
- if(is_dir($this->tmpath)){
- $configs = array();
- $modules = array();
-
- foreach($this->listDirectory($this->tmconfigs) as $key => $value)
- $configs[] = array(
- "name" => $value
- );
-
- foreach($this->listDirectory($this->tmmodules) as $key => $value)
- $modules[] = array(
- "name" => $value
- );
-
- $data = array(
- "configs" => $configs,
- "modules" => $modules
- );
- Render::addTemplate('_pagenew',$data);
- }else{
- Message::addError('no-tm-scripts');
- }
- }
- }
-
- protected function doAjax(){
- $request = $_GET['request'];
- switch($request){
- case "module-contents":
- $path = $this->tmpath . '/modules/' . Request::get('module');
- $data = $this->getDirContents($path);
- $json = json_encode($data);
- print_r($json);
- break;
- case "configs":
- $this->tmconfigs = $this->tmpath . '/configs';
- $this->tmmodules = $this->tmpath . '/modules';
- $userModules = $this->listDirectory($this->tmconfigs . '/' . Request::get('config'));
- $modules = array();
- foreach($this->listDirectory($this->tmmodules) as $key => $value){
- $chosen = (in_array($value, $userModules)) ? true : false;
- $modules[] = array(
- "name" => $value,
- "chosen" => $chosen
- );
- }
-
- foreach ($modules as $module) {
- $class = ($module['chosen']) ? "select-item select-item-selected" : "select-item";
- $ret .= "";
- }
-
- echo $ret;
- break;
- }
-
- }
-
- private function getDirContents($path){
- $ret = array();
- foreach ($this->listDirectory($path) as $key => $value) {
- if(is_dir($path . "/" . $value)){
- $ret["dir_" . $value] = $this->getDirContents($path . "/" . $value);
- }else{
- if(is_link($path . "/" . $value)){
- $ret["link_" . $value] = readlink($path . "/" . $value);
- }else{
- if(mime_content_type($path . "/" . $value) == "text/plain"){
- $ret["file_" . $value] = file_get_contents($path . "/" . $value);
- }else{
- $ret["lock_" . $value] = " oops";
- }
- }
- }
- }
- return $ret;
- }
-
- private function listDirectory($path){
- return array_diff(scandir($path), array('..', '.'));
- }
-
-}
diff --git a/modules/sysconfignew/templates/_pagenew.html b/modules/sysconfignew/templates/_pagenew.html
deleted file mode 100644
index 98881ae3..00000000
--- a/modules/sysconfignew/templates/_pagenew.html
+++ /dev/null
@@ -1,190 +0,0 @@
-
- {{title}} {{lang_add}}
-
-
- {{description}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/sysconfignew/templates/module-editor.html b/modules/sysconfignew/templates/module-editor.html
deleted file mode 100644
index 3ea28bf8..00000000
--- a/modules/sysconfignew/templates/module-editor.html
+++ /dev/null
@@ -1,269 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- {{lang_configurations}}
-
- {{lang_configsDescription}}
-
- | {{lang_configName}} | -- | - - - {{#configs}} - |
|---|---|---|
| {{name}} | -- - | -- - | -
-
-
-
-
-
-
-
-
-
- {{lang_modules}}
-
- {{lang_modulesDescription}}
-
- | {{lang_configName}} | -- | - - - {{#modules}} - |
|---|---|---|
| {{name}} | -- - | -- - | -
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/syslog/config.json b/modules/syslog/config.json
deleted file mode 100644
index 650ab2fe..00000000
--- a/modules/syslog/config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "category":"main.status",
- "enabled":"true"
-}
diff --git a/modules/syslog/lang/de/module.json b/modules/syslog/lang/de/module.json
deleted file mode 100644
index b9e8de49..00000000
--- a/modules/syslog/lang/de/module.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "module_name": "Client-Log",
- "page_title": "Lognachrichten gebooteter Clients"
-}
diff --git a/modules/syslog/lang/de/templates/page-syslog.json b/modules/syslog/lang/de/templates/page-syslog.json
deleted file mode 100644
index 49e94602..00000000
--- a/modules/syslog/lang/de/templates/page-syslog.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "lang_client": "Client",
- "lang_clientLog": "Client Log",
- "lang_details": "Details",
- "lang_event": "Ereignis",
- "lang_filter": "Filter",
- "lang_go": "Go",
- "lang_not": "not",
- "lang_when": "Wann"
-}
\ No newline at end of file
diff --git a/modules/syslog/lang/en/module.json b/modules/syslog/lang/en/module.json
deleted file mode 100644
index 70107d9c..00000000
--- a/modules/syslog/lang/en/module.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "lang_client": "Client",
- "lang_clientLog": "Client Log",
- "lang_details": "Details",
- "lang_event": "Event",
- "lang_filter": "Filter",
- "lang_go": "go",
- "lang_not": "no",
- "lang_when": "When",
- "module_name": "Server Log"
-}
\ No newline at end of file
diff --git a/modules/syslog/lang/en/templates/page-syslog.json b/modules/syslog/lang/en/templates/page-syslog.json
deleted file mode 100644
index 71f61693..00000000
--- a/modules/syslog/lang/en/templates/page-syslog.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "lang_client": "Client",
- "lang_clientLog": "Client Log",
- "lang_details": "Details",
- "lang_event": "Event",
- "lang_filter": "Filter",
- "lang_go": "Go",
- "lang_not": "not",
- "lang_when": "When"
-}
\ No newline at end of file
diff --git a/modules/syslog/lang/pt/module.json b/modules/syslog/lang/pt/module.json
deleted file mode 100644
index 0f7c5356..00000000
--- a/modules/syslog/lang/pt/module.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "lang_client": "Cliente",
- "lang_clientLog": "Log dos Clientes",
- "lang_details": "Detalhes",
- "lang_event": "Evento",
- "lang_filter": "Filtro",
- "lang_go": "Ir",
- "lang_not": "n\u00e3o",
- "lang_when": "Quando",
- "module_name": "Log do Servidor"
-}
\ No newline at end of file
diff --git a/modules/syslog/page.inc.php b/modules/syslog/page.inc.php
deleted file mode 100644
index 43a9bd28..00000000
--- a/modules/syslog/page.inc.php
+++ /dev/null
@@ -1,94 +0,0 @@
-exec();
- while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
- $day = date('d.m.Y', $row['dateline']);
- if ($day === $today) {
- $day = Dictionary::translate('today');
- } elseif ($day === $yesterday) {
- $day = Dictionary::translate('yesterday');
- }
- $row['date'] = $day . date(' H:i', $row['dateline']);
- $row['icon'] = $this->eventToIconName($row['logtypeid']);
- $lines[] = $row;
- }
-
- $paginate->render('page-syslog', array(
- 'filter' => $filter,
- 'not' => $not,
- 'list' => $lines
- ));
- }
-
- private function eventToIconName($event)
- {
- switch ($event) {
- case 'session-open':
- return 'glyphicon-log-in';
- case 'session-close':
- return 'glyphicon-log-out';
- case 'partition-swap':
- return 'glyphicon-info-sign';
- case 'partition-temp':
- case 'smartctl-realloc':
- return 'glyphicon-exclamation-sign';
- default:
- return 'glyphicon-minus';
- }
- }
-
-}
diff --git a/modules/syslog/templates/page-syslog.html b/modules/syslog/templates/page-syslog.html
deleted file mode 100644
index 98e94291..00000000
--- a/modules/syslog/templates/page-syslog.html
+++ /dev/null
@@ -1,58 +0,0 @@
-
- {{lang_back}}
-
-
-
-
- {{module}}
-
-
-
-
-
-
-
- {{lang_clientLog}}
- -{{{pagenav}}} -| - | {{lang_when}} | -{{lang_client}} | -{{lang_event}} | -{{lang_details}} | - - - {{#list}} -
|---|---|---|---|---|
| - | {{date}} | -{{clientip}} | -{{description}} | -{{#extra}}
- »
- {{extra}}
- {{/extra}} |
-
', htmlspecialchars(substr($data, $start)), ''; - } - - protected function ajaxLdadpLog() - { - $files = glob('/var/log/ldadp/*.log', GLOB_NOSORT); - if ($files === false || empty($files)) echo('No logs found'); - $now = time(); - foreach ($files as $file) { - $mod = filemtime($file); - if ($now - $mod > 86400) continue; - // New enough - handle - preg_match(',/(\d+)\.log,', $file, $out); - $module = ConfigModule::get($out[1]); - if ($module === false) { - echo '
Module ', $out[1], '
'; - } else { - echo 'Module ', htmlspecialchars($module->title()), '
'; - } - $fh = @fopen($file, 'r'); - if ($fh === false) { - echo 'Error opening log file'; - continue; - } - fseek($fh, -5000, SEEK_END); - $data = fread($fh, 5000); - @fclose($fh); - if ($data === false) { - echo '
Error reading from log file'; - continue; - } - if (strlen($data) < 4990) { - $start = 0; - } else { - $start = strpos($data, "\n") + 1; - } - echo '
', htmlspecialchars(substr($data, $start)), ''; - } - } - - protected function ajaxNetstat() - { - $taskId = Taskmanager::submit('Netstat'); - if ($taskId === false) - return; - $status = Taskmanager::waitComplete($taskId, 3500); - - if (isset($status['data']['messages'])) - $data = $status['data']['messages']; - else - $data = 'Taskmanager error'; - - echo '
', htmlspecialchars($data), ''; - } - - protected function ajaxPsList() - { - $taskId = Taskmanager::submit('PsList'); - if ($taskId === false) - return; - $status = Taskmanager::waitComplete($taskId, 3500); - - if (isset($status['data']['messages'])) - $data = $status['data']['messages']; - else - $data = 'Taskmanager error'; - - echo '
', htmlspecialchars($data), ''; - } - - private function usageColor($percent) - { - if ($percent <= 50) { - $r = $b = $percent / 3; - $g = (100 - $percent * (50 / 80)); - } elseif ($percent <= 70) { - $r = 55 + ($percent - 50) * (30 / 20); - $g = 60; - $b = 0; - } else { - $r = ($percent - 70) / 3 + 90; - $g = (100 - $percent) * (60 / 30); - $b = 0; - } - $r = dechex(round($r * 2.55)); - $g = dechex(round($g * 2.55)); - $b = dechex(round($b * 2.55)); - return sprintf("%02s%02s%02s", $r, $g, $b); - } - -} diff --git a/modules/systemstatus/templates/_page.html b/modules/systemstatus/templates/_page.html deleted file mode 100644 index 51aa5b55..00000000 --- a/modules/systemstatus/templates/_page.html +++ /dev/null @@ -1,129 +0,0 @@ -{{#rebootTask}} -
Reboot...
-{{/rebootTask}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{lang_space}}
-
-
-
-
-
-
-
-
-
-
- {{lang_services}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{lang_addressConfiguration}}
-
-
-
-
-
-
-
-
-
-
- {{lang_system}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{lang_maintenance}}
-
-
-
-
-
- {{lang_advanced}}
- -
-
-
- {{lang_dmsdLog}}
-
-
-
-
-
-
-
- {{lang_ldadpLog}}
-
-
-
-
-
-
-
- netstat -tulpn
-
-
-
-
-
-
-
-
diff --git a/modules/systemstatus/templates/addresses.html b/modules/systemstatus/templates/addresses.html
deleted file mode 100644
index ce92c4d5..00000000
--- a/modules/systemstatus/templates/addresses.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
- ps auxf
-
-
-
-
-| {{ip}} | -({{iface}}) | -
- {{#system}}
- {{lang_systemPartition}}
-
-
-{{lang_capacity}}: {{size}}
- {{lang_free}}: {{free}}
- {{/system}}
- {{^system}}
- {{lang_systemStoreError}}
- {{/system}}
-
- {{#store}}
- {{lang_vmStore}}
-
-
-
-{{#notConfigured}}
-{{lang_capacity}}: {{size}}
- {{lang_free}}: {{free}}
- {{/store}}
- {{^store}}
- {{lang_vmStoreError}}
- {{/store}}
-{{lang_storeNotConfigured}}
-{{/notConfigured}}
-{{#storeMissing}}
-{{lang_storeMissingExpected}} {{storeMissing}}
-{{/storeMissing}}
-{{#wrongStore}}
-{{lang_foundStore}} {{wrongStore}}
-{{/wrongStore}}
-{{lang_goToStoreConf}}
-
diff --git a/modules/systemstatus/templates/services.html b/modules/systemstatus/templates/services.html
deleted file mode 100644
index 6c4f0b93..00000000
--- a/modules/systemstatus/templates/services.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{{#ldadpError}}
-{{ldadpError}}
-{{/ldadpError}}
-{{^ldadpError}}
-LDAP-AD-Proxy: OK
-{{/ldadpError}}
diff --git a/modules/systemstatus/templates/systeminfo.html b/modules/systemstatus/templates/systeminfo.html
deleted file mode 100644
index ed4a1532..00000000
--- a/modules/systemstatus/templates/systeminfo.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
- {{lang_uptimeOS}}: {{uptime}}
-
-
-
- {{lang_cpuLoad}}
- {{#cpuLoadOk}}
-
-
-
-{{lang_average}}: {{cpuLoad}}%
- {{lang_onlyOS}}: {{cpuSystem}}%
- {{lang_logicCPUs}}: {{cpuCount}}
- {{/cpuLoadOk}}
- {{^cpuLoadOk}}
- {{lang_notDetermined}}
- {{/cpuLoadOk}}
-
- {{lang_ramUsage}}
- {{#memTotal}}
-
-
-
-{{lang_total}}: {{memTotal}}
- {{lang_free}}: {{memFree}}
- {{/memTotal}}
- {{^memTotal}}
- {{lang_notDetermined}}
- {{/memTotal}}
-
- {{lang_swapUsage}}
- {{#memTotal}}
-
-
-
-
-
-{{#swapWarning}}
-{{lang_total}}: {{swapTotal}}
- {{lang_occupied}}: {{swapUsed}}
- {{/memTotal}}
- {{^memTotal}}
- {{lang_notDetermined}}
- {{/memTotal}}
-
- {{lang_attention}} {{lang_swapWarning}}
-
-{{/swapWarning}}
-
-
diff --git a/modules/translation/config.json b/modules/translation/config.json
deleted file mode 100644
index 6c189b63..00000000
--- a/modules/translation/config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "category":"main.content",
- "enabled":"true"
-}
diff --git a/modules/translation/lang/de/templates/_page.json b/modules/translation/lang/de/templates/_page.json
deleted file mode 100644
index 639697de..00000000
--- a/modules/translation/lang/de/templates/_page.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "lang_adminInfo": "In diesem Abschnitt k\u00f6nnen Sie die JSON-Tags, die \u00fcbersetzten Texte durch die Website verwendet wird, enth\u00e4lt zu \u00e4ndern. Um dies zu tun, w\u00e4hlen Sie eine Vorlage aus, um ihre jeweiligen Tags \u00e4ndern. Alternativ klicken Sie auf den Link unten, um die Nachrichten der Website \u00e4ndern.",
- "lang_editConfigModule": "Konfigurationsmodulbezeichnungsphrasen editieren",
- "lang_editHardcoded": "Hardcoded-Texte bearbeiten",
- "lang_editMessages": "Nachrichten bearbeiten",
- "lang_editSettings": "Einstellungstexte bearbeiten",
- "lang_editTemplates": "Template-Texte bearbeiten",
- "lang_langAdministration": "Sprache Verwaltung"
-}
\ No newline at end of file
diff --git a/modules/translation/lang/de/templates/edit.json b/modules/translation/lang/de/templates/edit.json
deleted file mode 100644
index 671e51d8..00000000
--- a/modules/translation/lang/de/templates/edit.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "lang_back": "Z\u00fcruck",
- "lang_createTag": "TAG schafen",
- "lang_deleteTAG": "L\u00f6schen",
- "lang_englishTAG": "Englisch TAG",
- "lang_germanTAG": "Deutsch TAG",
- "lang_newTAG": "Neue Tag",
- "lang_portugueseTAG": "Portugiesisch TAG",
- "lang_save": "Speichern",
- "lang_templateAdminHelp": "Hier k\u00f6nnen Sie die verwendeten Texte und S\u00e4tze \u00fcbersetzen.",
- "lang_templateHint": "Hinweis: Gelbe Linie zeigt eine \u00dcbersetzung fehlt und roten Linien zeigen ein Tag wird nicht von das Template verwendet."
-}
\ No newline at end of file
diff --git a/modules/translation/lang/de/templates/template-list.json b/modules/translation/lang/de/templates/template-list.json
deleted file mode 100644
index 5d6945bc..00000000
--- a/modules/translation/lang/de/templates/template-list.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "lang_adminInfo": "Dies ist eine Liste aller Templates. Die \u0022Status\u0022-Spalte zeigt an, wenn f\u00fcr ein Template \u00fcbersetzungen fehlen, oder veraltete Tags definiert sind.",
- "lang_langAdministration": "Templates",
- "lang_status": "Status"
-}
\ No newline at end of file
diff --git a/modules/translation/lang/en/module.json b/modules/translation/lang/en/module.json
deleted file mode 100644
index 07bdb07e..00000000
--- a/modules/translation/lang/en/module.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "lang_adminInfo": "In this section you can change the JSON tags that contains the translated texts used by the site. To do this, select a template below to modify their respective tags. Alternatively, click the link below to change the messages of the site.",
- "lang_back": "Back",
- "lang_deleteTAG": "Delete",
- "lang_editHardcoded": "Edit hardcoded strings",
- "lang_editMessages": "Edit Messages",
- "lang_editModules": "Edit Module Translations",
- "lang_editSettings": "Edit configuration variables related strings",
- "lang_langAdministration": "Language Administration",
- "lang_module": "Module",
- "lang_save": "Save",
- "lang_status": "Status",
- "lang_templateAdminHelp": "Here you can translate and edit phrases and texts.",
- "lang_templateHint": "Hint: Yellow lines indicate a translation is missing and red lines indicate a tag is not being used by the template.",
- "module_name": "Translation"
-}
\ No newline at end of file
diff --git a/modules/translation/lang/en/templates/_page.json b/modules/translation/lang/en/templates/_page.json
deleted file mode 100644
index 5a48b696..00000000
--- a/modules/translation/lang/en/templates/_page.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "lang_adminInfo": "In this section you can change the JSON tags that contains the translated texts used by the site. To do this, select a template below to modify their respective tags. Alternatively, click the link below to change the messages of the site.",
- "lang_editConfigModule": "Edit config module strings",
- "lang_editHardcoded": "Edit hardcoded strings",
- "lang_editMessages": "Edit Messages",
- "lang_editSettings": "Edit configuration variables related strings",
- "lang_editTemplates": "Edit template strings",
- "lang_langAdministration": "Language Administration"
-}
\ No newline at end of file
diff --git a/modules/translation/lang/en/templates/edit.json b/modules/translation/lang/en/templates/edit.json
deleted file mode 100644
index 05c6697a..00000000
--- a/modules/translation/lang/en/templates/edit.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "lang_back": "Back",
- "lang_createTag": "Create TAG",
- "lang_deleteTAG": "Delete",
- "lang_englishTAG": "English TAG",
- "lang_germanTAG": "German TAG",
- "lang_newTAG": "New TAG",
- "lang_portugueseTAG": "Portuguese TAG",
- "lang_save": "Save",
- "lang_templateAdminHelp": "Here you can translate and edit phrases and texts.",
- "lang_templateHint": "Hint: Yellow lines indicate a translation is missing and red lines indicate a tag is not being used by the template."
-}
\ No newline at end of file
diff --git a/modules/translation/lang/en/templates/template-list.json b/modules/translation/lang/en/templates/template-list.json
deleted file mode 100644
index e3feb70b..00000000
--- a/modules/translation/lang/en/templates/template-list.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "lang_adminInfo": "This is a list of all templates. The \u0022status\u0022-column tells if there are translations missing, or unused tags are defined.",
- "lang_langAdministration": "Templates",
- "lang_status": "Status"
-}
\ No newline at end of file
diff --git a/modules/translation/lang/pt/module.json b/modules/translation/lang/pt/module.json
deleted file mode 100644
index 14964c89..00000000
--- a/modules/translation/lang/pt/module.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "lang_adminInfo": "Nesta se\u00e7\u00e3o \u00e9 poss\u00edvel alterar as TAGs de JSON que cont\u00e9m os textos traduzidos utilizados no site. Para fazer isto, selecione um template abaixo para modificar suas respectivas TAGs. Alternativamente, clique no link abaixo para alterar as mensagens do site.",
- "lang_back": "Voltar",
- "lang_deleteTAG": "Excluir",
- "lang_editHardcoded": "Editar Textos Hardcoded",
- "lang_editMessages": "Editar Mensagens",
- "lang_editModules": "Editar Tradu\u00e7\u00f5es dos M\u00f3dulos",
- "lang_editSettings": "Editar Textos das Vari\u00e1veis de Configura\u00e7\u00e3o",
- "lang_langAdministration": "Administra\u00e7\u00e3o da L\u00edngua",
- "lang_module": "M\u00f3dulo",
- "lang_save": "Salvar",
- "lang_status": "Status",
- "lang_templateAdminHelp": "Aqui voc\u00ea pode traduzir e editar frases e textos.",
- "lang_templateHint": "Dica: linhas amarelas indicam que uma tradu\u00e7\u00e3o est\u00e1 faltando e linhas vermelhas indicam que uma tag n\u00e3o \u00e9 utilizada pelo template.",
- "module_name": "Tradu\u00e7\u00f5es"
-}
\ No newline at end of file
diff --git a/modules/translation/page.inc.php b/modules/translation/page.inc.php
deleted file mode 100644
index 3548f727..00000000
--- a/modules/translation/page.inc.php
+++ /dev/null
@@ -1,597 +0,0 @@
-updateJson();
- Util::redirect('?do=Translation');
- }
- if (Request::post('delete')) {
- $this->deleteTag(Request::post('path'), Request::post('delete'));
- Util::redirect('?do=Translation'); // TODO: Ajax post for delete so we stay on the page
- }
-
- $this->template = Request::get('template');
- $this->page = Request::get('page');
- }
-
- protected function doRender()
- {
- $langs = Dictionary::getLanguages(true);
-
- //load the page accordingly to the link
- switch ($this->page) {
- case 'messages':
- //renders the message edit page
- Render::addTemplate('edit', array(
- 'path' => 'messages',
- 'langs' => $langs,
- 'tags' => $this->loadMessageEditArray()
- ));
- break;
- case 'hardcoded':
- //renders the hardcoded messages edit page
- Render::addTemplate('edit', array(
- 'path' => 'messages-hardcoded',
- 'langs' => $langs,
- 'tags' => $this->loadHardcodedStringEditArray()
- ));
- break;
- case 'settings':
- //renders the settings related edit page
- Render::addTemplate('edit', array(
- 'path' => 'cat_setting',
- 'langs' => $langs,
- 'tags' => $this->loadCategoriesArray()
- ));
- Render::addTemplate('edit', array(
- 'path' => 'setting',
- 'langs' => $langs,
- 'tags' => $this->loadSettingsArray()
- ));
- break;
- case 'config-module':
- //renders the hardcoded messages edit page
- Render::addTemplate('edit', array(
- 'path' => 'config-module',
- 'langs' => $langs,
- 'tags' => $this->buildTranslationTable('config-module')
- ));
- break;
- case 'template':
- $this->template = Util::safePath($this->template);
- if ($this->template === false) {
- Message::addError('invalid-path');
- Util::redirect('?do=Translation');
- }
- //renders the tag edition page
- Render::addTemplate('edit', array(
- 'path' => 'modules/' . $this->template,
- 'langs' => $langs,
- 'tags' => $this->loadTemplateEditArray($this->template)
- ));
- break;
- case 'templates':
- //renders the template selection page
- Render::addTemplate('template-list', array(
- 'table' => $this->loadTemplatesList(),
- ));
- break;
- case 'modules':
- Render::addTemplate('module-list', array(
- 'table' => $this->loadModuleTable()
- ));
- break;
- default:
- //renders main page with selection of what part to edit
- Render::addTemplate('_page');
- }
- }
-
- private function loadModuleTable(){
- $table = array();
-
- $modules = $this->loadModuleList();
-
- foreach ($modules as $module) {
- $msgs = $this->checkModuleTranslation($module);
- $table[] = array(
- 'module' => $module,
- 'status' => $msgs
- );
- }
-
- sort($table);
- return $table;
- }
-
- private function loadModuleEdit(){
- $table = array();
- $tags = array_flip($this->loadModuleTags($this->module));
- foreach ($this->langs as $lang) {
- $tags = array_merge($tags, Dictionary::getArray($this->module,$lang['cc']));
- }
- foreach ($tags as $tag => $value) {
- $langArray = array();
- $class = '';
- foreach ($this->langs as $lang) {
- $translations = Dictionary::getArray($this->module,$lang['cc']);
- $langArray[] = array(
- 'lang' => $lang['cc'],
- 'placeholder' => 'TAG - ' . $lang['name'],
- 'translation' => $translations[$tag]
- );
- if(!in_array($tag, $this->loadModuleTags($this->module)))
- $class = 'danger';
- else if(!$translations[$tag])
- $class = 'warning';
- }
- $table[] = array(
- 'tag' => $tag,
- 'class' => $class,
- 'langs' => $langArray
- );
- }
-
- return $table;
- }
-
- private function loadModuleList(){
- // Return an array with the modules and the tags data
- $list = array();
- $list = array_diff(scandir('modules/'), array('..', '.'));
- return $list;
- }
-
- private function loadModuleTags($module){
- // Return an array with the module language tags
- $path = "modules/" . $module . "templates/";
- $files = array_diff(scandir($path), array('..', '.'));
- $tags = array();
- foreach ($files as $file) {
- $content = file_get_contents($path . $file);
- preg_match_all('/{{(lang_.*?)}}/s', $content, $matches);
- if (isset($matches[1]) && is_array($matches[1])){
- $tags = array_merge($tags,array_unique($matches[1]));
- }
- }
- return array_unique($tags);
- }
-
- private function checkModuleTranslation($module){
- $tags = $this->loadModuleTags($module);
- $translation = array();
- $msgs = '';
- foreach ($this->langs as $key => $lang) {
- $translation = Dictionary::getArray($module,$lang['cc']);
- $matches = 0;
- $unused = 0;
- $expected = count($tags);
- foreach ($translation as $key => $value) {
- if(!in_array($key, $tags))
- $unused ++;
- else if(!empty($value))
- $matches ++;
-
- }
-
- $diff = $expected - $matches;
- $msg = "";
- if ($diff > 0)
- $msg .= $diff . " JSON tag(s) are missing";
- if ($diff > 0 && $unused > 0)
- $msg .= ""; - if ($unused > 0) - $msg .= $unused . " JSON tag(s) are not being used"; - if(!empty($msg)) - $msgs .= "
{$lang['name']}: $msg
";
- }
- if(empty($msgs))
- $msgs = 'OK';
- return $msgs;
- }
- /**
- * Load the main table with all the website's templates and it's informations
- * @return array with the templates' information
- */
- private function loadTemplatesList()
- {
- $table = array();
-
- //loads every template
- $files = $this->listTemplates();
- $langs = Dictionary::getLanguages(true);
-
- //checks the JSON tags from every language
- foreach ($files as $file) {
- $tags = $this->loadTemplateTags($file['path']);
- // Don't list templates without lang tags
- if (empty($tags))
- continue;
- $msgs = '';
- foreach ($langs as $lang) {
- $msg = $this->checkJson($file['path'], $lang['cc'], $tags);
- if (!empty($msg))
- $msgs .= "{$lang['name']}:$msg
";
- }
- if (empty($msgs))
- $msgs = 'OK';
- $table[] = array(
- 'template' => $file['name'],
- 'link' => $file['name'],
- 'status' => $msgs
- );
- }
- sort($table);
- return $table;
- }
-
- /**
- * Finds and returns all the website's templates
- * @return array
- */
- private function listTemplates()
- {
- $files = array();
- $dir = 'modules/';
- $objects = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir));
- foreach ($objects as $name => $object) {
- if (substr($name, -5) === '.html') {
- $files[] = array(
- 'path' => substr($name, 0, -5),
- 'name' => substr($name, strlen($dir), -5)
- );
- }
- }
- return $files;
- }
-
- /**
- * Finds and returns all PHP files of slxadmin
- * @return array of all php files
- */
- private function listPhp()
- {
- $php = array();
- $dir = '.';
- $objects = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir));
- foreach ($objects as $name => $object) {
- if (substr($name, -4) === '.php') {
- $php[] = $name;
- }
- }
- return $php;
- }
-
- /**
- * Checks the JSON tags from a template
- * @param string the template's path
- * @param string the selected language
- * @param string tags that should be in the json file
- * @return string|boolean the information about the JSON tags, false if template has no lang-tags
- */
- private function checkJson($path, $lang, $expectedTags)
- {
- //if there was not a valid template's path
- if (!$path) {
- return "Translation missing";
- }
- // How many tags do we expect in the translation
- $htmlCount = count($expectedTags);
-
- //initialize the count variables
- $matchCount = 0;
- $unusedCount = 0;
-
- //loads the JSON tags and count the matches
- $json = Dictionary::getArray(substr($path, strlen("modules/")), $lang);
- //return print_r($json) . "\nvs\n" . print_r($expectedTags);
- foreach ($json as $key => $value) {
- if (!in_array($key, $expectedTags)) {
- $unusedCount++;
- } else if (!empty($value)) {
- $matchCount++;
- }
- }
- $diff = $htmlCount - $matchCount;
-
- if ($diff == 0 && $unusedCount == 0)
- return '';
- //build the return string
- $str = "";
- if ($diff > 0)
- $str .= $diff . " JSON tag(s) are missing";
- if ($diff > 0 && $unusedCount > 0)
- $str .= ""; - if ($unusedCount > 0) - $str .= $unusedCount . " JSON tag(s) are not being used"; - return $str; - } - - /** - * Get array to pass to edit page with all the tags and translations for the given template - * @param string $path the template's path - * @return array the information about the JSON tags - */ - private function loadTemplateEditArray($path) - { - $tags = $this->loadTemplateTags($path); - if ($tags === false) - return false; - return $this->buildTranslationTable("modules/" . $path, $tags); - } - - /** - * Load array of tags used in given template. - * @param string $path the path of the template, relative to templates/, without .html extension. - * @return array all tags in template - */ - private function loadTemplateTags($path) - { - $templateFile = "$path.html"; - //checks if the template is valid - if (!file_exists($templateFile)) { - Message::addError('invalid-template', $templateFile); - return false; - } - - //finds every mustache tag within the html template - $htmlTemplate = file_get_contents($templateFile); - preg_match_all('/{{(lang_.*?)}}/s', $htmlTemplate, $matches); - if (!isset($matches[1]) || !is_array($matches[1])) - return array(); - return array_unique($matches[1]); - } - - /** - * Load array of tags and translations of all messages - * @return array the information about the JSON tags - */ - private function loadMessageEditArray() - { - $tags = $this->loadTagsFromPhp('/Message\s*::\s*add\w+\s*\(\s*[\'"](.*?)[\'"]\s*[\)\,]/i'); - if ($tags === false) - return false; - return $this->buildTranslationTable('messages', $tags); - } - - /** - * Load array of tags and translations of all strings found in the php files. - * @return array the information about the JSON tags - */ - private function loadHardcodedStringEditArray() - { - $tags = $this->loadTagsFromPhp('/Dictionary\s*::\s*translate\s*\(\s*[\'"]([^\'"]*?)[\'"]\s*\)/i'); - if ($tags === false) - return false; - return $this->buildTranslationTable('messages-hardcoded', $tags); - } - - /** - * Load array of tags used in all the php files, by given regexp. Capture group 1 should return - * the exact tag name. - * @param string $regexp regular expression matching all tags in capture group 1 - * @return array of all tags found - */ - private function loadTagsFromPhp($regexp) - { - // Get all php files, so we can find all strings that need to be translated - $php = $this->listPhp(); - $tags = array(); - // Now find all tags in all php files. Only works for literal usage, not something like $foo = 'bar'; Dictionary::translate($foo); - foreach ($php as $file) { - $content = @file_get_contents($file); - if ($content === false || preg_match_all($regexp, $content, $out) < 1) - continue; - foreach ($out[1] as $id) { - $tags[$id] = true; - } - } - return array_keys($tags); - } - - private function buildTranslationTable($path, $requiredTags = false) - { - // All languages - $langArray = Dictionary::getLanguages(); - - $tags = array(); - if ($requiredTags !== false) { - foreach ($requiredTags as $tagName) { - $tags[$tagName] = array('tag' => $tagName); - foreach ($langArray as $lang) { - $tags[$tagName]['langs'][$lang]['lang'] = $lang; - $tags[$tagName]['missing'] = count($langArray); - } - } - } - // Finds every JSON tag within the JSON language files - foreach ($langArray as $lang) { - $jsonTags = Dictionary::getArray($path, $lang, true); - if (!is_array($jsonTags)) - continue; - foreach ($jsonTags as $tag => $translation) { - $tags[$tag]['langs'][$lang]['translation'] = $translation; - $tags[$tag]['langs'][$lang]['lang'] = $lang; - if (strpos($translation, "\n") !== false) - $tags[$tag]['langs'][$lang]['big'] = true; - $tags[$tag]['tag'] = $tag; - if (!isset($tags[$tag]['missing'])) - $tags[$tag]['missing'] = 0; - if (!empty($translation)) - $tags[$tag]['missing'] --; - } - } - // Fill the blanks - foreach ($langArray as $lang) { - foreach (array_keys($tags) as $tagName) { - if (!isset($tags[$tagName]['langs'][$lang])) - $tags[$tagName]['langs'][$lang]['lang'] = $lang; - } - } - // Finally remove $lang from the keys so mustache will iterate over them via {{#..}} - foreach ($tags as &$tag) { - $tag['langs'] = array_values($tag['langs']); - if ($requiredTags !== false) - $tag['class'] = $this->getTagColor($tag['missing']); - } - return array_values($tags); - } - - /** - * Change the color of the table line according to the tag status - * @param string the JSON's path - * @param string the selected tag - * @return string the css class of the line - */ - private function getTagColor($missingCount) - { - //return danger in case the tag is not found in the template - if ($missingCount < 0) - return 'danger'; - - //return warning in case at least one of the tag's values is empty - if ($missingCount > 0) - return 'warning'; - //if it's ok don't change the class - return ''; - } - - /** - * Updates a JSON file with it's new tags or/and tags values - */ - private function updateJson() - { - $langArray = Dictionary::getLanguages(); - foreach ($langArray as $lang) { - $json[$lang] = array(); - } - - //find the tag requests to change the file - foreach ($_POST as $key => $value) { - $str = explode('#', $key, 3); - if (count($str) !== 3 || $str[0] !== 'lang') - continue; - $lang = $str[1]; - $tag = trim($str[2]); - if (!isset($json[$lang])) { - Message::addWarning('i18n-invalid-lang', $lang); - continue; - } - if (empty($tag)) { - Message::addWarning('i18n-empty-tag'); - continue; - } - $value = trim($value); - if ($tag !== 'newtag') { - if (empty($value)) { - unset($json[$lang][$tag]); - } else { - $json[$lang][$tag] = $value; - } - } else { - if (!empty($value)) // TODO: Error message if new tag's name collides with existing - $json[$lang][$_REQUEST['newtag']] = $value; - } - } - - // JSON_PRETTY_PRINT is only available starting with php 5.4.0.... Use upgradephp's json_encode - require_once('inc/up_json_encode.php'); - - //saves the new values on the file - foreach ($json as $key => $array) { - $path = Util::safePath('lang/' . $key . '/' . Request::post('path') . '.json'); - if ($path === false) { - Message::addError('invalid-path'); - Util::redirect('?do=Translation'); - } - @mkdir(dirname($path), 0755, true); - ksort($array); // Sort by key, so the diff on the output is cleaner - $json = up_json_encode($array, JSON_PRETTY_PRINT); // Also for better diffability of the json files, we pretty print - //exits the function in case the action was unsuccessful - if (@file_put_contents($path, $json) === false) { - Message::addError('invalid-template'); - return; - } - } - Message::addSuccess('updated-tags'); - } - - /** - * Delete a specific JSON tag from a JSON files - * @var string the JSON's file path - * @var the JSON tag to be deleted - * @return boolean if the action was not successful - */ - private function deleteTag($path, $tag) - { - // JSON_PRETTY_PRINT is only available starting with php 5.4.0.... Use upgradephp's json_encode - require_once('inc/up_json_encode.php'); - - //delete the tag from every language file - $langArray = Dictionary::getLanguages(); - foreach ($langArray as $lang) { - $json = Dictionary::getArray($path, $lang); - unset($json[$tag]); - $result = file_put_contents('lang/' . $lang . '/' . $path . '.json', up_json_encode($json, JSON_PRETTY_PRINT)); - //add warning and exit in case the action was unsuccessful - if ($result === false) { - Message::addWarning('unsuccessful-action'); - return false; - } - } - Message::addSuccess('deleted-tag'); - } - - /** - * Load all settings categories for editing. - * - * @return array - */ - private function loadCategoriesArray() - { - $want = array(); - $res = Database::simpleQuery("SELECT catid FROM cat_setting ORDER BY catid ASC"); - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { - $want[] = 'cat_' . $row['catid']; - } - return $this->buildTranslationTable('settings/cat_setting', $want); - } - - /** - * Load all settings categories for editing. - * - * @return array - */ - private function loadSettingsArray() - { - $want = array(); - $res = Database::simpleQuery("SELECT setting FROM setting ORDER BY setting ASC"); - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { - $want[] = $row['setting']; - } - return $this->buildTranslationTable('settings/setting', $want); - } - -} diff --git a/modules/translation/templates/_page.html b/modules/translation/templates/_page.html deleted file mode 100644 index 52a4c94b..00000000 --- a/modules/translation/templates/_page.html +++ /dev/null @@ -1,17 +0,0 @@ -
-
diff --git a/modules/translation/templates/edit.html b/modules/translation/templates/edit.html
deleted file mode 100644
index dc01deb6..00000000
--- a/modules/translation/templates/edit.html
+++ /dev/null
@@ -1,71 +0,0 @@
-
- {{lang_langAdministration}}
-
-
-
-{{lang_adminInfo}}
- -
-
-
diff --git a/modules/translation/templates/module-list.html b/modules/translation/templates/module-list.html
deleted file mode 100644
index 037a21bc..00000000
--- a/modules/translation/templates/module-list.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
- {{path}}
-
-
-
- {{lang_templateAdminHelp}}
-
- {{lang_templateHint}}
-
-
-
-
-
- {{lang_langAdministration}}
-
-
-
-{{lang_adminInfo}}
-
-
-
-
-
-
-
diff --git a/modules/translation/templates/template-list.html b/modules/translation/templates/template-list.html
deleted file mode 100644
index 881fc5af..00000000
--- a/modules/translation/templates/template-list.html
+++ /dev/null
@@ -1,32 +0,0 @@
-| {{lang_module}} | -{{lang_status}} | -
|---|---|
| {{module}} | -{{{status}}} | -
-
-
- {{lang_langAdministration}}
-
-
-
-{{lang_adminInfo}}
-
-
-
-
-
-
-
diff --git a/modules/usermanagement/config.json b/modules/usermanagement/config.json
deleted file mode 100644
index b9fc3ad3..00000000
--- a/modules/usermanagement/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "category":"main.users",
- "enabled":"true",
- "permission":"0"
-}
diff --git a/modules/usermanagement/lang/en/module.json b/modules/usermanagement/lang/en/module.json
deleted file mode 100644
index a8114ffc..00000000
--- a/modules/usermanagement/lang/en/module.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "lang_cancelConfirm": "Do you really want to delete this users?",
- "lang_close": "Close",
- "lang_create": "Create",
- "lang_edit": "Edit",
- "lang_editUser": "Edit User",
- "lang_email": "Email",
- "lang_login": "Login",
- "lang_operations": "Operation",
- "lang_password": "Password",
- "lang_remove": "Remove",
- "lang_save": "Save",
- "lang_telephone": "Telephone",
- "lang_userAdmin": "Administrator",
- "lang_userInfo": "On this section, you will be able to create website users, besides editing or removing existing users.",
- "lang_userPage": "Users",
- "lang_username": "Username",
- "module_name": "Management"
-}
\ No newline at end of file
diff --git a/modules/usermanagement/lang/en/templates/user-management.json b/modules/usermanagement/lang/en/templates/user-management.json
deleted file mode 100644
index 61225f55..00000000
--- a/modules/usermanagement/lang/en/templates/user-management.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "lang_cancelConfirm": "Do you really want to delete this users?",
- "lang_close": "Close",
- "lang_create": "Create",
- "lang_edit": "Edit",
- "lang_editUser": "Edit User",
- "lang_email": "Email",
- "lang_login": "Login",
- "lang_operations": "Operation",
- "lang_password": "Password",
- "lang_remove": "Remove",
- "lang_save": "Save",
- "lang_telephone": "Telephone",
- "lang_userAdmin": "Administrator",
- "lang_userInfo": "On this section, you will be able to create website users, besides editing or removing existing users.",
- "lang_userPage": "Users",
- "lang_username": "Username"
-}
\ No newline at end of file
diff --git a/modules/usermanagement/lang/pt/module.json b/modules/usermanagement/lang/pt/module.json
deleted file mode 100644
index d892e5c5..00000000
--- a/modules/usermanagement/lang/pt/module.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "lang_cancelConfirm": "Deseja realmente remover o usu\u00e1rio?",
- "lang_close": "Fechar",
- "lang_create": "Criar",
- "lang_edit": "Editar",
- "lang_editUser": "Editar Usu\u00e1rio",
- "lang_email": "Email",
- "lang_login": "Login",
- "lang_operations": "Opera\u00e7\u00f5es",
- "lang_password": "Senha",
- "lang_remove": "Remover",
- "lang_save": "Salvar",
- "lang_telephone": "Telefone",
- "lang_userAdmin": "Administrador",
- "lang_userInfo": "Nesta se\u00e7\u00e3o voc\u00ea poder\u00e1 criar usu\u00e1rios para o site, al\u00e9m de editar as informa\u00e7\u00f5es ou remover usu\u00e1rios existentes.",
- "lang_userPage": "Usu\u00e1rios",
- "lang_username": "Nome do Usu\u00e1rio",
- "module_name": "Gerenciamento"
-}
\ No newline at end of file
diff --git a/modules/usermanagement/page.inc.php b/modules/usermanagement/page.inc.php
deleted file mode 100644
index 01b5f755..00000000
--- a/modules/usermanagement/page.inc.php
+++ /dev/null
@@ -1,109 +0,0 @@
-page = $p;
- else
- $this->page = 1;
-
- switch(Request::post('action')){
- case "editAdmin":
- $this->edit(Request::post('userid'),Request::post('username'),Request::post('phone'),Request::post('email'), 1);
- break;
- case "edit":
- $this->edit(Request::post('userid'),Request::post('username'),Request::post('phone'),Request::post('email'), 4);
- break;
- case "create":
- $this->create(Request::post('login'),Request::post('username'),Request::post('pass'),Request::post('phone'),Request::post('email'), 4);
- break;
- case "delete":
- $this->delete(Request::post('userid'));
- break;
- }
-
- if(isset($_POST['userid']))
- $this->deb = $_POST['userid'];
-
- if (!User::hasPermission('superadmin')) {
- Message::addError('no-permission');
- Util::redirect('?do=Main');
- }
-
- }
-
- protected function doRender()
- {
- // load every user
- $admin = array();
- $users = array();
- $res = Database::simpleQuery("SELECT userid, login, fullname, phone, email, permissions FROM user ORDER BY userid DESC");
- while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
- if ($row['permissions'] == 1 )
- $admin = array($row['userid'],$row['login'],$row['fullname'],$row['phone'],$row['email']);
- else
- $users[] = array(
- 'id' => $row['userid'],
- 'username' => $row['login'],
- 'name' => $row['fullname'],
- 'telephone' => $row['phone'],
- 'email' => $row['email']
- );
- }
-
- //$pag = new Paginate($users,$this->page);
-
- Render::addTemplate('user-management', array(
- 'admin_id' => $admin[0],
- 'admin_username' => $admin[1],
- 'admin_name' => $admin[2],
- 'admin_telephone' => $admin[3],
- 'admin_email' => $admin[4]
- //'users' => $pag->getItems(),
- //'pages' => $pag->getPagination()
- ));
- }
-
- private function edit($userid, $newname, $newphone, $newemail, $newpermissions){
- $data = array (
- 'user' => $userid,
- 'name' => $newname,
- 'phone' => $newphone,
- 'email' => $newemail,
- 'permissions' => $newpermissions
- );
- Database::exec ( 'UPDATE user SET fullname = :name, phone = :phone, email = :email, permissions = :permissions WHERE userid = :user', $data );
- Message::addSuccess('update-user');
- }
-
- private function create($login, $username, $password, $phone, $email){
- $data = array (
- 'login' => $login,
- 'pass' => Crypto::hash6 ( $password ),
- 'name' => $username,
- 'phone' => $phone,
- 'email' => $email
- );
- User::addUser($data);
- }
-
- private function delete($userid){
- $data = array (
- 'userid' => $userid
- );
- Database::exec ( 'DELETE FROM setting_partition WHERE user = :userid', $data );
- Database::exec ( 'DELETE FROM setting_user WHERE user = :userid', $data );
- Database::exec ( 'DELETE FROM setting_values WHERE user = :userid', $data );
- Database::exec ( 'DELETE FROM user WHERE userid = :userid', $data );
- Message::addSuccess('delete-user');
- }
-
-}
diff --git a/modules/usermanagement/templates/user-management.html b/modules/usermanagement/templates/user-management.html
deleted file mode 100644
index fc14355f..00000000
--- a/modules/usermanagement/templates/user-management.html
+++ /dev/null
@@ -1,127 +0,0 @@
-| Template | -{{lang_status}} | -
|---|---|
| {{template}} | -{{{status}}} | -
-
-
-
-
-
-
- {{lang_userAdmin}}
- | ID | -{{lang_login}} | -{{lang_username}} | -{{lang_telephone}} | -{{lang_email}} | -- |
|---|---|---|---|---|---|
-
-
-
-{{#users}}
-
-
- {{lang_userPage}}
-
-
- - {{lang_userInfo}} -
- -| ID | -{{lang_login}} | -{{lang_operations}} | -|||
|---|---|---|---|---|---|
| - | - | - - - | -|||
-
|
- |||||
-
-{{/users}}
\ No newline at end of file
diff --git a/modules/vmstore/config.json b/modules/vmstore/config.json
deleted file mode 100644
index f2abe27c..00000000
--- a/modules/vmstore/config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "category":"main.settings",
- "enabled":"true"
-}
diff --git a/modules/vmstore/lang/de/templates/mount.json b/modules/vmstore/lang/de/templates/mount.json
deleted file mode 100644
index dbc75281..00000000
--- a/modules/vmstore/lang/de/templates/mount.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "lang_back": "Zur\u00fcck",
- "lang_configure": "Konfigurieren",
- "lang_vmLocationConfiguration": "VM Speicherort wird konfiguriert"
-}
\ No newline at end of file
diff --git a/modules/vmstore/lang/de/templates/page-vmstore.json b/modules/vmstore/lang/de/templates/page-vmstore.json
deleted file mode 100644
index bb2c0634..00000000
--- a/modules/vmstore/lang/de/templates/page-vmstore.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "lang_close": "Schlie\u00dfen",
- "lang_intern": "Intern",
- "lang_nfsHelp1": "Ben\u00f6tigt wird ein NFSv4\/3-Share, der f\u00fcr den Satelliten-Server schreibbar, und f\u00fcr die Arbeitsstationen lesbar ist. Beispielkonfiguration auf dem NFS-Server, wenn der Satelliten-Server die Adresse 1.2.3.4 hat:",
- "lang_nfsHelp2": "Alternative Konfiguration mittels all_sqash. In diesem Fall muss das Verzeichnis auf dem Server dem Benutzer mit der uid 1234 geh\u00f6ren:",
- "lang_noAdditionalInformation": "Keine weitere Konfiguration notwendig",
- "lang_password": "Passwort",
- "lang_readOnly": "Nur-Lese-Zugangsdaten",
- "lang_readWrite": "Lese\/Schreib-Zugangsdaten",
- "lang_save": "Speichern",
- "lang_username": "Benutzerkennung",
- "lang_vmLocation": "VM Speicherort",
- "lang_vmLocationChoose": "Bitte w\u00e4hlen Sie, wo die Images der Virtuellen Maschinen gespeichert werden sollen.",
- "lang_vmLocationHelp1": "F\u00fcr Testzwecke k\u00f6nnen die VMs direkt auf dem Satellitenserver gespeichert werden. Sofern Sie jedoch die ausgelieferte Satelliten-vmdk betreiben bedenken Sie bitte, dass Sie dann nur ca. 100GB Speicher zur Verf\u00fcgung haben.",
- "lang_vmLocationHelp2": "Im Produktivbetrieb bietet es sich an, hierf\u00fcr einen performanten Netzwerkspeicher zu benutzen. Dieser Netzwerkspeicher kann per NFS oder CIFS\/SMB eingebunden werden. In jedem Fall muss sichergestellt werden, dass der Satellitenserver zum Hinzuf\u00fcgen neuer Virtueller Maschinen Schreibzugriff auf diesen Netzwerkspeicher hat. Bei der Nutzung von NFSv3 kann dies IP-Basiert eingerichtet werden, f\u00fcr die Nutzung von CIFS\/SMB k\u00f6nnen Sie Zugangsdaten angaben, die zum Schreiben berechtigen.",
- "lang_vmLocationHelp3": "Die bwLehrpool-Clients brauchen lediglich Lesezugriff auf den Netzwerkspeicher (und sollten aus Sicherheitsgr\u00fcnden auch wirklich nur lesen k\u00f6nnen). Bei CIFS\/SMB erreichen Sie dies am einfachsten, indem Sie passwortlosen Gastzugriff mit Leserechten auf die Freigabe erlauben."
-}
\ No newline at end of file
diff --git a/modules/vmstore/lang/en/module.json b/modules/vmstore/lang/en/module.json
deleted file mode 100644
index 9d11656f..00000000
--- a/modules/vmstore/lang/en/module.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "lang_back": "Back",
- "lang_close": "Close",
- "lang_configure": "Configure",
- "lang_intern": "Intern",
- "lang_nfsHelp1": "An NFSv3-Share is required. It should be readable by all the workstations, and writable for the satellite server. An example, assuming the satellite server has IP address 1.2.3.4:",
- "lang_nfsHelp2": "Alternate configuration using all_squash. The exported directory should be owned (and be writable) by the user with uid 1234.",
- "lang_noAdditionalInformation": "No additional cofiguration required",
- "lang_password": "Password",
- "lang_readOnly": "Read-only Access",
- "lang_readWrite": "Read\/Write Access",
- "lang_save": "Save",
- "lang_username": "Username",
- "lang_vmLocation": "VM Location",
- "lang_vmLocationChoose": "Please choose where the images of virtual machines will be stored.",
- "lang_vmLocationConfiguration": "VM Location is being configured",
- "lang_vmLocationHelp1": "For test purposes, the VMs can be stored directly on the Satellite server. However, if you operate the delivered satellite vmdk please remember that you have only about 100GB of memory.",
- "lang_vmLocationHelp2": "In productive operation, it makes sense for this to use a high-performance network storage. This network storage can be integrated via NFS or CIFS \/ SMB. In any case, it must be ensured that the satellite server has write access to this network storage to add a new Virtual Machine . When using NFSv3 this can be set up IP-based, for the use of CIFS \/ SMB, you can access data disclosures that would entitle them to write.",
- "lang_vmLocationHelp3": "The bwLehrpool clients only need read access to the network storage (and for security reasons, really can only read). In CIFS \/ SMB You can do this most easily by allowing passwordless guest access with read access to the share.",
- "module_name": "Virtual Machine"
-}
\ No newline at end of file
diff --git a/modules/vmstore/lang/en/templates/mount.json b/modules/vmstore/lang/en/templates/mount.json
deleted file mode 100644
index 29814430..00000000
--- a/modules/vmstore/lang/en/templates/mount.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "lang_back": "Back",
- "lang_configure": "Configure",
- "lang_vmLocationConfiguration": "VM location is configured"
-}
\ No newline at end of file
diff --git a/modules/vmstore/lang/en/templates/page-vmstore.json b/modules/vmstore/lang/en/templates/page-vmstore.json
deleted file mode 100644
index 23ddbbd3..00000000
--- a/modules/vmstore/lang/en/templates/page-vmstore.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "lang_close": "Close",
- "lang_intern": "Intern",
- "lang_nfsHelp1": "An NFSv4\/3-Share is required. It should be readable by all the workstations, and writable for the satellite server. An example, assuming the satellite server has IP address 1.2.3.4:",
- "lang_nfsHelp2": "Alternate configuration using all_squash. The exported directory should be owned (and be writable) by the user with uid 1234.",
- "lang_noAdditionalInformation": "No additional cofiguration required",
- "lang_password": "Password",
- "lang_readOnly": "Read-only Access",
- "lang_readWrite": "Read\/Write Access",
- "lang_save": "Save",
- "lang_username": "Username",
- "lang_vmLocation": "VM Location",
- "lang_vmLocationChoose": "Please choose where the images of virtual machines will be stored.",
- "lang_vmLocationHelp1": "For test purposes, the VMs can be stored directly on the Satellite server. However, if you operate the delivered satellite vmdk please remember that you have only about 100GB of memory.",
- "lang_vmLocationHelp2": "In productive operation, it makes sense for this to use a high-performance network storage. This network storage can be integrated via NFS or CIFS \/ SMB. In any case, it must be ensured that the satellite server has write access to this network storage to add a new Virtual Machine . When using NFSv3 this can be set up IP-based, for the use of CIFS \/ SMB, you can access data disclosures that would entitle them to write.",
- "lang_vmLocationHelp3": "The bwLehrpool clients only need read access to the network storage (and for security reasons, really can only read). In CIFS \/ SMB You can do this most easily by allowing passwordless guest access with read access to the share."
-}
\ No newline at end of file
diff --git a/modules/vmstore/lang/pt/module.json b/modules/vmstore/lang/pt/module.json
deleted file mode 100644
index 1aa7fdaf..00000000
--- a/modules/vmstore/lang/pt/module.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "lang_back": "Voltar",
- "lang_close": "Fechar",
- "lang_configure": "configurar",
- "lang_intern": "Iterna",
- "lang_nfsHelp1": "\u00c9 necess\u00e1rio um NFSv3-Share. Ele deve poder ser lido por todas as esta\u00e7\u00f5es de trabalho, e poder ser escrito pelo server. Um exemplo, assumindo que o server possui endere\u00e7o ip 1.2.3.4:",
- "lang_nfsHelp2": "Configura\u00e7\u00e3o alternativa usando all_squash. O usu\u00e1rio com uid 1234 deve possuir ( e poder escrever em ) o diret\u00f3rio exportado.",
- "lang_noAdditionalInformation": "Nenhuma configura\u00e7\u00e3o adicional necess\u00e1ria",
- "lang_password": "Senha",
- "lang_readOnly": "Acesso Somente Leitura",
- "lang_readWrite": "Acesso Leitura\/Escrita",
- "lang_save": "Salvar",
- "lang_username": "Nome de Usu\u00e1rio",
- "lang_vmLocation": "Localiza\u00e7\u00e3o da VM",
- "lang_vmLocationChoose": "Por favor, escolha aonde as imagens das m\u00e1quinas virtuais ser\u00e3o armazenadas.",
- "lang_vmLocationConfiguration": "Localiza\u00e7\u00e3o da VM \u00e9 configurada",
- "lang_vmLocationHelp1": "Para fins de teste, as VMs podem ser armazenados diretamente no servidor sat\u00e9lite. No entanto, se voc\u00ea operar o vmdk do sat\u00e9lite entregue por favor lembre-se que voc\u00ea tem apenas cerca de 100 GB de mem\u00f3ria.",
- "lang_vmLocationHelp2": "Em opera\u00e7\u00e3o, faz sentido para este usar um armazenamento de rede de alto desempenho. Este armazenamento de rede pode ser integrado atrav\u00e9s de NFS ou CIFS \/ SMB. Em qualquer caso, deve-se assegurar de que o servidor de sat\u00e9lite tenha acesso de grava\u00e7\u00e3o para este armazenamento de rede para poder adicionar uma nova m\u00e1quina virtual. Ao utilizar NFSv3 este pode ser configurado com base em IP, para o uso de CIFS \/ SMB, voc\u00ea pode acessar as divulga\u00e7\u00f5es de dados que lhe permitiria escrever.",
- "lang_vmLocationHelp3": "Os clientes bwLehrpool s\u00f3 precisam ter acesso de leitura ao armazenamento de rede (e por raz\u00f5es de seguran\u00e7a, realmente s\u00f3 pode ler). Em CIFS \/ SMB Voc\u00ea pode fazer isso mais facilmente, permitindo o acesso a visitantes sem senha com acesso de leitura.",
- "module_name": "M\u00e1quina Virtual"
-}
\ No newline at end of file
diff --git a/modules/vmstore/page.inc.php b/modules/vmstore/page.inc.php
deleted file mode 100644
index 81f92ee3..00000000
--- a/modules/vmstore/page.inc.php
+++ /dev/null
@@ -1,63 +0,0 @@
-setStore();
- }
- }
-
- protected function doRender()
- {
- $action = Request::post('action');
- if ($action === 'setstore' && !Taskmanager::isFailed($this->mountTask)) {
- Render::addTemplate('mount', array(
- 'task' => $this->mountTask['id']
- ));
- return;
- }
- $vmstore = Property::getVmStoreConfig();
- if (isset($vmstore['storetype'])) {
- $vmstore['pre-' . $vmstore['storetype']] = 'checked';
- }
- Render::addTemplate('page-vmstore', $vmstore);
- }
-
- private function setStore()
- {
- foreach (array('storetype', 'nfsaddr', 'cifsaddr', 'cifsuser', 'cifspasswd', 'cifsuserro', 'cifspasswdro') as $key) {
- $vmstore[$key] = trim(Request::post($key, ''));
- }
- $storetype = $vmstore['storetype'];
- if (!in_array($storetype, array('internal', 'nfs', 'cifs'))) {
- Message::addError('value-invalid', 'type', $storetype);
- Util::redirect('?do=VmStore');
- }
- // Validate syntax of nfs/cifs
- if ($storetype === 'nfs' && !preg_match('#^\S+:\S+$#is', $vmstore['nfsaddr'])) {
- Message::addError('value-invalid', 'nfsaddr', $vmstore['nfsaddr']);
- Util::redirect('?do=VmStore');
- }
- $vmstore['cifsaddr'] = str_replace('\\', '/', $vmstore['cifsaddr']);
- if ($storetype === 'cifs' && !preg_match('#^//\S+/.+$#is', $vmstore['cifsaddr'])) {
- Message::addError('value-invalid', 'nfsaddr', $vmstore['nfsaddr']);
- Util::redirect('?do=VmStore');
- }
- $this->mountTask = Trigger::mount($vmstore);
- TaskmanagerCallback::addCallback($this->mountTask, 'manualMount', $vmstore);
- }
-
-}
\ No newline at end of file
diff --git a/modules/vmstore/templates/mount.html b/modules/vmstore/templates/mount.html
deleted file mode 100644
index eabee81a..00000000
--- a/modules/vmstore/templates/mount.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/vmstore/templates/page-vmstore.html b/modules/vmstore/templates/page-vmstore.html
deleted file mode 100644
index fe2c5225..00000000
--- a/modules/vmstore/templates/page-vmstore.html
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-
- {{lang_vmLocationConfiguration}}
-
-
-
-
- - - -
-{{lang_configure}}
-
- - - - -
-
-
-
-
-
-
-
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 @@
-
-
-
-
-
diff --git a/modules/webinterface/templates/https.html b/modules/webinterface/templates/https.html
deleted file mode 100644
index c6161cd6..00000000
--- a/modules/webinterface/templates/https.html
+++ /dev/null
@@ -1,60 +0,0 @@
-
diff --git a/modules/webinterface/templates/passwords.html b/modules/webinterface/templates/passwords.html
deleted file mode 100644
index f9fda016..00000000
--- a/modules/webinterface/templates/passwords.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
--
cgit v1.2.3-55-g7522
{{lang_applyingSettings}}
-
-
-{{lang_installAndRestart}}
-