Project

General

Profile

« Previous | Next » 

Revision 1303

Added by Dietmar over 14 years ago

Fixed e-mail preg pattern, because issues with some php versions

View differences:

branches/2.8.x/CHANGELOG
12 12

  
13 13
------------------------------------- 2.8.1 -------------------------------------
14 14
07-Mar-2010 Dietmar Woellbrink (Luisehahne)
15
#	Fixed e-mail preg pattern, because issues with some php versions
16
07-Mar-2010 Dietmar Woellbrink (Luisehahne)
15 17
#	fixed search_modext.php ( Tks to Thorn )
16 18
#	Ticket #953 is already fixed 
17 19
#	Ticket #954 styles issues in theme.css ( Tks to Ruebenwurzel )
branches/2.8.x/wb/admin/interface/version.php
52 52

  
53 53
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
54 54
if(!defined('VERSION')) define('VERSION', '2.8.x');
55
if(!defined('REVISION')) define('REVISION', '1302');
55
if(!defined('REVISION')) define('REVISION', '1303');
56 56

  
57 57
?>
branches/2.8.x/wb/admin/settings/save.php
40 40
if(isset($_POST['server_email']))
41 41
{
42 42
	$_POST['server_email'] = strip_tags($_POST['server_email']);
43
    $pattern = '/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9]([-a-z0-9_]?[a-z0-9])*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z]{2})|([1]?\d{1,2}|2[0-4]{1}\d{1}|25[0-5]{1})(\.([1]?\d{1,2}|2[0-4]{1}\d{1}|25[0-5]{1})){3})(:[0-9]{1,5})?\r/im';
44
    // $pattern = '/^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.(([0-9]{1,3})|([a-zA-Z]{2,6}))$/';
43
    // $pattern = '/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9]([-a-z0-9_]?[a-z0-9])*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z]{2})|([1]?\d{1,2}|2[0-4]{1}\d{1}|25[0-5]{1})(\.([1]?\d{1,2}|2[0-4]{1}\d{1}|25[0-5]{1})){3})(:[0-9]{1,5})?\r/im';
44
    $pattern = '/^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.(([0-9]{1,3})|([a-zA-Z]{2,6}))$/';
45 45
    if(false == preg_match($pattern, $_POST['server_email']))
46 46
    {
47 47
		$admin->print_error($MESSAGE['USERS']['INVALID_EMAIL'].

Also available in: Unified diff