From e575daa275744c628848a09dab5b099bdc6b2605 Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Mon, 21 Mar 2005 16:16:52 +0000 Subject: [PATCH] Version 2.8.1-1 SVN revision: 1259 --- doc/ChangeLog | 21 +++ doc/index.html | 2 +- eloglang.brazilian | 7 +- eloglang.bulgarian | 7 +- eloglang.danish | 7 +- eloglang.dutch | 7 +- eloglang.french | 11 +- eloglang.german | 7 +- eloglang.italian | 7 +- eloglang.japanese | 7 +- eloglang.spanish | 7 +- src/elog.c | 5 +- src/elogd.c | 358 +++++++++++++++++++++++---------------------- 13 files changed, 265 insertions(+), 188 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 986539c1..208c97b8 100755 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,24 @@ +Version 2.5.8, released March 21st, 2005 +======================================== + +- Fixed problem with MOptions and elog +- Implemented option 'link display' +- Show attributes as HTML if they contain '' etc. +- Fixed problem with multiple extendable options +- Fixed bug with resubmit box and conditional attributes +- Implemented email subscriptions for individual logbooks +- Encode '&' correctly if present in 'Start page' option +- Implemented support for thumbnail display +- Implemented MXML for password file +- Applied patch from Emiliano Gabrielli to use chkext() +- Improved speed by pre-parsing configuration file +- Applied patch from Heiko Scheit fixing problem with 'Show attributes' causing the 'Format ...' options to be ignored +- Implemented $attachements subsitution in 'execute' command +- Added web link to regular expressions +- Test regular expressions for validity +- Use 'attachmentframe' style +- Fixed HTML code to pass validator + Version 2.5.7, released Februar 14th, 2005 ========================================== diff --git a/doc/index.html b/doc/index.html index 7e855075..42eb4aaf 100755 --- a/doc/index.html +++ b/doc/index.html @@ -25,7 +25,7 @@  [Links]  * 

Home of the Electronic Logbook package by Stefan Ritt

-
Current version is : 2.5.7
+
Current version is : 2.5.8
  What is ELOG ?  
