Update XSS test golden file

1 files changed, 104 insertions, 102 deletions

diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index b22114a4..fa1f8cdf 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -1,13 +1,15 @@
 modules/akismet/views/admin_akismet.html.php                 16  DIRTY    $form
-modules/akismet/views/admin_akismet_stats.html.php           9   DIRTY    $api_key
-modules/akismet/views/admin_akismet_stats.html.php           9   DIRTY    urlencode($blog_url)
-modules/comment/views/admin_block_recent_comments.html.php   4   DIRTY    ($i%2==0)?"gEvenRow":"gOddRow"
+modules/akismet/views/admin_akismet_stats.html.php           9   DIRTY_ATTR $api_key
+modules/akismet/views/admin_akismet_stats.html.php           9   DIRTY_ATTR urlencode($blog_url)
+modules/comment/views/admin_block_recent_comments.html.php   4   DIRTY_ATTR ($i%2==0)?"gEvenRow":"gOddRow"
+modules/comment/views/admin_block_recent_comments.html.php   5   DIRTY_ATTR $comment->author()->avatar_url(32,$theme->url(,true))
 modules/comment/views/admin_block_recent_comments.html.php   10  DIRTY    gallery::date_time($comment->created)
 modules/comment/views/admin_comments.html.php                42  DIRTY    $menu
-modules/comment/views/admin_comments.html.php                106 DIRTY    $comment->id
-modules/comment/views/admin_comments.html.php                106 DIRTY    ($i%2==0)?"gOddRow":"gEvenRow"
+modules/comment/views/admin_comments.html.php                106 DIRTY_ATTR $comment->id
+modules/comment/views/admin_comments.html.php                106 DIRTY_ATTR ($i%2==0)?"gOddRow":"gEvenRow"
+modules/comment/views/admin_comments.html.php                109 DIRTY_ATTR $comment->author()->avatar_url(40,$theme->url(,true))
 modules/comment/views/admin_comments.html.php                122 DIRTY_JS $item->url()
-modules/comment/views/admin_comments.html.php                124 DIRTY    $item->thumb_url()
+modules/comment/views/admin_comments.html.php                124 DIRTY_ATTR $item->thumb_url()
 modules/comment/views/admin_comments.html.php                126 DIRTY    photo::img_dimensions($item->thumb_width,$item->thumb_height,75)
 modules/comment/views/admin_comments.html.php                134 DIRTY    gallery::date($comment->created)
 modules/comment/views/admin_comments.html.php                141 DIRTY_JS $comment->id
@@ -17,7 +19,8 @@ modules/comment/views/admin_comments.html.php                168 DIRTY_JS $comme
 modules/comment/views/admin_comments.html.php                175 DIRTY_JS $comment->id
 modules/comment/views/admin_comments.html.php                183 DIRTY_JS $comment->id
 modules/comment/views/admin_comments.html.php                196 DIRTY    $pager
-modules/comment/views/comment.html.php                       2   DIRTY    $comment->id;
+modules/comment/views/comment.html.php                       2   DIRTY_ATTR $comment->id;
+modules/comment/views/comment.html.php                       5   DIRTY_ATTR $comment->author()->avatar_url(40,$theme->url(,true))
 modules/comment/views/comment.mrss.php                       10  DIRTY    $feed->uri
 modules/comment/views/comment.mrss.php                       13  DIRTY_JS $feed->uri
 modules/comment/views/comment.mrss.php                       16  DIRTY_JS $feed->previous_page_uri
@@ -26,10 +29,11 @@ modules/comment/views/comment.mrss.php                       21  DIRTY    $pub_d
 modules/comment/views/comment.mrss.php                       22  DIRTY    $pub_date
 modules/comment/views/comment.mrss.php                       28  DIRTY    $child->item_uri
 modules/comment/views/comment.mrss.php                       29  DIRTY    $child->pub_date
-modules/comment/views/comment.mrss.php                       34  DIRTY    $child->thumb_url
-modules/comment/views/comment.mrss.php                       35  DIRTY    $child->thumb_height
-modules/comment/views/comment.mrss.php                       35  DIRTY    $child->thumb_width
-modules/comment/views/comments.html.php                      16  DIRTY    $comment->id
+modules/comment/views/comment.mrss.php                       34  DIRTY_ATTR $child->thumb_url
+modules/comment/views/comment.mrss.php                       35  DIRTY_ATTR $child->thumb_height
+modules/comment/views/comment.mrss.php                       35  DIRTY_ATTR $child->thumb_width
+modules/comment/views/comments.html.php                      16  DIRTY_ATTR $comment->id
+modules/comment/views/comments.html.php                      19  DIRTY_ATTR $comment->author()->avatar_url(40,$theme->url(,true))
 modules/digibug/views/digibug_form.html.php                  4   DIRTY    form::open("http://www.digibug.com/dapi/order.php")
 modules/digibug/views/digibug_form.html.php                  5   DIRTY    form::hidden($order_parms)
 modules/digibug/views/digibug_form.html.php                  6   DIRTY    form::close()
