Commit b0749b88 authored by Clément OUDOT's avatar Clément OUDOT

Manager: main dir value get from {DOCUMENT_ROOT}

parent 34ed7515
......@@ -277,7 +277,6 @@ install_manager_site: install_conf_dir
done
@find ${RSESSIONSEXPLORERDIR} -type l -name images -delete
@cp -pR --remove-destination ${SRCMANAGERDIR}/example/index.pl ${RMANAGERDIR}
@$(PERL) -i -pe 's#__MANAGERDIR__#$(MANAGERDIR)#' ${RMANAGERDIR}/index.pl
@cp -pR --remove-destination ${SRCMANAGERDIR}/example/skins/* $(RMANAGERSKINSDIR)
@if [ "$(MANAGERDIR)/skins/" != "$(MANAGERSKINSDIR)/" ]; then \
for skin in $$(ls lemonldap-ng-manager/example/skins/); do \
......@@ -567,6 +566,8 @@ debian-diff:
@$(DIFF) lemonldap-ng-manager/lib/Lemonldap/NG/Manager /usr/share/perl5/Lemonldap/NG/Manager ||true
@$(DIFF) lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm /usr/share/perl5/Lemonldap/NG/Manager.pm ||true
@$(DIFF) lemonldap-ng-manager/example/images /usr/share/lemonldap-ng/sessions-explorer-imgs ||true
@$(DIFF) lemonldap-ng-manager/example/index.pl /var/lib/lemonldap-ng/manager/index.pl ||true
@$(DIFF) lemonldap-ng-manager/example/sessions.pl /var/lib/lemonldap-ng/manager/sessions.pl ||true
@for i in $(MANAGERSKINS); do \
$(DIFF) -x 'jquery*' lemonldap-ng-manager/example/skins/$$i /usr/share/lemonldap-ng/manager-skins/$$i; \
done ||true
......@@ -593,6 +594,6 @@ default-diff:
@$(DIFF) lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm /usr/local/share/perl/5.10.0/Lemonldap/NG/Manager.pm ||true
@$(DIFF) lemonldap-ng-manager/example/images $(LMPREFIX)/htdocs/manager/images ||true
@$(DIFF) lemonldap-ng-manager/example/skins $(LMPREFIX)/htdocs/manager/skins ||true
@$(DIFF) -I '$main_dir' lemonldap-ng-manager/example/index.pl $(LMPREFIX)/htdocs/manager/index.pl ||true
@$(DIFF) lemonldap-ng-manager/example/index.pl $(LMPREFIX)/htdocs/manager/index.pl ||true
@$(DIFF) lemonldap-ng-manager/example/sessions.pl $(LMPREFIX)/htdocs/manager/sessions.pl ||true
......@@ -3,8 +3,6 @@
use strict;
use Lemonldap::NG::Manager;
use HTML::Template;
our $skin_dir='skins';
our $main_dir='__MANAGERDIR__';
my $manager = new Lemonldap::NG::Manager(
{
......@@ -37,6 +35,8 @@ my $manager = new Lemonldap::NG::Manager(
) or Lemonldap::NG::Common::CGI->abort('Unable to start manager');
our $skin = $manager->{managerSkin};
our $skin_dir ='skins';
our $main_dir = $ENV{DOCUMENT_ROOT};
my $template = HTML::Template->new(
filename => "$main_dir/$skin_dir/$skin/manager.tpl",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment