Merge pull request #6 from The-Systems/1.8_beta3

1.8 beta3

.gitignore

@@ -35,7 +35,7 @@ hs_err_pid*
 .idea/**/usage.statistics.xml
 .idea/**/dictionaries
 .idea/**/shelf
-
+k
 # Generated files
 .idea/**/contentModel.xml
 

INSTALL.md

@@ -1,4 +1,5 @@
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![Discord](https://img.shields.io/discord/340197684688453632.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/CYHuDpx)
 <br>
 
 <img src="https://cdn.the-systems.eu/icon-transparent-banner.png" width="300px" />
@@ -11,7 +12,8 @@
 
 - Webserver (or Webspace)
     - PHP 7+ (PHP8 recommended)
-    - PHP Extensions: Curl
+    - PHP Extensions: Curl (apt-get install phpX-curl)
+    - Apache2 Mods: rewrite (a2enmod rewrite)
 
 ## Download
 
@@ -23,7 +25,8 @@ You can download the latest version from https://project.the-systems.eu/resource
 2. Reloade the CloudNet-Master with "rl all"
 3. The setup should start automatically. If it does not start, type "wisetup"
 4. Complete the setup
-5. Copy the files from CloudNet-Master/Website (NOT CloudNet-Master/modules/webinterface!!!!) to your web server (
+5. Copy the files from CloudNet-Master/Website (!!!! DONT COPY CloudNet-Master/modules/webinterface !!!! THESE ARE ONLY
+   THE CONFIG FILES !!!!) to your web server (
    default /var/www/html)
 6. Type "composer install" in the SSH console
 7. Have fun!
@@ -41,9 +44,9 @@ Info: The web interface also works on an external Webspace!
 
         <VirtualHost *:80>
             ServerName webinterface.domain.com
-            DocumentRoot "/var/www/webinterface/"
+            DocumentRoot "/var/www/webinterface/public"
 
-            <Directory /var/www/webinterface/>
+            <Directory /var/www/webinterface/public>
                     AllowOverride All
             </Directory>
 
@@ -52,13 +55,9 @@ Info: The web interface also works on an external Webspace!
 
 4. Activate the page with
 
-        a2ensite webinterface.com
+        a2ensite webinterface.conf
 
-5. Enable the Apache2 Module mod-rewrite
-
-        a2enmod rewrite
-
-6. Restart Apache2
+5. Restart Apache2
 
         service apache2 restart
 
@@ -71,6 +70,69 @@ Info: The web interface also works on an external Webspace!
     curl -sS https://getcomposer.org/installer | php
     php composer.phar install --no-dev -o
 
+# GERMAN
+
+## Vorraussetzungen
+
+- CloudNet 2.1.17+ (NICHT v3!)
+
+- Webserver (oder Webspace)
+    - PHP 7+ (PHP8 empfohlen)
+    - PHP Erweiterungen: Curl (apt-get install phpX-curl)
+    - Apache2 Mods: rewrite (a2enmod rewrite)
+
+## Download
+
+Du kannst die aktuelle Version von https://project.the-systems.eu/resources/cloudnet-webinterface herunterladen
+
+## Installation
 
+1. Lade die webinterface.jar in den Module Ordner vom CloudNet-Master
+2. Lade den CloudNet-Master mit "rl all" neu
+3. Das Setup sollte automatisch starten, wenn es nicht startet, gebe "wisetup" ein
+4. Erledige das Setup
+5. Kopiere die Dateien von CloudNet-Master/Website (!!!! KOPIERE NICHT CloudNet-Master/modules/webinterface !!!! DAS
+   SIND NUR DIE CONFIG DATEIEN !!!!) auf deinen Webserver (
+   Standard /var/www/html)
+6. Gebe "composer install" in die SSH-Konsole ein
+7. Hab Spaß!
+
+Info: Das Webinterface funktioniert ebenfalls auf einem Externen Webserver/Webspace!
+
+### Webserver Configuration
+
+#### Apache2
+
+1. Gehe zu /etc/apache2/sites-available
+2. Erstelle eine Datei mit der Endung .conf
+   (Beispiel: webinterface.conf)
+3. Füge das folgende ein und füge deine Daten ein
+
+        <VirtualHost *:80>
+            ServerName webinterface.domain.com
+            DocumentRoot "/var/www/webinterface/public"
+
+            <Directory /var/www/webinterface/public>
+                    AllowOverride All
+            </Directory>
+
+
+        </VirtualHost>
+
+4. Aktiviere die Seite mit
+
+        a2ensite webinterface.conf
+
+5. Starte Apache2 neu
+
+        service apache2 restart
+
+7. Installier ein SSL-Zertifikat mit https://certbot.eff.org/
+
+### Composer installieren
+
+#### Debian 10
+
+    curl -sS https://getcomposer.org/installer | php
+    php composer.phar install --no-dev -o
 
-

README.md

@@ -14,6 +14,10 @@
 
 #### You can find more information about the installation in the [INSTALL.md](./INSTALL.md) file.
 
+## Updating
+
+#### You can find more information about updating in the [UPDATE.md](./UPDATE.md) file.
+
 ## Projectpage
 
 #### https://project.the-systems.eu/resources/cloudnet-webinterface

UPDATE.md

@@ -0,0 +1,51 @@
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![Discord](https://img.shields.io/discord/340197684688453632.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/CYHuDpx)
+<br>
+
+<img src="https://cdn.the-systems.eu/icon-transparent-banner.png" width="300px" />
+
+# <b>CloudNet-Webinterface</b>
+
+## Download
+
+You can download the latest version from https://project.the-systems.eu/resources/cloudnet-webinterface
+
+## Installation
+
+1. Load the webinterface.jar into the Modules folder of the CloudNet-Master
+2. Reloade the CloudNet-Master with "rl all"
+3. Start the Setup with "wisetup"
+4. Complete the setup
+
+5. Backup the Config of the old Webinterface (webinterface/config/config.php)
+
+6. Copy the files from CloudNet-Master/Website (!!!! DONT COPY CloudNet-Master/modules/webinterface !!!! THESE ARE ONLY
+   THE CONFIG FILES !!!!) to your web server and replace it with the old webinterface. (
+   default /var/www/html)
+7. Type "composer update" in the SSH console
+8. Have fun!
+
+# GERMAN
+
+## Download
+
+Du kannst die aktuelle Version von https://project.the-systems.eu/resources/cloudnet-webinterface herunterladen
+
+## Installation
+
+1. Lade die webinterface.jar in den Module Ordner vom CloudNet-Master
+2. Lade den CloudNet-Master mit "rl all" neu
+3. Starte das Setup mit "wisetup"
+4. Erledige das Setup
+
+5. Backup die Config vom alten Webinterface (webinterface/config/config.php)
+
+6. Kopiere die Dateien von CloudNet-Master/Website (!!!! KOPIERE NICHT CloudNet-Master/modules/webinterface !!!! DAS
+   SIND NUR DIE CONFIG DATEIEN !!!!) auf deinen Webserver und ersetze es mit dem alten (
+   Standard /var/www/html)
+7. Gebe "composer update" in die SSH-Konsole ein
+8. Hab Spaß!
+
+
+
+

WebInterface/pom.xml

@@ -68,7 +68,7 @@
                             <target>
                                 <zip destfile="${basedir}/target/classes/files/Website.zip"
                                      basedir="${basedir}/../WebSite"
-                                     excludes="config.php" />
+                                     excludes="config/config.php"/>
                                 <copy file="${basedir}/../WebSite/config/config.php"
                                       tofile="${basedir}/target/classes/files/config.php"/>
                             </target>

WebInterface/src/main/resources/module.properties

@@ -1,4 +1,4 @@
 name=Webinterface
-version=1.8_beta2
+version=1.8_beta3
 author=TheSystems
 main=eu.thesystems.cloudnet.webinterface.WebInterfaceModule

WebSite/config/version.php

@@ -1,5 +1,5 @@
 <?php
 $version = json_encode(array(
-    "version" => "1.8_beta2",
+    "version" => "1.8_beta3",
     "version_url" => "https://project.the-systems.eu/api/resource/?resourceid=1&type=allinfos"
 ));

WebSite/public/index.php

@@ -75,8 +75,8 @@
                 die();
             }
             if (isset($_POST['action'])) {
-                $_POST['action'] == "setpermgroup" ? $main->sendRequest("dispatchcloudcommand", "create USER " . $_POST['user'] . " " . $_POST['password']) : false;
-                $_POST['action'] == "createuser" ? $main->sendRequest("dispatchcloudcommand+", "perms user " . $_POST['player'] . " group set " . $_POST['group'] . " lifetime") : false;
+                $_POST['action'] == "createuser" ? $main->sendRequest("dispatchcloudcommand", "create USER " . $_POST['user'] . " " . $_POST['password']) : false;
+                $_POST['action'] == "setpermgroup" ? $main->sendRequest("dispatchcloudcommand+", "perms user " . $_POST['player'] . " group set " . $_POST['group'] . " lifetime") : false;
                 $_POST['action'] == "deleteuser" ? $main->sendRequest("deleteuser", $_POST['user']) : false;
                 $_POST['action'] == "dispatchcommand" ? $main->sendRequest("dispatchcloudcommand", $_POST['command']) : false;
                 $_POST['action'] == "sendcommandtoserver" ? $main->sendRequest("dispatchcloudcommand", "cmd " . $_POST['server'] . " " . $_POST['command']) : false;