Addad a function to disable poip3 and imap per user account.

Author: tbrehm

install/sql/ispconfig3.sql

@@ -448,6 +448,8 @@ CREATE TABLE `mail_user` (
   `custom_mailfilter` text,
   `postfix` enum('y','n') NOT NULL,
   `access` enum('y','n') NOT NULL,
+  `disableimap` enum('0','1') NOT NULL default '0',
+  `disablepop3` enum('0','1') NOT NULL default '0',
   PRIMARY KEY  (`mailuser_id`),
   KEY `server_id` (`server_id`,`email`),
   KEY `email_access` (`email`,`access`)

install/tpl/authmysqlrc.master

@@ -14,4 +14,5 @@ MYSQL_MAILDIR_FIELD maildir
 #MYSQL_NAME_FIELD
 #MYSQL_QUOTA_FIELD quota
 MYSQL_QUOTA_FIELD concat(quota,'S')
-MYSQL_WHERE_CLAUSE      access='y'
+#MYSQL_WHERE_CLAUSE      access='y'
+MYSQL_AUXOPTIONS_FIELD concat('disableimap=',disableimap,',disablepop3=',disablepop3)

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

@@ -79,7 +79,7 @@
 														'regex' => '/^[\s0-9\,]{0,255}$/',
 														'errmsg'=> 'tcp_ports_error_regex'),
 									),
-			'default'	=> '21,22,25,53,80,110,443,8080,10000',
+			'default'	=> '20,21,22,25,53,80,110,443,8080,10000',
 			'value'		=> '',
 			'width'		=> '30',
 			'maxlength'	=> '255'

interface/web/mail/form/mail_user.tform.php

@@ -137,12 +137,26 @@
 			'default'	=> 'y',
 			'value'		=> array(1 => 'y',0 => 'n')
 		),
+		/*
 		'access' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'CHECKBOX',
 			'default'	=> 'y',
 			'value'		=> array(1 => 'y',0 => 'n')
 		),
+		*/
+		'disableimap' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'CHECKBOX',
+			'default'	=> '0',
+			'value'		=> array(1 => '1',0 => '0')
+		),
+		'disablepop3' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'CHECKBOX',
+			'default'	=> 'y',
+			'value'		=> array(1 => '1',0 => '0')
+		),
 	##################################
 	# ENDE Datatable fields
 	##################################

interface/web/mail/lib/lang/en_mail_user.lng

@@ -24,4 +24,6 @@ $wb["limit_mailbox_txt"] = 'The max. number of mailboxes for your account is rea
 $wb["limit_mailquota_txt"] = 'The max space for mailboxes is reached. The max. available space in MB is';
 $wb["welcome_mail_subject"] = 'Welcome to your new email account.';
 $wb["welcome_mail_message"] = "Welcome to your new email account.\n\nYour webmaster.";
+$wb["disableimap_txt"] = 'Disable IMAP';
+$wb["disablepop3_txt"] = 'Disable POP3';
 ?>

interface/web/mail/templates/mail_user_mailbox_edit.htm

@@ -23,10 +23,20 @@
     <td width="126" class="frmText11">{tmpl_var name='postfix_txt'}:</td>
     <td width="366" class="frmText11">{tmpl_var name='postfix'}</td>
   </tr>
+  <tr>
+    <td width="126" class="frmText11">{tmpl_var name='disableimap_txt'}:</td>
+    <td width="366" class="frmText11">{tmpl_var name='disableimap'}</td>
+  </tr>
+  <tr>
+    <td width="126" class="frmText11">{tmpl_var name='disablepop3_txt'}:</td>
+    <td width="366" class="frmText11">{tmpl_var name='disablepop3'}</td>
+  </tr>
+  <!--
   <tr>
     <td width="126" class="frmText11">{tmpl_var name='access_txt'}:</td>
     <td width="366" class="frmText11">{tmpl_var name='access'}</td>
   </tr>
+  -->
   <tr>
     <td class="frmText11">&nbsp;</td>
     <td class="frmText11">&nbsp;</td>