interface/web/monitor/lib/lang/fi_dataloghistory_list.lng

@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
 $wb['dbtable_txt'] = 'DB Table';
 $wb['action_txt'] = 'Action';
 $wb['status_txt'] = 'Status';
+$wb['user_txt'] = 'User';
 ?>

interface/web/monitor/lib/lang/fr_dataloghistory_list.lng

@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
 $wb['dbtable_txt'] = 'DB Table';
 $wb['action_txt'] = 'Action';
 $wb['status_txt'] = 'Status';
+$wb['user_txt'] = 'User';
 ?>

interface/web/monitor/lib/lang/hr_dataloghistory_list.lng

@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
 $wb['dbtable_txt'] = 'DB Table';
 $wb['action_txt'] = 'Action';
 $wb['status_txt'] = 'Status';
+$wb['user_txt'] = 'User';
 ?>

interface/web/monitor/lib/lang/hu_dataloghistory_list.lng

@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
 $wb['dbtable_txt'] = 'DB Table';
 $wb['action_txt'] = 'Action';
 $wb['status_txt'] = 'Status';
+$wb['user_txt'] = 'User';
 ?>

interface/web/monitor/lib/lang/id_dataloghistory_list.lng

@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
 $wb['dbtable_txt'] = 'DB Table';
 $wb['action_txt'] = 'Action';
 $wb['status_txt'] = 'Status';
+$wb['user_txt'] = 'User';
 ?>

interface/web/monitor/lib/lang/it_dataloghistory_list.lng

@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
 $wb['dbtable_txt'] = 'Tabella DB';
 $wb['action_txt'] = 'Azione';
 $wb['status_txt'] = 'Stato';
+$wb['user_txt'] = 'User';
 ?>

interface/web/monitor/lib/lang/ja_dataloghistory_list.lng

@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
 $wb['dbtable_txt'] = 'DB Table';
 $wb['action_txt'] = 'Action';
 $wb['status_txt'] = 'Status';
+$wb['user_txt'] = 'User';
 ?>

interface/web/monitor/lib/lang/nl_dataloghistory_list.lng

@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
 $wb['dbtable_txt'] = 'DB Table';
 $wb['action_txt'] = 'Action';
 $wb['status_txt'] = 'Status';
+$wb['user_txt'] = 'User';
 ?>

interface/web/monitor/lib/lang/pl_dataloghistory_list.lng

@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
 $wb['dbtable_txt'] = 'DB Table';
 $wb['action_txt'] = 'Action';
 $wb['status_txt'] = 'Status';
+$wb['user_txt'] = 'User';
 ?>

interface/web/monitor/lib/lang/pt_dataloghistory_list.lng

@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
 $wb['dbtable_txt'] = 'DB Table';
 $wb['action_txt'] = 'Action';
 $wb['status_txt'] = 'Status';
+$wb['user_txt'] = 'User';
 ?>

interface/web/monitor/lib/lang/ro_dataloghistory_list.lng

@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
 $wb['dbtable_txt'] = 'DB Table';
 $wb['action_txt'] = 'Action';
 $wb['status_txt'] = 'Status';
+$wb['user_txt'] = 'User';
 ?>

interface/web/monitor/lib/lang/ru_dataloghistory_list.lng

@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
 $wb['dbtable_txt'] = 'DB Table';
 $wb['action_txt'] = 'Action';
 $wb['status_txt'] = 'Status';
+$wb['user_txt'] = 'User';
 ?>

interface/web/monitor/lib/lang/se_dataloghistory_list.lng

@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
 $wb['dbtable_txt'] = 'DB Table';
 $wb['action_txt'] = 'Action';
 $wb['status_txt'] = 'Status';
+$wb['user_txt'] = 'User';
 ?>

interface/web/monitor/lib/lang/sk_dataloghistory_list.lng

@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
 $wb['dbtable_txt'] = 'DB Table';
 $wb['action_txt'] = 'Action';
 $wb['status_txt'] = 'Status';
+$wb['user_txt'] = 'User';
 ?>

interface/web/monitor/lib/lang/tr_dataloghistory_list.lng

@@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server';
 $wb['dbtable_txt'] = 'DB Table';
 $wb['action_txt'] = 'Action';
 $wb['status_txt'] = 'Status';
+$wb['user_txt'] = 'User';
 ?>

interface/web/monitor/list/dataloghistory.list.php

@@ -77,7 +77,6 @@ $liste["item"][] = array( 'field'  => "action",
 	'width'  => "",
 	'value'  => array('i' => "Insert", 'u' => "Update", 'd' => "Delete"));
 
