From 94dfb1787d921b56175c0c5f6b1e2486d8e7d2c1 Mon Sep 17 00:00:00 2001
From: Sergio Cambra <sergio@programatica.es>
Date: Thu, 31 Jul 2014 15:28:00 +0200
Subject: [PATCH] display permissions for mail users on list

---
 .../web/mail/lib/lang/en_mail_user_list.lng   |  4 +++
 .../web/mail/lib/lang/es_mail_user_list.lng   |  4 +++
 interface/web/mail/list/mail_user.list.php    | 36 +++++++++++++++++++
 .../web/mail/templates/mail_user_list.htm     | 16 +++++++--
 interface/web/themes/blue/css/styles.css      | 10 +++++-
 interface/web/themes/default/css/styles.css   | 10 +++++-
 6 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/interface/web/mail/lib/lang/en_mail_user_list.lng b/interface/web/mail/lib/lang/en_mail_user_list.lng
index d2611452e..c7b0a43ad 100644
--- a/interface/web/mail/lib/lang/en_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/en_mail_user_list.lng
@@ -5,4 +5,8 @@ $wb["autoresponder_txt"] = 'Autoresponder';
 $wb["add_new_record_txt"] = 'Add new Mailbox';
 $wb["name_txt"] = 'Realname';
 $wb["login_txt"] = 'Login';
+$wb["postfix_txt"] = 'Receiving';
+$wb["disablesmtp_txt"] = 'SMTP (sending)';
+$wb["disableimap_txt"] = 'IMAP';
+$wb["disablepop3_txt"] = 'POP3';
 ?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/es_mail_user_list.lng b/interface/web/mail/lib/lang/es_mail_user_list.lng
index 42d4e324c..82b8ca5da 100644
--- a/interface/web/mail/lib/lang/es_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/es_mail_user_list.lng
@@ -5,4 +5,8 @@ $wb['autoresponder_txt'] = 'Autoresponder';
 $wb['add_new_record_txt'] = 'Añadir nuevo buzón';
 $wb['name_txt'] = 'Nombre';
 $wb['login_txt'] = 'Iniciar sesión';
