Updated xss data.

1 files changed, 167 insertions, 130 deletions

diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index eaa8c99c..ef386906 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -4,21 +4,21 @@ modules/akismet/views/admin_akismet_stats.html.php           9   DIRTY_ATTR urle
 modules/comment/views/admin_block_recent_comments.html.php   4   DIRTY_ATTR ($i%2==0)?"g-even":"g-odd"
 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_ATTR $comment->id
-modules/comment/views/admin_comments.html.php                106 DIRTY_ATTR ($i%2==0)?"g-odd":"g-even"
-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_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
-modules/comment/views/admin_comments.html.php                150 DIRTY_JS $comment->id
-modules/comment/views/admin_comments.html.php                159 DIRTY_JS $comment->id
-modules/comment/views/admin_comments.html.php                168 DIRTY_JS $comment->id
-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/admin_comments.html.php                43  DIRTY    $menu->render()
+modules/comment/views/admin_comments.html.php                107 DIRTY_ATTR $comment->id
+modules/comment/views/admin_comments.html.php                107 DIRTY_ATTR ($i%2==0)?"g-odd":"g-even"
+modules/comment/views/admin_comments.html.php                110 DIRTY_ATTR $comment->author()->avatar_url(40,$theme->url(,true))
+modules/comment/views/admin_comments.html.php                123 DIRTY_JS $item->url()
+modules/comment/views/admin_comments.html.php                125 DIRTY_ATTR $item->thumb_url()
+modules/comment/views/admin_comments.html.php                127 DIRTY    photo::img_dimensions($item->thumb_width,$item->thumb_height,75)
+modules/comment/views/admin_comments.html.php                135 DIRTY    gallery::date($comment->created)
+modules/comment/views/admin_comments.html.php                142 DIRTY_JS $comment->id
+modules/comment/views/admin_comments.html.php                151 DIRTY_JS $comment->id
+modules/comment/views/admin_comments.html.php                160 DIRTY_JS $comment->id
+modules/comment/views/admin_comments.html.php                169 DIRTY_JS $comment->id
+modules/comment/views/admin_comments.html.php                176 DIRTY_JS $comment->id
+modules/comment/views/admin_comments.html.php                184 DIRTY_JS $comment->id
+modules/comment/views/admin_comments.html.php                197 DIRTY    $pager
 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
@@ -39,8 +39,9 @@ modules/digibug/views/digibug_form.html.php                  5   DIRTY    form::
 modules/digibug/views/digibug_form.html.php                  6   DIRTY    form::close()
 modules/exif/views/exif_dialog.html.php                      14  DIRTY    $details[$i]["caption"]
 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/g2_import/views/admin_g2_import.html.php             29  DIRTY    $form
+modules/gallery/views/admin_advanced_settings.html.php       22  DIRTY_ATTR ($i%2==0)?"g-odd":"g-even"
+modules/gallery/views/admin_advanced_settings.html.php       23  DIRTY    $var->module_name
 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
@@ -53,9 +54,9 @@ modules/gallery/views/admin_block_photo_stream.html.php      6   DIRTY    photo:
 modules/gallery/views/admin_block_photo_stream.html.php      7   DIRTY_ATTR $photo->thumb_url()
 modules/gallery/views/admin_dashboard.html.php               5   DIRTY_JS $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.html.php                24  DIRTY    newView("admin_graphics_none.html")
+modules/gallery/views/admin_graphics.html.php                26  DIRTY    newView("admin_graphics_$active.html",array("tk"=>$tk->$active,"is_active"=>true))
+modules/gallery/views/admin_graphics.html.php                33  DIRTY    newView("admin_graphics_$id.html",array("tk"=>$tk->$id,"is_active"=>false))
 modules/gallery/views/admin_graphics_gd.html.php             2   DIRTY_ATTR $is_active?" g-selected":""
 modules/gallery/views/admin_graphics_gd.html.php             2   DIRTY_ATTR $tk->installed?" g-installed-toolkit":" g-unavailable"
 modules/gallery/views/admin_graphics_gd.html.php             19  DIRTY    $tk->error
