CVS: squirrelmail/functions addressbook.php,1.11,1.12

[P?l L?b. <pa...@us...>]

Update of /cvsroot/squirrelmail/squirrelmail/functions
In directory usw-pr-cvs1:/tmp/cvs-serv28926/functions

Modified Files:
	addressbook.php 
Log Message:
Fixed bug #126497 + problem with error handling in src/addressbook.php.


Index: addressbook.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/addressbook.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** addressbook.php	2000/08/17 11:28:18	1.11
--- addressbook.php	2001/01/03 14:12:42	1.12
***************
*** 336,339 ****
--- 336,345 ----
  	    return false;
  	 }
+ 
+ 	 if(eregi("[\: \|\#\"\!]", $userdata["nickname"])) {
+ 	    $this->error = _("Nickname contain illegal characters");
+ 	    return false;
+ 	 }
+ 
  	 if(empty($userdata["nickname"])) {
  	    $userdata["nickname"] = $userdata["email"];
***************
*** 342,346 ****
  	 // Check that specified backend is writable
  	 if(!$this->backends[$bnum]->writeable) {
! 	    $this->error = sprintf(_("Addressbook %s is read-only", $bnum));
  	    return false;
  	 }
--- 348,352 ----
  	 // Check that specified backend is writable
  	 if(!$this->backends[$bnum]->writeable) {
! 	    $this->error = _("Addressbook is read-only");;
  	    return false;
  	 }