[Kolab-devel] gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php.in, 1.23, 1.24

[Gunnar Wrobel]

Hi Martin,

cvs at kolab.org writes:

> Author: gunnar
>
> Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
> In directory doto:/tmp/cvs-serv31123/kolab-webadmin/kolab-webadmin/www/admin/user
>
> Modified Files:
> 	user.php.in 
> Log Message:
> Reverted kolabAllowSMTPRecipient changes for kolab_2_2_branch:
> cvs diff -u -d -r1.19 -r1.20 kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in|patch -p0 -s -R
> cvs diff -u -d -r1.13 -r1.14 kolabd/kolabd/templates/slapd.conf.template.in|patch -p0 -s -R
> cvs diff -u -d -r1.22 -r1.24 kolabd/kolabd/kolab2.schema|patch -p0 -s -R

I also reverted your kolabAllowSMTPRecipient for the Kolab-Server-2.2
branch in order to be able to work with the kolab webadmin development
version.

You can easily revert and return back to the point where you stopped
coding by moving into the server directory in your CVS checkout and
run:

cvs diff -u -d -r1.23 -r1.24 kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in|patch -p0 -s -R
cvs diff -u -d -r1.14 -r1.15 kolabd/kolabd/templates/slapd.conf.template.in|patch -p0 -s -R
cvs diff -u -d -r1.24 -r1.25 kolabd/kolabd/kolab2.schema|patch -p0 -s -R

Sorry for the trouble.

Cheers,

Gunnar


>
>
> Index: user.php.in
> ===================================================================
> RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
> retrieving revision 1.23
> retrieving revision 1.24
> diff -u -d -r1.23 -r1.24
> --- user.php.in	12 Jul 2007 16:28:23 -0000	1.23
> +++ user.php.in	27 Jul 2007 15:38:19 -0000	1.24
> @@ -148,49 +148,6 @@
>    return '';
>  }
>  
> -function checksmtprecipient ( $form, $key, $value ) {
> -  $lst = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $value ) ), 'strlen') );
> -  $str = '';
> -  foreach( $lst as $SMTPRecipient ) {
> -    $trimmed = ltrim($SMTPRecipient, "-."); // potentially every entry is negated with a '-'
> -    // $SMTPRecipient is either an 
> -    // - email address
> -    // - local part of an email address with an @ suffix
> -    // - a domain part
> -         
> -    if (! ( valid_email_address($SMTPRecipient) 
> -          | valid_domain($SMTPRecipient)
> -          | valid_local_part($SMTPRecipient))
> -      return sprintf(_("Syntax for Recipient %s is invalid"), $SMTPRecipient);
> -    }
> -  }
> -  return '';
> -}
> -
> -
> -function valid_email_address($address) {
> -// the following addresses are invalid
> -// email1.. at kolab.org
> -// email1.- at kolab.org
> -// email1._ at kolab.org
> -// email1 at 2sub.kolab.org
> -// email1 at sub.sub.2sub.kolab.org
> -  return preg_match("/^[a-z]+[a-z0-9]*[\.|\-|_]?[a-z0-9]+@([a-z]+[a-z0-9]*[\.|\-]?[a-z]+[a-z0-9]*[a-z0-9]+){1,4}\.[a-z]{2,4}$/i", $address));
> -}
> -
> -function valid_domain($domain) {
> -// the following subdomains are invalid
> -// 2sub.kolab.org
> -// sub.sub.2sub.kolab.org
> -  return preg_match("/^[a-z]+[a-z0-9]*[\.|\-]?[a-z]+[a-z0-9]*[a-z0-9]+){1,4}\.[a-z]{2,4}$/i", $domain));
> -}
> -
> -function valid_local_part($local_part) {
> -  // the local part always has an @ appended
> -  return preg_match("/^[a-z]+[a-z0-9]*[\.|\-|_]?[a-z0-9]+@/i", $local_part));
> -}
> -
> -
>  // Check uid/gid used in invitation policy
>  // We're pretty relaxed about what is entered 
>  // here and only check some basic syntax
> @@ -478,12 +435,6 @@
>  		'validation' => 'checkdelegate',
>  		'comment' => _('Others allowed to send emails with a "from" address of this account.') . '<br/>' .
>  			_('One email address per line.') );
> -
> -$entries['kolabAllowSMTPRecipient'] =array( 'name' => _('Allowed Recipients'),
> -                'type' => 'textarea',
> -                'validation' => 'checksmtprecipient',
> -                'comment' => _('restrict allowed recipients of SMTP messages') . '<br/>' .
> -                        _('One entry per line.') );
>  
>  $entries['title_0'] = array( 'name' => _('Title') );
>  $entries['o_0'] = array( 'name' => _('Organisation') );
>
>
> _______________________________________________
> Kolab-commits mailing list
> Kolab-commits at kolab.org
> https://kolab.org/mailman/listinfo/kolab-commits

-- 
____ http://www.pardus.de _________________ http://gunnarwrobel.de _

    >> Mail at ease - Rent a kolab groupware server at p at rdus <<

p at rdus Kolab work is funded in part by KDAB and the Kolab Konsortium