@@ -65,49 +66,62 @@ modules/gallery/views/admin_graphics_graphicsmagick.html.php 18  DIRTY    $tk->e
 modules/gallery/views/admin_graphics_imagemagick.html.php    2   DIRTY_ATTR $is_active?" g-selected":""
 modules/gallery/views/admin_graphics_imagemagick.html.php    2   DIRTY_ATTR $tk->installed?"  g-installed-toolkit":" g-unavailable"
 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_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_ATTR ($i%2==0)?"g-odd":"g-even"
-modules/gallery/views/admin_maintenance.html.php             24  DIRTY_ATTR log::severity_class($task->severity)
+modules/gallery/views/admin_identity.html.php                43  DIRTY    access::csrf_form_field()
+modules/gallery/views/admin_identity.html.php                51  DIRTY_ATTR ($i%2==0)?"g-odd":"g-even"
+modules/gallery/views/admin_identity.html.php                53  DIRTY    form::radio($data,$module_name,$module_name==$active)
+modules/gallery/views/admin_identity_confirm.html.php        3   DIRTY    access::csrf_form_field()
+modules/gallery/views/admin_identity_confirm.html.php        4   DIRTY    form::hidden("provider",$new_provider)
+modules/gallery/views/admin_languages.html.php               43  DIRTY    access::csrf_form_field()
+modules/gallery/views/admin_languages.html.php               60  DIRTY_ATTR (isset($installed_locales[$code]))?"g-available":""
+modules/gallery/views/admin_languages.html.php               60  DIRTY_ATTR ($default_locale==$code)?" g-selected":""
+modules/gallery/views/admin_languages.html.php               61  DIRTY    form::checkbox("installed_locales[]",$code,isset($installed_locales[$code]))
+modules/gallery/views/admin_languages.html.php               62  DIRTY    $display_name
+modules/gallery/views/admin_languages.html.php               64  DIRTY    form::radio("default_locale",$code,($default_locale==$code),((isset($installed_locales[$code]))?'':'disabled="disabled"'))
+modules/gallery/views/admin_languages.html.php               109 DIRTY    $share_translations_form
+modules/gallery/views/admin_maintenance.html.php             25  DIRTY_ATTR ($i%2==0)?"g-odd":"g-even"
 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_ATTR ($i%2==0)?"g-odd":"g-even"
-modules/gallery/views/admin_maintenance.html.php             72  DIRTY_ATTR $task->state=="stalled"?"g-warning":""
+modules/gallery/views/admin_maintenance.html.php             26  DIRTY_ATTR log::severity_class($task->severity)
+modules/gallery/views/admin_maintenance.html.php             27  DIRTY    $task->name
+modules/gallery/views/admin_maintenance.html.php             30  DIRTY    $task->description
+modules/gallery/views/admin_maintenance.html.php             73  DIRTY_ATTR ($i%2==0)?"g-odd":"g-even"
 modules/gallery/views/admin_maintenance.html.php             73  DIRTY_ATTR $task->state=="stalled"?"g-warning":""
-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_ATTR ($i%2==0)?"g-odd":"g-even"
-modules/gallery/views/admin_maintenance.html.php             145 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
+modules/gallery/views/admin_maintenance.html.php             74  DIRTY_ATTR $task->state=="stalled"?"g-warning":""
+modules/gallery/views/admin_maintenance.html.php             75  DIRTY    gallery::date_time($task->updated)
+modules/gallery/views/admin_maintenance.html.php             78  DIRTY    $task->name
+modules/gallery/views/admin_maintenance.html.php             93  DIRTY    $task->status
+modules/gallery/views/admin_maintenance.html.php             146 DIRTY_ATTR ($i%2==0)?"g-odd":"g-even"
 modules/gallery/views/admin_maintenance.html.php             146 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
-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.html.php             147 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
+modules/gallery/views/admin_maintenance.html.php             148 DIRTY    gallery::date_time($task->updated)
+modules/gallery/views/admin_maintenance.html.php             151 DIRTY    $task->name
+modules/gallery/views/admin_maintenance.html.php             163 DIRTY    $task->status
 modules/gallery/views/admin_maintenance_show_log.html.php    8   DIRTY_JS url::site("admin/maintenance/save_log/$task->id?csrf=$csrf")
 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_ATTR ($i%2==0)?"g-odd":"g-even"
-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_modules.html.php                 10  DIRTY    access::csrf_form_field()
+modules/gallery/views/admin_modules.html.php                 20  DIRTY_ATTR ($i%2==0)?"g-odd":"g-even"
+modules/gallery/views/admin_modules.html.php                 23  DIRTY    form::checkbox($data,'1',module::is_active($module_name))
+modules/gallery/views/admin_modules.html.php                 25  DIRTY    $module_info->version
+modules/gallery/views/admin_sidebar.html.php                 50  DIRTY    $available
+modules/gallery/views/admin_sidebar.html.php                 58  DIRTY    $active
+modules/gallery/views/admin_sidebar_blocks.html.php          4   DIRTY_ATTR $ref
+modules/gallery/views/admin_sidebar_blocks.html.php          4   DIRTY    $text
+modules/gallery/views/admin_theme_options.html.php           6   DIRTY    $form
 modules/gallery/views/admin_themes.html.php                  3   DIRTY_JS url::site("admin/themes/choose")
 modules/gallery/views/admin_themes.html.php                  5   DIRTY_JS $csrf
-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                  36  DIRTY    $info->name
-modules/gallery/views/admin_themes.html.php                  38  DIRTY    $info->description
-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                  74  DIRTY    $info->name
-modules/gallery/views/admin_themes.html.php                  76  DIRTY    $info->description
+modules/gallery/views/admin_themes.html.php                  22  DIRTY    $themes[$site]->name
+modules/gallery/views/admin_themes.html.php                  24  DIRTY    $themes[$site]->description
+modules/gallery/views/admin_themes.html.php                  38  DIRTY    $info->name
+modules/gallery/views/admin_themes.html.php                  40  DIRTY    $info->description
+modules/gallery/views/admin_themes.html.php                  60  DIRTY    $themes[$admin]->name
+modules/gallery/views/admin_themes.html.php                  62  DIRTY    $themes[$admin]->description
+modules/gallery/views/admin_themes.html.php                  76  DIRTY    $info->name
+modules/gallery/views/admin_themes.html.php                  78  DIRTY    $info->description
 modules/gallery/views/admin_themes_preview.html.php          7   DIRTY_ATTR $url
+modules/gallery/views/in_place_edit.html.php                 2   DIRTY    form::open($action,array("method"=>"post","id"=>"g-in-place-edit-form","class"=>"g-short-form"),$hidden)
+modules/gallery/views/in_place_edit.html.php                 5   DIRTY    form::input("input",$form["input"]," class='textbox'")
+modules/gallery/views/in_place_edit.html.php                 12  DIRTY    form::close()
+modules/gallery/views/in_place_edit.html.php                 14  DIRTY    $errors["input"]
 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();
@@ -125,7 +139,23 @@ modules/gallery/views/l10n_client.html.php                   54  DIRTY    form::
 modules/gallery/views/l10n_client.html.php                   58  DIRTY    form::textarea("l10n-edit-plural-translation-few","",' rows="2"')
 modules/gallery/views/l10n_client.html.php                   62  DIRTY    form::textarea("l10n-edit-plural-translation-many","",' rows="2"')
 modules/gallery/views/l10n_client.html.php                   67  DIRTY    form::textarea("l10n-edit-plural-translation-other","",' rows="2"')
