summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Bos <richard@radoeka.nl>2008-03-06 11:46:29 (GMT)
committerRichard Bos <richard@radoeka.nl>2008-03-06 11:46:29 (GMT)
commit9023984e5730055a2284deb01029c7fa8d3e51d0 (patch)
tree227dc5b887e7576ec61909b88d78f99012b780ad
parent603f7e20e226a852bd98aa6013bfa5a3868998d5 (diff)
downloadkolab-webadmin-9023984e5730055a2284deb01029c7fa8d3e51d0.tar.gz
Reflect the change in location of the file session_vars, it moved from a
possible read readonly location to @sysconfdir@/kolab.
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.am6
-rw-r--r--php/admin/include/ldap.class.php.in (renamed from php/admin/include/ldap.class.php)2
3 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index df88dc5..4daf6c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-06 Richard Bos <richard@radoeka.nl>
+
+ * kolab/issue2507
+ * php/admin/include/ldap.class.php: removed
+ * php/admin/include/ldap.class.php.in: added
+ * Makefile.am: reflect change in php/admin/include/ldap.class.php
+ filename
+
2008-03-04 Thomas Arendsen Hein <thomas@intevation.de>
* php/admin/include/menu.php: Reverted extra spaces after the main
diff --git a/Makefile.am b/Makefile.am
index cd99d11..5f778e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -393,6 +393,12 @@ php/admin/include/mysmarty.php: php/admin/include/mysmarty.php.in
CLEANFILES += php/admin/include/mysmarty.php
EXTRA_DIST += php/admin/include/mysmarty.php.in
+php/admin/include/ldap.class.php: php/admin/include/ldap.class.php.in
+ @$(mkinstalldirs) php/admin/include
+ $(do_subst) <$(srcdir)/php/admin/include/ldap.class.php.in >$@
+CLEANFILES += php/admin/include/ldap.class.php
+EXTRA_DIST += php/admin/include/ldap.class.php.in
+
php/admin/templates/page.tpl: php/admin/templates/page.tpl.in
@$(mkinstalldirs) php/admin/templates
$(do_subst) <$(srcdir)/php/admin/templates/page.tpl.in >$@
diff --git a/php/admin/include/ldap.class.php b/php/admin/include/ldap.class.php.in
index f710cd8..da125dd 100644
--- a/php/admin/include/ldap.class.php
+++ b/php/admin/include/ldap.class.php.in
@@ -19,7 +19,7 @@
*/
require_once('mysmarty.php');
-require_once('session_vars.php');
+require_once('@sysconfdir@/kolab/session_vars.php');
require_once('debug.php');
/* We dont have any better place to put this right now... */