Merge branch 'patch-misc' into 'develop'

Patch misc

Closes #4431

See merge request ispconfig/ispconfig3!1252

Author: Marius Burkard

interface/lib/classes/tform_base.inc.php

@@ -560,7 +560,13 @@ function getHTML($record, $tab, $action = 'NEW') {
 									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 @@ function getHTML($record, $tab, $action = 'NEW') {
 								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++;
 						}
 					}

interface/web/admin/form/remote_user.tform.php

@@ -146,6 +146,7 @@
 			'separator' => ';',
 			'width'  => '',
 			'maxlength' => '',
+			'render_inline' => 'n',
 			'rows'  => '5',
 			'cols'  => '30'
 		)

interface/web/client/lib/lang/nl_client.lng

@@ -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';

interface/web/dns/templates/dns_a_list.htm

@@ -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>

interface/web/themes/default/templates/main.tpl.htm

@@ -102,6 +102,7 @@ <h4 class="modal-title">{tmpl_var name="datalog_changes_txt"}</h4>
 		<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>

interface/web/tools/templates/index.htm

@@ -3,19 +3,3 @@ <h1><tmpl_var name="page_head_txt"></h1>
 </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>

server/lib/classes/monitor_tools.inc.php

@@ -460,7 +460,7 @@ public function monitorServices() {
 		/* 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;