", gt("Categories bgcolor2"));
- rsprintf("\n", loc("Change Password"));
+ rsprintf("\n", loc("Change password"));
rsprintf("\n", loc("Remove user"));
@@ -5489,8 +5493,17 @@ char str[256], in_reply_to[80], reply_to[256];
if (getparam("confirm") && *getparam("confirm") &&
strcmp(getparam("confirm"), loc("No")) == 0)
{
- sprintf(str, "%d", message_id);
- redirect(str);
+ if (message_id)
+ {
+ sprintf(str, "%d", message_id);
+ redirect(str);
+ }
+ else
+ {
+ strcpy(str, getparam("lastcmd"));
+ url_decode(str);
+ redirect(str);
+ }
return;
}
@@ -5537,6 +5550,22 @@ char str[256], in_reply_to[80], reply_to[256];
}
else
{
+ /* check if at least one message is selected */
+ if (!message_id)
+ {
+ for (i=0 ; i| \n", gt("Cell BGColor"));
rsprintf("\n", getparam("nsel"));
- strcpy(str, getparam("cmdline"));
- rsprintf("\n", str);
+ if (isparam("lastcmd"))
+ {
+ strcpy(str, getparam("lastcmd"));
+ rsprintf("\n", str);
+ }
for (i=reply=0 ; i");
if (n_msg > n_page)
- rsprintf("Goto page \n");
+ rsprintf("%s \n", loc("Goto page"));
if (page_n > 1)
{
sprintf(ref, "page%d", page_n - 1);
build_ref(ref);
- rsprintf("Previous ", ref);
+ rsprintf("%s ", ref, loc("Previous"));
}
if (page_n && n_msg > n_page)
@@ -6334,7 +6366,7 @@ char ref[256];
sprintf(ref, "page%d", page_n + 1);
build_ref(ref);
- rsprintf("Next ", ref);
+ rsprintf("%s ", ref, loc("Next"));
}
if (page_n != -1 && n_page < n_msg)
@@ -6342,7 +6374,7 @@ char ref[256];
sprintf(ref, "page");
build_ref(ref);
- rsprintf("All\n", ref);
+ rsprintf("%s\n", ref, loc("All"));
}
rsprintf(" | \n", gt("Menu1 BGColor"));
@@ -6351,7 +6383,7 @@ char ref[256];
{
i = atoi(getparam("last"));
- rsprintf("%s \n", loc("Show last"));
+ rsprintf(" \n", loc("Show last"));
rsprintf("\n");
-
- rsprintf("\n", loc("Go"));
}
rsprintf(" | |
\n\n");
@@ -6424,7 +6454,7 @@ char lbk_list[MAX_N_LIST][NAME_LENGTH];
if (!getcfg(lbs->name, "Menu commands", str) ||
strstr(str, loc("Delete")))
{
- rsprintf("");
if (n>1)
{
- if (move)
+ if (n_done == 0)
+ rsprintf(loc("No message selected"));
+ else if (move)
rsprintf(loc("%d messages moved successfully from \"%s\" to \"%s\""), n_done, lbs->name, lbs_dest->name);
else
rsprintf(loc("%d messages copied successfully from \"%s\" to \"%s\""), n_done, lbs->name, lbs_dest->name);
@@ -7911,8 +7954,13 @@ LOGBOOK *lbs_dest;
rsprintf("| %s %s | \n",
gt("Cell BGColor"), loc("Go to"), lbs->name, source_id, lbs->name);
else
+ {
+ strcpy(str, getparam("lastcmd"));
+ url_decode(str);
+
rsprintf("| %s %s | \n",
- gt("Cell BGColor"), loc("Go to"), lbs->name, getparam("cmdline"), lbs->name);
+ gt("Cell BGColor"), loc("Go to"), lbs->name, str, lbs->name);
+ }
rsprintf("| %s %s | \n",
gt("Cell BGColor"), loc("Go to"), lbs_dest->name, lbs_dest->name);
@@ -7927,7 +7975,7 @@ LOGBOOK *lbs_dest;
void show_elog_page(LOGBOOK *lbs, char *dec_path, char *command)
{
-int size, i, j, len, n, n_log, status, fh, length, message_error, index;
+int size, i, j, n, n_log, status, fh, length, message_error, index;
int message_id, orig_message_id;
char str[1000], ref[256], file_name[256], attrib[MAX_N_ATTR][NAME_LENGTH];
char date[80], text[TEXT_SIZE], menu_str[1000], other_str[1000], cmd[256],
@@ -7949,120 +7997,87 @@ BOOL first;
/* default menu commands */
if (menu_str[0] == 0)
{
- strcpy(menu_str, loc("Back"));
- strcat(menu_str, ", ");
- strcat(menu_str, loc("New"));
- strcat(menu_str, ", ");
- strcat(menu_str, loc("Edit"));
- strcat(menu_str, ", ");
- strcat(menu_str, loc("Delete"));
- strcat(menu_str, ", ");
- strcat(menu_str, loc("Reply"));
- strcat(menu_str, ", ");
- strcat(menu_str, loc("Find"));
- strcat(menu_str, ", ");
+ strcpy(menu_str, "Back, New, Edit, Delete, Reply, Find, ");
if (getcfg(lbs->name, "Password file", str))
{
if (getcfg(lbs->name, "Admin user", str) &&
strstr(str, getparam("unm")) != 0)
{
- strcat(menu_str, loc("Admin"));
- strcat(menu_str, ", ");
+ strcat(menu_str, "Admin, ");
}
- strcat(menu_str, loc("Config"));
- strcat(menu_str, ", ");
- strcat(menu_str, loc("Logout"));
- strcat(menu_str, ", ");
+ strcat(menu_str, "Config, Logout, ");
}
else
{
- strcat(menu_str, loc("Config"));
- strcat(menu_str, ", ");
+ strcat(menu_str, "Config, ");
}
- strcat(menu_str, loc("Help"));
+ strcat(menu_str, "Help");
}
else
{
- /* localize menu commands */
+ /* check for admin command */
n = strbreak(menu_str, menu_item, MAX_N_LIST);
menu_str[0] = 0;
admin_user[0] = 0;
getcfg(lbs->name, "Admin user", admin_user);
for (i=0 ; iname, "Admin user", str) &&
*getparam("unm") &&
strstr(str, getparam("unm")) != 0)
{
- strcat(other_str, loc("Remove user"));
- strcat(other_str, " ");
- strcat(other_str, loc("New user"));
- strcat(other_str, " ");
- strcat(other_str, "Activate");
- strcat(other_str, " ");
+ strcat(other_str, "Remove user, New user, Activate, ");
}
else
if (getcfg(lbs->name, "Self register", str) &&
atoi(str) > 0)
{
- strcat(other_str, loc("Remove user"));
- strcat(other_str, " ");
- strcat(other_str, loc("New user"));
- strcat(other_str, " ");
+ strcat(other_str, "Remove user, New user, ");
}
/* allow change password if "config" possible */
if (equal_ustring(command, loc("Change password")) &&
- strstr(menu_str, loc("Config")))
+ strstr(menu_str, "Config"))
{
}
- /* check if command is present in the menu list */
- else if (command[0] && strstr(menu_str, command) == NULL &&
- strstr(other_str, command) == NULL)
+ /* check if command is present in the menu list, exclude non-localized submit for elog */
+ else if (command[0] && !equal_ustring(command, "Submit"))
{
- sprintf(str, loc("Error: Command \"%s\" not allowed"), command);
- show_error(str);
- return;
+ n = strbreak(menu_str, menu_item, MAX_N_LIST);
+ for (i=0 ; i%s\" not allowed"), command);
+ show_error(str);
+ return;
+ }
+ }
}
/*---- check next/previous message -------------------------------*/
@@ -8232,7 +8247,7 @@ BOOL first;
for (i=0 ; i len)
+ if (getcfg(lbs->name, cmd, str))
{
- /* extract logbook */
- if (menu_item[i][len+1] == '"')
- strcpy(ref, menu_item[i]+len+2);
- else
- strcpy(ref, menu_item[i]+len+1);
- if (strchr(ref, '"'))
- *strchr(ref, '"') = 0;
+ n_log = strbreak(str, lbk_list, MAX_N_LIST);
- url_encode(ref);
+ for (j=0 ; j%s |\n",
- lbs->name_enc, message_id, loc("Copy to"), ref, menu_item[i]);
- else
- rsprintf(" %s |\n",
- lbs->name_enc, message_id, loc("Move to"), ref, menu_item[i]);
+ if (equal_ustring(cmd, loc("Copy to")))
+ rsprintf(" %s \"%s\" |\n",
+ lbs->name_enc, message_id, loc(cmd), ref, loc(cmd), lbk_list[j]);
+ else
+ rsprintf(" %s \"%s\" |\n",
+ lbs->name_enc, message_id, loc(cmd), ref, loc(cmd), lbk_list[j]);
+ }
}
else
{
@@ -8346,24 +8345,24 @@ BOOL first;
strcpy(ref, str);
url_encode(ref);
- if (equal_ustring(menu_item[i], loc("Copy to")))
+ if (equal_ustring(cmd, "Copy to"))
rsprintf(" %s \"%s\" |\n",
- lbs->name_enc, message_id, loc("Copy to"), ref, loc("Copy to"), str);
+ lbs->name_enc, message_id, loc(cmd), ref, loc(cmd), str);
else
rsprintf(" %s \"%s\" |\n",
- lbs->name_enc, message_id, loc("Move to"), ref, loc("Move to"), str);
+ lbs->name_enc, message_id, loc(cmd), ref, loc(cmd), str);
}
}
}
else
{
- strcpy(str, menu_item[i]);
+ strcpy(str, loc(menu_item[i]));
url_encode(str);
if (i < n-1)
- rsprintf(" %s |\n", message_id, str, menu_item[i]);
+ rsprintf(" %s |\n", message_id, str, loc(menu_item[i]));
else
- rsprintf(" %s \n", message_id, str, menu_item[i]);
+ rsprintf(" %s \n", message_id, str, loc(menu_item[i]));
}
}
@@ -9665,6 +9664,13 @@ FILE *f;
if (equal_ustring(command, loc("Find")))
{
+ /* stip message id */
+ if (dec_path[0])
+ {
+ sprintf(str, "../%s/?cmd=%s", lbs->name_enc, loc("Find"));
+ redirect(str);
+ return;
+ }
show_elog_find(lbs);
return;
}
@@ -9712,7 +9718,7 @@ FILE *f;
return;
}
- if (equal_ustring(command, loc("Change Password")) ||
+ if (equal_ustring(command, loc("Change password")) ||
(isparam("newpwd") && !equal_ustring(command, loc("Cancel")) && !equal_ustring(command, loc("Save"))))
{
show_change_pwd_page(lbs);
@@ -9741,7 +9747,7 @@ FILE *f;
return;
}
- if (equal_ustring(command, loc("Activate")))
+ if (equal_ustring(command, "Activate"))
{
if (!save_user_config(lbs, getparam("new_user_name"), TRUE, TRUE))
return;
|