"},
- {"[table ", "| "},
- {"|-", " | | "},
- {"|", " | "},
- {"[/table]", " |
"},
+ /* table */
+ {"[table]", ""},
+ {"[table ", "| "},
+ {"|-", " | | "},
+ {"|", " | "},
+ {"[/table]", " |
"},
- /* horizontal line */
- {"[line]", "
"},
+ /* horizontal line */
+ {"[line]", "
"},
- /* anchor */
- {"[anchor]", ""},
- {"[/anchor]", ""},
- {"", ""}
+ /* anchor */
+ {"[anchor]", ""},
+ {"[/anchor]", ""},
+ {"", ""}
};
char
-*email_quote_table =
- "| %s: | ";
+ *email_quote_table =
+ "| %s: | ";
-void rsputs_elcode(LOGBOOK * lbs, BOOL email_notify, const char *str)
-{
+void rsputs_elcode(LOGBOOK *lbs, BOOL email_notify, const char *str) {
int i, j, k, l, m, elcode_disabled, elcode_disabled1, ordered_list, substituted, inside_table,
- smileys_enabled;
+ smileys_enabled;
char *p, *pd, link[1000], link_text[1000], tmp[1000], attrib[1000], hattrib[1000], value[1000],
- subst[1000], base_url[256], param[256], *lstr, domain[256];
+ subst[1000], base_url[256], param[256], *lstr, domain[256];
if (strlen_retbuf + (int) (2 * strlen(str) + 1000) >= return_buffer_size) {
return_buffer = xrealloc(return_buffer, return_buffer_size + 100000);
@@ -6538,9 +6503,7 @@ void rsputs_elcode(LOGBOOK * lbs, BOOL email_notify, const char *str)
j += strlen(return_buffer + j);
i += strlen(pattern_list[l].pattern) - 1; // 1 gets added in for loop...
}
- }
-
- else if (strstr(pattern_list[l].subst, "%#")) {
+ } else if (strstr(pattern_list[l].subst, "%#")) {
/* special substitutions */
if (pattern_list[l].pattern[strlen(pattern_list[l].pattern) - 1] == '=') {
@@ -6612,7 +6575,7 @@ void rsputs_elcode(LOGBOOK * lbs, BOOL email_notify, const char *str)
}
}
- /* add http:// if missing */
+ /* add http:// if missing */
else if ((!strnieq(attrib, "http://", 7) && !strnieq(attrib, "https://", 8)) &&
strstr(pattern_list[l].subst, "mailto") == NULL &&
strstr(pattern_list[l].subst, "img") == NULL &&
@@ -6741,50 +6704,50 @@ void rsputs_elcode(LOGBOOK * lbs, BOOL email_notify, const char *str)
i += 3;
} else
switch (str[i]) {
- case '\r':
- if (!elcode_disabled && !elcode_disabled1 && !inside_table) {
- strcat(return_buffer, "
\r\n");
- j += 8;
- } else {
- strcat(return_buffer, "\r\n");
- j += 2;
- }
- break;
- case '\n':
- break;
- case '&':
- strcat(return_buffer, "&");
- j += 5;
- break;
- case '<':
- strcat(return_buffer, "<");
- j += 4;
- break;
- case '>':
- strcat(return_buffer, ">");
- j += 4;
- break;
+ case '\r':
+ if (!elcode_disabled && !elcode_disabled1 && !inside_table) {
+ strcat(return_buffer, "
\r\n");
+ j += 8;
+ } else {
+ strcat(return_buffer, "\r\n");
+ j += 2;
+ }
+ break;
+ case '\n':
+ break;
+ case '&':
+ strcat(return_buffer, "&");
+ j += 5;
+ break;
+ case '<':
+ strcat(return_buffer, "<");
+ j += 4;
+ break;
+ case '>':
+ strcat(return_buffer, ">");
+ j += 4;
+ break;
- /* the translation for the search highliting */
- case '\001':
- strcat(return_buffer, "<");
- j++;
- break;
- case '\002':
- strcat(return_buffer, ">");
- j++;
- break;
- case '\003':
- strcat(return_buffer, "\"");
- j++;
- break;
- case '\004':
- strcat(return_buffer, " ");
- j++;
- break;
+ /* the translation for the search highliting */
+ case '\001':
+ strcat(return_buffer, "<");
+ j++;
+ break;
+ case '\002':
+ strcat(return_buffer, ">");
+ j++;
+ break;
+ case '\003':
+ strcat(return_buffer, "\"");
+ j++;
+ break;
+ case '\004':
+ strcat(return_buffer, " ");
+ j++;
+ break;
- default:
- return_buffer[j++] = str[i];
+ default:
+ return_buffer[j++] = str[i];
}
}
@@ -6795,8 +6758,7 @@ void rsputs_elcode(LOGBOOK * lbs, BOOL email_notify, const char *str)
/*------------------------------------------------------------------*/
-void rsprintf(const char *format, ...)
-{
+void rsprintf(const char *format, ...) {
va_list argptr;
char str[10000];
@@ -6817,8 +6779,7 @@ void rsprintf(const char *format, ...)
/*------------------------------------------------------------------*/
-void flush_return_buffer()
-{
+void flush_return_buffer() {
#ifdef HAVE_SSL
send_with_timeout(_ssl_con, _sock, return_buffer, strlen_retbuf);
#else
@@ -6832,16 +6793,14 @@ void flush_return_buffer()
/* Parameter handling functions similar to setenv/getenv */
-void initparam()
-{
+void initparam() {
memset(_param, 0, sizeof(_param));
memset(_value, 0, sizeof(_value));
_mtext[0] = 0;
_cmdline[0] = 0;
}
-int setparam(char *param, char *value)
-{
+int setparam(char *param, char *value) {
int i;
char str[10000];
@@ -6903,8 +6862,7 @@ int setparam(char *param, char *value)
return 1;
}
-char *getparam(char *param)
-{
+char *getparam(char *param) {
int i;
if (strieq(param, "text"))
@@ -6923,8 +6881,7 @@ char *getparam(char *param)
return NULL;
}
-BOOL enumparam(int n, char *param, char *value)
-{
+BOOL enumparam(int n, char *param, char *value) {
param[0] = value[0] = 0;
if (n >= MAX_PARAM)
@@ -6939,8 +6896,7 @@ BOOL enumparam(int n, char *param, char *value)
return TRUE;
}
-BOOL isparam(char *param)
-{
+BOOL isparam(char *param) {
int i;
if (strieq(param, "text"))
@@ -6956,8 +6912,7 @@ BOOL isparam(char *param)
return FALSE;
}
-void unsetparam(char *param)
-{
+void unsetparam(char *param) {
int i;
for (i = 0; i < MAX_PARAM; i++)
@@ -6976,8 +6931,7 @@ void unsetparam(char *param)
/*------------------------------------------------------------------*/
-void extract_path(char *str)
-{
+void extract_path(char *str) {
char *p, str2[256];
p = NULL;
@@ -7002,8 +6956,7 @@ void extract_path(char *str)
/*------------------------------------------------------------------*/
-void extract_host(char *str)
-{
+void extract_host(char *str) {
char *p, *ph, str2[256];
p = NULL;
@@ -7026,7 +6979,7 @@ void extract_host(char *str)
/*------------------------------------------------------------------*/
-void compose_base_url(LOGBOOK * lbs, char *base_url, int size, BOOL email_notify)
+void compose_base_url(LOGBOOK *lbs, char *base_url, int size, BOOL email_notify)
/* return URL for elogd with optional logbook subdirectory */
{
if (email_notify)
@@ -7070,8 +7023,7 @@ void compose_base_url(LOGBOOK * lbs, char *base_url, int size, BOOL email_notify
/*------------------------------------------------------------------*/
-void set_location(LOGBOOK * lbs, char *rp)
-{
+void set_location(LOGBOOK *lbs, char *rp) {
char str[NAME_LENGTH], group[NAME_LENGTH], list[NAME_LENGTH], *p, rel_path[NAME_LENGTH];
int i;
@@ -7243,8 +7195,7 @@ void set_location(LOGBOOK * lbs, char *rp)
/*------------------------------------------------------------------*/
-void set_redir(LOGBOOK * lbs, char *redir)
-{
+void set_redir(LOGBOOK *lbs, char *redir) {
char str[NAME_LENGTH];
str[0] = 0;
@@ -7264,8 +7215,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;
time_t now;
@@ -7325,18 +7275,16 @@ void set_cookie(LOGBOOK * lbs, char *name, char *value, BOOL global, char *expir
/*------------------------------------------------------------------*/
-const char *git_revision()
-{
+const char *git_revision() {
const char *p = _git_revision;
if (strrchr(p, '-'))
- p = strrchr(p, '-')+2;
+ p = strrchr(p, '-') + 2;
return p;
}
/*------------------------------------------------------------------*/
-void redirect(LOGBOOK * lbs, char *rel_path)
-{
+void redirect(LOGBOOK *lbs, char *rel_path) {
/* redirect */
rsprintf("HTTP/1.1 302 Found\r\n");
rsprintf("Server: ELOG HTTP %s-%s\r\n", VERSION, git_revision());
@@ -7432,7 +7380,7 @@ int scan_attributes(char *logbook)
and attr_flags arrays */
{
char list[10000], str[NAME_LENGTH], str2[NAME_LENGTH], type[NAME_LENGTH],
- tmp_list[MAX_N_ATTR][NAME_LENGTH];
+ tmp_list[MAX_N_ATTR][NAME_LENGTH];
int i, j, n, m, n_options;
if (getcfg(logbook, "Attributes", list, sizeof(list))) {
@@ -7570,8 +7518,7 @@ int scan_attributes(char *logbook)
/*------------------------------------------------------------------*/
-void show_http_header(LOGBOOK * lbs, BOOL expires, char *cookie)
-{
+void show_http_header(LOGBOOK *lbs, BOOL expires, char *cookie) {
char str[256];
rsprintf("HTTP/1.1 200 Document follows\r\n");
@@ -7598,8 +7545,7 @@ void show_http_header(LOGBOOK * lbs, BOOL expires, char *cookie)
rsprintf("\r\n");
}
-void show_plain_header(int size, char *file_name)
-{
+void show_plain_header(int size, char *file_name) {
/* header */
rsprintf("HTTP/1.1 200 Document follows\r\n");
rsprintf("Server: ELOG HTTP %s-%s\r\n", VERSION, git_revision());
@@ -7618,9 +7564,8 @@ 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, char *cookie,
- int embed_css, int refresh)
-{
+void show_html_header(LOGBOOK *lbs, BOOL expires, char *title, BOOL close_head, BOOL rss_feed, char *cookie,
+ int embed_css, int refresh) {
int i, n;
char css[1000], css_base[1000], str[1000], media[1000], file_name[256];
char css_list[MAX_N_LIST][NAME_LENGTH];
@@ -7662,16 +7607,16 @@ void show_html_header(LOGBOOK * lbs, BOOL expires, char *title, BOOL close_head,
fseek(f, 0, SEEK_END);
int size = TELL(fileno(f));
fseek(f, 0, SEEK_SET);
-
+
char *buf = xmalloc(size + 100);
fread(buf, 1, size, f);
buf[size] = 0;
fclose(f);
-
+
rsprintf("\n");
-
+
xfree(buf);
}
} else {
@@ -7699,7 +7644,7 @@ void show_html_header(LOGBOOK * lbs, BOOL expires, char *title, BOOL close_head,
} else
rsprintf("\n", css_base, css);
}
-
+
if (!embed_css) {
rsprintf("\n");
rsprintf("\n");
@@ -7715,8 +7660,7 @@ void show_html_header(LOGBOOK * lbs, BOOL expires, char *title, BOOL close_head,
rsprintf("\n");
}
-void show_browser(char *browser)
-{
+void show_browser(char *browser) {
if (stristr(browser, "opera"))
rsprintf("var browser = \"Opera\";\n");
else if (stristr(browser, "konqueror"))
@@ -7731,9 +7675,8 @@ void show_browser(char *browser)
rsprintf("var browser = \"Other\";\n");
}
-void show_standard_header(LOGBOOK * lbs, BOOL expires, char *title, char *path, BOOL rss_feed, char *cookie,
- char *script, int refresh)
-{
+void show_standard_header(LOGBOOK *lbs, BOOL expires, char *title, char *path, BOOL rss_feed, char *cookie,
+ char *script, int refresh) {
if (script) {
show_html_header(lbs, expires, title, FALSE, rss_feed, cookie, FALSE, refresh);
@@ -7764,8 +7707,7 @@ void show_standard_header(LOGBOOK * lbs, BOOL expires, char *title, char *path,
/*------------------------------------------------------------------*/
-void show_upgrade_page(LOGBOOK * lbs)
-{
+void show_upgrade_page(LOGBOOK *lbs) {
char str[1000];
show_html_header(lbs, FALSE, "ELOG Upgrade Information", TRUE, FALSE, NULL, FALSE, 0);
@@ -7831,8 +7773,7 @@ LBLIST *get_subgroup(LBLIST pgrp, char *logbook)
/*------------------------------------------------------------------*/
-LBLIST get_logbook_hierarchy(void)
-{
+LBLIST get_logbook_hierarchy(void) {
int i, j, n, m, flag;
char str[1000], grpname[256], grpmembers[1000];
LBLIST root, *pgrp;
@@ -7950,8 +7891,7 @@ LBLIST get_logbook_hierarchy(void)
/*------------------------------------------------------------------*/
-void free_logbook_hierarchy(LBLIST root)
-{
+void free_logbook_hierarchy(LBLIST root) {
int i;
for (i = 0; i < root->n_members; i++) {
@@ -7988,8 +7928,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];
char grplist[MAX_N_LIST][NAME_LENGTH];
@@ -8024,8 +7963,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];
char grplist[MAX_N_LIST][NAME_LENGTH];
@@ -8060,8 +7998,7 @@ void add_logbook_to_group(LOGBOOK * lbs, char *new_name)
/*------------------------------------------------------------------*/
-void show_standard_title(LOGBOOK * lbs, char *text, int printable)
-{
+void show_standard_title(LOGBOOK *lbs, char *text, int printable) {
char str[NAME_LENGTH], ref[256], sclass[32], comment[256], full_name[256], url[256], logbook[256];
int i, j, level;
LBLIST phier, pnode, pnext, flb;
@@ -8074,7 +8011,7 @@ void show_standard_title(LOGBOOK * lbs, char *text, int printable)
if (printable)
rsprintf
- ("\n\n");
+ ("\n\n");
else
rsprintf("\n\n");
@@ -8224,7 +8161,7 @@ void show_standard_title(LOGBOOK * lbs, char *text, int printable)
rsprintf("%s", str);
} else
rsprintf("![\"ELOG](\"elog.png\" "\\"ELOG") ");
-
+
if (getcfg(logbook, "Title image URL", str, sizeof(str)))
rsprintf("\n");
@@ -8235,8 +8172,7 @@ void show_standard_title(LOGBOOK * lbs, char *text, int printable)
/*------------------------------------------------------------------*/
-void show_top_text(LOGBOOK * lbs)
-{
+void show_top_text(LOGBOOK *lbs) {
char str[NAME_LENGTH];
int size;
@@ -8271,8 +8207,7 @@ void show_top_text(LOGBOOK * lbs)
/*------------------------------------------------------------------*/
-void show_bottom_text(LOGBOOK * lbs)
-{
+void show_bottom_text(LOGBOOK *lbs) {
char str[NAME_LENGTH], slist[20][NAME_LENGTH], svalue[20][NAME_LENGTH];
int i, size;
@@ -8317,14 +8252,13 @@ void show_bottom_text(LOGBOOK * lbs)
} else
/* add little logo */
rsprintf
- ("ELOG V%s-%s",
- loc("Goto ELOG home page"), VERSION, git_revision());
+ ("ELOG V%s-%s",
+ loc("Goto ELOG home page"), VERSION, git_revision());
}
/*------------------------------------------------------------------*/
-void show_bottom_text_login(LOGBOOK * lbs)
-{
+void show_bottom_text_login(LOGBOOK *lbs) {
char str[NAME_LENGTH], slist[20][NAME_LENGTH], svalue[20][NAME_LENGTH];
int i, size;
@@ -8371,14 +8305,13 @@ void show_bottom_text_login(LOGBOOK * lbs)
} else
/* add little logo */
rsprintf
- ("ELOG V%s-%s",
- loc("Goto ELOG home page"), VERSION, git_revision());
+ ("ELOG V%s-%s",
+ loc("Goto ELOG home page"), VERSION, git_revision());
}
/*------------------------------------------------------------------*/
-void show_error(char *error)
-{
+void show_error(char *error) {
char str[256];
/* header */
@@ -8417,9 +8350,8 @@ void show_error(char *error)
/*------------------------------------------------------------------*/
-void show_query(LOGBOOK * lbs, char *title, char *query_string, char *button1, char *button1_url,
- char *button2, char *button2_url)
-{
+void show_query(LOGBOOK *lbs, char *title, char *query_string, char *button1, char *button1_url,
+ char *button2, char *button2_url) {
show_standard_header(lbs, TRUE, "ELog query", title, FALSE, NULL, NULL, 0);
rsprintf("");
@@ -8445,8 +8377,7 @@ void show_query(LOGBOOK * lbs, char *title, char *query_string, char *button1, c
/*------------------------------------------------------------------*/
-void set_sid_cookie(LOGBOOK * lbs, char *sid, char *full_name)
-{
+void set_sid_cookie(LOGBOOK *lbs, char *sid, char *full_name) {
char str[256], lb_name[256], exp[80];
BOOL global;
@@ -8490,8 +8421,7 @@ void set_sid_cookie(LOGBOOK * lbs, char *sid, char *full_name)
/*------------------------------------------------------------------*/
-void remove_all_login_cookies(LOGBOOK * lbs)
-{
+void remove_all_login_cookies(LOGBOOK *lbs) {
int i;
rsprintf("HTTP/1.1 302 Found\r\n");
@@ -8512,8 +8442,7 @@ void remove_all_login_cookies(LOGBOOK * lbs)
/*------------------------------------------------------------------*/
-int exist_file(char *file_name)
-{
+int exist_file(char *file_name) {
int fh;
fh = open(file_name, O_RDONLY | O_BINARY);
@@ -8526,8 +8455,7 @@ int exist_file(char *file_name)
/*------------------------------------------------------------------*/
-void send_file_direct(char *file_name)
-{
+void send_file_direct(char *file_name) {
int fh, i, length, delta;
char str[MAX_PATH_LENGTH], dir[MAX_PATH_LENGTH], charset[80];
@@ -8612,166 +8540,161 @@ void send_file_direct(char *file_name)
/*------------------------------------------------------------------*/
-void strencode(char *text)
-{
+void strencode(char *text) {
int i;
for (i = 0; i < (int) strlen(text); i++) {
switch (text[i]) {
- case '\n':
- rsprintf("
\n");
- break;
- case '<':
- rsprintf("<");
- break;
- case '>':
- rsprintf(">");
- break;
- case '&':
- rsprintf("&");
- break;
- case '\"':
- rsprintf(""");
- break;
- case ' ':
- rsprintf(" ");
- break;
+ case '\n':
+ rsprintf("
\n");
+ break;
+ case '<':
+ rsprintf("<");
+ break;
+ case '>':
+ rsprintf(">");
+ break;
+ case '&':
+ rsprintf("&");
+ break;
+ case '\"':
+ rsprintf(""");
+ break;
+ case ' ':
+ rsprintf(" ");
+ break;
- /* the translation for the search highliting */
+ /* the translation for the search highliting */
- case '\001':
- rsprintf("<");
- break;
- case '\002':
- rsprintf(">");
- break;
- case '\003':
- rsprintf("\"");
- break;
- case '\004':
- rsprintf(" ");
- break;
+ case '\001':
+ rsprintf("<");
+ break;
+ case '\002':
+ rsprintf(">");
+ break;
+ case '\003':
+ rsprintf("\"");
+ break;
+ case '\004':
+ rsprintf(" ");
+ break;
- default:
- rsprintf("%c", text[i]);
+ default:
+ rsprintf("%c", text[i]);
}
}
}
/*------------------------------------------------------------------*/
-void strencode_nouml(char *text)
-{
+void strencode_nouml(char *text) {
int i;
for (i = 0; i < (int) strlen(text); i++) {
switch (text[i]) {
- case '\n':
- rsprintf("
\n");
- break;
- case '<':
- rsprintf("<");
- break;
- case '>':
- rsprintf(">");
- break;
- case '\"':
- rsprintf(""");
- break;
- case ' ':
- rsprintf(" ");
- break;
+ case '\n':
+ rsprintf("
\n");
+ break;
+ case '<':
+ rsprintf("<");
+ break;
+ case '>':
+ rsprintf(">");
+ break;
+ case '\"':
+ rsprintf(""");
+ break;
+ case ' ':
+ rsprintf(" ");
+ break;
- /* the translation for the search highliting */
+ /* the translation for the search highliting */
- case '\001':
- rsprintf("<");
- break;
- case '\002':
- rsprintf(">");
- break;
- case '\003':
- rsprintf("\"");
- break;
- case '\004':
- rsprintf(" ");
- break;
+ case '\001':
+ rsprintf("<");
+ break;
+ case '\002':
+ rsprintf(">");
+ break;
+ case '\003':
+ rsprintf("\"");
+ break;
+ case '\004':
+ rsprintf(" ");
+ break;
- default:
- rsprintf("%c", text[i]);
+ default:
+ rsprintf("%c", text[i]);
}
}
}
/*------------------------------------------------------------------*/
-void xmlencode(char *text)
-{
+void xmlencode(char *text) {
int i;
for (i = 0; i < (int) strlen(text); i++) {
switch (text[i]) {
- case '<':
- rsprintf("<");
- break;
- case '>':
- rsprintf(">");
- break;
- case '&':
- rsprintf("&");
- break;
- case '\"':
- rsprintf(""");
- break;
+ case '<':
+ rsprintf("<");
+ break;
+ case '>':
+ rsprintf(">");
+ break;
+ case '&':
+ rsprintf("&");
+ break;
+ case '\"':
+ rsprintf(""");
+ break;
- default:
- rsprintf("%c", text[i]);
+ default:
+ rsprintf("%c", text[i]);
}
}
}
/*------------------------------------------------------------------*/
-void strencode2(char *b, const char *text, int size)
-{
+void strencode2(char *b, const char *text, int size) {
int i;
*b = 0;
for (i = 0; i < (int) strlen(text); i++) {
switch (text[i]) {
- case '\n':
- if (strlen(b) + 5 >= (unsigned int) size)
- return;
- strcat(b, "
\n");
- break;
- case '<':
- if (strlen(b) + 4 >= (unsigned int) size)
- return;
- strcat(b, "<");
- break;
- case '>':
- if (strlen(b) + 4 >= (unsigned int) size)
- return;
- strcat(b, ">");
- break;
- case '\"':
- if (strlen(b) + 6 >= (unsigned int) size)
- return;
- strcat(b, """);
- break;
- default:
- if (strlen(b) + 1 >= (unsigned int) size)
- return;
- sprintf(b + strlen(b), "%c", text[i]);
+ case '\n':
+ if (strlen(b) + 5 >= (unsigned int) size)
+ return;
+ strcat(b, "
\n");
+ break;
+ case '<':
+ if (strlen(b) + 4 >= (unsigned int) size)
+ return;
+ strcat(b, "<");
+ break;
+ case '>':
+ if (strlen(b) + 4 >= (unsigned int) size)
+ return;
+ strcat(b, ">");
+ break;
+ case '\"':
+ if (strlen(b) + 6 >= (unsigned int) size)
+ return;
+ strcat(b, """);
+ break;
+ default:
+ if (strlen(b) + 1 >= (unsigned int) size)
+ return;
+ sprintf(b + strlen(b), "%c", text[i]);
}
}
}
/*------------------------------------------------------------------*/
-int build_subst_list(LOGBOOK * lbs, char list[][NAME_LENGTH], char value[][NAME_LENGTH],
- char attrib[][NAME_LENGTH], BOOL format_date)
-{
+int build_subst_list(LOGBOOK *lbs, char list[][NAME_LENGTH], char value[][NAME_LENGTH],
+ char attrib[][NAME_LENGTH], BOOL format_date) {
int i;
char str[NAME_LENGTH], format[256], full_name[256], user_email[256];
time_t t;
@@ -8792,23 +8715,23 @@ int build_subst_list(LOGBOOK * lbs, char list[][NAME_LENGTH], char value[][NAME_
sprintf(str, "Date format %s", attr_list[i]);
if (!getcfg(lbs->name, str, format, sizeof(format)))
if (!getcfg(lbs->name, "Date format", format, sizeof(format)))
- strcpy(format, DEFAULT_DATE_FORMAT);
+ strcpy(format, DEFAULT_DATE_FORMAT);
my_strftime(value[i], NAME_LENGTH, format, ts);
} else if ((attr_flags[i] & AF_DATETIME) && format_date) {
-
+
t = (time_t) atoi(attrib[i]);
ts = localtime(&t);
assert(ts);
-
+
sprintf(str, "Time format %s", attr_list[i]);
if (!getcfg(lbs->name, str, format, sizeof(format)))
if (!getcfg(lbs->name, "Time format", format, sizeof(format)))
strcpy(format, DEFAULT_TIME_FORMAT);
-
+
my_strftime(value[i], NAME_LENGTH, format, ts);
-
+
} else
strcpy(value[i], attrib[i]);
} else
@@ -8852,7 +8775,7 @@ int build_subst_list(LOGBOOK * lbs, char list[][NAME_LENGTH], char value[][NAME_
if (lbs) {
strcpy(list[i], "logbook");
strlcpy(value[i++], lbs->name, NAME_LENGTH);
-
+
/* add logbook */
strcpy(list[i], "elogbook");
strlcpy(value[i++], lbs->name_enc, NAME_LENGTH);
@@ -8897,15 +8820,13 @@ int build_subst_list(LOGBOOK * lbs, char list[][NAME_LENGTH], char value[][NAME_
/*------------------------------------------------------------------*/
-void add_subst_list(char list[][NAME_LENGTH], char value[][NAME_LENGTH], char *item, char *str, int *i)
-{
+void add_subst_list(char list[][NAME_LENGTH], char value[][NAME_LENGTH], char *item, char *str, int *i) {
strlcpy(list[*i], item, NAME_LENGTH);
strlcpy(value[(*i)++], str, NAME_LENGTH);
}
-void add_subst_time(LOGBOOK * lbs, char list[][NAME_LENGTH], char value[][NAME_LENGTH], char *item,
- char *date, int *i, int flags)
-{
+void add_subst_time(LOGBOOK *lbs, char list[][NAME_LENGTH], char value[][NAME_LENGTH], char *item,
+ char *date, int *i, int flags) {
char format[80], str[256];
time_t ltime;
struct tm *pts;
@@ -8928,8 +8849,7 @@ void add_subst_time(LOGBOOK * lbs, char list[][NAME_LENGTH], char value[][NAME_L
/*------------------------------------------------------------------*/
-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];
getcfg(lbs->name, "Password file", str, sizeof(str));
@@ -8949,8 +8869,7 @@ BOOL get_password_file(LOGBOOK * lbs, char *file_name, int size)
/*------------------------------------------------------------------*/
-void show_change_pwd_page(LOGBOOK * lbs)
-{
+void show_change_pwd_page(LOGBOOK *lbs) {
char str[256], config[256], old_pwd[256], new_pwd[256], new_pwd2[256], user[256], auth[32], error_str[256];
int wrong_pwd;
/* otherwise calls with null lbs which make this procedure crash */
@@ -8994,7 +8913,7 @@ void show_change_pwd_page(LOGBOOK * lbs)
if (old_pwd[0] || new_pwd[0]) {
if (user[0]) {
- if (stristr(auth, "Kerberos") || stristr(auth, "Webserver") || stristr(auth, "PAM") ) {
+ if (stristr(auth, "Kerberos") || stristr(auth, "Webserver") || stristr(auth, "PAM")) {
if (strcmp(new_pwd, new_pwd2) != 0)
wrong_pwd = 2;
} else {
@@ -9017,7 +8936,7 @@ void show_change_pwd_page(LOGBOOK * lbs)
error_str[0] = 0;
if (!wrong_pwd)
wrong_pwd =
- (auth_change_password(lbs, user, old_pwd, new_pwd, error_str, sizeof(error_str)) == 0);
+ (auth_change_password(lbs, user, old_pwd, new_pwd, error_str, sizeof(error_str)) == 0);
if (!wrong_pwd && isparam("unm") && strcmp(user, getparam("unm")) == 0) {
redirect(lbs, "");
@@ -9055,8 +8974,7 @@ void show_change_pwd_page(LOGBOOK * lbs)
if (error_str[0]) {
strencode2(str, error_str, sizeof(str));
rsprintf("| %s! | \n", str);
- }
- else
+ } else
rsprintf("| %s! | \n", loc("Wrong password"));
}
@@ -9104,7 +9022,7 @@ void show_change_pwd_page(LOGBOOK * lbs)
/*------------------------------------------------------------------*/
-void get_auto_index(LOGBOOK * lbs, int index, char *format, char *retstr, int size)
+void get_auto_index(LOGBOOK *lbs, int index, char *format, char *retstr, int size)
/* return value of specific attribute of last entry, can be used to
auto-increment tags */
{
@@ -9169,8 +9087,7 @@ void get_auto_index(LOGBOOK * lbs, int index, char *format, char *retstr, int si
/*------------------------------------------------------------------*/
-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[NAME_LENGTH], preset[NAME_LENGTH], full_name[NAME_LENGTH];
int i;
@@ -9216,8 +9133,7 @@ BOOL is_author(LOGBOOK * lbs, char attrib[MAX_N_ATTR][NAME_LENGTH], char *owner)
/*------------------------------------------------------------------*/
-BOOL get_author(LOGBOOK * lbs, char attrib[MAX_N_ATTR][NAME_LENGTH], char *author)
-{
+BOOL get_author(LOGBOOK *lbs, char attrib[MAX_N_ATTR][NAME_LENGTH], char *author) {
char str[NAME_LENGTH], preset[NAME_LENGTH];
int i;
@@ -9248,8 +9164,7 @@ BOOL get_author(LOGBOOK * lbs, char attrib[MAX_N_ATTR][NAME_LENGTH], char *autho
/*------------------------------------------------------------------*/
-BOOL is_cond_attr(int index)
-{
+BOOL is_cond_attr(int index) {
int i;
for (i = 0; i < MAX_N_LIST && attr_options[index][i][0]; i++)
@@ -9261,8 +9176,7 @@ BOOL is_cond_attr(int index)
/*------------------------------------------------------------------*/
-void show_date_selector(int day, int month, int year, char *index)
-{
+void show_date_selector(int day, int month, int year, char *index) {
int i;
rsprintf(" |
|
|
|
![\"Happy\"](\"%sicons/happy.png\" "\\"Happy\\"")
"},
- {":-))", "![\"Smile\"](\"%sicons/smile.png\" "\\"Smile\\"")
"},
- {":-)", "![\"Frown\"](\"%sicons/frown.png\" "\\"Frown\\"")
"},
- {":-(", "![\"Wink\"](\"%sicons/wink.png\" "\\"Wink\\"")
"},
- {";-)", "![\"Big](\"%sicons/biggrin.png\" "\\"Big")
"},
- {"?-)", "![\"Confused\"](\"%sicons/confused.png\" "\\"Confused\\"")
"},
- {";(", "![\"Crying\"](\"%sicons/crying.png\" "\\"Crying\\"")
"},
- {";-(", "![\"Pleased\"](\"%sicons/pleased.png\" "\\"Pleased\\"")
"},
- {":-]", "![\"Yawn\"](\"%sicons/yawn.png\" "\\"Yawn\\"")
"},
- {":-o", "![\"Cool\"](\"%sicons/cool.png\" "\\"Cool\\"")
"},
- {"8o", "![\"Astonished\"](\"%sicons/astonished.png\" "\\"Astonished\\"")
"},
- {"x-(", "![\"Mad\"](\"%sicons/mad.png\" "\\"Mad\\"")
"},
- {":p", "![\"Tongue\"](\"%sicons/tongue.png\" "\\"Tongue\\"")
"},
- {":-p", "