Commit 7f3e0a7d authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch 'patch-misc' into 'develop'

Patch misc

Closes #4431

See merge request !1252
parents 333d13a9 39fb8b09
Pipeline #6675 passed with stage
in 24 seconds
......@@ -560,7 +560,13 @@ class tform_base {
if(trim($tvl) == trim($k)) $checked = ' CHECKED';
}
// $out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"checkbox\" $checked /> $v</label>\r\n";
$out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"checkbox\" $checked /> $v</label><br/>\r\n";
$out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"checkbox\" $checked /> $v</label>";
if (isset($field['render_inline']) && $field['render_inline'] == 'n') {
$out .= "<br/>\r\n";
}
else {
$out .= "&nbsp;\r\n";
}
$elementNo++;
}
}
......@@ -697,7 +703,13 @@ class tform_base {
if(trim($tvl) == trim($k)) $checked = ' CHECKED';
}
// $out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"checkbox\" $checked /> $v</label>\r\n";
$out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"checkbox\" $checked /> $v</label> &nbsp;\r\n";
$out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"checkbox\" $checked /> $v</label>";
if (isset($field['render_inline']) && $field['render_inline'] == 'n') {
$out .= "<br/>\r\n";
}
else {
$out .= "&nbsp;\r\n";
}
$elementNo++;
}
}
......
......@@ -146,6 +146,7 @@ $form["tabs"]['remote_user'] = array (
'separator' => ';',
'width' => '',
'maxlength' => '',
'render_inline' => 'n',
'rows' => '5',
'cols' => '30'
)
......
......@@ -154,7 +154,7 @@ $wb['gender_m_txt'] = 'Mr.';
$wb['gender_f_txt'] = 'Ms.';
$wb['added_by_txt'] = 'Added by';
$wb['added_date_txt'] = 'Added date';
$wb['parent_client_id_txt'] = 'Client of reseller';
$wb['parent_client_id_txt'] = 'Client van reseller';
$wb['none_txt'] = 'none';
$wb['email_error_empty'] = 'Email is empty';
$wb['xmpp_limits_txt'] = 'XMPP Limits';
......
......@@ -73,7 +73,7 @@
<td><input class="form-control" type="text" name="search_aux" value="{tmpl_var name='search_aux'}" /></td>
<td><input class="form-control" type="text" name="search_ttl" value="{tmpl_var name='search_ttl'}" /></td>
<td class="text-right">
<button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="return ISPConfig.changeTab('dns_records','dns/dns_soa_edit.php');"><span class="icon icon-filter"></span></button>
<button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="return ISPConfig.changeTab('dns_records','dns/dns_soa_edit.php');" data-form-action="dns/dns_a_list.php"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
......
......@@ -102,6 +102,7 @@
<div class='clear'>
<!-- content -->
<div id='content' class='right'>
<noscript>This page needs JavaScript to be enabled.</noscript>
<form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class='form-horizontal' role='form'>
<div id="pageContent" data-startpage="{tmpl_var name="startpage"}"><!-- AJAX CONTENT --></div>
</form>
......
......@@ -3,19 +3,3 @@
</div>
<p><tmpl_var name="page_desc_txt"></p>
<div class="panel panel_tools_interface">
<div class="pnl_formsarea">
<h2 class="frmTextHead"></h2><p>&nbsp;</p>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="clear"><div class="right">
&nbsp;
</div></div>
</div>
</div>
\ No newline at end of file
......@@ -460,7 +460,7 @@ class monitor_tools {
/* Monitor MySQL Server */
$data['mysqlserver'] = -1; // unknown - not needed
if ($services['db_server'] == 1) {
if ($this->_checkTcp('localhost', 3306)) {
if ($this->_checkTcp($conf['db_host'], $conf['db_port'])) {
$data['mysqlserver'] = 1;
} else {
$data['mysqlserver'] = 0;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment