ELOG/elog
0
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
ritt
2018-03-16 13:00:01 +01:00
parent a38b0146ce 8ccc404180
commit d7dfc9a781
5 changed files with 2799 additions and 2766 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/config.html
+2765 -2759
View File
File diff suppressed because it is too large Load Diff
mxml
+1 -1
Submodule mxml updated: 20b4610931...15c5f5c676
src/elogd.c
+18 -3
View File
@@ -5724,6 +5724,11 @@ int is_html(char *s)
}
}
if (strstr(str, "&#") && strchr(strstr(str, "&#"), ';')) {
xfree(str);
return TRUE;
}
xfree(str);
return FALSE;
}
@@ -20889,8 +20894,13 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
n_page = atoi(str);
else
n_page = 20;
if (isparam("npp"))
if (isparam("npp")) {
n_page = atoi(getparam("npp"));
if (n_page < 1)
n_page = 1;
if (n_page > 100000)
n_page = 100000;
}
if (page_mid) {
default_page = 0;
@@ -26681,8 +26691,8 @@ void show_selection_page(void)
rsprintf("</td></tr>\n");
rsprintf("<tr><td align=center class=\"dlgform\">\n");
rsprintf("<a href=\"?cmd=%s\">%s</a>", loc("Create new logbook"), loc("Create new logbook")),
rsprintf("</td></tr></table>\n");
rsprintf("<a href=\"?cmd=%s\">%s</a>", loc("Create new logbook"), loc("Create new logbook"));
rsprintf("</td></tr></table>\n");
rsprintf("</body></html>\n");
return;
}
@@ -29212,6 +29222,11 @@ int process_http_request(const char *request, int i_conn)
content_length = atoi(strstr(request, "Content-Length:") + 15);
else if (strstr(request, "Content-length:"))
content_length = atoi(strstr(request, "Content-length:") + 15);
if (content_length <= 0) {
show_error("Invalid Content-Length in header");
xfree(str);
return 1;
}
/* extract header length */
if (strstr(request, "\r\n\r\n"))
src/elogd.h
+2 -2
View File
@@ -301,7 +301,7 @@ int build_subst_list(LOGBOOK * lbs, char list[][NAME_LENGTH], char value[][NAME_
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, char *error, int error_size);
int load_password_files();
int load_password_files(void);
BOOL check_login(LOGBOOK * lbs, char *sid);
void compose_base_url(LOGBOOK * lbs, char *base_url, int size, BOOL email_notify);
void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command);
@@ -326,7 +326,7 @@ int ascii_compare(const void *s1, const void *s2);
int ascii_compare2(const void *s1, const void *s2);
void do_crypt(const char *s, char *d, int size);
BOOL get_password_file(LOGBOOK * lbs, char *file_name, int size);
LOGBOOK *get_first_lbs_with_global_passwd();
LOGBOOK *get_first_lbs_with_global_passwd(void);
/* functions from auth.c */
int auth_verify_password(LOGBOOK *lbs, const char *user, const char *password, char *error_str, int error_size);
xcode/elogd.xcodeproj/project.pbxproj
+13 -1
View File
@@ -155,7 +155,7 @@
D52BA2F113999DB0000458E3 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0810;
LastUpgradeCheck = 0910;
ORGANIZATIONNAME = PSI;
};
buildConfigurationList = D52BA2F413999DB0000458E3 /* Build configuration list for PBXProject "elogd" */;
@@ -212,12 +212,18 @@
D52BA30113999DB0000458E3 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -245,12 +251,18 @@
D52BA30213999DB0000458E3 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;