From 1272df7f9c98dd6ac4399616ba9e98f037365dd8 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 25 Nov 2013 07:53:41 -0500
Subject: [PATCH] - Allow underscore at the beginning of email user login names - Add config to clear php handler in apps vhost.

---
 interface/web/mail/form/mail_user.tform.php |    2 +-
 install/tpl/apache_apps.vhost.master        |    4 ++++
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/install/tpl/apache_apps.vhost.master b/install/tpl/apache_apps.vhost.master
index 068158c..08398ab 100644
--- a/install/tpl/apache_apps.vhost.master
+++ b/install/tpl/apache_apps.vhost.master
@@ -11,6 +11,10 @@
   ServerAdmin webmaster@localhost
   {apps_vhost_servername}
   
+  <FilesMatch "\.ph(p3?|tml)$">
+    SetHandler None
+  </FilesMatch>
+  
   <IfModule mod_php5.c>
     DocumentRoot {apps_vhost_dir}
     AddType application/x-httpd-php .php
diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index 11fb012..88994d6 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -107,7 +107,7 @@
 				0 => array (  'type'  => 'UNIQUE',
 					'errmsg'=> 'login_error_unique'),
 				1 => array (  'type'  => 'REGEX',
-					'regex' => '/^[a-z0-9][\w\.\-_\+@]{1,63}$/',
+					'regex' => '/^[_a-z0-9][\w\.\-_\+@]{1,63}$/',
 					'errmsg'=> 'login_error_regex'),
 			),
 			'default' => '',

--
Gitblit v1.9.1