From 4c564c28bfa6af46e64efa5f23311c082c7108be Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sat, 15 Jul 2006 11:59:25 +0000 Subject: Display session cookies' expiry correctly Fix urldb debug build Fix GTK build's cookie_update API svn path=/trunk/netsurf/; revision=2752 --- !NetSurf/Resources/de/Messages | 1 + !NetSurf/Resources/en/Messages | 1 + !NetSurf/Resources/fr/Messages | 1 + !NetSurf/Resources/nl/Messages | 1 + content/urldb.c | 5 +++++ desktop/tree.c | 23 +++++++++++++---------- gtk/gtk_gui.c | 26 ++++++++++++++------------ 7 files changed, 36 insertions(+), 22 deletions(-) diff --git a/!NetSurf/Resources/de/Messages b/!NetSurf/Resources/de/Messages index fa20b96cd..566fcbe72 100644 --- a/!NetSurf/Resources/de/Messages +++ b/!NetSurf/Resources/de/Messages @@ -240,6 +240,7 @@ TreeHeaders: (from headers) TreeVersion0:Netscape TreeVersion1:RFC 2109 TreeVersion2:RFC 2965 +TreeSession:Session end TreeUnused:Unused TreeImport:Importierte URL TreeNewFolder:Neues Verzeichnis diff --git a/!NetSurf/Resources/en/Messages b/!NetSurf/Resources/en/Messages index 5890ecde2..c518364cf 100644 --- a/!NetSurf/Resources/en/Messages +++ b/!NetSurf/Resources/en/Messages @@ -240,6 +240,7 @@ TreeHeaders: (from headers) TreeVersion0:Netscape TreeVersion1:RFC 2109 TreeVersion2:RFC 2965 +TreeSession:Session end TreeUnused:Unused TreeImport:Imported URL TreeNewFolder:New directory diff --git a/!NetSurf/Resources/fr/Messages b/!NetSurf/Resources/fr/Messages index d2dbf3be2..73a973ae2 100644 --- a/!NetSurf/Resources/fr/Messages +++ b/!NetSurf/Resources/fr/Messages @@ -240,6 +240,7 @@ TreeHeaders: (from headers) TreeVersion0:Netscape TreeVersion1:RFC 2109 TreeVersion2:RFC 2965 +TreeSession:Session end TreeUnused:Unused TreeImport:URL importée TreeNewFolder:Nouv. répertoire diff --git a/!NetSurf/Resources/nl/Messages b/!NetSurf/Resources/nl/Messages index 73e4dca17..1fc72d3b6 100644 --- a/!NetSurf/Resources/nl/Messages +++ b/!NetSurf/Resources/nl/Messages @@ -240,6 +240,7 @@ TreeHeaders: (from headers) TreeVersion0:Netscape TreeVersion1:RFC 2109 TreeVersion2:RFC 2965 +TreeSession:Session end TreeUnused:Unused TreeImport:Ge-importeerde URL TreeNewFolder:Nieuwe map diff --git a/content/urldb.c b/content/urldb.c index 1ab5c9663..6d51c932d 100644 --- a/content/urldb.c +++ b/content/urldb.c @@ -3281,6 +3281,11 @@ void urldb_save_cookie_paths(FILE *fp, struct path_data *parent) #ifdef TEST_URLDB int option_expire_url = 0; +bool cookies_update(const struct cookie_data *data) +{ + return true; +} + void die(const char *error) { printf("die: %s\n", error); diff --git a/desktop/tree.c b/desktop/tree.c index 7d3625945..acae266e2 100644 --- a/desktop/tree.c +++ b/desktop/tree.c @@ -911,10 +911,10 @@ void tree_delete_node(struct tree *tree, struct node *node, bool siblings) { /* reset URL characteristics */ urldb_reset_url_visit_data(e->text); } - + /* if not already 'deleted' then delete cookie */ if (!node->deleted) { - /* todo: delete cookie data */ + /* todo: delete cookie data */ } if (e->data != TREE_ELEMENT_TITLE && @@ -1113,8 +1113,8 @@ struct node *tree_create_URL_node_shared(struct node *parent, /** * Creates a tree entry for a cookie, and links it into the tree. * - * All information is used directly from the url_data, and as such cannot be - * edited and should never be freed. + * All information is used directly from the cookie_data, and as such cannot + * be edited and should never be freed. * * \param parent the node to link to * \param url the URL @@ -1137,7 +1137,7 @@ struct node *tree_create_cookie_node(struct node *parent, element = tree_create_node_element(node, TREE_ELEMENT_PERSISTENT); if (element) { - snprintf(buffer, 256, messages_get("TreePersistent"), + snprintf(buffer, 256, messages_get("TreePersistent"), data->no_destroy ? messages_get("Yes") : messages_get("No")); element->text = strdup(buffer); } @@ -1149,7 +1149,7 @@ struct node *tree_create_cookie_node(struct node *parent, } element = tree_create_node_element(node, TREE_ELEMENT_SECURE); if (element) { - snprintf(buffer, 256, messages_get("TreeSecure"), + snprintf(buffer, 256, messages_get("TreeSecure"), data->secure ? messages_get("Yes") : messages_get("No")); element->text = strdup(buffer); } @@ -1165,9 +1165,12 @@ struct node *tree_create_cookie_node(struct node *parent, element = tree_create_node_element(node, TREE_ELEMENT_EXPIRES); if (element) { snprintf(buffer, 256, messages_get("TreeExpires"), - (data->expires > 0) ? - ctime(&data->expires) : messages_get("TreeUnknown")); - if (data->expires > 0) + (data->expires > 0) + ? (data->expires == 1) + ? messages_get("TreeSession") + : ctime(&data->expires) + : messages_get("TreeUnknown")); + if (data->expires > 0 && data->expires != 1) buffer[strlen(buffer) - 1] = '\0'; element->text = strdup(buffer); } @@ -1197,7 +1200,7 @@ struct node *tree_create_cookie_node(struct node *parent, data->value ? data->value : messages_get("TreeUnused")); element->text = strdup(buffer); } - + /* add version, last_used, expires, * path, domain, comment, value */ tree_set_node_sprite(node, "small_xxx", "small_xxx"); diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c index 868adb380..496bd278b 100644 --- a/gtk/gtk_gui.c +++ b/gtk/gtk_gui.c @@ -21,6 +21,7 @@ #include "netsurf/content/urldb.h" #include "netsurf/desktop/401login.h" #include "netsurf/desktop/browser.h" +#include "netsurf/desktop/cookies.h" #include "netsurf/desktop/gui.h" #include "netsurf/desktop/netsurf.h" #include "netsurf/desktop/options.h" @@ -30,6 +31,7 @@ #include "netsurf/render/html.h" #include "netsurf/utils/log.h" #include "netsurf/utils/messages.h" +#include "netsurf/utils/url.h" #include "netsurf/utils/utf8.h" #include "netsurf/utils/utils.h" @@ -87,16 +89,6 @@ static char *find_resource(char *buf, const char *filename, const char *def) return buf; } -static char *path_to_url(const char *path) -{ - char *r = malloc(strlen(path) + 7 + 1); - - strcpy(r, "file://"); - strcat(r, path); - - return r; -} - void gui_init(int argc, char** argv) { char buf[PATH_MAX]; @@ -321,12 +313,22 @@ utf8_convert_ret utf8_from_local_encoding(const char *string, size_t len, return UTF8_CONVERT_OK; } +char *path_to_url(const char *path) +{ + char *r = malloc(strlen(path) + 7 + 1); + + strcpy(r, "file://"); + strcat(r, path); + + return r; +} + char *url_to_path(const char *url) { return strdup(url + 5); } -bool cookies_update(const char *domain, const struct cookie_data *data) +bool cookies_update(const struct cookie_data *data) { - return true; + return true; } -- cgit v1.2.3