Skip to content

Commit 83aa23b

Browse files
author
Dominik
committed
Merge branch 'master' of git.ispconfig.org:renky/ispconfig3
2 parents e9a084e + 93fdfe3 commit 83aa23b

File tree

337 files changed

+2187
-1605
lines changed

Some content is hidden

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

337 files changed

+2187
-1605
lines changed

‎install/tpl/bastille-firewall.cfg.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ DNS_SERVERS="{DNS_SERVERS}"
7575
# use the "\" continuation character (so Bastille can change the
7676
# values if it is run more than once)
7777
TRUSTED_IFACES="lo" # MINIMAL/SAFEST
78-
PUBLIC_IFACES="eth+ ppp+ slip+ venet+ bond+" # SAFEST
78+
PUBLIC_IFACES="eth+ ppp+ slip+ venet+ bond+ en+" # SAFEST
7979
INTERNAL_IFACES="" # SAFEST
8080

8181

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

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,34 @@ public function affected() {
425425
}
426426

427427

428+
/**
429+
* check if a utf8 string is valid
430+
*
431+
* @access public
432+
* @param string $string the string to check
433+
* @return bool true if it is valid utf8, false otherwise
434+
*/
435+
private function check_utf8($str) {
436+
$len = strlen($str);
437+
for($i = 0; $i < $len; $i++){
438+
$c = ord($str[$i]);
439+
if ($c > 128) {
440+
if (($c > 247)) return false;
441+
elseif ($c > 239) $bytes = 4;
442+
elseif ($c > 223) $bytes = 3;
443+
elseif ($c > 191) $bytes = 2;
444+
else return false;
445+
if (($i + $bytes) > $len) return false;
446+
while ($bytes > 1) {
447+
$i++;
448+
$b = ord($str[$i]);
449+
if ($b < 128 || $b > 191) return false;
450+
$bytes--;
451+
}
452+
}
453+
}
454+
return true;
455+
} // end of check_utf8
428456

429457
/**
430458
* Escape a string for usage in a query
@@ -442,16 +470,16 @@ public function escape($sString) {
442470
$sString = '';
443471
}
444472

445-
/*$cur_encoding = mb_detect_encoding($sString);
473+
$cur_encoding = mb_detect_encoding($sString);
446474
if($cur_encoding != "UTF-8") {
447475
if($cur_encoding != 'ASCII') {
448-
$app->log('String ' . substr($sString, 0, 25) . '... is ' . $cur_encoding . '.', LOGLEVEL_WARN);
476+
$app->log('String ' . substr($sString, 0, 25) . '... is ' . $cur_encoding . '.', LOGLEVEL_INFO);
449477
if($cur_encoding) $sString = mb_convert_encoding($sString, 'UTF-8', $cur_encoding);
450478
else $sString = mb_convert_encoding($sString, 'UTF-8');
451479
}
452-
} elseif(!PXBase::check_utf8($sString)) {
480+
} elseif(!$this->check_utf8($sString)) {
453481
$sString = utf8_encode($sString);
454-
}*/
482+
}
455483

456484
if($this->_iConnId) return mysqli_real_escape_string($this->_iConnId, $sString);
457485
else return addslashes($sString);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -354,23 +354,23 @@ public function getPagingHTML($vars)
354354

