From ae875917cb1796395160d8e41767b7c9477f81b4 Mon Sep 17 00:00:00 2001
From: Myron Blair <myronblair@outlook.com>
Date: Mon, 8 Jun 2026 12:21:06 +0000
Subject: [PATCH] Fix WordPressManager (wrong DB class) and DockerManager (sudo
 install)

---
 panel/lib/DockerManager.php    | 25 +++++++++++++++----------
 panel/lib/WordPressManager.php |  4 ++--
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/panel/lib/DockerManager.php b/panel/lib/DockerManager.php
index 08b96a8..3814518 100644
--- a/panel/lib/DockerManager.php
+++ b/panel/lib/DockerManager.php
@@ -19,19 +19,24 @@ class DockerManager {
 
     public function install(): string {
         if ($this->isInstalled()) return 'Docker is already installed';
+        // Write install script to /tmp then run it via sudo bash (no interactive terminal needed)
         $script = <<<'SH'
-        export DEBIAN_FRONTEND=noninteractive
-        curl -fsSL https://get.docker.com | sh
-        systemctl enable --now docker
-        usermod -aG docker www-data
-        SH;
+#!/bin/bash
+set -e
+export DEBIAN_FRONTEND=noninteractive
+curl -fsSL https://get.docker.com -o /tmp/ncpx-get-docker.sh
+bash /tmp/ncpx-get-docker.sh
+rm -f /tmp/ncpx-get-docker.sh
+systemctl enable --now docker
+usermod -aG docker www-data
+SH;
+        $scriptFile = '/tmp/ncpx-docker-install.sh';
+        file_put_contents($scriptFile, $script);
+        chmod($scriptFile, 0700);
         $out = [];
-        exec('bash -c ' . escapeshellarg($script) . ' 2>&1', $out, $rc);
+        exec('sudo bash ' . escapeshellarg($scriptFile) . ' 2>&1', $out, $rc);
+        @unlink($scriptFile);
         if ($rc !== 0) throw new RuntimeException("Docker install failed: " . implode("\n", $out));
-        // Add sudoers entry so www-data can run docker without password
-        file_put_contents('/etc/sudoers.d/novacpx-docker',
-            "www-data ALL=(root) NOPASSWD: /usr/bin/docker\n");
-        chmod('/etc/sudoers.d/novacpx-docker', 0440);
         novacpx_log('info', 'DockerManager: Docker CE installed');
         return 'Docker installed successfully';
     }
diff --git a/panel/lib/WordPressManager.php b/panel/lib/WordPressManager.php
index ca3d386..f0a71ca 100644
--- a/panel/lib/WordPressManager.php
+++ b/panel/lib/WordPressManager.php
@@ -1,10 +1,10 @@
 <?php
 class WordPressManager {
-    private PDO $db;
+    private \PDO $db;
     private string $wpcli = '/usr/local/bin/wp';
 
     public function __construct() {
-        $this->db = Database::getInstance()->getPDO();
+        $this->db = DB::getInstance()->pdo();
         $this->ensureWpCli();
     }