From 05b361f1288fa93e272e11eb2e3cc3e6ec5e830a Mon Sep 17 00:00:00 2001 From: Jannik Schönartz Date: Fri, 23 Nov 2018 00:08:07 +0100 Subject: [dozmod] Add LDAP filter submodule --- modules-available/dozmod/lang/de/permissions.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'modules-available/dozmod/lang/de/permissions.json') diff --git a/modules-available/dozmod/lang/de/permissions.json b/modules-available/dozmod/lang/de/permissions.json index df913265..ad099d37 100644 --- a/modules-available/dozmod/lang/de/permissions.json +++ b/modules-available/dozmod/lang/de/permissions.json @@ -1,6 +1,8 @@ { "actionlog.view": "Aktions-Log einsehen.", "expiredimages.delete": "Zur L\u00f6schung vorgemerkete Abbilder l\u00f6schen.", + "ldapfilters.save": "LDAP Filter speichern.", + "ldapfilters.view": "LDAP Filter einsehen.", "mailconfig.save": "\u00c4nderungen an der SMTP-Konfiguration zum Versenden von Mails speichern.", "runtimeconfig.save": "\u00c4nderungen an der Laufzeit-Konfiguration speichern.", "templates.reset": "E-Mail Templates zur\u00fccksetzen.", -- cgit v1.2.3-55-g7522 From 541b9aae3a8f96b0a800dbccf348e360c92a292c Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Fri, 23 Nov 2018 00:10:20 +0100 Subject: [dozmod] add network share submodule --- modules-available/dozmod/lang/de/messages.json | 2 + modules-available/dozmod/lang/de/module.json | 1 + modules-available/dozmod/lang/de/permissions.json | 2 + .../dozmod/lang/de/template-tags.json | 11 +++ modules-available/dozmod/lang/en/messages.json | 2 + modules-available/dozmod/lang/en/module.json | 1 + modules-available/dozmod/lang/en/permissions.json | 2 + .../dozmod/lang/en/template-tags.json | 11 +++ modules-available/dozmod/page.inc.php | 3 +- .../dozmod/pages/networkshares.inc.php | 63 ++++++++++++++ .../dozmod/permissions/permissions.json | 6 ++ .../dozmod/templates/networkshares-edit.html | 85 +++++++++++++++++++ .../dozmod/templates/networkshares.html | 95 ++++++++++++++++++++++ 13 files changed, 283 insertions(+), 1 deletion(-) create mode 100644 modules-available/dozmod/pages/networkshares.inc.php create mode 100644 modules-available/dozmod/templates/networkshares-edit.html create mode 100644 modules-available/dozmod/templates/networkshares.html (limited to 'modules-available/dozmod/lang/de/permissions.json') diff --git a/modules-available/dozmod/lang/de/messages.json b/modules-available/dozmod/lang/de/messages.json index 60c37927..85b8ca70 100644 --- a/modules-available/dozmod/lang/de/messages.json +++ b/modules-available/dozmod/lang/de/messages.json @@ -4,6 +4,8 @@ "dozmod-error": "Fehler bei der Kommunikation mit dem bwLehrpool-Suite server: {{0}}", "images-pending-delete-exist": "Zur L\u00f6schung markierte VM-Versionen: {{0}}", "mail-config-saved": "Mail-Konfiguration gespeichert", + "networkshare-deleted": "Netzlaufwerk gel\u00f6scht", + "networkshare-saved": "Netzlaufwerk gespeichert", "no-expired-images": "Keine Abgelaufenen VM-Versionen", "nothing-submitted": "Es wurde nichts \u00fcbermittelt", "runtimelimits-config-saved": "Einstellungen gespeichert", diff --git a/modules-available/dozmod/lang/de/module.json b/modules-available/dozmod/lang/de/module.json index c9acd4ee..7bd3e0c0 100644 --- a/modules-available/dozmod/lang/de/module.json +++ b/modules-available/dozmod/lang/de/module.json @@ -4,6 +4,7 @@ "submenu_actionlog": "Aktions-Log", "submenu_expiredimages": "Abgelaufene VM-Versionen", "submenu_mailconfig": "Email-Konfiguration", + "submenu_networkshares": "Netzlaufwerke", "submenu_runtimeconfig": "Limits und Standardwerte", "submenu_templates": "Textbausteine f\u00fcr E-Mails", "submenu_users": "Benutzer und Berechtigungen" diff --git a/modules-available/dozmod/lang/de/permissions.json b/modules-available/dozmod/lang/de/permissions.json index df913265..53cbf1d8 100644 --- a/modules-available/dozmod/lang/de/permissions.json +++ b/modules-available/dozmod/lang/de/permissions.json @@ -2,6 +2,8 @@ "actionlog.view": "Aktions-Log einsehen.", "expiredimages.delete": "Zur L\u00f6schung vorgemerkete Abbilder l\u00f6schen.", "mailconfig.save": "\u00c4nderungen an der SMTP-Konfiguration zum Versenden von Mails speichern.", + "networkshares.save": "Netzlaufwerke einsehen.", + "networkshares.view": "\u00c4nderungen an den Netzlaufwerken speichern.", "runtimeconfig.save": "\u00c4nderungen an der Laufzeit-Konfiguration speichern.", "templates.reset": "E-Mail Templates zur\u00fccksetzen.", "templates.save": "E-Mail Templates speichern.", diff --git a/modules-available/dozmod/lang/de/template-tags.json b/modules-available/dozmod/lang/de/template-tags.json index 84f6e0de..fa4b49f5 100644 --- a/modules-available/dozmod/lang/de/template-tags.json +++ b/modules-available/dozmod/lang/de/template-tags.json @@ -1,8 +1,11 @@ { "lang_actionTarget": "Aktionsziel", + "lang_active": "Aktiv", + "lang_addShare": "Netzlaufwerk hinzufügen", "lang_allowLoginByDefault": "Login standardm\u00e4\u00dfig erlauben", "lang_allowLoginDescription": "Wenn diese Option aktiviert ist, k\u00f6nnen sich alle Mitarbeiter der Einrichtung \u00fcber die bwLehrpool-Suite anmelden und VMs\/Veranstaltungen verwalten. Wenn Sie diese Option deaktivieren, m\u00fcssen Sie in der Untersektion \"Benutzer und Berechtigungen\" jeden Benutzer nach dem ersten Loginversuch manuell freischalten.", "lang_asteriskRequired": "Felder mit (*) sind erforderlich", + "lang_authMethod": "Authentifizierung", "lang_blockCount": "Anzahl Bl\u00f6cke", "lang_bwlehrpoolsuite": "bwLehrpool-Suite", "lang_canLoginOrganization": "Nutzer dieser Einrichtung k\u00f6nnen sich am Satelliten anmelden", @@ -21,6 +24,7 @@ "lang_descriptionRuntimeLimits": "Hier k\u00f6nnen Sie verschiedene Limits festlegen, z.B. wie lange eine VM nach dem Hochladen g\u00fcltig ist. Nach Ablauf dieses Zeitraums ist der Verantwortliche gezwungen, eine neue Version der VM hochzuladen. Damit k\u00f6nnen Sie das Ansammeln nicht mehr ben\u00f6tigter VMs eind\u00e4mmen. Weiterhin k\u00f6nnen Sie die maximale Anzahl gleichzeitiger Transfers pro Benutzer einschr\u00e4nken.\r\n\r\nVer\u00e4nderte Einstellungen wirken sich nicht auf bereits bestehende VMs aus.", "lang_description_delete_images": "Diese Liste zeigt VMs, 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_dozmodLogHeading": "bwLehrpool-Suite Aktionslog", + "lang_editNetworkshare": "Netzlaufwerk bearbeiten", "lang_email": "EMail", "lang_emailNotifications": "EMail-Benachrichtigungen aktiviert", "lang_error": "Fehler", @@ -39,6 +43,7 @@ "lang_lecturePermissionAdmin": "Administration", "lang_lecturePermissionEdit": "Bearbeiten", "lang_loadDefaults": "Alle Texte auf Auslieferungszustand zur\u00fccksetzen", + "lang_loggedInUser": "Angemeldeter Nutzer", "lang_mailConfig": "SMTP-Konfiguration zum Versenden von Mails", "lang_mailDescription": "F\u00fcllen Sie die folgenden Felder aus, wenn sie m\u00f6chten, dass Dozierende per Mail benachrichtigt werden, 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 Dozierender auf eine der automatisch generierten Mails antwortet (bzw. eine explizit angegebene Reply-To Adresse ignoriert).", "lang_mailTemplates": "E-Mail Templates", @@ -48,11 +53,14 @@ "lang_maxTransfers": "Maximale Zahl gleichzeitiger Up-\/Downloads pro Benutzer", "lang_miscOptions": "Verschiedene Einstellungen", "lang_modified": "Modifiziert", + "lang_name": "Name", + "lang_networkshares": "Netzlaufwerke", "lang_organization": "Einrichtung", "lang_organizationListHeader": "Nutzungsrechte f\u00fcr den Satelliten festlegen", "lang_os": "Betriebssystem", "lang_owner": "Besitzer", "lang_passwordplaceholder": "SMTP Passwort", + "lang_path": "Pfad", "lang_placeholders": "Platzhalter", "lang_port": "Port", "lang_reallyResetTemplates": "Sind Sie sicher, dass Sie alle Texte l\u00f6schen und auf die Standardwerte zur\u00fccksetzen wollen?", @@ -61,15 +69,18 @@ "lang_runtimeConfig": "Laufzeit-Konfiguration", "lang_runtimeConfigLimits": "Beschr\u00e4nkungen", "lang_senderAddress": "Absenderadresse", + "lang_shareDeleteConfirm": "Willst du dieses Netzlaufwerk wirklich l\u00f6schen?", "lang_senderName": "Absender Anzeigename", "lang_size": "Gr\u00f6\u00dfe", "lang_spaceWastedDuplication": "Potentiell durch mehrfach vorkommende Bl\u00f6cke belegter Speicherplatz", + "lang_specificUser": "Spezifischer Nutzer", "lang_ssl": "SSL-Modus", "lang_sslExplicit": "Explizites SSL (\"STARTTLS\")", "lang_sslImplicit": "Implizites SSL", "lang_sslNone": "Kein SSL", "lang_superUser": "Ist SuperUser (darf alle Veranstaltungen und VMs bearbeiten\/l\u00f6schen)", "lang_system": "System", + "lang_target": "Ziel", "lang_template": "Template", "lang_templatePageDescription": "Hier k\u00f6nnen Sie die Textbausteine bearbeiten, aus denen die Mails generiert werden, die der bwLehrpool-Server bez\u00fcglich Virtueller Maschinen und Veranstaltungen versendet. Diese Funktionalit\u00e4t unterst\u00fctzt zur Zeit keine Internationalisierung.", "lang_test": "Test-Mail senden", diff --git a/modules-available/dozmod/lang/en/messages.json b/modules-available/dozmod/lang/en/messages.json index 6d7ea0ac..8d309d1d 100644 --- a/modules-available/dozmod/lang/en/messages.json +++ b/modules-available/dozmod/lang/en/messages.json @@ -4,6 +4,8 @@ "dozmod-error": "Error communicating with the bwLehrpool-Suite server: {{0}}", "images-pending-delete-exist": "VMs marked for deletion: {{0}}", "mail-config-saved": "Mail config saved", + "networkshare-deleted": "Network share deleted", + "networkshare-saved": "Network share saved", "no-expired-images": "No expired VMs", "nothing-submitted": "There was nothing submitted", "runtimelimits-config-saved": "Configuration saved successfully", diff --git a/modules-available/dozmod/lang/en/module.json b/modules-available/dozmod/lang/en/module.json index b7a04762..91ebf304 100644 --- a/modules-available/dozmod/lang/en/module.json +++ b/modules-available/dozmod/lang/en/module.json @@ -4,6 +4,7 @@ "submenu_actionlog": "action log", "submenu_expiredimages": "Expired VM versions", "submenu_mailconfig": "email configuration", + "submenu_networkshares": "Network Shares", "submenu_runtimeconfig": "limits and defaults", "submenu_templates": "templates", "submenu_users": "users and permissions" diff --git a/modules-available/dozmod/lang/en/permissions.json b/modules-available/dozmod/lang/en/permissions.json index 0827c8d2..c1e44504 100644 --- a/modules-available/dozmod/lang/en/permissions.json +++ b/modules-available/dozmod/lang/en/permissions.json @@ -2,6 +2,8 @@ "actionlog.view": "View action log.", "expiredimages.delete": "Delete images marked for deletion.", "mailconfig.save": "Save SMTP configuration for sending mails.", + "networkshares.save": "View network drives.", + "networkshares.view": "Save network drives.", "runtimeconfig.save": "Save limits and defaults of a runtime configuration.", "templates.reset": "Reset email templates.", "templates.save": "Save email templates.", diff --git a/modules-available/dozmod/lang/en/template-tags.json b/modules-available/dozmod/lang/en/template-tags.json index 3ee95e8c..9cbc7378 100644 --- a/modules-available/dozmod/lang/en/template-tags.json +++ b/modules-available/dozmod/lang/en/template-tags.json @@ -1,8 +1,11 @@ { "lang_actionTarget": "Action target", + "lang_active": "Active", + "lang_addShare": "Add Network Share", "lang_allowLoginByDefault": "Allow all staff members to login and use the bwLehrpool-Suite", "lang_allowLoginDescription": "If this option is enabled, all members of the organization marked as staff or employee are allowed to login to this server and manage VMs\/courses. Otherwise, new users need to be individually allowed access after their first login attempt by visiting the sub page \"users and permissions\" in this web interface.", "lang_asteriskRequired": "Fields marked with (*) are required", + "lang_authMethod": "Authentication", "lang_blockCount": "Block count", "lang_bwlehrpoolsuite": "bwLehrpool-Suite", "lang_canLoginOrganization": "Users from this organization can login", @@ -21,6 +24,7 @@ "lang_descriptionRuntimeLimits": "Here you can define some limits, e.g. how long a newly uploaded VM will be valid. This should make sure that you don't end up with a lot of old, unused VMs over time.\r\n\r\nModified settings won't apply for already existing VMs.", "lang_description_delete_images": "This is a list of VMs that either expired, or where the disk image is damaged or missing. These VMs are not available in bwLehrpool currently, but you have to manually confirm the deletion of the disk images for safety reasons (clock skew etc.)", "lang_dozmodLogHeading": "bwLehrpool-Suite action log", + "lang_editNetworkshare": "Edit Network Share", "lang_email": "E-Mail", "lang_emailNotifications": "E-Mail notifications enabled", "lang_error": "Error", @@ -39,6 +43,7 @@ "lang_lecturePermissionAdmin": "Administrate", "lang_lecturePermissionEdit": "Edit", "lang_loadDefaults": "Reset all templates to their defaults", + "lang_loggedInUser": "Logged in User", "lang_mailConfig": "SMTP configuration for sending mails", "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_mailTemplates": "E-Mail Templates", @@ -48,11 +53,14 @@ "lang_maxTransfers": "Max concurrent transfers per user", "lang_miscOptions": "Misc options", "lang_modified": "modified", + "lang_name": "Name", + "lang_networkshares": "Network Shares", "lang_organization": "Organization", "lang_organizationListHeader": "Set access permissions for organizations", "lang_os": "Operating System", "lang_owner": "Owner", "lang_passwordplaceholder": "SMTP Password", + "lang_path": "Path", "lang_placeholders": "Placeholders", "lang_port": "Port", "lang_reallyResetTemplates": "Are you sure you want to reset all texts to their default values?", @@ -62,14 +70,17 @@ "lang_runtimeConfigLimits": "Limitations", "lang_senderAddress": "Sender address", "lang_senderName": "Sender's display name", + "lang_shareDeleteConfirm": "Do you really want to delete this network share?", "lang_size": "Size", "lang_spaceWastedDuplication": "Potentially wasted space by duplicate blocks", + "lang_specificUser": "Specific User", "lang_ssl": "SSL mode", "lang_sslExplicit": "Explicit SSL (\"STARTTLS\")", "lang_sslImplicit": "Implicit SSL", "lang_sslNone": "No SSL", "lang_superUser": "Is super user (can edit\/delete all lectures and VMs)", "lang_system": "System", + "lang_target": "Target", "lang_template": "Template", "lang_templatePageDescription": "Here you can edit text fragments that are used to compose the information and reminder mails sent by the bwLehrpool server, e.g. when a lecture or VM is about to expire.", "lang_test": "Send test mail", diff --git a/modules-available/dozmod/page.inc.php b/modules-available/dozmod/page.inc.php index a8e0da0e..9fc65f5f 100644 --- a/modules-available/dozmod/page.inc.php +++ b/modules-available/dozmod/page.inc.php @@ -5,7 +5,7 @@ class Page_DozMod extends Page /** @var bool true if we have a proper subpage */ private $haveSubPage = false; - private $validSections = ['expiredimages', 'mailconfig', 'templates', 'runtimeconfig', 'users', 'actionlog']; + private $validSections = ['expiredimages', 'mailconfig', 'templates', 'runtimeconfig', 'users', 'actionlog', 'networkshares']; private $section; @@ -60,6 +60,7 @@ class Page_DozMod extends Page Dictionary::translate('submenu_runtimeconfig', true); Dictionary::translate('submenu_users', true); Dictionary::translate('submenu_actionlog', true); + Dictionary::translate('submenu_networkshares', true); */ /* add sub-menus */ diff --git a/modules-available/dozmod/pages/networkshares.inc.php b/modules-available/dozmod/pages/networkshares.inc.php new file mode 100644 index 00000000..d0bbe03a --- /dev/null +++ b/modules-available/dozmod/pages/networkshares.inc.php @@ -0,0 +1,63 @@ + $shareid]); + if ($res) Message::addSuccess('networkshare-deleted'); + } + } else if ($action === 'save') { + User::assertPermission('networkshares.save'); + $shareid = Request::post('shareid', false, 'int'); + $sharename = Request::post('sharename', false, 'string'); + $path = Request::post('path', false, 'string'); + $target = Request::post('target', null, 'string'); + $username = Request::post('username', null, 'string'); + $password = Request::post('password', null, 'string'); + if ($sharename && $path) { + if ($shareid) { + Database::exec('UPDATE sat.presetnetworkshare SET sharename = :sharename, path = :path, target = :target, username = :username, password = :password' + .' WHERE shareid = :shareid', compact('shareid', 'sharename', 'path', 'target', 'username', 'password')); + } else { + Database::exec('INSERT INTO sat.presetnetworkshare (sharename, path, target, username, password, active)' + .' VALUES (:sharename, :path, :target, :username, :password, 0)', compact('sharename', 'path', 'target', 'username', 'password')); + } + Message::addSuccess('networkshare-saved'); + } + } else if ($action === 'toggleActive') { + User::assertPermission('networkshares.save'); + $shareid = Request::post('shareid', false, 'int'); + Database::exec('UPDATE sat.presetnetworkshare SET active = !active WHERE shareid = :shareid', compact('shareid')); + } + User::assertPermission('networkshares.view'); + } + + public static function doRender() + { + $show = Request::get('show', 'list', 'string'); + if ($show === 'list') { + $res = Database::simpleQuery('SELECT * FROM sat.presetnetworkshare;'); + $rows = array(); + while ($row = $res->fetch(PDO::FETCH_ASSOC)) { + $row['specificUser'] = $row['username'] && $row['password']; + $rows[] = $row; + } + Render::addTemplate('networkshares', ['networkshares' => $rows, 'hasEditPermissions' => User::hasPermission('networkshares.save')]); + } else if ($show === 'edit') { + $shareid = Request::get('shareid', 0, 'int'); + $data = Database::queryFirst('SELECT * FROM sat.presetnetworkshare WHERE shareid = :shareid', ['shareid' => $shareid]); + if ($data['username'] && $data['password']) $data['specificUser'] = 'selected'; + else $data['loggedInUser'] = 'selected'; + Render::addTemplate('networkshares-edit', $data); + } + } + +} diff --git a/modules-available/dozmod/permissions/permissions.json b/modules-available/dozmod/permissions/permissions.json index b9c82107..db20a3c0 100644 --- a/modules-available/dozmod/permissions/permissions.json +++ b/modules-available/dozmod/permissions/permissions.json @@ -8,6 +8,12 @@ "mailconfig.save": { "location-aware": false }, + "networkshares.view": { + "location-aware": false + }, + "networkshares.save": { + "location-aware": false + }, "runtimeconfig.save": { "location-aware": false }, diff --git a/modules-available/dozmod/templates/networkshares-edit.html b/modules-available/dozmod/templates/networkshares-edit.html new file mode 100644 index 00000000..32aa902f --- /dev/null +++ b/modules-available/dozmod/templates/networkshares-edit.html @@ -0,0 +1,85 @@ +

