Update KC Wahlen Button Reihenfolge

update Readme

.gitea/workflows/deploy.yml

@@ -35,6 +35,7 @@ jobs:
       # =====================
       - name: Deploy to DEV via FTP
         if: github.ref == 'refs/heads/develop'
+        shell: bash
         run: |
           apt-get update
           apt-get install -y lftp
@@ -51,17 +52,68 @@ jobs:
       # =====================
       # PROD DEPLOY (FTP)
       # =====================
-      - name: Deploy to PROD via FTP
+      - name: Deploy to PROD via SSH
         if: github.ref == 'refs/heads/main'
+        env:
+          SSH_HOST: ${{ secrets.PROD_SSH_HOST }}
+          SSH_USER: ${{ secrets.PROD_SSH_USER }}
+          SSH_PORT: ${{ secrets.PROD_SSH_PORT }}
+          SSH_KEY: ${{ secrets.PROD_SSH_PRIVATE_KEY }}
+          HOST_WP_ROOT: ${{ secrets.PROD_HOST_WP_ROOT }}
+          HOST_ABS_PLUGIN_PATH: ${{ secrets.PROD_HOST_ABS_PLUGIN_PATH }}
+        shell: bash
         run: |
+          set -euo pipefail
           apt-get update
-          apt-get install -y lftp
+          # openssh-client to auth; tar for packaging with excludes
+          apt-get install -y openssh-client tar
 
-          lftp -u "${{ secrets.FTP_USER }},${{ secrets.FTP_PASS }}" ftp://${{ secrets.FTP_HOST }}:${{ secrets.FTP_PORT }} <<EOF
+          # Prepare SSH key
-          set ftp:ssl-allow no
+          mkdir -p ~/.ssh
-          set net:timeout 20
+          # Write the multiline private key exactly as provided
-          set net:max-retries 2
+          printf "%s\n" "$SSH_KEY" > ~/.ssh/prod_docker_key
-          set mirror:parallel-transfer-count 2
+          chmod 600 ~/.ssh/prod_docker_key
-          mirror -R --delete --verbose ./ /httpdocs/wp-content/plugins/konficastle-workshopwahl/
+
-          quit
+          # Write SSH config so DOCKER_HOST can reference a named host
-          EOF
+          cat > ~/.ssh/config <<CFG
+          Host prod-docker
+            HostName ${SSH_HOST}
+            User ${SSH_USER}
+            Port ${SSH_PORT}
+            IdentityFile ~/.ssh/prod_docker_key
+            IdentitiesOnly yes
+            PubkeyAuthentication yes
+            StrictHostKeyChecking accept-new
+          CFG
+
+          # Prime known_hosts (optional, StrictHostKeyChecking accept-new will handle first connect)
+          ssh-keyscan -p "$SSH_PORT" "$SSH_HOST" >> ~/.ssh/known_hosts || true
+
+          # Create a tarball with excludes to avoid copying VCS and CI folders
+          TAR_FILE="/tmp/kc-plugin.tar.gz"
+          tar -czf "$TAR_FILE" \
+            --exclude .git \
+            --exclude .gitea \
+            --exclude .github \
+            --exclude Notes \
+            --exclude "*.yml" \
+            --exclude "*.yaml" \
+            --exclude "*.md" \
+            .
+          
+          # Choose target path: prefer absolute plugin path; otherwise derive from HOST_WP_ROOT
+          if [ -n "${HOST_ABS_PLUGIN_PATH}" ]; then
+            echo "Deploying to absolute host path: ${HOST_ABS_PLUGIN_PATH}"
+            REMOTE_PATH_DECL="PLUGIN_PATH=\"${HOST_ABS_PLUGIN_PATH%/}\""
+          elif [ -n "${HOST_WP_ROOT}" ]; then
+            echo "Deploying to host path relative to remote home: \$HOME/${HOST_WP_ROOT%/}/wp-content/plugins/konficastle-workshopwahl"
+            REMOTE_PATH_DECL="PLUGIN_PATH=\$HOME/${HOST_WP_ROOT%/}/wp-content/plugins/konficastle-workshopwahl"
+          else
+            echo "Error: set PROD_HOST_ABS_PLUGIN_PATH (absolute) or PROD_HOST_WP_ROOT (relative)" >&2
+            exit 1
+          fi
+
+          # Upload tarball to host home and extract
+          scp -o StrictHostKeyChecking=accept-new -o IdentitiesOnly=yes -i ~/.ssh/prod_docker_key "$TAR_FILE" prod-docker:~/kc-plugin.tar.gz
+          # Use \$HOME for remote expansion (tilde does not expand inside quotes)
+          ssh prod-docker "$REMOTE_PATH_DECL; mkdir -p \"\$PLUGIN_PATH\" && rm -rf \"\$PLUGIN_PATH\"/* && tar -xzf \"\$HOME/kc-plugin.tar.gz\" -C \"\$PLUGIN_PATH\" && rm -f \"\$HOME/kc-plugin.tar.gz\" && ls -la \"\$PLUGIN_PATH\" | head -n 50"

