perltidy and licence update

build/lemonldap-ng/Makefile

@@ -483,6 +483,7 @@ doxygen:	clean
 distclean:	clean
 
 clean:		common_clean handler_clean portal_clean manager_clean
+	@rm -f $$(find */ -name '*bak' -delete)
 	@rm -rf $(EXAMPLEROOT) example/ doc/devel
 	@rm -vf *gz
 

build/lemonldap-ng/debian/copyright

@@ -4,23 +4,46 @@ Upstream-Maintainer: Xavier Guimard <x.guimard@free.fr>
 Upstream-Source: http://forge.objectweb.org/project/showfiles.php?group_id=274
 Upstream-Name: lemonldap-ng
 
-Files: *
-Copyright: 2004, 2005, 2006, 2007, 2008, 2009, Xavier Guimard <x.guimard@free.fr>
-License: Artistic | GPL-2
+Files: tree.js
+Copyright: 2008, Peter Panov <panov@elcat.kg>, IKEEN Group http://www.ikeen.com
+Licence: BSD
+
+Files: xlib.js
+Copyright: 2002-2007, Michael Foster (Cross-Browser.com)
+Licence: LGPL
 
 Files: *.js
 Licence: GPL-2
 
+Files: *
+Copyright: 2004, 2005, 2006, 2007, 2008, 2009, Xavier Guimard <x.guimard@free.fr>
+License: Artistic | GPL-2
+
 License: Artistic
     This program is free software; you can redistribute it and/or modify
     it under the terms of the Artistic License, which comes with Perl.
     On Debian GNU/Linux systems, the complete text of the Artistic License
     can be found in `/usr/share/common-licenses/Artistic'
 
-License: GPL-1+
+License: GPL-2
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 1, or (at your option)
     any later version.
     On Debian GNU/Linux systems, the complete text of the GNU General
-    Public License can be found in `/usr/share/common-licenses/GPL'
+    Public License can be found in `/usr/share/common-licenses/GPL-2'
+
+Licence: BSD
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted under the terms of the BSD License.
+    On Debian GNU/Linux systems, the complete text of the BSD License can
+    be found in `/usr/share/common-licenses/BSD'.
+
+Licence: LGPL
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation.
+    On Debian GNU/Linux systems, the complete text of the GNU Lesser
+    General Public License can be found in
+    `/usr/share/common-licenses/LGPL'.
+

modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthCAS.pm

@@ -29,23 +29,21 @@ sub extractFormInfo {
         CAFile => $self->{CAS_CAFile},
     );
 
-    my $casLoginUrl = $self->{CAS_loginUrl};
+    my $casLoginUrl      = $self->{CAS_loginUrl};
     my $casValidationUrl = $self->{CAS_validationUrl};
-    if ($self->{_url})
-    {
-      my $url_param = 'url=' . $self->{_url};
-      $casLoginUrl .= ( $casLoginUrl =~ /\?/ ? '&' : '?' ) . $url_param;
-      $casValidationUrl .= ( $casValidationUrl =~ /\?/ ? '&' : '?' ) . $url_param;
+    if ( $self->{_url} ) {
+        my $url_param = 'url=' . $self->{_url};
+        $casLoginUrl .= ( $casLoginUrl =~ /\?/ ? '&' : '?' ) . $url_param;
+        $casValidationUrl .=
+          ( $casValidationUrl =~ /\?/ ? '&' : '?' ) . $url_param;
     }
 
-    my $login_url = $cas->getServerLoginURL( $casLoginUrl );
+    my $login_url = $cas->getServerLoginURL($casLoginUrl);
 
     my $ticket = $self->param('ticket');
 
     # Unless a ticket has been found, we redirect the user
-    unless ( $self->{user} =
-        $cas->validateST( $casValidationUrl, $ticket ) )
-    {
+    unless ( $self->{user} = $cas->validateST( $casValidationUrl, $ticket ) ) {
         print $self->redirect(
             -uri    => $login_url,
             -status => '303 See Other'