diff --git a/doc/ChangeLog b/doc/ChangeLog index de4a5043..a80c9912 100755 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -2,7 +2,14 @@ Version 2.3.4, released March xxth, 2003 ======================================== - Added option "Quote on reply" - +- Added option "Admin textarea" +- Fixed problem that replies with attachment upload erased original + messages +- Fixed enless loop if user gets renamed in password file but browser + keeps old cookie +- Only ownwer can delete entry if 'restrict edit = 1' +- Fixed error that logbook URL was wrong if messages are submitted via elog +- Added "Icon comment" option Version 2.3.3, released March 14th, 2003 ======================================== diff --git a/doc/config.html b/doc/config.html index cf99091c..eb06e156 100755 --- a/doc/config.html +++ b/doc/config.html @@ -612,6 +612,12 @@ New icons are welcome and should be sent back to the author to be incorporated in the next version.

+

  • Icon comment <icon> = <comment> +
    +Icons may contain a comment, which is then used in email notifications instead +of the icon file name. One has to add a separate icon comment for each icon file. +

    +

  • Options <attribute> = boolean
    If an attribute is marked "boolean" this way, a checkbox is displayed for diff --git a/doc/wishlist.html b/doc/wishlist.html index d1f90669..9c29a09a 100755 --- a/doc/wishlist.html +++ b/doc/wishlist.html @@ -33,17 +33,18 @@ starting at the items with the most votes. You can vote for a feature, or sugges FeatureVotes Get message from standard input in elog submission program1 -Implement groups of users1 +Implement groups of users2 Display the last logbook entry date and author on logbook selection page1 Multiple templates for "Preset text"1 -Conditional attributes2 +Conditional attributes3 Remove HTML tags for summary tags for "summary only" search mode1 Use "and" and "or" operands in queries1 Password expiration, email forgotten password upon request1 -Require entered attribute must be date, number, alpha, certain length2 +Require entered attribute must be date, number, alpha, certain length3 Search substring in all attributes (not only text body)1 Execute shell script on server for email (SMS, pager) notification1 Make attributes to display selectable in "Find" page1 +Convert elog text files into XML files with elconv1

    diff --git a/src/elogd.c b/src/elogd.c index ed12e11c..b0c49b40 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -6,6 +6,9 @@ Contents: Web server program for Electronic Logbook ELOG $Log$ + Revision 1.55 2003/03/26 11:21:37 midas + Added 'Icon comment' option + Revision 1.54 2003/03/26 10:38:49 midas Fixed error that logbook URL was wrong if messages are submitted via elog @@ -5272,7 +5275,13 @@ time_t now; else rsprintf("", attr_list[index], attr_options[index][i]); - rsprintf("\n", attr_options[index][i]); + sprintf(str, "Icon comment %s", attr_options[index][i]); + getcfg(lbs->name, str, comment); + + if (comment[0]) + rsprintf("\"%s\"\n", attr_options[index][i], comment); + else + rsprintf("\n", attr_options[index][i]); } rsprintf("\n"); @@ -5572,7 +5581,7 @@ time_t now; void show_find_form(LOGBOOK *lbs) { int i, j; -char str[NAME_LENGTH], mode[256]; +char str[NAME_LENGTH], mode[256], comment[256]; /*---- header ----*/ @@ -5736,8 +5745,15 @@ char str[NAME_LENGTH], mode[256]; { for (j=0 ; jname, str, comment); + rsprintf("", attr_list[i], attr_options[i][j]); - rsprintf("\n", attr_options[i][j]); + + if (comment[0]) + rsprintf("\"%s\"\n", attr_options[i][j], comment); + else + rsprintf("\n", attr_options[i][j]); } } @@ -6742,9 +6758,9 @@ FILE *f; { /* display standard icons */ if (level == 0) - rsprintf(" "); + rsprintf(" "); else - rsprintf(" ", ref); + rsprintf(" ", ref); } } @@ -6806,9 +6822,9 @@ FILE *f; if (equal_ustring(mode, "Threaded")) { if (level == 0) - rsprintf(" "); + rsprintf(" "); else - rsprintf(" "); + rsprintf(" "); skip_comma = TRUE; } @@ -8900,9 +8916,9 @@ int compose_email(LOGBOOK *lbs, char *mail_to, int message_id, char attrib[MAX_N char *mail_param, int old_mail) { int i, j, n; -char str[NAME_LENGTH+100], mail_from[256], *mail_text, smtp_host[256], subject[256]; +char str[NAME_LENGTH+100], str2[256], mail_from[256], *mail_text, smtp_host[256], subject[256]; char slist[MAX_N_ATTR+10][NAME_LENGTH], svalue[MAX_N_ATTR+10][NAME_LENGTH]; -char list[MAX_PARAM][NAME_LENGTH], url[256]; +char list[MAX_PARAM][NAME_LENGTH], url[256], comment[256]; if (!getcfg("global", "SMTP host", smtp_host)) { @@ -8933,7 +8949,18 @@ char list[MAX_PARAM][NAME_LENGTH], url[256]; { strcpy(str, " "); memcpy(str, attr_list[j], strlen(attr_list[j])); - sprintf(str+20, ": %s\r\n", attrib[j]); + + comment[0] = 0; + if (attr_flags[j] & AF_ICON) + { + sprintf(str2, "Icon comment %s", attrib[j]); + getcfg(lbs->name, str2, comment); + } + + if (comment[0]) + sprintf(str+20, ": %s\r\n", comment); + else + sprintf(str+20, ": %s\r\n", attrib[j]); strcpy(mail_text+strlen(mail_text), str); } @@ -9534,7 +9561,7 @@ char date[80], text[TEXT_SIZE], menu_str[1000], cmd[256], cmd_enc[256], orig_tag[80], reply_tag[256], attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], att[256], lattr[256]; char menu_item[MAX_N_LIST][NAME_LENGTH], format[80], admin_user[80], slist[MAX_N_ATTR+10][NAME_LENGTH], svalue[MAX_N_ATTR+10][NAME_LENGTH], *p; -char lbk_list[MAX_N_LIST][NAME_LENGTH]; +char lbk_list[MAX_N_LIST][NAME_LENGTH], comment[256]; FILE *f; BOOL first; @@ -10043,7 +10070,15 @@ BOOL first; { rsprintf("%s:\n", attr_list[i]); if (attrib[i][0]) - rsprintf("", attrib[i]); + { + sprintf(str, "Icon comment %s", attrib[i]); + getcfg(lbs->name, str, comment); + + if (comment[0]) + rsprintf("\"%s\"", attrib[i], comment); + else + rsprintf("", attrib[i]); + } rsprintf(" \n"); } else