355355
//* Show Back
356356
if(isset($vars['show_page_back']) && $vars['show_page_back'] == 1){
357-
$content .= '<li><a href="'."javascript:loadContent('".$vars['list_file'].'?page=0'.$vars['page_params']."');".'" aria-label="First">
357+
$content .= '<li><a href="#" data-load-content="'.$vars['list_file'].'?page=0'.$vars['page_params'].'" aria-label="First">
358358
<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">
359+
$content .= '<li><a href="#" data-load-content='.$vars['list_file'].'?page='.$vars['last_page'].$vars['page_params'].'" aria-label="Previous">
360360
<span aria-hidden="true">&lsaquo;</span></a></li>';
361361
}
362362
$prev = -1;
363363
foreach($show_pages as $p) {
364364
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>';
365+
$content .= '<li' . ($p == $vars['page'] ? ' class="active"' : '') . '><a href="#" data-load-content="'.$vars['list_file'].'?page='.$p.$vars['page_params'].'">'. ($p+1) .'</a></li>';
366366
$prev = $p;
367367
}
368368
//.$vars['next_page'].' '.$this->lng('page_of_txt').' '.$vars['max_pages'].' &nbsp; ';
369369
//* Show Next
370370
if(isset($vars['show_page_next']) && $vars['show_page_next'] == 1){
371-
$content .= '<li><a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['next_page'].$vars['page_params']."');".'" aria-label="Next">
371+
$content .= '<li><a href="#" data-load-content="'.$vars['list_file'].'?page='.$vars['next_page'].$vars['page_params'].'" aria-label="Next">
372372
<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">
373+
$content .= '<li><a href="#" data-load-content="'.$vars['list_file'].'?page='.$vars['pages'].$vars['page_params'].'" aria-label="Last">
374374
<span aria-hidden="true">&raquo;</span></a></li>';
375375
}
376376
$content .= '</ul></nav>';

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function buildHTML($listDef, $module = '') {
4444
<div class="pnl_toolsarea">
4545
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
4646
<div class="buttons">
47-
<button class="iconstxt icoAdd" type="button" onclick="'."loadContent('".$module."/".$listDef["edit_file"]."');".'">
47+
<button class="iconstxt icoAdd" type="button" data-load-content="'.$module."/".$listDef["edit_file"].'">
4848
<span>{tmpl_var name="add_new_record_txt"}</span>
4949
</button>
5050
</div>
@@ -75,13 +75,13 @@ function buildHTML($listDef, $module = '') {
7575
foreach($listDef["item"] as $field) {
7676
$key = $field["field"];
7777
if($field["formtype"] == 'SELECT') {
78-
$html .= " <td class=\"tbl_col_".$key."\"><select name=\"".$listDef["search_prefix"].$key."\" onChange=\"submitForm('pageForm','".$module."/".$listDef["file"]."');\">{tmpl_var name='".$listDef["search_prefix"].$key."'}</select></td>\n";
78+
$html .= " <td class=\"tbl_col_".$key."\"><select name=\"".$listDef["search_prefix"].$key."\" onChange=\"ISPConfig.submitForm('pageForm','".$module."/".$listDef["file"]."');\">{tmpl_var name='".$listDef["search_prefix"].$key."'}</select></td>\n";
7979
} else {
8080
$html .= " <td class=\"tbl_col_".$key."\"><input type=\"text\" name=\"".$listDef["search_prefix"].$key."\" value=\"{tmpl_var name='".$listDef["search_prefix"].$key."'}\" /></td>\n";
8181
}
8282
}
8383

84-
$html .= ' <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="'."submitForm('pageForm','".$module."/".$listDef["file"]."');".'"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
84+
$html .= ' <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="'."ISPConfig.submitForm('pageForm','".$module."/".$listDef["file"]."');".'"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
8585
</tr>
8686
</thead>
8787
<tbody>
@@ -91,7 +91,7 @@ function buildHTML($listDef, $module = '') {
9191

9292
foreach($listDef["item"] as $field) {
9393
$key = $field["field"];
94-
$html .= " <td class=\"tbl_col_".$key."\"><a href=\"#\" onclick=\"loadContent('".$module."/".$listDef["edit_file"]."?id={tmpl_var name='id'}');\">{tmpl_var name=\"".$key."\"}</a></td>\n";
94+
$html .= " <td class=\"tbl_col_".$key."\"><a href=\"#\" data-load-content=\"".$module."/".$listDef["edit_file"]."?id={tmpl_var name='id'}\">{tmpl_var name=\"".$key."\"}</a></td>\n";
9595
}
9696

9797
$html .= " <td class=\"tbl_col_buttons\">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ function buildHTML($formDef, $tab) {
136136
<input type=\"hidden\" name=\"id\" value=\"{tmpl_var name='id'}\">
137137
138138
<div class=\"buttonHolder buttons\">
139-
<button class=\"positive iconstxt icoPositive\" type=\"button\" value=\"{tmpl_var name='btn_save_txt'}\" onclick=\"submitForm('pageForm','".$module."/".$formDef["action"]."');\"><span>{tmpl_var name='btn_save_txt'}</span></button>
140-
<button class=\"negative iconstxt icoNegative\" type=\"button\" value=\"{tmpl_var name='btn_cancel_txt'}\" onclick=\"loadContent('".$module."/".$formDef["list_default"]."');\"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
139+
<button class=\"positive iconstxt icoPositive\" type=\"button\" value=\"{tmpl_var name='btn_save_txt'}\" onclick=\"ISPConfig.submitForm('pageForm','".$module."/".$formDef["action"]."');\"><span>{tmpl_var name='btn_save_txt'}</span></button>
140+
<button class=\"negative iconstxt icoNegative\" type=\"button\" value=\"{tmpl_var name='btn_cancel_txt'}\" data-load-content=\"".$module."/".$formDef["list_default"]."\"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
141141
</div>
142142
</div>
143143

‎interface/web/admin/software_package_install.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
//* Add the record to start the install process
131131
$insert_data = "(package_name, server_id, software_update_id, status) VALUES ('".$app->db->quote($package_name)."', '".$app->db->quote($install_server_id)."', '".$app->db->quote($software_update_id)."','installing')";
132132
$app->db->datalogInsert('software_update_inst', $insert_data, 'software_update_inst_id');
133-
$message_ok = 'Starting package installation '."<a href=\"#\" onclick=\"submitForm('pageForm','admin/software_package_list.php');\">".$app->lng('next')."</a>";
133+
$message_ok = 'Starting package installation '."<a href=\"#\" onclick=\"ISPConfig.submitForm('pageForm','admin/software_package_list.php');\">".$app->lng('next')."</a>";
134134

135135
}
136136

‎interface/web/admin/software_package_list.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
if($p['package_installable'] == 'no') {
166166
$installed_txt .= $s['server_name'].": ".$app->lng("Package can not be installed.")."<br />";
167167
} else {
168-
$installed_txt .= $s['server_name'].": <a href=\"#\" onclick=\"loadContent('admin/software_package_install.php?package=".$p["package_name"]."&server_id=".$s["server_id"]."');\">Install now</a><br />";
168+
$installed_txt .= $s['server_name'].": <a href=\"#\" data-load-content=\"admin/software_package_install.php?package=".$p["package_name"]."&server_id=".$s["server_id"]."\">Install now</a><br />";
169169
}
170170
}
171171
}

