Skip to content

Commit 72b6072

Browse files
mstrhakrmstrhakr
committed
refactor(structure): update all path references for include/ and sheets/
Update all require_once, include, URL, and asset references to use the new directory names (include/ instead of php/, sheets/ instead of styles/) and PascalCase filenames. Files updated: - 14 PHP source files (require_once paths) - 4 .page files (asset hrefs and include paths) - 1 JS file (AJAX endpoint URLs) - 1 shell script (inline PHP paths) - 1 CSS file (comment reference) - 3 build/test configs (phpstan, phpunit, bootstrap) - 19 test files (include paths and docblock comments) - 1 framework example test (asset path)
1 parent b6feb23 commit 72b6072

41 files changed

Lines changed: 129 additions & 128 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎phpstan.neon‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ parameters:
44
- php
55
- page
66
paths:
7-
- source/compose.manager/php
7+
- source/compose.manager/include
88
excludePaths:
99
- */vendor/*
1010
ignoreErrors:

‎phpunit.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</testsuites>
1414
<source>
1515
<include>
16-
<directory>source/compose.manager/php</directory>
16+
<directory>source/compose.manager/include</directory>
1717
</include>
1818
</source>
1919
<coverage>

‎source/compose.manager/Compose.page‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ Cond="$var['fsState'] == 'Started' && exec('/etc/rc.d/rc.docker status | grep -v
99
---
1010
<link type="text/css" rel="stylesheet" href="<?php autov('/webGui/styles/jquery.switchbutton.css'); ?>">
1111
<link type="text/css" rel="stylesheet" href="<?php autov('/webGui/styles/jquery.filetree.css'); ?>">
12-
<link type="text/css" rel="stylesheet" href="<?php autov('/plugins/compose.manager/styles/comboButton.css'); ?>">
13-
<link type="text/css" rel="stylesheet" href="<?php autov('/plugins/compose.manager/styles/editorModal.css'); ?>">
12+
<link type="text/css" rel="stylesheet" href="<?php autov('/plugins/compose.manager/sheets/ComboButton.css'); ?>">
13+
<link type="text/css" rel="stylesheet" href="<?php autov('/plugins/compose.manager/sheets/EditorModal.css'); ?>">
1414
<script src="<?php autov('/webGui/javascript/jquery.switchbutton.js'); ?>"></script>
1515
<script src="<?php autov('/webGui/javascript/jquery.filetree.js'); ?>" charset="utf-8"></script>
1616
<script src="<?php autov('/plugins/dynamix.docker.manager/javascript/docker.js'); ?>"></script>
1717
<style>
1818
table tbody td {
19-
line-height:normal
19+
line-height:normal
2020
}
2121
</style>
22-
<?php include '/usr/local/emhttp/plugins/compose.manager/php/compose_manager_main.php';?>
22+
<?php include '/usr/local/emhttp/plugins/compose.manager/include/ComposeManager.php';?>

‎source/compose.manager/compose.manager.dashboard.page‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ EOT;
164164
$script = <<<'EOT'
165165
<script>
166166
(function() {
167-
var caURL = '/plugins/compose.manager/php/exec.php';
167+
var caURL = '/plugins/compose.manager/include/Exec.php';
168168
var expandedStacks = {};
169169
var stackContainerCache = {};
170170

@@ -294,7 +294,7 @@ $script .= <<<'EOT'
294294
}
295295

296296
function stackAction(stackName, action) {
297-
// Map dashboard action names to compose_util.php action names
297+
// Map dashboard action names to ComposeUtil.php action names
298298
var actionMap = {
299299
'start': 'composeUp',
300300
'stop': 'composeStop',
@@ -305,7 +305,7 @@ $script .= <<<'EOT'
305305
var $status = $('#compose_stacks_status');
306306
$status.text(actionTitle + 'ing ' + stackName + '...');
307307

308-
$.post('/plugins/compose.manager/php/compose_util.php', {
308+
$.post('/plugins/compose.manager/include/ComposeUtil.php', {
309309
action: apiAction,
310310
path: '/boot/config/plugins/compose.manager/projects/' + stackName
311311
}, function(data) {
@@ -324,7 +324,7 @@ $script .= <<<'EOT'
324324
function openStackLogs(stackName) {
325325
// Open combined logs for the stack in a new window
326326
var projectPath = '/boot/config/plugins/compose.manager/projects/' + stackName;
327-
$.post('/plugins/compose.manager/php/compose_util.php', {
327+
$.post('/plugins/compose.manager/include/ComposeUtil.php', {
328328
action: 'composeLogs',
329329
path: projectPath
330330
}, function(data) {
@@ -412,7 +412,7 @@ $script .= <<<'EOT'
412412
function openDockerTerminal(name, isLogs, shell) {
413413
if (isLogs) {
414414
// Logs — start ttyd via plugin, open in new window (same as stack logs)
415-
$.post('/plugins/compose.manager/php/compose_util.php', {
415+
$.post('/plugins/compose.manager/include/ComposeUtil.php', {
416416
action: 'containerLogs',
417417
container: name
418418
}, function(data) {
@@ -425,7 +425,7 @@ $script .= <<<'EOT'
425425
});
426426
} else {
427427
// Console — start writable ttyd via plugin, open directly
428-
$.post('/plugins/compose.manager/php/compose_util.php', {
428+
$.post('/plugins/compose.manager/include/ComposeUtil.php', {
429429
action: 'containerConsole',
430430
container: name,
431431
shell: shell || '/bin/bash'
@@ -542,7 +542,7 @@ $script .= <<<'EOT'
542542
}
543543

544544
function loadComposeStacks() {
545-
$.post('/plugins/compose.manager/php/dashboard_stacks.php', function(data) {
545+
$.post('/plugins/compose.manager/include/DashboardStacks.php', function(data) {
546546
var statusText = 'Stacks -- Started: ' + data.started + ', Stopped: ' + data.stopped;
547547
if (data.partial > 0) statusText += ', Partial: ' + data.partial;
548548
$('#compose_stacks_status').text(statusText);

‎source/compose.manager/compose.manager.page‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ if (!empty($_SERVER['REQUEST_URI'])) {
2525
}
2626
}
2727
?>
28-
<link type="text/css" rel="stylesheet" href="<?php autov('/plugins/compose.manager/styles/comboButton.css'); ?>">
29-
<link type="text/css" rel="stylesheet" href="<?php autov('/plugins/compose.manager/styles/editorModal.css'); ?>">
28+
<link type="text/css" rel="stylesheet" href="<?php autov('/plugins/compose.manager/sheets/ComboButton.css'); ?>">
29+
<link type="text/css" rel="stylesheet" href="<?php autov('/plugins/compose.manager/sheets/EditorModal.css'); ?>">
3030
<link type="text/css" rel="stylesheet" href="<?php autov('/webGui/styles/jquery.filetree.css'); ?>">
3131
<link type="text/css" rel="stylesheet" href="<?php autov('/webGui/styles/jquery.switchbutton.css'); ?>">
3232
<script src="<?php autov('/webGui/javascript/jquery.filetree.js'); ?>" charset="utf-8"></script>
3333
<script src="<?php autov('/webGui/javascript/jquery.switchbutton.js'); ?>"></script>
34-
<?php include '/usr/local/emhttp/plugins/compose.manager/php/compose_manager_main.php';?>
34+
<?php include '/usr/local/emhttp/plugins/compose.manager/include/ComposeManager.php';?>

‎source/compose.manager/compose.manager.settings.page‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Lock="true"
77
---
88
<?php
99
include "/usr/local/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php";
10-
require_once("/usr/local/emhttp/plugins/compose.manager/php/defines.php");
10+
require_once("/usr/local/emhttp/plugins/compose.manager/include/Defines.php");
1111
$cfg = parse_plugin_cfg($sName);
1212
$ui_patch_button_type = (!$option_patch_ui && strcmp($cfg['PATCH_UI'], "true") == 0 && !isset($composemanDockerClientPatch)) ? "Button" : "Hidden";
1313
$ui_unpatch_button_type = (!$option_patch_ui && strcmp($cfg['PATCH_UI'], "false") == 0 && isset($composemanDockerClientPatch)) ? "Button" : "Hidden";
@@ -618,7 +618,7 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
618618
</style>
619619
<script src="<?php autov('/plugins/compose.manager/javascript/common.js'); ?>"></script>
620620
<script>
621-
var caURL = "/plugins/compose.manager/php/exec.php";
621+
var caURL = "/plugins/compose.manager/include/Exec.php";
622622
var skipPatchUI = <?php echo json_encode($option_patch_ui); ?>; // true when Unraid >= 6.12
623623
var logRefreshInterval = null;
624624
var autoScroll = true;
@@ -1585,10 +1585,10 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
15851585

15861586
function loadUpdatesUI() {
15871587
$('#updates-tbody').html('<tr><td colspan="5" class="compose-text-muted" style="text-align:center;padding:12px;">_(Loading stacks...)_</td></tr>');
1588-
$.post('/plugins/compose.manager/php/exec.php', {
1588+
$.post('/plugins/compose.manager/include/Exec.php', {
15891589
action: 'listProjects'
15901590
}, function(projects) {
1591-
$.post('/plugins/compose.manager/php/autoupdate.php', {
1591+
$.post('/plugins/compose.manager/include/AutoUpdate.php', {
15921592
action: 'getConfig'
15931593
}, function(cfg) {
15941594
// Response is already parsed as JSON by jQuery due to Content-Type header
@@ -1650,7 +1650,7 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
16501650
}
16511651

16521652
function refreshCronStatus() {
1653-
$.post('/plugins/compose.manager/php/autoupdate.php', {
1653+
$.post('/plugins/compose.manager/include/AutoUpdate.php', {
16541654
action: 'getCronStatus'
16551655
}, function(r) {
16561656
// Response is already parsed as JSON by jQuery due to Content-Type header
@@ -1783,7 +1783,7 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
17831783
var schedulerEnabled = $('#AUTOUPDATE_ENABLED').is(':checked');
17841784

17851785
// Save config first
1786-
$.post('/plugins/compose.manager/php/autoupdate.php', {
1786+
$.post('/plugins/compose.manager/include/AutoUpdate.php', {
17871787
action: 'saveConfig',
17881788
data: JSON.stringify(cfg)
17891789
}, function(resp) {
@@ -1795,7 +1795,7 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
17951795

17961796
// Then update scheduler
17971797
var schedulerAction = schedulerEnabled ? 'installCron' : 'removeCron';
1798-
$.post('/plugins/compose.manager/php/autoupdate.php', {
1798+
$.post('/plugins/compose.manager/include/AutoUpdate.php', {
17991799
action: schedulerAction
18001800
}, function(d) {
18011801
setUpdatesSpinner(false);
@@ -1837,7 +1837,7 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
18371837
return;
18381838
}
18391839
var p = paths[idx++];
1840-
$.post('/plugins/compose.manager/php/autoupdate.php', {
1840+
$.post('/plugins/compose.manager/include/AutoUpdate.php', {
18411841
action: 'runNow',
18421842
path: p
18431843
}, function(data) {

‎source/compose.manager/include/AutoUpdate.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
2-
require_once("/usr/local/emhttp/plugins/compose.manager/php/defines.php");
3-
require_once("/usr/local/emhttp/plugins/compose.manager/php/util.php");
2+
require_once("/usr/local/emhttp/plugins/compose.manager/include/Defines.php");
3+
require_once("/usr/local/emhttp/plugins/compose.manager/include/Util.php");
44

55
$action = isset($_POST['action']) ? $_POST['action'] : '';
66
$autofile = getAutoUpdateConfigFilePath();
@@ -72,7 +72,7 @@
7272
if ($cronDirEnv !== false && $cronDirEnv !== '') {
7373
$cronDir = $cronDirEnv;
7474
$cronFile = rtrim($cronDir, '/') . '/compose_manager_autoupdate';
75-
$runner = escapeshellarg($plugin_root . "php/autoupdate_runner.php");
75+
$runner = escapeshellarg($plugin_root . "include/AutoUpdateRunner.php");
7676
$line = "*/15 * * * * root " . escapeshellarg($phpBinary) . " " . $runner . " >/dev/null 2>&1\n";
7777
// ensure cron directory exists for test environments
7878
$cdir = dirname($cronFile);
@@ -86,7 +86,7 @@
8686
} else {
8787
// Default behavior: use plugin-owned cron file and let update_cron sync it to the system
8888
$pluginCron = '/boot/config/plugins/compose.manager/compose.manager.cron';
89-
$runner = escapeshellarg($plugin_root . "php/autoupdate_runner.php");
89+
$runner = escapeshellarg($plugin_root . "include/AutoUpdateRunner.php");
9090
$line = "*/15 * * * * root " . escapeshellarg($phpBinary) . " " . $runner . " >/dev/null 2>&1\n";
9191

9292
if (!is_dir(dirname($pluginCron))) {

‎source/compose.manager/include/AutoUpdateRunner.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
/**
33
* Runner invoked by cron to check autoupdate.json and run updates when scheduled
44
*/
5-
require_once("/usr/local/emhttp/plugins/compose.manager/php/defines.php");
6-
require_once("/usr/local/emhttp/plugins/compose.manager/php/util.php");
5+
require_once("/usr/local/emhttp/plugins/compose.manager/include/Defines.php");
6+
require_once("/usr/local/emhttp/plugins/compose.manager/include/Util.php");
77

88
$autofile = getAutoUpdateConfigFilePath();
99
if (!is_file($autofile)) exit(0);

‎source/compose.manager/include/BackupFunctions.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
* Archives are .tar.gz files containing stack directories.
88
*/
99

10-
require_once("/usr/local/emhttp/plugins/compose.manager/php/defines.php");
11-
require_once("/usr/local/emhttp/plugins/compose.manager/php/util.php");
10+
require_once("/usr/local/emhttp/plugins/compose.manager/include/Defines.php");
11+
require_once("/usr/local/emhttp/plugins/compose.manager/include/Util.php");
1212

1313
/**
1414
* Get the backup destination path from config, falling back to default.
@@ -338,7 +338,7 @@ function formatBytes($bytes)
338338

339339
/**
340340
* Log a message to syslog with compose.manager tag.
341-
* Guarded to avoid redeclaration when compose_util_functions.php is also loaded.
341+
* Guarded to avoid redeclaration when Helpers.php is also loaded.
342342
*/
343343
if (!function_exists('logger')) {
344344
function logger($message)

‎source/compose.manager/include/ComposeList.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* This file is called via AJAX to load the stack list without blocking page load
66
*/
77

8-
require_once("/usr/local/emhttp/plugins/compose.manager/php/defines.php");
9-
require_once("/usr/local/emhttp/plugins/compose.manager/php/util.php");
8+
require_once("/usr/local/emhttp/plugins/compose.manager/include/Defines.php");
9+
require_once("/usr/local/emhttp/plugins/compose.manager/include/Util.php");
1010

1111
$cfg = parse_plugin_cfg($sName);
1212

0 commit comments

Comments
 (0)