diff --git a/eloglang.brazilian b/eloglang.brazilian index 147fb0b1..0fc89f17 100755 --- a/eloglang.brazilian +++ b/eloglang.brazilian @@ -339,7 +339,6 @@ Hide all = Show all = This logbook requires authentication = Attachment file "%s" empty or not found = -Text fields may contain regular expressions = Case sensitive = List = Date must be between 1970 and 2037 = @@ -348,3 +347,9 @@ down = stop = Entry = name may not contain blanks = +regular expressions = +Text fields are treated as %s = +Subscribe to logbooks = +enable automatic email notifications = +Set all = +Set none = diff --git a/eloglang.bulgarian b/eloglang.bulgarian index e789aaef..c3783dbc 100755 --- a/eloglang.bulgarian +++ b/eloglang.bulgarian @@ -144,7 +144,6 @@ Search all logbooks = Display = Èçâåæäàíå íà entries per page = çàïèñà íà ñòðàíèöà Filters = Ôèëòðè -Text fields may contain regular expressions = Òåêñòîâèòå ïîëåòà ìîãàò äà ñúäúðæàò ðåãóëÿðíè èçðàçè Entry date = Äàòà íà çàïèñ Start = Íà÷àëî Show last = Ïîêàçâàíå íà ïîñëåäíèÿ @@ -348,3 +347,9 @@ down = stop = Entry = name may not contain blanks = +regular expressions = +Text fields are treated as %s = +Subscribe to logbooks = +enable automatic email notifications = +Set all = +Set none = diff --git a/eloglang.danish b/eloglang.danish index f0a801c3..0f4aeadd 100755 --- a/eloglang.danish +++ b/eloglang.danish @@ -339,7 +339,6 @@ Hide all = Show all = This logbook requires authentication = Attachment file "%s" empty or not found = -Text fields may contain regular expressions = Case sensitive = List = Date must be between 1970 and 2037 = @@ -348,3 +347,9 @@ down = stop = Entry = name may not contain blanks = +regular expressions = +Text fields are treated as %s = +Subscribe to logbooks = +enable automatic email notifications = +Set all = +Set none = diff --git a/eloglang.dutch b/eloglang.dutch index 76bf899d..1d4db070 100755 --- a/eloglang.dutch +++ b/eloglang.dutch @@ -337,7 +337,6 @@ Hide all = Alles Verbergen Show all = Alles laten zien This logbook requires authentication = Dit logboek vereist authenticatie Attachment file "%s" empty or not found = Bijlage bestand "%s" leeg of niet gevonden -Text fields may contain regular expressions = Tekstvelden kunnen reguliere uitdrukkingen bevatten Case sensitive = Hoofdlettergevoelig From = Van List = Lijst @@ -351,3 +350,9 @@ down = stop = Entry = name may not contain blanks = +regular expressions = +Text fields are treated as %s = +Subscribe to logbooks = +enable automatic email notifications = +Set all = +Set none = diff --git a/eloglang.french b/eloglang.french index aeb5373c..9710da17 100755 --- a/eloglang.french +++ b/eloglang.french @@ -334,7 +334,6 @@ Hide all = Cacher tout Show all = Montrer tout This logbook requires authentication = Ce registre nécessite une authentification Attachment file "%s" empty or not found = Fichier joint "%s" vide ou non trouvé -Text fields may contain regular expressions = Les champs "texte" peuvent contenir des expressions régulières Case sensitive = Tient compte de la casse List = Liste From = De @@ -344,3 +343,13 @@ down = bas stop = arrêter Entry = Entrée name may not contain blanks = le nom de doit pas contenir d'espace + +# +#---- please translate following items and then remove this comment ----# +# +regular expressions = +Text fields are treated as %s = +Subscribe to logbooks = +enable automatic email notifications = +Set all = +Set none = diff --git a/eloglang.german b/eloglang.german index 0f20a676..df4dd40b 100755 --- a/eloglang.german +++ b/eloglang.german @@ -334,7 +334,6 @@ Hide all = Alle verstecken Show all = Alle anzeigen This logbook requires authentication = Dieses Logbuch erfordert Authentifizierung Attachment file "%s" empty or not found = Datei "%s" ist leer oder nicht vorhanden -Text fields may contain regular expressions = Texteingabefelder können Reguläre Ausdrücke enthalten Case sensitive = Großschrteibung beachten List = Liste Date must be between 1970 and 2037 = Das Datum muß zwischen 1970 und 2037 liegen @@ -343,3 +342,9 @@ down = Runter stop = Stop Entry = Eintrag name may not contain blanks = Name darf keine Leerstellen enthalten +regular expressions = Reguläre Ausdrücke +Text fields are treated as %s = Textfelder werden als %s behandelt +Subscribe to logbooks = Logbücher abbonieren +enable automatic email notifications = Automatische Email Benachrichtigung ermöglichen +Set all = Alle ermöglichen +Set none = Keinen ermöglichen diff --git a/eloglang.italian b/eloglang.italian index 56b26fed..2fbeca3e 100755 --- a/eloglang.italian +++ b/eloglang.italian @@ -338,7 +338,6 @@ Hide all = Show all = This logbook requires authentication = Attachment file "%s" empty or not found = -Text fields may contain regular expressions = Case sensitive = List = Date must be between 1970 and 2037 = @@ -347,3 +346,9 @@ down = stop = Entry = name may not contain blanks = +regular expressions = +Text fields are treated as %s = +Subscribe to logbooks = +enable automatic email notifications = +Set all = +Set none = diff --git a/eloglang.japanese b/eloglang.japanese index 0e65bd43..55794088 100755 --- a/eloglang.japanese +++ b/eloglang.japanese @@ -337,7 +337,6 @@ Hide all = Show all = This logbook requires authentication = Attachment file "%s" empty or not found = -Text fields may contain regular expressions = Case sensitive = List = Date must be between 1970 and 2037 = @@ -346,3 +345,9 @@ down = stop = Entry = name may not contain blanks = +regular expressions = +Text fields are treated as %s = +Subscribe to logbooks = +enable automatic email notifications = +Set all = +Set none = diff --git a/eloglang.spanish b/eloglang.spanish index 244ad4cf..6828395a 100755 --- a/eloglang.spanish +++ b/eloglang.spanish @@ -334,7 +334,6 @@ Attachment file "%s" empty or not found = Archivo adjunto "%s" est # #---- please translate following items and then remove this comment ----# # -Text fields may contain regular expressions = Case sensitive = From = List = @@ -344,3 +343,9 @@ down = stop = Entry = name may not contain blanks = +regular expressions = +Text fields are treated as %s = +Subscribe to logbooks = +enable automatic email notifications = +Set all = +Set none = diff --git a/src/elog.c b/src/elog.c index 7e4120c9..b00c8849 100755 --- a/src/elog.c +++ b/src/elog.c @@ -6,6 +6,9 @@ Contents: Electronic logbook utility $Log$ + Revision 1.25 2005/03/21 16:16:52 ritt + Version 2.8.1-1 + Revision 1.24 2005/03/21 16:06:48 ritt Added STRLCPY_DEFINED @@ -263,7 +266,7 @@ size_t strlcat(char *dst, const char *src, size_t size) return (dlen + (s - src)); /* count does not include NUL */ } -#endif // STRLCPY_DEFINED +#endif // STRLCPY_DEFINED /*-------------------------------------------------------------------*/ diff --git a/src/elogd.c b/src/elogd.c index 5a48c450..0d534c9d 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -6,6 +6,9 @@ Contents: Web server program for Electronic Logbook ELOG $Log$ + Revision 1.591 2005/03/21 16:16:52 ritt + Version 2.8.1-1 + Revision 1.590 2005/03/21 07:37:43 ritt Fixed warnings under cygwin @@ -885,7 +888,7 @@ \********************************************************************/ /* Version of ELOG */ -#define VERSION "2.5.7-1" +#define VERSION "2.5.8-1" char cvs_revision[] = "$Id$"; /* ELOG identification */ @@ -1258,33 +1261,33 @@ int run_service(void); #endif void show_error(char *error); -BOOL enum_user_line(LOGBOOK *lbs, int n, char *user, int size); -int get_user_line(LOGBOOK *lbs, char *user, char *password, char *full_name, +BOOL enum_user_line(LOGBOOK * lbs, int n, char *user, int size); +int get_user_line(LOGBOOK * lbs, char *user, char *password, char *full_name, char *email, BOOL email_notify[1000]); int strbreak(char *str, char list[][NAME_LENGTH], int size, char *brk); -int execute_shell(LOGBOOK *lbs, int message_id, char attrib[MAX_N_ATTR][NAME_LENGTH], +int execute_shell(LOGBOOK * lbs, int message_id, char attrib[MAX_N_ATTR][NAME_LENGTH], char att_file[MAX_ATTACHMENTS][256], char *sh_cmd); BOOL isparam(char *param); char *getparam(char *param); -void write_logfile(LOGBOOK *lbs, const char *format, ...); -BOOL check_login_user(LOGBOOK *lbs, char *user); +void write_logfile(LOGBOOK * lbs, const char *format, ...); +BOOL check_login_user(LOGBOOK * lbs, char *user); LBLIST get_logbook_hierarchy(void); BOOL is_logbook_in_group(LBLIST pgrp, char *logbook); BOOL is_admin_user(char *logbook, char *user); BOOL is_admin_user_global(char *user); void free_logbook_hierarchy(LBLIST root); -void show_top_text(LOGBOOK *lbs); -void show_bottom_text(LOGBOOK *lbs); -int set_attributes(LOGBOOK *lbs, char attributes[][NAME_LENGTH], int n); -void show_elog_list(LOGBOOK *lbs, INT past_n, INT last_n, INT page_n, char *info); -int change_config_line(LOGBOOK *lbs, char *option, char *old_value, char *new_value); +void show_top_text(LOGBOOK * lbs); +void show_bottom_text(LOGBOOK * lbs); +int set_attributes(LOGBOOK * lbs, char attributes[][NAME_LENGTH], int n); +void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n, char *info); +int change_config_line(LOGBOOK * lbs, char *option, char *old_value, char *new_value); 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], +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); int parse_config_file(char *config_file); -PMXML_NODE load_password_file(LOGBOOK *lbs); +PMXML_NODE load_password_file(LOGBOOK * lbs); /*---- Funcions from the MIDAS library -----------------------------*/ @@ -2394,7 +2397,7 @@ INT recv_string(int sock, char *buffer, INT buffer_size, INT millisec) /*-------------------------------------------------------------------*/ -INT sendmail(LOGBOOK *lbs, char *smtp_host, char *from, char *to, +INT sendmail(LOGBOOK * lbs, char *smtp_host, char *from, char *to, char *subject, char *text, BOOL email_to, char *url, char att_file[MAX_ATTACHMENTS][256]) { struct sockaddr_in bind_addr; @@ -2938,7 +2941,7 @@ typedef struct { typedef struct { char *section_name; - int n_params; + int n_params; CONFIG_PARAM *config_param; } LB_CONFIG; @@ -3062,7 +3065,7 @@ BOOL match_param(char *str, char *param, int conditional_only) int param_compare(const void *p1, const void *p2) { - return stricmp(((CONFIG_PARAM *)p1)->uparam, ((CONFIG_PARAM *)p2)->uparam); + return stricmp(((CONFIG_PARAM *) p1)->uparam, ((CONFIG_PARAM *) p2)->uparam); } /*------------------------------------------------------------------*/ @@ -3071,8 +3074,8 @@ void free_config() { int i, j; - for (i=0 ; i") || strstr(str, "
") || strstr(str, "") || strstr(str, "") || - strstr(str, "

")){ + strstr(str, "

