[vhffs-dev] [1570] Using absolute path for requires

[subversion@xxxxxxxxxxxxx]

Revision: 1570
Author:   beuss
Date:     2010-03-22 13:04:59 +0100 (Mon, 22 Mar 2010)
Log Message:
-----------
Using absolute path for requires

Modified Paths:
--------------
    branches/vhffs-design/vhffs-api/src/Vhffs/Makefile.am
    branches/vhffs-design/vhffs-api/src/Vhffs/Panel.pm

Modified: branches/vhffs-design/vhffs-api/src/Vhffs/Makefile.am
===================================================================
--- branches/vhffs-design/vhffs-api/src/Vhffs/Makefile.am	2010-03-19 23:26:29 UTC (rev 1569)
+++ branches/vhffs-design/vhffs-api/src/Vhffs/Makefile.am	2010-03-22 12:04:59 UTC (rev 1570)
@@ -84,6 +84,7 @@
 do_sed = $(SED) --in-place \
 	-e 's,%PERL%,$(PERL),g' \
 	-e 's,'%VHFFS_LIB_DIR%',$(VHFFS_LIBDIR),g' \
+	-e 's,'%VHFFS_PANEL_DIR%',$(PANELDIR),g' \
 	-e 's,'%VHFFS_REVISION%",$(revision),g" \
 	-e 's,'%VHFFS_BOTS_DIR%',$(botsdir),g' \
 	-e 's,'%localedir%',$(localedir),g'

Modified: branches/vhffs-design/vhffs-api/src/Vhffs/Panel.pm
===================================================================
--- branches/vhffs-design/vhffs-api/src/Vhffs/Panel.pm	2010-03-19 23:26:29 UTC (rev 1569)
+++ branches/vhffs-design/vhffs-api/src/Vhffs/Panel.pm	2010-03-22 12:04:59 UTC (rev 1570)
@@ -397,7 +397,7 @@
         # We cannot use add_error since auth.pl instanciate a
         # Vhffs::Panel::Anonymous instance...
         $cgi->param('error', gettext('No cookie found, please accept the cookie and then please login again !') );
-        require 'auth.pl';
+        require '%VHFFS_PANEL_DIR%/auth.pl';
 		exit 0;
 	}
 
@@ -406,7 +406,7 @@
         $cgi->{_status} = '500 Internal server error';
         $cgi->delete_all();
         $cgi->param('error', gettext('Cannot create or fetch session file, please check that /tmp is readable and writeable') );
-        require 'auth.pl';
+        require '%VHFFS_PANEL_DIR%/auth.pl';
 		exit 0;
 	}
 
@@ -417,7 +417,7 @@
         $cgi->delete_all();
 		$cgi->param('error', gettext('Expired session ! Please login again') );
 		$session->delete();
-        require 'auth.pl';
+        require '%VHFFS_PANEL_DIR%/auth.pl';
 		exit 0;
 	}
 
@@ -427,7 +427,7 @@
         $cgi->delete_all();
         $cgi->param('error', gettext('User does not exist') );
 		$session->delete();
-        require 'auth.pl';
+        require '%VHFFS_PANEL_DIR%/auth.pl';
 		exit 0;
 	}
 
@@ -436,7 +436,7 @@
         $cgi->delete_all();
         $cgi->param('error', gettext('You\'re are not allowed to browse panel') );
 		$session->delete();
-        require 'auth.pl';
+        require '%VHFFS_PANEL_DIR%/auth.pl';
 		exit 0;
 	}