{{lang_networkshares}}

+ +
+
+ {{lang_editNetworkshare}} +
+
+
+ + + + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + {{lang_cancel}} + + +
+
+
+
+ + \ No newline at end of file diff --git a/modules-available/dozmod/templates/networkshares.html b/modules-available/dozmod/templates/networkshares.html new file mode 100644 index 00000000..48506b4e --- /dev/null +++ b/modules-available/dozmod/templates/networkshares.html @@ -0,0 +1,95 @@ +

{{lang_networkshares}}

+ + + + + + + + + + {{#hasEditPermissions}} + + + + {{/hasEditPermissions}} + + + + {{#networkshares}} + + + + + + + {{#hasEditPermissions}} + + + + {{/hasEditPermissions}} + + {{/networkshares}} + +
{{lang_name}}{{lang_path}}{{lang_target}}{{lang_authMethod}}{{lang_username}}{{lang_active}}{{lang_edit}}{{lang_delete}}
{{sharename}}{{path}}{{#target}}{{.}}:{{/target}}{{#specificUser}}{{lang_specificUser}}{{/specificUser}}{{^specificUser}}{{lang_loggedInUser}}{{/specificUser}}{{#specificUser}}{{username}}{{/specificUser}} +
+ + + + +
+ 		+ + + + + +
+{{#hasEditPermissions}} +
+ + + {{lang_addShare}} + +
+{{/hasEditPermissions}} + + +
+ + + +
+ + \ No newline at end of file -- cgit v1.2.3-55-g7522 From b98119be9411ad73b989fdf29284ad59b8340e4e Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 10 Dec 2018 15:43:07 +0100 Subject: [dozmod] Add editor for predefined run scripts Assigning scripts to certain locations only is currently not possible. Whether this is required is to be discussed, since predefined scripts selectable by bwLehrpool-Suite users would almost cover this use case. Refs #3145 --- modules-available/dozmod/lang/de/messages.json | 2 + modules-available/dozmod/lang/de/module.json | 1 + modules-available/dozmod/lang/de/permissions.json | 2 + .../dozmod/lang/de/template-tags.json | 18 +++ modules-available/dozmod/page.inc.php | 3 +- modules-available/dozmod/pages/runscripts.inc.php | 133 +++++++++++++++++++++ .../dozmod/permissions/permissions.json | 6 + modules-available/dozmod/style.css | 20 ++++ .../dozmod/templates/runscripts-edit.html | 89 ++++++++++++++ .../dozmod/templates/runscripts-list.html | 89 ++++++++++++++ 10 files changed, 362 insertions(+), 1 deletion(-) create mode 100644 modules-available/dozmod/pages/runscripts.inc.php create mode 100644 modules-available/dozmod/templates/runscripts-edit.html create mode 100644 modules-available/dozmod/templates/runscripts-list.html (limited to 'modules-available/dozmod/lang/de/permissions.json') diff --git a/modules-available/dozmod/lang/de/messages.json b/modules-available/dozmod/lang/de/messages.json index f74c3eab..4a4be923 100644 --- a/modules-available/dozmod/lang/de/messages.json +++ b/modules-available/dozmod/lang/de/messages.json @@ -18,6 +18,8 @@ "networkshare-saved": "Netzlaufwerk gespeichert", "no-expired-images": "Keine Abgelaufenen VM-Versionen", "nothing-submitted": "Es wurde nichts \u00fcbermittelt", + "runscript-invalid-id": "Ung\u00fcltige Script-ID: {{0}}", + "runscript-saved": "Script gespeichert", "runtimelimits-config-saved": "Einstellungen gespeichert", "templates-saved": "Templates wurden gespeichert", "timeout": "Zeit\u00fcberschreitung", diff --git a/modules-available/dozmod/lang/de/module.json b/modules-available/dozmod/lang/de/module.json index b2746b81..de8b10f7 100644 --- a/modules-available/dozmod/lang/de/module.json +++ b/modules-available/dozmod/lang/de/module.json @@ -6,6 +6,7 @@ "submenu_ldapfilters": "LDAP Filter", "submenu_mailconfig": "Email-Konfiguration", "submenu_networkshares": "Netzlaufwerke", + "submenu_runscripts": "Startscripte", "submenu_runtimeconfig": "Limits und Standardwerte", "submenu_templates": "Textbausteine f\u00fcr E-Mails", "submenu_users": "Benutzer und Berechtigungen" diff --git a/modules-available/dozmod/lang/de/permissions.json b/modules-available/dozmod/lang/de/permissions.json index 845be3b9..a1675148 100644 --- a/modules-available/dozmod/lang/de/permissions.json +++ b/modules-available/dozmod/lang/de/permissions.json @@ -6,6 +6,8 @@ "mailconfig.save": "\u00c4nderungen an der SMTP-Konfiguration zum Versenden von Mails speichern.", "networkshares.save": "Netzlaufwerke einsehen.", "networkshares.view": "\u00c4nderungen an den Netzlaufwerken speichern.", + "runscripts.save": "Startkripte erstellen\/bearbeiten", + "runscripts.view": "Startscripte auflisten", "runtimeconfig.save": "\u00c4nderungen an der Laufzeit-Konfiguration speichern.", "templates.reset": "E-Mail Templates zur\u00fccksetzen.", "templates.save": "E-Mail Templates speichern.", diff --git a/modules-available/dozmod/lang/de/template-tags.json b/modules-available/dozmod/lang/de/template-tags.json index 99756995..ef775a16 100644 --- a/modules-available/dozmod/lang/de/template-tags.json +++ b/modules-available/dozmod/lang/de/template-tags.json @@ -25,6 +25,7 @@ "lang_description_delete_images": "Diese Liste zeigt VMs, 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_dozmodLogHeading": "bwLehrpool-Suite Aktionslog", "lang_editNetworkshare": "Netzlaufwerk bearbeiten", + "lang_editScript": "Startscript bearbeiten", "lang_email": "EMail", "lang_emailNotifications": "EMail-Benachrichtigungen aktiviert", "lang_error": "Fehler", @@ -34,6 +35,7 @@ "lang_hasNewer": "Neuere Version existiert", "lang_hash": "Hash", "lang_heading": "Zu l\u00f6schende VM-Versionen", + "lang_hidden": "Versteckt", "lang_host": "Host", "lang_image": "VM", "lang_lastEditor": "Zuletzt bearbeitet von", @@ -60,12 +62,14 @@ "lang_maxLectureVisibility": "Sp\u00e4testes Enddatum einer Veranstaltung (Tage in der Zukunft)", "lang_maxLocationsPerLecture": "Max. explizite Orte pro Veranstaltung", "lang_maxTransfers": "Maximale Zahl gleichzeitiger Up-\/Downloads pro Benutzer", + "lang_minimized": "Minimiert", "lang_miscOptions": "Verschiedene Einstellungen", "lang_modified": "Modifiziert", "lang_name": "Name", "lang_networkshares": "Netzlaufwerke", "lang_networksharesIntro": "Hier k\u00f6nnen Sie vordefinierte Netzlaufwerke anlegen, die den Nutzern der bwLehrpool-Suite zur Auswahl gestellt werden. Es ist den Nutzern der bwLehrpool-Suite weiterhin m\u00f6glich, komplett eigene Netzwerkfreigaben zu definieren. Die Angaben hier sollen lediglich das Hinzuf\u00fcgen h\u00e4ufig genutzter Laufwerke vereinfachen, bzw. das \u00c4ndern eines Netzwerkpfades vereinfachen, da in diesem Fall nur der Zentrale Eintrag hier angepasst werden muss, und nicht mehr wie zuvor jede Veranstaltung einzeln.", "lang_none": "(Keiner)", + "lang_normal": "Normal", "lang_organization": "Einrichtung", "lang_organizationListHeader": "Nutzungsrechte f\u00fcr den Satelliten festlegen", "lang_os": "Betriebssystem", @@ -78,8 +82,22 @@ "lang_reallyResetTemplates": "Sind Sie sicher, dass Sie alle Texte l\u00f6schen und auf die Standardwerte zur\u00fccksetzen wollen?", "lang_replaceWithOriginal": "Originaltext in Textbox laden", "lang_replyTo": "Reply-To Adresse", + "lang_runScriptAdd": "Script hinzuf\u00fcgen", + "lang_runScriptDeleteConfirmation": "Script wirklich l\u00f6schen?", "lang_runtimeConfig": "Laufzeit-Konfiguration", "lang_runtimeConfigLimits": "Beschr\u00e4nkungen", + "lang_scriptContent": "Scriptinhalt", + "lang_scriptExtension": "Dateinamenerweiterung", + "lang_scriptExtensionHead": "Erweiterung", + "lang_scriptIsGlobal": "Script ist global, wird in jeder Veranstaltung ausgef\u00fchrt", + "lang_scriptIsGlobalHead": "Global", + "lang_scriptIsPredefined": "Script ist ein vordefiniertes Script, das in der bwLehrpool-Suite zur Auswahl steht", + "lang_scriptPassCredentials": "Benutzername\/Passwort an dieses Script \u00fcbergeben", + "lang_scriptPassCredentialsHead": "User\/Pass", + "lang_scriptVisibility": "Anzeigemodus", + "lang_scriptVisibilityHead": "Anzeige", + "lang_scriptsHead": "Startscripte f\u00fcr Virtuelle Umgebungen", + "lang_scriptsIntro": "Hier k\u00f6nnen Sie Startskripte definieren, die entweder global bei jedem Start einer Veranstaltung ausgef\u00fchrt werden, oder den Nutzerinnen der bwLehrpool-Suite zur Vorauswahl zur Verf\u00fcgung gestellt werden.", "lang_senderAddress": "Absenderadresse", "lang_senderName": "Absender Anzeigename", "lang_shareDeleteConfirm": "Willst du dieses Netzlaufwerk wirklich l\u00f6schen?", diff --git a/modules-available/dozmod/page.inc.php b/modules-available/dozmod/page.inc.php index cdb347ab..776109cf 100644 --- a/modules-available/dozmod/page.inc.php +++ b/modules-available/dozmod/page.inc.php @@ -5,7 +5,7 @@ class Page_DozMod extends Page /** @var bool true if we have a proper subpage */ private $haveSubPage = false; - private $validSections = ['expiredimages', 'mailconfig', 'templates', 'runtimeconfig', 'users', 'actionlog', 'networkshares', 'ldapfilters']; + private $validSections = ['expiredimages', 'mailconfig', 'templates', 'runtimeconfig', 'users', 'actionlog', 'networkshares', 'ldapfilters', 'runscripts']; private $section; @@ -62,6 +62,7 @@ class Page_DozMod extends Page Dictionary::translate('submenu_actionlog', true); Dictionary::translate('submenu_networkshares', true); Dictionary::translate('submenu_ldapfilters', true); + Dictionary::translate('submenu_runscripts', true); */ /* add sub-menus */ diff --git a/modules-available/dozmod/pages/runscripts.inc.php b/modules-available/dozmod/pages/runscripts.inc.php new file mode 100644 index 00000000..c6566c13 --- /dev/null +++ b/modules-available/dozmod/pages/runscripts.inc.php @@ -0,0 +1,133 @@ + $scriptname, + 'content' => Request::post('content', '', 'string'), + 'visibility' => Request::post('visibility', 1, 'int'), + 'extension' => preg_replace('/[^a-z0-9_\-~\!\$\=]/i', '', Request::post('extension', '', 'string')), + 'passcreds' => Request::post('passcreds', 0, 'int') !== 0, + 'isglobal' => Request::post('isglobal', 0, 'int') !== 0, + ]; + if ($id === 0) { + // New entry + $ret = Database::exec('INSERT INTO sat.presetrunscript + (scriptname, content, extension, visibility, passcreds, isglobal) VALUES + (:scriptname, :content, :extension, :visibility, :passcreds, :isglobal)', $data); + $id = Database::lastInsertId(); + } else { + // Edit entry + $data['id'] = $id; + Database::exec('UPDATE sat.presetrunscript SET + scriptname = :scriptname, content = :content, extension = :extension, visibility = :visibility, + passcreds = :passcreds, isglobal = :isglobal + WHERE runscriptid = :id', $data); + } + $oslist = Request::post('osid', false, 'array'); + if (is_array($oslist)) { + $oslist = array_filter($oslist, 'is_numeric'); + $query = Database::prepare('INSERT INTO sat.presetrunscript_x_operatingsystem + (runscriptid, osid) VALUES (:id, :osid)'); + foreach ($oslist as $osid) { + $query->execute(['id' => $id, 'osid' => $osid]); + } + $query->closeCursor(); + Database::exec('DELETE FROM sat.presetrunscript_x_operatingsystem + WHERE runscriptid = :id AND osid NOT IN (:oslist)', ['id' => $id, 'oslist' => $oslist]); + } + Message::addSuccess('runscript-saved'); + } + + public static function doRender() + { + $show = Request::get('show', 'list', 'string'); + if ($show === 'list') { + $res = Database::simpleQuery('SELECT runscriptid, scriptname, extension, visibility, passcreds, isglobal + FROM sat.presetrunscript + ORDER BY scriptname ASC'); + $rows = []; + while ($row = $res->fetch(PDO::FETCH_ASSOC)) { + if ($row['visibility'] == 0) { + $row['visibility'] = 'eye-close'; + } elseif ($row['visibility'] == 1) { + $row['visibility'] = 'eye-open'; + } else { + $row['visibility'] = 'arrow-down'; + } + $rows[] = $row; + } + Render::addTemplate('runscripts-list', ['list' => $rows, 'hasEditPermission' => User::hasPermission('runscripts.save')]); + } elseif ($show === 'edit') { + // Edit + $id = Request::get('runscriptid', false, 'int'); + if ($id === false) { + Message::addError('main.parameter-missing', 'runscriptid'); + Util::redirect('?do=dozmod§ion=runscripts'); + } + if ($id === 0) { + $row = [ + 'runscriptid' => 0, + 'visibility_1_checked' => 'checked', + 'isglobal_1_checked' => 'checked', + ]; + } else { + $row = Database::queryFirst('SELECT runscriptid, scriptname, content, extension, visibility, passcreds, isglobal + FROM sat.presetrunscript + WHERE runscriptid = :runscriptid', ['runscriptid' => $id]); + $row['visibility_' . $row['visibility'] . '_selected'] = 'selected'; + $row['passcreds_checked'] = $row['passcreds'] ? 'checked' : ''; + $row['isglobal_' . $row['isglobal'] . '_checked'] = 'checked'; + if ($row === false) { + Message::addError('runscript-invalid-id', $id); + Util::redirect('?do=dozmod§ion=runscripts'); + } + } + // Get OS + $row['oslist'] = []; + $res = Database::simpleQuery('SELECT o.osid, o.displayname, pxo.osid AS isvalid FROM sat.operatingsystem o + LEFT JOIN sat.presetrunscript_x_operatingsystem pxo ON (o.osid = pxo.osid AND pxo.runscriptid = :runscriptid) + ORDER BY o.displayname ASC', ['runscriptid' => $id]); + while ($osrow = $res->fetch(PDO::FETCH_ASSOC)) { + $row['oslist'][] = [ + 'osid' => $osrow['osid'], + 'displayname' => $osrow['displayname'], + 'checked' => $osrow['isvalid'] ? 'checked' : '', + ]; + } + // Output + Render::addTemplate('runscripts-edit', $row); + } + } + + public static function doAjax() + { + + } + +} diff --git a/modules-available/dozmod/permissions/permissions.json b/modules-available/dozmod/permissions/permissions.json index 4496b771..3f9cd604 100644 --- a/modules-available/dozmod/permissions/permissions.json +++ b/modules-available/dozmod/permissions/permissions.json @@ -23,6 +23,12 @@ "runtimeconfig.save": { "location-aware": false }, + "runscripts.view": { + "location-aware": false + }, + "runscripts.save": { + "location-aware": false + }, "templates.reset": { "location-aware": false }, diff --git a/modules-available/dozmod/style.css b/modules-available/dozmod/style.css index 23dd121e..4cec715a 100644 --- a/modules-available/dozmod/style.css +++ b/modules-available/dozmod/style.css @@ -48,4 +48,24 @@ .table > tbody > tr > td > div { display: inline-block; +} + +/* number of columns in tree view depending on screen size */ +.column-list { + column-gap: 20px; + column-count: 2; + padding-left: 20px; + padding-right: 20px; +} + +@media (min-width: 768px) { + .column-list { + column-count: 3; + } +} + +@media (min-width: 992px) { + .column-list { + column-count: 4; + } } \ No newline at end of file diff --git a/modules-available/dozmod/templates/runscripts-edit.html b/modules-available/dozmod/templates/runscripts-edit.html new file mode 100644 index 00000000..8d81b33c --- /dev/null +++ b/modules-available/dozmod/templates/runscripts-edit.html @@ -0,0 +1,89 @@ +

{{lang_scriptsHead}}

+ +
+ + + +
+
+ {{lang_editScript}} +
+
+
+ + +
+
+ + + + +
+
+ + +
+
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+ + +
+ +
+ {{#oslist}} +
+ + +
+ {{/oslist}} +
+ +
+ {{lang_cancel}} + +
+ +
+
+ +
+ + diff --git a/modules-available/dozmod/templates/runscripts-list.html b/modules-available/dozmod/templates/runscripts-list.html new file mode 100644 index 00000000..4d519afb --- /dev/null +++ b/modules-available/dozmod/templates/runscripts-list.html @@ -0,0 +1,89 @@ +

{{lang_scriptsHead}}

+ +

+ {{lang_scriptsIntro}} +

+ + + + + + + + + + {{#hasEditPermission}} + + + {{/hasEditPermission}} + + + + {{#list}} + + + + + + + {{#hasEditPermission}} + + + {{/hasEditPermission}} + + {{/list}} + +
{{lang_name}}{{lang_scriptExtensionHead}}{{lang_scriptVisibilityHead}}{{lang_scriptPassCredentialsHead}}{{lang_scriptIsGlobalHead}}{{lang_edit}}{{lang_delete}}
{{scriptname}}.{{extension}} + {{#passcreds}} + + {{/passcreds}} + + {{#isglobal}} + + {{/isglobal}} + + + + + + +
+ +{{#hasEditPermission}} +
+ + + {{lang_runScriptAdd}} + +
+{{/hasEditPermission}} + +
+ + + +
+ + -- cgit v1.2.3-55-g7522