‎interface/web/admin/software_update_list.php‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -176,38 +176,14 @@
176176

177177
foreach($updates as $key => $u) {
178178
$version = $u['v1'].'.'.$u['v2'].'.'.$u['v3'].'.'.$u['v4'];
179-
$installed_txt = "<a href=\"#\" onclick=\"loadContent('admin/software_update_list.php?action=install&package=".$u["package_name"]."&id=".$u["software_update_id"]."&server_id=".$server_id."');\">Install Update</a><br />";
179+
$installed_txt = "<a href=\"#\" data-load-content=\"admin/software_update_list.php?action=install&package=".$u["package_name"]."&id=".$u["software_update_id"]."&server_id=".$server_id."\">Install Update</a><br />";
180180
$records_out[] = array('version' => $version, 'update_title' => $u["update_title"], 'installed' => $installed_txt);
181181

182182
}
183183
}
184184
}
185185
}
186186

187-
/*
188-
$updates = $app->db->queryAllRecords('SELECT software_update.update_title, software_update.software_update_id, software_update.package_name, v1, v2, v3, v4, software_update_inst.status
189-
FROM software_update LEFT JOIN software_update_inst ON ( software_update.software_update_id = software_update_inst.software_update_id )
190-
WHERE server_id = '.$server_id.'
191-
GROUP BY software_update.package_name
192-
ORDER BY software_update.package_name ASC, v1 DESC , v2 DESC , v3 DESC , v4 DESC');
193-
194-
if(is_array($updates)) {
195-
foreach($updates as $key => $u) {
196-
$installed_txt = '';
197-
198-
$version = $u['v1'].'.'.$u['v2'].'.'.$u['v3'].'.'.$u['v4'];
199-
$updates[$key]['version'] = $version;
200-
if($u['status'] == 'installed' || $u['status'] == 'installing' || $u['status'] == 'deleting') {
201-
$installed_txt .= "Installed version $version<br />";
202-
} else {
203-
$installed_txt .= "<a href=\"#\" onclick=\"loadContent('admin/software_update_list.php?action=install&package=".$u["package_name"]."&id=".$u["software_update_id"]."&server_id=".$server_id."');\">Install now</a><br />";
204-
}
205-
$updates[$key]['installed'] = $installed_txt;
206-
207-
}
208-
}
209-
*/
210-
211187

212188

213189
$app->tpl->setLoop('records', $records_out);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
3535
<input type="hidden" name="id" value="{tmpl_var name='id'}">
3636

3737
<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>
38+
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/directive_snippets_edit.php">{tmpl_var name='btn_save_txt'}</button>
3939
<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>
4040
</div></div>
4141
<script language="JavaScript" type="text/javascript">

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ <h1><tmpl_var name="list_head_txt"></h1>
1313
<table class="table">
1414
<thead class="dark form-group-sm">
1515
<tr>
16-
<th class="tiny-col"><tmpl_var name="active_txt"></th>
17-
<th><tmpl_var name="name_txt"></th>
18-
<th><tmpl_var name="type_txt"></th>
19-
<th><tmpl_var name="customer_viewable_txt"></th>
16+
<th class="tiny-col" data-column="active"><tmpl_var name="active_txt"></th>
17+
<th data-column="name"><tmpl_var name="name_txt"></th>
18+
<th data-column="type"><tmpl_var name="type_txt"></th>
19+
<th data-column="customer_viewable"><tmpl_var name="customer_viewable_txt"></th>
2020
<th class="small-col text-right">{tmpl_var name='search_limit'}</th>
2121
</tr>
2222
<tr>
@@ -25,7 +25,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
2525
<td><select class="form-control" name="search_type">{tmpl_var name='search_type'}</select></td>
2626
<td><select class="form-control" name="search_customer_viewable">{tmpl_var name='search_customer_viewable'}</select></td>
2727
<td class="text-right">
28-
<button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/directive_snippets_list.php');"><span class="icon icon-filter"></span></button>
28+
<button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="admin/directive_snippets_list.php"><span class="icon icon-filter"></span></button>
2929
</td>
3030
</tr>
3131
</thead>
@@ -37,7 +37,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
3737
<td><a href="#" data-load-content="admin/directive_snippets_edit.php?id={tmpl_var name='id'}">{tmpl_var name="type"}</a></td>
3838
<td><a href="#" data-load-content="admin/directive_snippets_edit.php?id={tmpl_var name='id'}">{tmpl_var name="customer_viewable"}</a></td>
3939
<td class="text-right">
40-
<a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('admin/directive_snippets_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
40+
<a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('admin/directive_snippets_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
4141
</td>
4242
</tr>
4343
</tmpl_loop>

0 commit comments

Comments
 (0)