summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Bos <richard@radoeka.nl>2008-02-23 20:19:19 (GMT)
committerRichard Bos <richard@radoeka.nl>2008-02-23 20:19:19 (GMT)
commit21956abeeb282fc8194495bb930dc1b0de6db0ad (patch)
tree877b979c1406540d7b60d878dfed97a192d7816e
parent0885da3d839b459726baa85f462bf085c9234495 (diff)
downloadkolab-webadmin-21956abeeb282fc8194495bb930dc1b0de6db0ad.tar.gz
changed the hardcoded path to web user interface (/admin)
into a variable: kolab_wui.
-rw-r--r--ChangeLog9
-rw-r--r--Makefile.am2
-rw-r--r--php/admin/include/auth.class.php.in2
-rw-r--r--php/admin/include/headers.php.in2
-rw-r--r--php/admin/locale/de/LC_MESSAGES/messages.po8
-rw-r--r--php/admin/locale/es/LC_MESSAGES/messages.po8
-rw-r--r--php/admin/locale/fr/LC_MESSAGES/messages.po4
-rw-r--r--php/admin/locale/it/LC_MESSAGES/messages.po4
-rw-r--r--php/admin/locale/nl/LC_MESSAGES/messages.po4
-rwxr-xr-xphp/admin/templates/page.tpl.in2
-rw-r--r--www/admin/addressbook/addr.php.in2
-rw-r--r--www/admin/logout.php.in2
12 files changed, 29 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 51eecb6..1145c2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
2008-02-23 Richard Bos <richard@radoeka.nl>
* php/admin/include/menu.php: Fixed untranslated string Addressbook
+ * Makefile.am, php/admin/include/auth.class.php.in,
+ php/admin/include/headers.php.in, php/admin/templates/page.tpl.in,
+ www/admin/logout.php.in, www/admin/addressbook/addr.php.in,
+ php/admin/locale/de/LC_MESSAGES/messages.po,
+ php/admin/locale/es/LC_MESSAGES/messages.po,
+ php/admin/locale/fr/LC_MESSAGES/messages.po,
+ php/admin/locale/it/LC_MESSAGES/messages.po,
+ php/admin/locale/nl/LC_MESSAGES/messages.po: changed the hardcoded
+ path to web user interface (/admin) into a variable: kolab_wui.
2008-02-22 Richard Bos <richard@radoeka.nl>
diff --git a/Makefile.am b/Makefile.am
index a96abef..66160dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ WSKOLAB_FILES = www/admin/index.php \
www/admin/print.css \
www/admin/style.css
-wskolabdir = $(webserver_document_root)$(webserver_web_prefix)/admin
+wskolabdir = $(webserver_document_root)$(kolab_wui)
wskolab_DATA = $(WSKOLAB_FILES)
EXTRA_DIST += www/admin/style.css \
www/admin/print.css
diff --git a/php/admin/include/auth.class.php.in b/php/admin/include/auth.class.php.in
index e7ab703..bcff719 100644
--- a/php/admin/include/auth.class.php.in
+++ b/php/admin/include/auth.class.php.in
@@ -104,7 +104,7 @@ class KolabAuth {
session_destroy();
$this->error_string = false;
//$this->gotoLoginPage();
- Header("Location: @webserver_web_prefix@/admin/");
+ Header("Location: @kolab_wui@/");
}
function handleLogin() {
diff --git a/php/admin/include/headers.php.in b/php/admin/include/headers.php.in
index 1c8a511..c19f94d 100644
--- a/php/admin/include/headers.php.in
+++ b/php/admin/include/headers.php.in
@@ -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 = '@webserver_web_prefix@/admin';
+$topdir = '@kolab_wui@';
/*
Local variables:
mode: php
diff --git a/php/admin/locale/de/LC_MESSAGES/messages.po b/php/admin/locale/de/LC_MESSAGES/messages.po
index cc243cc..3ab5546 100644
--- a/php/admin/locale/de/LC_MESSAGES/messages.po
+++ b/php/admin/locale/de/LC_MESSAGES/messages.po
@@ -1139,12 +1139,12 @@ msgstr "Externe Adresse hinzufügen"
#, php-format
msgid ""
"Addressbook entry DN could not be modified, distribution list <a "
-"href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+"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."
msgstr ""
"Der DN der Adresse konnte nicht verändert werden; Verteilerliste <a "
-"href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+"href='@kolab_wui@/distributionlist/list.php?"
"action=modify&dn=%s'>'%s'</a> hängt davon ab. Um dieses Konto zu verändern, "
"müssen Sie es erst aus der Verteilerliste entfernen."
@@ -2408,12 +2408,12 @@ msgstr " ist leer"
#~ msgid ""
#~ "Account DN could not be modified, distribution list <a "
-#~ "href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+#~ "href='@kolab_wui@/distributionlist/list.php?"
#~ "action=modify&dn=%s'>'%s'</a> depends on it. To modify this account, "
#~ "first remove it from the distribution list."
#~ msgstr ""
#~ "Der DN des Kontos konnte nicht verändert werden; Verteilerliste <a "
-#~ "href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+#~ "href='@kolab_wui@/distributionlist/list.php?"
#~ "action=modify&dn=%s'>'%s'</a> hängt davon ab. Um dieses Konto zu "
#~ "verändern, müssen Sie es erst aus der Verteilerliste entfernen."
diff --git a/php/admin/locale/es/LC_MESSAGES/messages.po b/php/admin/locale/es/LC_MESSAGES/messages.po
index 8c9a094..555d54e 100644
--- a/php/admin/locale/es/LC_MESSAGES/messages.po
+++ b/php/admin/locale/es/LC_MESSAGES/messages.po
@@ -1133,12 +1133,12 @@ msgstr "Añadir dirección externa"
#, php-format
msgid ""
"Addressbook entry DN could not be modified, distribution list <a "
-"href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+"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."
msgstr ""
"La entrada DN de la libreta de direcciones no puede ser modificada, la lista "
-"de distribución <a href='@webserver_web_prefix@/admin/distributionlist/list."
+"de distribución <a href='@kolab_wui@/distributionlist/list."
"php?action=modify&dn=%s'>'%s'</a> depende de ella. Para modificar esta "
"entrada, primero bórrela de la lista de distribución."
@@ -2405,12 +2405,12 @@ msgstr "Está vacío "
#~ msgid ""
#~ "Account DN could not be modified, distribution list <a "
-#~ "href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+#~ "href='@kolab_wui@/distributionlist/list.php?"
#~ "action=modify&dn=%s'>'%s'</a> depends on it. To modify this account, "
#~ "first remove it from the distribution list."
#~ msgstr ""
#~ "La cuenta DN no puede ser modificada, la lista de distribución <a "
-#~ "href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+#~ "href='@kolab_wui@/distributionlist/list.php?"
#~ "action=modify&dn=%s'>'%s'</a> depende de ella. Para modificar esta "
#~ "cuenta, primero borrarla de la lista de distribución."
diff --git a/php/admin/locale/fr/LC_MESSAGES/messages.po b/php/admin/locale/fr/LC_MESSAGES/messages.po
index 3be1dd9..19767fc 100644
--- a/php/admin/locale/fr/LC_MESSAGES/messages.po
+++ b/php/admin/locale/fr/LC_MESSAGES/messages.po
@@ -1131,7 +1131,7 @@ msgstr "Ajouter une adresse externe"
#, fuzzy, php-format
msgid ""
"Addressbook entry DN could not be modified, distribution list <a "
-"href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+"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."
msgstr ""
@@ -2433,7 +2433,7 @@ msgstr "est vide"
#, fuzzy
#~ msgid ""
#~ "Account DN could not be modified, distribution list <a "
-#~ "href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+#~ "href='@kolab_wui@/distributionlist/list.php?"
#~ "action=modify&dn=%s'>'%s'</a> depends on it. To modify this account, "
#~ "first remove it from the distribution list."
#~ msgstr ""
diff --git a/php/admin/locale/it/LC_MESSAGES/messages.po b/php/admin/locale/it/LC_MESSAGES/messages.po
index d1d79c9..5203c30 100644
--- a/php/admin/locale/it/LC_MESSAGES/messages.po
+++ b/php/admin/locale/it/LC_MESSAGES/messages.po
@@ -1135,7 +1135,7 @@ msgstr "Aggiungi indirizzi esterni"
#, fuzzy, php-format
msgid ""
"Addressbook entry DN could not be modified, distribution list <a "
-"href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+"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."
msgstr ""
@@ -2407,7 +2407,7 @@ msgstr " è vuoto"
#, fuzzy
#~ msgid ""
#~ "Account DN could not be modified, distribution list <a "
-#~ "href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+#~ "href='@kolab_wui@/distributionlist/list.php?"
#~ "action=modify&dn=%s'>'%s'</a> depends on it. To modify this account, "
#~ "first remove it from the distribution list."
#~ msgstr ""
diff --git a/php/admin/locale/nl/LC_MESSAGES/messages.po b/php/admin/locale/nl/LC_MESSAGES/messages.po
index 9111df3..625d395 100644
--- a/php/admin/locale/nl/LC_MESSAGES/messages.po
+++ b/php/admin/locale/nl/LC_MESSAGES/messages.po
@@ -1123,7 +1123,7 @@ msgstr "Extern adres toevoegen"
#, php-format
msgid ""
"Addressbook entry DN could not be modified, distribution list <a "
-"href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+"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."
msgstr ""
@@ -2385,7 +2385,7 @@ msgstr " is leeg"
#~ msgid ""
#~ "Account DN could not be modified, distribution list <a "
-#~ "href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+#~ "href='@kolab_wui@/distributionlist/list.php?"
#~ "action=modify&dn=%s'>'%s'</a> depends on it. To modify this account, "
#~ "first remove it from the distribution list."
#~ msgstr ""
diff --git a/php/admin/templates/page.tpl.in b/php/admin/templates/page.tpl.in
index c84a6d6..d698f0e 100755
--- a/php/admin/templates/page.tpl.in
+++ b/php/admin/templates/page.tpl.in
@@ -30,7 +30,7 @@ function changeLanguage(combobox) {ldelim}
</head>
<body>
<div id="topbar">
- <a href="@webserver_web_prefix@/admin"><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/www/admin/addressbook/addr.php.in b/www/admin/addressbook/addr.php.in
index 015be50..1554647 100644
--- a/www/admin/addressbook/addr.php.in
+++ b/www/admin/addressbook/addr.php.in
@@ -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='@webserver_web_prefix@/admin/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='@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/logout.php.in b/www/admin/logout.php.in
index 6d69593..57b59c6 100644
--- a/www/admin/logout.php.in
+++ b/www/admin/logout.php.in
@@ -21,7 +21,7 @@
session_start();
session_destroy();
session_unset();
-header('Location: @webserver_web_prefix@/admin/');
+header('Location: @kolab_wui@/');
/*
Local variables: