From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/mail/list/mail_user.list.php |  127 ++++++++++++++++++++++++++++--------------
 1 files changed, 84 insertions(+), 43 deletions(-)

diff --git a/interface/web/mail/list/mail_user.list.php b/interface/web/mail/list/mail_user.list.php
index ec7b854..1c56140 100644
--- a/interface/web/mail/list/mail_user.list.php
+++ b/interface/web/mail/list/mail_user.list.php
@@ -13,75 +13,116 @@
 
 
 // Name of the list
-$liste["name"] 				= "mail_user";
+$liste["name"]    = "mail_user";
 
 // Database table
-$liste["table"] 			= "mail_user";
+$liste["table"]   = "mail_user";
 
 // Index index field of the database table
-$liste["table_idx"]			= "mailuser_id";
+$liste["table_idx"]  = "mailuser_id";
 
 // Search Field Prefix
-$liste["search_prefix"] 	= "search_";
+$liste["search_prefix"]  = "search_";
 
 // Records per page
-$liste["records_per_page"] 	= "15";
+$liste["records_per_page"]  = "15";
 
 // Script File of the list
-$liste["file"]				= "mail_user_list.php";
+$liste["file"]   = "mail_user_list.php";
 
 // Script file of the edit form
-$liste["edit_file"]			= "mail_user_edit.php";
+$liste["edit_file"]  = "mail_user_edit.php";
 
 // Script File of the delete script
-$liste["delete_file"]		= "mail_user_del.php";
+$liste["delete_file"]  = "mail_user_del.php";
 
 // Paging Template
-$liste["paging_tpl"]		= "templates/paging.tpl.htm";
+$liste["paging_tpl"]  = "templates/paging.tpl.htm";
 
 // Enable auth
-$liste["auth"]				= "yes";
+$liste["auth"]   = "yes";
 
 
 /*****************************************************
 * Suchfelder
 *****************************************************/
 
-$liste["item"][] = array( 'field'   => "email",
-              'datatype'  => "VARCHAR",
-              'formtype'  => "TEXT",
-              'op'    => "like",
-              'prefix'  => "%",
-              'suffix'  => "%",
-              'width'   => "",
-              'value'   => "");
+$liste["item"][] = array(   'field'     => "email",
+	'datatype'  => "VARCHAR",
+	'filters'   => array( 0 => array( 'event' => 'SHOW',
+			'type' => 'IDNTOUTF8')
+	),
+	'formtype'  => "TEXT",
+	'op'        => "like",
+	'prefix'    => "%",
+	'suffix'    => "%",
+	'width'     => "",
+	'value'     => "");
 
-$liste["item"][] = array( 'field'   => "login",
-              'datatype'  => "VARCHAR",
-              'formtype'  => "TEXT",
-              'op'    => "like",
-              'prefix'  => "%",
-              'suffix'  => "%",
-              'width'   => "",
-              'value'   => "");
+$liste["item"][] = array(   'field'     => "login",
+	'datatype'  => "VARCHAR",
+	'filters'   => array( 0 => array( 'event' => 'SHOW',
+			'type' => 'IDNTOUTF8')
+	),
+	'formtype'  => "TEXT",
+	'op'        => "like",
+	'prefix'    => "%",
+	'suffix'    => "%",
+	'width'     => "",
+	'value'     => "");
 
-$liste["item"][] = array(	'field'		=> "name",
-							'datatype'	=> "VARCHAR",
-							'formtype'	=> "TEXT",
-							'op'		=> "like",
-							'prefix'	=> "%",
-							'suffix'	=> "%",
-							'width'		=> "",
-							'value'		=> "");
+$liste["item"][] = array(   'field'     => "name",
+	'datatype' => "VARCHAR",
+	'formtype' => "TEXT",
+	'op' => "like",
+	'prefix' => "%",
+	'suffix' => "%",
+	'width' => "",
+	'value' => "");
 
-$liste["item"][] = array(	'field'		=> "autoresponder",
-							'datatype'	=> "VARCHAR",
-							'formtype'	=> "TEXT",
-							'op'		=> "like",
-							'prefix'	=> "%",
-							'suffix'	=> "%",
-							'width'		=> "",
-							'value'		=> "");
+$liste["item"][] = array(   'field'     => "autoresponder",
+	'datatype' => "VARCHAR",
+	'formtype' => "SELECT",
+	'op' => "=",
+	'prefix' => "",
+	'suffix' => "",
+	'width' => "",
+	'value' => array('y' => "<div id=\"ir-Yes\" class=\"swap\"><span>".$app->lng('yes_txt')."</span></div>", 'n' => "<div class=\"swap\" id=\"ir-No\"><span>".$app->lng('no_txt')."</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>".$app->lng('yes_txt')."</span></div>", 'n' => "<div class=\"swap\" id=\"ir-No\"><span>".$app->lng('no_txt')."</span></div>"));
 
-?>
\ No newline at end of file
+$liste["item"][] = array( 'field'  => "disablesmtp",
+	'datatype' => "VARCHAR",
+	'formtype' => "SELECT",
+	'op'  => "=",
+	'prefix' => "",
+	'suffix' => "",
+	'width'  => "",
+	'value'  => array('n' => "<div id=\"ir-Yes\" class=\"swap\"><span>".$app->lng('yes_txt')."</span></div>", 'y' => "<div class=\"swap\" id=\"ir-No\"><span>".$app->lng('no_txt')."</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>".$app->lng('yes_txt')."</span></div>", 'y' => "<div class=\"swap\" id=\"ir-No\"><span>".$app->lng('no_txt')."</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>".$app->lng('yes_txt')."</span></div>", 'y' => "<div class=\"swap\" id=\"ir-No\"><span>".$app->lng('no_txt')."</span></div>"));
+
+?>

--
Gitblit v1.9.1