Skip to content

Commit 7a993ed

Browse files
author
Kristan Kenney
committed
Merge branch 'webui-packages' into webui-refresh-winterfell
2 parents 5a3a08d + b1f0aa4 commit 7a993ed

26 files changed

+368
-396
lines changed

bin/v-copy-package renamed to bin/v-copy-user-package

File renamed without changes.

‎web/copy/package/index.php‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?php
2+
// Init
3+
error_reporting(NULL);
4+
ob_start();
5+
session_start();
6+
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
7+
8+
// Check token
9+
if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
10+
header('location: /login/');
11+
exit();
12+
}
13+
14+
// Check user
15+
if ($_SESSION['user'] != 'admin') {
16+
header("Location: /list/user");
17+
exit;
18+
}
19+
20+
// Check package argument
21+
if (empty($_GET['package'])) {
22+
header("Location: /list/package/");
23+
exit;
24+
}
25+
26+
if ($_SESSION['user'] == 'admin') {
27+
if (!empty($_GET['package'])) {
28+
$v_package = escapeshellarg($_GET['package']);
29+
exec (HESTIA_CMD."v-copy-user-package ".$v_package." ".$v_package."-copy", $output, $return_var);
30+
}
31+
32+
if ($return_var != 0) {
33+
$error = implode('<br>', $output);
34+
if (empty($error)) $error = 'Error: unable to copy package.';
35+
$_SESSION['error_msg'] = $error;
36+
}
37+
unset($output);
38+
}
39+
40+
header("Location: /list/package/");
41+
exit;

‎web/css/styles.min.css‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3176,49 +3176,63 @@ form#vstobjects.suspended {
31763176
color: #fff;
31773177
}
31783178