@@ -37,7 +41,7 @@ modules/exif/views/exif_dialog.html.php                      14  DIRTY    $detai
 modules/exif/views/exif_dialog.html.php                      21  DIRTY    $details[$i]["caption"]
 modules/g2_import/views/admin_g2_import.html.php             28  DIRTY    $form
 modules/gallery/views/admin_advanced_settings.html.php       22  DIRTY    $var->module_name
-modules/gallery/views/admin_block_log_entries.html.php       4   DIRTY    log::severity_class($entry->severity)
+modules/gallery/views/admin_block_log_entries.html.php       4   DIRTY_ATTR log::severity_class($entry->severity)
 modules/gallery/views/admin_block_log_entries.html.php       6   DIRTY    gallery::date_time($entry->timestamp)
 modules/gallery/views/admin_block_log_entries.html.php       7   DIRTY    $entry->message
 modules/gallery/views/admin_block_log_entries.html.php       8   DIRTY    $entry->html
@@ -45,70 +49,66 @@ modules/gallery/views/admin_block_news.html.php              5   DIRTY_JS $entry
 modules/gallery/views/admin_block_news.html.php              5   DIRTY    $entry["title"]
 modules/gallery/views/admin_block_news.html.php              7   DIRTY    text::limit_words(strip_tags($entry["description"]),25);
 modules/gallery/views/admin_block_photo_stream.html.php      6   DIRTY    photo::img_dimensions($photo->width,$photo->height,72)
-modules/gallery/views/admin_block_photo_stream.html.php      7   DIRTY    $photo->thumb_url()
+modules/gallery/views/admin_block_photo_stream.html.php      7   DIRTY_ATTR $photo->thumb_url()
 modules/gallery/views/admin_dashboard.html.php               5   DIRTY    $csrf
 modules/gallery/views/admin_dashboard.html.php               35  DIRTY    $blocks
 modules/gallery/views/admin_graphics.html.php                22  DIRTY    newView("admin_graphics_none.html")
 modules/gallery/views/admin_graphics.html.php                24  DIRTY    newView("admin_graphics_$active.html",array("tk"=>$tk->$active,"is_active"=>true))
 modules/gallery/views/admin_graphics.html.php                31  DIRTY    newView("admin_graphics_$id.html",array("tk"=>$tk->$id,"is_active"=>false))
-modules/gallery/views/admin_graphics_gd.html.php             2   DIRTY    $is_active?" gSelected":""
-modules/gallery/views/admin_graphics_gd.html.php             2   DIRTY    $tk->installed?" gInstalledToolkit":" gUnavailable"
+modules/gallery/views/admin_graphics_gd.html.php             2   DIRTY_ATTR $is_active?" gSelected":""
+modules/gallery/views/admin_graphics_gd.html.php             2   DIRTY_ATTR $tk->installed?" gInstalledToolkit":" gUnavailable"
 modules/gallery/views/admin_graphics_gd.html.php             19  DIRTY    $tk->error
-modules/gallery/views/admin_graphics_graphicsmagick.html.php 2   DIRTY    $is_active?" gSelected":""
-modules/gallery/views/admin_graphics_graphicsmagick.html.php 2   DIRTY    $tk->installed?"  gInstalledToolkit":" gUnavailable"
+modules/gallery/views/admin_graphics_graphicsmagick.html.php 2   DIRTY_ATTR $is_active?" gSelected":""
+modules/gallery/views/admin_graphics_graphicsmagick.html.php 2   DIRTY_ATTR $tk->installed?"  gInstalledToolkit":" gUnavailable"
 modules/gallery/views/admin_graphics_graphicsmagick.html.php 18  DIRTY    $tk->error
-modules/gallery/views/admin_graphics_imagemagick.html.php    2   DIRTY    $is_active?" gSelected":""
-modules/gallery/views/admin_graphics_imagemagick.html.php    2   DIRTY    $tk->installed?"  gInstalledToolkit":" gUnavailable"
+modules/gallery/views/admin_graphics_imagemagick.html.php    2   DIRTY_ATTR $is_active?" gSelected":""
+modules/gallery/views/admin_graphics_imagemagick.html.php    2   DIRTY_ATTR $tk->installed?"  gInstalledToolkit":" gUnavailable"
 modules/gallery/views/admin_graphics_imagemagick.html.php    18  DIRTY    $tk->error
 modules/gallery/views/admin_languages.html.php               9   DIRTY    access::csrf_form_field()