-modules/gallery/views/maintenance.html.php                   46  DIRTY    user::get_login_form("login/auth_html")
+modules/gallery/views/login_ajax.html.php                    6   DIRTY_JS url::site("password/reset")
+modules/gallery/views/login_ajax.html.php                    37  DIRTY    $form
+modules/gallery/views/maintenance.html.php                   46  DIRTY    auth::get_login_form("login/auth_html")
+modules/gallery/views/menu.html.php                          4   DIRTY    isset($menu->css_id)?"id='$menu->css_id'":""
+modules/gallery/views/menu.html.php                          4   DIRTY_ATTR $menu->css_class
+modules/gallery/views/menu.html.php                          6   DIRTY    $element->render()
+modules/gallery/views/menu.html.php                          18  DIRTY    $element->render()
+modules/gallery/views/menu_ajax_link.html.php                3   DIRTY_ATTR $menu->css_id
+modules/gallery/views/menu_ajax_link.html.php                4   DIRTY_ATTR $menu->css_class
+modules/gallery/views/menu_ajax_link.html.php                5   DIRTY_JS $menu->url
+modules/gallery/views/menu_ajax_link.html.php                7   DIRTY    $menu->ajax_handler
+modules/gallery/views/menu_dialog.html.php                   3   DIRTY_ATTR $menu->css_id
+modules/gallery/views/menu_dialog.html.php                   4   DIRTY_ATTR $menu->css_class
+modules/gallery/views/menu_dialog.html.php                   5   DIRTY_JS $menu->url
+modules/gallery/views/menu_link.html.php                     3   DIRTY_ATTR $menu->css_id
+modules/gallery/views/menu_link.html.php                     4   DIRTY_ATTR $menu->css_class
+modules/gallery/views/menu_link.html.php                     5   DIRTY_JS $menu->url
 modules/gallery/views/move_browse.html.php                   4   DIRTY_JS url::site("move/show_sub_tree/{$source->id}/__TARGETID__")
 modules/gallery/views/move_browse.html.php                   39  DIRTY    $tree
 modules/gallery/views/move_browse.html.php                   43  DIRTY    access::csrf_form_field()
@@ -143,8 +173,8 @@ modules/gallery/views/movieplayer.html.php                   7   DIRTY_JS url::a
 modules/gallery/views/movieplayer.html.php                   13  DIRTY_JS url::abs_file("lib/flowplayer.h264streaming.swf")
 modules/gallery/views/permissions_browse.html.php            3   DIRTY_JS url::site("permissions/form/__ITEM__")
 modules/gallery/views/permissions_browse.html.php            16  DIRTY_JS url::site("permissions/change/__CMD__/__GROUP__/__PERM__/__ITEM__?csrf=$csrf")
-modules/gallery/views/permissions_browse.html.php            42  DIRTY_ATTR $parent->id
-modules/gallery/views/permissions_browse.html.php            44  DIRTY_JS $parent->id
+modules/gallery/views/permissions_browse.html.php            43  DIRTY_ATTR $parent->id
+modules/gallery/views/permissions_browse.html.php            45  DIRTY_JS $parent->id
 modules/gallery/views/permissions_browse.html.php            52  DIRTY_ATTR $item->id
 modules/gallery/views/permissions_browse.html.php            53  DIRTY_JS $item->id
 modules/gallery/views/permissions_browse.html.php            60  DIRTY    $form
@@ -173,10 +203,19 @@ modules/gallery/views/permissions_form.html.php              75  DIRTY_JS $item-
 modules/gallery/views/permissions_form.html.php              80  DIRTY_JS $group->id
 modules/gallery/views/permissions_form.html.php              80  DIRTY_JS $permission->id
 modules/gallery/views/permissions_form.html.php              80  DIRTY_JS $item->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/gallery/views/simple_uploader.html.php               7   DIRTY_JS url::file("lib/uploadify/uploadify.swf")