+$wb['postfix_txt'] = 'Recepción';
+$wb['disablesmtp_txt'] = 'SMTP (envío)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
diff --git a/interface/web/mail/list/mail_user.list.php b/interface/web/mail/list/mail_user.list.php
index 0b17bf7ce..253aa90ed 100644
--- a/interface/web/mail/list/mail_user.list.php
+++ b/interface/web/mail/list/mail_user.list.php
@@ -89,4 +89,40 @@ $liste["item"][] = array(   'field'     => "autoresponder",
 	'width' => "",
 	'value' => array('y' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>", 'n' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
 
+$liste["item"][] = array( 'field'  => "postfix",
+	'datatype' => "VARCHAR",
+	'formtype' => "SELECT",
+	'op'  => "=",
+	'prefix' => "",
+	'suffix' => "",
+	'width'  => "",
+	'value'  => array('y' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>", 'n' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
+
+$liste["item"][] = array( 'field'  => "disablesmtp",
+	'datatype' => "VARCHAR",
+	'formtype' => "SELECT",
+	'op'  => "=",
+	'prefix' => "",
+	'suffix' => "",
+	'width'  => "",
+	'value'  => array('n' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>", 'y' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
+
+$liste["item"][] = array( 'field'  => "disableimap",
+	'datatype' => "VARCHAR",
+	'formtype' => "SELECT",
+	'op'  => "=",
+	'prefix' => "",
+	'suffix' => "",
+	'width'  => "",
+	'value'  => array('n' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>", 'y' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
+
+$liste["item"][] = array( 'field'  => "disablepop3",
+	'datatype' => "VARCHAR",
+	'formtype' => "SELECT",
+	'op'  => "=",
+	'prefix' => "",
+	'suffix' => "",
+	'width'  => "",
+	'value'  => array('n' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>", 'y' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
+
 ?>
diff --git a/interface/web/mail/templates/mail_user_list.htm b/interface/web/mail/templates/mail_user_list.htm
index 9fba82e72..3d9f09f9b 100644
--- a/interface/web/mail/templates/mail_user_list.htm
+++ b/interface/web/mail/templates/mail_user_list.htm
@@ -38,6 +38,10 @@
                 <tmpl_if name="enable_custom_login"><th class="tbl_col_login" scope="col"><tmpl_var name="login_txt"></th></tmpl_if>
                 <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
                         <th class="tbl_col_autoresponder" scope="col"><tmpl_var name="autoresponder_txt"></th>
+                        <th class="tbl_col_postfix" scope="col"><tmpl_var name="postfix_txt"></th>
+                        <th class="tbl_col_disablesmtp" scope="col"><tmpl_var name="disablesmtp_txt"></th>
+                        <th class="tbl_col_disableimap" scope="col"><tmpl_var name="disableimap_txt"></th>
+                        <th class="tbl_col_disablepop3" scope="col"><tmpl_var name="disablepop3_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
                     <tr class="filter">
@@ -45,6 +49,10 @@
             <tmpl_if name="enable_custom_login"><td class="tbl_col_login"><input type="text" name="search_login" value="{tmpl_var name='search_login'}" /></td></tmpl_if>
                         <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
                         <td class="tbl_col_autoresponder"><select name="search_autoresponder">{tmpl_var name='search_autoresponder'}</select></td>
+                        <td class="tbl_col_postfix"><select name="search_postfix">{tmpl_var name='search_postfix'}</select></th>
+                        <td class="tbl_col_disablesmtp"><select name="search_disablesmtp">{tmpl_var name='search_disablesmtp'}</select></th>
+                        <td class="tbl_col_disableimap"><select name="search_disableimap">{tmpl_var name='search_disableimap'}</select></th>
+                        <td class="tbl_col_disablepop3"><select name="search_disablepop3">{tmpl_var name='search_disablepop3'}</select></th>
                         <td class="tbl_col_buttons">
                             <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
                         </td>
@@ -61,6 +69,10 @@
                         </tmpl_if>
                         <td class="tbl_col_name"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
                         <td class="tbl_col_autoresponder"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="autoresponder"}</a></td>
+                        <td class="tbl_col_postfix"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="postfix"}</a></td>
+                        <td class="tbl_col_disablesmtp"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="disablesmtp"}</a></td>
+                        <td class="tbl_col_disableimap"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="disableimap"}</a></td>
+                        <td class="tbl_col_disablepop3"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="disablepop3"}</a></td>
                         <td class="tbl_col_buttons">
                             <tmpl_if name="mailboxlist_webmail_link">
                                 <a class="button icons16 icoWebmailer" href="mail/webmailer.php?id={tmpl_var name='id'}" target="webmail"><span>{tmpl_var name="webmail_txt"}</span></a>
@@ -71,13 +83,13 @@
                 </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="<tmpl_if name="enable_custom_login">5<tmpl_else>4</tmpl_if>">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
+                        <td colspan="<tmpl_if name="enable_custom_login">9<tmpl_else>8</tmpl_if>">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
                     </tr>
                 </tmpl_unless>
                 </tbody>
                 <tfoot>
                     <tr>
-                        <td class="tbl_footer tbl_paging" colspan="<tmpl_if name="enable_custom_login">5<tmpl_else>4</tmpl_if>"><tmpl_var name="paging"></td>
+                        <td class="tbl_footer tbl_paging" colspan="<tmpl_if name="enable_custom_login">9<tmpl_else>8</tmpl_if>"><tmpl_var name="paging"></td>
                     </tr>
                 </tfoot>
             </table>
diff --git a/interface/web/themes/blue/css/styles.css b/interface/web/themes/blue/css/styles.css
index b98893808..2843c9f44 100644
--- a/interface/web/themes/blue/css/styles.css
+++ b/interface/web/themes/blue/css/styles.css
@@ -373,7 +373,15 @@ table.list td[class$="_pid"],
 table.list th[class$="_active"],
 table.list td[class$="_active"],
 table.list th.tbl_col_autoresponder,
-table.list td.tbl_col_autoresponder {
+table.list td.tbl_col_autoresponder,
+table.list th.tbl_col_postfix,
+table.list td.tbl_col_postfix,
+table.list th.tbl_col_disablesmtp,
+table.list td.tbl_col_disablesmtp,
+table.list th.tbl_col_disableimap,
+table.list td.tbl_col_disableimap,
+table.list th.tbl_col_disablepop3,
+table.list td.tbl_col_disablepop3 {
     width: 70px;
     text-align: center;
 }
diff --git a/interface/web/themes/default/css/styles.css b/interface/web/themes/default/css/styles.css
index afe36fd54..0d0e7d261 100644
--- a/interface/web/themes/default/css/styles.css
+++ b/interface/web/themes/default/css/styles.css
@@ -373,7 +373,15 @@ table.list td[class$="_pid"],
 table.list th[class$="_active"],
 table.list td[class$="_active"],
 table.list th.tbl_col_autoresponder,
-table.list td.tbl_col_autoresponder {
+table.list td.tbl_col_autoresponder,
+table.list th.tbl_col_postfix,
+table.list td.tbl_col_postfix,
+table.list th.tbl_col_disablesmtp,
+table.list td.tbl_col_disablesmtp,
+table.list th.tbl_col_disableimap,
+table.list td.tbl_col_disableimap,
+table.list th.tbl_col_disablepop3,
+table.list td.tbl_col_disablepop3 {
     width: 70px;
     text-align: center;
 }
-- 
GitLab