Chore/cleanup repo

.envrc

@@ -0,0 +1 @@
+use nix

.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

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`

compose.debug.yaml

@@ -1,8 +1,7 @@
 services:
   mysql:
     container_name: mysql_dev
-    image: mysql
-    command: --default-authentication-plugin=mysql_native_password
+    image: mysql:9.7
     environment:
       MYSQL_ROOT_PASSWORD: test
       MYSQL_DATABASE: test
@@ -15,11 +14,13 @@ services:
       - "8080:80"
     volumes:
         - ./:/var/www/
+    depends_on:
+      - mysql
     environment:
       MYSQL_HOST: mysql_dev
       MYSQL_DATABASE: test
       MYSQL_USER: root
       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

debug.Dockerfile

@@ -39,5 +39,6 @@ RUN chown -R www-data:www-data /var/www
 COPY docker/start-apache /usr/local/bin
 
 ENV APP_PATH=/var/www
+COPY docker/000-default.conf /etc/apache2/sites-available/000-default.conf
 
 CMD ["start-apache"]

docker/000-default.conf

@@ -1,8 +1,8 @@
 <VirtualHost *:80>
   ServerAdmin webmaster@localhost
-  DocumentRoot /var/www
+  DocumentRoot /var/www/public
 
-  <Directory /var/www>
+  <Directory /var/www/public>
     Options Indexes FollowSymLinks
     AllowOverride All
     Require all granted

php/devmarkt.inc.php

@@ -1,5 +1,5 @@
 <?php
-include_once('../pdo.php');
+include_once('pdo.php');
 include_once('login.inc.php');
 include_once('token.inc.php');
 include_once('request.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']))) {

php/pdo.php

@@ -1,2 +1,87 @@
 <?php
-include_once(getenv("APP_PATH") . '/pdo.php');
+session_start();
+error_reporting(E_ALL ^ E_DEPRECATED);
+$base_url = getenv("BOT_BASE_URI");
+$devmarkt_anfragen = getenv("GUILD_DEVMARKT_REQUEST_CHANNEL");
+$devmarkt = getenv("GUILD_DEVMARKT_CHANNEL");
+$guild_id = getenv("GUILD_ID");
+$moderator_id = getenv("GUILD_MOD_ID");
+$redirect_uri = getenv("BOT_REDIRECT_URI");
+
+class MySQL
+{
+
+    private $host, $database, $username, $password;
+
+    private $pdo;
+
+    public function __construct()
+    {
+
+        $this->host = getenv("MYSQL_HOST");
+        $this->database = getenv("MYSQL_DATABASE");
+        $this->username = getenv("MYSQL_USER");
+        $this->password = getenv("MYSQL_PASSWORD");
+        $options = array(
+            PDO::ATTR_ERRMODE => PDO::ERRMODE_SILENT,
+            PDO::ATTR_PERSISTENT => false,
+        );
+        $this->pdo = new PDO('mysql:host=' . $this->host . ';dbname=' . $this->database, $this->username, $this->password, $options);
+        $this->loadTables();
+
+    }
+
+    public function loadTables()
+    {
+
+        $pdoConnection = $this->getPDO();
+
+        $stmt = 'CREATE TABLE IF NOT EXISTS `dc_users` ( `id` INT NOT NULL AUTO_INCREMENT , `discord_id` VARCHAR(255) NOT NULL , `auth_code` VARCHAR(255) NOT NULL , `refresh_code` VARCHAR(255) NOT NULL , `rang` VARCHAR(50) NOT NULL , `login_token` VARCHAR(255),`blocked` BOOLEAN, `thread` VARCHAR(200) NULL DEFAULT NULL, PRIMARY KEY (`id`)) ENGINE = InnoDB;';
+        $qry = $pdoConnection->prepare($stmt);
+        $qry->execute();
+
+        $stmt1 = 'CREATE TABLE `anfragen` ( `id` INT NOT NULL AUTO_INCREMENT , `by_discord_id` VARCHAR(255) NOT NULL , `title` VARCHAR(100) NOT NULL , `type` VARCHAR(20) NOT NULL , `description` VARCHAR(' . getenv("MAX_DESCRIPTION_SIZE") . ') NOT NULL , `link` VARCHAR(100) NOT NULL , `req_id` VARCHAR(100) NOT NULL , `status` VARCHAR(100) NOT NULL , `processed_by` VARCHAR(100) NOT NULL ,`message_id` VARCHAR(100),`date` VARCHAR(100),`date_processed` VARCHAR(100),`color` VARCHAR(100),`reason` VARCHAR(500),`options` VARCHAR(200), PRIMARY KEY (`id`)) ENGINE = InnoDB;';
+        $qry1 = $pdoConnection->prepare($stmt1);
+        $qry1->execute();
+
+    }
+
+    public function getPDO()
+    {
+
+        return $this->pdo;
+
+    }
+
+    public function close()
+    {
+
+        $this->pdo->close();
+
+    }
+
+    public function query($qry)
+    {
+        return $this->pdo->query($qry);
+
+    }
+
+    public function inTable($table, $column, $user)
+    {
+
+        $pdoConnection = $this->pdo;
+
+        $stmt = "SELECT * FROM `" . $table . "` WHERE `" . $column . "`=:user";
+        $qry = $pdoConnection->prepare($stmt);
+        $qry->bindParam(":user", $user);
+        $qry->execute();
+
+        if ($qry->fetchColumn() == 0) {
+            return false;
+        }
+        return true;
+    }
+
+}
+
+?>

case.php → public/case.php

@@ -1,10 +1,9 @@
 <?php
-include_once('pdo.php');
-require 'vendor/autoload.php';
-include_once('php/checklogin.php');
-include_once('php/token.inc.php');
-include_once('php/login.inc.php');
-include_once('php/request.inc.php');
+include_once('../php/pdo.php');
+include_once('../php/checklogin.php');
+include_once('../php/token.inc.php');
+include_once('../php/login.inc.php');
+include_once('../php/request.inc.php');
 
 if (!isset($_GET['req_id'])) {
     header('Location: index.php?error=nothing_set');

public/devmarkt.inc.php

@@ -0,0 +1,2 @@
+<?php
+include_once('../php/devmarkt.inc.php');

index.php → public/index.php

@@ -1,10 +1,10 @@
 <?php
-include_once('pdo.php');
-include_once('php/login.inc.php');
-include_once('php/token.inc.php');
-include_once('php/checklogin.php');
-include_once('php/request.inc.php');
-include_once('php/devmarkt.class.php');
+include_once('../php/pdo.php');
+include_once('../php/login.inc.php');
+include_once('../php/token.inc.php');
+include_once('../php/checklogin.php');
+include_once('../php/request.inc.php');
+include_once('../php/devmarkt.class.php');
 $mysql = new MySQL();
 $base_url = getenv("BOT_BASE_URI");
 $discordInvite = getenv('GUILD_INVITE');
@@ -129,7 +129,7 @@
 
     ?>
 
-    <form id="form" method="POST" action="php/devmarkt.inc.php">
+    <form id="form" method="POST" action="devmarkt.inc.php">
 
         <?php