-modules/gallery/views/admin_languages.html.php               27  DIRTY    (isset($installed_locales[$code]))?"installed":""
-modules/gallery/views/admin_languages.html.php               27  DIRTY    ($default_locale==$code)?" default":""
+modules/gallery/views/admin_languages.html.php               27  DIRTY_ATTR (isset($installed_locales[$code]))?"installed":""
+modules/gallery/views/admin_languages.html.php               27  DIRTY_ATTR ($default_locale==$code)?" default":""
 modules/gallery/views/admin_languages.html.php               28  DIRTY    form::checkbox("installed_locales[]",$code,isset($installed_locales[$code]))
 modules/gallery/views/admin_languages.html.php               29  DIRTY    $display_name
 modules/gallery/views/admin_languages.html.php               31  DIRTY    form::radio("default_locale",$code,($default_locale==$code),((isset($installed_locales[$code]))?'':'disabled="disabled"'))
 modules/gallery/views/admin_languages.html.php               102 DIRTY    $share_translations_form
-modules/gallery/views/admin_maintenance.html.php             24  DIRTY    log::severity_class($task->severity)
-modules/gallery/views/admin_maintenance.html.php             24  DIRTY    ($i%2==0)?"gOddRow":"gEvenRow"
-modules/gallery/views/admin_maintenance.html.php             25  DIRTY    log::severity_class($task->severity)
+modules/gallery/views/admin_maintenance.html.php             24  DIRTY_ATTR log::severity_class($task->severity)
+modules/gallery/views/admin_maintenance.html.php             24  DIRTY_ATTR ($i%2==0)?"gOddRow":"gEvenRow"
+modules/gallery/views/admin_maintenance.html.php             25  DIRTY_ATTR log::severity_class($task->severity)
 modules/gallery/views/admin_maintenance.html.php             26  DIRTY    $task->name
 modules/gallery/views/admin_maintenance.html.php             29  DIRTY    $task->description
-modules/gallery/views/admin_maintenance.html.php             72  DIRTY    $task->state=="stalled"?"gWarning":""
-modules/gallery/views/admin_maintenance.html.php             72  DIRTY    ($i%2==0)?"gOddRow":"gEvenRow"
-modules/gallery/views/admin_maintenance.html.php             73  DIRTY    $task->state=="stalled"?"gWarning":""
+modules/gallery/views/admin_maintenance.html.php             72  DIRTY_ATTR $task->state=="stalled"?"gWarning":""
+modules/gallery/views/admin_maintenance.html.php             72  DIRTY_ATTR ($i%2==0)?"gOddRow":"gEvenRow"
+modules/gallery/views/admin_maintenance.html.php             73  DIRTY_ATTR $task->state=="stalled"?"gWarning":""
 modules/gallery/views/admin_maintenance.html.php             74  DIRTY    gallery::date_time($task->updated)
 modules/gallery/views/admin_maintenance.html.php             77  DIRTY    $task->name
 modules/gallery/views/admin_maintenance.html.php             92  DIRTY    $task->status
-modules/gallery/views/admin_maintenance.html.php             145 DIRTY    $task->state=="success"?"gSuccess":"gError"
-modules/gallery/views/admin_maintenance.html.php             145 DIRTY    ($i%2==0)?"gOddRow":"gEvenRow"
-modules/gallery/views/admin_maintenance.html.php             146 DIRTY    $task->state=="success"?"gSuccess":"gError"
+modules/gallery/views/admin_maintenance.html.php             145 DIRTY_ATTR $task->state=="success"?"gSuccess":"gError"
+modules/gallery/views/admin_maintenance.html.php             145 DIRTY_ATTR ($i%2==0)?"gOddRow":"gEvenRow"
+modules/gallery/views/admin_maintenance.html.php             146 DIRTY_ATTR $task->state=="success"?"gSuccess":"gError"
 modules/gallery/views/admin_maintenance.html.php             147 DIRTY    gallery::date_time($task->updated)
 modules/gallery/views/admin_maintenance.html.php             150 DIRTY    $task->name
 modules/gallery/views/admin_maintenance.html.php             162 DIRTY    $task->status
 modules/gallery/views/admin_maintenance_show_log.html.php    13  DIRTY    $task->name
 modules/gallery/views/admin_maintenance_task.html.php        55  DIRTY    $task->name
 modules/gallery/views/admin_modules.html.php                 9   DIRTY    access::csrf_form_field()