-
 $liste["item"][] = array( 'field'  => "dbtable",
 	'datatype' => "VARCHAR",
 	'formtype' => "TEXT",
@@ -87,5 +86,13 @@ $liste["item"][] = array( 'field'  => "dbtable",
 	'width'  => "",
 	'value'  => "");
 
+$liste["item"][] = array( 'field'  => "user",
+	'datatype' => "VARCHAR",
+	'formtype' => "TEXT",
+	'op'  => "like",
+	'prefix' => "%",
+	'suffix' => "%",
+	'width'  => "",
+	'value'  => "");
 
 ?>

interface/web/monitor/templates/dataloghistory_list.htm

@@ -15,6 +15,7 @@
                         <th data-column="server_id"><tmpl_var name="server_id_txt"></th>
                         <th data-column="action"><tmpl_var name="action_txt"></th>
                         <th data-column="dbtable"><tmpl_var name="dbtable_txt"></th>
+                        <th data-column="user"><tmpl_var name="user_txt"></th>
                         <th class="small-col text-right">{tmpl_var name='search_limit'}</th>
                     </tr>
                     <tr>
@@ -22,6 +23,8 @@
                         <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td><select class="form-control" name="search_action">{tmpl_var name='search_action'}</select></td>
                         <td><input class="form-control" type="text" name="search_dbtable" value="{tmpl_var name='search_dbtable'}" /></td>
+                        <td><input class="form-control" type="text" name="search_user" value="{tmpl_var name='search_user'}" /></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"}" data-submit-form="pageForm" data-form-action="monitor/dataloghistory_list.php"><span class="icon icon-filter"></span></button>
                         </td>
@@ -34,18 +37,19 @@
                             <td><a href="#" data-load-content="monitor/dataloghistory_view.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
                             <td><a href="#" data-load-content="monitor/dataloghistory_view.php?id={tmpl_var name='id'}">{tmpl_var name="action"}</a></td>
                             <td><a href="#" data-load-content="monitor/dataloghistory_view.php?id={tmpl_var name='id'}">{tmpl_var name="dbtable"}</a></td>
+                            <td><a href="#" data-load-content="monitor/dataloghistory_view.php?id={tmpl_var name='id'}">{tmpl_var name="user"}</a></td>
                             <td class="text-right"></td>
                         </tr>
                     </tmpl_loop>
                     <tmpl_unless name="records">
                         <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td colspan="5">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
+                            <td colspan="6">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
                         </tr>
                     </tmpl_unless>
                 </tbody>
                 <tfoot>
                     <tr>
-                        <td colspan="5"><tmpl_var name="paging"></td>
+                        <td colspan="6"><tmpl_var name="paging"></td>
                     </tr>
                 </tfoot>
             </table>

interface/web/sites/templates/ftp_sites_stats_list.htm

@@ -30,10 +30,10 @@
 		<tmpl_loop name="records">
 			<tr>
 				<td><a target="_blank" href="http://{tmpl_var name="domain"}/stats">{tmpl_var name="domain"}</a></td>
-				<td><a href="#" data-load-content="sites/web_<tmpl_if name='type' op='==' value='vhostsubdomain'>vhost_sub</tmpl_if><tmpl_if name='type' op='==' value='vhostalias'>vhost_alias</tmpl_if>domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="this_month_in"}/{tmpl_var name="this_month_out"}</a></td>
-				<td><a href="#" data-load-content="sites/web_<tmpl_if name='type' op='==' value='vhostsubdomain'>vhost_sub</tmpl_if><tmpl_if name='type' op='==' value='vhostalias'>vhost_alias</tmpl_if>domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="last_month_in"}/{tmpl_var name="last_month_out"}</a></td>
-				<td><a href="#" data-load-content="sites/web_<tmpl_if name='type' op='==' value='vhostsubdomain'>vhost_sub</tmpl_if><tmpl_if name='type' op='==' value='vhostalias'>vhost_alias</tmpl_if>domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="this_year_in"}/{tmpl_var name="this_year_out"}</a></td>
-				<td><a href="#" data-load-content="sites/web_<tmpl_if name='type' op='==' value='vhostsubdomain'>vhost_sub</tmpl_if><tmpl_if name='type' op='==' value='vhostalias'>vhost_alias</tmpl_if>domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="last_year_in"}/{tmpl_var name="last_year_out"}</a></td>
+				<td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}">{tmpl_var name="this_month_in"}/{tmpl_var name="this_month_out"}</a></td>
+				<td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}">{tmpl_var name="last_month_in"}/{tmpl_var name="last_month_out"}</a></td>
+				<td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}">{tmpl_var name="this_year_in"}/{tmpl_var name="this_year_out"}</a></td>
+				<td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}">{tmpl_var name="last_year_in"}/{tmpl_var name="last_year_out"}</a></td>
 				<td class="text-right"></td>
 			</tr>
 		</tmpl_loop>

interface/web/themes/default/assets/javascripts/ispconfig.js

@@ -223,7 +223,7 @@ var ISPConfig = {
 
 		var frame_id = 'ajaxUploader-iframe-' + Math.round(new Date().getTime() / 1000);
 		$('body').append('<iframe width="0" height="0" style="display:none;" name="'+frame_id+'" id="'+frame_id+'"/>');
-		$('#'+frame_id).load(function() {
+		$('#'+frame_id).on("load", function() {
 			var msg = handleResponse(this);
 			$('#errorMsg').remove();
 			$('#OKMsg').remove();

remoting_client/API-docs/mail_user_get_all_by_client.html

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html><head><title>ISPCOnfig 3 remote API documentation</title>
+
+  
+
+  
+  
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  <link rel="stylesheet" type="text/css" href="definitionen.css">
+  <style type="text/css">
+
+  </style></head>
+
+<body>
+<div style="padding:40px">
+<h1>mail_user_get_all_by_client(<span class="var">$session_id</span>, <span class="var">$client_id</span>);</h1>
+<br>
+<p class="headgrp">Description: </p>
+<p class="margin"> Retrieves information about the mail users belonging to a client.</p><br>
+<p class="headgrp">Input Variables: </p> 
+<p class="margin"> <span class="var">$session_id</span>, <span class="var">$primary_id</span></p>
+<p class="headgrp">Parameters (in <span class="var">$params</span>): </p>
+<p class="margin"> None</p>
+<p class="headgrp">Output: </p> 
+<p class="margin"> Returns all fields and values of the chosen mail users.</p>
+<!--<b>Output:</b> 
+<p style="margin-left:100px">Gives a record of </p> -->
+</div>
+
+</body></html>