3179-
.status-icon-yellow, .status-icon-maroon:hover {
3179+
.status-icon.large {
3180+
font-size: 1rem;
3181+
}
3182+
3183+
.status-icon.yellow, .status-icon.yellow:hover {
31803184
color: #f3e72c;
31813185
}
3182-
.status-icon-teal, .status-icon-teal:hover {
3186+
.status-icon.teal, .status-icon.teal:hover {
31833187
color: #33cccc;
31843188
}
3185-
.status-icon-purple, .status-icon-purple:hover {
3189+
.status-icon.purple, .status-icon.purple:hover {
31863190
color: #8e2fca;
31873191
}
31883192

3189-
.status-icon-maroon, .status-icon-maroon:hover {
3193+
.status-icon.maroon, .status-icon.maroon:hover {
31903194
color: #cc3366;
31913195
}
31923196

3193-
.status-icon-red, .status-icon-red:hover {
3197+
.status-icon.red, .status-icon.red:hover {
31943198
color: #ff3333;
31953199
}
31963200

3197-
.status-icon-green, .status-icon-green:hover {
3201+
.status-icon.green, .status-icon.green:hover {
31983202
color: #53ba55;
31993203
}
32003204

3201-
.status-icon-orange, .status-icon-orange:hover {
3205+
.status-icon.orange, .status-icon.orange:hover {
32023206
color: #ffc043;
32033207
}
32043208

3205-
.status-icon-lightblue, .status-icon-lightblue:hover {
3209+
.status-icon.lightblue, .status-icon.lightblue:hover {
32063210
color: #6eb6f0;
32073211
}
32083212

3209-
.status-icon-highlight, .status-icon-highlight:hover {
3213+
.status-icon.highlight, .status-icon.highlight:hover {
32103214
color: #323232;
32113215
}
32123216

3213-
.status-icon-blue, .status-icon-blue:hover {
3217+
.status-icon.blue, .status-icon.blue:hover {
32143218
color: #326b9b;
32153219
}
32163220

3217-
.status-icon-dim {
3221+
.status-icon.dim {
3222+
color: #ddd;
3223+
text-shadow: 1px 1px rgba(255,255,255,0.3);
3224+
}
3225+
3226+
.status-icon.dim {
32183227
color: #ddd;
32193228
text-shadow: 1px 1px rgba(255,255,255,0.3);
32203229
}
32213230

3231+
.l-unit--suspended .status-icon.dim {
3232+
color: #c0c0c0 !important;
3233+
text-shadow: 0px !important;
3234+
}
3235+
32223236
.noselect {
32233237
-webkit-touch-callout: none;
32243238
-webkit-user-select: none;

‎web/inc/i18n/en.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@
410410
'cron' => 'Cron',
411411
'user dir' => 'User Directory',
412412

413-
'unlimited' => 'Unlimited',
413+
'unlimited' => '∞',
414414
'1 account' => '1 account',
415415
'%s accounts' => '%s accounts',
416416
'1 domain' => '1 domain',
@@ -760,4 +760,5 @@
760760
'Enable 2FA' => 'Enable two-factor authentication',
761761
'Please scan the code below in your 2FA application:' => 'To finish setting up two-factor authentication, scan the QR code below<br />using an authentication app (such as <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2">Google Authenticator</a>):',
762762
'2FA Reset Code:' => 'Account Recovery Code:',
763+
763764
);

‎web/templates/admin/list_backup.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a href="/schedule/backup/" class="ui-button cancel" title="<?=__('Create Backup')?>"><i class="fas fa-plus-circle status-icon-green"></i> <?=__('Create Backup')?></a>
5-
<a href="/list/backup/exclusions/" class="ui-button cancel" title="<?=__('backup exclusions')?>"><i class="fas fa-folder-minus status-icon-orange"></i> <?=__('backup exclusions')?></a>
4+
<a href="/schedule/backup/" class="ui-button cancel" title="<?=__('Create Backup')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Create Backup')?></a>
5+
<a href="/list/backup/exclusions/" class="ui-button cancel" title="<?=__('backup exclusions')?>"><i class="fas fa-folder-minus status-icon orange"></i> <?=__('backup exclusions')?></a>
66
</div>
77
<div class="l-sort-toolbar clearfix">
88
<table>
@@ -79,11 +79,11 @@
7979
<div class="clearfix l-unit__stat-col--left compact-4 text-right">
8080
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
8181
<div class="actions-panel clearfix">
82-
<div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/download/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-file-download status-icon-lightblue status-icon-dim"></i></a></div>
83-
<div class="actions-panel__col actions-panel__list shortcut-d" key-action="href"><a href="/list/backup/?backup=<?=$key?>"><i class="fas fa-undo status-icon-green status-icon-dim"></i></a></div>
82+
<div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/download/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-file-download status-icon lightblue status-icon dim"></i></a></div>
83+
<div class="actions-panel__col actions-panel__list shortcut-d" key-action="href"><a href="/list/backup/?backup=<?=$key?>"><i class="fas fa-undo status-icon green status-icon dim"></i></a></div>
8484
<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
8585
<a id="delete_link_<?=$i?>" class="data-controls do_delete">
86-
<i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
86+
<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
8787
<input type="hidden" name="delete_url" value="/delete/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" />
8888
<div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
8989
<p class="confirmation"><?=__('DELETE_BACKUP_CONFIRMATION',$key)?></p>

‎web/templates/admin/list_backup_detail.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a class="ui-button cancel" href="/list/backup/"><i class="fas fa-arrow-left status-icon-blue"></i> <?=__('Back')?></a>
5-
<a href="/schedule/restore/?backup=<?=htmlentities($_GET['backup'])?>" class="ui-button cancel" title="<?=__('Restore All')?>"><i class="fas fa-undo status-icon-green"></i> <?=__('Restore All')?></a>
4+
<a class="ui-button cancel" href="/list/backup/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
5+
<a href="/schedule/restore/?backup=<?=htmlentities($_GET['backup'])?>" class="ui-button cancel" title="<?=__('Restore All')?>"><i class="fas fa-undo status-icon green"></i> <?=__('Restore All')?></a>
66
</div>
77
<div class="l-sort-toolbar clearfix">
88
<table>

‎web/templates/admin/list_backup_exclusions.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a class="ui-button cancel" href="/list/backup/"><i class="fas fa-arrow-left status-icon-blue"></i><?=__('Back')?></a>
5-
<a href="/edit/backup/exclusions/" class="ui-button cancel" title="<?=__('Edit Backup Exclusions')?>"><i class="fas fa-pencil-alt status-icon-orange"></i> <?=__('Edit Backup Exclusions')?></a>
4+
<a class="ui-button cancel" href="/list/backup/"><i class="fas fa-arrow-left status-icon blue"></i><?=__('Back')?></a>
5+
<a href="/edit/backup/exclusions/" class="ui-button cancel" title="<?=__('Edit Backup Exclusions')?>"><i class="fas fa-pencil-alt status-icon orange"></i> <?=__('Edit Backup Exclusions')?></a>
66
</div>
77
<div class="l-sort-toolbar clearfix">
88
<table>

‎web/templates/admin/list_cron.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a href="/add/cron/" class="ui-button cancel" title="<?=__('Add Cron Job')?>"><i class="fas fa-plus-circle status-icon-green"></i> <?=__('Add Cron Job')?></a>
4+
<a href="/add/cron/" class="ui-button cancel" title="<?=__('Add Cron Job')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Cron Job')?></a>
55
<?
66
if($panel[$user]['CRON_REPORTS'] == 'yes') {
7-
echo '<a class="ui-button cancel" href="/delete/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-bell status-icon-orange"></i> '.__('turn off notifications').'</a>';
7+
echo '<a class="ui-button cancel" href="/delete/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-bell status-icon orange"></i> '.__('turn off notifications').'</a>';
88
} else {
9-
echo '<a class="ui-button cancel" href="/add/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-bell-slash status-icon-orange"></i> '.__('turn on notifications').'</a>';
9+
echo '<a class="ui-button cancel" href="/add/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-bell-slash status-icon orange"></i> '.__('turn on notifications').'</a>';
1010
}
1111
?>
1212
</div>
@@ -92,10 +92,10 @@
9292
<div class="clearfix l-unit__stat-col--left compact-2 text-right">
9393
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
9494
<div class="actions-panel clearfix">
95-
<div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
95+
<div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
9696
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
9797
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
98-
<i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
98+
<i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
9999
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
100100
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
101101
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
@@ -104,7 +104,7 @@
104104
</div>
105105
<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
106106
<a id="delete_link_<?=$i?>" class="data-controls do_delete">
107-
<i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
107+
<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
108108
<input type="hidden" name="delete_url" value="/delete/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
109109
<div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
110110
<p class="confirmation"><?=__('DELETE_CRON_CONFIRMATION',$key)?></p>

‎web/templates/admin/list_db.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a href="/add/db/" class="ui-button cancel" title="<?=__('Add Database')?>"><i class="fas fa-plus-circle status-icon-green"></i> <?=__('Add Database')?></a>
4+
<a href="/add/db/" class="ui-button cancel" title="<?=__('Add Database')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Database')?></a>
55
<?
66
$mysql = 0;
77
$pgsql = 0;
@@ -25,10 +25,10 @@
2525
}
2626
}
2727
if($mysql){
28-
echo '<a class="ui-button cancel" href="'.$db_myadmin_link.'" target="_blank"><i class="fas fa-database status-icon-orange"></i> Database Editor</a>';
28+
echo '<a class="ui-button cancel" href="'.$db_myadmin_link.'" target="_blank"><i class="fas fa-database status-icon orange"></i> Database Editor</a>';
2929
}
3030
if($pgsql){
31-
echo '<a class="ui-button cancel" href="'.$db_pgadmin_link.'" target="_blank"><i class="fas fa-database status-icon-orange"></i> Database Editor</a>';
31+
echo '<a class="ui-button cancel" href="'.$db_pgadmin_link.'" target="_blank"><i class="fas fa-database status-icon orange"></i> Database Editor</a>';
3232
}
3333
?>
3434
</div>
@@ -126,10 +126,10 @@
126126
<div class="clearfix l-unit__stat-col--left text-right compact-2">
127127
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
128128
<div class="actions-panel clearfix">
129-
<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/db/?database=<?=$key?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
129+
<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/db/?database=<?=$key?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
130130
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
131131
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
132-
<i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
132+
<i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
133133
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>" />
134134
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
135135
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
@@ -138,7 +138,7 @@
138138
</div>
139139
<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
140140
<a id="delete_link_<?=$i?>" class="data-controls do_delete">
141-
<i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
141+
<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
142142
<input type="hidden" name="delete_url" value="/delete/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>" />
143143
<div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
144144
<p class="confirmation"><?=__('DELETE_DATABASE_CONFIRMATION',$key)?></p>

‎web/templates/admin/list_dns.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a href="/add/dns/" class="ui-button cancel" title="<?=__('Add DNS Domain')?>"><i class="fas fa-plus-circle status-icon-green"></i> <?=__('Add DNS Domain')?></a>
4+
<a href="/add/dns/" class="ui-button cancel" title="<?=__('Add DNS Domain')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add DNS Domain')?></a>
55
</div>
66
<ul class="context-menu sort-order animated fadeIn" style="display:none;">
77
<li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
@@ -88,13 +88,13 @@
8888
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
8989
<div class="actions-panel clearfix">
9090

91-
<div class="actions-panel__col actions-panel__logs shortcut-n" key-action="href"><a href="/add/dns/?domain=<?=$key?>"><i class="fas fa-plus-circle status-icon-green status-icon-dim"></i></a></div>
92-
<div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="/list/dns/?domain=<?=$key?>"><i class="fas fa-list status-icon-lightblue status-icon-dim"></i></div>
93-
<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/dns/?domain=<?=$key?>"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim"></i></a></div>
91+
<div class="actions-panel__col actions-panel__logs shortcut-n" key-action="href"><a href="/add/dns/?domain=<?=$key?>"><i class="fas fa-plus-circle status-icon green status-icon dim"></i></a></div>
92+
<div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="/list/dns/?domain=<?=$key?>"><i class="fas fa-list status-icon lightblue status-icon dim"></i></div>
93+
<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/dns/?domain=<?=$key?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
9494

9595
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
9696
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
97-
<i class="fas fa-pause status-icon-highlight status-icon-dim do_<?=$spnd_action?>"></i>
97+
<i class="fas fa-pause status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
9898
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/dns/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
9999
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
100100
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
@@ -103,7 +103,7 @@
103103
</div>
104104
<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
105105
<a id="delete_link_<?=$i?>" class="data-controls do_delete">
106-
<i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
106+
<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
107107
<input type="hidden" name="delete_url" value="/delete/dns/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
108108
<div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
109109
<p class="confirmation"><?=__('DELETE_DOMAIN_CONFIRMATION',$key)?></p>

0 commit comments

Comments
 (0)