")) { xfree(str); return TRUE; } @@ -5979,7 +5984,7 @@ void extract_host(char *str) /*------------------------------------------------------------------*/ -void set_location(LOGBOOK *lbs, char *rel_path) +void set_location(LOGBOOK * lbs, char *rel_path) { char str[NAME_LENGTH]; @@ -6047,7 +6052,7 @@ void set_location(LOGBOOK *lbs, char *rel_path) /*------------------------------------------------------------------*/ -void set_redir(LOGBOOK *lbs, char *redir) +void set_redir(LOGBOOK * lbs, char *redir) { char str[NAME_LENGTH]; @@ -6068,7 +6073,7 @@ void set_redir(LOGBOOK *lbs, char *redir) /*------------------------------------------------------------------*/ -void set_cookie(LOGBOOK *lbs, char *name, char *value, BOOL global, char *expiration) +void set_cookie(LOGBOOK * lbs, char *name, char *value, BOOL global, char *expiration) { char lb_name[256], str[NAME_LENGTH], format[80]; double exp; @@ -6126,7 +6131,7 @@ void set_cookie(LOGBOOK *lbs, char *name, char *value, BOOL global, char *expira /*------------------------------------------------------------------*/ -void redirect(LOGBOOK *lbs, char *rel_path) +void redirect(LOGBOOK * lbs, char *rel_path) { /* redirect */ rsprintf("HTTP/1.1 302 Found\r\n"); @@ -6372,7 +6377,7 @@ void show_plain_header(int size, char *file_name) rsprintf("\r\n"); } -void show_html_header(LOGBOOK *lbs, BOOL expires, char *title, BOOL close_head, BOOL rss_feed) +void show_html_header(LOGBOOK * lbs, BOOL expires, char *title, BOOL close_head, BOOL rss_feed) { char css[256], str[256]; @@ -6408,7 +6413,7 @@ void show_html_header(LOGBOOK *lbs, BOOL expires, char *title, BOOL close_head, rsprintf("\n"); } -void show_standard_header(LOGBOOK *lbs, BOOL expires, char *title, char *path, BOOL rss_feed) +void show_standard_header(LOGBOOK * lbs, BOOL expires, char *title, char *path, BOOL rss_feed) { show_html_header(lbs, expires, title, TRUE, rss_feed); @@ -6424,7 +6429,7 @@ void show_standard_header(LOGBOOK *lbs, BOOL expires, char *title, char *path, B /*------------------------------------------------------------------*/ -void show_upgrade_page(LOGBOOK *lbs) +void show_upgrade_page(LOGBOOK * lbs) { char str[1000]; @@ -6648,7 +6653,7 @@ BOOL is_logbook_in_group(LBLIST pgrp, char *logbook) /*------------------------------------------------------------------*/ -void change_logbook_in_group(LOGBOOK *lbs, char *new_name) +void change_logbook_in_group(LOGBOOK * lbs, char *new_name) { int i, j, n, flag; char str[1000], grpname[256], grpmembers[1000]; @@ -6684,7 +6689,7 @@ void change_logbook_in_group(LOGBOOK *lbs, char *new_name) /*------------------------------------------------------------------*/ -void add_logbook_to_group(LOGBOOK *lbs, char *new_name) +void add_logbook_to_group(LOGBOOK * lbs, char *new_name) { int i, j, n, flag; char str[1000], grpname[256], grpmembers[1000]; @@ -6861,7 +6866,7 @@ void show_standard_title(char *logbook, char *text, int printable) /*------------------------------------------------------------------*/ -void show_top_text(LOGBOOK *lbs) +void show_top_text(LOGBOOK * lbs) { char str[NAME_LENGTH]; int size; @@ -6897,7 +6902,7 @@ void show_top_text(LOGBOOK *lbs) /*------------------------------------------------------------------*/ -void show_bottom_text(LOGBOOK *lbs) +void show_bottom_text(LOGBOOK * lbs) { char str[NAME_LENGTH]; int size; @@ -6968,7 +6973,7 @@ void show_error(char *error) /*------------------------------------------------------------------*/ -void set_login_cookies(LOGBOOK *lbs, char *user, char *enc_pwd) +void set_login_cookies(LOGBOOK * lbs, char *user, char *enc_pwd) { char str[256], lb_name[256], exp[80]; BOOL global; @@ -7218,7 +7223,7 @@ void strencode2(char *b, char *text) /*------------------------------------------------------------------*/ -int build_subst_list(LOGBOOK *lbs, char list[][NAME_LENGTH], char value[][NAME_LENGTH], +int build_subst_list(LOGBOOK * lbs, char list[][NAME_LENGTH], char value[][NAME_LENGTH], char attrib[][NAME_LENGTH], BOOL format_date) { int i; @@ -7307,7 +7312,7 @@ void add_subst_list(char list[][NAME_LENGTH], char value[][NAME_LENGTH], char *i strcpy(value[(*i)++], str); } -void add_subst_time(LOGBOOK *lbs, +void add_subst_time(LOGBOOK * lbs, char list[][NAME_LENGTH], char value[][NAME_LENGTH], char *item, char *date, int *i) { char format[80], str[256]; @@ -7325,7 +7330,7 @@ void add_subst_time(LOGBOOK *lbs, /*------------------------------------------------------------------*/ -BOOL get_password_file(LOGBOOK *lbs, char *file_name, int size) +BOOL get_password_file(LOGBOOK * lbs, char *file_name, int size) { char str[256]; @@ -7346,7 +7351,7 @@ BOOL get_password_file(LOGBOOK *lbs, char *file_name, int size) /*------------------------------------------------------------------*/ -BOOL change_pwd(LOGBOOK *lbs, char *user, char *pwd) +BOOL change_pwd(LOGBOOK * lbs, char *user, char *pwd) { char str[256], file_name[256]; PMXML_NODE node; @@ -7369,7 +7374,7 @@ BOOL change_pwd(LOGBOOK *lbs, char *user, char *pwd) /*------------------------------------------------------------------*/ -void show_change_pwd_page(LOGBOOK *lbs) +void show_change_pwd_page(LOGBOOK * lbs) { char str[256], old_pwd[32], new_pwd[32], new_pwd2[32], act_pwd[32], user[80]; int wrong_pwd; @@ -7470,7 +7475,7 @@ void show_change_pwd_page(LOGBOOK *lbs) /*------------------------------------------------------------------*/ -int get_last_index(LOGBOOK *lbs, int index) +int get_last_index(LOGBOOK * lbs, int index) /* return value of specific attribute of last entry, can be used to auto-increment tags */ { @@ -7497,7 +7502,7 @@ auto-increment tags */ /*------------------------------------------------------------------*/ -BOOL is_author(LOGBOOK *lbs, char attrib[MAX_N_ATTR][NAME_LENGTH], char *owner) +BOOL is_author(LOGBOOK * lbs, char attrib[MAX_N_ATTR][NAME_LENGTH], char *owner) { char str[1000], preset[1000]; int i; @@ -7665,7 +7670,7 @@ void attrib_from_param(int n_attr, char attrib[MAX_N_ATTR][NAME_LENGTH]) /*------------------------------------------------------------------*/ -void show_edit_form(LOGBOOK *lbs, int message_id, BOOL breply, BOOL bedit, BOOL bupload, BOOL breedit) +void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL bupload, BOOL breedit) { int i, j, n, index, aindex, size, width, height, fh, length, input_size, input_maxlen, format_flags[MAX_N_ATTR], year, month, day, n_attr, n_disp_attr, attr_index[MAX_N_ATTR]; @@ -8971,7 +8976,7 @@ void show_edit_form(LOGBOOK *lbs, int message_id, BOOL breply, BOOL bedit, BOOL /*------------------------------------------------------------------*/ -void show_find_form(LOGBOOK *lbs) +void show_find_form(LOGBOOK * lbs) { int i, j; char str[NAME_LENGTH], mode[NAME_LENGTH], comment[NAME_LENGTH], option[NAME_LENGTH]; @@ -9316,7 +9321,7 @@ void load_config_section(char *section, char **buffer, char *error) /*------------------------------------------------------------------*/ -void show_admin_page(LOGBOOK *lbs, char *top_group) +void show_admin_page(LOGBOOK * lbs, char *top_group) { int rows, cols; char *buffer, error_str[256]; @@ -9565,7 +9570,7 @@ int save_admin_config(char *section, char *buffer, char *error) /*------------------------------------------------------------------*/ -int change_config_line(LOGBOOK *lbs, char *option, char *old_value, char *new_value) +int change_config_line(LOGBOOK * lbs, char *option, char *old_value, char *new_value) { int fh, i, j, n, length, bufsize; char str[NAME_LENGTH], *buf, *buf2, *p1, *p2, *p3; @@ -9678,7 +9683,7 @@ int change_config_line(LOGBOOK *lbs, char *option, char *old_value, char *new_va /*------------------------------------------------------------------*/ -int delete_logbook(LOGBOOK *lbs, char *error) +int delete_logbook(LOGBOOK * lbs, char *error) { int fh, i, length; char *buf, *p1, *p2; @@ -9737,7 +9742,7 @@ int delete_logbook(LOGBOOK *lbs, char *error) /*------------------------------------------------------------------*/ -int rename_logbook(LOGBOOK *lbs, char *new_name) +int rename_logbook(LOGBOOK * lbs, char *new_name) { int fh, i, length, bufsize; char *buf, *buf2, *p1, *p2; @@ -9955,12 +9960,12 @@ int save_config(char *buffer, char *error) /*------------------------------------------------------------------*/ -int save_user_config(LOGBOOK *lbs, char *user, BOOL new_user, BOOL activate) +int save_user_config(LOGBOOK * lbs, char *user, BOOL new_user, BOOL activate) { char file_name[256], str[256], *pl, new_pwd[80], new_pwd2[80]; char smtp_host[256], email_addr[256], mail_from[256], subject[256], mail_text[2000]; char admin_user[80], enc_pwd[80], url[256]; - int i, self_register; + int i, self_register; PMXML_NODE node, subnode; /* check for full name */ @@ -10027,7 +10032,7 @@ int save_user_config(LOGBOOK *lbs, char *user, BOOL new_user, BOOL activate) mxml_add_node(node, "password", getparam("encpwd")); else mxml_add_node(node, "password", new_pwd); - + } else { /* replace record */ mxml_replace_subvalue(node, "name", getparam("new_user_name")); @@ -10041,7 +10046,7 @@ int save_user_config(LOGBOOK *lbs, char *user, BOOL new_user, BOOL activate) mxml_delete_node(subnode); mxml_add_node(node, "email_notify", NULL); subnode = mxml_find_node(node, "email_notify"); - for (i=0 ; lb_list[i].name[0] ; i++) { + for (i = 0; lb_list[i].name[0]; i++) { sprintf(str, "sub_lb%d", i); if (getparam(str) && atoi(getparam(str))) mxml_add_node(subnode, "logbook", lb_list[i].name); @@ -10181,7 +10186,7 @@ int save_user_config(LOGBOOK *lbs, char *user, BOOL new_user, BOOL activate) /*------------------------------------------------------------------*/ -int remove_user(LOGBOOK *lbs, char *user) +int remove_user(LOGBOOK * lbs, char *user) { char file_name[256], str[256]; PMXML_NODE node; @@ -10211,7 +10216,7 @@ int ascii_compare(const void *s1, const void *s2) /*------------------------------------------------------------------*/ -void show_config_page(LOGBOOK *lbs) +void show_config_page(LOGBOOK * lbs) { char str[256], user[80], password[80], full_name[80], user_email[80], logbook[256]; char **user_list; @@ -10309,14 +10314,12 @@ void show_config_page(LOGBOOK *lbs) rsprintf("\n", full_name); rsprintf("Email:\n"); - rsprintf - ("\n", - user_email); + rsprintf("\n", user_email); rsprintf("%s:\n", loc("Subscribe to logbooks")); - rsprintf("
(%s)\n", - loc("enable automatic email notifications")); + rsprintf("
(%s)\n", + loc("enable automatic email notifications")); rsprintf("\n"); @@ -10382,7 +10385,7 @@ void show_config_page(LOGBOOK *lbs) /*------------------------------------------------------------------*/ -void show_forgot_pwd_page(LOGBOOK *lbs) +void show_forgot_pwd_page(LOGBOOK * lbs) { int i; char str[1000], login_name[256], full_name[256], user_email[256], @@ -10528,7 +10531,7 @@ void show_forgot_pwd_page(LOGBOOK *lbs) /*------------------------------------------------------------------*/ -void show_new_user_page(LOGBOOK *lbs) +void show_new_user_page(LOGBOOK * lbs) { int i; @@ -10577,8 +10580,8 @@ void show_new_user_page(LOGBOOK *lbs) rsprintf("%s:\n", loc("Subscribe to logbooks")); - rsprintf("
(%s)\n", - loc("enable automatic email notifications")); + rsprintf("
(%s)\n", + loc("enable automatic email notifications")); rsprintf("\n"); @@ -10634,7 +10637,7 @@ void show_new_user_page(LOGBOOK *lbs) /*------------------------------------------------------------------*/ -void show_elog_delete(LOGBOOK *lbs, int message_id) +void show_elog_delete(LOGBOOK * lbs, int message_id) { int i, status, reply, next; char str[256], in_reply_to[80], reply_to[MAX_REPLY_TO * 10], owner[256]; @@ -10791,7 +10794,7 @@ void show_elog_delete(LOGBOOK *lbs, int message_id) /*------------------------------------------------------------------*/ -void show_logbook_delete(LOGBOOK *lbs) +void show_logbook_delete(LOGBOOK * lbs) { char str[256]; @@ -10844,7 +10847,7 @@ void show_logbook_delete(LOGBOOK *lbs) /*------------------------------------------------------------------*/ -void show_logbook_rename(LOGBOOK *lbs) +void show_logbook_rename(LOGBOOK * lbs) { int i; char str[256], lbn[256]; @@ -10895,7 +10898,7 @@ void show_logbook_rename(LOGBOOK *lbs) /*------------------------------------------------------------------*/ -void show_logbook_new(LOGBOOK *lbs) +void show_logbook_new(LOGBOOK * lbs) { char str[256], lbn[256]; int i; @@ -10957,7 +10960,7 @@ void show_logbook_new(LOGBOOK *lbs) /*------------------------------------------------------------------*/ -int show_download_page(LOGBOOK *lbs, char *path) +int show_download_page(LOGBOOK * lbs, char *path) { char file_name[256], error_str[256]; int index, message_id, fh, i, size, delta; @@ -11085,7 +11088,7 @@ int download_config() /*------------------------------------------------------------------*/ -void show_import_page(LOGBOOK *lbs) +void show_import_page(LOGBOOK * lbs) { char str[256], str2[256]; @@ -11189,7 +11192,7 @@ void show_import_page(LOGBOOK *lbs) /*------------------------------------------------------------------*/ -void csv_import(LOGBOOK *lbs, char *csv, char *csvfile) +void csv_import(LOGBOOK * lbs, char *csv, char *csvfile) { char *list, *line, *p, str[256], date[80], sep[80]; int i, j, n, n_attr, iline, n_imported, textcol; @@ -11415,7 +11418,7 @@ void csv_import(LOGBOOK *lbs, char *csv, char *csvfile) /*------------------------------------------------------------------*/ -int show_md5_page(LOGBOOK *lbs) +int show_md5_page(LOGBOOK * lbs) { int i, j; char *buffer, error_str[256]; @@ -11461,7 +11464,7 @@ int show_md5_page(LOGBOOK *lbs) /*------------------------------------------------------------------*/ -void combine_url(LOGBOOK *lbs, char *url, char *param, char *result, int size) +void combine_url(LOGBOOK * lbs, char *url, char *param, char *result, int size) { if (strstr(url, "http://")) @@ -11489,7 +11492,7 @@ void combine_url(LOGBOOK *lbs, char *url, char *param, char *result, int size) /*------------------------------------------------------------------*/ -int retrieve_remote_md5(LOGBOOK *lbs, char *host, MD5_INDEX ** md5_index, char *error_str) +int retrieve_remote_md5(LOGBOOK * lbs, char *host, MD5_INDEX ** md5_index, char *error_str) { int i, n, id, x, version; char *text, *p, url[256], str[1000]; @@ -11637,7 +11640,7 @@ INT send_tcp(int sock, char *buffer, unsigned int buffer_size, INT flags) /*------------------------------------------------------------------*/ -int submit_message(LOGBOOK *lbs, char *host, int message_id, char *error_str) +int submit_message(LOGBOOK * lbs, char *host, int message_id, char *error_str) { int size, i, n, status, fh, port, sock, content_length, header_length, remote_id, n_attr; char str[256], file_name[MAX_PATH_LENGTH], attrib[MAX_N_ATTR][NAME_LENGTH]; @@ -11898,7 +11901,7 @@ int submit_message(LOGBOOK *lbs, char *host, int message_id, char *error_str) /*------------------------------------------------------------------*/ -int receive_message(LOGBOOK *lbs, char *url, int message_id, char *error_str, BOOL bnew) +int receive_message(LOGBOOK * lbs, char *url, int message_id, char *error_str, BOOL bnew) { int i, status, size, n_attr; char str[NAME_LENGTH], str2[NAME_LENGTH], *p, *p2, *message, date[80], @@ -12028,7 +12031,7 @@ int receive_message(LOGBOOK *lbs, char *url, int message_id, char *error_str, BO /*------------------------------------------------------------------*/ -void submit_config(LOGBOOK *lbs, char *server, char *buffer, char *error_str) +void submit_config(LOGBOOK * lbs, char *server, char *buffer, char *error_str) { int i, n, status, port, sock, content_length, header_length; char str[256]; @@ -12171,7 +12174,7 @@ void submit_config(LOGBOOK *lbs, char *server, char *buffer, char *error_str) /*------------------------------------------------------------------*/ -void receive_config(LOGBOOK *lbs, char *server, char *error_str) +void receive_config(LOGBOOK * lbs, char *server, char *error_str) { char str[256], pwd[256], *buffer, *p; int status, version; @@ -12361,7 +12364,7 @@ int adjust_config(char *url) /*------------------------------------------------------------------*/ -void receive_pwdfile(LOGBOOK *lbs, char *server, char *error_str) +void receive_pwdfile(LOGBOOK * lbs, char *server, char *error_str) { char str[256], pwd[256], url[256], *buffer, *buf, *p; int i, status, version, fh; @@ -12493,7 +12496,7 @@ void receive_pwdfile(LOGBOOK *lbs, char *server, char *error_str) /*------------------------------------------------------------------*/ -int save_md5(LOGBOOK *lbs, char *server, MD5_INDEX * md5_index, int n) +int save_md5(LOGBOOK * lbs, char *server, MD5_INDEX * md5_index, int n) { char str[256], url[256], file_name[256]; int i, j; @@ -12536,7 +12539,7 @@ int save_md5(LOGBOOK *lbs, char *server, MD5_INDEX * md5_index, int n) /*------------------------------------------------------------------*/ -int load_md5(LOGBOOK *lbs, char *server, MD5_INDEX ** md5_index) +int load_md5(LOGBOOK * lbs, char *server, MD5_INDEX ** md5_index) { char str[256], url[256], file_name[256], *p; int i, j, x; @@ -12615,7 +12618,7 @@ BOOL equal_md5(unsigned char m1[16], unsigned char m2[16]) #define SYNC_CRON 2 #define SYNC_CLONE 3 -void mprint(LOGBOOK *lbs, int mode, char *str) +void mprint(LOGBOOK * lbs, int mode, char *str) { char line[1000]; @@ -12630,7 +12633,7 @@ void mprint(LOGBOOK *lbs, int mode, char *str) eputs(str); } -void synchronize_logbook(LOGBOOK *lbs, int mode, BOOL sync_all) +void synchronize_logbook(LOGBOOK * lbs, int mode, BOOL sync_all) { int index, i, j, i_msg, i_remote, i_cache, n_remote, n_cache, nserver, remote_id, exist_remote, exist_cache, message_id, max_id; @@ -13336,7 +13339,7 @@ void synchronize_logbook(LOGBOOK *lbs, int mode, BOOL sync_all) /*------------------------------------------------------------------*/ -void synchronize(LOGBOOK *lbs, int mode) +void synchronize(LOGBOOK * lbs, int mode) { int i; char str[256], pwd[256]; @@ -13385,7 +13388,7 @@ void synchronize(LOGBOOK *lbs, int mode) /*------------------------------------------------------------------*/ -void display_line(LOGBOOK *lbs, int message_id, int number, char *mode, +void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, int expand, int level, BOOL printable, int n_line, int show_attachments, char *date, char *in_reply_to, char *reply_to, int n_attr_disp, @@ -13578,7 +13581,8 @@ void display_line(LOGBOOK *lbs, int message_id, int number, char *mode, rsprintf(", %s", lbs->name); } else { if (disp_attr_link == NULL || disp_attr_link[index]) - rsprintf("%s\n", sclass, nowrap, ref, lbs->name); + rsprintf("%s\n", sclass, nowrap, ref, + lbs->name); else rsprintf("%s\n", sclass, nowrap, lbs->name); } @@ -13861,22 +13865,22 @@ void display_line(LOGBOOK *lbs, int message_id, int number, char *mode, if (!show_attachments) { rsprintf("%s     ", ref, attachment[index] + 14); } else { - + if (file_exist(thumb_name)) { rsprintf - ("%s %d: %s\n", - colspan, loc("Attachment"), index + 1, ref, attachment[index] + 14); + ("%s %d: %s\n", + colspan, loc("Attachment"), index + 1, ref, attachment[index] + 14); if (show_attachments) { rsprintf("\n", colspan); rsprintf("\n", index + 1, ref); - rsprintf("\"%s\"\n", ref, attachment[index]+14); + rsprintf("\"%s\"\n", ref, attachment[index] + 14); rsprintf("\n\n"); } } else { if (is_image(attachment[index])) { rsprintf - ("%s %d: %s\n", - colspan, loc("Attachment"), index + 1, ref, attachment[index] + 14); + ("%s %d: %s\n", + colspan, loc("Attachment"), index + 1, ref, attachment[index] + 14); if (show_attachments) { rsprintf(""); rsprintf("", colspan); @@ -13885,16 +13889,16 @@ void display_line(LOGBOOK *lbs, int message_id, int number, char *mode, } } else { rsprintf - ("%s %d: %s\n", - colspan, loc("Attachment"), index + 1, ref, attachment[index] + 14); + ("%s %d: %s\n", + colspan, loc("Attachment"), index + 1, ref, attachment[index] + 14); strlcpy(file_name, lbs->data_dir, sizeof(file_name)); strlcat(file_name, attachment[index], sizeof(file_name)); if (is_ascii(file_name) && - !chkext(attachment[index], ".PS") && - !chkext(attachment[index], ".PDF") && - !chkext(attachment[index], ".EPS") && show_attachments) { + !chkext(attachment[index], ".PS") && + !chkext(attachment[index], ".PDF") && + !chkext(attachment[index], ".EPS") && show_attachments) { /* display attachment */ rsprintf("

