Unterschiede

Hier werden die Unterschiede zwischen zwei Versionen angezeigt.

--- dienste:wiki [20.12.2019 15:44] – [Für Nutzer] + tablewidth und wrap chaos
+++ dienste:wiki [05.04.2022 22:12] (aktuell) – Registrieren unterbinden mape2k
@@ Zeile 2: / Zeile 2: @@
 Wir verwenden [[https://www.dokuwiki.org|DokuWiki]] in der nachfolgend dokumentierten Konfiguration.
 ===== Plugins =====
-==== Für Nutzer ====
+^ Name     ^ Anwendung       ^  Kommentar       ^
+| [[http://www.dokuwiki.org/plugin:codemirror|Codemirror]]   | Enhances DokuWiki's Editor with syntax highlighting     | funktioniert mit aktueller DokuWiki-Version, wird aber nicht aktiv weiterentwickelt, im Wiki wird auf [[https://www.dokuwiki.org/plugin:prosemirror|prosemirror]] verwiesen   |
-  * [[http://www.dokuwiki.org/plugin:codemirror|Codemirror]]
+| [[http://www.dokuwiki.org/plugin:code|Code Replacement]]   | This plugin replaces the current DokuWiki handlers for code & file markup. It adds ability to recognize and render a title above the code box. |  |
-  * [[http://www.dokuwiki.org/plugin:code|Code Replacement]]
+| [[http://www.dokuwiki.org/plugin:edittable|editTable]]     | This plugin adds an additional edit button to every table. Using this button the table can be edited in an Excel-like visual interface. The plugin also adds a button to the standard toolbar for inserting new tables using this editor. | |
-  * [[http://www.dokuwiki.org/plugin:edittable|editTable]]
+| [[http://www.dokuwiki.org/plugin:tablewidth|tableWidth]]   | The plugin allows to specify width for a DokuWiki table and its columns. |  |
-  * [[http://www.dokuwiki.org/plugin:tablewidth|tableWidth]]
+| [[http://www.dokuwiki.org/plugin:wrap|Wrap]]               | Universal plugin which combines the functionality of many other plugins. Wrap wiki text inside containers (divs or spans) and give them a class (choose from a variety of preset classes), a width and/or a language with its associated text direction. |  |
-  * [[http://www.dokuwiki.org/plugin:wrap|Wrap]]
+| [[https://www.dokuwiki.org/plugin:mobiletable|MobileTable]] | This plugin creates a second representation of a table, where all columns are stacked on top of each other, which is only shown for mobile devices. This improves the mobile experience for wide tables as it prevents horizontal scrolling. | |
+| [[http://www.dokuwiki.org/plugin:move|Move]] | Move pages, media files and namespaces while maintaining the link structure |  |
-==== Für Admins ====
+| [[http://www.dokuwiki.org/plugin:searchindex|Searchindex Manager]] | This admin plugin allows you to rebuild the index used by the fulltext search. | |
+| [[http://www.dokuwiki.org/plugin:smtp|SMTP]] | This plugin replaces the way DokuWiki sends emails. Instead of relying on PHP's built-in mail function, it will contact a configured SMTP server directly to send emails. |  |
-  * [[http://www.dokuwiki.org/plugin:move|Move]]
+| [[https://www.dokuwiki.org/plugin:simplenavi|simplenavi]] | Create a simple navigation tree based on namespaces | |
-  * [[http://www.dokuwiki.org/plugin:searchindex|Searchindex Manager]]
+| [[https://www.dokuwiki.org/plugin:attribute|attribute]] | Arbitrary attribute definition and storage for user associated data  | wird für das 2FA-Plugin benötigt, um Daten abspeichern zu können |
+| [[https://www.dokuwiki.org/plugin:twofactor|Two Factor Authentication - Core Plugin]] | Provides modular two factor authentication functionality to DokuWiki | wird als Grundlage für die verschiedenen 2FA-Methoden benötigt |
-==== System ====
+| [[https://www.dokuwiki.org/plugin:twofactorgoogleauth|Two Factor Authentication - Google Authenticator Plugin]] | Google Authenticator support plugin for the Twofactor authentication plugin. | Implementiert die App-Veriante von 2FA. Es gibt auch noch eine Variante für [[https://www.dokuwiki.org/plugin:twofactoremail|2FA per E-Mail]], dieses ist jedoch aktuell nicht installiert. |
-  * [[https://www.dokuwiki.org/plugin:simplenavi|simplenavi]]
 ===== Template =====
@@ Zeile 34: / Zeile 33: @@
   * nativeeditor: **[X]**
-==== iCalendar ====
-  * table: **<nowiki>| **{date}**  | {summary} |  {location_link} |</nowiki>**
 ==== URL-Schemes ====
   * conf/scheme.local.conf angelegt und um "webcal" erweitert
+==== SMTP ====
+  * smtp_host: **mail.bytespeicher.org**
+  * smtp_port: **465**
+  * smtp_ssl: **SSL**
+  * smtp_auth_user: **XXX@technikkultur-erfurt.de**
+  * smtp_auth_user: **PASSWORT fuer XXX**
+==== Twofactor ====
+  * enable: **[X]**
+  * optinout: **opt-in**
+  * otpsubject: **OTP Verification Code**
+  * otpcontent: **$otp is your verification code.**
+  * generatorexpiry: **2**
+  * otplength: **7**
+  * sentexpiry: **5**
+  * loginnotice: **User**
+  * loginsubject: **Login Successful**
+  * logincontent: **Your account was logged into at $time.**
+  * refreshexpiry: **240**
+  * logging_level: **None**
+  * logging_path: **2fa_audit.txt**
+==== Twofactorgoogleauth ====
+  * enable: **[X]**
 ==== Template / Boostrap3 ====
@@ Zeile 82: / Zeile 107: @@
 </code>
-Der Raum-Status und die Social-Media-Links liegen in folgender Datei
+Der Raum-Status und die Social-Media-Links liegen in der Datei lib/tpl/bootstrap3/sidebarfooter.html. Der PHP-Code des Raum-Status ist identisch mit dem im [[wp_tkev#raumstatus|Wordpress]] verwendeten.
 <file|lib/tpl/bootstrap3/sidebarfooter.html>
@@ Zeile 94: / Zeile 119: @@
 </div>
 <!-- ***** Raumstatus ***** -->
-<a href="https://status.bytespeicher.org/">
+<div class="well" style="color: #999; padding: 10px;">
-  <?php
+<?php
-    $context = stream_context_create(array('http'=> array('timeout' => 3)));
-    $status = json_decode(file_get_contents('https://status.bytespeicher.org/status.json', false, $context));
+// Spaces
-    if($status && isset($status->state->open) && $status->state->open === true) {
+$spaces = [
-      echo '<img src='.$status->icon->open.' style="max-width: 100%;" alt="Raumstatus des Bytespeicher, offen" title="Der Bytespeicher ist offen!" />';
+    'Bytespeicher' => 'http://status.bytespeicher.org',
-    } else {
+    'Makerspace' => 'http://status.makerspace-erfurt.de',
-      echo '<img src='.$status->icon->closed.' style="max-width: 100%;" alt="Raumstatus des Bytespeicher, geschlossen" title="Der Bytespeicher ist geschlossen!" />';
+];
+// Max width of icon (small = 100, large = 200)
+$cssMaxWidth = 100;
+// JSON path for URI
+$statusJsonPath = '/status-minimal.json';
+// Create stream context with low timeout
+$context = stream_context_create([
+    'http' => [
+        'method' => "GET",
+        'timeout' => 1
+    ]
+]);
+// Check every space
+// No output on errors
+foreach ($spaces as $spaceName => $statusUrl) {
+    // Get minimal status from spacestatus webpage
+    $jsonContent = file_get_contents($statusUrl . $statusJsonPath, false, $context);
+    if ($jsonContent === false) {
+        // Status could not be received, skip it
+        continue;
     }
-  ?>
-</a>
+    // Decode JSON with max depth of 2
-<a href="https://status.makerspace-erfurt.de/">
+    $jsonContent = json_decode($jsonContent, false, 2);
-  <?php
+    if (is_null($jsonContent) || !isset($jsonContent->open) || !isset($jsonContent->icon)) {
-    $context = stream_context_create(array('http'=> array('timeout' => 3)));
+        // JSON could not be decoded or entries missing
-    $status = json_decode(file_get_contents('https://status.makerspace-erfurt.de/status.json', false, $context));
+        continue;
-    if($status && isset($status->state->open) && $status->state->open === true) {
-      echo '<img src='.$status->icon->open.' style="max-width: 100%;" alt="Raumstatus des Makerspace, offen" title="Der Makerspace ist offen!" />';
-    } else {
-      echo '<img src='.$status->icon->closed.' style="max-width: 100%;" alt="Raumstatus des Makerspace, geschlossen" title="Der Makerspace ist geschlossen!" />';
     }
-  ?>
-</a>
+    // Output spaces
-<hr />
+    $text = 'Der ' . $spaceName . ' ist ' . ($jsonContent->open === true ? 'offen' : 'geschlossen') . '!';
-<a href="https://www.hetzner.de"><img src="/lib/tpl/bootstrap3/images/hetzner_hosted_160.gif" /></a>
+    echo '<a href=\'' . $statusUrl . '\'>';
+    echo '<img src=\'' . $jsonContent->icon . '\' title=\'' . $text . '\' alt=\'Raumstatus des ' . $spaceName . '\' style=\'width:100%;max-width:' . $cssMaxWidth . 'px;\' />';
+    echo '</a>';
+}
+?>
+</div>
 </file>
@@ Zeile 207: / Zeile 257: @@
 $conf['passcrypt'] = 'sha512';
 $conf['superuser'] = '@admin';
+$conf['disableactions'] = 'register';
 $conf['mediarevisions'] = 0;
 $conf['mailfrom'] = 'noreply@technikkultur-erfurt.de';
@@ Zeile 212: / Zeile 263: @@
 $conf['userewrite'] = '1';
 $conf['plugin']['codemirror']['nativeeditor'] = 1;
-$conf['plugin']['iCalendar']['dformat'] = '%d. %B %Y';
-$conf['plugin']['iCalendar']['default'] = '===== {date}: {summary} =====
@@ Zeile 220: / Zeile 269: @@
 {description}';
-$conf['plugin']['iCalendar']['list'] = '====== {date}: {summary} ======
-**<sup>Location: {location}</sup>**\\\\
-{description}';
-$conf['plugin']['iCalendar']['table'] = '| **{date}**  | {summary} |  {location_link} |';
 $conf['plugin']['dw2pdf']['template'] = 'technikkultur';
 $conf['plugin']['dw2pdf']['output'] = 'browser';