Skip to content

Commit 2e9ac91

Browse files
author
Florian Schaal
committed
2 parents 0380585 + c4c549e commit 2e9ac91

File tree

407 files changed

+12897
-12690
lines changed

Some content is hidden

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

407 files changed

+12897
-12690
lines changed

‎interface/lib/classes/db_mysql.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ private function _query($sQuery = '') {
252252
$sQuery = call_user_func_array(array(&$this, '_build_query_string'), $aArgs);
253253
$this->securityScan($sQuery);
254254

255-
$this->_iQueryId = mysqli_query($this->_iConnId, $sQuery);
255+
$this->_iQueryId = @mysqli_query($this->_iConnId, $sQuery);
256256
if (!$this->_iQueryId) {
257257
$this->_sqlerror('Falsche Anfrage / Wrong Query', false, 'SQL-Query = ' . $sQuery);
258258
return false;

‎interface/lib/classes/listform.inc.php‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -348,29 +348,33 @@ public function getPagingHTML($vars)
348348

349349
sort($show_pages);
350350
$show_pages = array_unique($show_pages);
351-
351+
352+
$content = '<nav>
353+
<ul class="pagination">';
354+
352355
//* Show Back
353356
if(isset($vars['show_page_back']) && $vars['show_page_back'] == 1){
354-
$content = '<a class="btn-page first-page" href="'."javascript:loadContent('".$vars['list_file'].'?page=0'.$vars['page_params']."');".'">'
355-
.'<img src="themes/'.$_SESSION['s']['theme'].'/icons/x16/arrow_stop_180.png"></a> &nbsp; ';
356-
$content .= '<a class="btn-page previous-page" href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['last_page'].$vars['page_params']."');".'">'
357-
.'<img src="themes/'.$_SESSION['s']['theme'].'/icons/x16/arrow_180.png"></a> &nbsp; ';
357+
$content .= '<li><a href="'."javascript:loadContent('".$vars['list_file'].'?page=0'.$vars['page_params']."');".'" aria-label="First">
358+
<span aria-hidden="true">&laquo;</span></a></li>';
359+
$content .= '<li><a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['last_page'].$vars['page_params']."');".'" aria-label="Previous">
360+
<span aria-hidden="true">&lsaquo;</span></a></li>';
358361
}
359-
$content .= ' '.$this->lng('page_txt').' ';
360362
$prev = -1;
361363
foreach($show_pages as $p) {
362-
if($prev != -1 && $p > $prev + 1) $content .= '<span class="page-spacer">...</span>';
363-
$content .= '<a class="link-page' . ($p == $vars['page'] ? ' current-page' : '') . '" href="'."javascript:loadContent('".$vars['list_file'].'?page='.$p.$vars['page_params']."');".'">'. ($p+1) .'</a>';
364+
if($prev != -1 && $p > $prev + 1) $content .= '<li class="disabled"><a href="#">…</a></li>';
365+
$content .= '<li' . ($p == $vars['page'] ? ' class="active"' : '') . '><a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$p.$vars['page_params']."');".'">'. ($p+1) .'</a></li>';
364366
$prev = $p;
365367
}
366368
//.$vars['next_page'].' '.$this->lng('page_of_txt').' '.$vars['max_pages'].' &nbsp; ';
367369
//* Show Next
368370
if(isset($vars['show_page_next']) && $vars['show_page_next'] == 1){
369-
$content .= '<a class="btn-page next-page" href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['next_page'].$vars['page_params']."');".'">'
370-
.'<img src="themes/'.$_SESSION['s']['theme'].'/icons/x16/arrow.png"></a> &nbsp; ';
371-
$content .= '<a class="btn-page last-page" href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['pages'].$vars['page_params']."');".'">'
372-
.'<img src="themes/'.$_SESSION['s']['theme'].'/icons/x16/arrow_stop.png"></a>';
371+
$content .= '<li><a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['next_page'].$vars['page_params']."');".'" aria-label="Next">
372+
<span aria-hidden="true">&rsaquo;</span></a></li>';
373+
$content .= '<li><a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['pages'].$vars['page_params']."');".'" aria-label="Last">
374+
<span aria-hidden="true">&raquo;</span></a></li>';
373375
}
376+
$content .= '</ul></nav>';
377+
374378
return $content;
375379
}
376380

