summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-09-13 08:22:28 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-09-13 08:22:28 (GMT)
commit9bc3127a73dc27a44b4da7df9ee67bc304e019a5 (patch)
tree62cad64b0bddf4e1430930f481702a11bb046725
parent4972ddc5a577aa1ec020531584218590f9c224c6 (diff)
downloadkolab-webadmin-9bc3127a73dc27a44b4da7df9ee67bc304e019a5.tar.gz
Started the process of removing the dist_conf based build process from kolab-webadmin. Two includes (auth.class.php and ldap.class.php) modified to use the configuration file.
-rw-r--r--Makefile.am18
-rw-r--r--php/admin/include/auth.class.php (renamed from php/admin/include/auth.class.php.in)2
-rw-r--r--php/admin/include/ldap.class.php (renamed from php/admin/include/ldap.class.php.in)1
3 files changed, 4 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am
index fb273b7..c25bd76 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -103,17 +103,17 @@ wsuser_DATA = $(WSUSER_FILES)
phpkolabdir = $(phplibdir2)/$(kolab_php_module_prefix)admin
PHP_INCLUDES = php/admin/include/menu.php \
+ php/admin/include/auth.class.php \
+ php/admin/include/authenticate.php \
php/admin/include/debug.php \
php/admin/include/form.class.php \
- php/admin/include/authenticate.php \
+ php/admin/include/ldap.class.php \
php/admin/include/locale.php \
php/admin/include/Sieve.php \
php/admin/include/passwd.php
phpincludesdir = $(phpkolabdir)/include
phpincludes_DATA = $(PHP_INCLUDES) \
- php/admin/include/auth.class.php \
- php/admin/include/ldap.class.php \
php/admin/include/headers.php \
php/admin/include/mysmarty.php
EXTRA_DIST += $(PHP_INCLUDES)
@@ -379,12 +379,6 @@ CLEANFILES += www/admin/user/vacation.php
EXTRA_DIST += www/admin/user/vacation.php.in
###
-php/admin/include/auth.class.php: php/admin/include/auth.class.php.in
- @$(mkinstalldirs) php/admin/include
- $(do_subst) <$(srcdir)/php/admin/include/auth.class.php.in >$@
-CLEANFILES += php/admin/include/auth.class.php
-EXTRA_DIST += php/admin/include/auth.class.php.in
-
php/admin/include/headers.php: php/admin/include/headers.php.in
@$(mkinstalldirs) php/admin/include
$(do_subst) <$(srcdir)/php/admin/include/headers.php.in >$@
@@ -397,12 +391,6 @@ 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/auth.class.php.in b/php/admin/include/auth.class.php
index 7ecfc1a..c245bfa 100644
--- a/php/admin/include/auth.class.php.in
+++ b/php/admin/include/auth.class.php
@@ -104,7 +104,7 @@ class KolabAuth {
session_destroy();
$this->error_string = false;
//$this->gotoLoginPage();
- Header("Location: @kolab_wui@/");
+ Header("Location: $this->params['kolab_wui']/");
}
function handleLogin() {
diff --git a/php/admin/include/ldap.class.php.in b/php/admin/include/ldap.class.php
index ef3568d..d2b735c 100644
--- a/php/admin/include/ldap.class.php.in
+++ b/php/admin/include/ldap.class.php
@@ -19,7 +19,6 @@
*/
require_once('mysmarty.php');
-require_once('@sysconfdir@/kolab/session_vars.php');
require_once('KolabAdmin/Ldap.php');
require_once('debug.php');