-modules/gallery/views/admin_modules.html.php                 19  DIRTY    ($i%2==0)?"gOddRow":"gEvenRow"
+modules/gallery/views/admin_modules.html.php                 19  DIRTY_ATTR ($i%2==0)?"gOddRow":"gEvenRow"
 modules/gallery/views/admin_modules.html.php                 22  DIRTY    form::checkbox($data,'1',module::is_active($module_name))
 modules/gallery/views/admin_modules.html.php                 24  DIRTY    $module_info->version
 modules/gallery/views/admin_theme_options.html.php           5   DIRTY    $form
 modules/gallery/views/admin_themes.html.php                  5   DIRTY    $csrf
-modules/gallery/views/admin_themes.html.php                  19  DIRTY    $themes[$site]->name
 modules/gallery/views/admin_themes.html.php                  20  DIRTY    $themes[$site]->name
 modules/gallery/views/admin_themes.html.php                  22  DIRTY    $themes[$site]->description
-modules/gallery/views/admin_themes.html.php                  35  DIRTY    $info->name
 modules/gallery/views/admin_themes.html.php                  36  DIRTY    $info->name
 modules/gallery/views/admin_themes.html.php                  38  DIRTY    $info->description
-modules/gallery/views/admin_themes.html.php                  57  DIRTY    $themes[$admin]->name
 modules/gallery/views/admin_themes.html.php                  58  DIRTY    $themes[$admin]->name
 modules/gallery/views/admin_themes.html.php                  60  DIRTY    $themes[$admin]->description
-modules/gallery/views/admin_themes.html.php                  73  DIRTY    $info->name
 modules/gallery/views/admin_themes.html.php                  74  DIRTY    $info->name
 modules/gallery/views/admin_themes.html.php                  76  DIRTY    $info->description
-modules/gallery/views/admin_themes_preview.html.php          7   DIRTY    $url
+modules/gallery/views/admin_themes_preview.html.php          7   DIRTY_ATTR $url
 modules/gallery/views/kohana_error_page.php                  102 DIRTY    $message
 modules/gallery/views/kohana_error_page.php                  116 DIRTY    $trace
 modules/gallery/views/kohana_profiler.php                    32  DIRTY    $profile->render();
-modules/gallery/views/l10n_client.html.php                   21  DIRTY    $string["translation"]===""?"untranslated":"translated"
+modules/gallery/views/l10n_client.html.php                   21  DIRTY_ATTR $string["translation"]===""?"untranslated":"translated"
 modules/gallery/views/l10n_client.html.php                   23  DIRTY    $string["source"]["one"]
 modules/gallery/views/l10n_client.html.php                   24  DIRTY    $string["source"]["other"]
 modules/gallery/views/l10n_client.html.php                   26  DIRTY    $string["source"]
@@ -128,16 +128,16 @@ modules/gallery/views/move_browse.html.php                   43  DIRTY    access
 modules/gallery/views/move_tree.html.php                     2   DIRTY    $parent->thumb_img(array(),25);
 modules/gallery/views/move_tree.html.php                     4   DIRTY_JS $parent->id
 modules/gallery/views/move_tree.html.php                     6   DIRTY_JS $parent->id
-modules/gallery/views/move_tree.html.php                     8   DIRTY    $parent->id
-modules/gallery/views/move_tree.html.php                     10  DIRTY    $child->id
+modules/gallery/views/move_tree.html.php                     8   DIRTY_ATTR $parent->id
+modules/gallery/views/move_tree.html.php                     10  DIRTY_ATTR $child->id
 modules/gallery/views/move_tree.html.php                     11  DIRTY    $child->thumb_img(array(),25);
 modules/gallery/views/move_tree.html.php                     13  DIRTY_JS $child->id
 modules/gallery/views/move_tree.html.php                     15  DIRTY_JS $child->id
 modules/gallery/views/movieplayer.html.php                   2   DIRTY    html::anchor($item->file_url(true),"",$attrs)
 modules/gallery/views/movieplayer.html.php                   5   DIRTY    $attrs["id"]
-modules/gallery/views/permissions_browse.html.php            41  DIRTY    $parent->id
+modules/gallery/views/permissions_browse.html.php            41  DIRTY_ATTR $parent->id
 modules/gallery/views/permissions_browse.html.php            42  DIRTY_JS $parent->id
-modules/gallery/views/permissions_browse.html.php            47  DIRTY    $item->id
+modules/gallery/views/permissions_browse.html.php            47  DIRTY_ATTR $item->id
 modules/gallery/views/permissions_browse.html.php            48  DIRTY_JS $item->id
 modules/gallery/views/permissions_browse.html.php            55  DIRTY    $form
 modules/gallery/views/permissions_form.html.php              24  DIRTY_JS $lock->id