+modules/gallery/views/simple_uploader.html.php               8   DIRTY_JS url::site("simple_uploader/add_photo/{$item->id}")
+modules/gallery/views/simple_uploader.html.php               15  DIRTY_JS url::file("lib/uploadify/cancel.png")
+modules/gallery/views/simple_uploader.html.php               43  DIRTY_JS t("Completed")
+modules/gallery/views/upgrader.html.php                      57  DIRTY_ATTR $done?"muted":""
+modules/gallery/views/upgrader.html.php                      61  DIRTY_ATTR $done?"muted":""
+modules/gallery/views/upgrader.html.php                      69  DIRTY_ATTR $module->version==$module->code_version?"current":"upgradeable"
+modules/gallery/views/upgrader.html.php                      70  DIRTY_ATTR $id
+modules/gallery/views/upgrader.html.php                      74  DIRTY    $module->version
+modules/gallery/views/upgrader.html.php                      77  DIRTY    $module->code_version
+modules/gallery/views/upgrader.html.php                      99  DIRTY_ATTR $done?"muted":""
+modules/gallery/views/upgrader.html.php                      102 DIRTY_ATTR $done?"muted":""
+modules/gallery/views/user_languages_block.html.php          2   DIRTY    form::dropdown("g-select-session-locale",$installed_locales,$selected)
 modules/image_block/views/image_block_block.html.php         3   DIRTY_JS $item->url()
 modules/image_block/views/image_block_block.html.php         4   DIRTY    $item->thumb_img(array("class"=>"g-thumbnail"))
 modules/info/views/info_block.html.php                       22  DIRTY    date("M j, Y H:i:s",$item->captured)
@@ -193,10 +232,10 @@ modules/organize/views/organize_dialog.html.php              3   DIRTY_JS url::s
 modules/organize/views/organize_dialog.html.php              4   DIRTY_JS url::site("organize/rearrange/__TARGET_ID__/__BEFORE__?csrf=$csrf")
 modules/organize/views/organize_dialog.html.php              5   DIRTY_JS url::site("organize/sort_order/__ALBUM_ID__/__COL__/__DIR__?csrf=$csrf")
 modules/organize/views/organize_dialog.html.php              6   DIRTY_JS url::site("organize/tree/__ALBUM_ID__")
-modules/organize/views/organize_dialog.html.php              22  DIRTY    $album_tree
-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"=>"g-organize-sort-column"),album::get_sort_order_options(),$album->sort_column)
-modules/organize/views/organize_dialog.html.php              38  DIRTY    form::dropdown(array("id"=>"g-organize-sort-order"),array("ASC"=>"Ascending","DESC"=>"Descending"),$album->sort_order)
+modules/organize/views/organize_dialog.html.php              20  DIRTY    $album_tree
+modules/organize/views/organize_dialog.html.php              27  DIRTY    $micro_thumb_grid
+modules/organize/views/organize_dialog.html.php              35  DIRTY    form::dropdown(array("id"=>"g-organize-sort-column"),album::get_sort_order_options(),$album->sort_column)
+modules/organize/views/organize_dialog.html.php              36  DIRTY    form::dropdown(array("id"=>"g-organize-sort-order"),array("ASC"=>"Ascending","DESC"=>"Descending"),$album->sort_order)
 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()?"g-album":"g-photo"
@@ -210,7 +249,7 @@ modules/organize/views/organize_tree.html.php                13  DIRTY    View::
 modules/organize/views/organize_tree.html.php                15  DIRTY_ATTR access::can("edit",$child)?"":"g-view-only"
 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             11  DIRTY    $form
 modules/recaptcha/views/admin_recaptcha.html.php             23  DIRTY_JS $public_key
 modules/recaptcha/views/form_recaptcha.html.php              7   DIRTY_JS $public_key
 modules/rss/views/feed.mrss.php                              10  DIRTY    $feed->uri
@@ -220,14 +259,13 @@ 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_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                              35  DIRTY_ATTR $child->resize_url(true)
+modules/rss/views/feed.mrss.php                              37  DIRTY_ATTR $child->resize_height
+modules/rss/views/feed.mrss.php                              37  DIRTY_ATTR $child->resize_width
+modules/rss/views/feed.mrss.php                              40  DIRTY_ATTR $child->thumb_url(true)
+modules/rss/views/feed.mrss.php                              42  DIRTY_ATTR $child->thumb_height
+modules/rss/views/feed.mrss.php                              42  DIRTY_ATTR $child->thumb_width
+modules/rss/views/feed.mrss.php                              48  DIRTY_ATTR $child->thumb_url(true)
 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)
