summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--DEVELOPMENT70
-rw-r--r--Makefile.am439
-rwxr-xr-xbootstrap4
-rw-r--r--configure.ac59
-rw-r--r--data/locale/Makefile28
-rw-r--r--data/locale/de/LC_MESSAGES/messages.po (renamed from php/admin/locale/de/LC_MESSAGES/messages.po)0
-rw-r--r--data/locale/es/LC_MESSAGES/messages.po (renamed from php/admin/locale/es/LC_MESSAGES/messages.po)0
-rwxr-xr-xdata/locale/extract_messages (renamed from php/admin/locale/extract_messages)10
-rw-r--r--data/locale/fr/LC_MESSAGES/messages.po (renamed from php/admin/locale/fr/LC_MESSAGES/messages.po)0
-rw-r--r--data/locale/it/LC_MESSAGES/messages.po (renamed from php/admin/locale/it/LC_MESSAGES/messages.po)0
-rw-r--r--data/locale/nl/LC_MESSAGES/messages.po (renamed from php/admin/locale/nl/LC_MESSAGES/messages.po)0
-rwxr-xr-xdata/templates/addrdeleted.tpl (renamed from php/admin/templates/addrdeleted.tpl)0
-rwxr-xr-xdata/templates/addresslist.tpl (renamed from php/admin/templates/addresslist.tpl)0
-rwxr-xr-xdata/templates/addrlistall.tpl (renamed from php/admin/templates/addrlistall.tpl)0
-rwxr-xr-xdata/templates/admindeleted.tpl (renamed from php/admin/templates/admindeleted.tpl)0
-rwxr-xr-xdata/templates/adminlistall.tpl (renamed from php/admin/templates/adminlistall.tpl)0
-rwxr-xr-xdata/templates/codefusion.tpl (renamed from php/admin/templates/codefusion.tpl)0
-rw-r--r--data/templates/createuser.tpl (renamed from php/admin/templates/createuser.tpl)0
-rw-r--r--data/templates/deliver.tpl (renamed from php/admin/templates/deliver.tpl)0
-rwxr-xr-xdata/templates/distlistall.tpl (renamed from php/admin/templates/distlistall.tpl)0
-rw-r--r--data/templates/distlistdeleted.tpl (renamed from php/admin/templates/distlistdeleted.tpl)0
-rw-r--r--data/templates/domainmaintainerlistall.tpl (renamed from php/admin/templates/domainmaintainerlistall.tpl)0
-rwxr-xr-xdata/templates/erfrakon.tpl (renamed from php/admin/templates/erfrakon.tpl)0
-rwxr-xr-xdata/templates/formcontainer.tpl (renamed from php/admin/templates/formcontainer.tpl)0
-rwxr-xr-xdata/templates/forward.tpl (renamed from php/admin/templates/forward.tpl)0
-rwxr-xr-xdata/templates/intevation.tpl (renamed from php/admin/templates/intevation.tpl)0
-rwxr-xr-xdata/templates/kdab.tpl (renamed from php/admin/templates/kdab.tpl)0
-rwxr-xr-xdata/templates/kde.tpl (renamed from php/admin/templates/kde.tpl)0
-rwxr-xr-xdata/templates/kolab.tpl (renamed from php/admin/templates/kolab.tpl)0
-rwxr-xr-xdata/templates/login.tpl (renamed from php/admin/templates/login.tpl)0
-rwxr-xr-xdata/templates/maintainerdeleted.tpl (renamed from php/admin/templates/maintainerdeleted.tpl)0
-rwxr-xr-xdata/templates/maintainerlistall.tpl (renamed from php/admin/templates/maintainerlistall.tpl)0
-rwxr-xr-xdata/templates/page.tpl (renamed from php/admin/templates/page.tpl.in)4
-rwxr-xr-xdata/templates/settings.tpl (renamed from php/admin/templates/settings.tpl)0
-rw-r--r--data/templates/sfdeleted.tpl (renamed from php/admin/templates/sfdeleted.tpl)0
-rwxr-xr-xdata/templates/sflistall.tpl (renamed from php/admin/templates/sflistall.tpl)0
-rwxr-xr-xdata/templates/systemaliasnagscreen.tpl (renamed from php/admin/templates/systemaliasnagscreen.tpl)0
-rwxr-xr-xdata/templates/userdeleted.tpl (renamed from php/admin/templates/userdeleted.tpl)0
-rwxr-xr-xdata/templates/userlistall.tpl (renamed from php/admin/templates/userlistall.tpl)0
-rw-r--r--data/templates/userlisterror.tpl (renamed from php/admin/templates/userlisterror.tpl)0
-rwxr-xr-xdata/templates/vacation.tpl (renamed from php/admin/templates/vacation.tpl)0
-rwxr-xr-xdata/templates/versions.tpl (renamed from php/admin/templates/versions.tpl.in)10
-rwxr-xr-xdata/templates/welcome.tpl (renamed from php/admin/templates/welcome.tpl)0
-rw-r--r--kolab-webadmin.spec.in82
-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.in)2
-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.in)2
-rw-r--r--lib/KolabAdmin/include/ldap.class.php (renamed from php/admin/include/ldap.class.php.in)1
-rw-r--r--lib/KolabAdmin/include/locale.php (renamed from php/admin/include/locale.php)2
-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.in)18
-rw-r--r--lib/KolabAdmin/include/passwd.php (renamed from php/admin/include/passwd.php)0
-rw-r--r--package.xml342
-rw-r--r--www/admin/addressbook/addr.php (renamed from www/admin/addressbook/addr.php.in)14
-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 (renamed from www/admin/kolab/versions.php.in)26
-rw-r--r--www/admin/logout.php (renamed from www/admin/logout.php.in)14
-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
83 files changed, 620 insertions, 769 deletions
diff --git a/DEVELOPMENT b/DEVELOPMENT
new file mode 100644
index 0000000..1da3334
--- /dev/null
+++ b/DEVELOPMENT
@@ -0,0 +1,70 @@
+Development notes
+=================
+
+The kolab-webadmin package is a PHP based web application. Since no
+compilation is necessary it is sufficient to package the "freebusy"
+directory for a release.
+
+The Kolab Server packages were usually not released as source
+packages. This should be changed with this new package layout. The
+"dist" target will produce a kolab-webadmin-*.tar.gz package that can
+be distributed as source package. The same run will produce a
+kolab-webadmin-*.src.rpm package that is suited for installation on an
+OpenPKG system.
+
+Version numbering
+=================
+
+kolab-webadmin is a Kolab Server core package. Released packages should
+have the same core version as the Server release. As a part of Kolab
+Server 2.1.0 the version number should be 2.1.0.
+
+Released source packages will look like this:
+
+ kolab-webadmin-2.1.0.tar.gz
+
+Released source RPMs will look like this:
+
+ kolab-webadmin-2.1.0-20070813.src.rpm
+
+A NEW VERSION AND RELEASE NUMBER HAVE TO BE SET IN
+
+ kolab-webadmin.spec
+
+Once development picks up after a release, please set
+
+%define V_cvs 1
+
+in kolab-filter.spec.
+
+Source packages will then look like this:
+
+ kolab-webadmin-2.1.0.cvs-20070815.tar.gz
+
+Source RPMs will be named similar:
+
+ kolab-webadmin-2.1.0.cvs-20070815.src.rpm
+
+For tagging the next release the version number needs to be increased
+to the new Kolab Server version (e.g. 2.2.0) and the CVS variable needs
+to be reset to 0:
+
+%define V_cvs 0
+
+Change log
+==========
+
+The change log for the package is provided in
+"admin/docs/ChangeLog". Please keep this file up-to-date if you
+change the source code of this package.
+
+Depending on the editor it may be helpful to link
+admin/docs/ChangeLog to ChangeLog in the top level directory of this
+package.
+
+Contributors
+============
+
+The developers of this package are listed in
+"admin/docs/AUTHORS". Please keep this file up-to-date if you
+change the source code of this package.
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index fb273b7..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,439 +0,0 @@
-EXTRA_DIST =
-CLEANFILES =
-
-@distribution@
-@common@
-
-# With or Without openpkg (w_or_wo_openpkg) definition
-if OPENPKG
- w_or_wo_openpkg = sed -e 's/^@OPENPKG@//;/^@WITHOUT_OPENPKG@/d'
-else
- w_or_wo_openpkg = sed -e 's/^@WITHOUT_OPENPKG@//;/^@OPENPKG@/d'
-endif
-
-distclean-local:
- rm -rf $(srcdir)/autom4te*.cache
-
-noinst_HEADERS = @PACKAGE@.spec
-
-WSTOPLEVEL_FILES = www/favicon.png
-
-wstopleveldir = $(webserver_document_root)$(webserver_web_prefix)
-dist_wstoplevel_DATA = $(WSTOPLEVEL_FILES)
-
-WSKOLAB_FILES = www/admin/index.php \
- www/admin/logout.php \
- www/admin/print.css \
- www/admin/style.css
-
-wskolabdir = $(webserver_document_root)$(kolab_wui)
-wskolab_DATA = $(WSKOLAB_FILES)
-EXTRA_DIST += www/admin/style.css \
- www/admin/print.css
-
-WSADDRESSBOOK_FILES = www/admin/addressbook/addr.php \
- www/admin/addressbook/index.php
-
-wsaddressbookdir = $(wskolabdir)/addressbook
-wsaddressbook_DATA = $(WSADDRESSBOOK_FILES)
-
-WSADMINISTRATOR_FILES = www/admin/administrator/admin.php \
- www/admin/administrator/index.php
-
-wsadminstratordir = $(wskolabdir)/administrator
-wsadminstrator_DATA = $(WSADMINISTRATOR_FILES)
-
-WSDISTRIBUTIONLIST_FILES = www/admin/distributionlist/index.php \
- www/admin/distributionlist/list.php
-
-wsdistributionlistdir = $(wskolabdir)/distributionlist
-wsdistributionlist_DATA = $(WSDISTRIBUTIONLIST_FILES)
-
-WSABOUT_FILES = www/admin/kolab/erfrakon.php \
- www/admin/kolab/index.php \
- www/admin/kolab/intevation.php \
- www/admin/kolab/codefusion.php \
- www/admin/kolab/kdab.php \
- www/admin/kolab/kde.php \
- www/admin/kolab/versions.php
-
-wsaboutdir = $(wskolabdir)/kolab
-wsabout_DATA = $(WSABOUT_FILES)
-
-WSMAINTAINER_FILES = www/admin/maintainer/maintainer.php \
- www/admin/maintainer/index.php
-
-wsmaintainerdir = $(wskolabdir)/maintainer
-wsmaintainer_DATA = $(WSMAINTAINER_FILES)
-
-WSDOMAINMAINTAINER_FILES = www/admin/domainmaintainer/domainmaintainer.php \
- www/admin/domainmaintainer/index.php
-
-wsdomainmaintainerdir = $(wskolabdir)/domainmaintainer
-wsdomainmaintainer_DATA = $(WSDOMAINMAINTAINER_FILES)
-
-WSPICS_FILES = www/admin/pics/erfrakon.png \
- www/admin/pics/codefusion.png \
- www/admin/pics/intevation_logo.png \
- www/admin/pics/kdab.png \
- www/admin/pics/kde.png \
- www/admin/pics/kolab_logo.png
-
-wspicsdir = $(wskolabdir)/pics
-dist_wspics_DATA = $(WSPICS_FILES)
-
-wssettingsdir = $(wskolabdir)/settings
-wssettings_DATA = www/admin/settings/index.php
-
-WSSHAREDFOLDER_FILES = www/admin/sharedfolder/sf.php \
- www/admin/sharedfolder/index.php
-
-wssharedfolderdir = $(wskolabdir)/sharedfolder
-wssharedfolder_DATA = $(WSSHAREDFOLDER_FILES)
-
-WSUSER_FILES = www/admin/user/forward.php \
- www/admin/user/index.php \
- www/admin/user/user.php \
- www/admin/user/vacation.php \
- www/admin/user/deliver.php
-
-wsuserdir = $(wskolabdir)/user
-wsuser_DATA = $(WSUSER_FILES)
-
-phpkolabdir = $(phplibdir2)/$(kolab_php_module_prefix)admin
-
-PHP_INCLUDES = php/admin/include/menu.php \
- php/admin/include/debug.php \
- php/admin/include/form.class.php \
- php/admin/include/authenticate.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)
-
-PEARKA_FILES = lib/KolabAdmin/Ldap.php \
- lib/KolabAdmin/Sieve.php
-pearkadir = $(phplibdir)/KolabAdmin
-dist_pearka_DATA = $(PEARKA_FILES)
-
-PEARKA_SIEVE_FILES = lib/KolabAdmin/Sieve/Script.php \
- lib/KolabAdmin/Sieve/Segment.php
-pearkasievedir = $(phplibdir)/KolabAdmin/Sieve
-dist_pearkasieve_DATA = $(PEARKA_SIEVE_FILES)
-
-PEARKA_SIEVE_SEGMENT_FILES = lib/KolabAdmin/Sieve/Segment/Delivery.php \
- lib/KolabAdmin/Sieve/Segment/Forward.php \
- lib/KolabAdmin/Sieve/Segment/Vacation.php
-pearkasievesegmentdir = $(phplibdir)/KolabAdmin/Sieve/Segment
-dist_pearkasievesegment_DATA = $(PEARKA_SIEVE_SEGMENT_FILES)
-
-PHP_TEMPLATES = php/admin/templates/maintainerdeleted.tpl \
- php/admin/templates/kde.tpl \
- php/admin/templates/addrdeleted.tpl \
- php/admin/templates/userdeleted.tpl \
- php/admin/templates/sfdeleted.tpl \
- php/admin/templates/distlistdeleted.tpl \
- php/admin/templates/addresslist.tpl \
- php/admin/templates/sflistall.tpl \
- php/admin/templates/erfrakon.tpl \
- php/admin/templates/codefusion.tpl \
- php/admin/templates/adminlistall.tpl \
- php/admin/templates/login.tpl \
- php/admin/templates/maintainerlistall.tpl \
- php/admin/templates/domainmaintainerlistall.tpl \
- php/admin/templates/kolab.tpl \
- php/admin/templates/addrlistall.tpl \
- php/admin/templates/forward.tpl \
- php/admin/templates/deliver.tpl \
- php/admin/templates/distlistall.tpl \
- php/admin/templates/kdab.tpl \
- php/admin/templates/userlistall.tpl \
- php/admin/templates/userlisterror.tpl \
- php/admin/templates/settings.tpl \
- php/admin/templates/welcome.tpl \
- php/admin/templates/systemaliasnagscreen.tpl \
- php/admin/templates/intevation.tpl \
- php/admin/templates/vacation.tpl \
- php/admin/templates/createuser.tpl \
- php/admin/templates/formcontainer.tpl \
- php/admin/templates/admindeleted.tpl
-
-phptemplatesdir = $(phpkolabdir)/templates
-phptemplates_DATA = $(PHP_TEMPLATES) \
- php/admin/templates/page.tpl \
- php/admin/templates/versions.tpl
-EXTRA_DIST += $(PHP_TEMPLATES)
-
-
-### i18n stuff
-# gettextize didn't make much sense for a php project
-# so we install the .mo files "manually"
-# PENDING(steffen): Improve this
-
-MSGFMT=msgfmt
-
-.po.mo: $<
-# Without $(mkinstalldirs) `echo ... | sed ...` a 'make distcheck' would
-# fail as the target directory (e.g. php/admin/locale/de/LC_MESSAGES)
-# does not yes exist at build time. Use the `echo ... | sed ...` construction
-# as something smarter, like basename, results in configure to complain
-# about not portable filenames.
- @$(mkinstalldirs) `echo "$@" | sed 's|messages\.mo||'`
- $(MSGFMT) -o $@ $<
-
-CLEANFILES += php/admin/locale/*/LC_MESSAGES/messages.mo
-
-
-PHP_LOCALE_DE_PO = php/admin/locale/de/LC_MESSAGES/messages.po
-PHP_LOCALE_DE_MO = php/admin/locale/de/LC_MESSAGES/messages.mo
-PHP_LOCALE_FR_PO = php/admin/locale/fr/LC_MESSAGES/messages.po
-PHP_LOCALE_FR_MO = php/admin/locale/fr/LC_MESSAGES/messages.mo
-PHP_LOCALE_NL_PO = php/admin/locale/nl/LC_MESSAGES/messages.po
-PHP_LOCALE_NL_MO = php/admin/locale/nl/LC_MESSAGES/messages.mo
-PHP_LOCALE_IT_PO = php/admin/locale/it/LC_MESSAGES/messages.po
-PHP_LOCALE_IT_MO = php/admin/locale/it/LC_MESSAGES/messages.mo
-PHP_LOCALE_ES_PO = php/admin/locale/es/LC_MESSAGES/messages.po
-PHP_LOCALE_ES_MO = php/admin/locale/es/LC_MESSAGES/messages.mo
-
-localedir = $(phpkolabdir)/locale
-
-phplocalededir = $(localedir)/de/LC_MESSAGES
-phplocalefrdir = $(localedir)/fr/LC_MESSAGES
-phplocalenldir = $(localedir)/nl/LC_MESSAGES
-phplocaleitdir = $(localedir)/it/LC_MESSAGES
-phplocaleesdir = $(localedir)/es/LC_MESSAGES
-
-phplocalede_DATA = $(PHP_LOCALE_DE_MO)
-phplocalefr_DATA = $(PHP_LOCALE_FR_MO)
-phplocalenl_DATA = $(PHP_LOCALE_NL_MO)
-phplocaleit_DATA = $(PHP_LOCALE_IT_MO)
-phplocalees_DATA = $(PHP_LOCALE_ES_MO)
-
-EXTRA_DIST += $(PHP_LOCALE_DE_PO) \
- $(PHP_LOCALE_FR_PO) \
- $(PHP_LOCALE_NL_PO) \
- $(PHP_LOCALE_IT_PO) \
- $(PHP_LOCALE_ES_PO)
-
-kwadocdir = $(pkgdocdir)/@PACKAGE@
-dist_kwadoc_DATA = ChangeLog \
- COPYING \
- NEWS \
- AUTHORS
-
-EXTRA_DIST += dist_conf/common \
- dist_conf/debian \
- dist_conf/kolab \
- 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/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 >$@
-CLEANFILES += php/admin/include/headers.php
-EXTRA_DIST += php/admin/include/headers.php.in
-
-php/admin/include/mysmarty.php: php/admin/include/mysmarty.php.in
- @$(mkinstalldirs) php/admin/include
- $(do_subst) <$(srcdir)/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 >$@
-CLEANFILES += php/admin/templates/page.tpl
-EXTRA_DIST += php/admin/templates/page.tpl.in
-
-php/admin/templates/versions.tpl: php/admin/templates/versions.tpl.in
- @$(mkinstalldirs) php/admin/templates
- $(w_or_wo_openpkg) <$(srcdir)/php/admin/templates/versions.tpl.in >$@
-CLEANFILES += php/admin/templates/versions.tpl
-EXTRA_DIST += php/admin/templates/versions.tpl.in
-
-www/admin/logout.php: www/admin/logout.php.in
- @$(mkinstalldirs) www/admin
- $(do_subst) <$(srcdir)/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 >$@
-CLEANFILES += www/admin/kolab/versions.php
-EXTRA_DIST += www/admin/kolab/versions.php.in
-
-
-install-data-hook:
- $(mkinstalldirs) $(DESTDIR)$(smarty_compiledir)
-# test -z "$(webserver_usr)" || chown $(webserver_usr) $(DESTDIR)$(phpkolabdir)/templates_c
diff --git a/bootstrap b/bootstrap
deleted file mode 100755
index 868a459..0000000
--- a/bootstrap
+++ /dev/null
@@ -1,4 +0,0 @@
-cp -pr ../../kolabd/kolabd/dist_conf .
-touch README
-autoreconf -f -i
-
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index c13d067..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,59 +0,0 @@
-AC_PREREQ(2.57)
-
-m4_define(_VERSION,2.2.3)
-AC_INIT([kolab-webadmin],[_VERSION],[kolab-devel@kolab.org])
-AC_CONFIG_AUX_DIR(.)
-
-AM_INIT_AUTOMAKE([gnu] [1.7] [dist-bzip2] [no-dist-gzip])
-AC_PREFIX_DEFAULT([/usr])
-
-AC_ARG_WITH([dist],
- [AC_HELP_STRING([--with-dist=DIST],
- [distribution target (default: openpkg)])],
- [distribution=$srcdir/dist_conf/$withval],
- [distribution=$srcdir/dist_conf/kolab])
-
-AS_IF([test -f $distribution],,
- AC_MSG_ERROR([incorrect value for --with-dist: $withval])
-)
-AC_SUBST_FILE(distribution)
-
-common=dist_conf/common
-AC_SUBST_FILE(common)
-
-AC_ARG_WITH([openpkg],
- [AC_HELP_STRING([--with-openpkg],
- [Special Files for the openpkg platform])],
- [case "${withval}" in
- yes) openpkg=true ;;
- no) openpkg=false ;;
- *) AC_MSG_ERROR(bad value ${withval} for --with-openpkg) ;;
- esac],[openpkg=true])
-AM_CONDITIONAL(OPENPKG, test x$openpkg = xtrue)
-
-if test "x$openpkg" = "xtrue"; then
- WITHOPENPKG=yes
-else
- WITHOPENPKG=no
-fi
-AC_SUBST(WITHOPENPKG)
-
-# Checks for libraries.
-
-# Checks for header files.
-
-# Checks for typedefs, structures, and compiler characteristics.
-
-# Checks for library functions.
-
-# Build date for spec file
-spec_build_date=`date '+%Y%m%d'`
-AC_SUBST(spec_build_date)
-
-AC_CONFIG_FILES([
-Makefile
-kolab-webadmin.spec
-])
-
-AC_OUTPUT
-
diff --git a/data/locale/Makefile b/data/locale/Makefile
new file mode 100644
index 0000000..b1821e4
--- /dev/null
+++ b/data/locale/Makefile
@@ -0,0 +1,28 @@
+MSGFMT=msgfmt
+
+CLEANFILES = */LC_MESSAGES/messages.mo
+
+PHP_LOCALE_DE_PO = de/LC_MESSAGES/messages.po
+PHP_LOCALE_DE_MO = de/LC_MESSAGES/messages.mo
+PHP_LOCALE_FR_PO = fr/LC_MESSAGES/messages.po
+PHP_LOCALE_FR_MO = fr/LC_MESSAGES/messages.mo
+PHP_LOCALE_NL_PO = nl/LC_MESSAGES/messages.po
+PHP_LOCALE_NL_MO = nl/LC_MESSAGES/messages.mo
+PHP_LOCALE_IT_PO = it/LC_MESSAGES/messages.po
+PHP_LOCALE_IT_MO = it/LC_MESSAGES/messages.mo
+PHP_LOCALE_ES_PO = es/LC_MESSAGES/messages.po
+PHP_LOCALE_ES_MO = es/LC_MESSAGES/messages.mo
+
+MO = $(PHP_LOCALE_DE_MO) \
+ $(PHP_LOCALE_FR_MO) \
+ $(PHP_LOCALE_NL_MO) \
+ $(PHP_LOCALE_IT_MO) \
+ $(PHP_LOCALE_ES_MO) \
+
+all: $(MO)
+
+$(MO):
+ $(MSGFMT) -o $@ $(@:%.mo=%.po)
+
+clean:
+ rm $(CLEANFILES)
diff --git a/php/admin/locale/de/LC_MESSAGES/messages.po b/data/locale/de/LC_MESSAGES/messages.po
index 64bf511..64bf511 100644
--- a/php/admin/locale/de/LC_MESSAGES/messages.po
+++ b/data/locale/de/LC_MESSAGES/messages.po
diff --git a/php/admin/locale/es/LC_MESSAGES/messages.po b/data/locale/es/LC_MESSAGES/messages.po
index 7f5aa3f..7f5aa3f 100644
--- a/php/admin/locale/es/LC_MESSAGES/messages.po
+++ b/data/locale/es/LC_MESSAGES/messages.po
diff --git a/php/admin/locale/extract_messages b/data/locale/extract_messages
index 7ca5dfb..a56bf29 100755
--- a/php/admin/locale/extract_messages
+++ b/data/locale/extract_messages
@@ -29,8 +29,8 @@ if($ARGV[0] eq "update" || $ARGV[0] eq "create") {
#print "languages : " . join(" ", @languages) . "\n";
$templatesDir = "../templates";
-$phpDir = "../../../www/admin";
-$includeDir = "../include";
+$phpDir = "../../www/admin";
+$includeDir = "../../lib/KolabAdmin/include";
#
# Extract messages from the templates
@@ -45,7 +45,7 @@ if ( $^V ge v5.8.0 ) {
print OUTFILE "<?php\n";
-@tplFiles = `find $templatesDir -name "*.tpl" -o -name "*.tpl.in" 2> /dev/null`;
+@tplFiles = `find $templatesDir -name "*.tpl" 2> /dev/null`;
foreach $tpl (@tplFiles)
{
@@ -75,9 +75,9 @@ close(OUTFILE);
#
# Get all the php files recursively in www/admin and in the includes
#
-@phpFiles = `find $phpDir -name "*.php" -o -name "*.php.in" 2> /dev/null`;
+@phpFiles = `find $phpDir -name "*.php" 2> /dev/null`;
foreach (@phpFiles) { chomp; }
-@includeFiles = `find $includeDir -name "*.php" -o -name "*.php.in" 2> /dev/null`;
+@includeFiles = `find $includeDir -name "*.php" 2> /dev/null`;
foreach (@includeFiles) { chomp; }
#print join(" ", @phpFiles);
#print join(" ", @includeFiles);
diff --git a/php/admin/locale/fr/LC_MESSAGES/messages.po b/data/locale/fr/LC_MESSAGES/messages.po
index d3a7d34..d3a7d34 100644
--- a/php/admin/locale/fr/LC_MESSAGES/messages.po
+++ b/data/locale/fr/LC_MESSAGES/messages.po
diff --git a/php/admin/locale/it/LC_MESSAGES/messages.po b/data/locale/it/LC_MESSAGES/messages.po
index 13c2c81..13c2c81 100644
--- a/php/admin/locale/it/LC_MESSAGES/messages.po
+++ b/data/locale/it/LC_MESSAGES/messages.po
diff --git a/php/admin/locale/nl/LC_MESSAGES/messages.po b/data/locale/nl/LC_MESSAGES/messages.po
index 9a0e475..9a0e475 100644
--- a/php/admin/locale/nl/LC_MESSAGES/messages.po
+++ b/data/locale/nl/LC_MESSAGES/messages.po
diff --git a/php/admin/templates/addrdeleted.tpl b/data/templates/addrdeleted.tpl
index 84a7806..84a7806 100755
--- a/php/admin/templates/addrdeleted.tpl
+++ b/data/templates/addrdeleted.tpl
diff --git a/php/admin/templates/addresslist.tpl b/data/templates/addresslist.tpl
index 4bf6904..4bf6904 100755
--- a/php/admin/templates/addresslist.tpl
+++ b/data/templates/addresslist.tpl
diff --git a/php/admin/templates/addrlistall.tpl b/data/templates/addrlistall.tpl
index 3b8717e..3b8717e 100755
--- a/php/admin/templates/addrlistall.tpl
+++ b/data/templates/addrlistall.tpl
diff --git a/php/admin/templates/admindeleted.tpl b/data/templates/admindeleted.tpl
index 31bb532..31bb532 100755
--- a/php/admin/templates/admindeleted.tpl
+++ b/data/templates/admindeleted.tpl
diff --git a/php/admin/templates/adminlistall.tpl b/data/templates/adminlistall.tpl
index 232120f..232120f 100755
--- a/php/admin/templates/adminlistall.tpl
+++ b/data/templates/adminlistall.tpl
diff --git a/php/admin/templates/codefusion.tpl b/data/templates/codefusion.tpl
index 1513511..1513511 100755
--- a/php/admin/templates/codefusion.tpl
+++ b/data/templates/codefusion.tpl
diff --git a/php/admin/templates/createuser.tpl b/data/templates/createuser.tpl
index 0433351..0433351 100644
--- a/php/admin/templates/createuser.tpl
+++ b/data/templates/createuser.tpl
diff --git a/php/admin/templates/deliver.tpl b/data/templates/deliver.tpl
index bb9155f..bb9155f 100644
--- a/php/admin/templates/deliver.tpl
+++ b/data/templates/deliver.tpl
diff --git a/php/admin/templates/distlistall.tpl b/data/templates/distlistall.tpl
index 9fad827..9fad827 100755
--- a/php/admin/templates/distlistall.tpl
+++ b/data/templates/distlistall.tpl
diff --git a/php/admin/templates/distlistdeleted.tpl b/data/templates/distlistdeleted.tpl
index 2f78033..2f78033 100644
--- a/php/admin/templates/distlistdeleted.tpl
+++ b/data/templates/distlistdeleted.tpl
diff --git a/php/admin/templates/domainmaintainerlistall.tpl b/data/templates/domainmaintainerlistall.tpl
index fb39a28..fb39a28 100644
--- a/php/admin/templates/domainmaintainerlistall.tpl
+++ b/data/templates/domainmaintainerlistall.tpl
diff --git a/php/admin/templates/erfrakon.tpl b/data/templates/erfrakon.tpl
index 3f3a432..3f3a432 100755
--- a/php/admin/templates/erfrakon.tpl
+++ b/data/templates/erfrakon.tpl
diff --git a/php/admin/templates/formcontainer.tpl b/data/templates/formcontainer.tpl
index cde0961..cde0961 100755
--- a/php/admin/templates/formcontainer.tpl
+++ b/data/templates/formcontainer.tpl
diff --git a/php/admin/templates/forward.tpl b/data/templates/forward.tpl
index 458e093..458e093 100755
--- a/php/admin/templates/forward.tpl
+++ b/data/templates/forward.tpl
diff --git a/php/admin/templates/intevation.tpl b/data/templates/intevation.tpl
index 7e0cefc..7e0cefc 100755
--- a/php/admin/templates/intevation.tpl
+++ b/data/templates/intevation.tpl
diff --git a/php/admin/templates/kdab.tpl b/data/templates/kdab.tpl
index 2fd745c..2fd745c 100755
--- a/php/admin/templates/kdab.tpl
+++ b/data/templates/kdab.tpl
diff --git a/php/admin/templates/kde.tpl b/data/templates/kde.tpl
index 94deaff..94deaff 100755
--- a/php/admin/templates/kde.tpl
+++ b/data/templates/kde.tpl
diff --git a/php/admin/templates/kolab.tpl b/data/templates/kolab.tpl
index d43db6c..d43db6c 100755
--- a/php/admin/templates/kolab.tpl
+++ b/data/templates/kolab.tpl
diff --git a/php/admin/templates/login.tpl b/data/templates/login.tpl
index 3c36775..3c36775 100755
--- a/php/admin/templates/login.tpl
+++ b/data/templates/login.tpl
diff --git a/php/admin/templates/maintainerdeleted.tpl b/data/templates/maintainerdeleted.tpl
index 4f1b312..4f1b312 100755
--- a/php/admin/templates/maintainerdeleted.tpl
+++ b/data/templates/maintainerdeleted.tpl
diff --git a/php/admin/templates/maintainerlistall.tpl b/data/templates/maintainerlistall.tpl
index 2c6a3ad..2c6a3ad 100755
--- a/php/admin/templates/maintainerlistall.tpl
+++ b/data/templates/maintainerlistall.tpl
diff --git a/php/admin/templates/page.tpl.in b/data/templates/page.tpl
index b0128b6..4b71979 100755
--- a/php/admin/templates/page.tpl.in
+++ b/data/templates/page.tpl
@@ -9,7 +9,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<title>{$page_title}</title>
-<link rel="shortcut icon" type="image/png" href="@webserver_web_prefix@/favicon.png" />
+<link rel="shortcut icon" type="image/png" href="{$webserver_web_prefix}/favicon.png" />
<meta name="robots" content="noindex" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<meta http-equiv="Content-Language" content="{$currentlang}" />
@@ -30,7 +30,7 @@ function changeLanguage(combobox) {ldelim}
</head>
<body>
<div id="topbar">
- <a href="@kolab_wui@"><span id="toplogo"></span></a>
+ <a href="{$kolab_wui}"><span id="toplogo"></span></a>
<div id="toptitle">{$page_title}</div>
</div>
<div id="topuserinfo">
diff --git a/php/admin/templates/settings.tpl b/data/templates/settings.tpl
index 6d1dfcc..6d1dfcc 100755
--- a/php/admin/templates/settings.tpl
+++ b/data/templates/settings.tpl
diff --git a/php/admin/templates/sfdeleted.tpl b/data/templates/sfdeleted.tpl
index 03fa3ea..03fa3ea 100644
--- a/php/admin/templates/sfdeleted.tpl
+++ b/data/templates/sfdeleted.tpl
diff --git a/php/admin/templates/sflistall.tpl b/data/templates/sflistall.tpl
index 3958e18..3958e18 100755
--- a/php/admin/templates/sflistall.tpl
+++ b/data/templates/sflistall.tpl
diff --git a/php/admin/templates/systemaliasnagscreen.tpl b/data/templates/systemaliasnagscreen.tpl
index 5beb354..5beb354 100755
--- a/php/admin/templates/systemaliasnagscreen.tpl
+++ b/data/templates/systemaliasnagscreen.tpl
diff --git a/php/admin/templates/userdeleted.tpl b/data/templates/userdeleted.tpl
index 33977b3..33977b3 100755
--- a/php/admin/templates/userdeleted.tpl
+++ b/data/templates/userdeleted.tpl
diff --git a/php/admin/templates/userlistall.tpl b/data/templates/userlistall.tpl
index bca3843..bca3843 100755
--- a/php/admin/templates/userlistall.tpl
+++ b/data/templates/userlistall.tpl
diff --git a/php/admin/templates/userlisterror.tpl b/data/templates/userlisterror.tpl
index a1914ec..a1914ec 100644
--- a/php/admin/templates/userlisterror.tpl
+++ b/data/templates/userlisterror.tpl
diff --git a/php/admin/templates/vacation.tpl b/data/templates/vacation.tpl
index 01fe63c..01fe63c 100755
--- a/php/admin/templates/vacation.tpl
+++ b/data/templates/vacation.tpl
diff --git a/php/admin/templates/versions.tpl.in b/data/templates/versions.tpl
index 51081b2..aa1385f 100755
--- a/php/admin/templates/versions.tpl.in
+++ b/data/templates/versions.tpl
@@ -11,8 +11,10 @@
<pre>{$kolabversions}</pre>
<h1>{tr msg="PEAR/Horde Versions"}</h1>
<pre>{$pearhordeversions}</pre>
-@OPENPKG@<h1>{tr msg="Kolab2 Patched OpenPKG Package Versions"}</h1>
-@OPENPKG@<pre>{$kolabpatchedversions}</pre>
-@OPENPKG@<h1>{tr msg="OpenPKG Version"}</h1>
-@OPENPKG@<pre>{$openpkgversion}</pre>
+{if $OPENPKG=="yes"}
+<h1>{tr msg="Kolab2 Patched OpenPKG Package Versions"}</h1>
+<pre>{$kolabpatchedversions}</pre>
+<h1>{tr msg="OpenPKG Version"}</h1>
+<pre>{$openpkgversion}</pre>
+{/if}
</div>
diff --git a/php/admin/templates/welcome.tpl b/data/templates/welcome.tpl
index 4b8fb5a..4b8fb5a 100755
--- a/php/admin/templates/welcome.tpl
+++ b/data/templates/welcome.tpl
diff --git a/kolab-webadmin.spec.in b/kolab-webadmin.spec.in
deleted file mode 100644
index 027b625..0000000
--- a/kolab-webadmin.spec.in
+++ /dev/null
@@ -1,82 +0,0 @@
-##
-## kolab-webadmin.spec -- OpenPKG RPM Specification
-## Copyright (c) 2004 Klaraelvdalens Datakonsult AB <http://www.klaralvdalens-datakonsult.se>
-##
-## Permission to use, copy, modify, and distribute this software for
-## any purpose with or without fee is hereby granted, provided that
-## the above copyright notice and this permission notice appear in all
-## copies.
-##
-## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-## SUCH DAMAGE.
-##
-
-# package information
-Name: @PACKAGE@
-Summary: Kolab Groupware Server Web Administration Interface
-URL: http://www.kolab.org/
-Vendor: Klaraelvdalens Datakonsult AB
-Packager: Klaraelvdalens Datakonsult AB
-Distribution: OpenPKG
-Group: Mail
-License: GPL
-Version: @VERSION@
-Release: @spec_build_date@
-
-
-# list of sources
-Source0: kolab-webadmin-%{version}.tar.bz2
-Source1: webadmin.conf.template
-
-# build information
-Prefix: %{l_prefix}
-BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20070603
-PreReq: OpenPKG, openpkg >= 20070603
-PreReq: kolabd >= 2.2.1-20081212
-PreReq: php-smarty >= 2.6.20
-AutoReq: no
-AutoReqProv: no
-
-%option kolab_version snapshot
-
-%description
- Web based administration interface for The Kolab Groupware Server
-
-%prep
- %setup -q
- %{l_shtool} subst -e 's;@kolab_version@;%{kolab_version};g' \
- www/admin/kolab/versions.php.in
-
-%build
- ./configure -prefix=%{l_prefix} --with-dist=kolab
-
-%install
- %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
-
- # install package
- %{l_make} %{l_mflags} install \
- DESTDIR=$RPM_BUILD_ROOT
-
- %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
- $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
-
- # generate file list
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
- '%config %{l_prefix}/etc/kolab/templates/webadmin.conf.template' \
- %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/php/admin/templates_c
-
-%files -f files
-
-%clean
- rm -rf $RPM_BUILD_ROOT
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.in b/lib/KolabAdmin/include/auth.class.php
index 7ecfc1a..c245bfa 100644
--- a/php/admin/include/auth.class.php.in
+++ b/lib/KolabAdmin/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/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.in b/lib/KolabAdmin/include/headers.php
index c19f94d..2ddb5bf 100644
--- a/php/admin/include/headers.php.in
+++ b/lib/KolabAdmin/include/headers.php
@@ -23,7 +23,7 @@ header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
header("Cache-Control: no-cache, must-revalidate");
header("Pragma: no-cache");
-$topdir = '@kolab_wui@';
+$topdir = $params['kolab_wui'];
/*
Local variables:
mode: php
diff --git a/php/admin/include/ldap.class.php.in b/lib/KolabAdmin/include/ldap.class.php
index ef3568d..d2b735c 100644
--- a/php/admin/include/ldap.class.php.in
+++ b/lib/KolabAdmin/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');
diff --git a/php/admin/include/locale.php b/lib/KolabAdmin/include/locale.php
index ce7e7fd..4172a42 100644
--- a/php/admin/include/locale.php
+++ b/lib/KolabAdmin/include/locale.php
@@ -108,7 +108,7 @@ setlocale(LC_ALL, $language);
$domain = "messages";
//$tmpSmarty = new MySmarty();
-bindtextdomain($domain, $locale_dir);
+bindtextdomain($domain, $locale_dir);
bind_textdomain_codeset($domain, "UTF-8");
textdomain($domain);
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.in b/lib/KolabAdmin/include/mysmarty.php
index 9762af8..47f5dd8 100644
--- a/php/admin/include/mysmarty.php.in
+++ b/lib/KolabAdmin/include/mysmarty.php
@@ -19,7 +19,6 @@
*/
require_once('config.php');
-require_once('@kolab_php_smarty_prefix@/Smarty.class.php');
require_once('locale.php');
// PENDING: Remove this before production(!)
@@ -32,20 +31,23 @@ class MySmarty extends Smarty {
global $topdir;
global $php_dir;
global $language;
+ global $smarty_compiledir;
+ global $webserver_web_prefix;
+ global $params;
$this->Smarty();
- $basedir = "$php_dir/@kolab_php_module_prefix@admin/";
- $this->config_dir = $basedir.'configs/';
- $this->template_dir = $basedir.'templates/';
- $this->compile_dir = '@smarty_compiledir@/';
- //$this->cache_dir = $basedir.'cache/';
+ $this->template_dir = $php_dir . '/data/KolabAdmin/templates/';
+ $this->compile_dir = $smarty_compiledir;
+
// Added for i18n management (Romain 05-03-03)
$this->register_function("tr", "translate");
//$this->register_outputfilter("count_bytes");
- $this->assign( 'topdir', $topdir );
- $this->assign( 'self_url', $_SERVER['REQUEST_URI'] );
+ $this->assign('webserver_web_prefix', $webserver_web_prefix);
+ $this->assign('kolab_wui', $params['kolab_wui']);
+ $this->assign('topdir', $topdir);
+ $this->assign('self_url', $_SERVER['REQUEST_URI']);
$cleanurl = preg_replace('/(\?|&)lang=(.*)(&|$)/', '', $_SERVER['REQUEST_URI']);
$this->assign( 'lang_url',
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/package.xml b/package.xml
new file mode 100644
index 0000000..ed951f4
--- /dev/null
+++ b/package.xml
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package packagerversion="1.9.0" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
+ <name>KolabAdmin</name>
+ <channel>pear.horde.org</channel>
+ <summary>A frontend for the Kolab user database.</summary>
+ <description>This package provides a web frontend for editing the
+ Kolab user database stored in LDAP.</description>
+ <lead>
+ <name>Gunnar Wrobel</name>
+ <user>wrobel</user>
+ <email>p@rdus.de</email>
+ <active>yes</active>
+ </lead>
+ <date>2010-09-14</date>
+ <time>16:02:38</time>
+ <version>
+ <release>2.3.0</release>
+ <api>2.3.0</api>
+ </version>
+ <stability>
+ <release>alpha</release>
+ <api>alpha</api>
+ </stability>
+ <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+ <notes>
+* Initial PEAR packaging.
+ </notes>
+ <contents>
+ <dir baseinstalldir="/" name="/">
+ <dir name="data">
+ <dir name="locale">
+ <dir name="de">
+ <dir name="LC_MESSAGES">
+ <file name="messages.mo" role="data" />
+ </dir> <!-- /data/locale/de/LC_MESSAGES -->
+ </dir> <!-- /data/locale/de -->
+ <dir name="es">
+ <dir name="LC_MESSAGES">
+ <file name="messages.mo" role="data" />
+ </dir> <!-- /data/locale/es/LC_MESSAGES -->
+ </dir> <!-- /data/locale/es -->
+ <dir name="fr">
+ <dir name="LC_MESSAGES">
+ <file name="messages.mo" role="data" />
+ </dir> <!-- /data/locale/fr/LC_MESSAGES -->
+ </dir> <!-- /data/locale/fr -->
+ <dir name="it">
+ <dir name="LC_MESSAGES">
+ <file name="messages.mo" role="data" />
+ </dir> <!-- /data/locale/it/LC_MESSAGES -->
+ </dir> <!-- /data/locale/it -->
+ <dir name="nl">
+ <dir name="LC_MESSAGES">
+ <file name="messages.mo" role="data" />
+ </dir> <!-- /data/locale/nl/LC_MESSAGES -->
+ </dir> <!-- /data/locale/nl -->
+ <file name="extract_messages" role="data" />
+ </dir> <!-- /data/locale -->
+ <dir name="templates">
+ <file name="addrdeleted.tpl" role="data" />
+ <file name="addresslist.tpl" role="data" />
+ <file name="addrlistall.tpl" role="data" />
+ <file name="admindeleted.tpl" role="data" />
+ <file name="adminlistall.tpl" role="data" />
+ <file name="codefusion.tpl" role="data" />
+ <file name="createuser.tpl" role="data" />
+ <file name="deliver.tpl" role="data" />
+ <file name="distlistall.tpl" role="data" />
+ <file name="distlistdeleted.tpl" role="data" />
+ <file name="domainmaintainerlistall.tpl" role="data" />
+ <file name="erfrakon.tpl" role="data" />
+ <file name="formcontainer.tpl" role="data" />
+ <file name="forward.tpl" role="data" />
+ <file name="intevation.tpl" role="data" />
+ <file name="kdab.tpl" role="data" />
+ <file name="kde.tpl" role="data" />
+ <file name="kolab.tpl" role="data" />
+ <file name="login.tpl" role="data" />
+ <file name="maintainerdeleted.tpl" role="data" />
+ <file name="maintainerlistall.tpl" role="data" />
+ <file name="page.tpl" role="data" />
+ <file name="settings.tpl" role="data" />
+ <file name="sfdeleted.tpl" role="data" />
+ <file name="sflistall.tpl" role="data" />
+ <file name="systemaliasnagscreen.tpl" role="data" />
+ <file name="userdeleted.tpl" role="data" />
+ <file name="userlistall.tpl" role="data" />
+ <file name="userlisterror.tpl" role="data" />
+ <file name="vacation.tpl" role="data" />
+ <file name="versions.tpl" role="data" />
+ <file name="welcome.tpl" role="data" />
+ </dir> <!-- /data/templates -->
+ </dir> <!-- /data -->
+ <dir name="lib">
+ <dir name="KolabAdmin">
+ <dir name="include">
+ <file name="auth.class.php" role="php" />
+ <file name="authenticate.php" role="php" />
+ <file name="debug.php" role="php" />
+ <file name="form.class.php" role="php" />
+ <file name="headers.php" role="php" />
+ <file name="ldap.class.php" role="php" />
+ <file name="locale.php" role="php" />
+ <file name="menu.php" role="php" />
+ <file name="mysmarty.php" role="php" />
+ <file name="passwd.php" role="php" />
+ <file name="Sieve.php" role="php" />
+ </dir> <!-- /lib/KolabAdmin/include -->
+ <dir name="Sieve">
+ <dir name="Segment">
+ <file name="Delivery.php" role="php" />
+ <file name="Forward.php" role="php" />
+ <file name="Vacation.php" role="php" />
+ </dir> <!-- /lib/KolabAdmin/Sieve/Segment -->
+ <file name="Script.php" role="php" />
+ <file name="Segment.php" role="php" />
+ </dir> <!-- /lib/KolabAdmin/Sieve -->
+ <file name="Ldap.php" role="php" />
+ <file name="Sieve.php" role="php" />
+ </dir> <!-- /lib/KolabAdmin -->
+ </dir> <!-- /lib -->
+ <dir name="test">
+ <dir name="KolabAdmin">
+ <dir name="Unit">
+ <dir name="Sieve">
+ <dir name="Segment">
+ <file name="DeliveryTest.php" role="test" />
+ <file name="ForwardTest.php" role="test" />
+ <file name="VacationTest.php" role="test" />
+ </dir> <!-- /test/KolabAdmin/Unit/Sieve/Segment -->
+ </dir> <!-- /test/KolabAdmin/Unit/Sieve -->
+ <file name="BaseTest.php" role="test" />
+ <file name="SieveTest.php" role="test" />
+ </dir> <!-- /test/KolabAdmin/Unit -->
+ <file name="AllTests.php" role="test" />
+ <file name="Autoload.php" role="test" />
+ </dir> <!-- /test/KolabAdmin -->
+ </dir> <!-- /test -->
+ <dir name="www">
+ <dir name="admin">
+ <dir name="addressbook">
+ <file name="addr.php" role="www" />
+ <file name="index.php" role="www" />
+ </dir> <!-- /www/admin/addressbook -->
+ <dir name="administrator">
+ <file name="admin.php" role="www" />
+ <file name="index.php" role="www" />
+ </dir> <!-- /www/admin/administrator -->
+ <dir name="distributionlist">
+ <file name="index.php" role="www" />
+ <file name="list.php" role="www" />
+ </dir> <!-- /www/admin/distributionlist -->
+ <dir name="domainmaintainer">
+ <file name="domainmaintainer.php" role="www" />
+ <file name="index.php" role="www" />
+ </dir> <!-- /www/admin/domainmaintainer -->
+ <dir name="kolab">
+ <file name="codefusion.php" role="www" />
+ <file name="erfrakon.php" role="www" />
+ <file name="index.php" role="www" />
+ <file name="intevation.php" role="www" />
+ <file name="kdab.php" role="www" />
+ <file name="kde.php" role="www" />
+ <file name="versions.php" role="www" />
+ </dir> <!-- /www/admin/kolab -->
+ <dir name="maintainer">
+ <file name="index.php" role="www" />
+ <file name="maintainer.php" role="www" />
+ </dir> <!-- /www/admin/maintainer -->
+ <dir name="pics">
+ <file name="codefusion.png" role="www" />
+ <file name="erfrakon.png" role="www" />
+ <file name="intevation_logo.png" role="www" />
+ <file name="kdab.png" role="www" />
+ <file name="kde.png" role="www" />
+ <file name="kolab_logo.png" role="www" />
+ </dir> <!-- /www/admin/pics -->
+ <dir name="settings">
+ <file name="index.php" role="www" />
+ </dir> <!-- /www/admin/settings -->
+ <dir name="sharedfolder">
+ <file name="index.php" role="www" />
+ <file name="sf.php" role="www" />
+ </dir> <!-- /www/admin/sharedfolder -->
+ <dir name="user">
+ <file name="deliver.php" role="www" />
+ <file name="forward.php" role="www" />
+ <file name="index.php" role="www" />
+ <file name="user.php" role="www" />
+ <file name="vacation.php" role="www" />
+ </dir> <!-- /www/admin/user -->
+ <file name="index.php" role="www" />
+ <file name="logout.php" role="www" />
+ <file name="print.css" role="www" />
+ <file name="style.css" role="www" />
+ </dir> <!-- /www/admin -->
+ <file name="favicon.ico" role="www" />
+ <file name="favicon.png" role="www" />
+ </dir> <!-- /www -->
+ <file name="AUTHORS" role="data" />
+ <file name="ChangeLog" role="data" />
+ <file name="COPYING" role="data" />
+ <file name="INSTALL" role="data" />
+ <file name="NEWS" role="data" />
+ </dir> <!-- / -->
+ </contents>
+ <dependencies>
+ <required>
+ <php>
+ <min>4.3.0</min>
+ </php>
+ <pearinstaller>
+ <min>1.4.0b1</min>
+ </pearinstaller>
+ <package>
+ <name>Kolab_Server</name>
+ <channel>pear.horde.org</channel>
+ </package>
+ </required>
+ </dependencies>
+ <phprelease>
+ <filelist>
+ <install as="locale/extract_messages" name="data/locale/extract_messages" />
+ <install as="locale/de/LC_MESSAGES/messages.mo" name="data/locale/de/LC_MESSAGES/messages.mo" />
+ <install as="locale/es/LC_MESSAGES/messages.mo" name="data/locale/es/LC_MESSAGES/messages.mo" />
+ <install as="locale/fr/LC_MESSAGES/messages.mo" name="data/locale/fr/LC_MESSAGES/messages.mo" />
+ <install as="locale/it/LC_MESSAGES/messages.mo" name="data/locale/it/LC_MESSAGES/messages.mo" />
+ <install as="locale/nl/LC_MESSAGES/messages.mo" name="data/locale/nl/LC_MESSAGES/messages.mo" />
+ <install as="templates/addrdeleted.tpl" name="data/templates/addrdeleted.tpl" />
+ <install as="templates/addresslist.tpl" name="data/templates/addresslist.tpl" />
+ <install as="templates/addrlistall.tpl" name="data/templates/addrlistall.tpl" />
+ <install as="templates/admindeleted.tpl" name="data/templates/admindeleted.tpl" />
+ <install as="templates/adminlistall.tpl" name="data/templates/adminlistall.tpl" />
+ <install as="templates/codefusion.tpl" name="data/templates/codefusion.tpl" />
+ <install as="templates/createuser.tpl" name="data/templates/createuser.tpl" />
+ <install as="templates/deliver.tpl" name="data/templates/deliver.tpl" />
+ <install as="templates/distlistall.tpl" name="data/templates/distlistall.tpl" />
+ <install as="templates/distlistdeleted.tpl" name="data/templates/distlistdeleted.tpl" />
+ <install as="templates/domainmaintainerlistall.tpl" name="data/templates/domainmaintainerlistall.tpl" />
+ <install as="templates/erfrakon.tpl" name="data/templates/erfrakon.tpl" />
+ <install as="templates/formcontainer.tpl" name="data/templates/formcontainer.tpl" />
+ <install as="templates/forward.tpl" name="data/templates/forward.tpl" />
+ <install as="templates/intevation.tpl" name="data/templates/intevation.tpl" />
+ <install as="templates/kdab.tpl" name="data/templates/kdab.tpl" />
+ <install as="templates/kde.tpl" name="data/templates/kde.tpl" />
+ <install as="templates/kolab.tpl" name="data/templates/kolab.tpl" />
+ <install as="templates/login.tpl" name="data/templates/login.tpl" />
+ <install as="templates/maintainerdeleted.tpl" name="data/templates/maintainerdeleted.tpl" />
+ <install as="templates/maintainerlistall.tpl" name="data/templates/maintainerlistall.tpl" />
+ <install as="templates/page.tpl" name="data/templates/page.tpl" />
+ <install as="templates/settings.tpl" name="data/templates/settings.tpl" />
+ <install as="templates/sfdeleted.tpl" name="data/templates/sfdeleted.tpl" />
+ <install as="templates/sflistall.tpl" name="data/templates/sflistall.tpl" />
+ <install as="templates/systemaliasnagscreen.tpl" name="data/templates/systemaliasnagscreen.tpl" />
+ <install as="templates/userdeleted.tpl" name="data/templates/userdeleted.tpl" />
+ <install as="templates/userlistall.tpl" name="data/templates/userlistall.tpl" />
+ <install as="templates/userlisterror.tpl" name="data/templates/userlisterror.tpl" />
+ <install as="templates/vacation.tpl" name="data/templates/vacation.tpl" />
+ <install as="templates/versions.tpl" name="data/templates/versions.tpl" />
+ <install as="templates/welcome.tpl" name="data/templates/welcome.tpl" />
+ <install as="KolabAdmin/Ldap.php" name="lib/KolabAdmin/Ldap.php" />
+ <install as="KolabAdmin/Sieve.php" name="lib/KolabAdmin/Sieve.php" />
+ <install as="KolabAdmin/include/auth.class.php" name="lib/KolabAdmin/include/auth.class.php" />
+ <install as="KolabAdmin/include/authenticate.php" name="lib/KolabAdmin/include/authenticate.php" />
+ <install as="KolabAdmin/include/debug.php" name="lib/KolabAdmin/include/debug.php" />
+ <install as="KolabAdmin/include/form.class.php" name="lib/KolabAdmin/include/form.class.php" />
+ <install as="KolabAdmin/include/headers.php" name="lib/KolabAdmin/include/headers.php" />
+ <install as="KolabAdmin/include/ldap.class.php" name="lib/KolabAdmin/include/ldap.class.php" />
+ <install as="KolabAdmin/include/locale.php" name="lib/KolabAdmin/include/locale.php" />
+ <install as="KolabAdmin/include/menu.php" name="lib/KolabAdmin/include/menu.php" />
+ <install as="KolabAdmin/include/mysmarty.php" name="lib/KolabAdmin/include/mysmarty.php" />
+ <install as="KolabAdmin/include/passwd.php" name="lib/KolabAdmin/include/passwd.php" />
+ <install as="KolabAdmin/include/Sieve.php" name="lib/KolabAdmin/include/Sieve.php" />
+ <install as="KolabAdmin/Sieve/Script.php" name="lib/KolabAdmin/Sieve/Script.php" />
+ <install as="KolabAdmin/Sieve/Segment.php" name="lib/KolabAdmin/Sieve/Segment.php" />
+ <install as="KolabAdmin/Sieve/Segment/Delivery.php" name="lib/KolabAdmin/Sieve/Segment/Delivery.php" />
+ <install as="KolabAdmin/Sieve/Segment/Forward.php" name="lib/KolabAdmin/Sieve/Segment/Forward.php" />
+ <install as="KolabAdmin/Sieve/Segment/Vacation.php" name="lib/KolabAdmin/Sieve/Segment/Vacation.php" />
+ <install as="KolabAdmin/AllTests.php" name="test/KolabAdmin/AllTests.php" />
+ <install as="KolabAdmin/Autoload.php" name="test/KolabAdmin/Autoload.php" />
+ <install as="KolabAdmin/Unit/BaseTest.php" name="test/KolabAdmin/Unit/BaseTest.php" />
+ <install as="KolabAdmin/Unit/SieveTest.php" name="test/KolabAdmin/Unit/SieveTest.php" />
+ <install as="KolabAdmin/Unit/Sieve/Segment/DeliveryTest.php" name="test/KolabAdmin/Unit/Sieve/Segment/DeliveryTest.php" />
+ <install as="KolabAdmin/Unit/Sieve/Segment/ForwardTest.php" name="test/KolabAdmin/Unit/Sieve/Segment/ForwardTest.php" />
+ <install as="KolabAdmin/Unit/Sieve/Segment/VacationTest.php" name="test/KolabAdmin/Unit/Sieve/Segment/VacationTest.php" />
+ <install as="favicon.ico" name="www/favicon.ico" />
+ <install as="favicon.png" name="www/favicon.png" />
+ <install as="admin/index.php" name="www/admin/index.php" />
+ <install as="admin/logout.php" name="www/admin/logout.php" />
+ <install as="admin/print.css" name="www/admin/print.css" />
+ <install as="admin/style.css" name="www/admin/style.css" />
+ <install as="admin/addressbook/addr.php" name="www/admin/addressbook/addr.php" />
+ <install as="admin/addressbook/index.php" name="www/admin/addressbook/index.php" />
+ <install as="admin/administrator/admin.php" name="www/admin/administrator/admin.php" />
+ <install as="admin/administrator/index.php" name="www/admin/administrator/index.php" />
+ <install as="admin/distributionlist/index.php" name="www/admin/distributionlist/index.php" />
+ <install as="admin/distributionlist/list.php" name="www/admin/distributionlist/list.php" />
+ <install as="admin/domainmaintainer/domainmaintainer.php" name="www/admin/domainmaintainer/domainmaintainer.php" />
+ <install as="admin/domainmaintainer/index.php" name="www/admin/domainmaintainer/index.php" />
+ <install as="admin/kolab/codefusion.php" name="www/admin/kolab/codefusion.php" />
+ <install as="admin/kolab/erfrakon.php" name="www/admin/kolab/erfrakon.php" />
+ <install as="admin/kolab/index.php" name="www/admin/kolab/index.php" />
+ <install as="admin/kolab/intevation.php" name="www/admin/kolab/intevation.php" />
+ <install as="admin/kolab/kdab.php" name="www/admin/kolab/kdab.php" />
+ <install as="admin/kolab/kde.php" name="www/admin/kolab/kde.php" />
+ <install as="admin/kolab/versions.php" name="www/admin/kolab/versions.php" />
+ <install as="admin/maintainer/index.php" name="www/admin/maintainer/index.php" />
+ <install as="admin/maintainer/maintainer.php" name="www/admin/maintainer/maintainer.php" />
+ <install as="admin/pics/codefusion.png" name="www/admin/pics/codefusion.png" />
+ <install as="admin/pics/erfrakon.png" name="www/admin/pics/erfrakon.png" />
+ <install as="admin/pics/intevation_logo.png" name="www/admin/pics/intevation_logo.png" />
+ <install as="admin/pics/kdab.png" name="www/admin/pics/kdab.png" />
+ <install as="admin/pics/kde.png" name="www/admin/pics/kde.png" />
+ <install as="admin/pics/kolab_logo.png" name="www/admin/pics/kolab_logo.png" />
+ <install as="admin/settings/index.php" name="www/admin/settings/index.php" />
+ <install as="admin/sharedfolder/index.php" name="www/admin/sharedfolder/index.php" />
+ <install as="admin/sharedfolder/sf.php" name="www/admin/sharedfolder/sf.php" />
+ <install as="admin/user/deliver.php" name="www/admin/user/deliver.php" />
+ <install as="admin/user/forward.php" name="www/admin/user/forward.php" />
+ <install as="admin/user/index.php" name="www/admin/user/index.php" />
+ <install as="admin/user/user.php" name="www/admin/user/user.php" />
+ <install as="admin/user/vacation.php" name="www/admin/user/vacation.php" />
+ </filelist>
+ </phprelease>
+ <changelog>
+ <release>
+ <version>
+ <release>2.3.0</release>
+ <api>2.3.0</api>
+ </version>
+ <stability>
+ <release>alpha</release>
+ <api>alpha</api>
+ </stability>
+ <date>2010-09-14</date>
+ <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+ <notes>
+* Initial PEAR packaging.
+ </notes>
+ </release>
+ </changelog>
+</package>
diff --git a/www/admin/addressbook/addr.php.in b/www/admin/addressbook/addr.php
index bb70ecf..66adeab 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];
@@ -175,7 +175,7 @@ if( !$errors ) {
unset( $distlists['count'] );
foreach( $distlists as $distlist ) {
$dlcn = $distlist['mail'][0];
- $errors[] = sprintf(_("Addressbook entry DN could not be modified, distribution list <a href='@kolab_wui@/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> depends on it. To modify this entry, first remove it from the distribution list."), urlencode($distlist['dn']), $dlcn );
+ $errors[] = sprintf(_("Addressbook entry DN could not be modified, distribution list <a href='" $params['kolab_wui'] . "/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> depends on it. To modify this entry, first remove it from the distribution list."), urlencode($distlist['dn']), $dlcn );
}
if( !$errors ) {
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
index 94671b1..94eb230 100644
--- a/www/admin/kolab/versions.php.in
+++ b/www/admin/kolab/versions.php
@@ -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';
@@ -27,26 +27,25 @@ $menuitems[$sidx]['selected'] = 'selected';
// The variable 'kolab_pkgs' is used to collect a packages that make up the
// kolab groupware server.
$kolabversions = shell_exec('
- @RPM@ -q --qf "%{NAME}: %{VERSION}-%{RELEASE}\n" \
- @kolab_pkgs@ \
+ ' . $RPM .' -q --qf "%{NAME}: %{VERSION}-%{RELEASE}\n" \
+ ' . $kolab_pkgs . ' \
| sort
');
$pearhordeversions = shell_exec('
- @RPM@ -q --qf "%{NAME}: %{VERSION}-%{RELEASE}\n" \
- @pear_horde_pkgs@ \
+ ' . $RPM . ' -q --qf "%{NAME}: %{VERSION}-%{RELEASE}\n" \
+ ' . $pear_horde_pkgs . ' \
| sort
');
# This is an openpkg test, difficult to see after make.
# but visible in the vanilla sources.
-if ("@WITHOPENPKG@" == "yes") {
- $openpkgversion = shell_exec("@RPM@ -q openpkg");
- $kolabpatchedversions = shell_exec("@RPM@ -qa|grep 'kolab[0-9]*$'" );
+if ($WITHOPENPKG == "yes") {
+ $openpkgversion = shell_exec("$RPM -q openpkg");
+ $kolabpatchedversions = shell_exec("$RPM -qa|grep 'kolab[0-9]*$'" );
}
-$kolabversion = '@kolab_version@';
if( $kolabversion[0] == '@' ) {
// Unofficial/non-openpkg package
$kolabversion = 'unknown';
@@ -65,6 +64,7 @@ $smarty->assign( 'kolabversions', $kolabversions );
$smarty->assign( 'pearhordeversions', $pearhordeversions );
$smarty->assign( 'kolabpatchedversions', $kolabpatchedversions );
$smarty->assign( 'openpkgversion', $openpkgversion );
+$smarty->assign( 'OPENPKG', $WITHOPENPKG );
$smarty->assign( 'maincontent', 'versions.tpl' );
$smarty->display('page.tpl');
diff --git a/www/admin/logout.php.in b/www/admin/logout.php
index 57b59c6..e9c5772 100644
--- a/www/admin/logout.php.in
+++ b/www/admin/logout.php
@@ -18,17 +18,9 @@
* Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
*/
+require_once('KolabAdmin/include/mysmarty.php');
+
session_start();
session_destroy();
session_unset();
-header('Location: @kolab_wui@/');
-
-/*
- Local variables:
- mode: php
- indent-tabs-mode: t
- tab-width: 4
- buffer-file-coding-system: utf-8
- End:
- */
-?>
+header("Location: " . $params['kolab_wui'] . "/");
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';