What is ELOG ?
diff --git a/elog.nsi b/elog.nsi
index 5f80d8ba..60061d4d 100755
--- a/elog.nsi
+++ b/elog.nsi
@@ -96,7 +96,7 @@ Section "ELOG system (required)" SecSystem
MessageBox MB_YESNO|MB_ICONQUESTION "Would you like to overwrite your existing theme files?" IDNO themesNotOverwrite
themesNotExist:
File themes\default\*.css
- File themes\default\*.gif
+ File themes\default\*.png
File themes\default\*.ico
File themes\default\*.png
SetOutPath $INSTDIR\themes\default\icons
diff --git a/eloglang.brazilian b/eloglang.brazilian
index 981840dd..147fb0b1 100755
--- a/eloglang.brazilian
+++ b/eloglang.brazilian
@@ -343,3 +343,8 @@ Text fields may contain regular expressions =
Case sensitive =
List =
Date must be between 1970 and 2037 =
+up =
+down =
+stop =
+Entry =
+name may not contain blanks =
diff --git a/eloglang.bulgarian b/eloglang.bulgarian
index dd4fdd72..e789aaef 100755
--- a/eloglang.bulgarian
+++ b/eloglang.bulgarian
@@ -343,3 +343,8 @@ Attachment file "%s" empty or not found =
#
#---- please translate following items and then remove this comment ----#
#
+up =
+down =
+stop =
+Entry =
+name may not contain blanks =
diff --git a/eloglang.danish b/eloglang.danish
index a219b7c5..f0a801c3 100755
--- a/eloglang.danish
+++ b/eloglang.danish
@@ -343,3 +343,8 @@ Text fields may contain regular expressions =
Case sensitive =
List =
Date must be between 1970 and 2037 =
+up =
+down =
+stop =
+Entry =
+name may not contain blanks =
diff --git a/eloglang.dutch b/eloglang.dutch
index aebf0c87..76bf899d 100755
--- a/eloglang.dutch
+++ b/eloglang.dutch
@@ -346,3 +346,8 @@ Date must be between 1970 and 2037 = Datum moet tussen 1970 en 2037 liggen
#
#---- please translate following items and then remove this comment ----#
#
+up =
+down =
+stop =
+Entry =
+name may not contain blanks =
diff --git a/eloglang.french b/eloglang.french
index c8a88e82..0b184bcf 100755
--- a/eloglang.french
+++ b/eloglang.french
@@ -339,3 +339,12 @@ Case sensitive = Tient compte de la casse
List = Liste
From = De
Date must be between 1970 and 2037 = La date doit être comprise entre 1970 et 2037
+
+#
+#---- please translate following items and then remove this comment ----#
+#
+up =
+down =
+stop =
+Entry =
+name may not contain blanks =
diff --git a/eloglang.german b/eloglang.german
index 5eb691cc..0f20a676 100755
--- a/eloglang.german
+++ b/eloglang.german
@@ -338,3 +338,8 @@ Text fields may contain regular expressions = Texteingabefelder k
Case sensitive = Großschrteibung beachten
List = Liste
Date must be between 1970 and 2037 = Das Datum muß zwischen 1970 und 2037 liegen
+up = Hoch
+down = Runter
+stop = Stop
+Entry = Eintrag
+name may not contain blanks = Name darf keine Leerstellen enthalten
diff --git a/eloglang.italian b/eloglang.italian
index a066e506..56b26fed 100755
--- a/eloglang.italian
+++ b/eloglang.italian
@@ -342,3 +342,8 @@ Text fields may contain regular expressions =
Case sensitive =
List =
Date must be between 1970 and 2037 =
+up =
+down =
+stop =
+Entry =
+name may not contain blanks =
diff --git a/eloglang.japanese b/eloglang.japanese
index ec84f9a2..0e65bd43 100755
--- a/eloglang.japanese
+++ b/eloglang.japanese
@@ -341,3 +341,8 @@ Text fields may contain regular expressions =
Case sensitive =
List =
Date must be between 1970 and 2037 =
+up =
+down =
+stop =
+Entry =
+name may not contain blanks =
diff --git a/eloglang.spanish b/eloglang.spanish
index 874f2d15..244ad4cf 100755
--- a/eloglang.spanish
+++ b/eloglang.spanish
@@ -339,3 +339,8 @@ Case sensitive =
From =
List =
Date must be between 1970 and 2037 =
+up =
+down =
+stop =
+Entry =
+name may not contain blanks =
diff --git a/src/elogd.c b/src/elogd.c
index 62cf6a4c..f6982b69 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG
$Log$
+ Revision 1.557 2005/02/14 10:52:36 ritt
+ Version 2.5.7-1
+
Revision 1.556 2005/02/14 10:44:16 ritt
Fixed buffer overflow in decode_post()
@@ -1173,7 +1176,7 @@ int read_password(char *pwd, int size);
int getcfg(char *group, char *param, char *value, int vsize);
int build_subst_list(LOGBOOK * lbs, char list[][NAME_LENGTH], char value[][NAME_LENGTH],
char attrib[][NAME_LENGTH], BOOL format_date);
-void highlight_searchtext(regex_t *re_buf, char *src, char *dst, BOOL hidden);
+void highlight_searchtext(regex_t * re_buf, char *src, char *dst, BOOL hidden);
/*---- Funcions from the MIDAS library -----------------------------*/
@@ -1245,7 +1248,7 @@ static BOOL chkext(const char *str, const char *ext)
strl = strlen(str);
if (extl >= strl)
return FALSE;
- str = str+strl-extl;
+ str = str + strl - extl;
while (*str) {
c1 = *str++;
c2 = *ext++;
@@ -3532,7 +3535,7 @@ void retrieve_email_from(LOGBOOK * lbs, char *ret, char attrib[MAX_N_ATTR][NAME_
/* remove possible 'mailto:' */
if ((p = strstr(str, "mailto:")) != NULL)
- strcpy(p, p+7);
+ strcpy(p, p + 7);
}
/* if nothing available, figure out email from an administrator */
@@ -4399,7 +4402,7 @@ INT el_retrieve(LOGBOOK * lbs,
int el_submit_attachment(LOGBOOK * lbs, char *afilename, char *buffer, int buffer_size, char *full_name)
{
- char file_name[MAX_PATH_LENGTH], ext_file_name[MAX_PATH_LENGTH+100], str[MAX_PATH_LENGTH], *p;
+ char file_name[MAX_PATH_LENGTH], ext_file_name[MAX_PATH_LENGTH + 100], str[MAX_PATH_LENGTH], *p;
int fh;
time_t now;
struct tm tms;
@@ -4439,7 +4442,7 @@ int el_submit_attachment(LOGBOOK * lbs, char *afilename, char *buffer, int buffe
/* save attachment */
fh = open(str, O_CREAT | O_RDWR | O_BINARY, 0644);
if (fh < 0) {
- strlcpy(file_name, str, sizeof(str)-40);
+ strlcpy(file_name, str, sizeof(str) - 40);
sprintf(str, "Cannot write attachment file \"%s\"", file_name);
show_error(str);
return -1;
@@ -7675,7 +7678,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
}
}
- for (index = 0 ; index < lbs->n_attr ; index++) {
+ for (index = 0; index < lbs->n_attr; index++) {
/* check for preset string */
sprintf(str, "Preset %s", attr_list[index]);
@@ -8405,7 +8408,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
rsprintf("![\"%s\"](\"reply.png\")
", loc("reply"));
+ rsprintf(" ", loc("Reply"));
else {
/* display standard icons */
if (level == 0)
- rsprintf("![\"%s\"](\"entry.png\")
", loc("entry"));
+ rsprintf(" ", loc("Entry"));
else
- rsprintf(" ", loc("reply"));
+ rsprintf(" ", loc("Reply"));
}
}
if (highlight != message_id)
@@ -13429,9 +13431,9 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode,
if (strieq(disp_attr[index], loc("ID"))) {
if (strieq(mode, "Threaded")) {
if (level == 0)
- rsprintf(" ", loc("entry"));
+ rsprintf(" ", loc("Entry"));
else
- rsprintf(" ", loc("reply"));
+ rsprintf(" ", loc("Reply"));
skip_comma = TRUE;
@@ -13526,7 +13528,8 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode,
else if (attr_flags[i] & AF_ICON) {
if (attrib[i][0])
- rsprintf(" ", colspan);
@@ -13790,8 +13792,8 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode,
void display_reply(LOGBOOK * lbs, int message_id, int printable,
int expand, int n_line, int n_attr_disp,
- char disp_attr[MAX_N_ATTR + 4][NAME_LENGTH], BOOL show_text,
- int level, int highlight, regex_t *re_buf)
+ char disp_attr[MAX_N_ATTR + 4][NAME_LENGTH], BOOL show_text,
+ int level, int highlight, regex_t * re_buf)
{
char *date, *text, *in_reply_to, *reply_to, *encoding, *locked_by, *attachment, *attrib, *p;
int status, size;
@@ -14758,15 +14760,15 @@ void show_rss_feed(LOGBOOK * lbs)
/*------------------------------------------------------------------*/
-void highlight_searchtext(regex_t *re_buf, char *src, char *dst, int hidden)
+void highlight_searchtext(regex_t * re_buf, char *src, char *dst, int hidden)
{
char *pt, *pt1;
int size, status;
regmatch_t pmatch[10];
dst[0] = 0;
- pt = src; /* original text */
- pt1 = dst; /* text with inserted coloring */
+ pt = src; /* original text */
+ pt1 = dst; /* text with inserted coloring */
do {
status = regexec(re_buf, pt, 10, pmatch, 0);
if (status != REG_NOMATCH) {
@@ -15247,7 +15249,7 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n, char *inf
/* apply filter for attributes */
for (i = 0; i < lbs->n_attr; i++) {
-
+
/* check for multi attributes */
if (attr_flags[i] & AF_MULTI) {
@@ -16073,8 +16075,7 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n, char *inf
text1[i] = 0;
*/
- highlight_searchtext(re_buf, text, text1,
- strieq(encoding, "plain") || !strieq(mode, "Full"));
+ highlight_searchtext(re_buf, text, text1, strieq(encoding, "plain") || !strieq(mode, "Full"));
strlcpy(text, text1, TEXT_SIZE);
}
@@ -16987,7 +16988,7 @@ void submit_elog(LOGBOOK * lbs)
/* remove possible 'mailto:' */
if ((p = strstr(mail_list[i], "mailto:")) != NULL)
- strcpy(p, p+7);
+ strcpy(p, p + 7);
if ((int) strlen(mail_to) + (int) strlen(mail_list[i]) >= mail_to_size) {
mail_to_size += 256;
@@ -17753,7 +17754,8 @@ void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command)
if (locked_by && locked_by[0]) {
sprintf(str, "%s %s", loc("Entry is currently edited by"), locked_by);
- rsprintf("![\"%s\"](\"stop.png\")
\n", loc("stop"));
+ rsprintf("\n",
+ loc("stop"));
rsprintf("%s
%s \n");
rsprintf("\n", index + 1);
- rsprintf("![\"%s\"](\"%s\")