README.md

@@ -32,8 +32,15 @@ Dear Developers, Please use pushes sparingly because it takes a while for the se
 
 ## Symlinks
 The following files and directories are linked to areas where they can be accessed by the web server:
-  * `threadr/` → `threadr.lostcave.ddnss.de/threadr/` (all files acessible by the web server)
-  * `default.html` → `threadr.lostcave.ddnss.de/index.html` (http redirect)
+  * `index.html` → `*/common/index.html` (http redirect)
+  * `icon.png` → `*/common/icon.png` (unused)
+  * `threadr/` → `*/common/threadr/` (everything else acessible by the web server)
+  * `default.html` → `lostcave.ddnss.de/index.html` (http redirect)
+  * `admin.php` → `admin.strassenkind.ip/index.php` (future management page, maybe for services, available sites, users, etc?)
+  * `strassenkind.php` → `strassenkind.ip/index.php` (status page)
+  * `commands_status.conf` → `strassenkind.ip/commands_status.conf`
+  * `commands_ondemand.conf` → `strassenkind.ip/commands_ondemand.conf`
+  * `internal.css` → `strassenkind.ip/style.css`
 
 ## Variables handled by the deployment script
 ~~Here is the place for variables that will be replaced automatically on the server. Using them is encouraged. Using the paths is DISCOURAGED.
@@ -50,6 +57,8 @@ This section has moved. Look in the files or their documentation below.
 ```
 
 # Individual documentation for each file
+### [[DIR] policies](./policies)
+This folder contains the documents from which our policy pages (privacy policy, TOS, etc) will be built in the future.
 ### [[DIR] threadr](./threadr)
 This folder contains all the files that are parts of ThreadR directly
 ### [admin.php](./admin.php)
@@ -63,6 +72,13 @@ This script is executed each time (well... if Gitea decides to actually run the
 It contains the commands to execute the code variable replcement system and some other useful tasks.
 It’s working directory is the root of the git repository.
 If you want to know more: It is commented. Just look at it.
+### [icon.png](./icon.png)
+Well, that’s a story about developers looking at the documentation and realizing what this is for...
+I (Jan) intended it as the icon file for the tab icon but some folks put another icon elsewhere. Just ignore it. Maybe, one time, I will find a use for it.
+### [index.html](./index.html)
+This was originally intended to be our index file. Turns out, we even need PHP on our index, so this one became another redirect to the new ThreadR index.php.
+
+DEPRECATED: We don’t have a /common directory anymore and therefore this is no longer needed. To be removed.
 ### [strassenkind.php](./strassenkind.php), [internal.css](./internal.css), [commands_status.conf](./commands_status.conf), [commands_ondemand.conf](./commands_ondemand.conf), [commands_git.conf](./commands_git.conf)
 The internal status page. strassenkind.php is the index, internal.css is the stylesheet strassenkind.php uses
 and the .conf files are lists of commands to be executed by the status page. The status page auto-refreshes to display up-to-date information on the commands in commands_status.conf.
@@ -70,7 +86,7 @@ It is advised to put commands that have a high disk usage or start/stop/restart/
 The file commands_git.conf contains the commands that would be executed by the deployment WebHook. These are there to provide a fast and simple backup solution.
 The alternative to foce-updating ThreadR via the status page would be:
 ```
-ssh <user>@<threadr.ip|no public access set up currently>
+ssh <user>@<strassenkind.ip|lostcave.ddnss.de>
 cd /var/www/git
 sudo -u www-data -s
 rm -rf ./web-deployment
@@ -80,9 +96,13 @@ cd web-deployment
 exit
 logout
 ```
-DEPRECATED: The administration framework will be turned into its own project.
 ### [README.md](./README.md)
 this file
+### [run-once-script.sh](./run-once-script.sh)
+This script will be executed each time it is altered and pushed. Make sure to remove everything the previous user added before using it to not run these commands again.
+Leave the bang (#! comment) and the bottom part that has been commented to instruct you to leave it there.
+
+DEPRECATED: This file depends on things being placed outside of the repository which will cause issues with the deployment system in the future. To be removed.
 ### [variable_grabbler.py](./variable_grabbler.py)
 This is the code variable replacer. It takes two arguments: The configuration file to be used and the file to be worked on.
 The configuration file contains a json which defines replacement string for each code variable in the format `"<VARNAME>":"<String>"`. Code variables are preceeded and followed by a % sign in code but this is not the case in the configuration.

deployment-script.sh

@@ -13,5 +13,23 @@ echo -n "`find -name "*.php" -or -name "*.html" -or -name "*.css" -or -name "*.s
 echo -n "`find -name "*.php" -or -name "*.html" -or -name "*.css" -or -name "*.svg" | sed 's/^/python variable_grabbler.py /;s/$/ variable_grabbler.pass1.json/'`" | bash -
 echo -n "`find -name "*.php" -or -name "*.html" -or -name "*.css" -or -name "*.svg" | sed 's/^/python variable_grabbler.py /;s/$/ variable_grabbler.pass2.json/'`" | bash -
 