@@ -249,52 +287,51 @@ modules/rss/views/rss_block.html.php                         6   DIRTY_JS rss::u
 modules/search/views/search.html.php                         30  DIRTY_ATTR $item_class
 modules/search/views/search.html.php                         31  DIRTY_JS $item->url()
 modules/search/views/search.html.php                         32  DIRTY    $item->thumb_img()
+modules/search/views/search.html.php                         43  DIRTY    $theme->paginator()
+modules/server_add/views/admin_server_add.html.php           5   DIRTY    $form
 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            20  DIRTY_ATTR is_dir($file)?"ui-icon-folder-collapsed":"ui-icon-document"
 modules/server_add/views/server_add_tree.html.php            21  DIRTY_ATTR is_dir($file)?"g-directory":"g-file"
 modules/server_add/views/server_add_tree_dialog.html.php     3   DIRTY_JS url::site("server_add/children?path=__PATH__")
 modules/server_add/views/server_add_tree_dialog.html.php     4   DIRTY_JS url::site("server_add/start?item_id={$item->id}&csrf=$csrf")
-modules/server_add/views/server_add_tree_dialog.html.php     23  DIRTY    $tree
-modules/tag/views/admin_tags.html.php                        13  DIRTY_JS $csrf
-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/server_add/views/server_add_tree_dialog.html.php     21  DIRTY    $tree
+modules/tag/views/admin_tags.html.php                        45  DIRTY_ATTR $tag->id
+modules/tag/views/admin_tags.html.php                        46  DIRTY    $tag->count
+modules/tag/views/tag_block.html.php                         27  DIRTY    $cloud
+modules/tag/views/tag_block.html.php                         29  DIRTY    $form
 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/tag/views/tag_cloud.html.php                         6   DIRTY_JS $tag->url()
 modules/user/views/admin_users.html.php                      3   DIRTY_JS url::site("admin/users/add_user_to_group/__USERID__/__GROUPID__?csrf=$csrf")
 modules/user/views/admin_users.html.php                      26  DIRTY_JS url::site("admin/users/group/__GROUPID__")
 modules/user/views/admin_users.html.php                      36  DIRTY_JS url::site("admin/users/remove_user_from_group/__USERID__/__GROUPID__?csrf=$csrf")
