Skip to content

S22 tech patch edit addon #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
s22-tech wants to merge 3 commits into
base: master
Choose a base branch
from
Open

S22 tech patch edit addon #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d8b928
Refactor administrator fetch logic in login.inc.php
s22-tech Jun 29, 2026
6239650
Revert "Refactor administrator fetch logic in login.inc.php"
s22-tech Jun 29, 2026
d781b81
Fix HTML and JavaScript syntax issues in edit_addon.inc.php
s22-tech Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 40 additions & 40 deletions public_html/backend/apps/addons/edit_addon.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,9 @@
$relative_path = preg_replace('#^'. preg_quote('storage://addons/'.$addon->data['id'].'/', '#') .'#', '', $directory . $file);

if (is_dir($directory.$file)) {
$output[] = '<li>'. f::draw_fonticon('icon-folder icon-lg', 'style="color: #7ccdff;"') .' <span class="item" data-path="'. $relative_path .'">'. $file .'/</span>'. $draw_folder_contents($directory.$file.'/') .'</li>';
$output[] = '<li>'. f::draw_fonticon('icon-folder icon-lg', 'style="color: #7ccdff;"') .' <span class="item" data-path="'. $relative_path .'">'. $file .'/</span>'. $draw_folder_contents($directory . $file . '/') .'</li>';
} else {
$output[] = '<li>'. f::draw_fonticon('icon-file-o') .' <span class="item" data-path="'. $relative_path .'">'. $file .'</span><li>';
$output[] = '<li>'. f::draw_fonticon('icon-file-o') .' <span class="item" data-path="'. $relative_path .'">'. $file .'</span></li>';
}
}

Expand Down Expand Up @@ -405,7 +405,7 @@

input.warning,
textarea.warning {
box-shadow: 0 0 5px 3px rgba(255 0,0, 0.7);
box-shadow: 0 0 5px 3px rgba(255, 0, 0, 0.7);
}
</style>

Expand Down Expand Up @@ -470,7 +470,7 @@

