remove updates page, fix admin page to use cli commands properly

Author: hinanaya

cli/includes/web.php

@@ -13,11 +13,10 @@
 define('OB_CLI', true);
 
 require_once(__DIR__ . '/../../core/init.php');
-require_once(__DIR__ . '/../../public/updates/checker.php');
 
 $system_user = exec('whoami');
 
-$checker = new \OBFChecker();
+$checker = new \OpenBroadcaster\Support\Checker();
 
 $output = [];
 $output['system_user'] = exec('whoami');

core/cli/CheckInstall.php

@@ -10,9 +10,7 @@ class CheckInstall extends CLI
 
     public function run(array $args): bool
     {
-        require_once(__DIR__ . '/../../public/updates/checker.php');
-
-        $checker = new \OBFChecker();
+        $checker = new \OpenBroadcaster\Support\Checker();
         $methods = get_class_methods($checker);
         $methods = array_filter($methods, fn($x) => $x !== '__construct');
         $rows = [];

core/init.php

@@ -151,8 +151,7 @@
 $init_verify_running = false;
 if (!$init_verify_running && OB_INIT_VERIFY && is_array(OB_INIT_VERIFY) && !defined('OB_CLI')) {
     $init_verify_running = true;
-    require_once(OB_LOCAL . '/public/updates/checker.php');
-    $checker = new \OBFChecker();
+    $checker = new \OpenBroadcaster\Support\Checker();
     $methods = get_class_methods($checker);
 
     foreach (OB_INIT_VERIFY as $check) {

public/admin/run.php

@@ -12,7 +12,7 @@
 $theme = new SolarizedTheme();
 $converter = new AnsiToHtmlConverter($theme, false);
 
-header('Content-type: application-json');
+header('Content-type: application/json');
 
 $json = json_decode(file_get_contents('php://input'));
 
@@ -32,17 +32,19 @@
     exit();
 }
 
-$validCommands = ['check', 'cron run', 'updates list all', 'updates run all'];
+$validCommands = ['check install', 'cron run', 'updates list all', 'updates run all'];
 if (in_array($json->command, $validCommands)) {
     $output = [];
     $resultCode = 0;
-    exec(__DIR__ . "/../../tools/cli/ob {$json->command}", $output);
+    $commandStr = __DIR__ . "/../../cli/ob {$json->command}";
+
+    exec($commandStr, $output, $resultCode);
 
     $output = $converter->convert(implode(PHP_EOL, $output));
     if ($output === "" && $resultCode === 0) {
         $output = $converter->convert('No output. Command ran successfully.');
     } elseif ($output === "") {
-        $output = $converter->convert('An error occurred running the command but no output was provided.');
+        $output = $converter->convert('An error occurred (' . $resultCode . ') running the command but no output was provided.');
     }
 
     echo json_encode([

public/admin/script.js

@@ -12,7 +12,7 @@ async function run(data)
     });
 
     const output = document.querySelector("#cli-output");
-    
+
     response.json().then((data) => {
         if (! response.ok) {
             output.innerHTML += '<p class="error">' + data.message + '</p>';
@@ -27,7 +27,7 @@ async function run(data)
 async function cliCheck()
 {
     const data = {
-        command: "check"
+        command: "check install"
     };
 
     run(data);