", colspan);
@@ -13931,7 +13935,7 @@ void display_line(LOGBOOK *lbs, int message_id, int number, char *mode,
 
 /*------------------------------------------------------------------*/
 
-void display_reply(LOGBOOK *lbs, int message_id, int printable,
+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)
@@ -14092,7 +14096,7 @@ void subst_param(char *str, int size, char *param, char *value)
 
 /*------------------------------------------------------------------*/
 
-BOOL is_user_allowed(LOGBOOK *lbs, char *command)
+BOOL is_user_allowed(LOGBOOK * lbs, char *command)
 {
    char str[1000], users[2000];
    char list[MAX_N_LIST][NAME_LENGTH];
@@ -14138,7 +14142,7 @@ BOOL is_user_allowed(LOGBOOK *lbs, char *command)
 
 /*------------------------------------------------------------------*/
 
-BOOL is_command_allowed(LOGBOOK *lbs, char *command)
+BOOL is_command_allowed(LOGBOOK * lbs, char *command)
 {
    char str[1000], menu_str[1000], other_str[1000];
    char menu_item[MAX_N_LIST][NAME_LENGTH];
@@ -14334,7 +14338,7 @@ void build_ref(char *ref, int size, char *mode, char *expand)
 
 /*------------------------------------------------------------------*/
 
-void show_page_filters(LOGBOOK *lbs, int n_msg, int page_n, BOOL mode_commands, BOOL threaded)
+void show_page_filters(LOGBOOK * lbs, int n_msg, int page_n, BOOL mode_commands, BOOL threaded)
 {
    int cur_exp, n, i, j, index;
    char ref[256], str[NAME_LENGTH], comment[NAME_LENGTH], list[MAX_N_LIST][NAME_LENGTH], option[NAME_LENGTH];
@@ -14596,7 +14600,7 @@ void show_page_navigation(int n_msg, int page_n, int n_page)
 
 /*------------------------------------------------------------------*/
 
-void show_select_navigation(LOGBOOK *lbs)
+void show_select_navigation(LOGBOOK * lbs)
 {
    int i, n_log;
    char str[NAME_LENGTH];
@@ -14764,7 +14768,7 @@ time_t retrieve_date(char *index, BOOL bstart)
 
 /*------------------------------------------------------------------*/
 
-void show_rss_feed(LOGBOOK *lbs)
+void show_rss_feed(LOGBOOK * lbs)
 {
    int i, n, size, index, status, message_id, offset;
    char str[256], charset[256], url[256], attrib[MAX_N_ATTR][NAME_LENGTH], date[80], *text, title[2000],
@@ -14958,7 +14962,7 @@ void highlight_searchtext(regex_t * re_buf, char *src, char *dst, int hidden)
 
 /*------------------------------------------------------------------*/
 
-void show_elog_list(LOGBOOK *lbs, INT past_n, INT last_n, INT page_n, char *info)
+void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n, char *info)
 {
    int i, j, n, index, size, status, d1, m1, y1, d2, m2, y2, n_line, flags;
    int current_year, current_month, current_day, printable, n_logbook,
@@ -14972,7 +14976,7 @@ void show_elog_list(LOGBOOK *lbs, INT past_n, INT last_n, INT page_n, char *info
        sort_attr[MAX_N_ATTR + 4][NAME_LENGTH];
    char *p, *pt, *pt1, *pt2, *slist, *svalue, *gattr, line[1024], iattr[256];
    BOOL show_attachments, threaded, csv, xml, mode_commands, expand, filtering, disp_filter,
-       show_text, searched, found, disp_attr_link[MAX_N_ATTR+4];
+       show_text, searched, found, disp_attr_link[MAX_N_ATTR + 4];
    time_t ltime, ltime_start, ltime_end, now, ltime1, ltime2;
    struct tm tms, *ptms;
    MSG_LIST *msg_list;
@@ -16093,7 +16097,7 @@ void show_elog_list(LOGBOOK *lbs, INT past_n, INT last_n, INT page_n, char *info
       if (list[0]) {
          n = strbreak(list, (char (*)[NAME_LENGTH]) gattr, MAX_N_ATTR, ",");
 
-         for (i=0 ; i\n");
@@ -16334,7 +16338,7 @@ void show_elog_list(LOGBOOK *lbs, INT past_n, INT last_n, INT page_n, char *info
 
 /*------------------------------------------------------------------*/
 
-void show_elog_thread(LOGBOOK *lbs, int message_id)
+void show_elog_thread(LOGBOOK * lbs, int message_id)
 {
    int i, size, status, in_reply_to_id, head_id, n_display, n_attr_disp;
    char date[80], attrib[MAX_N_ATTR][NAME_LENGTH], *text, in_reply_to[80],
@@ -16410,7 +16414,7 @@ void show_elog_thread(LOGBOOK *lbs, int message_id)
 
 /*------------------------------------------------------------------*/
 
-int compose_email(LOGBOOK *lbs, char *mail_to, int message_id,
+int compose_email(LOGBOOK * lbs, char *mail_to, int message_id,
                   char attrib[MAX_N_ATTR][NAME_LENGTH], char *mail_param, int old_mail,
                   char att_file[MAX_ATTACHMENTS][256])
 {
@@ -16593,7 +16597,7 @@ int compose_email(LOGBOOK *lbs, char *mail_to, int message_id,
 
 /*------------------------------------------------------------------*/
 
-int execute_shell(LOGBOOK *lbs, int message_id, char attrib[MAX_N_ATTR][NAME_LENGTH], 
+int execute_shell(LOGBOOK * lbs, int message_id, char attrib[MAX_N_ATTR][NAME_LENGTH],
                   char att_file[MAX_ATTACHMENTS][256], char *sh_cmd)
 {
    int i;
@@ -16611,15 +16615,15 @@ int execute_shell(LOGBOOK *lbs, int message_id, char attrib[MAX_N_ATTR][NAME_LEN
    sprintf(str, "%d", message_id);
    add_subst_list(slist, svalue, "message id", str, &i);
    strsubst(shell_cmd, slist, svalue, i);
-   
+
    if (att_file && stristr(shell_cmd, "$attachments")) {
       /* substitute attachments */
       p = stristr(shell_cmd, "$attachments");
       strlcpy(tail, p + strlen("$attachments"), sizeof(tail));
       *p = 0;
-      for (i=0 ; idata_dir)+strlen(att_file[i]) < sizeof(shell_cmd)+1) {
+      for (i = 0; i < MAX_ATTACHMENTS; i++)
+         if (att_file[i][0] &&
+             strlen(shell_cmd) + strlen(lbs->data_dir) + strlen(att_file[i]) < sizeof(shell_cmd) + 1) {
             strcpy(p, lbs->data_dir);
             strcat(p, att_file[i]);
             strcat(p, " ");
@@ -16637,7 +16641,7 @@ int execute_shell(LOGBOOK *lbs, int message_id, char attrib[MAX_N_ATTR][NAME_LEN
 
 /*------------------------------------------------------------------*/
 
-int add_attribute_option(LOGBOOK *lbs, char *attrname, char *attrvalue, char *condition)
+int add_attribute_option(LOGBOOK * lbs, char *attrname, char *attrvalue, char *condition)
 {
    int fh, i, length;
    char str[NAME_LENGTH], *buf, *buf2, *p1, *p2, *p3;
@@ -16724,7 +16728,7 @@ int add_attribute_option(LOGBOOK *lbs, char *attrname, char *attrvalue, char *co
 
 /*------------------------------------------------------------------*/
 
-int set_attributes(LOGBOOK *lbs, char attributes[][NAME_LENGTH], int n)
+int set_attributes(LOGBOOK * lbs, char attributes[][NAME_LENGTH], int n)
 {
    int fh, i, length, size;
    char str[NAME_LENGTH], *buf, *buf2, *p1, *p2, *p3;
@@ -16811,7 +16815,7 @@ int set_attributes(LOGBOOK *lbs, char attributes[][NAME_LENGTH], int n)
 
 /*------------------------------------------------------------------*/
 
-void submit_elog(LOGBOOK *lbs)
+void submit_elog(LOGBOOK * lbs)
 {
    char str[1000], str2[1000], file_name[256], error[1000], date[80],
        mail_list[MAX_N_LIST][NAME_LENGTH], list[10000], *p,
@@ -17215,7 +17219,7 @@ void submit_elog(LOGBOOK *lbs)
 
                get_user_line(lbs, user, NULL, NULL, user_email, email_notify);
 
-               for (i=0 ; lb_list[i].name[0] && i<1000 ; i++)
+               for (i = 0; lb_list[i].name[0] && i < 1000; i++)
                   if (strieq(lb_list[i].name, lbs->name))
                      break;
 
@@ -17276,7 +17280,7 @@ void submit_elog(LOGBOOK *lbs)
 
 /*------------------------------------------------------------------*/
 
-void submit_elog_mirror(LOGBOOK *lbs)
+void submit_elog_mirror(LOGBOOK * lbs)
 {
    char str[1000], date[80], attrib_value[MAX_N_ATTR][NAME_LENGTH],
        attrib_name[MAX_N_ATTR][NAME_LENGTH], in_reply_to[80], encoding[80],
@@ -17354,7 +17358,7 @@ void submit_elog_mirror(LOGBOOK *lbs)
 
 /*------------------------------------------------------------------*/
 
-void copy_to(LOGBOOK *lbs, int src_id, char *dest_logbook, int move, int orig_id)
+void copy_to(LOGBOOK * lbs, int src_id, char *dest_logbook, int move, int orig_id)
 {
    int size, i, n, n_done, n_done_reply, n_reply, index, status, fh, source_id, message_id;
    char str[256], file_name[MAX_PATH_LENGTH], attrib[MAX_N_ATTR][NAME_LENGTH];
@@ -17562,7 +17566,7 @@ void copy_to(LOGBOOK *lbs, int src_id, char *dest_logbook, int move, int orig_id
 
 /*------------------------------------------------------------------*/
 
-void show_elog_entry(LOGBOOK *lbs, char *dec_path, char *command)
+void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command)
 {
    int size, i, j, n, n_log, status, fh, length, message_error, index, n_hidden,
        message_id, orig_message_id, format_flags[MAX_N_ATTR], att_hide[MAX_ATTACHMENTS],
@@ -18358,12 +18362,12 @@ void show_elog_entry(LOGBOOK *lbs, char *dec_path, char *command)
                   if (file_exist(thumb_name)) {
                      rsprintf("\n");
                      rsprintf("\n", index + 1, ref);
-                     rsprintf("\"%s\"\n", ref, attachment[index]+14);
+                     rsprintf("\"%s\"\n", ref, attachment[index] + 14);
                      rsprintf("\n\n");
                   } else if (is_image(att)) {
                      rsprintf("\n");
                      rsprintf("\n", index + 1);
-                     rsprintf("\"%s\"\n", ref, attachment[index]+14);
+                     rsprintf("\"%s\"\n", ref, attachment[index] + 14);
                      rsprintf("\n\n");
                   } else {
                      if (is_ascii(file_name)) {
@@ -18418,7 +18422,7 @@ void show_elog_entry(LOGBOOK *lbs, char *dec_path, char *command)
 
 /*------------------------------------------------------------------*/
 
-BOOL check_password(LOGBOOK *lbs, char *name, char *password, char *redir)
+BOOL check_password(LOGBOOK * lbs, char *name, char *password, char *redir)
 {
    char str[256];
 
@@ -18486,7 +18490,7 @@ BOOL convert_password_file(char *file_name)
       return FALSE;
    len = lseek(fh, 0, SEEK_END);
    lseek(fh, 0, SEEK_SET);
-   buf = malloc(len+1);
+   buf = malloc(len + 1);
    assert(buf);
    i = read(fh, buf, len);
    buf[i] = 0;
@@ -18514,7 +18518,7 @@ BOOL convert_password_file(char *file_name)
 
       /* skip comment lines */
       if (*p != ';' && *p != '#') {
-         for (i=0 ; i<(int)sizeof(name)-1 && *p && *p != ':' ; i++)
+         for (i = 0; i < (int) sizeof(name) - 1 && *p && *p != ':'; i++)
             name[i] = *p++;
          name[i] = 0;
          if (*p++ != ':') {
@@ -18522,7 +18526,7 @@ BOOL convert_password_file(char *file_name)
             return FALSE;
          }
 
-         for (i=0 ; i<(int)sizeof(password)-1 && *p && *p != ':' ; i++)
+         for (i = 0; i < (int) sizeof(password) - 1 && *p && *p != ':'; i++)
             password[i] = *p++;
          password[i] = 0;
          if (*p++ != ':') {
@@ -18530,7 +18534,7 @@ BOOL convert_password_file(char *file_name)
             return FALSE;
          }
 
-         for (i=0 ; i<(int)sizeof(full_name)-1 && *p && *p != ':' ; i++)
+         for (i = 0; i < (int) sizeof(full_name) - 1 && *p && *p != ':'; i++)
             full_name[i] = *p++;
          full_name[i] = 0;
          if (*p++ != ':') {
@@ -18538,7 +18542,7 @@ BOOL convert_password_file(char *file_name)
             return FALSE;
          }
 
-         for (i=0 ; i<(int)sizeof(email)-1 && *p && *p != ':' ; i++)
+         for (i = 0; i < (int) sizeof(email) - 1 && *p && *p != ':'; i++)
             email[i] = *p++;
          email[i] = 0;
          if (*p++ != ':') {
@@ -18546,7 +18550,7 @@ BOOL convert_password_file(char *file_name)
             return FALSE;
          }
 
-         for (i=0 ; i<(int)sizeof(email_notify)-1 && *p && *p != '\n' ; i++)
+         for (i = 0; i < (int) sizeof(email_notify) - 1 && *p && *p != '\n'; i++)
             email_notify[i] = *p++;
          email_notify[i] = 0;
          if (*p++ != '\n') {
@@ -18575,7 +18579,7 @@ BOOL convert_password_file(char *file_name)
 
 /*------------------------------------------------------------------*/
 
-PMXML_NODE load_password_file(LOGBOOK *lbs)
+PMXML_NODE load_password_file(LOGBOOK * lbs)
 {
    PMXML_NODE xml_tree;
    char str[256], line[256], file_name[256];
@@ -18633,7 +18637,7 @@ void load_password_files()
    char str1[256], str2[256];
    PMXML_NODE xml_tree;
 
-   for (i=0 ; lb_list[i].name[0] ; i++) {
+   for (i = 0; lb_list[i].name[0]; i++) {
       if (lb_list[i].pwd_xml_tree == NULL) {
          if (lb_list[i].top_group[0])
             setcfg_topgroup(lb_list[i].top_group);
@@ -18646,7 +18650,7 @@ void load_password_files()
                setcfg_topgroup(lb_list[i].top_group);
             getcfg(lb_list[i].name, "Password file", str1, sizeof(str1));
 
-            for (j=i+1 ; lb_list[j].name[0] ; j++) {
+            for (j = i + 1; lb_list[j].name[0]; j++) {
                if (lb_list[j].top_group[0])
                   setcfg_topgroup(lb_list[j].top_group);
                getcfg(lb_list[j].name, "Password file", str2, sizeof(str2));
@@ -18661,7 +18665,7 @@ void load_password_files()
 
 /*------------------------------------------------------------------*/
 
-int get_user_line(LOGBOOK *lbs, char *user, char *password, char *full_name,
+int get_user_line(LOGBOOK * lbs, char *user, char *password, char *full_name,
                   char *email, BOOL email_notify[1000])
 {
    int i, j;
@@ -18685,12 +18689,12 @@ int get_user_line(LOGBOOK *lbs, char *user, char *password, char *full_name,
       if (*getcfg_topgroup())
          strcpy(orig_topgroup, getcfg_topgroup());
 
-      for (i=0 ; lb_list[i].name[0] ; i++) {
+      for (i = 0; lb_list[i].name[0]; i++) {
          if (lb_list[i].top_group[0])
             setcfg_topgroup(lb_list[i].top_group);
          getcfg(lb_list[i].name, "Password file", str, sizeof(str));
          if (strieq(str, global)) {
-            lbs = lb_list+i;
+            lbs = lb_list + i;
             break;
          }
       }
@@ -18722,12 +18726,12 @@ int get_user_line(LOGBOOK *lbs, char *user, char *password, char *full_name,
 
       if ((node = mxml_find_node(user_node, "email_notify")) != NULL && email_notify) {
          if (mxml_get_number_of_children(node)) {
-            for (i=0 ; i<1000 ; i++)
+            for (i = 0; i < 1000; i++)
                email_notify[i] = FALSE;
 
-            for (i=0 ; i 13 && pfile[6] == '_'
            && pfile[13] == '_') || (strlen(pfile) > 13 && pfile[6] == '_' && pfile[13] == '/')) {
          if (pfile[13] == '/')
@@ -20409,7 +20413,7 @@ void decode_get(char *logbook, char *string)
 
 /*------------------------------------------------------------------*/
 
-void decode_post(LOGBOOK *lbs, char *string, char *boundary, int length)
+void decode_post(LOGBOOK * lbs, char *string, char *boundary, int length)
 {
    int n_att;
    char *pinit, *p, *ptmp, file_name[MAX_PATH_LENGTH], full_name[MAX_PATH_LENGTH],
@@ -21491,7 +21495,7 @@ void server_loop(void)
                      while (*p == ' ')
                         p++;
                      i = 0;
-                     while (*p && *p != ' ' && *p != '\r' && i < (int)sizeof(cl_pwd) - 1)
+                     while (*p && *p != ' ' && *p != '\r' && i < (int) sizeof(cl_pwd) - 1)
                         str[i++] = *p++;
                      str[i] = 0;
                   }
@@ -22404,7 +22408,7 @@ int main(int argc, char *argv[])
       exit(EXIT_FAILURE);
    }
    close(fh);
-   
+
    /* parse contents of config file into internal structure */
    check_config();