diff options
Diffstat (limited to 'generators.c')
| -rw-r--r-- | generators.c | 52 |
1 files changed, 28 insertions, 24 deletions
diff --git a/generators.c b/generators.c index fd40490..907412a 100644 --- a/generators.c +++ b/generators.c @@ -287,16 +287,12 @@ write_html_album (TGallerySetup *setup, /* Navigation bar */ s1 = g_strdup (items->ID); - /* TODO: check */ - fix_entities (&s1); old_parent_item_index = items->parent_item_index + 1; parent = items->parent_index; level = 1; while (parent) { s3 = make_string ("../", level); s4 = g_strdup (parent->ID); - /* TODO: check */ - fix_entities (&s4); s5 = setup->use_inpage_links ? g_strdup_printf ("#i%d", old_parent_item_index) : g_strdup (""); s2 = g_strdup_printf ("<a href=\"%sindex.html%s\">%s</a> > %s", s3, s5, s4, s1); free (s3); @@ -314,20 +310,26 @@ write_html_album (TGallerySetup *setup, /* META tags */ s1 = g_strdup_printf ("\t<meta name=\"generator\" content=\"Cataract Gallery Generator v%s\" />\n", APP_VERSION); if (setup->meta_author || items->meta_author) { - s2 = g_strdup_printf ("%s\t<meta name=\"author\" content=\"%s\" />\n", s1, - items->meta_author ? items->meta_author : setup->meta_author); + s3 = g_strdup (items->meta_author ? items->meta_author : setup->meta_author); + adjust_tags_parameter (&s3); + s2 = g_strdup_printf ("%s\t<meta name=\"author\" content=\"%s\" />\n", s1, s3); + g_free (s3); g_free (s1); s1 = s2; } if (setup->meta_description || items->meta_description) { - s2 = g_strdup_printf ("%s\t<meta name=\"description\" content=\"%s\" />\n", s1, - items->meta_description? items->meta_description : setup->meta_description); + s3 = g_strdup (items->meta_description ? items->meta_description : setup->meta_description); + adjust_tags_parameter (&s3); + s2 = g_strdup_printf ("%s\t<meta name=\"description\" content=\"%s\" />\n", s1, s3); + g_free (s3); g_free (s1); s1 = s2; } if (setup->meta_keywords || items->meta_keywords) { - s2 = g_strdup_printf ("%s\t<meta name=\"keywords\" content=\"%s\" />\n", s1, - items->meta_keywords ? items->meta_keywords : setup->meta_keywords); + s3 = g_strdup (items->meta_keywords ? items->meta_keywords : setup->meta_keywords); + adjust_tags_parameter (&s3); + s2 = g_strdup_printf ("%s\t<meta name=\"keywords\" content=\"%s\" />\n", s1, s3); + g_free (s3); g_free (s1); s1 = s2; } @@ -651,12 +653,12 @@ write_html_image (TGallerySetup *setup, } /* Convert line breaks to be visible in the HTML code */ if (title) { - str_replace (&title, "\r\n", "<br />", NULL); - str_replace (&title, "\n", "<br />", NULL); + str_replace (&title, "\r\n", "<br />"); + str_replace (&title, "\n", "<br />"); } if (title_desc) { - str_replace (&title_desc, "\r\n", "<br />", NULL); - str_replace (&title_desc, "\n", "<br />", NULL); + str_replace (&title_desc, "\r\n", "<br />"); + str_replace (&title_desc, "\n", "<br />"); } } if (title) title = g_strstrip (title); @@ -695,8 +697,6 @@ write_html_image (TGallerySetup *setup, while (parent) { s3 = make_string ("../", level); s4 = g_strdup (parent->ID); - /* TODO: check */ - fix_entities (&s4); s5 = setup->use_inpage_links ? g_strdup_printf ("#i%d", parent == parent_items ? item_index : old_parent_item_index) : g_strdup (""); s2 = g_strdup_printf ("<a href=\"%sindex.html%s\">%s</a> > %s", s3, s5, s4, s1); free (s3); @@ -753,22 +753,26 @@ write_html_image (TGallerySetup *setup, override_title_meta = setup->use_title_as_meta && title && (strlen (title) > 0); s1 = g_strdup_printf ("\t<meta name=\"generator\" content=\"Cataract Gallery Generator v%s\" />\n", APP_VERSION); if (setup->meta_author || parent_items->meta_author) { - s2 = g_strdup_printf ("%s\t<meta name=\"author\" content=\"%s\" />\n", s1, - parent_items->meta_author ? parent_items->meta_author : setup->meta_author); + s3 = g_strdup (parent_items->meta_author ? parent_items->meta_author : setup->meta_author); + adjust_tags_parameter (&s3); + s2 = g_strdup_printf ("%s\t<meta name=\"author\" content=\"%s\" />\n", s1, s3); + g_free (s3); g_free (s1); s1 = s2; } if (setup->meta_description || parent_items->meta_description || override_title_meta) { - s3 = override_title_meta ? g_markup_escape_text (title, -1) : NULL; - s2 = g_strdup_printf ("%s\t<meta name=\"description\" content=\"%s\" />\n", s1, - override_title_meta ? s3 : (parent_items->meta_description ? parent_items->meta_description : setup->meta_description)); + s3 = g_strdup (override_title_meta ? title : (parent_items->meta_description ? parent_items->meta_description : setup->meta_description)); + adjust_tags_parameter (&s3); + s2 = g_strdup_printf ("%s\t<meta name=\"description\" content=\"%s\" />\n", s1, s3); + g_free (s3); g_free (s1); - if (s3) g_free (s3); s1 = s2; } if ((setup->meta_keywords || parent_items->meta_keywords) && (! override_title_meta)) { - s2 = g_strdup_printf ("%s\t<meta name=\"keywords\" content=\"%s\" />\n", s1, - parent_items->meta_keywords ? parent_items->meta_keywords : setup->meta_keywords); + s3 = g_strdup (parent_items->meta_keywords ? parent_items->meta_keywords : setup->meta_keywords); + adjust_tags_parameter (&s3); + s2 = g_strdup_printf ("%s\t<meta name=\"keywords\" content=\"%s\" />\n", s1, s3); + g_free (s3); g_free (s1); s1 = s2; } |