") || 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("
(%s)\n", - loc("enable automatic email notifications")); + rsprintf("
(%s)\n", + loc("enable automatic email notifications")); rsprintf("
(%s)\n", - loc("enable automatic email notifications")); + rsprintf("
(%s)\n", + loc("enable automatic email notifications")); 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\"](\"%s.thumb\")
\n", ref, attachment[index]+14);
+ rsprintf("\n", ref, attachment[index] + 14);
rsprintf(" \n");
rsprintf("\n", index + 1);
- rsprintf("![\"%s\"](\"%s\")
\n", ref, attachment[index]+14);
+ rsprintf("\n", ref, attachment[index] + 14);
rsprintf(" 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();