From 2b804ebdcea2127ca481ae3fb25a33a3bc5a78c3 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 28 Jun 2009 17:53:20 -0600 Subject: Convert info module's block to use a list instead of a table. Addresses request in ticket #441. --- modules/info/views/info_block.html.php | 75 +++++++++++++++------------------- 1 file changed, 33 insertions(+), 42 deletions(-) (limited to 'modules/info') diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php index 9f9ec5df..3a96937c 100644 --- a/modules/info/views/info_block.html.php +++ b/modules/info/views/info_block.html.php @@ -1,44 +1,35 @@ - - - - - - - description): ?> - - - - + - - - - - id != 1): ?> - parent(); ?> - - - - - - captured): ?> - - - - - - owner): ?> - - - - - - -
title) ?>
description) ?>
name) ?>
- id}?show=$item->id") ?>"> - title) ?> - -
captured) ?>
owner->name) ?>
+ + + \ No newline at end of file -- cgit v1.2.3 From b235fd6e5f2197869c8ef04637d990d2017a19bf Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 28 Jun 2009 18:00:00 -0700 Subject: Pass the item into the block. --- modules/info/helpers/info_theme.php | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/info') diff --git a/modules/info/helpers/info_theme.php b/modules/info/helpers/info_theme.php index 151885b7..2a761fb4 100644 --- a/modules/info/helpers/info_theme.php +++ b/modules/info/helpers/info_theme.php @@ -22,6 +22,7 @@ class info_theme_Core { if ($theme->item()) { $block = new Block(); $block->css_id = "gMetadata"; + $block->item = $theme->item(); $block->title = $theme->item()->is_album() ? t("Album Info") : t("Photo Info"); $block->content = new View("info_block.html"); return $block; -- cgit v1.2.3 From 24f0c4bd1914e5dc62d4fef936c901227620abbe Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 28 Jun 2009 18:10:42 -0700 Subject: Undo my last change; it's not the right fix for the problem. --- modules/info/helpers/info_theme.php | 1 - modules/info/views/info_block.html.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'modules/info') diff --git a/modules/info/helpers/info_theme.php b/modules/info/helpers/info_theme.php index 2a761fb4..151885b7 100644 --- a/modules/info/helpers/info_theme.php +++ b/modules/info/helpers/info_theme.php @@ -22,7 +22,6 @@ class info_theme_Core { if ($theme->item()) { $block = new Block(); $block->css_id = "gMetadata"; - $block->item = $theme->item(); $block->title = $theme->item()->is_album() ? t("Album Info") : t("Photo Info"); $block->content = new View("info_block.html"); return $block; diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php index 3a96937c..db621006 100644 --- a/modules/info/views/info_block.html.php +++ b/modules/info/views/info_block.html.php @@ -32,4 +32,4 @@ - \ No newline at end of file + -- cgit v1.2.3 From 0d105bcf9dfa0b34b390bd80f49965c563d48534 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Tue, 30 Jun 2009 23:29:53 -0600 Subject: Display owner's full name rather than username, ticket #421. --- modules/info/helpers/info_theme.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/info') diff --git a/modules/info/helpers/info_theme.php b/modules/info/helpers/info_theme.php index 151885b7..863317a8 100644 --- a/modules/info/helpers/info_theme.php +++ b/modules/info/helpers/info_theme.php @@ -37,7 +37,7 @@ class info_theme_Core { } if ($item->owner) { $results .= "
  • "; - $results .= t("By: %owner_name", array("owner_name" => "{$item->owner->name}")); + $results .= t("By: %owner_name", array("owner_name" => "{$item->owner->full_name}")); $results .= "
    • "; } return $results; -- cgit v1.2.3 From 54ffea24196e8f5d88cf9d8607455f0f6aab305c Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Fri, 3 Jul 2009 21:44:10 -0700 Subject: Split the clean method into two clean and purify. clean is a light weight approach using html::specialchars and purify uses HTMLPurifier to intelligently cleanse the output fields. Use purifier for text and title fields where it is likely that a user would enter html to format their data. --- modules/comment/controllers/comments.php | 4 ++-- modules/comment/helpers/comment_rss.php | 2 +- modules/comment/views/admin_block_recent_comments.html.php | 2 +- modules/comment/views/admin_comments.html.php | 4 ++-- modules/comment/views/comment.html.php | 2 +- modules/comment/views/comments.html.php | 2 +- modules/digibug/controllers/digibug.php | 2 +- modules/gallery/controllers/quick.php | 10 +++++----- modules/gallery/helpers/p.php | 4 ++++ modules/gallery/views/permissions_browse.html.php | 2 +- modules/gallery/views/simple_uploader.html.php | 6 +++--- modules/info/views/info_block.html.php | 4 ++-- modules/notification/views/comment_published.html.php | 2 +- modules/notification/views/item_added.html.php | 4 ++-- modules/notification/views/item_deleted.html.php | 2 +- modules/organize/controllers/organize.php | 10 +++++----- modules/organize/views/organize.html.php | 2 +- modules/search/views/search.html.php | 4 ++-- themes/default/views/album.html.php | 4 ++-- themes/default/views/header.html.php | 4 ++-- themes/default/views/movie.html.php | 4 ++-- themes/default/views/photo.html.php | 4 ++-- 22 files changed, 44 insertions(+), 40 deletions(-) (limited to 'modules/info') diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php index 99ecc8e0..2840ba67 100644 --- a/modules/comment/controllers/comments.php +++ b/modules/comment/controllers/comments.php @@ -41,7 +41,7 @@ class Comments_Controller extends REST_Controller { "id" => $comment->id, "author_name" => p::clean($comment->author_name()), "created" => $comment->created, - "text" => p::clean($comment->text)); + "text" => p::purify($comment->text)); } print json_encode($data); break; @@ -128,7 +128,7 @@ class Comments_Controller extends REST_Controller { "id" => $comment->id, "author_name" => p::clean($comment->author_name()), "created" => $comment->created, - "text" => p::clean($comment->text)))); + "text" => p::purify($comment->text)))); } else { $view = new Theme_View("comment.html", "fragment"); $view->comment = $comment; diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php index ef2d176e..746c6161 100644 --- a/modules/comment/helpers/comment_rss.php +++ b/modules/comment/helpers/comment_rss.php @@ -23,7 +23,7 @@ class comment_rss_Core { $feeds["comment/newest"] = t("All new comments"); if ($item) { $feeds["comment/item/$item->id"] = - t("Comments on %title", array("title" => p::clean($item->title))); + t("Comments on %title", array("title" => p::purify($item->title))); } return $feeds; } diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php index af4d946e..893c1a63 100644 --- a/modules/comment/views/admin_block_recent_comments.html.php +++ b/modules/comment/views/admin_block_recent_comments.html.php @@ -10,7 +10,7 @@ created) ?> %author_name said %comment_text', array("author_name" => p::clean($comment->author_name()), - "comment_text" => text::limit_words(p::clean($comment->text), 50))); ?> + "comment_text" => text::limit_words(p::purify($comment->text), 50))); ?> diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php index 453cf849..489605d5 100644 --- a/modules/comment/views/admin_comments.html.php +++ b/modules/comment/views/admin_comments.html.php @@ -122,7 +122,7 @@ has_thumb()): ?> <?= p::clean($item->title) ?>thumb_width, $item->thumb_height, 75) ?> /> @@ -132,7 +132,7 @@

    created) ?>

    - text) ?> + text) ?>

    @@ -185,7 +185,7 @@ $("#gUploadQueueInfo").text("(completed " + stats.successful_uploads + " of " + (stats.files_queued + stats.successful_uploads + stats.upload_errors + stats.upload_cancelled + stats.queue_errors) + ")"); } - + // Auto start the upload this.startUpload(); } diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php index db621006..ccb564d3 100644 --- a/modules/info/views/info_block.html.php +++ b/modules/info/views/info_block.html.php @@ -2,12 +2,12 @@

    • - title) ?> + title) ?>
      • description): ?>
    • - description) ?> + description) ?>
      • id != 1): ?> diff --git a/modules/notification/views/comment_published.html.php b/modules/notification/views/comment_published.html.php index ff2ba0bc..70709979 100644 --- a/modules/notification/views/comment_published.html.php +++ b/modules/notification/views/comment_published.html.php @@ -8,7 +8,7 @@ - + diff --git a/modules/notification/views/item_added.html.php b/modules/notification/views/item_added.html.php index 32857c08..4fa5d42d 100644 --- a/modules/notification/views/item_added.html.php +++ b/modules/notification/views/item_added.html.php @@ -8,7 +8,7 @@
      text) ?>text) ?>
      - + @@ -21,7 +21,7 @@ description): ?> - +
      title) ?>title) ?>
      description) ?>description) ?>
      diff --git a/modules/notification/views/item_deleted.html.php b/modules/notification/views/item_deleted.html.php index 2d6d5738..92215211 100644 --- a/modules/notification/views/item_deleted.html.php +++ b/modules/notification/views/item_deleted.html.php @@ -9,7 +9,7 @@ p::clean($item->parent()->title))) ?> + array("title" => p::purify($item->parent()->title))) ?> diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php index 5f80805c..6792573d 100644 --- a/modules/organize/controllers/organize.php +++ b/modules/organize/controllers/organize.php @@ -62,8 +62,8 @@ class Organize_Controller extends Controller { access::required("edit", $item); print json_encode( - array("title" => p::clean($item->title), - "description" => empty($item->description) ? "" : p::clean($item->description))); + array("title" => p::purify($item->title), + "description" => empty($item->description) ? "" : p::purify($item->description))); } function tree($item, $parent) { @@ -283,10 +283,10 @@ class Organize_Controller extends Controller { if ($item->is_album()) { log::success("content", "Updated album", "id\">view"); - $message = t("Saved album %album_title", array("album_title" => p::clean($item->title))); + $message = t("Saved album %album_title", array("album_title" => p::purify($item->title))); } else { log::success("content", "Updated photo", "id\">view"); - $message = t("Saved photo %photo_title", array("photo_title" => p::clean($item->title))); + $message = t("Saved photo %photo_title", array("photo_title" => p::purify($item->title))); } print json_encode(array("form" => $form->__toString(), "message" => $message)); } else { @@ -325,7 +325,7 @@ class Organize_Controller extends Controller { module::event("item_updated", $orig, $item); log::success("content", "Updated album", "id\">view"); - $message = t("Saved album %album_title", array("album_title" => p::clean($item->title))); + $message = t("Saved album %album_title", array("album_title" => p::purify($item->title))); print json_encode(array("form" => $form->__toString(), "message" => $message)); } else { print json_encode(array("form" => $form->__toString())); diff --git a/modules/organize/views/organize.html.php b/modules/organize/views/organize.html.php index 6e5bfcea..65d67d04 100644 --- a/modules/organize/views/organize.html.php +++ b/modules/organize/views/organize.html.php @@ -16,7 +16,7 @@ var CONFIRM_DELETE = "
      - p::clean($item->title))) ?> + p::purify($item->title))) ?>
      diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php index 5db07bad..d173f734 100644 --- a/modules/search/views/search.html.php +++ b/modules/search/views/search.html.php @@ -31,10 +31,10 @@ id") ?>"> thumb_img() ?>

      - title) ?> + title) ?>

      - description) ?> + description) ?>
      diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php index 46b0d29a..273b8a4e 100644 --- a/themes/default/views/album.html.php +++ b/themes/default/views/album.html.php @@ -2,8 +2,8 @@
      album_top() ?> -

      title) ?>

      -
      description) ?>
      +

      title) ?>

      +
      description) ?>
        diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php index 51f55b41..5428d9fd 100644 --- a/themes/default/views/header.html.php +++ b/themes/default/views/header.html.php @@ -19,10 +19,10 @@
      • id}?show=$item->id") ?>"> - title) ?> + title) ?>
        • -
      • title) ?>
        • +
      • title) ?>
      diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php index c2fb0e30..2cd9806f 100644 --- a/themes/default/views/movie.html.php +++ b/themes/default/views/movie.html.php @@ -15,8 +15,8 @@ movie_img(array("class" => "gMovie", "id" => "gMovieId-{$item->id}")) ?>
      -

      title) ?>

      -
      description) ?>
      +

      title) ?>

      +
      description) ?>