From 8f647e559b19a44328f9121301b9376c25b82db5 Mon Sep 17 00:00:00 2001 From: Xavier Guimard Date: Mon, 16 Jan 2017 19:59:22 +0000 Subject: [PATCH] Rewrite WSDL (#595) --- .../{example => }/scripts/buildPortalWSDL | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) rename lemonldap-ng-portal/{example => }/scripts/buildPortalWSDL (96%) diff --git a/lemonldap-ng-portal/example/scripts/buildPortalWSDL b/lemonldap-ng-portal/scripts/buildPortalWSDL similarity index 96% rename from lemonldap-ng-portal/example/scripts/buildPortalWSDL rename to lemonldap-ng-portal/scripts/buildPortalWSDL index 239b9cb90..71c2a5426 100644 --- a/lemonldap-ng-portal/example/scripts/buildPortalWSDL +++ b/lemonldap-ng-portal/scripts/buildPortalWSDL @@ -1,27 +1,26 @@ #!/usr/bin/perl -use Lemonldap::NG::Portal::SharedConf; +use Lemonldap::NG::Portal::Main; -my $self = Lemonldap::NG::Portal::SharedConf->new( {} ); +my $self = Lemonldap::NG::Portal::Main->new( {} ); -unless ( $self->{Soap} ) { - print STDERR "Lemonldap::NG Portal SOAP capability is disabled.\n" - . "Set 'Soap' option to 1 in manager or lemonldap-ng.ini to enable it.\n"; +unless ( $self->conf->{soapConfigServer} or $self->conf->{soapSessionServer} ) { + print STDERR "Lemonldap::NG Portal SOAP capability is disabled.\n"; exit; } -my $portal = $self->{portal}; +my $portal = $self->conf->{portal}; $portal .= "index.pl" if ( $portal =~ /\/$/ ); -my @cookies = ( $self->{cookieName} ); -push @cookies, "$self->{cookieName}http" - if ( $self->{securedCookie} >= 2 ); +my @cookies = ( $self->conf->{cookieName} ); +push @cookies, "$self->conf->{cookieName}http" + if ( $self->conf->{securedCookie} >= 2 ); my $cookieList = join "\n", map { "" } @cookies; my $attrList = join "\n", map { "" } - $self->exportedAttr; + $self->conf->{exportedAttr}; print <