‎interface/lib/classes/plugin_backuplist.inc.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,13 @@ function onShow() {
108108
}
109109

110110
//* Get the data
111+
$server_ids = array();
111112
$web = $app->db->queryOneRecord("SELECT server_id FROM web_domain WHERE domain_id = ".$app->functions->intval($this->form->id));
112-
$sql = "SELECT * FROM web_backup WHERE parent_domain_id = ".$app->functions->intval($this->form->id)." AND server_id = ".$app->functions->intval($web['server_id'])." ORDER BY tstamp DESC, backup_type ASC";
113+
$database = $app->db->queryOneRecord("SELECT server_id FROM web_database WHERE parent_domain_id = ".$app->functions->intval($this->form->id));
114+
if($app->functions->intval($web['server_id']) > 0) $server_ids[] = $app->functions->intval($web['server_id']);
115+
if($app->functions->intval($database['server_id']) > 0) $server_ids[] = $app->functions->intval($database['server_id']);
116+
$server_ids = array_unique($server_ids);
117+
$sql = "SELECT * FROM web_backup WHERE parent_domain_id = ".$app->functions->intval($this->form->id)." AND server_id IN (".implode(',', $server_ids).") ORDER BY tstamp DESC, backup_type ASC";
113118
$records = $app->db->queryAllRecords($sql);
114119

115120
$bgcolor = "#FFFFFF";

‎interface/lib/classes/quota_lib.inc.php‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public function get_quota_data($clientid = null, $readable = true) {
1414
//print_r($monitor_data);
1515

1616
// select all websites or websites belonging to client
17-
$sites = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE active = 'y' AND type = 'vhost'".(($clientid != null)?" AND sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=?)":''), $app->functions->intval($client_id));
17+
$sites = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE active = 'y' AND type = 'vhost'".(($clientid != null)?" AND sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=?)":''), $clientid);
1818