-modules/user/views/admin_users.html.php                      67  DIRTY_ATTR $user->id
-modules/user/views/admin_users.html.php                      67  DIRTY_ATTR text::alternate("g-odd","g-even")
-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_ATTR $group->id
-modules/user/views/admin_users.html.php                      121 DIRTY_ATTR ($group->special?"g-default-group":"")
-modules/user/views/admin_users.html.php                      123 DIRTY    $v
+modules/user/views/admin_users.html.php                      71  DIRTY_ATTR $user->id
+modules/user/views/admin_users.html.php                      71  DIRTY_ATTR text::alternate("g-odd","g-even")
+modules/user/views/admin_users.html.php                      71  DIRTY_ATTR $user->admin?"g-admin":""
+modules/user/views/admin_users.html.php                      72  DIRTY_ATTR $user->id
+modules/user/views/admin_users.html.php                      73  DIRTY_ATTR $user->avatar_url(20,$theme->url(,true))
+modules/user/views/admin_users.html.php                      87  DIRTY    ($user->last_login==0)?"":gallery::date($user->last_login)
+modules/user/views/admin_users.html.php                      123 DIRTY_ATTR $group->id
+modules/user/views/admin_users.html.php                      123 DIRTY_ATTR ($group->special?"g-default-group":"")
+modules/user/views/admin_users.html.php                      125 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                       6   DIRTY_JS url::site("password/reset")
-modules/user/views/login_ajax.html.php                       37  DIRTY    $form
-modules/user/views/user_languages_block.html.php             2   DIRTY    form::dropdown("g-select-session-locale",$installed_locales,$selected)
-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_wind/views/admin.html.php                       15  DIRTY_JS $theme->url()
-themes/admin_wind/views/admin.html.php                       32  DIRTY    $theme->admin_head()
-themes/admin_wind/views/admin.html.php                       36  DIRTY    $theme->admin_page_top()
-themes/admin_wind/views/admin.html.php                       44  DIRTY    $theme->admin_header_top()
-themes/admin_wind/views/admin.html.php                       49  DIRTY_JS item::root()->url()
-themes/admin_wind/views/admin.html.php                       53  DIRTY    $theme->admin_menu()
-themes/admin_wind/views/admin.html.php                       55  DIRTY    $theme->admin_header_bottom()
-themes/admin_wind/views/admin.html.php                       62  DIRTY    $content
-themes/admin_wind/views/admin.html.php                       68  DIRTY    $sidebar
-themes/admin_wind/views/admin.html.php                       73  DIRTY    $theme->admin_footer()
-themes/admin_wind/views/admin.html.php                       75  DIRTY    $theme->admin_credits()
-themes/admin_wind/views/admin.html.php                       79  DIRTY    $theme->admin_page_bottom()
+modules/user/views/user_form.html.php                        7   DIRTY    $form
+modules/watermark/views/admin_watermarks.html.php            20  DIRTY_ATTR $width
+modules/watermark/views/admin_watermarks.html.php            20  DIRTY_ATTR $height
+modules/watermark/views/admin_watermarks.html.php            20  DIRTY_ATTR $url
+themes/admin_wind/views/admin.html.php                       16  DIRTY_JS $theme->url()
+themes/admin_wind/views/admin.html.php                       33  DIRTY    $theme->admin_head()
+themes/admin_wind/views/admin.html.php                       37  DIRTY    $theme->admin_page_top()
+themes/admin_wind/views/admin.html.php                       45  DIRTY    $theme->admin_header_top()
+themes/admin_wind/views/admin.html.php                       60  DIRTY_JS item::root()->url()
+themes/admin_wind/views/admin.html.php                       64  DIRTY    $theme->admin_menu()
+themes/admin_wind/views/admin.html.php                       66  DIRTY    $theme->admin_header_bottom()
+themes/admin_wind/views/admin.html.php                       73  DIRTY    $content
+themes/admin_wind/views/admin.html.php                       79  DIRTY    $sidebar
+themes/admin_wind/views/admin.html.php                       84  DIRTY    $theme->admin_footer()
+themes/admin_wind/views/admin.html.php                       86  DIRTY    $theme->admin_credits()
+themes/admin_wind/views/admin.html.php                       90  DIRTY    $theme->admin_page_bottom()
 themes/admin_wind/views/block.html.php                       3   DIRTY_ATTR $anchor
 themes/admin_wind/views/block.html.php                       5   DIRTY    $id
 themes/admin_wind/views/block.html.php                       5   DIRTY_ATTR $css_id
@@ -310,6 +347,7 @@ themes/wind/views/album.html.php                             16  DIRTY_ATTR $ite
 themes/wind/views/album.html.php                             18  DIRTY_JS $child->url()
 themes/wind/views/album.html.php                             19  DIRTY    $child->thumb_img(array("class"=>"g-thumbnail"))
 themes/wind/views/album.html.php                             23  DIRTY_JS $child->url()
+themes/wind/views/album.html.php                             41  DIRTY    $theme->paginator()
 themes/wind/views/block.html.php                             3   DIRTY_ATTR $anchor
 themes/wind/views/block.html.php                             5   DIRTY_ATTR $css_id
 themes/wind/views/block.html.php                             6   DIRTY    $title
@@ -320,28 +358,27 @@ themes/wind/views/dynamic.html.php                           14  DIRTY_ATTR $chi
 themes/wind/views/dynamic.html.php                           15  DIRTY_ATTR $child->thumb_url()
 themes/wind/views/dynamic.html.php                           16  DIRTY_ATTR $child->thumb_width
 themes/wind/views/dynamic.html.php                           17  DIRTY_ATTR $child->thumb_height