@@ -165,8 +165,8 @@ modules/gallery/views/permissions_form.html.php              74  DIRTY_JS $item-
 modules/gallery/views/permissions_form.html.php              79  DIRTY_JS $group->id
 modules/gallery/views/permissions_form.html.php              79  DIRTY_JS $permission->id
 modules/gallery/views/permissions_form.html.php              79  DIRTY_JS $item->id
-modules/gallery/views/upgrader.html.php                      44  DIRTY    $module->version==$module->code_version?"current":"upgradeable"
-modules/gallery/views/upgrader.html.php                      45  DIRTY    $id
+modules/gallery/views/upgrader.html.php                      44  DIRTY_ATTR $module->version==$module->code_version?"current":"upgradeable"
+modules/gallery/views/upgrader.html.php                      45  DIRTY_ATTR $id
 modules/gallery/views/upgrader.html.php                      49  DIRTY    $module->version
 modules/gallery/views/upgrader.html.php                      52  DIRTY    $module->code_version
 modules/image_block/views/image_block_block.html.php         3   DIRTY_JS $item->url()
@@ -185,18 +185,18 @@ modules/organize/views/organize_dialog.html.php              22  DIRTY    $album
 modules/organize/views/organize_dialog.html.php              29  DIRTY    $micro_thumb_grid
 modules/organize/views/organize_dialog.html.php              37  DIRTY    form::dropdown(array("id"=>"gOrganizeSortColumn"),album::get_sort_order_options(),$album->sort_column)
 modules/organize/views/organize_dialog.html.php              38  DIRTY    form::dropdown(array("id"=>"gOrganizeSortOrder"),array("ASC"=>"Ascending","DESC"=>"Descending"),$album->sort_order)
-modules/organize/views/organize_thumb_grid.html.php          3   DIRTY    $child->id
-modules/organize/views/organize_thumb_grid.html.php          4   DIRTY    $child->id
-modules/organize/views/organize_thumb_grid.html.php          5   DIRTY    $child->is_album()?"gAlbum":"gPhoto"
+modules/organize/views/organize_thumb_grid.html.php          3   DIRTY_ATTR $child->id
+modules/organize/views/organize_thumb_grid.html.php          4   DIRTY_ATTR $child->id
+modules/organize/views/organize_thumb_grid.html.php          5   DIRTY_ATTR $child->is_album()?"gAlbum":"gPhoto"
 modules/organize/views/organize_thumb_grid.html.php          6   DIRTY    $child->thumb_img(array("class"=>"gThumbnail","ref"=>$child->id),90,true)
-modules/organize/views/organize_tree.html.php                2   DIRTY    access::can("edit",$album)?"":"gViewOnly"
-modules/organize/views/organize_tree.html.php                3   DIRTY    $album->id
-modules/organize/views/organize_tree.html.php                6   DIRTY    $selected&&$album->id==$selected->id?"selected":""
-modules/organize/views/organize_tree.html.php                7   DIRTY    $album->id
+modules/organize/views/organize_tree.html.php                2   DIRTY_ATTR access::can("edit",$album)?"":"gViewOnly"
+modules/organize/views/organize_tree.html.php                3   DIRTY_ATTR $album->id
+modules/organize/views/organize_tree.html.php                6   DIRTY_ATTR $selected&&$album->id==$selected->id?"selected":""
+modules/organize/views/organize_tree.html.php                7   DIRTY_ATTR $album->id
 modules/organize/views/organize_tree.html.php                13  DIRTY    View::factory("organize_tree.html",array("selected"=>$selected,"album"=>$child));
-modules/organize/views/organize_tree.html.php                15  DIRTY    access::can("edit",$child)?"":"gViewOnly"
-modules/organize/views/organize_tree.html.php                16  DIRTY    $child->id
-modules/organize/views/organize_tree.html.php                19  DIRTY    $child->id
+modules/organize/views/organize_tree.html.php                15  DIRTY_ATTR access::can("edit",$child)?"":"gViewOnly"
+modules/organize/views/organize_tree.html.php                16  DIRTY_ATTR $child->id
+modules/organize/views/organize_tree.html.php                19  DIRTY_ATTR $child->id
 modules/recaptcha/views/admin_recaptcha.html.php             10  DIRTY    $form
 modules/recaptcha/views/admin_recaptcha.html.php             23  DIRTY    $public_key
 modules/recaptcha/views/form_recaptcha.html.php              7   DIRTY    $public_key
