fixes

WEBROOT/controller/DatabaseConnect.php

@@ -44,7 +44,7 @@ function db_connect() {
         ]
     ];
 
-    $enviroment = 'live';
+    $enviroment = 'vpn';
 
     mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
 

merge.sh

@@ -2,24 +2,24 @@
 
 set -e
 
-echo "🚀 Starte automatischen Merge- und Tag-Prozess..."
+echo "Starte automatischen Merge- und Tag-Prozess..."
 
 git config core.filemode false
 
-echo "🔄 Aktualisiere lokale Branches vom Remote..."
+echo "Aktualisiere lokale Branches vom Remote..."
 git fetch --all --quiet
 
-echo "🌿 Wechsle zu main..."
+echo "Wechsle zu main..."
 git checkout main --quiet
 git pull origin main --quiet
 
-echo "🔀 Merge: main -> dev..."
+echo "Merge: main -> dev..."
 git checkout dev --quiet
 git pull origin dev --quiet || true
 git merge main --no-ff -m "Automated merge from main to dev" --quiet
 git push origin dev --quiet
 
-echo "🔀 Merge: dev -> live..."
+echo "Merge: dev -> live..."
 git checkout live --quiet
 git pull origin live --quiet || true
 git merge dev --no-ff -m "Automated merge from dev to live" --quiet
@@ -27,7 +27,7 @@ git push origin live --quiet
 
 TAG_NAME="v$(date +'%Y.%m.%d-%H%M')"
 
-echo "🏷️  Erstelle Tag: $TAG_NAME..."
+echo " Erstelle Tag: $TAG_NAME..."
 git tag -a "$TAG_NAME" -m "Automated release tag $TAG_NAME"
 git push origin "$TAG_NAME" --quiet