-themes/wind/views/movie.html.php                             8   DIRTY_JS $previous_item->url()
-themes/wind/views/movie.html.php                             18  DIRTY_JS $next_item->url()
-themes/wind/views/movie.html.php                             28  DIRTY    $item->movie_img(array("class"=>"g-movie","id"=>"g-movie-id-{$item->id}"))
+themes/wind/views/dynamic.html.php                           29  DIRTY    $theme->paginator()
+themes/wind/views/movie.html.php                             5   DIRTY    $theme->paginator()
+themes/wind/views/movie.html.php                             8   DIRTY    $item->movie_img(array("class"=>"g-movie","id"=>"g-movie-id-{$item->id}"))
 themes/wind/views/page.html.php                              9   DIRTY    $page_title
-themes/wind/views/page.html.php                              32  DIRTY_JS $theme->url()
-themes/wind/views/page.html.php                              41  DIRTY    $new_width
-themes/wind/views/page.html.php                              42  DIRTY    $new_height
-themes/wind/views/page.html.php                              43  DIRTY    $thumb_proportion
-themes/wind/views/page.html.php                              82  DIRTY    $header_text
-themes/wind/views/page.html.php                              84  DIRTY_JS item::root()->url()
-themes/wind/views/page.html.php                              102 DIRTY_JS $parent->url($parent==$theme->item()->parent()?"show={$theme->item()->id}":null)
-themes/wind/views/page.html.php                              117 DIRTY    $content
-themes/wind/views/page.html.php                              123 DIRTY    newView("sidebar.html")
-themes/wind/views/page.html.php                              130 DIRTY    $footer_text
-themes/wind/views/pager.html.php                             13  DIRTY_JS str_replace('{page}',1,$url)
-themes/wind/views/pager.html.php                             20  DIRTY_JS str_replace('{page}',$previous_page,$url)
-themes/wind/views/pager.html.php                             27  DIRTY    $from_to_msg
-themes/wind/views/pager.html.php                             30  DIRTY_JS str_replace('{page}',$next_page,$url)
-themes/wind/views/pager.html.php                             37  DIRTY_JS str_replace('{page}',$last_page,$url)
+themes/wind/views/page.html.php                              33  DIRTY_JS $theme->url()
+themes/wind/views/page.html.php                              42  DIRTY    $new_width
+themes/wind/views/page.html.php                              43  DIRTY    $new_height
+themes/wind/views/page.html.php                              44  DIRTY    $thumb_proportion
+themes/wind/views/page.html.php                              81  DIRTY    $header_text
+themes/wind/views/page.html.php                              83  DIRTY_JS item::root()->url()
+themes/wind/views/page.html.php                              87  DIRTY    $theme->user_menu()
+themes/wind/views/page.html.php                              104 DIRTY_JS $parent->url($parent==$theme->item()->parent()?"show={$theme->item()->id}":null)
+themes/wind/views/page.html.php                              120 DIRTY    $content
+themes/wind/views/page.html.php                              126 DIRTY    newView("sidebar.html")
+themes/wind/views/page.html.php                              133 DIRTY    $footer_text
+themes/wind/views/paginator.html.php                         32  DIRTY_JS $first_page_url
+themes/wind/views/paginator.html.php                         41  DIRTY_JS $previous_page_url
+themes/wind/views/paginator.html.php                         69  DIRTY_JS $next_page_url
+themes/wind/views/paginator.html.php                         78  DIRTY_JS $last_page_url
 themes/wind/views/photo.html.php                             8   DIRTY_JS $theme->item()->width
 themes/wind/views/photo.html.php                             8   DIRTY_JS $theme->item()->height
-themes/wind/views/photo.html.php                             21  DIRTY_JS $previous_item->url()
-themes/wind/views/photo.html.php                             31  DIRTY_JS $next_item->url()
-themes/wind/views/photo.html.php                             43  DIRTY_JS $item->file_url()
-themes/wind/views/photo.html.php                             45  DIRTY    $item->resize_img(array("id"=>"g-photo-id-{$item->id}","class"=>"g-resize"))
+themes/wind/views/photo.html.php                             18  DIRTY    $theme->paginator()
+themes/wind/views/photo.html.php                             23  DIRTY_JS $item->file_url()
+themes/wind/views/photo.html.php                             25  DIRTY    $item->resize_img(array("id"=>"g-photo-id-{$item->id}","class"=>"g-resize"))