@@ -207,60 +207,61 @@ modules/rss/views/feed.mrss.php                              19  DIRTY_JS $feed-
 modules/rss/views/feed.mrss.php                              21  DIRTY    $pub_date
 modules/rss/views/feed.mrss.php                              22  DIRTY    $pub_date
 modules/rss/views/feed.mrss.php                              28  DIRTY    date("D, d M Y H:i:s T",$child->created);
-modules/rss/views/feed.mrss.php                              34  DIRTY    $child->resize_url(true)
-modules/rss/views/feed.mrss.php                              36  DIRTY    $child->resize_height
-modules/rss/views/feed.mrss.php                              36  DIRTY    $child->resize_width
-modules/rss/views/feed.mrss.php                              39  DIRTY    $child->thumb_url(true)
-modules/rss/views/feed.mrss.php                              41  DIRTY    $child->thumb_height
-modules/rss/views/feed.mrss.php                              41  DIRTY    $child->thumb_width
-modules/rss/views/feed.mrss.php                              47  DIRTY    $child->thumb_url(true)
-modules/rss/views/feed.mrss.php                              48  DIRTY    @filesize($child->thumb_path())
-modules/rss/views/feed.mrss.php                              49  DIRTY    $child->thumb_height
-modules/rss/views/feed.mrss.php                              50  DIRTY    $child->thumb_width
-modules/rss/views/feed.mrss.php                              54  DIRTY    $child->resize_url(true)
-modules/rss/views/feed.mrss.php                              55  DIRTY    @filesize($child->resize_path())
-modules/rss/views/feed.mrss.php                              56  DIRTY    $child->mime_type
-modules/rss/views/feed.mrss.php                              57  DIRTY    $child->resize_height
-modules/rss/views/feed.mrss.php                              58  DIRTY    $child->resize_width
-modules/rss/views/feed.mrss.php                              62  DIRTY    $child->file_url(true)
-modules/rss/views/feed.mrss.php                              63  DIRTY    @filesize($child->file_path())
-modules/rss/views/feed.mrss.php                              64  DIRTY    $child->mime_type
-modules/rss/views/feed.mrss.php                              65  DIRTY    $child->height
-modules/rss/views/feed.mrss.php                              66  DIRTY    $child->width
-modules/rss/views/feed.mrss.php                              70  DIRTY    $child->file_url(true)
-modules/rss/views/feed.mrss.php                              71  DIRTY    @filesize($child->file_path())
-modules/rss/views/feed.mrss.php                              72  DIRTY    $child->height
-modules/rss/views/feed.mrss.php                              73  DIRTY    $child->width
-modules/rss/views/feed.mrss.php                              74  DIRTY    $child->mime_type
+modules/rss/views/feed.mrss.php                              34  DIRTY_ATTR $child->resize_url(true)
+modules/rss/views/feed.mrss.php                              36  DIRTY_ATTR $child->resize_height
+modules/rss/views/feed.mrss.php                              36  DIRTY_ATTR $child->resize_width
+modules/rss/views/feed.mrss.php                              39  DIRTY_ATTR $child->thumb_url(true)
+modules/rss/views/feed.mrss.php                              41  DIRTY_ATTR $child->thumb_height
+modules/rss/views/feed.mrss.php                              41  DIRTY_ATTR $child->thumb_width
+modules/rss/views/feed.mrss.php                              47  DIRTY_ATTR $child->thumb_url(true)
+modules/rss/views/feed.mrss.php                              48  DIRTY_ATTR @filesize($child->thumb_path())
+modules/rss/views/feed.mrss.php                              49  DIRTY_ATTR $child->thumb_height
+modules/rss/views/feed.mrss.php                              50  DIRTY_ATTR $child->thumb_width
+modules/rss/views/feed.mrss.php                              54  DIRTY_ATTR $child->resize_url(true)
+modules/rss/views/feed.mrss.php                              55  DIRTY_ATTR @filesize($child->resize_path())
+modules/rss/views/feed.mrss.php                              56  DIRTY_ATTR $child->mime_type
+modules/rss/views/feed.mrss.php                              57  DIRTY_ATTR $child->resize_height
+modules/rss/views/feed.mrss.php                              58  DIRTY_ATTR $child->resize_width
+modules/rss/views/feed.mrss.php                              62  DIRTY_ATTR $child->file_url(true)
+modules/rss/views/feed.mrss.php                              63  DIRTY_ATTR @filesize($child->file_path())
+modules/rss/views/feed.mrss.php                              64  DIRTY_ATTR $child->mime_type
+modules/rss/views/feed.mrss.php                              65  DIRTY_ATTR $child->height
+modules/rss/views/feed.mrss.php                              66  DIRTY_ATTR $child->width
+modules/rss/views/feed.mrss.php                              70  DIRTY_ATTR $child->file_url(true)
+modules/rss/views/feed.mrss.php                              71  DIRTY_ATTR @filesize($child->file_path())
+modules/rss/views/feed.mrss.php                              72  DIRTY_ATTR $child->height
+modules/rss/views/feed.mrss.php                              73  DIRTY_ATTR $child->width
+modules/rss/views/feed.mrss.php                              74  DIRTY_ATTR $child->mime_type
 modules/rss/views/rss_block.html.php                         6   DIRTY_JS rss::url($url)
