From 613964ece4a601dcc0fcc5888abb2c052c636689 Mon Sep 17 00:00:00 2001
From: Guy Brand <gb@isis.u-strasbg.fr>
Date: Tue, 18 Mar 2008 23:16:59 +0100
Subject: [PATCH] Fix message displayed after (un)subscribens action
darcs-hash:20080318221659-19e2d-bf5088e16c3a9c65bb70dd58fff4e385b5851204.gz
---
inc/actions.php | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/inc/actions.php b/inc/actions.php
index 2ae366ce0..c0f85c97a 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -466,17 +466,22 @@ function act_subscriptionns($act){
if(!getNS($ID)) {
$file = metaFN(getNS($ID),'.mlist');
+ $ns = "root";
} else {
$file = metaFN(getNS($ID),'/.mlist');
+ $ns = getNS($ID);
}
+ // reuse strings used to display the status of the subscribe action
+ $act_msg = rtrim($act, 'ns');
+
if ($act=='subscribens' && !$INFO['subscribedns']){
if ($INFO['userinfo']['mail']){
if (io_saveFile($file,$_SERVER['REMOTE_USER']."\n",true)) {
$INFO['subscribedns'] = true;
- msg(sprintf($lang[$act.'_success'], $INFO['userinfo']['name'], $ID),1);
+ msg(sprintf($lang[$act_msg.'_success'], $INFO['userinfo']['name'], $ns),1);
} else {
- msg(sprintf($lang[$act.'_error'], $INFO['userinfo']['name'], $ID),1);
+ msg(sprintf($lang[$act_msg.'_error'], $INFO['userinfo']['name'], $ns),1);
}
} else {
msg($lang['subscribe_noaddress']);
@@ -484,9 +489,9 @@ function act_subscriptionns($act){
} elseif ($act=='unsubscribens' && $INFO['subscribedns']){
if (io_deleteFromFile($file,$_SERVER['REMOTE_USER']."\n")) {
$INFO['subscribedns'] = false;
- msg(sprintf($lang[$act.'_success'], $INFO['userinfo']['name'], $ID),1);
+ msg(sprintf($lang[$act_msg.'_success'], $INFO['userinfo']['name'], $ns),1);
} else {
- msg(sprintf($lang[$act.'_error'], $INFO['userinfo']['name'], $ID),1);
+ msg(sprintf($lang[$act_msg.'_error'], $INFO['userinfo']['name'], $ns),1);
}
}
--
GitLab