Update files and fix some issues

rainbowdashlabs · rainbowdashlabs · commit 3a3e1d1d412a · 2026-05-05T16:29:12.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 .env
-.env.dev
+dev.env
 discordguild.php
 f.php
 test.php
@@ -23,3 +23,5 @@ buildpush.sh
 html/install-php-extensions
 composer.lock
 info.php
+*.env
+!example.*.env
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # DevCord Devmarkt
 
 ## setup dev environment
-- copy .env.dev.example to .env.dev
+- copy example.dev.env to dev.env
 - enter all properties
 - add the bot to your server
 - run `docker compose -f compose.debug.yaml up`
diff --git a/compose.debug.yaml b/compose.debug.yaml
@@ -23,4 +23,4 @@ services:
       MYSQL_PASSWORD: test
       BOT_REDIRECT_URI: http://localhost:8080/login.php?
       BOT_BASE_URI: http://localhost:8080
-    env_file: .env.dev
+    env_file: dev.env
diff --git a/example.dev.env b/example.dev.env
diff --git a/example.env b/example.env
diff --git a/php/devmarkt.inc.php b/php/devmarkt.inc.php
@@ -21,12 +21,12 @@
 $devmarktChannel = getenv('GUILD_DEVMARKT_CHANNEL');
 
 if ($login->isBlocked()) {
-    header('Location: index.php');
+    header('Location: ' . $base_url . '/index.php');
 }
 
 if ($login->isOnCoolDown()
     && !($login->isModerator())) {
-    header('Location: index.php');
+    header('Location: ' . $base_url . '/index.php');
 }
 
 if (!(isset($_POST['titel'], $_POST['type'], $_POST['beschreibung'], $_POST['color']))) {
diff --git a/public/devmarkt.inc.php b/public/devmarkt.inc.php
@@ -0,0 +1,2 @@
+<?php
+include_once('../php/devmarkt.inc.php');
diff --git a/public/index.php b/public/index.php
@@ -129,7 +129,7 @@
 
     ?>
 
-    <form id="form" method="POST" action="php/devmarkt.inc.php">
+    <form id="form" method="POST" action="devmarkt.inc.php">
 
         <?php
 

Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,12 @@`
`21`	`21`	`$devmarktChannel = getenv('GUILD_DEVMARKT_CHANNEL');`
`22`	`22`
`23`	`23`	`if ($login->isBlocked()) {`
`24`		`- header('Location: index.php');`
	`24`	`+ header('Location: ' . $base_url . '/index.php');`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`if ($login->isOnCoolDown()`
`28`	`28`	`&& !($login->isModerator())) {`
`29`		`- header('Location: index.php');`
	`29`	`+ header('Location: ' . $base_url . '/index.php');`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`if (!(isset($_POST['titel'], $_POST['type'], $_POST['beschreibung'], $_POST['color']))) {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<?php`
	`2`	`+include_once('../php/devmarkt.inc.php');`