summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-09-13 12:30:56 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-09-13 12:30:56 (GMT)
commit42235552b8c245a9d5723909f719ff56c3c343ed (patch)
treebb7a47fca8a136447f17684724c226b214f63c66
parentc7f24760d5043330a97d682db412f9f3155ac6be (diff)
downloadkolab-webadmin-42235552b8c245a9d5723909f719ff56c3c343ed.tar.gz
Avoid the use of two include directories.
This is the major change in order to get rid of the dist_conf approach for the web admin: This moves all includes into the KolabAdmin/include directory. The top directory KolabAdmin needs to be in the include path. Should be a sane setup for all distributions.
-rw-r--r--Makefile.am187
-rw-r--r--lib/KolabAdmin/include/Sieve.php (renamed from php/admin/include/Sieve.php)0
-rw-r--r--lib/KolabAdmin/include/auth.class.php (renamed from php/admin/include/auth.class.php)0
-rw-r--r--lib/KolabAdmin/include/authenticate.php (renamed from php/admin/include/authenticate.php)0
-rw-r--r--lib/KolabAdmin/include/debug.php (renamed from php/admin/include/debug.php)0
-rw-r--r--lib/KolabAdmin/include/form.class.php (renamed from php/admin/include/form.class.php)0
-rw-r--r--lib/KolabAdmin/include/headers.php (renamed from php/admin/include/headers.php)0
-rw-r--r--lib/KolabAdmin/include/ldap.class.php (renamed from php/admin/include/ldap.class.php)0
-rw-r--r--lib/KolabAdmin/include/locale.php (renamed from php/admin/include/locale.php)0
-rw-r--r--lib/KolabAdmin/include/menu.php (renamed from php/admin/include/menu.php)0
-rw-r--r--lib/KolabAdmin/include/mysmarty.php (renamed from php/admin/include/mysmarty.php)0
-rw-r--r--lib/KolabAdmin/include/passwd.php (renamed from php/admin/include/passwd.php)0
-rw-r--r--www/admin/addressbook/addr.php (renamed from www/admin/addressbook/addr.php.in)12
-rw-r--r--www/admin/addressbook/index.php (renamed from www/admin/addressbook/index.php.in)12
-rw-r--r--www/admin/administrator/admin.php (renamed from www/admin/administrator/admin.php.in)14
-rw-r--r--www/admin/administrator/index.php (renamed from www/admin/administrator/index.php.in)10
-rw-r--r--www/admin/distributionlist/index.php (renamed from www/admin/distributionlist/index.php.in)10
-rw-r--r--www/admin/distributionlist/list.php (renamed from www/admin/distributionlist/list.php.in)12
-rw-r--r--www/admin/domainmaintainer/domainmaintainer.php (renamed from www/admin/domainmaintainer/domainmaintainer.php.in)14
-rw-r--r--www/admin/domainmaintainer/index.php (renamed from www/admin/domainmaintainer/index.php.in)10
-rw-r--r--www/admin/index.php (renamed from www/admin/index.php.in)10
-rw-r--r--www/admin/kolab/codefusion.php (renamed from www/admin/kolab/codefusion.php.in)10
-rw-r--r--www/admin/kolab/erfrakon.php (renamed from www/admin/kolab/erfrakon.php.in)10
-rw-r--r--www/admin/kolab/index.php (renamed from www/admin/kolab/index.php.in)10
-rw-r--r--www/admin/kolab/intevation.php (renamed from www/admin/kolab/intevation.php.in)10
-rw-r--r--www/admin/kolab/kdab.php (renamed from www/admin/kolab/kdab.php.in)10
-rw-r--r--www/admin/kolab/kde.php (renamed from www/admin/kolab/kde.php.in)10
-rw-r--r--www/admin/kolab/versions.php.in10
-rw-r--r--www/admin/maintainer/index.php (renamed from www/admin/maintainer/index.php.in)10
-rw-r--r--www/admin/maintainer/maintainer.php (renamed from www/admin/maintainer/maintainer.php.in)14
-rw-r--r--www/admin/settings/index.php (renamed from www/admin/settings/index.php.in)10
-rw-r--r--www/admin/sharedfolder/index.php (renamed from www/admin/sharedfolder/index.php.in)10
-rw-r--r--www/admin/sharedfolder/sf.php (renamed from www/admin/sharedfolder/sf.php.in)12
-rw-r--r--www/admin/user/deliver.php (renamed from www/admin/user/deliver.php.in)8
-rw-r--r--www/admin/user/forward.php (renamed from www/admin/user/forward.php.in)10
-rw-r--r--www/admin/user/index.php (renamed from www/admin/user/index.php.in)12
-rw-r--r--www/admin/user/user.php (renamed from www/admin/user/user.php.in)14
-rw-r--r--www/admin/user/vacation.php (renamed from www/admin/user/vacation.php.in)10
38 files changed, 168 insertions, 303 deletions
diff --git a/Makefile.am b/Makefile.am
index 6c619f9..cae24f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,24 +30,28 @@ wskolabdir = $(webserver_document_root)$(kolab_wui)
wskolab_DATA = $(WSKOLAB_FILES)
EXTRA_DIST += www/admin/style.css \
www/admin/print.css
+EXTRA_DIST += $(WSKOLAB_FILES)
WSADDRESSBOOK_FILES = www/admin/addressbook/addr.php \
www/admin/addressbook/index.php
wsaddressbookdir = $(wskolabdir)/addressbook
wsaddressbook_DATA = $(WSADDRESSBOOK_FILES)
+EXTRA_DIST += $(WSADDRESSBOOK_FILES)
WSADMINISTRATOR_FILES = www/admin/administrator/admin.php \
www/admin/administrator/index.php
wsadminstratordir = $(wskolabdir)/administrator
wsadminstrator_DATA = $(WSADMINISTRATOR_FILES)
+EXTRA_DIST += $(WSADMINISTRATOR_FILES)
WSDISTRIBUTIONLIST_FILES = www/admin/distributionlist/index.php \
www/admin/distributionlist/list.php
wsdistributionlistdir = $(wskolabdir)/distributionlist
wsdistributionlist_DATA = $(WSDISTRIBUTIONLIST_FILES)
+EXTRA_DIST += $(WSDISTRIBUTIONLIST_FILES)
WSABOUT_FILES = www/admin/kolab/erfrakon.php \
www/admin/kolab/index.php \
@@ -59,18 +63,21 @@ WSABOUT_FILES = www/admin/kolab/erfrakon.php \
wsaboutdir = $(wskolabdir)/kolab
wsabout_DATA = $(WSABOUT_FILES)
+EXTRA_DIST += $(WSABOUT_FILES)
WSMAINTAINER_FILES = www/admin/maintainer/maintainer.php \
www/admin/maintainer/index.php
wsmaintainerdir = $(wskolabdir)/maintainer
wsmaintainer_DATA = $(WSMAINTAINER_FILES)
+EXTRA_DIST += $(WSMAINTAINER_FILES)
WSDOMAINMAINTAINER_FILES = www/admin/domainmaintainer/domainmaintainer.php \
www/admin/domainmaintainer/index.php
wsdomainmaintainerdir = $(wskolabdir)/domainmaintainer
wsdomainmaintainer_DATA = $(WSDOMAINMAINTAINER_FILES)
+EXTRA_DIST += $(WSDOMAINMAINTAINER_FILES)
WSPICS_FILES = www/admin/pics/erfrakon.png \
www/admin/pics/codefusion.png \
@@ -84,12 +91,14 @@ dist_wspics_DATA = $(WSPICS_FILES)
wssettingsdir = $(wskolabdir)/settings
wssettings_DATA = www/admin/settings/index.php
+EXTRA_DIST += www/admin/settings/index.php
WSSHAREDFOLDER_FILES = www/admin/sharedfolder/sf.php \
www/admin/sharedfolder/index.php
wssharedfolderdir = $(wskolabdir)/sharedfolder
wssharedfolder_DATA = $(WSSHAREDFOLDER_FILES)
+EXTRA_DIST += $(WSSHAREDFOLDER_FILES)
WSUSER_FILES = www/admin/user/forward.php \
www/admin/user/index.php \
@@ -99,20 +108,26 @@ WSUSER_FILES = www/admin/user/forward.php \
wsuserdir = $(wskolabdir)/user
wsuser_DATA = $(WSUSER_FILES)
+EXTRA_DIST += $(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/headers.php \
- php/admin/include/ldap.class.php \
- php/admin/include/locale.php \
- php/admin/include/mysmarty.php \
- php/admin/include/Sieve.php \
- php/admin/include/passwd.php
+PHP_INCLUDES = lib/KolabAdmin/include/menu.php \
+ lib/KolabAdmin/include/auth.class.php \
+ lib/KolabAdmin/include/authenticate.php \
+ lib/KolabAdmin/include/debug.php \
+ lib/KolabAdmin/include/form.class.php \
+ lib/KolabAdmin/include/headers.php \
+ lib/KolabAdmin/include/ldap.class.php \
+ lib/KolabAdmin/include/locale.php \
+ lib/KolabAdmin/include/mysmarty.php \
+ lib/KolabAdmin/include/Sieve.php \
+ lib/KolabAdmin/include/passwd.php
+
+phpincludesdir = $(phplibdir)/KolabAdmin/include
+phpincludes_DATA = $(PHP_INCLUDES)
+EXTRA_DIST += $(PHP_INCLUDES)
+
PEARKA_FILES = lib/KolabAdmin/Ldap.php \
lib/KolabAdmin/Sieve.php
@@ -230,150 +245,6 @@ EXTRA_DIST += dist_conf/common \
dist_conf/mandriva \
dist_conf/suse
-www/admin/addressbook/addr.php: www/admin/addressbook/addr.php.in
- @$(mkinstalldirs) www/admin/addressbook
- $(do_subst) <$(srcdir)/www/admin/addressbook/addr.php.in >$@
-CLEANFILES += www/admin/addressbook/addr.php
-EXTRA_DIST += www/admin/addressbook/addr.php.in
-
-www/admin/addressbook/index.php: www/admin/addressbook/index.php.in
- @$(mkinstalldirs) www/admin/addressbook
- $(do_subst) <$(srcdir)/www/admin/addressbook/index.php.in >$@
-CLEANFILES += www/admin/addressbook/index.php
-EXTRA_DIST += www/admin/addressbook/index.php.in
-
-www/admin/administrator/admin.php: www/admin/administrator/admin.php.in
- @$(mkinstalldirs) www/admin/administrator
- $(do_subst) <$(srcdir)/www/admin/administrator/admin.php.in >$@
-CLEANFILES += www/admin/administrator/admin.php
-EXTRA_DIST += www/admin/administrator/admin.php.in
-
-www/admin/administrator/index.php: www/admin/administrator/index.php.in
- @$(mkinstalldirs) www/admin/administrator
- $(do_subst) <$(srcdir)/www/admin/administrator/index.php.in >$@
-CLEANFILES += www/admin/administrator/index.php
-EXTRA_DIST += www/admin/administrator/index.php.in
-
-www/admin/distributionlist/index.php: www/admin/distributionlist/index.php.in
- @$(mkinstalldirs) www/admin/distributionlist
- $(do_subst) <$(srcdir)/www/admin/distributionlist/index.php.in >$@
-CLEANFILES += www/admin/distributionlist/index.php
-EXTRA_DIST += www/admin/distributionlist/index.php.in
-
-www/admin/distributionlist/list.php: www/admin/distributionlist/list.php.in
- @$(mkinstalldirs) www/admin/distributionlist
- $(do_subst) <$(srcdir)/www/admin/distributionlist/list.php.in >$@
-CLEANFILES += www/admin/distributionlist/list.php
-EXTRA_DIST += www/admin/distributionlist/list.php.in
-
-www/admin/domainmaintainer/domainmaintainer.php: www/admin/domainmaintainer/domainmaintainer.php.in
- @$(mkinstalldirs) www/admin/domainmaintainer
- $(do_subst) <$(srcdir)/www/admin/domainmaintainer/domainmaintainer.php.in >$@
-CLEANFILES += www/admin/domainmaintainer/domainmaintainer.php
-EXTRA_DIST += www/admin/domainmaintainer/domainmaintainer.php.in
-
-www/admin/domainmaintainer/index.php: www/admin/domainmaintainer/index.php.in
- @$(mkinstalldirs) www/admin/domainmaintainer
- $(do_subst) <$(srcdir)/www/admin/domainmaintainer/index.php.in >$@
-CLEANFILES += www/admin/domainmaintainer/index.php
-EXTRA_DIST += www/admin/domainmaintainer/index.php.in
-
-www/admin/index.php: www/admin/index.php.in
- @$(mkinstalldirs) www/admin
- $(do_subst) <$(srcdir)/www/admin/index.php.in >$@
-CLEANFILES += www/admin/index.php
-EXTRA_DIST += www/admin/index.php.in
-
-www/admin/kolab/codefusion.php: www/admin/kolab/codefusion.php.in
- @$(mkinstalldirs) www/admin/kolab
- $(do_subst) <$(srcdir)/www/admin/kolab/codefusion.php.in >$@
-CLEANFILES += www/admin/kolab/codefusion.php
-EXTRA_DIST += www/admin/kolab/codefusion.php.in
-
-www/admin/kolab/erfrakon.php: www/admin/kolab/erfrakon.php.in
- @$(mkinstalldirs) www/admin/kolab
- $(do_subst) <$(srcdir)/www/admin/kolab/erfrakon.php.in >$@
-CLEANFILES += www/admin/kolab/erfrakon.php
-EXTRA_DIST += www/admin/kolab/erfrakon.php.in
-
-www/admin/kolab/index.php: www/admin/kolab/index.php.in
- @$(mkinstalldirs) www/admin/kolab
- $(do_subst) <$(srcdir)/www/admin/kolab/index.php.in >$@
-CLEANFILES += www/admin/kolab/index.php
-EXTRA_DIST += www/admin/kolab/index.php.in
-
-www/admin/kolab/intevation.php: www/admin/kolab/intevation.php.in
- @$(mkinstalldirs) www/admin/kolab
- $(do_subst) <$(srcdir)/www/admin/kolab/intevation.php.in >$@
-CLEANFILES += www/admin/kolab/intevation.php
-EXTRA_DIST += www/admin/kolab/intevation.php.in
-
-www/admin/kolab/kdab.php: www/admin/kolab/kdab.php.in
- @$(mkinstalldirs) www/admin/kolab
- $(do_subst) <$(srcdir)/www/admin/kolab/kdab.php.in >$@
-CLEANFILES += www/admin/kolab/kdab.php
-EXTRA_DIST += www/admin/kolab/kdab.php.in
-
-www/admin/kolab/kde.php: www/admin/kolab/kde.php.in
- @$(mkinstalldirs) www/admin/kolab
- $(do_subst) <$(srcdir)/www/admin/kolab/kde.php.in >$@
-CLEANFILES += www/admin/kolab/kde.php
-EXTRA_DIST += www/admin/kolab/kde.php.in
-
-www/admin/maintainer/index.php: www/admin/maintainer/index.php.in
- @$(mkinstalldirs) www/admin/maintainer
- $(do_subst) <$(srcdir)/www/admin/maintainer/index.php.in >$@
-CLEANFILES += www/admin/maintainer/index.php
-EXTRA_DIST += www/admin/maintainer/index.php.in
-
-www/admin/maintainer/maintainer.php: www/admin/maintainer/maintainer.php.in
- @$(mkinstalldirs) www/admin/maintainer
- $(do_subst) <$(srcdir)/www/admin/maintainer/maintainer.php.in >$@
-CLEANFILES += www/admin/maintainer/maintainer.php
-EXTRA_DIST += www/admin/maintainer/maintainer.php.in
-
-www/admin/settings/index.php: www/admin/settings/index.php.in
- @$(mkinstalldirs) www/admin/settings
- $(do_subst) <$(srcdir)/www/admin/settings/index.php.in >$@
-CLEANFILES += www/admin/settings/index.php
-EXTRA_DIST += www/admin/settings/index.php.in
-
-www/admin/sharedfolder/index.php: www/admin/sharedfolder/index.php.in
- @$(mkinstalldirs) www/admin/sharedfolder
- $(do_subst) <$(srcdir)/www/admin/sharedfolder/index.php.in >$@
-CLEANFILES += www/admin/sharedfolder/index.php
-EXTRA_DIST += www/admin/sharedfolder/index.php.in
-
-www/admin/sharedfolder/sf.php: www/admin/sharedfolder/sf.php.in
- @$(mkinstalldirs) www/admin/sharedfolder
- $(do_subst) <$(srcdir)/www/admin/sharedfolder/sf.php.in >$@
-CLEANFILES += www/admin/sharedfolder/sf.php
-EXTRA_DIST += www/admin/sharedfolder/sf.php.in
-
-www/admin/user/deliver.php: www/admin/user/deliver.php.in
- @$(mkinstalldirs) www/admin/user
- $(do_subst) <$(srcdir)/www/admin/user/deliver.php.in >$@
-CLEANFILES += www/admin/user/deliver.php
-EXTRA_DIST += www/admin/user/deliver.php.in
-
-www/admin/user/forward.php: www/admin/user/forward.php.in
- @$(mkinstalldirs) www/admin/user
- $(do_subst) <$(srcdir)/www/admin/user/forward.php.in >$@
-CLEANFILES += www/admin/user/forward.php
-EXTRA_DIST += www/admin/user/forward.php.in
-
-www/admin/user/index.php: www/admin/user/index.php.in
- @$(mkinstalldirs) www/admin/user
- $(do_subst) <$(srcdir)/www/admin/user/index.php.in >$@
-CLEANFILES += www/admin/user/index.php
-EXTRA_DIST += www/admin/user/index.php.in
-
-www/admin/user/vacation.php: www/admin/user/vacation.php.in
- @$(mkinstalldirs) www/admin/user
- $(do_subst) <$(srcdir)/www/admin/user/vacation.php.in >$@
-CLEANFILES += www/admin/user/vacation.php
-EXTRA_DIST += www/admin/user/vacation.php.in
-###
php/admin/templates/page.tpl: php/admin/templates/page.tpl.in
@$(mkinstalldirs) php/admin/templates
@@ -393,12 +264,6 @@ www/admin/logout.php: www/admin/logout.php.in
CLEANFILES += www/admin/logout.php
EXTRA_DIST += www/admin/logout.php.in
-www/admin/user/user.php: www/admin/user/user.php.in
- @$(mkinstalldirs) www/admin/user
- $(do_subst) <$(srcdir)/www/admin/user/user.php.in >$@
-CLEANFILES += www/admin/user/user.php
-EXTRA_DIST += www/admin/user/user.php.in
-
www/admin/kolab/versions.php: www/admin/kolab/versions.php.in
@$(mkinstalldirs) www/admin/kolab
$(do_subst) <$(srcdir)/www/admin/kolab/versions.php.in >$@
diff --git a/php/admin/include/Sieve.php b/lib/KolabAdmin/include/Sieve.php
index eec1c81..eec1c81 100644
--- a/php/admin/include/Sieve.php
+++ b/lib/KolabAdmin/include/Sieve.php
diff --git a/php/admin/include/auth.class.php b/lib/KolabAdmin/include/auth.class.php
index c245bfa..c245bfa 100644
--- a/php/admin/include/auth.class.php
+++ b/lib/KolabAdmin/include/auth.class.php
diff --git a/php/admin/include/authenticate.php b/lib/KolabAdmin/include/authenticate.php
index 5c5721e..5c5721e 100644
--- a/php/admin/include/authenticate.php
+++ b/lib/KolabAdmin/include/authenticate.php
diff --git a/php/admin/include/debug.php b/lib/KolabAdmin/include/debug.php
index 086307f..086307f 100644
--- a/php/admin/include/debug.php
+++ b/lib/KolabAdmin/include/debug.php
diff --git a/php/admin/include/form.class.php b/lib/KolabAdmin/include/form.class.php
index 7c75fd1..7c75fd1 100644
--- a/php/admin/include/form.class.php
+++ b/lib/KolabAdmin/include/form.class.php
diff --git a/php/admin/include/headers.php b/lib/KolabAdmin/include/headers.php
index 2ddb5bf..2ddb5bf 100644
--- a/php/admin/include/headers.php
+++ b/lib/KolabAdmin/include/headers.php
diff --git a/php/admin/include/ldap.class.php b/lib/KolabAdmin/include/ldap.class.php
index d2b735c..d2b735c 100644
--- a/php/admin/include/ldap.class.php
+++ b/lib/KolabAdmin/include/ldap.class.php
diff --git a/php/admin/include/locale.php b/lib/KolabAdmin/include/locale.php
index ce7e7fd..ce7e7fd 100644
--- a/php/admin/include/locale.php
+++ b/lib/KolabAdmin/include/locale.php
diff --git a/php/admin/include/menu.php b/lib/KolabAdmin/include/menu.php
index 6954c5b..6954c5b 100644
--- a/php/admin/include/menu.php
+++ b/lib/KolabAdmin/include/menu.php
diff --git a/php/admin/include/mysmarty.php b/lib/KolabAdmin/include/mysmarty.php
index 0e27fa5..0e27fa5 100644
--- a/php/admin/include/mysmarty.php
+++ b/lib/KolabAdmin/include/mysmarty.php
diff --git a/php/admin/include/passwd.php b/lib/KolabAdmin/include/passwd.php
index 97846f0..97846f0 100644
--- a/php/admin/include/passwd.php
+++ b/lib/KolabAdmin/include/passwd.php
diff --git a/www/admin/addressbook/addr.php.in b/www/admin/addressbook/addr.php
index bb70ecf..5dc580c 100644
--- a/www/admin/addressbook/addr.php.in
+++ b/www/admin/addressbook/addr.php
@@ -1,9 +1,9 @@
<?php
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
-require_once('@kolab_php_module_prefix@admin/include/form.class.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
+require_once('KolabAdmin/include/form.class.php');
/**** Authentication etc. ***/
@@ -17,7 +17,7 @@ if( $auth->group() != 'maintainer' && $auth->group() != 'admin') {
array_push($errors, _("Error: You don't have Permissions to access this Menu") );
}
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
function fill_form_for_modify( &$form, &$ldap_object ) {
if (is_array($ldap_object['sn'])) $lastname = $ldap_object['sn'][0];
diff --git a/www/admin/addressbook/index.php.in b/www/admin/addressbook/index.php
index 8c3e059..9ff597e 100644
--- a/www/admin/addressbook/index.php.in
+++ b/www/admin/addressbook/index.php
@@ -7,11 +7,11 @@
Read the file COPYING that comes with this packages for details.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
-require_once('@kolab_php_module_prefix@admin/include/form.class.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
+require_once('KolabAdmin/include/form.class.php');
$errors = array();
@@ -23,7 +23,7 @@ if( $auth->group() != 'maintainer' && $auth->group() != 'admin') {
array_push($errors, _("Error: You don't have Permissions to access this Menu"));
}
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
/**** Submenu for current page ***/
$menuitems[$sidx]['selected'] = 'selected';
diff --git a/www/admin/administrator/admin.php.in b/www/admin/administrator/admin.php
index d3b5bab..b23005b 100644
--- a/www/admin/administrator/admin.php.in
+++ b/www/admin/administrator/admin.php
@@ -18,12 +18,12 @@
* Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
-require_once('@kolab_php_module_prefix@admin/include/form.class.php');
-require_once('@kolab_php_module_prefix@admin/include/passwd.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
+require_once('KolabAdmin/include/form.class.php');
+require_once('KolabAdmin/include/passwd.php');
/**** Functions ***/
function comment( $s ) {
@@ -106,7 +106,7 @@ function fill_form_for_modify( &$form, &$ldap_object ) {
/**** Authentication etc. ***/
$sidx = 'administrator';
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
$menuitems[$sidx]['selected'] = 'selected';
/**** Logic ***/
diff --git a/www/admin/administrator/index.php.in b/www/admin/administrator/index.php
index 6f5ee6f..71819ef 100644
--- a/www/admin/administrator/index.php.in
+++ b/www/admin/administrator/index.php
@@ -18,10 +18,10 @@
* Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
$errors = array();
@@ -33,7 +33,7 @@ if( $auth->group() != 'admin' ) {
array_push($errors, _("Error: You don't have Permissions to access this Menu"));
}
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
/**** Submenu for current page ***/
$menuitems[$sidx]['selected'] = 'selected';
diff --git a/www/admin/distributionlist/index.php.in b/www/admin/distributionlist/index.php
index 73b5b92..adc50d9 100644
--- a/www/admin/distributionlist/index.php.in
+++ b/www/admin/distributionlist/index.php
@@ -20,10 +20,10 @@
* Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
$errors = array();
@@ -35,7 +35,7 @@ if( $group != 'maintainer' && $group != 'admin' && $group != 'domain-maintainer'
array_push($errors, _("Error: You don't have Permissions to access this Menu") );
}
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
/**** Submenu for current page ***/
$menuitems[$sidx]['selected'] = 'selected';
diff --git a/www/admin/distributionlist/list.php.in b/www/admin/distributionlist/list.php
index 2ba0398..e4dcbb6 100644
--- a/www/admin/distributionlist/list.php.in
+++ b/www/admin/distributionlist/list.php
@@ -18,11 +18,11 @@
* Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
-require_once('@kolab_php_module_prefix@admin/include/form.class.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
+require_once('KolabAdmin/include/form.class.php');
/**** Authentication etc. ***/
@@ -37,7 +37,7 @@ if( $group != 'maintainer' && $group != 'admin' && $group != 'domain-maintainer'
array_push($errors, _("Error: You don't have Permissions to access this Menu") );
}
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
function checkemaillist( $form, $key, $value ) {
global $ldap;
diff --git a/www/admin/domainmaintainer/domainmaintainer.php.in b/www/admin/domainmaintainer/domainmaintainer.php
index 35e6c0c..68a6d47 100644
--- a/www/admin/domainmaintainer/domainmaintainer.php.in
+++ b/www/admin/domainmaintainer/domainmaintainer.php
@@ -18,12 +18,12 @@
* Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
-require_once('@kolab_php_module_prefix@admin/include/form.class.php');
-require_once('@kolab_php_module_prefix@admin/include/passwd.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
+require_once('KolabAdmin/include/form.class.php');
+require_once('KolabAdmin/include/passwd.php');
/**** Functions ***/
function comment( $s ) {
@@ -81,7 +81,7 @@ function fill_form_for_modify( &$form, &$ldap_object ) {
/**** Authentication etc. ***/
$sidx = 'domain-maintainer';
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
$menuitems[$sidx]['selected'] = 'selected';
/**** Logic ***/
diff --git a/www/admin/domainmaintainer/index.php.in b/www/admin/domainmaintainer/index.php
index 0939321..9e3b597 100644
--- a/www/admin/domainmaintainer/index.php.in
+++ b/www/admin/domainmaintainer/index.php
@@ -18,10 +18,10 @@
* Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
$errors = array();
@@ -33,7 +33,7 @@ if( $auth->group() != 'admin' && $auth->group() != 'maintainer' ) {
array_push($errors, _("Error: You don't have Permissions to access this Menu"));
}
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
/**** Submenu for current page ***/
$menuitems[$sidx]['selected'] = 'selected';
diff --git a/www/admin/index.php.in b/www/admin/index.php
index 8515587..b1235d4 100644
--- a/www/admin/index.php.in
+++ b/www/admin/index.php
@@ -18,14 +18,14 @@
* Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
/**** Authentication etc. ***/
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
function exists_group( $group ) {
global $ldap;
diff --git a/www/admin/kolab/codefusion.php.in b/www/admin/kolab/codefusion.php
index 1ad64fe..b17e2b8 100644
--- a/www/admin/kolab/codefusion.php.in
+++ b/www/admin/kolab/codefusion.php
@@ -21,15 +21,15 @@
* Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
/**** Authentication etc. ***/
$sidx = 'about';
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
/**** Submenu for current page ***/
diff --git a/www/admin/kolab/erfrakon.php.in b/www/admin/kolab/erfrakon.php
index 5f0ec9e..bcbbd40 100644
--- a/www/admin/kolab/erfrakon.php.in
+++ b/www/admin/kolab/erfrakon.php
@@ -20,15 +20,15 @@
* Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
/**** Authentication etc. ***/
$sidx = 'about';
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
/**** Submenu for current page ***/
diff --git a/www/admin/kolab/index.php.in b/www/admin/kolab/index.php
index 5d8f0dc..9cfa392 100644
--- a/www/admin/kolab/index.php.in
+++ b/www/admin/kolab/index.php
@@ -7,15 +7,15 @@
Read the file COPYING that comes with this packages for details.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
/**** Authentication etc. ***/
$sidx = 'about';
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
/**** Submenu for current page ***/
diff --git a/www/admin/kolab/intevation.php.in b/www/admin/kolab/intevation.php
index c5ddd26..d5537c2 100644
--- a/www/admin/kolab/intevation.php.in
+++ b/www/admin/kolab/intevation.php
@@ -7,15 +7,15 @@
Read the file COPYING that comes with this packages for details.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
/**** Authentication etc. ***/
$sidx = 'about';
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
/**** Submenu for current page ***/
diff --git a/www/admin/kolab/kdab.php.in b/www/admin/kolab/kdab.php
index d739a65..c50f278 100644
--- a/www/admin/kolab/kdab.php.in
+++ b/www/admin/kolab/kdab.php
@@ -7,15 +7,15 @@
Read the file COPYING that comes with this packages for details.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
/**** Authentication etc. ***/
$sidx = 'about';
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
/**** Submenu for current page ***/
diff --git a/www/admin/kolab/kde.php.in b/www/admin/kolab/kde.php
index b8c74c1..40576ec 100644
--- a/www/admin/kolab/kde.php.in
+++ b/www/admin/kolab/kde.php
@@ -7,15 +7,15 @@
Read the file COPYING that comes with this packages for details.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
/**** Authentication etc. ***/
$sidx = 'about';
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
/**** Submenu for current page ***/
diff --git a/www/admin/kolab/versions.php.in b/www/admin/kolab/versions.php.in
index 94671b1..cc35f09 100644
--- a/www/admin/kolab/versions.php.in
+++ b/www/admin/kolab/versions.php.in
@@ -8,15 +8,15 @@
Read the file COPYING that comes with this packages for details.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
/**** Authentication etc. ***/
$sidx = 'about';
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
/**** Submenu for current page ***/
$menuitems[$sidx]['selected'] = 'selected';
diff --git a/www/admin/maintainer/index.php.in b/www/admin/maintainer/index.php
index 5334e92..aed4dbb 100644
--- a/www/admin/maintainer/index.php.in
+++ b/www/admin/maintainer/index.php
@@ -18,10 +18,10 @@
* Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
$errors = array();
@@ -33,7 +33,7 @@ if( $auth->group() != 'admin' ) {
array_push($errors, _("Error: You don't have Permissions to access this Menu"));
}
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
/**** Submenu for current page ***/
$menuitems[$sidx]['selected'] = 'selected';
diff --git a/www/admin/maintainer/maintainer.php.in b/www/admin/maintainer/maintainer.php
index 513040d..f4aada9 100644
--- a/www/admin/maintainer/maintainer.php.in
+++ b/www/admin/maintainer/maintainer.php
@@ -18,12 +18,12 @@
* Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
-require_once('@kolab_php_module_prefix@admin/include/form.class.php');
-require_once('@kolab_php_module_prefix@admin/include/passwd.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
+require_once('KolabAdmin/include/form.class.php');
+require_once('KolabAdmin/include/passwd.php');
/**** Functions ***/
function comment( $s ) {
@@ -103,7 +103,7 @@ function fill_form_for_modify( &$form, &$ldap_object ) {
/**** Authentication etc. ***/
$sidx = 'maintainer';
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
$menuitems[$sidx]['selected'] = 'selected';
/**** Logic ***/
diff --git a/www/admin/settings/index.php.in b/www/admin/settings/index.php
index 6dc5ba9..8a64429 100644
--- a/www/admin/settings/index.php.in
+++ b/www/admin/settings/index.php
@@ -1,8 +1,8 @@
<?php
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
$errors = array();
@@ -13,7 +13,7 @@ if( $auth->group() != 'admin') {
array_push($errors, _("Error: You don't have Permissions to access this Menu"));
}
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
/**** Submenu for current page ***/
$menuitems[$sidx]['selected'] = 'selected';
diff --git a/www/admin/sharedfolder/index.php.in b/www/admin/sharedfolder/index.php
index c8d105f..9e8db12 100644
--- a/www/admin/sharedfolder/index.php.in
+++ b/www/admin/sharedfolder/index.php
@@ -7,10 +7,10 @@
Read the file COPYING that comes with this packages for details.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
$errors = array();
@@ -22,7 +22,7 @@ if( $auth->group() != 'maintainer' && $auth->group() != 'admin' && $auth->group(
array_push($errors, _("Error: You don't have Permissions to access this Menu"));
}
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
/**** Submenu for current page ***/
$menuitems[$sidx]['selected'] = 'selected';
diff --git a/www/admin/sharedfolder/sf.php.in b/www/admin/sharedfolder/sf.php
index 79a6645..60b584c 100644
--- a/www/admin/sharedfolder/sf.php.in
+++ b/www/admin/sharedfolder/sf.php
@@ -7,11 +7,11 @@
* Read the file COPYING that comes with this packages for details.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
-require_once('@kolab_php_module_prefix@admin/include/form.class.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
+require_once('KolabAdmin/include/form.class.php');
/**** Authentication etc. ***/
$errors = array();
@@ -25,7 +25,7 @@ if( $group != 'maintainer' && $group != 'admin' && $group != 'domain-maintainer'
array_push($errors, _("Error: You don't have Permissions to access this Menu"));
}
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
function fill_form_for_modify( &$form, &$ldap_object ) {
if (is_array($ldap_object['cn'])) $cn = $ldap_object['cn'][0];
diff --git a/www/admin/user/deliver.php.in b/www/admin/user/deliver.php
index a883002..93f738c 100644
--- a/www/admin/user/deliver.php.in
+++ b/www/admin/user/deliver.php
@@ -18,9 +18,9 @@
* Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
*/
-require_once '@kolab_php_module_prefix@admin/include/mysmarty.php';
-require_once '@kolab_php_module_prefix@admin/include/headers.php';
-require_once '@kolab_php_module_prefix@admin/include/authenticate.php';
+require_once 'KolabAdmin/include/mysmarty.php';
+require_once 'KolabAdmin/include/headers.php';
+require_once 'KolabAdmin/include/authenticate.php';
require_once 'Net/Sieve.php';
require_once 'Horde/String.php';
require_once 'KolabAdmin/Sieve.php';
@@ -33,7 +33,7 @@ require_once 'KolabAdmin/Sieve/Segment/Vacation.php';
/**** Authentication etc. ***/
$sidx = 'user';
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
/**** Submenu for current page ***/
$menuitems[$sidx]['selected'] = 'selected';
diff --git a/www/admin/user/forward.php.in b/www/admin/user/forward.php
index 3dcce95..789ba44 100644
--- a/www/admin/user/forward.php.in
+++ b/www/admin/user/forward.php
@@ -18,10 +18,10 @@
* Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
*/
-require_once '@kolab_php_module_prefix@admin/include/mysmarty.php';
-require_once '@kolab_php_module_prefix@admin/include/headers.php';
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once '@kolab_php_module_prefix@admin/include/authenticate.php';
+require_once 'KolabAdmin/include/mysmarty.php';
+require_once 'KolabAdmin/include/headers.php';
+require_once('KolabAdmin/include/locale.php');
+require_once 'KolabAdmin/include/authenticate.php';
require_once 'Net/Sieve.php';
require_once 'Horde/String.php';
require_once 'KolabAdmin/Sieve.php';
@@ -34,7 +34,7 @@ require_once 'KolabAdmin/Sieve/Segment/Vacation.php';
/**** Authentication etc. ***/
$sidx = 'user';
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
/**** Submenu for current page ***/
$menuitems[$sidx]['selected'] = 'selected';
diff --git a/www/admin/user/index.php.in b/www/admin/user/index.php
index 7fe05af..51675ed 100644
--- a/www/admin/user/index.php.in
+++ b/www/admin/user/index.php
@@ -18,11 +18,11 @@
* Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
-require_once('@kolab_php_module_prefix@admin/include/form.class.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
+require_once('KolabAdmin/include/form.class.php');
$errors = array();
@@ -34,7 +34,7 @@ if( $auth->group() != 'maintainer' && $auth->group() != 'admin' && $auth->group(
array_push($errors, _("Error: You don't have Permissions to access this Menu"));
}
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
/**** Submenu for current page ***/
$menuitems[$sidx]['selected'] = 'selected';
diff --git a/www/admin/user/user.php.in b/www/admin/user/user.php
index eeace1d..7c00de3 100644
--- a/www/admin/user/user.php.in
+++ b/www/admin/user/user.php
@@ -6,12 +6,12 @@
Read the file COPYING that comes with this packages for details.
*/
-require_once('@kolab_php_module_prefix@admin/include/mysmarty.php');
-require_once('@kolab_php_module_prefix@admin/include/headers.php');
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once('@kolab_php_module_prefix@admin/include/authenticate.php');
-require_once('@kolab_php_module_prefix@admin/include/form.class.php');
-require_once('@kolab_php_module_prefix@admin/include/passwd.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
+require_once('KolabAdmin/include/form.class.php');
+require_once('KolabAdmin/include/passwd.php');
/**** Functions ***/
function comment( $s ) {
@@ -399,7 +399,7 @@ function fill_form_for_modify( &$form, $dn, &$ldap_object ) {
/**** Authentication etc. ***/
$sidx = 'user';
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
$menuitems[$sidx]['selected'] = 'selected';
/**** Logic ***/
diff --git a/www/admin/user/vacation.php.in b/www/admin/user/vacation.php
index 1c4d3cd..3076847 100644
--- a/www/admin/user/vacation.php.in
+++ b/www/admin/user/vacation.php
@@ -6,10 +6,10 @@
Read the file COPYING that comes with this packages for details.
*/
-require_once '@kolab_php_module_prefix@admin/include/mysmarty.php';
-require_once '@kolab_php_module_prefix@admin/include/headers.php';
-require_once('@kolab_php_module_prefix@admin/include/locale.php');
-require_once '@kolab_php_module_prefix@admin/include/authenticate.php';
+require_once 'KolabAdmin/include/mysmarty.php';
+require_once 'KolabAdmin/include/headers.php';
+require_once('KolabAdmin/include/locale.php');
+require_once 'KolabAdmin/include/authenticate.php';
require_once 'Net/Sieve.php';
require_once 'Horde/String.php';
require_once 'KolabAdmin/Sieve.php';
@@ -22,7 +22,7 @@ require_once 'KolabAdmin/Sieve/Segment/Vacation.php';
/**** Authentication etc. ***/
$sidx = 'user';
-require_once('@kolab_php_module_prefix@admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
/**** Submenu for current page ***/
$menuitems[$sidx]['selected'] = 'selected';