CHANGELOG.md

@@ -1,16 +0,0 @@
-# Changelog
-
-All notable changes to this project are documented in this file.
-
-## [1.0] - 2026-02-01
-### Added
-- Initial release of the KonfiCastle Workshop-Wahlen plugin (Admin backend, participant frontend, assignment logic, CSV export, teamer password management).
-- Shortcodes: `[konficastle_workshopwahl wahl=ID]`, `[konficastle_workshop_ergebnis wahl=ID]`.
-
-### Fixed
-- Removed query against non-existent table `kc_phasen`; phases are derived from `kc_wahlen.anzahl_einheiten`. See [includes/admin-workshops.php](includes/admin-workshops.php).
-- Initialized `$debug_output` to prevent PHP warning in frontend. See [includes/frontend-form.php](includes/frontend-form.php).
-
-### Notes
-- Database tables use WordPress prefix via `$wpdb->prefix`.
-- Force assignments have priority over automatic allocation.

README.md

@@ -47,8 +47,3 @@ Dieses WordPress-Plugin ermöglicht die Verwaltung und Durchführung von Worksho
 ---
 
 Für Detailfragen zu Datenbankstruktur, Shortcodes oder Zuteilungslogik siehe die jeweiligen Dateien im `includes/`-Verzeichnis.
-
-## Release Notes
-
-Siehe die ausführlichen Hinweise zur Version 1.0 in [RELEASE_NOTES.md](RELEASE_NOTES.md).
-

includes/admin-wahlen.php

