martin: server/perl-kolab/Kolab-Conf Changes, 1.1, 1.2 Conf.pm.in, 1.9, 1.10

cvs at kolab.org cvs at kolab.org
Sat Jan 6 22:36:22 CET 2007


Author: martin

Update of /kolabrepository/server/perl-kolab/Kolab-Conf
In directory doto:/tmp/cvs-serv14835

Modified Files:
	Changes Conf.pm.in 
Log Message:
Martin Konold: Applied patch from Joergen Fjeld <jhf at linpro.no> which fixes the masquerade problem https://intevation.de/roundup/kolab/issue1550


Index: Changes
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Changes,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Changes	31 Mar 2004 15:36:42 -0000	1.1
+++ Changes	6 Jan 2007 21:36:20 -0000	1.2
@@ -3,4 +3,5 @@
 0.01  Thu Nov  6 14:07:19 2003
 	- original version; created by h2xs 1.22 with options
 		-XA -n Kolab::Conf
-
+0.02 Sa 6. Jan 22:35:25 2007
+        - fixes order of domains see also https://intevation.de/roundup/kolab/issue1550

Index: Conf.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Conf.pm.in	4 Dec 2006 13:31:48 -0000	1.9
+++ Conf.pm.in	6 Jan 2007 21:36:20 -0000	1.10
@@ -4,12 +4,12 @@
 ##  Copyright (c) 2004  Klaraelvdalens Datakonsult AB
 ##  Copyright (c) 2003  Code Fusion cc
 ##
-##    Writen by Stuart Bingë <s.binge at codefusion.co.za>
+##    Written by Stuart Bingë <s.binge at codefusion.co.za>
 ##    Portions based on work by the following people:
 ##
-##      (c) 2003  Tassilo Erlewein  <tassilo.erlewein at erfrakon.de>
-##      (c) 2003  Martin Konold     <martin.konold at erfrakon.de>
-##      (c) 2003  Achim Frank       <achim.frank at erfrakon.de>
+##      (c) 2003       Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+##      (c) 2003-2006  Martin Konold    <martin.konold at erfrakon.de>
+##      (c) 2003       Achim Frank      <achim.frank at erfrakon.de>
 ##
 ##
 ##  This  program is free  software; you can redistribute  it and/or
@@ -25,7 +25,7 @@
 ##  You can view the  GNU General Public License, online, at the GNU
 ##  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
 ##
-
+## Version 0.02
 use 5.008;
 use strict;
 use warnings;
@@ -277,11 +277,16 @@
 		} else {
 		  # Modifier functions
 		SWITCH: {
-		    # Join function
+		    # Join function 
 		    $fct eq 'join' && do {
-		      $val = join $args, (ref $Kolab::config{$attr} eq "ARRAY")
-			?@{$Kolab::config{$attr}}
-			  :($Kolab::config{$attr});
+                      if (ref $Kolab::config{$attr} eq "ARRAY") {
+                          my @vals = @{$Kolab::config{$attr}} ;
+			  # We want to make sure subdomain.domain.tld comes before domain.tld
+                          my @length_sorted_vals = sort {length $a cmp length $b} @vals;
+                          $val = join ($args, @length_sorted_vals) ;
+                      } else {
+                          $val = $Kolab::config{$attr};
+                      }
 		      last SWITCH;
 		    };
 		    # Quote function





More information about the commits mailing list