-modules/search/views/search.html.php                         30  DIRTY    $item_class
+modules/search/views/search.html.php                         30  DIRTY_ATTR $item_class
 modules/search/views/search.html.php                         32  DIRTY    $item->thumb_img()
-modules/server_add/views/admin_server_add.html.php           15  DIRTY    $id
+modules/server_add/views/admin_server_add.html.php           15  DIRTY_ATTR $id
 modules/server_add/views/admin_server_add.html.php           24  DIRTY    $form
 modules/server_add/views/server_add_tree.html.php            12  DIRTY_JS html::js_string($dir)
-modules/server_add/views/server_add_tree.html.php            20  DIRTY    is_dir($file)?"ui-icon-folder-collapsed":"ui-icon-document"
+modules/server_add/views/server_add_tree.html.php            20  DIRTY_ATTR is_dir($file)?"ui-icon-folder-collapsed":"ui-icon-document"
 modules/server_add/views/server_add_tree_dialog.html.php     23  DIRTY    $tree
 modules/tag/views/admin_tags.html.php                        13  DIRTY    $csrf
-modules/tag/views/admin_tags.html.php                        50  DIRTY    $tag->id
+modules/tag/views/admin_tags.html.php                        50  DIRTY_ATTR $tag->id
 modules/tag/views/admin_tags.html.php                        51  DIRTY    $tag->count
 modules/tag/views/tag_block.html.php                         15  DIRTY    $cloud
 modules/tag/views/tag_block.html.php                         17  DIRTY    $form
-modules/tag/views/tag_cloud.html.php                         4   DIRTY    (int)(($tag->count/$max_count)*7)
+modules/tag/views/tag_cloud.html.php                         4   DIRTY_ATTR (int)(($tag->count/$max_count)*7)
 modules/tag/views/tag_cloud.html.php                         5   DIRTY    $tag->count
-modules/user/views/admin_users.html.php                      67  DIRTY    $user->id
-modules/user/views/admin_users.html.php                      67  DIRTY    text::alternate("gOddRow","gEvenRow")
-modules/user/views/admin_users.html.php                      67  DIRTY    $user->admin?"admin":""
-modules/user/views/admin_users.html.php                      68  DIRTY    $user->id
+modules/user/views/admin_users.html.php                      67  DIRTY_ATTR $user->id
+modules/user/views/admin_users.html.php                      67  DIRTY_ATTR text::alternate("gOddRow","gEvenRow")
+modules/user/views/admin_users.html.php                      67  DIRTY_ATTR $user->admin?"admin":""
+modules/user/views/admin_users.html.php                      68  DIRTY_ATTR $user->id
+modules/user/views/admin_users.html.php                      69  DIRTY_ATTR $user->avatar_url(20,$theme->url(,true))
 modules/user/views/admin_users.html.php                      83  DIRTY    ($user->last_login==0)?"":gallery::date($user->last_login)
-modules/user/views/admin_users.html.php                      121 DIRTY    $group->id
-modules/user/views/admin_users.html.php                      121 DIRTY    ($group->special?"gDefaultGroup":"")
+modules/user/views/admin_users.html.php                      121 DIRTY_ATTR $group->id
+modules/user/views/admin_users.html.php                      121 DIRTY_ATTR ($group->special?"gDefaultGroup":"")
 modules/user/views/admin_users.html.php                      123 DIRTY    $v
 modules/user/views/admin_users_group.html.php                22  DIRTY_JS $user->id
 modules/user/views/admin_users_group.html.php                22  DIRTY_JS $group->id
 modules/user/views/login_ajax.html.php                       37  DIRTY    $form
-modules/watermark/views/admin_watermarks.html.php            19  DIRTY    $width
-modules/watermark/views/admin_watermarks.html.php            19  DIRTY    $height
-modules/watermark/views/admin_watermarks.html.php            19  DIRTY    $url
+modules/watermark/views/admin_watermarks.html.php            19  DIRTY_ATTR $width
+modules/watermark/views/admin_watermarks.html.php            19  DIRTY_ATTR $height
+modules/watermark/views/admin_watermarks.html.php            19  DIRTY_ATTR $url
 themes/admin_default/views/admin.html.php                    16  DIRTY_JS $theme->url()
 themes/admin_default/views/admin.html.php                    34  DIRTY    $theme->admin_head()
 themes/admin_default/views/admin.html.php                    38  DIRTY    $theme->admin_page_top()