+#the run-once section
+echo "Checking run-once script..."
+echo "Setting permissions."
+chmod +x run-once-script.sh
+#run the script only if it has changed since the last time it was checked, save a checksum of it to /var/www/git/run-once to compare next time
+echo -ne "import os, sys\nif \"`sha256sum run-once-script.sh`\" == \"`cat ../run-once`\":\n print \"File has not changed. Aborting.\"\n sys.exit()\nelse:\n print \"File has changed. Calculating checksum...\"\n os.system(\"sha256sum run-once-script.sh > ../run-once\")\n print \"\"\"Executing...\n==========\"\"\"\n os.system(\"./run-once-script.sh\")\n print \"\"\"==========\nDone.\"\"\"" | python
+
+# The status page is not just symlinked like the other files just to have a backup in case something goes wrong.
+# Not like that ever happened before....
+echo "Replacing status page..."
+cp -v ./strassenkind.php /var/www/strassenkind.ip/index.php
+cp -v ./internal.css /var/www/strassenkind.ip/style.css
+cp -v ./commands_git.conf /var/www/strassenkind.ip/
+cp -v ./commands_ondemand.conf /var/www/strassenkind.ip/
+cp -v ./commands_status.conf /var/www/strassenkind.ip/
+echo "Done."
+
+
 echo "==============================================================================
 Done."

index.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="refresh" content="0;%CONTENT_DIR%/" />
+  </head>
+  <body>
+    <p> Your browser seems to not support redirects. <br />
+    Please klick the following link to continue: <a href="%CONTENT_DIR%/"> Go to home page... </a></p>
+  </body>
+</html>

policies/README.md

@@ -0,0 +1,9 @@
+# Short documentation of each file
+### [cookie_policy.md](./cookie_policy.md)
+the cookie policy (markdown)
+### [anonymous_terms_and_conditions.md](./anonymous_terms_and_conditions.md)
+the TOS for anonymous users (markdown)
+### [terms_and_conditions.md](./terms_and_conditions.md)
+the TOS (markdown)
+### [README.md](./README.md)
+this file

policies/privacy_policy.md

@@ -0,0 +1,19 @@
+# Our Privacy and Cookie Policy (proposed) - Version 2.0
+
+*We do like cookies very much. They taste good. \*Crunch\**
+
+Jokes aside, you probably know that a lot of websites process some of your data and use so called cookies to store information on your computer. So do we. It is necessary for our website to function properly and securely.
+
+The following will explain what of your data we use and why. We collect and process your information to provide useful features to you or to improve security and stability of our service. In case you want to have insight in the information we know about you, you may ask us on the support&contact forum. If you want us to correct or delete your data, this would be the place to go, as well.
+
+This document will probably change in the future. Although we will try to inform you about changes in advance, we reserve the right to change this policy without notice at any moment. As we are not any of these big, data hungry companies, we will not ask you to come back to this site and look for changes yourself. If we change this policy, it will be announced on our support&contacts forum.
+
+@ devs: So, my reasoning behind this is that we can change the policy in case of an emergency. The support&contact forum I am mentioning in multiple sections of this file will be for general announcements, support, contact with us etc. If there is another word describing all of that in one, please let me know.
+
+## What information we store or process:
+* Your session: Sessions are used to tell users apart. This is very important when providing dynamic content as it allows to show different pages to different people at the same time. Without sessions, all users would see the same page at the same URL. This would for obvious reasons be unpractical on a forum platform.
+* Your connection metadata: We use some of the connection metadata to make our website more secure. This is optional and can be reduced or turned off completely for registered users.
+* The information you give us directly: Just in case you did not know that... We do save your user profile. Really. Actually, this is the only point of having a profile so that other users can look at what information you provided if they want to. This is optional. You decide what information you want on your profile.
+
+## Information we may collect in the future:
+* Anonymized usage statistics: In case we experience technical difficulties, we can collect statistics about what parts of our website are used in which way. This can be useful for troubleshooting (example: Statistics show that a new feature never gets used because we forgot to put a link) or finding the root cause of problems (example: We need to locate a buggy script that was not originally intended for the use most users use it for).

run-once-script.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+rm /var/www/strassenkind.ip/*.conf
+rm /var/www/strassenkind.ip/index.php
+rm /var/www/strassenkind.ip/style.css
+
+# leave this here for whenever this script is altered to be empty
+exit 0

threadr/about/index.php

@@ -1,6 +1,7 @@
 <?php
 session_start();
 %SET_LOGIN_VARIABLE%
+//ToDo: Remove dis when development izz done. Cause perfoarmance.
 %PLEAZE_NO_CACHE%
 %NO_CHEAP_SESSION_STEALING%
 $navbar="about";
@@ -35,6 +36,11 @@ $navbar="about";
         <h2>
           Who we are
         </h2>
+        <div class="image_container">
+          <img src="%CONTENT_DIR%/img/group.jpg" alt="Image of the team" />
+          <p class="image_container">
+            From left to right: Ilja, Jakob, Jan [me], and Erik
+          </p>
         </div>
       </div>
       <div class="item-4">

threadr/signup/verify-email/index.php

@@ -38,6 +38,7 @@ $navbar = "verify-email";
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
       </head>
       <body>
+      //todo empty navbar
         %NAVBAR%
         <div class="container">
           <div class="item-1">

threadr/userhome/index.php

@@ -2,6 +2,7 @@
 session_start();
 %PLEAZE_NO_CACHE%
 %SET_LOGIN_VARIABLE%
+//Todo: make this a setting for users that use VPNs/Proxies and seem to jump around the world rather quickly...
 %NO_CHEAP_SESSION_STEALING%
 %REQUIRE_LOGIN%
 
@@ -19,6 +20,7 @@ if (!$result) {
 }
 
 $navbar = "home";
+//ToDo: differentiate between home and userhome (or auto-redirect)
 ?>
 <!DOCTYPE html>
 <html>