1919
//print_r($sites);
2020
if(is_array($sites) && !empty($sites)){
@@ -35,7 +35,13 @@ public function get_quota_data($clientid = null, $readable = true) {
3535
if (!is_numeric($sites[$i]['soft'])) $sites[$i]['soft']=$sites[$i]['soft'][1];
3636
if (!is_numeric($sites[$i]['hard'])) $sites[$i]['hard']=$sites[$i]['hard'][1];
3737
if (!is_numeric($sites[$i]['files'])) $sites[$i]['files']=$sites[$i]['files'][1];
38-
38+
39+
$sites[$i]['used_raw'] = $sites[$i]['used'];
40+
$sites[$i]['soft_raw'] = $sites[$i]['soft'];
41+
$sites[$i]['hard_raw'] = $sites[$i]['hard'];
42+
$sites[$i]['files_raw'] = $sites[$i]['files'];
43+
$sites[$i]['used_percentage'] = ($sites[$i]['soft'] > 0 && $sites[$i]['used'] > 0 ? round($sites[$i]['used'] * 100 / $sites[$i]['soft']) : 0);
44+
3945
if ($readable) {
4046
// colours
4147
$sites[$i]['display_colour'] = '#000000';
@@ -109,7 +115,7 @@ public function get_mailquota_data($clientid = null, $readable = true) {
109115
//print_r($monitor_data);
110116

111117
// select all email accounts or email accounts belonging to client
112-
$emails = $app->db->queryAllRecords("SELECT * FROM mail_user".(($clientid != null)? " WHERE sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=?)" : ''), $app->functions->intval($client_id));
118+
$emails = $app->db->queryAllRecords("SELECT * FROM mail_user".(($clientid != null)? " WHERE sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=?)" : ''), $clientid);
113119

114120
//print_r($emails);
115121
if(is_array($emails) && !empty($emails)){
@@ -120,6 +126,11 @@ public function get_mailquota_data($clientid = null, $readable = true) {
120126

121127
if (!is_numeric($emails[$i]['used'])) $emails[$i]['used']=$emails[$i]['used'][1];
122128

129+
$emails[$i]['quota_raw'] = $emails[$i]['quota'];
130+
$emails[$i]['used_raw'] = $emails[$i]['used'];
131+
$emails[$i]['used_percentage'] = ($emails[$i]['quota'] > 0 && $emails[$i]['used'] > 0 ? round($emails[$i]['used'] * 100 / $emails[$i]['quota']) : 0);
132+
133+
123134
if ($readable) {
124135
// colours
125136
$emails[$i]['display_colour'] = '#000000';

‎interface/lib/classes/tools_monitor.inc.php‎

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -91,24 +91,26 @@ function showDiskUsage () {
9191
$html =
9292
'<div class="systemmonitor-state state-'.$record['state'].'">
9393
<div class="systemmonitor-content icons32 ico-'.$record['state'].'">
94-
<table>
94+
<table class="table">
95+
<thead class="dark">
9596
<tr>
96-
<td>'.$app->lng("monitor_diskusage_filesystem_txt").'</td>
97-
<td>'.$app->lng("monitor_diskusage_type_txt").'</td>
98-
<td>'.$app->lng("monitor_diskusage_size_txt").'</td>
99-
<td>'.$app->lng("monitor_diskusage_used_txt").'</td>
100-
<td>'.$app->lng("monitor_diskusage_available_txt").'</td>
101-
<td>'.$app->lng("monitor_diskusage_usage_txt").'</td>
102-
<td>'.$app->lng("monitor_diskusage_mounted_txt").'</td>
103-
</tr>';
97+
<th>'.$app->lng("monitor_diskusage_filesystem_txt").'</th>
98+
<th class="small-col">'.$app->lng("monitor_diskusage_type_txt").'</th>
99+
<th class="tiny-col">'.$app->lng("monitor_diskusage_size_txt").'</th>
100+
<th class="tiny-col">'.$app->lng("monitor_diskusage_used_txt").'</th>
101+
<th class="tiny-col">'.$app->lng("monitor_diskusage_available_txt").'</th>
102+
<th class="tiny-col">'.$app->lng("monitor_diskusage_usage_txt").'</th>
103+
<th>'.$app->lng("monitor_diskusage_mounted_txt").'</th>
104+
</tr></thead>
105+
<tbody>';
104106
foreach($data as $line) {
105107
$html .= '<tr>';
106108
foreach ($line as $item) {
107109
$html .= '<td>' . $item . '</td>';
108110
}
109111
$html .= '</tr>';
110112
}
111-
$html .= '</table>';
113+
$html .= '</tbody></table>';
112114
$html .= '</div></div>';
113115
} else {
114116
$html = '<p>'.$app->lng("no_data_diskusage_txt").'</p>';
@@ -128,12 +130,13 @@ function showDatabaseSize () {
128130
$html =
129131
'<div class="systemmonitor-state state-'.$record['state'].'">
130132
<div class="systemmonitor-content icons32 ico-'.$record['state'].'">
131-
<table><thead><tr>
132-
<td>'.$app->lng("monitor_database_name_txt").'</td>
133-
<td>'.$app->lng("monitor_database_size_txt").'</td>
134-
<td>'.$app->lng("monitor_database_client_txt").'</td>
135-
<td>'.$app->lng("monitor_database_domain_txt").'</td>
136-
</tr>';
133+
<table class="table"><thead class="dark"><tr>
134+
<th>'.$app->lng("monitor_database_name_txt").'</th>
135+
<th class="tiny-col">'.$app->lng("monitor_database_size_txt").'</th>
136+
<th>'.$app->lng("monitor_database_client_txt").'</th>
137+
<th>'.$app->lng("monitor_database_domain_txt").'</th>
138+
</tr></thead>
139+
<tbody>';
137140
foreach($data as $line) {
138141
$html .= '<tr>';
139142
if ($line['size'] > 0) $line['size'] = $app->functions->formatBytes($line['size']);
@@ -150,7 +153,7 @@ function showDatabaseSize () {
150153
foreach ($line as $item) {
151154
$html .= '<td>' . $item . '</td>';
152155
}
153-
$html .= '</tr></tmpl loop>';
156+
$html .= '</tr>';
154157
}
155158
$html .= '</tbody></table></div></div>';
156159
} else {
@@ -174,7 +177,8 @@ function showMemUsage () {
174177
$html =
175178
'<div class="systemmonitor-state state-'.$record['state'].'">
176179
<div class="systemmonitor-content icons32 ico-'.$record['state'].'">
177-
<table>';
180+
<table class="table">
181+
<tbody>';
178182

179183
foreach($data as $key => $value) {
180184
if ($key != '') {
@@ -184,7 +188,7 @@ function showMemUsage () {
184188
</tr>';
185189
}
186190
}
187-
$html .= '</table>';
191+
$html .= '</tbody></table>';
188192
$html .= '</div></div>';
189193

190194
} else {
@@ -209,7 +213,8 @@ function showCpuInfo () {
209213
$html =
210214
'<div class="systemmonitor-state state-'.$record['state'].'">
211215
<div class="systemmonitor-content icons32 ico-'.$record['state'].'">
212-
<table>';
216+
<table class="table">
217+
<tbody>';
213218
foreach($data as $key => $value) {
214219
if ($key != '') {
215220
$html .= '<tr>
@@ -218,7 +223,7 @@ function showCpuInfo () {
218223
</tr>';
219224
}
220225
}
221-
$html .= '</table>';
226+
$html .= '</tbody></table>';
222227
$html .= '</div></div>';
223228
} else {
224229
$html = '<p>'.$app->lng("no_data_cpuinfo_txt").'</p>';
@@ -242,7 +247,8 @@ function showServices () {
242247
$html =
243248
'<div class="systemmonitor-state state-'.$record['state'].'">
244249
<div class="systemmonitor-content icons32 ico-'.$record['state'].'">
245-
<table>';
250+
<table class="table">
251+
<tbody>';
246252

247253
if($data['webserver'] != -1) {
248254
if($data['webserver'] == 1) {
@@ -330,7 +336,7 @@ function showServices () {
330336
}
331337

332338

333-
$html .= '</table></div></div>';
339+
$html .= '</tbody></table></div></div>';
334340
} else {
335341
$html = '<p>'.$app->lng("no_data_services_txt").'</p>';
336342
}

‎interface/web/admin/lib/lang/de_directive_snippets_list.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ $wb['active_txt'] = 'Aktiv';
44
$wb['name_txt'] = 'Name des Schnipsels';
55
$wb['type_txt'] = 'Typ';
66
$wb['add_new_record_txt'] = 'Direktiven Schnipsel hinzufügen';
7+
$wb['customer_viewable_txt'] = 'Sichtbar für Kunden';
78
?>

‎interface/web/admin/lib/lang/en_directive_snippets_list.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ $wb["active_txt"] = 'Active';
44
$wb["name_txt"] = 'Name of Snippet';
55
$wb["type_txt"] = 'Type';
66
$wb["add_new_record_txt"] = 'Add Directive Snippet';
7+
$wb['customer_viewable_txt'] = 'Customer viewable';
78
?>

‎interface/web/admin/list/directive_snippets.list.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,14 @@
7474
'suffix' => "",
7575
'width' => "",
7676
'value' => array('apache' => 'Apache', 'nginx' => 'nginx', 'php' => 'PHP', 'proxy' => 'Proxy'));
77+
78+
$liste["item"][] = array( 'field' => "customer_viewable",
79+
'datatype' => "VARCHAR",
80+
'formtype' => "SELECT",
81+
'op' => "=",
82+
'prefix' => "",
83+
'suffix' => "",
84+
'width' => "",
85+
'value' => array('y' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>", 'n' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
7786

7887
?>

‎interface/web/admin/templates/directive_snippets_edit.htm‎

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,43 @@
1-
<h2><tmpl_var name="list_head_txt"></h2>
1+
<div class='page-header'>
2+
<h1><tmpl_var name="list_head_txt"></h1>
3+
</div>
24
<p><tmpl_var name="list_desc_txt"></p>
35

4-
<div class="panel panel_directive_snippets">
5-
6-
<div class="pnl_formsarea">
7-
<fieldset class="inlineLabels">
8-
<div class="ctrlHolder">
9-
<label for="name">{tmpl_var name='name_txt'}</label>
10-
<input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
11-
</div>
12-
<div class="ctrlHolder">
13-
<label for="type">{tmpl_var name='type_txt'}</label>
14-
<select name="type" id="type" class="selectInput">
6+
7+
8+
<div class="form-group">
9+
<label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
10+
<div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" /></div></div>
11+
<div class="form-group">
12+
<label for="type" class="col-sm-3 control-label">{tmpl_var name='type_txt'}</label>
13+
<div class="col-sm-9"><select name="type" id="type" class="form-control">
1514
{tmpl_var name='type'}
16-
</select>
15+
</select></div>
1716
</div>
18-
<div class="ctrlHolder">
19-
<label for="snippet">{tmpl_var name='snippet_txt'}</label>
20-
<textarea name="snippet" id="snippet" rows='10' cols='50' style="width:400px;">{tmpl_var name='snippet'}</textarea><span class="nginx"> &nbsp; {tmpl_var name='variables_txt'}: </span><a href="javascript:void(0);" class="addPlaceholder nginx">{DOCROOT}</a><span class="nginx">, </span><a href="javascript:void(0);" class="addPlaceholder nginx">{FASTCGIPASS}</a>
17+
<div class="form-group">
18+
<label for="snippet" class="col-sm-3 control-label">{tmpl_var name='snippet_txt'}</label>
19+
<div class="col-sm-9"><textarea class="form-control" name="snippet" id="snippet" rows='10' cols='50'>{tmpl_var name='snippet'}</textarea></div><span class="nginx"> &nbsp; {tmpl_var name='variables_txt'}: </span><a href="javascript:void(0);" class="addPlaceholder nginx">{DOCROOT}</a><span class="nginx">, </span><a href="javascript:void(0);" class="addPlaceholder nginx">{FASTCGIPASS}</a>
2120
</div>
22-
<div class="ctrlHolder">
23-
<p class="label">{tmpl_var name='customer_viewable_txt'}</p>
24-
<div class="multiField">
21+
<div class="form-group">
22+
<label class="col-sm-3 control-label">{tmpl_var name='customer_viewable_txt'}</label>
23+
<div class="col-sm-9">
2524
{tmpl_var name='customer_viewable'}
2625
</div>
2726
</div>
28-
<div class="ctrlHolder">
29-
<p class="label">{tmpl_var name='active_txt'}</p>
30-
<div class="multiField">
27+
<div class="form-group">
28+
<label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
29+
<div class="col-sm-9">
3130
{tmpl_var name='active'}
3231
</div>
3332
</div>
34-
</fieldset>
33+
3534

3635
<input type="hidden" name="id" value="{tmpl_var name='id'}">
3736

38-
<div class="buttonHolder buttons">
39-
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/directive_snippets_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
40-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/directive_snippets_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
41-
</div>
42-
</div>
43-
44-
</div>
37+
<div class="clear"><div class="right">
38+
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/directive_snippets_edit.php');">{tmpl_var name='btn_save_txt'}</button>
39+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/directive_snippets_list.php">{tmpl_var name='btn_cancel_txt'}</button>
40+
</div></div>
4541
<script language="JavaScript" type="text/javascript">
4642

4743
if(jQuery('#type').val() == 'nginx'){

0 commit comments

Comments
 (0)