@@ -273,7 +274,7 @@ themes/admin_default/views/admin.html.php                    75  DIRTY    $theme
 themes/admin_default/views/admin.html.php                    77  DIRTY    $theme->admin_credits()
 themes/admin_default/views/admin.html.php                    81  DIRTY    $theme->admin_page_bottom()
 themes/admin_default/views/block.html.php                    2   DIRTY    $id
-themes/admin_default/views/block.html.php                    2   DIRTY    $css_id
+themes/admin_default/views/block.html.php                    2   DIRTY_ATTR $css_id
 themes/admin_default/views/block.html.php                    10  DIRTY    $title
 themes/admin_default/views/block.html.php                    13  DIRTY    $content
 themes/admin_default/views/pager.html.php                    13  DIRTY_JS str_replace('{page}',1,$url)
@@ -281,21 +282,21 @@ themes/admin_default/views/pager.html.php                    20  DIRTY_JS str_re
 themes/admin_default/views/pager.html.php                    27  DIRTY    $from_to_msg
 themes/admin_default/views/pager.html.php                    30  DIRTY_JS str_replace('{page}',$next_page,$url)
 themes/admin_default/views/pager.html.php                    37  DIRTY_JS str_replace('{page}',$last_page,$url)
-themes/default/views/album.html.php                          16  DIRTY    $child->id
-themes/default/views/album.html.php                          16  DIRTY    $item_class
+themes/default/views/album.html.php                          16  DIRTY_ATTR $child->id
+themes/default/views/album.html.php                          16  DIRTY_ATTR $item_class
 themes/default/views/album.html.php                          18  DIRTY_JS $child->url()
 themes/default/views/album.html.php                          19  DIRTY    $child->thumb_img(array("class"=>"gThumbnail"))
 themes/default/views/album.html.php                          23  DIRTY_JS $child->url()
-themes/default/views/block.html.php                          2   DIRTY    $anchor
-themes/default/views/block.html.php                          3   DIRTY    $css_id
+themes/default/views/block.html.php                          2   DIRTY_ATTR $anchor
+themes/default/views/block.html.php                          3   DIRTY_ATTR $css_id
 themes/default/views/block.html.php                          4   DIRTY    $title
 themes/default/views/block.html.php                          6   DIRTY    $content
-themes/default/views/dynamic.html.php                        11  DIRTY    $child->is_album()?"gAlbum":""
+themes/default/views/dynamic.html.php                        11  DIRTY_ATTR $child->is_album()?"gAlbum":""
 themes/default/views/dynamic.html.php                        13  DIRTY_JS $child->url()
-themes/default/views/dynamic.html.php                        14  DIRTY    $child->id
-themes/default/views/dynamic.html.php                        15  DIRTY    $child->thumb_url()
-themes/default/views/dynamic.html.php                        16  DIRTY    $child->thumb_width
-themes/default/views/dynamic.html.php                        17  DIRTY    $child->thumb_height
+themes/default/views/dynamic.html.php                        14  DIRTY_ATTR $child->id
+themes/default/views/dynamic.html.php                        15  DIRTY_ATTR $child->thumb_url()
+themes/default/views/dynamic.html.php                        16  DIRTY_ATTR $child->thumb_width
+themes/default/views/dynamic.html.php                        17  DIRTY_ATTR $child->thumb_height
 themes/default/views/movie.html.php                          8   DIRTY_JS $previous_item->url()
 themes/default/views/movie.html.php                          18  DIRTY_JS $next_item->url()
 themes/default/views/movie.html.php                          28  DIRTY    $item->movie_img(array("class"=>"gMovie","id"=>"gMovieId-{$item->id}"))
@@ -306,6 +307,7 @@ themes/default/views/page.html.php                           41  DIRTY    $new_w
 themes/default/views/page.html.php                           42  DIRTY    $new_height
 themes/default/views/page.html.php                           43  DIRTY    $thumb_proportion
 themes/default/views/page.html.php                           82  DIRTY    $header_text
+themes/default/views/page.html.php                           85  DIRTY_ATTR $theme->url()
 themes/default/views/page.html.php                           112 DIRTY    $content
 themes/default/views/page.html.php                           118 DIRTY    newView("sidebar.html")
 themes/default/views/page.html.php                           125 DIRTY    $footer_text