@@ -360,9 +360,9 @@ function kc_wahlen_page() {
         echo '<td class="kc-actions">';
             echo '<a class="kc-btn" href="?page=kc_wahlen&zuweisen='.intval($wahl->id).'">Workshops zuweisen</a>';
             echo '<a class="kc-btn" href="?page=kc_wahlen&edit_wahl='.intval($wahl->id).'">Bearbeiten</a>';
-            echo '<a class="kc-btn" href="?page=kc_wahlen&show_zuteilung='.intval($wahl->id).'">Zuteilung anzeigen</a>';
             $nonce = wp_create_nonce('kc_run_zuteilung_' . intval($wahl->id));
             echo '<a class="kc-btn" href="?page=kc_wahlen&run_zuteilung='.intval($wahl->id).'&_wpnonce='.$nonce.'" onclick="return confirm(\'Zuteilung wirklich starten? Dies überschreibt vorhandene Zuteilungen.\');">Zuteilung starten</a>';
+            echo '<a class="kc-btn" href="?page=kc_wahlen&show_zuteilung='.intval($wahl->id).'">Zuteilung anzeigen</a>';
             echo '<a href="?page=kc_wahlen&delete_wahl='.intval($wahl->id).'" class="kc-btn del" onclick="return confirm(\'Wirklich löschen?\');">Löschen</a>';
         echo '</td>';
         echo '</tr>';

install.php

@@ -1,139 +1,140 @@
-<?php
+<?php
-if (!defined('ABSPATH')) exit;
+if (!defined('ABSPATH')) exit;
-
+
-/**
+/**
- * Create plugin database tables on activation and remove them on deactivation.
+ * Create plugin database tables on activation and remove them on deactivation.
- */
+ 
-function kc_install_tables() {
+ */
-    global $wpdb;
+function kc_install_tables() {
-    $prefix = $wpdb->prefix;
+    global $wpdb;
-    $charset_collate = $wpdb->get_charset_collate();
+    $prefix = $wpdb->prefix;
-
+    $charset_collate = $wpdb->get_charset_collate();
-    require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+
-
+    require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
-    // Tables definitions
+
-    $tables_sql = [];
+    // Tables definitions
-
+    $tables_sql = [];
-    $tables_sql[] = "CREATE TABLE {$prefix}kc_wahlen (
+
-        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+    $tables_sql[] = "CREATE TABLE {$prefix}kc_wahlen (
-        name varchar(191) NOT NULL,
+        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-        beschreibung text DEFAULT NULL,
+        name varchar(191) NOT NULL,
-        anzahl_einheiten tinyint NOT NULL DEFAULT 1,
+        beschreibung text DEFAULT NULL,
-        min_kapazitaet int NOT NULL DEFAULT 0,
+        anzahl_einheiten tinyint NOT NULL DEFAULT 1,
-        max_kapazitaet int NOT NULL DEFAULT 0,
+        min_kapazitaet int NOT NULL DEFAULT 0,
-        freigegeben tinyint(1) NOT NULL DEFAULT 0,
+        max_kapazitaet int NOT NULL DEFAULT 0,
-        deleted tinyint(1) NOT NULL DEFAULT 0,
+        freigegeben tinyint(1) NOT NULL DEFAULT 0,
-        PRIMARY KEY (id)
+        deleted tinyint(1) NOT NULL DEFAULT 0,
-    ) $charset_collate";
+        PRIMARY KEY (id)
-
+    ) $charset_collate";
-    $tables_sql[] = "CREATE TABLE {$prefix}kc_workshops (
+
-        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+    $tables_sql[] = "CREATE TABLE {$prefix}kc_workshops (
-        name varchar(191) NOT NULL,
+        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-        beschreibung text DEFAULT NULL,
+        name varchar(191) NOT NULL,
-        max_teilnehmer int NOT NULL DEFAULT 0,
+        beschreibung text DEFAULT NULL,
-        min_teilnehmer int NOT NULL DEFAULT 0,
+        max_teilnehmer int NOT NULL DEFAULT 0,
-        PRIMARY KEY (id)
+        min_teilnehmer int NOT NULL DEFAULT 0,
-    ) $charset_collate";
+        PRIMARY KEY (id)
-
+    ) $charset_collate";
-    $tables_sql[] = "CREATE TABLE {$prefix}kc_teamer (
+
-        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+    $tables_sql[] = "CREATE TABLE {$prefix}kc_teamer (
-        vorname varchar(191) DEFAULT NULL,
+        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-        nachname varchar(191) DEFAULT NULL,
+        vorname varchar(191) DEFAULT NULL,
-        PRIMARY KEY (id)
+        nachname varchar(191) DEFAULT NULL,
-    ) $charset_collate";
+        PRIMARY KEY (id)
-
+    ) $charset_collate";
-    $tables_sql[] = "CREATE TABLE {$prefix}kc_teilnehmer (
+
-        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+    $tables_sql[] = "CREATE TABLE {$prefix}kc_teilnehmer (
-        vorname varchar(191) DEFAULT NULL,
+        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-        nachname varchar(191) DEFAULT NULL,
+        vorname varchar(191) DEFAULT NULL,
-        wahl_id bigint(20) unsigned NOT NULL DEFAULT 0,
+        nachname varchar(191) DEFAULT NULL,
-        phase tinyint NOT NULL DEFAULT 1,
+        wahl_id bigint(20) unsigned NOT NULL DEFAULT 0,
-        wunsch1 bigint(20) unsigned DEFAULT NULL,
+        phase tinyint NOT NULL DEFAULT 1,
-        wunsch2 bigint(20) unsigned DEFAULT NULL,
+        wunsch1 bigint(20) unsigned DEFAULT NULL,
-        wunsch3 bigint(20) unsigned DEFAULT NULL,
+        wunsch2 bigint(20) unsigned DEFAULT NULL,
-		deleted tinyint(1) NOT NULL DEFAULT 0,
+        wunsch3 bigint(20) unsigned DEFAULT NULL,
-        PRIMARY KEY (id)
+		deleted tinyint(1) NOT NULL DEFAULT 0,
-    ) $charset_collate";
+        PRIMARY KEY (id)
-
+    ) $charset_collate";
-    $tables_sql[] = "CREATE TABLE {$prefix}kc_wahl_workshops (
+
-        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+    $tables_sql[] = "CREATE TABLE {$prefix}kc_wahl_workshops (
-        wahl_id bigint(20) unsigned NOT NULL DEFAULT 0,
+        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-        workshop_id bigint(20) unsigned NOT NULL DEFAULT 0,
+        wahl_id bigint(20) unsigned NOT NULL DEFAULT 0,
-        phase tinyint NOT NULL DEFAULT 1,
+        workshop_id bigint(20) unsigned NOT NULL DEFAULT 0,
-        PRIMARY KEY (id)
+        phase tinyint NOT NULL DEFAULT 1,
-    ) $charset_collate";
+        PRIMARY KEY (id)
-
+    ) $charset_collate";
-    $tables_sql[] = "CREATE TABLE {$prefix}kc_force_zuteilung (
+
-        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+    $tables_sql[] = "CREATE TABLE {$prefix}kc_force_zuteilung (
-        teilnehmer_id bigint(20) unsigned NOT NULL DEFAULT 0,
+        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-        wahl_id bigint(20) unsigned NOT NULL DEFAULT 0,
+        teilnehmer_id bigint(20) unsigned NOT NULL DEFAULT 0,
-        phase tinyint NOT NULL DEFAULT 1,
+        wahl_id bigint(20) unsigned NOT NULL DEFAULT 0,
-        workshop_id bigint(20) unsigned DEFAULT NULL,
+        phase tinyint NOT NULL DEFAULT 1,
-        kommentar text DEFAULT NULL,
+        workshop_id bigint(20) unsigned DEFAULT NULL,
-        PRIMARY KEY (id)
+        kommentar text DEFAULT NULL,
-    ) $charset_collate";
+        PRIMARY KEY (id)
-
+    ) $charset_collate";
-    $tables_sql[] = "CREATE TABLE {$prefix}kc_zuteilung (
+
-        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+    $tables_sql[] = "CREATE TABLE {$prefix}kc_zuteilung (
-        teilnehmer_id bigint(20) unsigned NOT NULL DEFAULT 0,
+        id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-        vorname varchar(191) DEFAULT NULL,
+        teilnehmer_id bigint(20) unsigned NOT NULL DEFAULT 0,
-        nachname varchar(191) DEFAULT NULL,
+        vorname varchar(191) DEFAULT NULL,
-        wahl_id bigint(20) unsigned NOT NULL DEFAULT 0,
+        nachname varchar(191) DEFAULT NULL,
-        phase tinyint NOT NULL DEFAULT 1,
+        wahl_id bigint(20) unsigned NOT NULL DEFAULT 0,
-        workshop_id bigint(20) unsigned DEFAULT NULL,
+        phase tinyint NOT NULL DEFAULT 1,
-        wunsch_rang tinyint DEFAULT NULL,
+        workshop_id bigint(20) unsigned DEFAULT NULL,
-        PRIMARY KEY (id)
+        wunsch_rang tinyint DEFAULT NULL,
-    ) $charset_collate";
+        PRIMARY KEY (id)
-	
+    ) $charset_collate";
-	$tables_sql[] = "CREATE TABLE {$prefix}kc_workshop_teamer (
+	
-		id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+	$tables_sql[] = "CREATE TABLE {$prefix}kc_workshop_teamer (
-		workshop_id bigint(20) unsigned DEFAULT NULL,
+		id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-		teamer_id bigint(20) unsigned DEFAULT NULL,
+		workshop_id bigint(20) unsigned DEFAULT NULL,
-		PRIMARY KEY (id)
+		teamer_id bigint(20) unsigned DEFAULT NULL,
-	) $charset_collate";
+		PRIMARY KEY (id)
-
+	) $charset_collate";
-    foreach ($tables_sql as $sql) {
+
-        dbDelta($sql);
+    foreach ($tables_sql as $sql) {
-    }
+        dbDelta($sql);
-
+    }
-    // Post-creation migration guard: ensure min_teilnehmer exists for older installs
+
-    $col = $wpdb->get_var($wpdb->prepare("SHOW COLUMNS FROM {$prefix}kc_workshops LIKE %s", 'min_teilnehmer'));
+    // Post-creation migration guard: ensure min_teilnehmer exists for older installs
-    if (empty($col)) {
+    $col = $wpdb->get_var($wpdb->prepare("SHOW COLUMNS FROM {$prefix}kc_workshops LIKE %s", 'min_teilnehmer'));
-        // try to add the column (no-op on newer installs)
+    if (empty($col)) {
-        $wpdb->query("ALTER TABLE {$prefix}kc_workshops ADD COLUMN min_teilnehmer INT NOT NULL DEFAULT 0");
+        // try to add the column (no-op on newer installs)
-    }
+        $wpdb->query("ALTER TABLE {$prefix}kc_workshops ADD COLUMN min_teilnehmer INT NOT NULL DEFAULT 0");
-
+    }
-    // Optionally store plugin version
+
-    add_option('kc_workshopwahl_db_version', '1.0');
+    // Optionally store plugin version
-}
+    add_option('kc_workshopwahl_db_version', '1.0');
-
+}
-function kc_uninstall_tables() {
+
-    global $wpdb;
+function kc_uninstall_tables() {
-    $prefix = $wpdb->prefix;
+    global $wpdb;
-
+    $prefix = $wpdb->prefix;
-    $tables = [
+
-        "{$prefix}kc_zuteilung",
+    $tables = [
-        "{$prefix}kc_force_zuteilung",
+        "{$prefix}kc_zuteilung",
-        "{$prefix}kc_wahl_workshops",
+        "{$prefix}kc_force_zuteilung",
-        "{$prefix}kc_teilnehmer",
+        "{$prefix}kc_wahl_workshops",
-        "{$prefix}kc_teamer",
+        "{$prefix}kc_teilnehmer",
-        "{$prefix}kc_workshops",
+        "{$prefix}kc_teamer",
-        "{$prefix}kc_wahlen",
+        "{$prefix}kc_workshops",
-		"{$prefix}kc_workshop_teamer"
+        "{$prefix}kc_wahlen",
-    ];
+		"{$prefix}kc_workshop_teamer"
-
+    ];
-    foreach ($tables as $t) {
+
-        $wpdb->query("DROP TABLE IF EXISTS $t");
+    foreach ($tables as $t) {
-    }
+        $wpdb->query("DROP TABLE IF EXISTS $t");
-
+    }
-    delete_option('kc_workshopwahl_db_version');
+
-}
+    delete_option('kc_workshopwahl_db_version');
-
+}
-// Backwards-compat wrapper for register_activation_hook usage
+
-if (!function_exists('kc_register_hooks_internal')) {
+// Backwards-compat wrapper for register_activation_hook usage
-    function kc_register_hooks_internal() {
+if (!function_exists('kc_register_hooks_internal')) {
-        // intentionally left blank
+    function kc_register_hooks_internal() {
-    }
+        // intentionally left blank
-}
+    }
-
+}
-?>
+
+?>