<label class="form-group">
<div class="form-label"><?php echo t('title_storage_location', 'Storage Location'); ?></div>
<div class="form-input" readyonly><?php echo (($addon->data['location'] ?? '') ?: '<em>' . t('text_save_addon_to_establish_file_storage', 'Save the add-on to establish a file storage') . '</em>'); ?></div>
<div class="form-input" readonly><?php echo (($addon->data['location'] ?? '') ?: '<em>' . t('text_save_addon_to_establish_file_storage', 'Save the add-on to establish a file storage') . '</em>'); ?></div>
</label>
<?php if (!empty($addon->data['id'])) { ?>
<div class="grid">
Expand Down Expand Up @@ -534,7 +534,7 @@
<nav class="tabs">
<?php foreach (array_keys($addon->data['files']) as $f) { ?>
<a class="tab-item" data-toggle="tab" href="#tab-<?php echo $f; ?>">
<span class="file"><?php echo f::escape_html($_POST['files'][$f]['name']); ?></span> <span class="btn btn-default btn-sm remove" title="<?php t('title_remove', 'Remove'); ?>"><?php echo f::draw_fonticon('remove'); ?></span>
<span class="file"><?php echo f::escape_html($_POST['files'][$f]['name']); ?></span> <span class="btn btn-default btn-sm remove" title="<?php echo t('title_remove', 'Remove'); ?>"><?php echo f::draw_fonticon('remove'); ?></span>
</a>
<?php } ?>
<a class="tab-item add" href="#"><?php echo f::draw_fonticon('add'); ?></a>
Expand Down Expand Up @@ -585,7 +585,7 @@
<div class="col-md-6">
<label class="form-group">
<div class="form-label"><?php echo t('title_match_type', 'Match Type'); ?></div>
<?php echo f::form_toggle('files['.$f.'][operations]['.$o.'][type]', $type_options, (!isset($_POST['files'][$f]['operations'][$o]['type']) || $_POST['files'][$f]['operations'][$o]['type'] == '') ? 'multiline' : true); ?>
<?php echo f::form_toggle('files['.$f.'][operations]['.$o.'][type]', $type_options, (!isset($_POST['files'][$f]['operations'][$o]['type']) || $_POST['files'][$f]['operations'][$o]['type'] == 'multiline') ? 'multiline' : $_POST['files'][$f]['operations'][$o]['type']); ?>
</label>
</div>

Expand Down Expand Up @@ -687,9 +687,9 @@
</div>

<div class="col-md-2" style="align-self: center;">
<?php echo f::form_button('aliases[new_alias_index][move_up]', f::draw_fonticon('move-up'), 'button', ['class' => 'btn btn-default btn-sm', 'title' => f::escape_attr(t('title_move_up', 'Move Up'))]); ?>
<?php echo f::form_button('aliases[new_alias_index][move_down]', f::draw_fonticon('move-down'), 'button', ['class' => 'btn btn-default btn-sm', 'title' => f::escape_attr(t('title_move_down', 'Move Down'))]); ?>
<?php echo f::form_button('aliases[new_alias_index][remove]', f::draw_fonticon('remove'), 'button', ['class' => 'btn btn-default btn-sm', 'title' => f::escape_attr(t('title_remove', 'Remove'))]); ?>
<?php echo f::form_button('aliases['.$key.'][move_up]', f::draw_fonticon('move-up'), 'button', ['class' => 'btn btn-default btn-sm', 'title' => f::escape_attr(t('title_move_up', 'Move Up'))]); ?>
<?php echo f::form_button('aliases['.$key.'][move_down]', f::draw_fonticon('move-down'), 'button', ['class' => 'btn btn-default btn-sm', 'title' => f::escape_attr(t('title_move_down', 'Move Down'))]); ?>
<?php echo f::form_button('aliases['.$key.'][remove]', f::draw_fonticon('remove'), 'button', ['class' => 'btn btn-default btn-sm', 'title' => f::escape_attr(t('title_remove', 'Remove'))]); ?>
</div>
</div>
</fieldset>
Expand Down Expand Up @@ -955,7 +955,7 @@

$('.tabs').on('click', '[data-toggle="tab"]', function(e) {
let $target = $(this).attr('href');
$target.find(':input[name$="[content]"]').trigger('input');
$($target).find(':input[name$="[content]"]').trigger('input');
});

$('.tabs .add').on('click', function(e) {
Expand All @@ -966,8 +966,8 @@

let $tab = $([
'<a class="nav-link" data-toggle="tab" href="#tab-__index__">',
' <span class="file">__index__</span> <span class="btn btn-default btn-sm remove" title="<?php t('title_remove', 'Remove'); ?>">',
' <?php echo f::draw_fonticon('remove'); ?></span></a>',
' <span class="file">__index__</span> <span class="btn btn-default btn-sm remove" title="Remove">',
' <i class="icon-remove"></i></span></a>',
].join('\n')
.replace(/__index__/g, 'new_' + __index__)
);
Expand Down Expand Up @@ -1116,8 +1116,8 @@ function traverseFileTreePromise(item, path = '', files) {
let $contextmenu = $([
'<nav class="context-menu">',
' <ul class="list-unstyled">',
' <li class="item rename"><?php echo f::draw_fonticon('edit'); ?> <?php echo t('title_rename', 'Rename'); ?></a>',
' <li class="item delete"><?php echo f::draw_fonticon('delete'); ?> <?php echo t('title_delete', 'Delete'); ?></a>',
' <li class="item rename"><i class="icon-edit"></i> Rename</li>',
' <li class="item delete"><i class="icon-delete"></i> Delete</li>',
' </ul>',
'</nav>',
].join('\n'));
Expand All @@ -1129,7 +1129,7 @@ function traverseFileTreePromise(item, path = '', files) {
form_data.append('storage_action', 'rename');
form_data.append('file', $item.data('path'));

let new_name = prompt('<?php echo t('title_new_name', 'New Name'); ?>', $item.data('path'));
let new_name = prompt('<?php echo t("title_new_name", "New Name"); ?>', $item.data('path'));

if (!new_name) {
$('.context-menu').remove();
Expand Down Expand Up @@ -1448,26 +1448,26 @@ function traverseFileTreePromise(item, path = '', files) {
' <div class="grid">',
' <div class="col-md-4">',
' <label class="form-group">',
' <div class="form-label"><?php echo t('title_key', 'Key'); ?></div>',
' <div class="form-label">Key</div>',
' <div class="input-group">',
' <span class="input-group-text" style="font-family: monospace;">{alias:</span>',
' <?php echo f::form_input_text('aliases[__index__][key]', '', ['required' => '']); ?>',
' <input type="text" name="aliases[__index__][key]" class="form-control" required="">',
' <span class="input-group-text" style="font-family: monospace;">}</span>',
' </div>',
' </label>',
' </div>',
'',
' <div class="col-md-6">',
' <label class="form-group">',
' <div class="form-label"><?php echo f::escape_js(t('title_value', 'Value')); ?></div>',
' <?php echo f::escape_js(f::form_input_text('aliases[__index__][value]', '', ['required' => ''])); ?>',
' <div class="form-label">Value</div>',
' <input type="text" name="aliases[__index__][value]" class="form-control" required="">',
' </label>',
' </div>',
'',
' <div class="col-md-2" style="align-self: center;">',
' <?php echo f::form_button('aliases[__index__][move_up]', f::draw_fonticon('move-up'), 'button', ['class' => 'btn btn-default btn-sm', 'title' => f::escape_attr(t('title_move_up', 'Move Up'))]); ?>',
' <?php echo f::form_button('aliases[__index__][move_down]', f::draw_fonticon('move-down'), 'button', ['class' => 'btn btn-default btn-sm', 'title' => f::escape_attr(t('title_move_down', 'Move Down'))]); ?>',
' <?php echo f::form_button('aliases[__index__][remove]', f::draw_fonticon('remove'), 'button', ['class' => 'btn btn-default btn-sm', 'title' => f::escape_attr(t('title_remove', 'Remove'))]); ?>',
' <button type="button" class="btn btn-default btn-sm" name="aliases[__index__][move_up]" title="Move Up"><i class="icon-arrow-up"></i></button>',
' <button type="button" class="btn btn-default btn-sm" name="aliases[__index__][move_down]" title="Move Down"><i class="icon-arrow-down"></i></button>',
' <button type="button" class="btn btn-default btn-sm" name="aliases[__index__][remove]" title="Remove"><i class="icon-remove"></i></button>',
' </div>',
' </div>',
'</fieldset>'
Expand Down Expand Up @@ -1509,46 +1509,46 @@ function traverseFileTreePromise(item, path = '', files) {
' <div class="grid">',
' <div class="col-md-4">',
' <label class="form-group">',
' <div class="form-label"><?php echo t('title_key', 'Key'); ?></div>',
' <div class="form-label">Key</div>',
' <div class="input-group">',
' <span class="input-group-text" style="font-family: monospace;">{setting:</span>',
' <?php echo f::form_input_text('settings[__index__][key]', '', ['required' => '']); ?>',
' <input type="text" name="settings[__index__][key]" class="form-control" required="">',
' <span class="input-group-text" style="font-family: monospace;">}</span>',
' </div>',
' </label>',
' </div>',
'',
' <div class="col-md-6">',
' <label class="form-group">',
' <div class="form-label"><?php echo f::escape_js(t('title_title', 'Title')); ?></div>',
' <?php echo f::escape_js(f::form_input_text('settings[new_setting_index][title]', '', ['required' => ''])); ?>',
' <div class="form-label">Title</div>',
' <input type="text" name="settings[__index__][title]" class="form-control" required="">',
' </label>',
' </div>',
'',
' <div class="col-md-2 text-center" style="align-self: center;">',
' <?php echo f::form_button('settings[__index__][move_up]', f::draw_fonticon('move-up'), 'button', ['class' => 'btn btn-default btn-sm', 'title' => f::escape_attr(t('title_move_up', 'Move Up'))]); ?>',
' <?php echo f::form_button('settings[__index__][move_down]', f::draw_fonticon('move-down'), 'button', ['class' => 'btn btn-default btn-sm', 'title' => f::escape_attr(t('title_move_down', 'Move Down'))]); ?>',
' <?php echo f::form_button('settings[__index__][remove]', f::draw_fonticon('remove'), 'button', ['class' => 'btn btn-default btn-sm', 'title' => f::escape_attr(t('title_remove', 'Remove'))]); ?>',
' <button type="button" class="btn btn-default btn-sm" name="settings[__index__][move_up]" title="Move Up"><i class="icon-arrow-up"></i></button>',
' <button type="button" class="btn btn-default btn-sm" name="settings[__index__][move_down]" title="Move Down"><i class="icon-arrow-down"></i></button>',
' <button type="button" class="btn btn-default btn-sm" name="settings[__index__][remove]" title="Remove"><i class="icon-remove"></i></button>',
' </div>',
' </div>',
'',
' <label class="form-group">',
' <div class="form-label"><?php echo f::escape_js(t('title_description', 'Description')); ?></div>',
' <?php echo f::escape_js(f::form_input_text('settings[__index__][description]', '', ['required' => ''])); ?>',
' <div class="form-label">Description</div>',
' <input type="text" name="settings[__index__][description]" class="form-control" required="">',
' </label>',
'',
' <div class="grid">',
' <div class="col-md-6">',
' <label class="form-group">',
' <div class="form-label"><?php echo f::escape_js(t('title_function', 'Function')); ?></div>',
' <?php echo f::escape_js(f::form_input_text('settings[__index__][function]', '', ['required' => ''])); ?>',
' <div class="form-label">Function</div>',
' <input type="text" name="settings[__index__][function]" class="form-control" placeholder="text()" required="">',
' </label>',
' </div>',
'',
' <div class="col-md-6">',
' <label class="form-group">',
' <div class="form-label"><?php echo f::escape_js(t('title_default_value', 'Default Value')); ?></div>',
' <?php echo f::escape_js(f::form_input_text('settings[__index__][default_value]', '')); ?>',
' <div class="form-label">Default Value</div>',
' <input type="text" name="settings[__index__][default_value]" class="form-control">',
' </label>',
' </div>',
' </div>',
Expand Down Expand Up @@ -1589,13 +1589,13 @@ function traverseFileTreePromise(item, path = '', files) {
let $output = $([
'<fieldset class="upgrade">',
' <label class="form-group" style="max-width: 250px;">',
' <div class="form-label"><?php echo f::escape_js(t('title_version', 'Version')); ?></div>',
' <?php echo f::escape_js(f::form_input_text('upgrades[__index__][version]', '')); ?>',
' <div class="form-label">Version</div>',
' <input type="text" name="upgrades[__index__][version]" class="form-control">',
' </label>',
'',
' <label class="form-group">',
' <div class="form-label"><?php echo f::escape_js(t('title_script', 'Script')); ?></div>',
' <?php echo f::escape_js(f::form_input_code('upgrades[__index__][script]', '', ['style' => 'height: 200px;'])); ?>',
' <div class="form-label">Script</div>',
' <textarea name="upgrades[__index__][script]" class="form-control form-code" style="height: 200px;"></textarea>',
' </label>',
'</fieldset>'
].join('\n')
Expand All @@ -1613,4 +1613,4 @@ function traverseFileTreePromise(item, path = '', files) {
$('body').on('click', '.litebox button[name="cancel"]', function(e) {
$.litebox.close();
});
</script>
</script>
8 changes: 4 additions & 4 deletions public_html/backend/pages/login.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
}

if (!empty($administrator['last_ip_address']) && $administrator['last_ip_address'] != $_SERVER['REMOTE_ADDR']) {
notices::add('warnings', strtr(t('warning_account_previously_used_by_another_ip', 'Your account was previously used by another IP address {ip_address} ({hostname}). If this was not you then your login credentials might be compromised.'), [
notices::add('warnings', strtr(t('warning_account_previously_used_by_another_ip', 'Your account was previously used by another IP address {ip_address} ({hostname}). If this was not you then y[...]
'{username}' => $administrator['username'],
'{ip_address}' => $administrator['last_ip_address'],
'{hostname}' => $administrator['last_hostname'],
Expand Down Expand Up @@ -159,7 +159,7 @@

unset(session::$data['security.administrator']['verification']);

// TOTP (opt-in per administrator). When enrolled, always challenge �
// TOTP (opt-in per administrator). When enrolled, always challenge ✓
// independent of the known-IP check below. Email OTP remains the
// fallback for admins who haven't enrolled.
if (!empty($administrator['totp_secret'])) {
Expand Down Expand Up @@ -241,7 +241,7 @@

if (!empty($_POST['remember_me']) && defined('HMAC_KEY_REMEMBER_ME')) {
$token = f::token_create_remember($administrator['id'], $administrator['password_hash']);
header('Set-Cookie: remember_me='. $token .'; Path='. WS_DIR_APP .'; Expires='. gmdate('r', strtotime('+30 days')) .'; HttpOnly; SameSite=Lax' . (!empty($_SERVER['HTTPS']) ? '; Secure' : ''), false);
header('Set-Cookie: remember_me='. $token .'; Path='. WS_DIR_APP .'; Expires='. gmdate('r', strtotime('+30 days')) .'; HttpOnly; SameSite=Lax' . (!empty($_SERVER['HTTPS']) ? '; Secure' : ''),[...]
} else if (!empty($_COOKIE['remember_me'])) {
header('Set-Cookie: remember_me=; Path='. WS_DIR_APP .'; Max-Age=-1; HttpOnly; SameSite=Lax', false);
}
Expand Down Expand Up @@ -383,4 +383,4 @@
});
});
});
</script>
</script>