[otrs-cvs] otrs/Kernel/System CheckItem.pm,1.24,1.25

cvs-log at otrs.org cvs-log at otrs.org
Fri Feb 1 17:24:57 GMT 2008


Comments:
Update of /home/cvs/otrs/Kernel/System
In directory lancelot:/tmp/cvs-serv27772/Kernel/System

Modified Files:
	CheckItem.pm 
Log Message:
Fixed bug #2638 - Broken email syntax detection.

Author: ub

Index: CheckItem.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/System/CheckItem.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** CheckItem.pm	23 Jan 2008 12:16:43 -0000	1.24
--- CheckItem.pm	1 Feb 2008 17:24:52 -0000	1.25
***************
*** 7,11 ****
  # This software comes with ABSOLUTELY NO WARRANTY. For details, see
  # the enclosed file COPYING for license information (GPL). If you
! # did not receive this file, see http://www.gnu.org/licenses/gpl.txt.
  # --
  
--- 7,11 ----
  # This software comes with ABSOLUTELY NO WARRANTY. For details, see
  # the enclosed file COPYING for license information (GPL). If you
! # did not receive this file, see http://www.gnu.org/licenses/gpl-2.0.txt.
  # --
  
***************
*** 118,126 ****
      # email address syntax check
      if ( $Param{Address}
!         !~ /^(()|([a-zA-Z0-9]+([a-zA-Z0-9_+\.&%-]*[a-zA-Z0-9_'\.-]+)?@([a-zA-Z0-9]+([a-zA-Z0-9\.-]*[a-zA-Z0-9]+)?\.+[a-zA-Z]{2,8}|\[\d+\.\d+\.\d+\.\d+])))$/
          )
      {
          $Error = "Invalid syntax";
      }
  
      # mx check
--- 118,132 ----
      # email address syntax check
      if ( $Param{Address}
!         !~ /^(()|([a-zA-Z0-9_]+([a-zA-Z0-9_+\.&%-]*[a-zA-Z0-9_'\.-]+)?@([a-zA-Z0-9]+([a-zA-Z0-9\.-]*[a-zA-Z0-9]+)?\.+[a-zA-Z]{2,8}|\[\d+\.\d+\.\d+\.\d+])))$/
          )
      {
          $Error = "Invalid syntax";
      }
+     # email address syntax check
+     # period (".") may not be used to end the local part,
+     # nor may two or more consecutive periods appear
+     if ( $Param{Address} =~ /(\.\.)|(\.@)/ ) {
+         $Error = "Invalid syntax";
+     }
  
      # mx check
***************
*** 262,266 ****
  This software comes with ABSOLUTELY NO WARRANTY. For details, see
  the enclosed file COPYING for license information (GPL). If you
! did not receive this file, see http://www.gnu.org/licenses/gpl.txt.
  
  =cut
--- 268,272 ----
  This software comes with ABSOLUTELY NO WARRANTY. For details, see
  the enclosed file COPYING for license information (GPL). If you
! did not receive this file, see http://www.gnu.org/licenses/gpl-2.0.txt.
  
  =cut


More information about the cvs-log mailing list