From dbeadc1407293d0c7af36723db6fe5699890b845 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 22 Jul 2009 14:27:57 -0700
Subject: Use the Kohana cascading filesystem to locate resources loaded by the
 theme.  Because the theme comes first, this means that themes can override
 any module resources, at the cost that we no longer have namespacing for JS
 and CSS files.

The only file getting used outside of this model is
themes/default/screen.css which is used in the admin theme.  I fixed
that by copying screen.css into admin_default and renaming its
screen.css to admin_screen.css.  I also copied over all the images
that it was referencing.

Fixes tickets #48 and #539.

Theme API changes:
- theme_script(), theme_url() and theme_css() are no longer needed
- script(), url() and css() now refer to the first matching asset in
  the module load path, where gallery3/lib is at the end of the path
---
 themes/default/views/header.html.php |  2 +-
 themes/default/views/page.html.php   | 36 ++++++++++++++++++------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'themes/default/views')

diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index 5428d9fd..c903edf5 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -4,7 +4,7 @@
 <?= $header_text ?>
 <? else: ?>
 <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery home") ?>">
-  <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site") ?>" src="<?= $theme->theme_url("images/logo.png") ?>" />
+  <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site") ?>" src="<?= $theme->url("images/logo.png") ?>" />
 </a>
 <? endif ?>
 
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 181a2c46..66282bae 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -23,13 +23,13 @@
         <? endif ?>
       <? endif ?>
     </title>
-    <link rel="shortcut icon" href="<?= $theme->theme_url("images/favicon.ico") ?>" type="image/x-icon" />
-    <?= $theme->css("lib/yui/reset-fonts-grids.css") ?>
-    <?= $theme->css("lib/superfish/css/superfish.css") ?>
-    <?= $theme->css("lib/themeroller/ui.base.css") ?>
-    <?= $theme->theme_css("css/screen.css") ?>
+    <link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" />
+    <?= $theme->css("yui/reset-fonts-grids.css") ?>
+    <?= $theme->css("superfish/css/superfish.css") ?>
+    <?= $theme->css("themeroller/ui.base.css") ?>
+    <?= $theme->css("screen.css") ?>
     <!--[if lt IE 8]>
-    <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/fix-ie.css") ?>"
+    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
           media="screen,print,projection" />
     <![endif]-->
     <? if ($theme->page_type == 'album'): ?>
@@ -45,26 +45,26 @@
     </style>
       <? endif ?>
     <? endif ?>
-    <?= $theme->script("lib/jquery.js") ?>
-    <?= $theme->script("lib/jquery.form.js") ?>
-    <?= $theme->script("lib/jquery-ui.js") ?>
-    <?= $theme->script("lib/gallery.common.js") ?>
+    <?= $theme->script("jquery.js") ?>
+    <?= $theme->script("jquery.form.js") ?>
+    <?= $theme->script("jquery-ui.js") ?>
+    <?= $theme->script("gallery.common.js") ?>
     <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
     <script type="text/javascript">
     var MSG_CANCEL = "<?= t('Cancel') ?>";
     </script>
-    <?= $theme->script("lib/gallery.dialog.js") ?>
-    <?= $theme->script("lib/gallery.form.js") ?>
-    <?= $theme->script("lib/superfish/js/superfish.js") ?>
-    <?= $theme->script("lib/jquery.localscroll.js") ?>
-    <?= $theme->theme_script("js/ui.init.js") ?>
+    <?= $theme->script("gallery.dialog.js") ?>
+    <?= $theme->script("gallery.form.js") ?>
+    <?= $theme->script("superfish/js/superfish.js") ?>
+    <?= $theme->script("jquery.localscroll.js") ?>
+    <?= $theme->script("ui.init.js") ?>
 
     <? /* These are page specific, but if we put them before $theme->head() they get combined */ ?>
     <? if ($theme->page_type == "photo"): ?>
-    <?= $theme->script("lib/jquery.scrollTo.js") ?>
-    <?= $theme->script("lib/gallery.show_full_size.js") ?>
+    <?= $theme->script("jquery.scrollTo.js") ?>
+    <?= $theme->script("gallery.show_full_size.js") ?>
     <? elseif ($theme->page_type == "movie"): ?>
-    <?= $theme->script("lib/flowplayer.js") ?>
+    <?= $theme->script("flowplayer.js") ?>
     <? endif ?>
 
     <?= $theme->head() ?>
-- 
cgit v1.2.3


From a7af9bb456fa840d0be2f83145a642e202be3325 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 26 Jul 2009 16:02:53 -0600
Subject: Missed committing the gBanner addition to the view template.

---
 themes/default/views/header.html.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'themes/default/views')

diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index c903edf5..2ba1e923 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -1,19 +1,19 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<?= $theme->header_top() ?>
-<? if ($header_text = module::get_var("gallery", "header_text")): ?>
-<?= $header_text ?>
-<? else: ?>
-<a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery home") ?>">
-  <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site") ?>" src="<?= $theme->url("images/logo.png") ?>" />
-</a>
-<? endif ?>
-
-<div id="gSiteMenu" style="display: none">
-<?= $theme->site_menu() ?>
+<div id="gBanner">
+  <?= $theme->header_top() ?>
+  <? if ($header_text = module::get_var("gallery", "header_text")): ?>
+  <?= $header_text ?>
+  <? else: ?>
+  <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery home") ?>">
+    <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site") ?>" src="<?= $theme->url("images/logo.png") ?>" />
+  </a>
+  <? endif ?>
+  <div id="gSiteMenu">
+  <?= $theme->site_menu() ?>
+  </div>
+  <?= $theme->header_bottom() ?>
 </div>
 
-<?= $theme->header_bottom() ?>
-
 <? if (!empty($parents)): ?>
 <ul class="gBreadcrumbs">
   <? foreach ($parents as $parent): ?>
-- 
cgit v1.2.3


From 1f014aae6c16bbda62d8f5937180f11ccb0eb1b1 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 27 Jul 2009 12:39:12 -0700
Subject: Allow a theme to override the page refresh mechanism.  Create a new
 javascript lib (gallery.reload.js) which defines the functions
 gallery_reload() and gallery_location(new_location).  They just do a
 window.location.reload() and window.location = new_location.

This change breaks the assumption that all themes will handle page reloads
the same and allows the theme to customize the page refresh.
---
 lib/gallery.dialog.js                              |  4 +-
 lib/gallery.panel.js                               |  4 +-
 lib/gallery.reload.js                              | 16 +++++
 modules/gallery/js/quick.js                        |  4 +-
 modules/gallery/tests/xss_data.txt                 | 68 +++++++++++-----------
 .../views/admin_maintenance_show_log.html.php      |  2 +-
 .../gallery/views/admin_maintenance_task.html.php  |  2 +-
 modules/organize/js/organize.js                    |  2 +-
 .../views/server_add_tree_dialog.html.php          |  2 +-
 modules/tag/js/tag.js                              |  2 +-
 themes/admin_default/views/admin.html.php          |  2 +
 themes/default/views/page.html.php                 |  2 +
 12 files changed, 66 insertions(+), 44 deletions(-)
 create mode 100644 lib/gallery.reload.js

(limited to 'themes/default/views')

diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index 74c2f20e..0efcf120 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -25,9 +25,9 @@ function ajaxify_dialog() {
       }
       if (data.result == "success") {
 	if (data.location) {
-          window.location = data.location;
+          $.gallery_location(data.location);
         } else {
-          window.location.reload();
+          $.gallery_reload();
         }
       }
     }
diff --git a/lib/gallery.panel.js b/lib/gallery.panel.js
index 022e4878..26be11ad 100644
--- a/lib/gallery.panel.js
+++ b/lib/gallery.panel.js
@@ -40,9 +40,9 @@ function togglePanel(element, on_success) {
               if (on_success) {
                 on_success();
               } else if (data.location) {
-                window.location = data.location;
+                $.gallery_location(data.location);
               } else {
-                window.location.reload();
+                $.gallery_reload();
               }
             }
           }
diff --git a/lib/gallery.reload.js b/lib/gallery.reload.js
new file mode 100644
index 00000000..2c8752a0
--- /dev/null
+++ b/lib/gallery.reload.js
@@ -0,0 +1,16 @@
+/**
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+(function ($) {
+  $.gallery_reload = function() {
+    window.location.reload();
+  };
+})(jQuery);
+
+// Vertically align a block element's content
+(function ($) {
+  $.gallery_location = function(location) {
+    window.location = location;
+  };
+})(jQuery);
diff --git a/modules/gallery/js/quick.js b/modules/gallery/js/quick.js
index fda6470f..4753808e 100644
--- a/modules/gallery/js/quick.js
+++ b/modules/gallery/js/quick.js
@@ -67,9 +67,9 @@ var quick_do = function(cont, pane, img) {
             img.css("margin-top", 0);
           }
         } else if (data.location) {
-          window.location = data.location;
+          $.gallery_location(data.location);
         } else if (data.reload) {
-          window.location.reload();
+          $.gallery_reload();
         }
       }
     });
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 45f7c7ec..b1cb295b 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -498,24 +498,25 @@ themes/admin_default/views/admin.html.php                    20  DIRTY $theme->s
 themes/admin_default/views/admin.html.php                    21  DIRTY $theme->script("jquery.form.js")
 themes/admin_default/views/admin.html.php                    22  DIRTY $theme->script("jquery-ui.js")
 themes/admin_default/views/admin.html.php                    23  DIRTY $theme->script("gallery.common.js")
-themes/admin_default/views/admin.html.php                    28  DIRTY $theme->script("gallery.dialog.js")
-themes/admin_default/views/admin.html.php                    29  DIRTY $theme->script("superfish/js/superfish.js")
-themes/admin_default/views/admin.html.php                    30  DIRTY $theme->script("jquery.dropshadow.js")
-themes/admin_default/views/admin.html.php                    31  DIRTY $theme->script("ui.init.js")
-themes/admin_default/views/admin.html.php                    33  DIRTY $theme->admin_head()
-themes/admin_default/views/admin.html.php                    36  DIRTY $theme->body_attributes()
-themes/admin_default/views/admin.html.php                    37  DIRTY $theme->admin_page_top()
-themes/admin_default/views/admin.html.php                    43  DIRTY $theme->site_status()
-themes/admin_default/views/admin.html.php                    45  DIRTY $theme->admin_header_top()
-themes/admin_default/views/admin.html.php                    48  DIRTY $csrf
-themes/admin_default/views/admin.html.php                    54  DIRTY $theme->admin_menu()
-themes/admin_default/views/admin.html.php                    56  DIRTY $theme->admin_header_bottom()
-themes/admin_default/views/admin.html.php                    62  DIRTY $theme->messages()
-themes/admin_default/views/admin.html.php                    63  DIRTY $content
-themes/admin_default/views/admin.html.php                    69  DIRTY $sidebar
-themes/admin_default/views/admin.html.php                    74  DIRTY $theme->admin_footer()
-themes/admin_default/views/admin.html.php                    76  DIRTY $theme->admin_credits()
-themes/admin_default/views/admin.html.php                    80  DIRTY $theme->admin_page_bottom()
+themes/admin_default/views/admin.html.php                    25  DIRTY $theme->script("gallery.reload.js")
+themes/admin_default/views/admin.html.php                    30  DIRTY $theme->script("gallery.dialog.js")
+themes/admin_default/views/admin.html.php                    31  DIRTY $theme->script("superfish/js/superfish.js")
+themes/admin_default/views/admin.html.php                    32  DIRTY $theme->script("jquery.dropshadow.js")
+themes/admin_default/views/admin.html.php                    33  DIRTY $theme->script("ui.init.js")
+themes/admin_default/views/admin.html.php                    35  DIRTY $theme->admin_head()
+themes/admin_default/views/admin.html.php                    38  DIRTY $theme->body_attributes()
+themes/admin_default/views/admin.html.php                    39  DIRTY $theme->admin_page_top()
+themes/admin_default/views/admin.html.php                    45  DIRTY $theme->site_status()
+themes/admin_default/views/admin.html.php                    47  DIRTY $theme->admin_header_top()
+themes/admin_default/views/admin.html.php                    50  DIRTY $csrf
+themes/admin_default/views/admin.html.php                    56  DIRTY $theme->admin_menu()
+themes/admin_default/views/admin.html.php                    58  DIRTY $theme->admin_header_bottom()
+themes/admin_default/views/admin.html.php                    64  DIRTY $theme->messages()
+themes/admin_default/views/admin.html.php                    65  DIRTY $content
+themes/admin_default/views/admin.html.php                    71  DIRTY $sidebar
+themes/admin_default/views/admin.html.php                    76  DIRTY $theme->admin_footer()
+themes/admin_default/views/admin.html.php                    78  DIRTY $theme->admin_credits()
+themes/admin_default/views/admin.html.php                    82  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                    5   DIRTY $id
@@ -603,21 +604,22 @@ themes/default/views/page.html.php                           48  DIRTY $theme->s
 themes/default/views/page.html.php                           49  DIRTY $theme->script("jquery.form.js")
 themes/default/views/page.html.php                           50  DIRTY $theme->script("jquery-ui.js")
 themes/default/views/page.html.php                           51  DIRTY $theme->script("gallery.common.js")
-themes/default/views/page.html.php                           56  DIRTY $theme->script("gallery.dialog.js")
-themes/default/views/page.html.php                           57  DIRTY $theme->script("gallery.form.js")
-themes/default/views/page.html.php                           58  DIRTY $theme->script("superfish/js/superfish.js")
-themes/default/views/page.html.php                           59  DIRTY $theme->script("jquery.localscroll.js")
-themes/default/views/page.html.php                           60  DIRTY $theme->script("ui.init.js")
-themes/default/views/page.html.php                           64  DIRTY $theme->script("jquery.scrollTo.js")
-themes/default/views/page.html.php                           65  DIRTY $theme->script("gallery.show_full_size.js")
-themes/default/views/page.html.php                           67  DIRTY $theme->script("flowplayer.js")
-themes/default/views/page.html.php                           70  DIRTY $theme->head()
-themes/default/views/page.html.php                           73  DIRTY $theme->body_attributes()
-themes/default/views/page.html.php                           74  DIRTY $theme->page_top()
-themes/default/views/page.html.php                           76  DIRTY $theme->site_status()
-themes/default/views/page.html.php                           84  DIRTY $theme->messages()
-themes/default/views/page.html.php                           85  DIRTY $content
-themes/default/views/page.html.php                           99  DIRTY $theme->page_bottom()
+themes/default/views/page.html.php                           53  DIRTY $theme->script("gallery.reload.js")
+themes/default/views/page.html.php                           58  DIRTY $theme->script("gallery.dialog.js")
+themes/default/views/page.html.php                           59  DIRTY $theme->script("gallery.form.js")
+themes/default/views/page.html.php                           60  DIRTY $theme->script("superfish/js/superfish.js")
+themes/default/views/page.html.php                           61  DIRTY $theme->script("jquery.localscroll.js")
+themes/default/views/page.html.php                           62  DIRTY $theme->script("ui.init.js")
+themes/default/views/page.html.php                           66  DIRTY $theme->script("jquery.scrollTo.js")
+themes/default/views/page.html.php                           67  DIRTY $theme->script("gallery.show_full_size.js")
+themes/default/views/page.html.php                           69  DIRTY $theme->script("flowplayer.js")
+themes/default/views/page.html.php                           72  DIRTY $theme->head()
+themes/default/views/page.html.php                           75  DIRTY $theme->body_attributes()
+themes/default/views/page.html.php                           76  DIRTY $theme->page_top()
+themes/default/views/page.html.php                           78  DIRTY $theme->site_status()
+themes/default/views/page.html.php                           86  DIRTY $theme->messages()
+themes/default/views/page.html.php                           87  DIRTY $content
+themes/default/views/page.html.php                           101 DIRTY $theme->page_bottom()
 themes/default/views/pager.html.php                          13  DIRTY $url
 themes/default/views/pager.html.php                          20  DIRTY $previous_page
 themes/default/views/pager.html.php                          20  DIRTY $url
diff --git a/modules/gallery/views/admin_maintenance_show_log.html.php b/modules/gallery/views/admin_maintenance_show_log.html.php
index 9d850986..ac593de7 100644
--- a/modules/gallery/views/admin_maintenance_show_log.html.php
+++ b/modules/gallery/views/admin_maintenance_show_log.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   dismiss = function() {
-    window.location.reload();
+    $.gallery_reload();
   }
   download = function(){
     // send request
diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index c81fe571..b0d99425 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -40,7 +40,7 @@
   $(".gProgressBar").progressbar({value: 0});
   update();
   dismiss = function() {
-    window.location.reload();
+    $.gallery_reload();
   }
 </script>
 <div id="gProgress">
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index f10cbcc9..12d8a5b5 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -374,7 +374,7 @@ function organize_dialog_init() {
   }
 
   $("#gDialog").bind("organize_close", function(target) {
-    document.location.reload();
+    $.gallery_reload();
   });
 
   heightMicroThumbPanel -= 2 * parseFloat($("#gDialog").css("padding-top"));
diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index 21952849..8dfd2c38 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -34,7 +34,7 @@
       <?= t("Add") ?>
     </button>
 
-    <button class="ui-state-default ui-corner-all" onclick="closeDialog(); window.location.reload();">
+    <button class="ui-state-default ui-corner-all" onclick="closeDialog(); $.gallery_reload();">
       <?= t("Close") ?>
     </button>
   </span>
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index bbf44166..22a1a7a3 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -59,7 +59,7 @@ function editInPlace(element) {
           closeEditInPlaceForms(); // close form
           $("#gTag-" + data.tag_id).text(data.new_tagname); // update tagname
           console.log(data);
-          window.location.reload();
+          $.gallery_reload();
         }
       }
     });
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index d27f9260..63fc45b5 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -21,6 +21,8 @@
    <?= $theme->script("jquery.form.js") ?>
    <?= $theme->script("jquery-ui.js") ?>
    <?= $theme->script("gallery.common.js") ?>
+   <? /* Themes can override this to provide custom refresh handling */ ?>
+   <?= $theme->script("gallery.reload.js") ?>
    <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
    <script type="text/javascript">
    var MSG_CANCEL = "<?= t('Cancel') ?>";
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 66282bae..5865e4cc 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -49,6 +49,8 @@
     <?= $theme->script("jquery.form.js") ?>
     <?= $theme->script("jquery-ui.js") ?>
     <?= $theme->script("gallery.common.js") ?>
+    <? /* Themes can override this to provide custom refresh handling */ ?>
+    <?= $theme->script("gallery.reload.js") ?>
     <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
     <script type="text/javascript">
     var MSG_CANCEL = "<?= t('Cancel') ?>";
-- 
cgit v1.2.3


From 52147cf6f857c4c54a2f3d753e72b27b5141d028 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 3 Aug 2009 21:45:54 -0700
Subject: Combine the quick menu and the thumb menu into a single menu called
 the "context" menu.

This new context menu is generated using the typical event processing
system, like our other menus.  The specialized quick CSS and JS is now
gone, replaced by our generic menu handling code.  It's all rolled
together currently using the thumb_menu UI for easy packaging.  All
the CSS and JS is updated.

NOTE: the non-dialog links (rotate, album_cover) have a broken UI
because they return JSON which the quick.js code handled specially,
but we don't handle properly now.  I need to fix this.
---
 modules/digibug/helpers/digibug_event.php |   4 +-
 modules/gallery/controllers/quick.php     |  14 ---
 modules/gallery/css/quick.css             |  52 ----------
 modules/gallery/helpers/gallery.php       | 102 ++++++++++++++++++++
 modules/gallery/helpers/gallery_quick.php | 152 ------------------------------
 modules/gallery/helpers/gallery_theme.php |  31 ------
 modules/gallery/helpers/module.php        |   8 +-
 modules/gallery/js/quick.js               |  78 ---------------
 modules/gallery/libraries/Menu.php        |   4 +-
 modules/gallery/libraries/Theme_View.php  |  10 +-
 modules/gallery/views/quick_pane.html.php |  26 -----
 themes/default/css/fix-ie.css             |   4 -
 themes/default/css/screen.css             |   9 +-
 themes/default/js/ui.init.js              |  31 ++----
 themes/default/views/album.html.php       |   2 +-
 15 files changed, 131 insertions(+), 396 deletions(-)
 delete mode 100644 modules/gallery/css/quick.css
 delete mode 100644 modules/gallery/helpers/gallery_quick.php
 delete mode 100644 modules/gallery/js/quick.js
 delete mode 100644 modules/gallery/views/quick_pane.html.php

(limited to 'themes/default/views')

diff --git a/modules/digibug/helpers/digibug_event.php b/modules/digibug/helpers/digibug_event.php
index c4f9e560..efe66a0f 100644
--- a/modules/digibug/helpers/digibug_event.php
+++ b/modules/digibug/helpers/digibug_event.php
@@ -36,9 +36,9 @@ class digibug_event_Core {
       ->css_id("gDigibugLink"));
   }
 
-  static function thumb_menu($menu, $theme, $item) {
+  static function context_menu($menu, $theme, $item) {
     if ($item->type == "photo") {
-      $menu->get("options_menu")
+      $menu
         ->append(
           Menu::factory("link")
           ->id("digibug")
diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index de027c1b..82176e02 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -18,20 +18,6 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Quick_Controller extends Controller {
-  public function pane($id) {
-    $item = model_cache::get("item", $id);
-    if (!access::can("view", $item) || !access::can("edit", $item)) {
-      return "";
-    }
-
-    $view = new View("quick_pane.html");
-    $page_type = Input::instance()->get("page_type");
-    $view->button_list = gallery_quick::get_quick_buttons($item, $page_type);
-    $view->item = $item;
-    $view->page_type = $page_type;
-    print $view;
-  }
-
   public function rotate($id, $dir) {
     access::verify_csrf();
     $item = model_cache::get("item", $id);
diff --git a/modules/gallery/css/quick.css b/modules/gallery/css/quick.css
deleted file mode 100644
index f153d475..00000000
--- a/modules/gallery/css/quick.css
+++ /dev/null
@@ -1,52 +0,0 @@
-.gQuickPane {
-  position: absolute;
-  top: 0;
-  left: 0;
-  text-align: center;
-  width: 100%;
-  height: auto;
-}
-
-.gItem:hover {
-  background-color: #cfdeff;
-}
-
-.gQuick {
-  border: none !important;
-  margin: 0 !important;
-  padding: 0 !important;
-}
-
-.gQuickPane {
-  background: #000;
-  border-bottom: 1px solid #ccc;
-  opacity: 0.9;
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-
-.gQuickPane a {
-  cursor: pointer;
-  float: left;
-  margin: 4px;
-}
-
-.gQuickPaneOptions {
-  background: #000;
-  float: left;
-  width: 100%;
-}
-
-.gQuickPaneOptions li a {
-  display: block;
-  float: none;
-  width: auto;
-  margin: 0;
-  padding: .5em .5em .5em .8em;
-  text-align: left;
-}
-
-.gQuickPaneOptions li a:hover {
-  background-color: #4d4d4d;
-}
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 476e9cbe..085965a2 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -196,4 +196,106 @@ class gallery_Core {
                ->url(url::site("admin/maintenance")));
     return $menu;
   }
+
+  static function context_menu($menu, $theme, $item, $page_type) {
+    switch ($item->type) {
+    case "movie":
+      $edit_title = t("Edit this movie");
+      $move_title = t("Move this movie to another album");
+      $cover_title = t("Choose this movie as the album cover");
+      $delete_title = t("Delete this movie");
+      break;
+
+    case "album":
+      $edit_title = t("Edit this album");
+      $move_title = t("Move this album to another album");
+      $cover_title = t("Choose this album as the album cover");
+      $delete_title = t("Delete this album");
+      break;
+
+    default:
+      $edit_title = t("Edit this photo");
+      $move_title = t("Move this photo to another album");
+      $cover_title = t("Choose this photo as the album cover");
+      $delete_title = t("Delete this photo");
+      break;
+    }
+
+    $csrf = access::csrf_token();
+    $menu->append(Menu::factory("dialog")
+                  ->id("edit")
+                  ->label($edit_title)
+                  ->css_clasS("ui-icon-pencil")
+                  ->url(url::site("quick/form_edit/$item->id?page_type=$page_type")));
+
+
+    if ($item->is_photo() && graphics::can("rotate")) {
+      $menu
+        ->append(Menu::factory("link")
+                  ->id("rotate_ccw")
+                 ->label(t("Rotate 90 degrees counter clockwise"))
+                 ->css_class("ui-icon-rotate-ccw")
+                 ->url(url::site("quick/rotate/$item->id/ccw?csrf=$csrf&page_type=$page_type")))
+        ->append(Menu::factory("link")
+                  ->id("rotate_cw")
+                 ->label(t("Rotate 90 degrees clockwise"))
+                 ->css_class("ui-icon-rotate-cw")
+                 ->url(url::site("quick/rotate/$item->id/cw?csrf=$csrf&page_type=$page_type")));
+    }
+
+    // Don't move photos from the photo page; we don't yet have a good way of redirecting after move
+    if ($page_type == "album") {
+      $menu
+        ->append(Menu::factory("dialog")
+                 ->id("move")
+                 ->label($move_title)
+                 ->css_class("ui-icon-folder-open")
+                 ->url(url::site("move/browse/$item->id")));
+    }
+
+    $parent = $item->parent();
+    if (access::can("edit", $parent)) {
+      // We can't make this item the highlight if it's an album with no album cover, or if it's
+      // already the album cover.
+      if (($item->type == "album" && empty($item->album_cover_item_id)) ||
+          ($item->type == "album" && $parent->album_cover_item_id == $item->album_cover_item_id) ||
+          $parent->album_cover_item_id == $item->id) {
+        $disabledState = " ui-state-disabled";
+      } else {
+        $disabledState = " ";
+      }
+      $menu
+        ->append(Menu::factory("link")
+                 ->id("make_album_cover")
+                 ->label($cover_title)
+                 ->css_class($disabledState)
+                 ->url(
+                   url::site("quick/make_album_cover/$item->id?csrf=$csrf&page_type=$page_type")))
+        ->append(Menu::factory("dialog")
+                 ->id("delete")
+                 ->label($delete_title)
+                 ->css_class("ui-icon-trash")
+                 ->css_id("gQuickDelete")
+                 ->url(url::site("quick/form_delete/$item->id?csrf=$csrf&page_type=$page_type")));
+    }
+
+    if ($item->is_album()) {
+      $menu
+        ->append(Menu::factory("dialog")
+                 ->id("add_item")
+                 ->label(t("Add a photo"))
+                 ->css_class("add_item")
+                 ->url(url::site("simple_uploader/app/$item->id")))
+        ->append(Menu::factory("dialog")
+                 ->id("add_album")
+                 ->label(t("Add an album"))
+                 ->css_class("add_album")
+                 ->url(url::site("form/add/albums/$item->id?type=album")))
+        ->append(Menu::factory("dialog")
+                 ->id("edit_permissions")
+                 ->label(t("Edit permissions"))
+                 ->css_class("permissions")
+                 ->url(url::site("permissions/browse/$item->id")));
+    }
+  }
 }
\ No newline at end of file
diff --git a/modules/gallery/helpers/gallery_quick.php b/modules/gallery/helpers/gallery_quick.php
deleted file mode 100644
index 8a92890b..00000000
--- a/modules/gallery/helpers/gallery_quick.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class gallery_quick_Core {
-  static function get_quick_buttons($item, $page_type) {
-    $buttons = self::buttons($item, $page_type);
-    foreach (module::active() as $module) {
-      if ($module->name == "gallery") {
-        continue;
-      }
-      $class_name = "{$module->name}_quick";
-      if (method_exists($class_name, "buttons")) {
-        $module_buttons = call_user_func(array($class_name, "buttons"), $item, $page_type);
-        foreach (array("left", "center", "right", "additional") as $position) {
-          if (!empty($module_buttons[$position])) {
-            $buttons[$position] = array_merge($buttons[$position], $module_buttons[$position]);
-          }
-        }
-      }
-    }
-
-    $sorted_buttons->main = array();
-    foreach (array("left", "center", "right") as $position) {
-      $sorted_buttons->main = array_merge($sorted_buttons->main, $buttons[$position]);
-    }
-
-    $sorted_buttons->additional = $buttons["additional"];
-    $max_display = empty($sorted_buttons->additional) ? 6 : 5;
-    if (count($sorted_buttons->main) >= $max_display) {
-      $to_move = array_slice($sorted_buttons->main, 5);
-      $sorted_buttons->additional = array_merge($to_move, $sorted_buttons->additional);
-      for ($i = count($sorted_buttons->main); $i >= 5; $i--) {
-        unset($sorted_buttons->main[$i]);
-      }
-    }
-
-    return $sorted_buttons;
-  }
-
-  static function buttons($item, $page_type) {
-    $elements = array("left" => array(), "center" => array(), "right" => array(),
-                      "additional"  => array());
-    switch ($item->type) {
-    case "movie":
-      $edit_title = t("Edit this movie");
-      $move_title = t("Move this movie to another album");
-      $cover_title = t("Choose this movie as the album cover");
-      $delete_title = t("Delete this movie");
-      break;
-    case "album":
-      $edit_title = t("Edit this album");
-      $move_title = t("Move this album to another album");
-      $cover_title = t("Choose this album as the album cover");
-      $delete_title = t("Delete this album");
-      break;
-    default:
-      $edit_title = t("Edit this photo");
-      $move_title = t("Move this photo to another album");
-      $cover_title = t("Choose this photo as the album cover");
-      $delete_title = t("Delete this photo");
-      break;
-    }
-
-    $csrf = access::csrf_token();
-    $elements["left"][] = (object)array(
-      "title" => $edit_title,
-      "class" => "gDialogLink gButtonLink",
-      "icon" => "ui-icon-pencil",
-      "href" => url::site("quick/form_edit/$item->id?page_type=$page_type"));
-
-    if ($item->is_photo() && graphics::can("rotate")) {
-      $elements["left"][] =
-        (object)array(
-          "title" => t("Rotate 90 degrees counter clockwise"),
-          "class" => "gButtonLink",
-          "icon" => "ui-icon-rotate-ccw",
-          "href" => url::site("quick/rotate/$item->id/ccw?csrf=$csrf&page_type=$page_type"));
-      $elements["left"][] =
-        (object)array(
-          "title" => t("Rotate 90 degrees clockwise"),
-          "class" => "gButtonLink",
-          "icon" => "ui-icon-rotate-cw",
-          "href" => url::site("quick/rotate/$item->id/cw?csrf=$csrf&page_type=$page_type"));
-    }
-
-    // Don't move photos from the photo page; we don't yet have a good way of redirecting after move
-    if ($page_type == "album") {
-      $elements["left"][] = (object)array(
-        "title" => $move_title,
-        "class" => "gDialogLink gButtonLink",
-        "icon" => "ui-icon-folder-open",
-        "href" => url::site("move/browse/$item->id"));
-    }
-
-    $parent = $item->parent();
-    if (access::can("edit", $parent)) {
-      // We can't make this item the highlight if it's an album with no album cover, or if it's
-      // already the album cover.
-      if (($item->type == "album" && empty($item->album_cover_item_id)) ||
-          ($item->type == "album" && $parent->album_cover_item_id == $item->album_cover_item_id) ||
-          $parent->album_cover_item_id == $item->id) {
-        $disabledState = " ui-state-disabled";
-      } else {
-        $disabledState = " ";
-      }
-      $elements["right"][] = (object)array(
-        "title" => $cover_title,
-        "class" => "gButtonLink$disabledState",
-        "icon" => "ui-icon-star",
-        "href" => url::site("quick/make_album_cover/$item->id?csrf=$csrf&page_type=$page_type"));
-
-      $elements["right"][] = (object)array(
-        "title" => $delete_title,
-        "class" => "gDialogLink gButtonLink",
-        "icon" => "ui-icon-trash",
-        "id" => "gQuickDelete",
-        "href" => url::site("quick/form_delete/$item->id?csrf=$csrf&page_type=$page_type"));
-    }
-
-    if ($item->is_album()) {
-      $elements["additional"][] = (object)array(
-        "title" => t("Add a photo"),
-        "class" => "add_item gDialogLink",
-        "href" => url::site("simple_uploader/app/$item->id"));
-      $elements["additional"][] = (object)array(
-        "title" => t("Add an album"),
-        "class" => "add_album gDialogLink",
-        "href" => url::site("form/add/albums/$item->id?type=album"));
-      $elements["additional"][] = (object)array(
-        "title" => t("Edit permissions"),
-        "class" => "permissions gDialogLink",
-        "href" => url::site("permissions/browse/$item->id"));
-    }
-    return $elements;
-  }
-}
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index d3751b80..8fe1c768 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -24,11 +24,6 @@ class gallery_theme_Core {
     if ($session->get("debug")) {
       $theme->css("debug.css");
     }
-    if (($theme->page_type == "album" || $theme->page_type == "photo")
-        && access::can("edit", $theme->item())) {
-      $theme->css("quick.css");
-      $theme->script("quick.js");
-    }
 
     if (module::is_active("rss")) {
       if ($item = $theme->item()) {
@@ -51,32 +46,6 @@ class gallery_theme_Core {
     return $buf;
   }
 
-  static function resize_top($theme, $item) {
-    if (access::can("edit", $item)) {
-      $edit_link = url::site("quick/pane/$item->id?page_type=photo");
-      return "<div class=\"gQuick\" href=\"$edit_link\">";
-    }
-  }
-
-  static function resize_bottom($theme, $item) {
-    if (access::can("edit", $item)) {
-      return "</div>";
-    }
-  }
-
-  static function thumb_top($theme, $child) {
-    if (access::can("edit", $child)) {
-      $edit_link = url::site("quick/pane/$child->id?page_type=album");
-      return "<div class=\"gQuick\" href=\"$edit_link\">";
-    }
-  }
-
-  static function thumb_bottom($theme, $child) {
-    if (access::can("edit", $child)) {
-      return "</div>";
-    }
-  }
-
   static function admin_head($theme) {
     $session = Session::instance();
     if ($session->get("debug")) {
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 0d483206..03d538a9 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -274,11 +274,9 @@ class module_Core {
     array_shift($args);
     $function = str_replace(".", "_", $name);
 
-    foreach (self::$modules as $module) {
-      if (!$module->active) {
-        continue;
-      }
-
+    // @todo: consider calling gallery_event first, since for things menus we need it to do some
+    // setup
+    foreach (self::$active as $module) {
       $class = "{$module->name}_event";
       if (method_exists($class, $function)) {
         call_user_func_array(array($class, $function), $args);
diff --git a/modules/gallery/js/quick.js b/modules/gallery/js/quick.js
deleted file mode 100644
index fda6470f..00000000
--- a/modules/gallery/js/quick.js
+++ /dev/null
@@ -1,78 +0,0 @@
-$(document).ready(function() {
-  if ($("#gAlbumGrid").length) {
-    // @todo Add quick edit pane for album (meta, move, permissions, delete)
-    $(".gItem").hover(show_quick, function() {});
-  }
-  if ($("#gPhoto").length) {
-    $("#gPhoto").hover(show_quick, function() {});
-  }
-});
-
-var show_quick = function() {
-  var cont = $(this);
-  var quick = $(this).find(".gQuick");
-  var img = cont.find(".gThumbnail,.gResize");
-  cont.find(".gQuickPane").remove();
-  cont.append("<div class=\"gQuickPane\"></div>");
-  cont.find(".gQuickPane").hide();
-  cont.hover(function() {}, function() { cont.find(".gQuickPane").remove(); });
-  $.get(
-    quick.attr("href"),
-    {},
-    function(data, textStatus) {
-      cont.find(".gQuickPane").html(data).slideDown("fast");
-      $(".ui-state-default").hover(
-        function() {
-          $(this).addClass("ui-state-hover");
-        },
-        function() {
-          $(this).removeClass("ui-state-hover");
-        }
-      );
-      cont.find(".gQuickPane a:not(.options)").click(function(e) {
-        e.preventDefault();
-        quick_do(cont, $(this), img);
-      });
-      cont.find(".gQuickPane a.options").click(function(e) {
-        e.preventDefault();
-        cont.find(".gQuickPaneOptions").slideToggle("fast");
-      });
-    }
-  );
-};
-
-var quick_do = function(cont, pane, img) {
-  if (pane.hasClass("ui-state-disabled")) {
-    return false;
-  }
-  if (pane.hasClass("gDialogLink")) {
-    openDialog(pane);
-  } else {
-    img.css("opacity", "0.1");
-    cont.addClass("gLoadingLarge");
-    $.ajax({
-      type: "GET",
-      url: pane.attr("href"),
-      dataType: "json",
-      success: function(data) {
-        img.css("opacity", "1");
-        cont.removeClass("gLoadingLarge");
-        if (data.src) {
-          img.attr("width", data.width);
-          img.attr("height", data.height);
-          img.attr("src", data.src);
-          if (data.height > data.width) {
-            img.css("margin-top", -32);
-          } else {
-            img.css("margin-top", 0);
-          }
-        } else if (data.location) {
-          window.location = data.location;
-        } else if (data.reload) {
-          window.location.reload();
-        }
-      }
-    });
-  }
-  return false;
-};
diff --git a/modules/gallery/libraries/Menu.php b/modules/gallery/libraries/Menu.php
index a39b59a5..263dc38d 100644
--- a/modules/gallery/libraries/Menu.php
+++ b/modules/gallery/libraries/Menu.php
@@ -91,7 +91,7 @@ class Menu_Element_Link extends Menu_Element {
     } else {
       $css_class = "";
     }
-    return "<li><a$css_id class=\"gMenuElement$css_class\" href=\"$this->url\" " .
+    return "<li><a$css_id class=\"gMenuLink $css_class\" href=\"$this->url\" " .
       "title=\"$this->label\">$this->label</a></li>";
   }
 }
@@ -111,7 +111,7 @@ class Menu_Element_Dialog extends Menu_Element {
     } else {
       $css_class = "";
     }
-    return "<li><a$css_id class=\"gMenuLink$css_class\" href=\"$this->url\" " .
+    return "<li><a$css_id class=\"gDialogLink $css_class\" href=\"$this->url\" " .
            "title=\"$this->label\">$this->label</a></li>";
   }
 }
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 360e5e46..24dea729 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -111,14 +111,16 @@ class Theme_View_Core extends Gallery_View {
     return $menu->compact();
   }
 
-  public function thumb_menu($item) {
+  public function context_menu($item) {
     $menu = Menu::factory("root")
       ->append(Menu::factory("submenu")
-               ->id("options_menu")
+               ->id("context_menu")
                ->label(t("Options")))
-      ->css_class("gThumbMenu");
+      ->css_class("gContextMenu");
 
-    module::event("thumb_menu", $menu, $this, $item);
+    $page_type = Input::instance()->get("page_type");
+    gallery::context_menu($menu, $this, $item, $page_type);
+    module::event("context_menu", $menu, $this, $item, $page_type);
     return $menu->compact();
   }
 
diff --git a/modules/gallery/views/quick_pane.html.php b/modules/gallery/views/quick_pane.html.php
deleted file mode 100644
index e5469696..00000000
--- a/modules/gallery/views/quick_pane.html.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<? foreach ($button_list->main as $button): ?>
-<a class="<?= $button->class ?> ui-corner-all ui-state-default" href="<?= $button->href ?>"
-  title="<?= $button->title ?>">
-  <span class="ui-icon <?= $button->icon ?>">
-    <?= $button->title ?>
-  </span>
-</a>
-<? endforeach ?>
-
-<? if (!empty($button_list->additional)): ?>
-<a class="gButtonLink ui-corner-all ui-state-default options" href="#" title="<?= t("additional options") ?>">
-  <span class="ui-icon ui-icon-triangle-1-s">
-    <?= t("Additional options") ?>
-  </span>
-</a>
-
-<ul class="gQuickPaneOptions" style="display: none">
-  <? foreach ($button_list->additional as $button): ?>
-  <li><a class="<?= $button->class ?>" href="<?= $button->href ?>"
-    title="<?= $button->title ?>">
-    <?=  $button->title ?>
-  </a></li>
-  <? endforeach ?>
-</ul>
-<? endif ?>
diff --git a/themes/default/css/fix-ie.css b/themes/default/css/fix-ie.css
index c7c1ebad..eee88c15 100644
--- a/themes/default/css/fix-ie.css
+++ b/themes/default/css/fix-ie.css
@@ -35,7 +35,3 @@ input.submit {
 .gPager .ui-icon-right {
   width: 60px;
 }
-
-.gQuickPane {
-  height: 32px !important;
-}
\ No newline at end of file
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index c5a9956d..eb092b83 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -588,24 +588,25 @@ form .gError,
 
 /* Thumb Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gContent .gThumbMenu {
+#gContent .gContextMenu {
   bottom: 0;
   left: 0;
   position: absolute;
   width: 100%;
+  display: none;
 }
 
-#gContent .gThumbMenu li {
+#gContent .gContextMenu li {
   border-left: none;
   border-right: none;
   border-bottom: none;
 }
 
-#gContent .gThumbMenu li li {
+#gContent .gContextMenu li li {
   padding: .3em;
 }
 
-#gContent .gThumbMenu a:hover {
+#gContent .gContextMenu a:hover {
   text-decoration: none;
 }
 
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 11cd06ed..d796cb67 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -32,7 +32,6 @@ $(document).ready(function() {
   $("#gMessage li").showMessage();
 
   // Initialize dialogs
-  $(".gMenuLink").addClass("gDialogLink");
   $("#gLoginLink").addClass("gDialogLink");
   var dialogLinks = $(".gDialogLink");
   for (var i=0; i < dialogLinks.length; i++) {
@@ -57,9 +56,6 @@ $(document).ready(function() {
   if ($("#gAlbumGrid").length) {
     // Vertical align thumbnails/metadata in album grid
     $(".gItem").vAlign();
-    $(".gQuick").ajaxStop(function(){
-      $(".gItem").vAlign();
-    });
   }
 
   // Photo/Item item view only
@@ -97,26 +93,19 @@ $(document).ready(function() {
     }
   );
 
-  // Initialize thumbnail menus
-  // @todo Toggle between north and south caret's on hover
-  if ($("#gContent .gThumbMenu").length) {
-    $("#gContent .gThumbMenu li").addClass("ui-state-default");
-    $("#gContent .gThumbMenu li a")
-      .not('[class]')
-      .addClass("gButtonLink ui-icon ui-icon-caret-l-n")
-      .css({
-        height: "10px",
-        margin: "0",
-        padding: "0 0 3px 0"
-      });
-
-    $(".gThumbMenu ul").hide();
-    $(".gThumbMenu").hover(
+  // Initialize context menus
+  if ($("#gContent .gContextMenu").length) {
+    $("#gContent .gContextMenu li").addClass("ui-state-default");
+    $(".gContextMenu").parent().hover(
       function() {
-        $(this).find("ul").slideDown("fast");
+        $(this).find(".gContextMenu").slideDown("fast");
+	var dialogLinks = $(this).find(".gDialogLink");
+	for (var i = 0; i < dialogLinks.length; i++) {
+	  $(dialogLinks[i]).bind("click", handleDialogEvent);
+	}
       },
       function() {
-	      $(this).find("ul").slideUp("slow");
+	$(this).find(".gContextMenu").slideUp("slow");
       }
     );
   }
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 65ea3381..ce57458e 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -19,7 +19,7 @@
       <?= $child->thumb_img(array("class" => "gThumbnail")) ?>
     </a>
     <?= $theme->thumb_bottom($child) ?>
-    <?= $theme->thumb_menu($child) ?>
+    <?= $theme->context_menu($child) ?>
     <h2><span></span><a href="<?= $child->url() ?>"><?= p::clean($child->title) ?></a></h2>
     <ul class="gMetadata">
       <?= $theme->thumb_info($child) ?>
-- 
cgit v1.2.3


From ad19e29c469295189a2d13772706e39e3bd3dfc7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 3 Aug 2009 21:50:01 -0700
Subject: Add the context menu to the photo/movie pages also.

---
 themes/default/views/movie.html.php | 1 +
 themes/default/views/photo.html.php | 1 +
 2 files changed, 2 insertions(+)

(limited to 'themes/default/views')

diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
index 66c80ded..b9e1bc21 100644
--- a/themes/default/views/movie.html.php
+++ b/themes/default/views/movie.html.php
@@ -23,4 +23,5 @@
     var ADD_A_COMMENT = "<?= t("Add a comment") ?>";
   </script>
   <?= $theme->photo_bottom() ?>
+  <?= $theme->context_menu($item) ?>
 </div>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index bf4d9da3..cf8bebdd 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -47,6 +47,7 @@
     </a>
     <? endif ?>
     <?= $theme->resize_bottom($item) ?>
+    <?= $theme->context_menu($item) ?>
   </div>
 
   <div id="gInfo">
-- 
cgit v1.2.3


From 9f396178cedc96abb282e72ff0e843e255c8225a Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 5 Aug 2009 09:24:27 -0700
Subject: Revert "Allow a theme to override the page refresh mechanism.  Create
 a new"

This reverts commit 1f014aae6c16bbda62d8f5937180f11ccb0eb1b1.
---
 lib/gallery.dialog.js                              |  4 +-
 lib/gallery.panel.js                               |  4 +-
 lib/gallery.reload.js                              | 16 -----
 modules/gallery/js/quick.js                        |  4 +-
 modules/gallery/tests/xss_data.txt                 | 68 +++++++++++-----------
 .../views/admin_maintenance_show_log.html.php      |  2 +-
 .../gallery/views/admin_maintenance_task.html.php  |  2 +-
 modules/organize/js/organize.js                    |  2 +-
 .../views/server_add_tree_dialog.html.php          |  2 +-
 modules/tag/js/tag.js                              |  2 +-
 themes/admin_default/views/admin.html.php          |  2 -
 themes/default/views/page.html.php                 |  2 -
 12 files changed, 44 insertions(+), 66 deletions(-)
 delete mode 100644 lib/gallery.reload.js

(limited to 'themes/default/views')

diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index 0efcf120..74c2f20e 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -25,9 +25,9 @@ function ajaxify_dialog() {
       }
       if (data.result == "success") {
 	if (data.location) {
-          $.gallery_location(data.location);
+          window.location = data.location;
         } else {
-          $.gallery_reload();
+          window.location.reload();
         }
       }
     }
diff --git a/lib/gallery.panel.js b/lib/gallery.panel.js
index 26be11ad..022e4878 100644
--- a/lib/gallery.panel.js
+++ b/lib/gallery.panel.js
@@ -40,9 +40,9 @@ function togglePanel(element, on_success) {
               if (on_success) {
                 on_success();
               } else if (data.location) {
-                $.gallery_location(data.location);
+                window.location = data.location;
               } else {
-                $.gallery_reload();
+                window.location.reload();
               }
             }
           }
diff --git a/lib/gallery.reload.js b/lib/gallery.reload.js
deleted file mode 100644
index 2c8752a0..00000000
--- a/lib/gallery.reload.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-(function ($) {
-  $.gallery_reload = function() {
-    window.location.reload();
-  };
-})(jQuery);
-
-// Vertically align a block element's content
-(function ($) {
-  $.gallery_location = function(location) {
-    window.location = location;
-  };
-})(jQuery);
diff --git a/modules/gallery/js/quick.js b/modules/gallery/js/quick.js
index 4753808e..fda6470f 100644
--- a/modules/gallery/js/quick.js
+++ b/modules/gallery/js/quick.js
@@ -67,9 +67,9 @@ var quick_do = function(cont, pane, img) {
             img.css("margin-top", 0);
           }
         } else if (data.location) {
-          $.gallery_location(data.location);
+          window.location = data.location;
         } else if (data.reload) {
-          $.gallery_reload();
+          window.location.reload();
         }
       }
     });
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 29d223b7..0e118ce7 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -496,25 +496,24 @@ themes/admin_default/views/admin.html.php                    20  DIRTY $theme->s
 themes/admin_default/views/admin.html.php                    21  DIRTY $theme->script("jquery.form.js")
 themes/admin_default/views/admin.html.php                    22  DIRTY $theme->script("jquery-ui.js")
 themes/admin_default/views/admin.html.php                    23  DIRTY $theme->script("gallery.common.js")
-themes/admin_default/views/admin.html.php                    25  DIRTY $theme->script("gallery.reload.js")
-themes/admin_default/views/admin.html.php                    30  DIRTY $theme->script("gallery.dialog.js")
-themes/admin_default/views/admin.html.php                    31  DIRTY $theme->script("superfish/js/superfish.js")
-themes/admin_default/views/admin.html.php                    32  DIRTY $theme->script("jquery.dropshadow.js")
-themes/admin_default/views/admin.html.php                    33  DIRTY $theme->script("ui.init.js")
-themes/admin_default/views/admin.html.php                    35  DIRTY $theme->admin_head()
-themes/admin_default/views/admin.html.php                    38  DIRTY $theme->body_attributes()
-themes/admin_default/views/admin.html.php                    39  DIRTY $theme->admin_page_top()
-themes/admin_default/views/admin.html.php                    45  DIRTY $theme->site_status()
-themes/admin_default/views/admin.html.php                    47  DIRTY $theme->admin_header_top()
-themes/admin_default/views/admin.html.php                    50  DIRTY $csrf
-themes/admin_default/views/admin.html.php                    56  DIRTY $theme->admin_menu()
-themes/admin_default/views/admin.html.php                    58  DIRTY $theme->admin_header_bottom()
-themes/admin_default/views/admin.html.php                    64  DIRTY $theme->messages()
-themes/admin_default/views/admin.html.php                    65  DIRTY $content
-themes/admin_default/views/admin.html.php                    71  DIRTY $sidebar
-themes/admin_default/views/admin.html.php                    76  DIRTY $theme->admin_footer()
-themes/admin_default/views/admin.html.php                    78  DIRTY $theme->admin_credits()
-themes/admin_default/views/admin.html.php                    82  DIRTY $theme->admin_page_bottom()
+themes/admin_default/views/admin.html.php                    28  DIRTY $theme->script("gallery.dialog.js")
+themes/admin_default/views/admin.html.php                    29  DIRTY $theme->script("superfish/js/superfish.js")
+themes/admin_default/views/admin.html.php                    30  DIRTY $theme->script("jquery.dropshadow.js")
+themes/admin_default/views/admin.html.php                    31  DIRTY $theme->script("ui.init.js")
+themes/admin_default/views/admin.html.php                    33  DIRTY $theme->admin_head()
+themes/admin_default/views/admin.html.php                    36  DIRTY $theme->body_attributes()
+themes/admin_default/views/admin.html.php                    37  DIRTY $theme->admin_page_top()
+themes/admin_default/views/admin.html.php                    43  DIRTY $theme->site_status()
+themes/admin_default/views/admin.html.php                    45  DIRTY $theme->admin_header_top()
+themes/admin_default/views/admin.html.php                    48  DIRTY $csrf
+themes/admin_default/views/admin.html.php                    54  DIRTY $theme->admin_menu()
+themes/admin_default/views/admin.html.php                    56  DIRTY $theme->admin_header_bottom()
+themes/admin_default/views/admin.html.php                    62  DIRTY $theme->messages()
+themes/admin_default/views/admin.html.php                    63  DIRTY $content
+themes/admin_default/views/admin.html.php                    69  DIRTY $sidebar
+themes/admin_default/views/admin.html.php                    74  DIRTY $theme->admin_footer()
+themes/admin_default/views/admin.html.php                    76  DIRTY $theme->admin_credits()
+themes/admin_default/views/admin.html.php                    80  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                    5   DIRTY $id
@@ -602,22 +601,21 @@ themes/default/views/page.html.php                           48  DIRTY $theme->s
 themes/default/views/page.html.php                           49  DIRTY $theme->script("jquery.form.js")
 themes/default/views/page.html.php                           50  DIRTY $theme->script("jquery-ui.js")
 themes/default/views/page.html.php                           51  DIRTY $theme->script("gallery.common.js")
-themes/default/views/page.html.php                           53  DIRTY $theme->script("gallery.reload.js")
-themes/default/views/page.html.php                           58  DIRTY $theme->script("gallery.dialog.js")
-themes/default/views/page.html.php                           59  DIRTY $theme->script("gallery.form.js")
-themes/default/views/page.html.php                           60  DIRTY $theme->script("superfish/js/superfish.js")
-themes/default/views/page.html.php                           61  DIRTY $theme->script("jquery.localscroll.js")
-themes/default/views/page.html.php                           62  DIRTY $theme->script("ui.init.js")
-themes/default/views/page.html.php                           66  DIRTY $theme->script("jquery.scrollTo.js")
-themes/default/views/page.html.php                           67  DIRTY $theme->script("gallery.show_full_size.js")
-themes/default/views/page.html.php                           69  DIRTY $theme->script("flowplayer.js")
-themes/default/views/page.html.php                           72  DIRTY $theme->head()
-themes/default/views/page.html.php                           75  DIRTY $theme->body_attributes()
-themes/default/views/page.html.php                           76  DIRTY $theme->page_top()
-themes/default/views/page.html.php                           78  DIRTY $theme->site_status()
-themes/default/views/page.html.php                           86  DIRTY $theme->messages()
-themes/default/views/page.html.php                           87  DIRTY $content
-themes/default/views/page.html.php                           101 DIRTY $theme->page_bottom()
+themes/default/views/page.html.php                           56  DIRTY $theme->script("gallery.dialog.js")
+themes/default/views/page.html.php                           57  DIRTY $theme->script("gallery.form.js")
+themes/default/views/page.html.php                           58  DIRTY $theme->script("superfish/js/superfish.js")
+themes/default/views/page.html.php                           59  DIRTY $theme->script("jquery.localscroll.js")
+themes/default/views/page.html.php                           60  DIRTY $theme->script("ui.init.js")
+themes/default/views/page.html.php                           64  DIRTY $theme->script("jquery.scrollTo.js")
+themes/default/views/page.html.php                           65  DIRTY $theme->script("gallery.show_full_size.js")
+themes/default/views/page.html.php                           67  DIRTY $theme->script("flowplayer.js")
+themes/default/views/page.html.php                           70  DIRTY $theme->head()
+themes/default/views/page.html.php                           73  DIRTY $theme->body_attributes()
+themes/default/views/page.html.php                           74  DIRTY $theme->page_top()
+themes/default/views/page.html.php                           76  DIRTY $theme->site_status()
+themes/default/views/page.html.php                           84  DIRTY $theme->messages()
+themes/default/views/page.html.php                           85  DIRTY $content
+themes/default/views/page.html.php                           99  DIRTY $theme->page_bottom()
 themes/default/views/pager.html.php                          13  DIRTY $url
 themes/default/views/pager.html.php                          20  DIRTY $previous_page
 themes/default/views/pager.html.php                          20  DIRTY $url
diff --git a/modules/gallery/views/admin_maintenance_show_log.html.php b/modules/gallery/views/admin_maintenance_show_log.html.php
index ac593de7..9d850986 100644
--- a/modules/gallery/views/admin_maintenance_show_log.html.php
+++ b/modules/gallery/views/admin_maintenance_show_log.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   dismiss = function() {
-    $.gallery_reload();
+    window.location.reload();
   }
   download = function(){
     // send request
diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index 6ab87e3f..0eb0b38c 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -47,7 +47,7 @@
   $(".gProgressBar").progressbar({value: 0});
   update();
   dismiss = function() {
-    $.gallery_reload();
+    window.location.reload();
   }
 </script>
 <div id="gProgress">
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 12d8a5b5..f10cbcc9 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -374,7 +374,7 @@ function organize_dialog_init() {
   }
 
   $("#gDialog").bind("organize_close", function(target) {
-    $.gallery_reload();
+    document.location.reload();
   });
 
   heightMicroThumbPanel -= 2 * parseFloat($("#gDialog").css("padding-top"));
diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index 8dfd2c38..21952849 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -34,7 +34,7 @@
       <?= t("Add") ?>
     </button>
 
-    <button class="ui-state-default ui-corner-all" onclick="closeDialog(); $.gallery_reload();">
+    <button class="ui-state-default ui-corner-all" onclick="closeDialog(); window.location.reload();">
       <?= t("Close") ?>
     </button>
   </span>
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index 564de393..765c2a35 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -59,7 +59,7 @@ function editInPlace(element) {
           closeEditInPlaceForms(); // close form
           $("#gTag-" + data.tag_id).text(data.new_tagname); // update tagname
           console.log(data);
-          $.gallery_reload();
+          window.location.reload();
         }
       }
     });
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 63fc45b5..d27f9260 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -21,8 +21,6 @@
    <?= $theme->script("jquery.form.js") ?>
    <?= $theme->script("jquery-ui.js") ?>
    <?= $theme->script("gallery.common.js") ?>
-   <? /* Themes can override this to provide custom refresh handling */ ?>
-   <?= $theme->script("gallery.reload.js") ?>
    <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
    <script type="text/javascript">
    var MSG_CANCEL = "<?= t('Cancel') ?>";
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 5865e4cc..66282bae 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -49,8 +49,6 @@
     <?= $theme->script("jquery.form.js") ?>
     <?= $theme->script("jquery-ui.js") ?>
     <?= $theme->script("gallery.common.js") ?>
-    <? /* Themes can override this to provide custom refresh handling */ ?>
-    <?= $theme->script("gallery.reload.js") ?>
     <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
     <script type="text/javascript">
     var MSG_CANCEL = "<?= t('Cancel') ?>";
-- 
cgit v1.2.3


From e4eec71efa5f7b1902155a34f8655cebe523c358 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 7 Aug 2009 11:53:40 -0700
Subject: Rename gallery.common.js functions to conform to our naming standards
 and have some basic namespacing:   showMessage --> gallery_show_message  
 vAlign      --> gallery_valign   showLoading --> gallery_show_loading

Convert gallery.show_full_size.js to be a jQuery function and give it a namespace:
  show_full_size --> gallery_show_full_size
---
 lib/gallery.common.js                |   9 +--
 lib/gallery.dialog.js                |   4 +-
 lib/gallery.show_full_size.js        | 140 ++++++++++++++++++-----------------
 modules/organize/js/organize.js      |   2 +-
 modules/organize/js/organize_init.js |   2 +-
 themes/admin_default/js/ui.init.js   |   4 +-
 themes/default/js/ui.init.js         |   6 +-
 themes/default/views/photo.html.php  |   2 +-
 8 files changed, 85 insertions(+), 84 deletions(-)

(limited to 'themes/default/views')

diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index 7fced304..7e6acad9 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -1,5 +1,5 @@
 (function ($) {
-  $.fn.showMessage = function(message) {
+  $.fn.gallery_show_message = function(message) {
     return this.each(function(i){
       $(this).effect("highlight", {"color": "white"}, 3000);
       $(this).animate({opacity: 1.0}, 6000);
@@ -7,7 +7,7 @@
   };
 
   // Vertically align a block element's content
-  $.fn.vAlign = function(container) {
+  $.fn.gallery_valign = function(container) {
     return this.each(function(i){
       if (container == null) {
         container = 'div';
@@ -22,7 +22,7 @@
   };
 
   // Get the viewport size
-  $.getViewportSize = function() {
+  $.gallery_get_viewport_size = function() {
     return {
       width : function() {
         return $(window).width();
@@ -37,7 +37,7 @@
    * Toggle the processing indicator, both large and small
    * @param elementID Target ID, including #, to apply .gLoadingSize
    */
-  $.fn.showLoading = function() {
+  $.fn.gallery_show_loading = function() {
     return this.each(function(i){
       var size;
       switch ($(this).attr("id")) {
@@ -52,5 +52,4 @@
       $(this).toggleClass("gLoading" + size);
     });
   };
-
 })(jQuery);
diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index 04ab44de..51ebb21a 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -16,10 +16,10 @@
          }
          $("#gDialog").dialog(self.options);
 
-         $("#gDialog").showLoading();
+         $("#gDialog").gallery_show_loading();
 
          $.get(sHref, function(data) {
-           $("#gDialog").html(data).showLoading();
+           $("#gDialog").html(data).gallery_show_loading();
 
            if ($("#gDialog form").length) {
              self._trigger("form_loaded", null, $("#gDialog form"));
diff --git a/lib/gallery.show_full_size.js b/lib/gallery.show_full_size.js
index 8b271db9..c32195f6 100644
--- a/lib/gallery.show_full_size.js
+++ b/lib/gallery.show_full_size.js
@@ -1,76 +1,78 @@
-/**
- * @todo Move inline CSS out to external style sheet (theme style sheet)
- */
-var show_full_size = function(image_url, image_width, image_height) {
-  /*
-   * Calculate the size of the image panel based on the size of the image and the size of the
-   * window.  Scale the image so the entire panel fits in the view port.
-   */
-  function _auto_fit(imageWidth, imageHeight) {
-    // ui-dialog gives a padding of 2 pixels
-    var windowWidth = $(window).width() - 10;
-    var windowHeight = $(window).height() - 10;
+(function($) {
+   /**
+    * @todo Move inline CSS out to external style sheet (theme style sheet)
+    */
+   $.gallery_show_full_size = function(image_url, image_width, image_height) {
+     /*
+      * Calculate the size of the image panel based on the size of the image and the size of the
+      * window.  Scale the image so the entire panel fits in the view port.
+      */
+     function _auto_fit(imageWidth, imageHeight) {
+       // ui-dialog gives a padding of 2 pixels
+       var windowWidth = $(window).width() - 10;
+       var windowHeight = $(window).height() - 10;
 
-    /* If the width is greater then scale the image width first */
-    if (imageWidth > windowWidth) {
-      var ratio = windowWidth / imageWidth;
-      imageWidth *= ratio;
-      imageHeight *= ratio;
-    }
-    /* after scaling the width, check that the height fits */
-    if (imageHeight > windowHeight) {
-      var ratio = windowHeight / imageHeight;
-      imageWidth *= ratio;
-      imageHeight *= ratio;
-    }
+       /* If the width is greater then scale the image width first */
+       if (imageWidth > windowWidth) {
+	 var ratio = windowWidth / imageWidth;
+	 imageWidth *= ratio;
+	 imageHeight *= ratio;
+       }
+       /* after scaling the width, check that the height fits */
+       if (imageHeight > windowHeight) {
+	 var ratio = windowHeight / imageHeight;
+	 imageWidth *= ratio;
+	 imageHeight *= ratio;
+       }
 
-    // handle the case where the calculation is almost zero (2.14e-14)
-    return {
-      top: Number((windowHeight - imageHeight) / 2),
-      left: Number((windowWidth - imageWidth) / 2),
-      width: Number(imageWidth),
-      height: Number(imageHeight)
-    };
-  }
+       // handle the case where the calculation is almost zero (2.14e-14)
+       return {
+	 top: Number((windowHeight - imageHeight) / 2),
+	 left: Number((windowWidth - imageWidth) / 2),
+	 width: Number(imageWidth),
+	 height: Number(imageHeight)
+       };
+     }
 
-  var width = $(document).width();
-  var height = $(document).height();
+     var width = $(document).width();
+     var height = $(document).height();
 
-  $("body").append('<div id="gFullsizeOverlay" class="ui-dialog-overlay" ' +
-		   'style="border: none; margin: 0; padding: 0; background-color: #000; ' +
-		   'position: absolute; top: 0px; left: 0px; ' +
-		   'width: ' + width + 'px; height: ' + height + 'px; opacity: 0.7; filter: alpha(opacity=70);' +
-		   '-moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; ' +
-		   '-moz-background-inline-policy: -moz-initial; z-index: 1001;"> </div>');
+     $("body").append('<div id="gFullsizeOverlay" class="ui-dialog-overlay" ' +
+		      'style="border: none; margin: 0; padding: 0; background-color: #000; ' +
+		      'position: absolute; top: 0px; left: 0px; ' +
+		      'width: ' + width + 'px; height: ' + height + 'px; opacity: 0.7; filter: alpha(opacity=70);' +
+		      '-moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; ' +
+		      '-moz-background-inline-policy: -moz-initial; z-index: 1001;"> </div>');
 
-  var image_size = _auto_fit(image_width, image_height);
+     var image_size = _auto_fit(image_width, image_height);
 
-  $("body").append('<div id="gFullsize" class="ui-dialog ui-widget" ' +
-		   'style="overflow: hidden; display: block; ' +
-		   'position: absolute; z-index: 1002; outline-color: -moz-use-text-color; ' +
-		   'outline-style: none; outline-width: 0px; ' +
-		   'height: ' + image_size.height + 'px; ' +
-		   'width: ' + image_size.width + 'px; ' +
-		   'top: ' + image_size.top + 'px; left: ' + image_size.left + 'px;">' +
-		   '<img id="gFullSizeImage" src="' + image_url + '"' +
-		   'height="' + image_size.height + '" width="' + image_size.width + '"/></div>');
+     $("body").append('<div id="gFullsize" class="ui-dialog ui-widget" ' +
+		      'style="overflow: hidden; display: block; ' +
+		      'position: absolute; z-index: 1002; outline-color: -moz-use-text-color; ' +
+		      'outline-style: none; outline-width: 0px; ' +
+		      'height: ' + image_size.height + 'px; ' +
+		      'width: ' + image_size.width + 'px; ' +
+		      'top: ' + image_size.top + 'px; left: ' + image_size.left + 'px;">' +
+		      '<img id="gFullSizeImage" src="' + image_url + '"' +
+		      'height="' + image_size.height + '" width="' + image_size.width + '"/></div>');
 
-  $("#gFullsize").append('<span id="gFullsizeClose" class="fg-button ui-icon ui-state-default ' +
-			 'ui-icon-closethick ui-corner-all" style="z-index: 1003; position: absolute; ' +
-			 'right: 1em; top: 1em;"></span>');
-  $("#gFullsizeClose").click(function() {
-			       $("#gFullsizeOverlay*").remove();
-			       $("#gFullsize").remove();
-			     });
-  $(window).resize(function() {
-		     $("#gFullsizeOverlay").width($(document).width());
-		     $("#gFullsizeOverlay").height($(document).height());
-		     image_size = _auto_fit(image_width, image_height);
-		     $("#gFullsize").height(image_size.height);
-		     $("#gFullsize").width(image_size.width);
-		     $("#gFullsize").css("top", image_size.top);
-		     $("#gFullsize").css("left", image_size.left);
-		     $("#gFullSizeImage").height(image_size.height);
-		     $("#gFullSizeImage").width(image_size.width);
-		   });
-};
+     $("#gFullsize").append('<span id="gFullsizeClose" class="fg-button ui-icon ui-state-default ' +
+			    'ui-icon-closethick ui-corner-all" style="z-index: 1003; position: absolute; ' +
+			    'right: 1em; top: 1em;"></span>');
+     $("#gFullsizeClose").click(function() {
+				  $("#gFullsizeOverlay*").remove();
+				  $("#gFullsize").remove();
+				});
+     $(window).resize(function() {
+			$("#gFullsizeOverlay").width($(document).width())
+			  .height($(document).height());
+			image_size = _auto_fit(image_width, image_height);
+			$("#gFullsize").height(image_size.height)
+			  .width(image_size.width)
+			  .css("top", image_size.top)
+			  .css("left", image_size.left);
+			$("#gFullSizeImage").height(image_size.height)
+			  .width(image_size.width);
+		      });
+   };
+})(jQuery);
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index f10cbcc9..31657d3a 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -391,7 +391,7 @@ function organize_dialog_init() {
   $(".gBranchText").droppable(treeDroppable);
   $(".gBranchText").click(organizeOpenFolder);
   retrieveMicroThumbs(item_id);
-  //showLoading("#gDialog");
+  //$.gallery_show_loading("#gDialog");
 
   $("#gMicroThumbPanel").droppable(thumbDroppable);
   $("#gMicroThumbPanel").selectable(selectable);
diff --git a/modules/organize/js/organize_init.js b/modules/organize/js/organize_init.js
index ed036fdb..30bc78dd 100644
--- a/modules/organize/js/organize_init.js
+++ b/modules/organize/js/organize_init.js
@@ -17,7 +17,7 @@ $("document").ready(function() {
       zIndex: 75
     });
 
-    //showLoading("#gDialog");
+    //$.gallery_show_loading("#gDialog");
 
     $.get(href, function(data) {
       $("#gDialog").html(data);
diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js
index 89dd5b47..e52f0c4c 100644
--- a/themes/admin_default/js/ui.init.js
+++ b/themes/admin_default/js/ui.init.js
@@ -14,7 +14,7 @@ $(document).ready(function(){
   $("#gSiteAdminMenu").css("display", "block");
 
   // Initialize status message effects
-  $("#gMessage li").showMessage();
+  $("#gMessage li").gallery_show_message();
 
   // Initialize modal dialogs
   $(".gDialogLink").gallery_dialog();
@@ -24,7 +24,7 @@ $(document).ready(function(){
 
   if ($("#gPhotoStream").length) {
     // Vertically align thumbs in photostream
-    $(".gItem").vAlign();
+    $(".gItem").gallery_valign();
   }
 
   // Apply jQuery UI button css to submit inputs
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 4b876c66..b8ad68db 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -29,7 +29,7 @@ $(document).ready(function() {
   $("#gSiteMenu").css("display", "block");
 
   // Initialize status message effects
-  $("#gMessage li").showMessage();
+  $("#gMessage li").gallery_show_message();
 
   // Initialize dialogs
   $(".gMenuLink").addClass("gDialogLink");
@@ -53,9 +53,9 @@ $(document).ready(function() {
   // Album view only
   if ($("#gAlbumGrid").length) {
     // Vertical align thumbnails/metadata in album grid
-    $(".gItem").vAlign();
+    $(".gItem").gallery_valign();
     $(".gQuick").ajaxStop(function(){
-      $(".gItem").vAlign();
+      $(".gItem").gallery_valign();
     });
   }
 
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index bf4d9da3..48472170 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -5,7 +5,7 @@
 <script>
   $(document).ready(function() {
     $(".gFullSizeLink").click(function() {
-      show_full_size("<?= $theme->item()->file_url() ?>", "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
+      $.gallery_show_full_size("<?= $theme->item()->file_url() ?>", "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
       return false;
     });
   });
-- 
cgit v1.2.3


From 6641fec60da715161f0f7f11235c1720d17ec19e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 8 Aug 2009 14:37:55 -0700
Subject: Use the same pager layout as we do in photo.html.php.

---
 themes/default/views/movie.html.php | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

(limited to 'themes/default/views')

diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
index 66c80ded..c90a370c 100644
--- a/themes/default/views/movie.html.php
+++ b/themes/default/views/movie.html.php
@@ -2,16 +2,29 @@
 <div id="gItem">
   <?= $theme->photo_top() ?>
 
-  <ul id="gPager">
-    <li><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
-    <? if ($previous_item): ?>
-    <li><span class="ui-icon ui-icon-seek-prev"></span><a href="<?= $previous_item->url() ?>"><?= t("previous") ?></a></li>
-    <? endif ?>
-    <? if ($next_item): ?>
-    <li><a href="<?= $next_item->url() ?>"><?= t("next") ?></a><span class="ui-icon ui-icon-seek-next"></span></li>
-    <? endif ?>
+  <ul class="gPager">
+    <li>
+      <? if ($previous_item): ?>
+      <a href="<?= $previous_item->url() ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
+      <? else: ?>
+      <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
+      <? endif; ?>
+    </li>
+    <li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
+    <li class="txtright">
+      <? if ($next_item): ?>
+      <a href="<?= $next_item->url() ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
+      <? else: ?>
+      <a class="gButtonLink ui-icon-right ui-state-disabled ui-corner-all">
+      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
+      <? endif ?>
+    </li>
   </ul>
 
+
   <?= $item->movie_img(array("class" => "gMovie", "id" => "gMovieId-{$item->id}")) ?>
 
   <div id="gInfo">
-- 
cgit v1.2.3


From cbba45fffc7368280e9529f55e108d0080175b6a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 10 Aug 2009 23:05:05 -0700
Subject: Create the concept of an "ajax link" and use it for thumbnail
 rotation and album covers in the context menu.

Notes:
- This requires context_menu() to have a CSS selector that refers to the
  <img> that we're operating on, otherwise we don't know how to find the
  thumbnail, etc.
- Create Menu_Element_Ajax_Link which has an ajax_handler attribute
  that contains a snippet of JS that we're going to run when the ajax
  call returns.
- Add $.gallery_replace_image in gallery.common.js
- Add lib/gallery.ajax.js which can be used to ajaxify any link, and have
  ui.init.js in the themes call that on all .gAjaxLink elements.
---
 lib/gallery.ajax.js                       |  15 +++
 lib/gallery.common.js                     |   4 +
 modules/gallery/helpers/gallery.php       | 191 ++++++++++++++++--------------
 modules/gallery/libraries/Menu.php        |  34 ++++++
 modules/gallery/libraries/Theme_View.php  |   6 +-
 themes/admin_default/js/ui.init.js        |   3 +
 themes/admin_default/views/admin.html.php |   1 +
 themes/default/js/ui.init.js              |   9 +-
 themes/default/views/album.html.php       |   2 +-
 themes/default/views/movie.html.php       |   2 +-
 themes/default/views/page.html.php        |   1 +
 themes/default/views/photo.html.php       |   2 +-
 12 files changed, 169 insertions(+), 101 deletions(-)
 create mode 100644 lib/gallery.ajax.js

(limited to 'themes/default/views')

diff --git a/lib/gallery.ajax.js b/lib/gallery.ajax.js
new file mode 100644
index 00000000..4f26745d
--- /dev/null
+++ b/lib/gallery.ajax.js
@@ -0,0 +1,15 @@
+(function($) {
+  $.widget("ui.gallery_ajax",  {
+    _init: function() {
+      this.element.click(function(event) {
+	eval("var ajax_handler = " + $(event.currentTarget).attr("ajax_handler"));
+	$.get($(event.currentTarget).attr("href"), function(data) {
+		eval("var data = " + data);
+		ajax_handler(data);
+	      });
+	event.preventDefault();
+	return false;
+      });
+    }
+  });
+})(jQuery);
diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index fdb7a1cc..53c2fafb 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -104,5 +104,9 @@
     );
   };
 
+  // Ajax handler for replacing an image, used in Ajax thumbnail rotation
+  $.gallery_replace_image = function(data, thumb) {
+    $(thumb).attr({src: data.src, width: data.width, height: data.height});
+  };
 })(jQuery);
 
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 42097a99..c81af842 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -197,108 +197,117 @@ class gallery_Core {
     return $menu;
   }
 
-  static function context_menu($menu, $theme, $item) {
-    $page_type = $theme->page_type();
-    switch ($item->type) {
-    case "movie":
-      $edit_title = t("Edit this movie");
-      $delete_title = t("Delete this movie");
-      break;
-
-    case "album":
-      $edit_title = t("Edit this album");
-      $delete_title = t("Delete this album");
-      break;
-
-    default:
-      $edit_title = t("Edit this photo");
-      $delete_title = t("Delete this photo");
-      break;
-    }
-    $cover_title = t("Choose as the album cover");
-    $move_title = t("Move to another album");
-
-    $csrf = access::csrf_token();
-
+  static function context_menu($menu, $theme, $item, $thumb_css_selector) {
     $menu->append($options_menu = Menu::factory("submenu")
                   ->id("options_menu")
                   ->label(t("Options"))
                   ->css_class("ui-icon-carat-1-n"));
 
-    $options_menu->append(Menu::factory("dialog")
-                          ->id("edit")
-                          ->label($edit_title)
-                          ->css_class("ui-icon-pencil")
-                          ->url(url::site("quick/form_edit/$item->id?page_type=$page_type")));
+    if (access::can("edit", $item)) {
+      $page_type = $theme->page_type();
+      switch ($item->type) {
+      case "movie":
+        $edit_title = t("Edit this movie");
+        $delete_title = t("Delete this movie");
+        break;
 
+      case "album":
+        $edit_title = t("Edit this album");
+        $delete_title = t("Delete this album");
+        break;
 
-    if ($item->is_photo() && graphics::can("rotate")) {
-      $options_menu
-        ->append(Menu::factory("link")
-                 ->id("rotate_ccw")
-                 ->label(t("Rotate 90&deg; counter clockwise"))
-                 ->css_class("ui-icon-rotate-ccw")
-                 ->url(url::site("quick/rotate/$item->id/ccw?csrf=$csrf&page_type=$page_type")))
-        ->append(Menu::factory("link")
-                 ->id("rotate_cw")
-                 ->label(t("Rotate 90&deg; clockwise"))
-                 ->css_class("ui-icon-rotate-cw")
-                 ->url(url::site("quick/rotate/$item->id/cw?csrf=$csrf&page_type=$page_type")));
-    }
+      default:
+        $edit_title = t("Edit this photo");
+        $delete_title = t("Delete this photo");
+        break;
+      }
+      $cover_title = t("Choose as the album cover");
+      $move_title = t("Move to another album");
 
-    // Don't move photos from the photo page; we don't yet have a good way of redirecting after move
-    if ($page_type == "album") {
-      $options_menu
-        ->append(Menu::factory("dialog")
-                 ->id("move")
-                 ->label($move_title)
-                 ->css_class("ui-icon-folder-open")
-                 ->url(url::site("move/browse/$item->id")));
-    }
+      $csrf = access::csrf_token();
+
+      $options_menu->append(Menu::factory("dialog")
+                            ->id("edit")
+                            ->label($edit_title)
+                            ->css_class("ui-icon-pencil")
+                            ->url(url::site("quick/form_edit/$item->id?page_type=$page_type")));
 
-    $parent = $item->parent();
-    if (access::can("edit", $parent)) {
-      // We can't make this item the highlight if it's an album with no album cover, or if it's
-      // already the album cover.
-      if (($item->type == "album" && empty($item->album_cover_item_id)) ||
-          ($item->type == "album" && $parent->album_cover_item_id == $item->album_cover_item_id) ||
-          $parent->album_cover_item_id == $item->id) {
-        $disabledState = " ui-state-disabled";
-      } else {
-        $disabledState = " ";
+
+      if ($item->is_photo() && graphics::can("rotate")) {
+        $options_menu
+          ->append(
+            Menu::factory("ajax_link")
+            ->id("rotate_ccw")
+            ->label(t("Rotate 90&deg; counter clockwise"))
+            ->css_class("ui-icon-rotate-ccw")
+            ->ajax_handler("function(data) { " .
+                           "\$.gallery_replace_image(data, \$('$thumb_css_selector')) }")
+            ->url(url::site("quick/rotate/$item->id/ccw?csrf=$csrf&page_type=$page_type")))
+          ->append(
+            Menu::factory("ajax_link")
+            ->id("rotate_cw")
+            ->label(t("Rotate 90&deg; clockwise"))
+            ->css_class("ui-icon-rotate-cw")
+            ->ajax_handler("function(data) { " .
+                           "\$.gallery_replace_image(data, \$('$thumb_css_selector')) }")
+            ->url(url::site("quick/rotate/$item->id/cw?csrf=$csrf&page_type=$page_type")));
+      }
+
+      // Don't move photos from the photo page; we don't yet have a good way of redirecting after
+      // move
+      if ($page_type == "album") {
+        $options_menu
+          ->append(Menu::factory("dialog")
+                   ->id("move")
+                   ->label($move_title)
+                   ->css_class("ui-icon-folder-open")
+                   ->url(url::site("move/browse/$item->id")));
       }
-      $options_menu
-        ->append(Menu::factory("link")
-                 ->id("make_album_cover")
-                 ->label($cover_title)
-                 ->css_class("ui-icon-star")
-                 ->url(
-                   url::site("quick/make_album_cover/$item->id?csrf=$csrf&page_type=$page_type")))
-        ->append(Menu::factory("dialog")
-                 ->id("delete")
-                 ->label($delete_title)
-                 ->css_class("ui-icon-trash")
-                 ->css_id("gQuickDelete")
-                 ->url(url::site("quick/form_delete/$item->id?csrf=$csrf&page_type=$page_type")));
-    }
 
-    if ($item->is_album()) {
-      $options_menu
-        ->append(Menu::factory("dialog")
-                 ->id("add_item")
-                 ->label(t("Add a photo"))
-                 ->css_class("add_item")
-                 ->url(url::site("simple_uploader/app/$item->id")))
-        ->append(Menu::factory("dialog")
-                 ->id("add_album")
-                 ->label(t("Add an album"))
-                 ->css_class("add_album")
-                 ->url(url::site("form/add/albums/$item->id?type=album")))
-        ->append(Menu::factory("dialog")
-                 ->id("edit_permissions")
-                 ->label(t("Edit permissions"))
-                 ->css_class("permissions")
-                 ->url(url::site("permissions/browse/$item->id")));
+      $parent = $item->parent();
+      if (access::can("edit", $parent)) {
+        // We can't make this item the highlight if it's an album with no album cover, or if it's
+        // already the album cover.
+        if (($item->type == "album" && empty($item->album_cover_item_id)) ||
+            ($item->type == "album" && $parent->album_cover_item_id == $item->album_cover_item_id) ||
+            $parent->album_cover_item_id == $item->id) {
+          $disabledState = " ui-state-disabled";
+        } else {
+          $disabledState = " ";
+        }
+        $options_menu
+          ->append(Menu::factory("ajax_link")
+                   ->id("make_album_cover")
+                   ->label($cover_title)
+                   ->css_class("ui-icon-star")
+                   ->ajax_handler("function(data) { window.location.reload() }")
+                   ->url(url::site("quick/make_album_cover/$item->id?csrf=$csrf")))
+          ->append(Menu::factory("dialog")
+                   ->id("delete")
+                   ->label($delete_title)
+                   ->css_class("ui-icon-trash")
+                   ->css_id("gQuickDelete")
+                   ->url(url::site("quick/form_delete/$item->id?csrf=$csrf&page_type=$page_type")));
+      }
+
+      if ($item->is_album()) {
+        $options_menu
+          ->append(Menu::factory("dialog")
+                   ->id("add_item")
+                   ->label(t("Add a photo"))
+                   ->css_class("add_item")
+                   ->url(url::site("simple_uploader/app/$item->id")))
+          ->append(Menu::factory("dialog")
+                   ->id("add_album")
+                   ->label(t("Add an album"))
+                   ->css_class("add_album")
+                   ->url(url::site("form/add/albums/$item->id?type=album")))
+          ->append(Menu::factory("dialog")
+                   ->id("edit_permissions")
+                   ->label(t("Edit permissions"))
+                   ->css_class("permissions")
+                   ->url(url::site("permissions/browse/$item->id")));
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/modules/gallery/libraries/Menu.php b/modules/gallery/libraries/Menu.php
index 263dc38d..07b2b2b8 100644
--- a/modules/gallery/libraries/Menu.php
+++ b/modules/gallery/libraries/Menu.php
@@ -96,6 +96,37 @@ class Menu_Element_Link extends Menu_Element {
   }
 }
 
+/**
+ * Menu element that provides an AJAX link.
+ */
+class Menu_Element_Ajax_Link extends Menu_Element {
+  public $ajax_handler;
+
+  /**
+   * Set the AJAX handler
+   * @chainable
+   */
+  public function ajax_handler($ajax_handler) {
+    $this->ajax_handler = $ajax_handler;
+    return $this;
+  }
+
+  public function __toString() {
+    if (isset($this->css_id) && !empty($this->css_id)) {
+      $css_id = " id=\"$this->css_id\"";
+    } else {
+      $css_id = "";
+    }
+    if (isset($this->css_class) && !empty($this->css_class)) {
+      $css_class = " $this->css_class";
+    } else {
+      $css_class = "";
+    }
+    return "<li><a$css_id class=\"gAjaxLink $css_class\" href=\"$this->url\" " .
+      "title=\"$this->label\" ajax_handler=\"$this->ajax_handler\">$this->label</a></li>";
+  }
+}
+
 /**
  * Menu element that provides a pop-up dialog
  */
@@ -132,6 +163,9 @@ class Menu_Core extends Menu_Element {
     case "link":
       return new Menu_Element_Link($type);
 
+    case "ajax_link":
+      return new Menu_Element_Ajax_Link($type);
+
     case "dialog":
       return new Menu_Element_Dialog($type);
 
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index a5f5db03..541bce88 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -111,15 +111,15 @@ class Theme_View_Core extends Gallery_View {
     return $menu->compact();
   }
 
-  public function context_menu($item) {
+  public function context_menu($item, $thumbnail_css_selector) {
     $menu = Menu::factory("root")
       ->append(Menu::factory("submenu")
                ->id("context_menu")
                ->label(t("Options")))
       ->css_class("gContextMenu");
 
-    gallery::context_menu($menu, $this, $item);
-    module::event("context_menu", $menu, $this, $item);
+    gallery::context_menu($menu, $this, $item, $thumbnail_css_selector);
+    module::event("context_menu", $menu, $this, $item, $thumbnail_css_selector);
     return $menu->compact();
   }
 
diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js
index e52f0c4c..daa6dd70 100644
--- a/themes/admin_default/js/ui.init.js
+++ b/themes/admin_default/js/ui.init.js
@@ -19,6 +19,9 @@ $(document).ready(function(){
   // Initialize modal dialogs
   $(".gDialogLink").gallery_dialog();
 
+  // Initialize ajax links
+  $(".gDialogLink").gallery_ajax();
+
   // Initialize panels
   $(".gPanelLink").gallery_panel();
 
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index d27f9260..3f4128cb 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -25,6 +25,7 @@
    <script type="text/javascript">
    var MSG_CANCEL = "<?= t('Cancel') ?>";
    </script>
+   <?= $theme->script("gallery.ajax.js") ?>
    <?= $theme->script("gallery.dialog.js") ?>
    <?= $theme->script("superfish/js/superfish.js") ?>
    <?= $theme->script("jquery.dropshadow.js") ?>
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 3726d305..60482972 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -34,6 +34,7 @@ $(document).ready(function() {
   // Initialize dialogs
   $("#gLoginLink").addClass("gDialogLink");
   $(".gDialogLink").gallery_dialog();
+  $(".gAjaxLink").gallery_ajax();
 
   // Initialize view menu
   if ($("#gViewMenu").length) {
@@ -100,8 +101,8 @@ $(document).ready(function() {
             $(".gContextMenu").hover(
               function() {
                 $(this).find("ul").slideDown("fast");
-                var dialogLinks = $(this).find(".gDialogLink");
-                $(dialogLinks).gallery_dialog();
+		$(this).find(".gDialogLink").gallery_dialog();
+		$(this).find(".gAjaxLink").gallery_ajax();
               },
               function() {
                 $(this).find("ul").slideUp("slow");
@@ -128,8 +129,8 @@ $(document).ready(function() {
         $(".gContextMenu").hover(
           function() {
             $(this).find("ul").slideDown("fast");
-            var dialogLinks = $(this).find(".gDialogLink");
-            $(dialogLinks).gallery_dialog();
+            $(this).find(".gDialogLink").gallery_dialog();
+            $(this).find(".gAjaxLink").gallery_ajax();
           },
           function() {
             $(this).find("ul").slideUp("slow");
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index ce57458e..e2890482 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -19,7 +19,7 @@
       <?= $child->thumb_img(array("class" => "gThumbnail")) ?>
     </a>
     <?= $theme->thumb_bottom($child) ?>
-    <?= $theme->context_menu($child) ?>
+    <?= $theme->context_menu($child, "#gItemId-{$child->id} .gThumbnail") ?>
     <h2><span></span><a href="<?= $child->url() ?>"><?= p::clean($child->title) ?></a></h2>
     <ul class="gMetadata">
       <?= $theme->thumb_info($child) ?>
diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
index d255922b..c8ecd769 100644
--- a/themes/default/views/movie.html.php
+++ b/themes/default/views/movie.html.php
@@ -36,5 +36,5 @@
     var ADD_A_COMMENT = "<?= t("Add a comment") ?>";
   </script>
   <?= $theme->photo_bottom() ?>
-  <?= $theme->context_menu($item) ?>
+  <?= $theme->context_menu($item, "#gMovieId-{$item->id}") ?>
 </div>
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 66282bae..2cb71b9e 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -53,6 +53,7 @@
     <script type="text/javascript">
     var MSG_CANCEL = "<?= t('Cancel') ?>";
     </script>
+    <?= $theme->script("gallery.ajax.js") ?>
     <?= $theme->script("gallery.dialog.js") ?>
     <?= $theme->script("gallery.form.js") ?>
     <?= $theme->script("superfish/js/superfish.js") ?>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index 453417dc..fa5def47 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -47,7 +47,7 @@
     </a>
     <? endif ?>
     <?= $theme->resize_bottom($item) ?>
-    <?= $theme->context_menu($item) ?>
+    <?= $theme->context_menu($item, "#gPhotoId-{$item->id}") ?>
   </div>
 
   <div id="gInfo">
-- 
cgit v1.2.3


From 1d5262f9c354a8564f05a8a31b915ad479f4d361 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 28 Aug 2009 13:44:01 -0700
Subject: Fix ticket #591: reCaptcha always on the page. 1) move creating the
 "Add a comment" button into the comments.html.php 2) use $.get() to retrieve
 the comment add form

---
 modules/comment/helpers/comment_theme.php |  2 --
 modules/comment/js/comment.js             | 10 +++++++++-
 modules/comment/views/comments.html.php   | 10 ++++++++--
 themes/default/css/screen.css             |  7 +++++++
 themes/default/js/ui.init.js              | 12 ------------
 themes/default/views/movie.html.php       |  3 ---
 themes/default/views/photo.html.php       |  3 ---
 7 files changed, 24 insertions(+), 23 deletions(-)

(limited to 'themes/default/views')

diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php
index b807e2cf..38a00b5c 100644
--- a/modules/comment/helpers/comment_theme.php
+++ b/modules/comment/helpers/comment_theme.php
@@ -26,7 +26,6 @@ class comment_theme_Core {
   static function photo_bottom($theme) {
     $block = new Block;
     $block->css_id = "gComments";
-    $block->anchor = t("comments");
     $block->title = t("Comments");
 
     $view = new View("comments.html");
@@ -37,7 +36,6 @@ class comment_theme_Core {
       ->find_all();
 
     $block->content = $view;
-    $block->content .= comment::get_add_form($theme->item())->render("form.html");
     return $block;
   }
 }
\ No newline at end of file
diff --git a/modules/comment/js/comment.js b/modules/comment/js/comment.js
index 00fc6027..9fd63c1a 100644
--- a/modules/comment/js/comment.js
+++ b/modules/comment/js/comment.js
@@ -1,5 +1,13 @@
 $("document").ready(function() {
-  ajaxify_comment_form();
+  $("#gAddCommentButton").click(function(event) {
+    event.preventDefault();
+    $.get($(this).attr("href"),
+          {},
+          function(data) {
+            $("#gCommentDetail").append(data);
+            ajaxify_comment_form();
+          });
+    });
 });
 
 function ajaxify_comment_form() {
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index f7251389..6dce9971 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -1,11 +1,17 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+  <a href="<?= url::site("form/add/comments/{$item->id})") ?>" id="gAddCommentButton"
+   class="gButtonLink ui-corner-all ui-icon-left ui-state-default right">
+  <span class="ui-icon ui-icon-comment"></span>
+  <?= t("Add a comment") ?>
+</a>
+<div id="gCommentDetail">
 <? if (!$comments->count()): ?>
 <p id="gNoCommentsYet">
   <?= t("No comments yet. Be the first to <a %attrs>comment</a>!",
       array("attrs" => "href=\"#add_comment_form\" class=\"showCommentForm\"")) ?>
 </p>
 <? endif ?>
-<ul id="gComments">
+<ul>
   <? foreach ($comments as $comment): ?>
   <li id="gComment-<?= $comment->id ?>">
     <p class="gAuthor">
@@ -26,4 +32,4 @@
   </li>
   <? endforeach ?>
 </ul>
-<a name="add_comment_form"></a>
+</div>
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index ecae2bb2..481581a2 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -530,6 +530,7 @@ form .gError,
 
 #gContent #gComments {
   margin-top: 2em;
+  position: relative;
 }
 
 #gContent #gComments ul li {
@@ -561,6 +562,12 @@ form .gError,
   width: 32px;
 }
 
+#gAddCommentButton {
+  position: absolute;
+  right: 0;
+  top: 2px;
+}
+
 #gContent #gAddCommentForm {
   margin-top: 2em;
 }
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 2391f638..67cdb968 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -110,18 +110,6 @@ $(document).ready(function() {
       $(this).gallery_context_menu();
     });
 
-    // Collapse comments form, insert button to expand
-    if ($("#gAddCommentForm").length) {
-      var showCommentForm = '<a href="#add_comment_form"'
-        + ' class="showCommentForm gButtonLink ui-corner-all ui-icon-left ui-state-default right">'
-        + '<span class="ui-icon ui-icon-comment"></span>' + ADD_A_COMMENT + '</a>';
-      $("#gAddCommentForm").hide();
-      $("#gComments").prepend(showCommentForm);
-      $(".showCommentForm").click(function(){
-        $("#gAddCommentForm").show(1000);
-      });
-    }
-
     // Add scroll effect for links to named anchors
     $.localScroll({
       queue: true,
diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
index c8ecd769..29789f8e 100644
--- a/themes/default/views/movie.html.php
+++ b/themes/default/views/movie.html.php
@@ -32,9 +32,6 @@
        <div><?= nl2br(p::purify($item->description)) ?></div>
   </div>
 
-  <script type="text/javascript">
-    var ADD_A_COMMENT = "<?= t("Add a comment") ?>";
-  </script>
   <?= $theme->photo_bottom() ?>
   <?= $theme->context_menu($item, "#gMovieId-{$item->id}") ?>
 </div>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index fa5def47..39e61ef6 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -55,8 +55,5 @@
     <div><?= nl2br(p::purify($item->description)) ?></div>
   </div>
 
-  <script type="text/javascript">
-    var ADD_A_COMMENT = "<?= t("Add a comment") ?>";
-  </script>
   <?= $theme->photo_bottom() ?>
 </div>
-- 
cgit v1.2.3


From a2e2a2178b1b84a9895fdddd020c5ec8dddf89c5 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Sat, 29 Aug 2009 10:40:34 -0700
Subject: Using SafeString in album controller / view

---
 modules/gallery/controllers/albums.php | 6 +++---
 themes/default/views/album.html.php    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'themes/default/views')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index cdfa823d..ec3eb426 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -112,7 +112,7 @@ class Albums_Controller extends Items_Controller {
       log::success("content", "Created an album",
                html::anchor("albums/$new_album->id", "view album"));
       message::success(
-        t("Created album %album_title", array("album_title" => p::clean($new_album->title))));
+        t("Created album %album_title", array("album_title" => $new_album->title)));
 
       print json_encode(
         array("result" => "success",
@@ -145,7 +145,7 @@ class Albums_Controller extends Items_Controller {
 
       log::success("content", "Added a photo", html::anchor("photos/$photo->id", "view photo"));
       message::success(
-        t("Added photo %photo_title", array("photo_title" => p::clean($photo->title))));
+        t("Added photo %photo_title", array("photo_title" => $photo->title)));
 
       print json_encode(
         array("result" => "success",
@@ -194,7 +194,7 @@ class Albums_Controller extends Items_Controller {
 
       log::success("content", "Updated album", "<a href=\"albums/$album->id\">view</a>");
       message::success(
-        t("Saved album %album_title", array("album_title" => p::clean($album->title))));
+        t("Saved album %album_title", array("album_title" => $album->title)));
 
       print json_encode(
         array("result" => "success",
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 65ea3381..c2f95731 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -2,8 +2,8 @@
 <? // @todo Set hover on AlbumGrid list items for guest users ?>
 <div id="gInfo">
   <?= $theme->album_top() ?>
-  <h1><?= p::purify($item->title) ?></h1>
-  <div class="gDescription"><?= nl2br(p::purify($item->description)) ?></div>
+  <h1><?= SafeString::of($item->title)->purified_html() ?></h1>
+  <div class="gDescription"><?= nl2br(SafeString::of($item->description)->purified_html()) ?></div>
 </div>
 
 <ul id="gAlbumGrid">
@@ -20,7 +20,7 @@
     </a>
     <?= $theme->thumb_bottom($child) ?>
     <?= $theme->thumb_menu($child) ?>
-    <h2><span></span><a href="<?= $child->url() ?>"><?= p::clean($child->title) ?></a></h2>
+    <h2><span></span><a href="<?= $child->url() ?>"><?= SafeString::of($child->title) ?></a></h2>
     <ul class="gMetadata">
       <?= $theme->thumb_info($child) ?>
     </ul>
-- 
cgit v1.2.3


From c01ac42c4604b3b129e8089e0dc683ebd418b380 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Sat, 29 Aug 2009 12:48:40 -0700
Subject: Refactor all calls of p::clean() to SafeString::of() and p::purify()
 to SafeString::purify().

Removing any p::clean() calls for arguments to t() and t2() since their args are wrapped in a SafeString anyway.
---
 modules/comment/controllers/comments.php           |  8 +++---
 modules/comment/helpers/comment_rss.php            |  8 +++---
 .../views/admin_block_recent_comments.html.php     |  6 ++---
 modules/comment/views/admin_comments.html.php      | 10 ++++----
 modules/comment/views/comment.html.php             |  6 ++---
 modules/comment/views/comment.mrss.php             | 12 ++++-----
 modules/comment/views/comments.html.php            |  6 ++---
 modules/digibug/controllers/digibug.php            |  2 +-
 modules/exif/views/exif_dialog.html.php            |  4 +--
 modules/g2_import/helpers/g2_import.php            |  2 +-
 .../controllers/admin_advanced_settings.php        |  2 +-
 modules/gallery/controllers/movies.php             |  2 +-
 modules/gallery/controllers/photos.php             |  2 +-
 modules/gallery/controllers/quick.php              | 10 ++++----
 modules/gallery/helpers/gallery_rss.php            |  4 +--
 modules/gallery/helpers/gallery_task.php           |  4 +--
 modules/gallery/helpers/p.php                      | 29 ----------------------
 .../gallery/views/admin_advanced_settings.html.php |  8 +++---
 .../gallery/views/admin_block_log_entries.html.php |  2 +-
 .../views/admin_block_photo_stream.html.php        |  4 +--
 modules/gallery/views/admin_maintenance.html.php   |  2 +-
 .../views/admin_maintenance_show_log.html.php      |  2 +-
 modules/gallery/views/after_install.html.php       |  2 +-
 modules/gallery/views/move_tree.html.php           |  8 +++---
 modules/gallery/views/permissions_browse.html.php  |  4 +--
 modules/gallery/views/permissions_form.html.php    |  2 +-
 modules/gallery/views/simple_uploader.html.php     |  6 ++---
 modules/info/views/info_block.html.php             | 10 ++++----
 .../notification/views/comment_published.html.php  | 12 ++++-----
 modules/notification/views/item_added.html.php     |  8 +++---
 modules/notification/views/item_deleted.html.php   |  6 ++---
 modules/notification/views/item_updated.html.php   | 12 ++++-----
 modules/organize/controllers/organize.php          | 10 ++++----
 modules/organize/views/organize.html.php           |  2 +-
 modules/organize/views/organize_album.html.php     |  2 +-
 modules/rss/views/feed.mrss.php                    | 14 +++++------
 modules/search/views/search.html.php               | 10 ++++----
 .../server_add/controllers/admin_server_add.php    |  4 +--
 modules/server_add/views/server_add_tree.html.php  |  2 +-
 .../views/server_add_tree_dialog.html.php          |  6 ++---
 modules/tag/controllers/admin_tags.php             |  8 +++---
 modules/tag/helpers/tag_rss.php                    |  2 +-
 modules/tag/views/admin_tags.html.php              |  2 +-
 modules/tag/views/tag_cloud.html.php               |  2 +-
 modules/user/controllers/admin_users.php           | 14 +++++------
 modules/user/controllers/login.php                 |  4 +--
 modules/user/controllers/logout.php                |  4 +--
 modules/user/controllers/password.php              |  2 +-
 modules/user/views/admin_users.html.php            |  8 +++---
 modules/user/views/admin_users_group.html.php      |  8 +++---
 modules/user/views/login.html.php                  |  6 ++---
 modules/user/views/reset_password.html.php         |  2 +-
 system/helpers/request.php                         |  2 +-
 themes/default/views/album.html.php                |  4 +--
 themes/default/views/dynamic.html.php              |  4 +--
 themes/default/views/header.html.php               |  4 +--
 themes/default/views/movie.html.php                |  4 +--
 themes/default/views/page.html.php                 |  8 +++---
 themes/default/views/photo.html.php                |  4 +--
 59 files changed, 159 insertions(+), 188 deletions(-)
 delete mode 100644 modules/gallery/helpers/p.php

(limited to 'themes/default/views')

diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php
index 9fb4796e..87633f4c 100644
--- a/modules/comment/controllers/comments.php
+++ b/modules/comment/controllers/comments.php
@@ -39,9 +39,9 @@ class Comments_Controller extends REST_Controller {
       foreach ($comments as $comment) {
         $data[] = array(
           "id" => $comment->id,
-          "author_name" => p::clean($comment->author_name()),
+          "author_name" => SafeString::of($comment->author_name()),
           "created" => $comment->created,
-          "text" => nl2br(p::purify($comment->text)));
+          "text" => nl2br(SafeString::purify($comment->text)));
       }
       print json_encode($data);
       break;
@@ -126,9 +126,9 @@ class Comments_Controller extends REST_Controller {
         array("result" => "success",
               "data" => array(
                 "id" => $comment->id,
-                "author_name" => p::clean($comment->author_name()),
+                "author_name" => SafeString::of($comment->author_name()),
                 "created" => $comment->created,
-                "text" => nl2br(p::purify($comment->text)))));
+                "text" => nl2br(SafeString::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 ab3d2283..d0f15010 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::purify($item->title)));
+        t("Comments on %title", array("title" => SafeString::purify($item->title)));
     }
     return $feeds;
   }
@@ -53,13 +53,13 @@ class comment_rss_Core {
         $item = $comment->item();
         $feed->children[] = new ArrayObject(
           array("pub_date" => date("D, d M Y H:i:s T", $comment->created),
-                "text" => nl2br(p::purify($comment->text)),
+                "text" => nl2br(SafeString::purify($comment->text)),
                 "thumb_url" => $item->thumb_url(),
                 "thumb_height" => $item->thumb_height,
                 "thumb_width" => $item->thumb_width,
                 "item_uri" => url::abs_site("{$item->type}s/$item->id"),
-                "title" => p::purify($item->title),
-                "author" => p::clean($comment->author_name())),
+                "title" => SafeString::purify($item->title),
+                "author" => SafeString::of($comment->author_name())),
           ArrayObject::ARRAY_AS_PROPS);
       }
 
diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php
index 516a8181..2c7a5cf1 100644
--- a/modules/comment/views/admin_block_recent_comments.html.php
+++ b/modules/comment/views/admin_block_recent_comments.html.php
@@ -4,13 +4,13 @@
   <li class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
     <img src="<?= $comment->author()->avatar_url(32, $theme->url("images/avatar.jpg", true)) ?>"
          class="gAvatar"
-         alt="<?= p::clean($comment->author_name()) ?>"
+         alt="<?= SafeString::of($comment->author_name()) ?>"
          width="32"
          height="32" />
     <?= gallery::date_time($comment->created) ?>
     <?= t('<a href="#">%author_name</a> said <em>%comment_text</em>',
-          array("author_name" => p::clean($comment->author_name()),
-                "comment_text" => text::limit_words(nl2br(p::purify($comment->text)), 50))); ?>
+          array("author_name" => SafeString::of($comment->author_name()),
+                "comment_text" => text::limit_words(nl2br(SafeString::purify($comment->text)), 50))); ?>
   </li>
   <? endforeach ?>
 </ul>
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 9fe7164b..b27e3166 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -108,12 +108,12 @@
         <a href="#">
           <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
                class="gAvatar"
-               alt="<?= p::clean($comment->author_name()) ?>"
+               alt="<?= SafeString::of($comment->author_name()) ?>"
                width="40"
                height="40" />
         </a>
-        <p><a href="mailto:<?= p::clean($comment->author_email()) ?>"
-              title="<?= p::clean($comment->author_email()) ?>"> <?= p::clean($comment->author_name()) ?> </a></p>
+        <p><a href="mailto:<?= SafeString::of($comment->author_email()) ?>"
+              title="<?= SafeString::of($comment->author_email()) ?>"> <?= SafeString::of($comment->author_name()) ?> </a></p>
       </td>
       <td>
         <div class="right">
@@ -122,7 +122,7 @@
             <a href="<?= $item->url() ?>">
               <? if ($item->has_thumb()): ?>
               <img src="<?= $item->thumb_url() ?>"
-                 alt="<?= p::purify($item->title) ?>"
+                 alt="<?= SafeString::purify($item->title) ?>"
                  <?= photo::img_dimensions($item->thumb_width, $item->thumb_height, 75) ?>
               />
               <? else: ?>
@@ -132,7 +132,7 @@
           </div>
         </div>
         <p><?= gallery::date($comment->created) ?></p>
-           <?= nl2br(p::purify($comment->text)) ?>
+           <?= nl2br(SafeString::purify($comment->text)) ?>
       </td>
       <td>
         <ul class="gButtonSetVertical">
diff --git a/modules/comment/views/comment.html.php b/modules/comment/views/comment.html.php
index 3d17411c..31bb7f4d 100644
--- a/modules/comment/views/comment.html.php
+++ b/modules/comment/views/comment.html.php
@@ -4,15 +4,15 @@
     <a href="#">
       <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
            class="gAvatar"
-           alt="<?= p::clean($comment->author_name()) ?>"
+           alt="<?= SafeString::of($comment->author_name()) ?>"
            width="40"
            height="40" />
     </a>
     <?= t("on %date_time, %author_name said",
           array("date_time" => gallery::date_time($comment->created),
-                "author_name" => p::clean($comment->author_name()))) ?>
+                "author_name" => SafeString::of($comment->author_name()))) ?>
   </p>
   <div>
-  <?= nl2br(p::purify($comment->text)) ?>
+  <?= nl2br(SafeString::purify($comment->text)) ?>
   </div>
 </li>
diff --git a/modules/comment/views/comment.mrss.php b/modules/comment/views/comment.mrss.php
index 2b5b13c1..ae7762d9 100644
--- a/modules/comment/views/comment.mrss.php
+++ b/modules/comment/views/comment.mrss.php
@@ -6,9 +6,9 @@
    xmlns:fh="http://purl.org/syndication/history/1.0">
   <channel>
     <generator>Gallery 3</generator>
-    <title><?= p::clean($feed->title) ?></title>
+    <title><?= SafeString::of($feed->title) ?></title>
     <link><?= $feed->uri ?></link>
-    <description><?= p::clean($feed->description) ?></description>
+    <description><?= SafeString::of($feed->description) ?></description>
     <language>en-us</language>
     <atom:link rel="self" href="<?= $feed->uri ?>" type="application/rss+xml" />
     <fh:complete/>
@@ -22,14 +22,14 @@
     <lastBuildDate><?= $pub_date ?></lastBuildDate>
     <? foreach ($feed->children as $child): ?>
     <item>
-      <title><?= p::purify($child->title) ?></title>
-      <link><?= p::clean($child->item_uri) ?></link>
-      <author><?= p::clean($child->author) ?></author>
+      <title><?= SafeString::purify($child->title) ?></title>
+      <link><?= SafeString::of($child->item_uri) ?></link>
+      <author><?= SafeString::of($child->author) ?></author>
       <guid isPermaLink="true"><?= $child->item_uri ?></guid>
       <pubDate><?= $child->pub_date ?></pubDate>
       <content:encoded>
         <![CDATA[
-          <p><?= nl2br(p::purify($child->text)) ?></p>
+          <p><?= nl2br(SafeString::purify($child->text)) ?></p>
           <p>
             <img alt="" src="<?= $child->thumb_url ?>"
                  height="<?= $child->thumb_height ?>" width="<?= $child->thumb_width ?>" />
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index f7251389..7941b7da 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -12,16 +12,16 @@
       <a href="#">
         <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
              class="gAvatar"
-             alt="<?= p::clean($comment->author_name()) ?>"
+             alt="<?= SafeString::of($comment->author_name()) ?>"
              width="40"
              height="40" />
       </a>
       <?= t('on %date <a href="#">%name</a> said',
             array("date" => date("Y-M-d H:i:s", $comment->created),
-                  "name" => p::clean($comment->author_name()))); ?>
+                  "name" => SafeString::of($comment->author_name()))); ?>
     </p>
     <div>
-      <?= nl2br(p::purify($comment->text)) ?>
+      <?= nl2br(SafeString::purify($comment->text)) ?>
     </div>
   </li>
   <? endforeach ?>
diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index e0f4b6bf..509a8b70 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -50,7 +50,7 @@ class Digibug_Controller extends Controller {
       "image_width_1" => $item->width,
       "thumb_height_1" => $item->thumb_height,
       "thumb_width_1" => $item->thumb_width,
-      "title_1" => p::purify($item->title));
+      "title_1" => SafeString::purify($item->title));
 
     print $v;
   }
diff --git a/modules/exif/views/exif_dialog.html.php b/modules/exif/views/exif_dialog.html.php
index 6494b2b0..a981ca09 100644
--- a/modules/exif/views/exif_dialog.html.php
+++ b/modules/exif/views/exif_dialog.html.php
@@ -14,14 +14,14 @@
          <?= $details[$i]["caption"] ?>
          </td>
          <td class="gOdd">
-         <?= p::clean($details[$i]["value"]) ?>
+         <?= SafeString::of($details[$i]["value"]) ?>
          </td>
          <? if (!empty($details[++$i])): ?>
            <td class="gEven">
            <?= $details[$i]["caption"] ?>
            </td>
            <td class="gOdd">
-           <?= p::clean($details[$i]["value"]) ?>
+           <?= SafeString::of($details[$i]["value"]) ?>
            </td>
          <? else: ?>
            <td class="gEven"></td><td class="gOdd"></td>
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 436cef52..a01ca1db 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -590,7 +590,7 @@ class g2_import_Core {
     self::map($g2_comment->getId(), $comment->id);
     return t("Imported comment '%comment' for item with id: %id",
              array("id" => $comment->item_id,
-                   "comment" => text::limit_words(nl2br(p::purify($comment->text)), 50)));
+                   "comment" => text::limit_words(nl2br(SafeString::purify($comment->text)), 50)));
   }
 
   /**
diff --git a/modules/gallery/controllers/admin_advanced_settings.php b/modules/gallery/controllers/admin_advanced_settings.php
index 64007fdb..d727b654 100644
--- a/modules/gallery/controllers/admin_advanced_settings.php
+++ b/modules/gallery/controllers/admin_advanced_settings.php
@@ -46,7 +46,7 @@ class Admin_Advanced_Settings_Controller extends Admin_Controller {
     module::set_var($module_name, $var_name, Input::instance()->post("value"));
     message::success(
       t("Saved value for %var (%module_name)",
-        array("var" => p::clean($var_name), "module_name" => $module_name)));
+        array("var" => SafeString::of($var_name), "module_name" => $module_name)));
 
     print json_encode(array("result" => "success"));
   }
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index c8227d74..09b16759 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -93,7 +93,7 @@ class Movies_Controller extends Items_Controller {
 
       log::success("content", "Updated photo", "<a href=\"photos/$photo->id\">view</a>");
       message::success(
-        t("Saved photo %photo_title", array("photo_title" => p::clean($photo->title))));
+        t("Saved photo %photo_title", array("photo_title" => $photo->title)));
 
       print json_encode(
         array("result" => "success",
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 8ee24da8..3447b4c6 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -86,7 +86,7 @@ class Photos_Controller extends Items_Controller {
 
       log::success("content", "Updated photo", "<a href=\"photos/$photo->id\">view</a>");
       message::success(
-        t("Saved photo %photo_title", array("photo_title" => p::clean($photo->title))));
+        t("Saved photo %photo_title", array("photo_title" => $photo->title)));
 
       print json_encode(
         array("result" => "success",
diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index de027c1b..98a5bf9f 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -89,7 +89,7 @@ class Quick_Controller extends Controller {
     access::required("view", $item->parent());
     access::required("edit", $item->parent());
 
-    $msg = t("Made <b>%title</b> this album's cover", array("title" => p::purify($item->title)));
+    $msg = t("Made <b>%title</b> this album's cover", array("title" => SafeString::purify($item->title)));
 
     item::make_album_cover($item);
     message::success($msg);
@@ -105,10 +105,10 @@ class Quick_Controller extends Controller {
     if ($item->is_album()) {
       print t(
         "Delete the album <b>%title</b>? All photos and movies in the album will also be deleted.",
-        array("title" => p::purify($item->title)));
+        array("title" => SafeString::purify($item->title)));
     } else {
       print t("Are you sure you want to delete <b>%title</b>?",
-              array("title" => p::purify($item->title)));
+              array("title" => SafeString::purify($item->title)));
     }
 
     $form = item::get_delete_form($item);
@@ -122,9 +122,9 @@ class Quick_Controller extends Controller {
     access::required("edit", $item);
 
     if ($item->is_album()) {
-      $msg = t("Deleted album <b>%title</b>", array("title" => p::purify($item->title)));
+      $msg = t("Deleted album <b>%title</b>", array("title" => SafeString::purify($item->title)));
     } else {
-      $msg = t("Deleted photo <b>%title</b>", array("title" => p::purify($item->title)));
+      $msg = t("Deleted photo <b>%title</b>", array("title" => SafeString::purify($item->title)));
     }
 
     $parent = $item->parent();
diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index 7daf6170..be555296 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -52,9 +52,9 @@ class gallery_rss_Core {
         ->viewable()
         ->descendants($limit, $offset, "photo");
       $feed->max_pages = ceil($item->viewable()->descendants_count("photo") / $limit);
-      $feed->title = p::purify($item->title);
+      $feed->title = SafeString::purify($item->title);
       $feed->link = url::abs_site("albums/{$item->id}");
-      $feed->description = nl2br(p::purify($item->description));
+      $feed->description = nl2br(SafeString::purify($item->description));
 
       return $feed;
     }
diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index 9edc3acd..8c0e8aa8 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -64,10 +64,10 @@ class gallery_task_Core {
           if (!$success) {
             $ignored[$item->id] = 1;
             $errors[] = t("Unable to rebuild images for '%title'",
-                          array("title" => p::purify($item->title)));
+                          array("title" => SafeString::purify($item->title)));
           } else {
             $errors[] = t("Successfully rebuilt images for '%title'",
-                          array("title" => p::purify($item->title)));
+                          array("title" => SafeString::purify($item->title)));
           }
         }
 
diff --git a/modules/gallery/helpers/p.php b/modules/gallery/helpers/p.php
deleted file mode 100644
index e852c086..00000000
--- a/modules/gallery/helpers/p.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class p_Core {
-  static function clean($dirty_html) {
-    return new SafeString($dirty_html);
-  }
-
-  // Deprecated: Please use p::clean($var).purified_html()
-  static function purify($dirty_html) {
-    return SafeString::of($dirty_html)->purified_html();
-  }
-}
diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index b37c1c73..adc15b91 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -20,13 +20,13 @@
     <? if ($var->module_name == "gallery" && $var->name == "_cache") continue ?>
     <tr class="setting">
       <td> <?= $var->module_name ?> </td>
-      <td> <?= p::clean($var->name) ?> </td>
+      <td> <?= SafeString::of($var->name) ?> </td>
       <td>
-        <a href="<?= url::site("admin/advanced_settings/edit/$var->module_name/" . p::clean($var->name)) ?>"
+        <a href="<?= url::site("admin/advanced_settings/edit/$var->module_name/" . SafeString::of($var->name)) ?>"
           class="gDialogLink"
-          title="<?= t("Edit %var (%module_name)", array("var" => p::clean($var->name), "module_name" => $var->module_name)) ?>">
+          title="<?= t("Edit %var (%module_name)", array("var" => $var->name, "module_name" => $var->module_name)) ?>">
           <? if ($var->value): ?>
-          <?= p::clean($var->value) ?>
+          <?= SafeString::of($var->value) ?>
           <? else: ?>
           <i> <?= t("empty") ?> </i>
           <? endif ?>
diff --git a/modules/gallery/views/admin_block_log_entries.html.php b/modules/gallery/views/admin_block_log_entries.html.php
index 44c1657f..b7afb22d 100644
--- a/modules/gallery/views/admin_block_log_entries.html.php
+++ b/modules/gallery/views/admin_block_log_entries.html.php
@@ -2,7 +2,7 @@
 <ul>
   <? foreach ($entries as $entry): ?>
   <li class="<?= log::severity_class($entry->severity) ?>" style="direction: ltr">
-    <a href="<?= url::site("user/$entry->user_id") ?>"><?= p::clean($entry->user->name) ?></a>
+    <a href="<?= url::site("user/$entry->user_id") ?>"><?= SafeString::of($entry->user->name) ?></a>
     <?= gallery::date_time($entry->timestamp) ?>
     <?= $entry->message ?>
     <?= $entry->html ?>
diff --git a/modules/gallery/views/admin_block_photo_stream.html.php b/modules/gallery/views/admin_block_photo_stream.html.php
index 1e1329d1..732bdc38 100644
--- a/modules/gallery/views/admin_block_photo_stream.html.php
+++ b/modules/gallery/views/admin_block_photo_stream.html.php
@@ -2,9 +2,9 @@
 <ul>
 <? foreach ($photos as $photo): ?>
   <li class="gItem gPhoto">
-    <a href="<?= url::site("photos/$photo->id") ?>" title="<?= p::clean($photo->title) ?>">
+    <a href="<?= url::site("photos/$photo->id") ?>" title="<?= SafeString::of($photo->title) ?>">
       <img <?= photo::img_dimensions($photo->width, $photo->height, 72) ?>
-        src="<?= $photo->thumb_url() ?>" alt="<?= p::clean($photo->title) ?>" />
+        src="<?= $photo->thumb_url() ?>" alt="<?= SafeString::of($photo->title) ?>" />
     </a>
   </li>
 <? endforeach ?>
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 450eb754..a4db38ce 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -90,7 +90,7 @@
           <?= $task->status ?>
         </td>
         <td>
-          <?= p::clean($task->owner()->name) ?>
+          <?= SafeString::of($task->owner()->name) ?>
         </td>
         <td>
           <? if ($task->state == "stalled"): ?>
diff --git a/modules/gallery/views/admin_maintenance_show_log.html.php b/modules/gallery/views/admin_maintenance_show_log.html.php
index 9d850986..209aef03 100644
--- a/modules/gallery/views/admin_maintenance_show_log.html.php
+++ b/modules/gallery/views/admin_maintenance_show_log.html.php
@@ -12,7 +12,7 @@ appendTo('body').submit().remove();
 <div id="gTaskLogDialog">
   <h1> <?= $task->name ?> </h1>
   <div class="gTaskLog">
-    <pre><?= p::purify($task->get_log()) ?></pre>
+    <pre><?= SafeString::purify($task->get_log()) ?></pre>
   </div>
   <button id="gCloseButton" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Close") ?></button>
   <button id="gSaveButton" class="ui-state-default ui-corner-all" onclick="download()"><?= t("Save") ?></button>
diff --git a/modules/gallery/views/after_install.html.php b/modules/gallery/views/after_install.html.php
index e4842163..2cf8ec8f 100644
--- a/modules/gallery/views/after_install.html.php
+++ b/modules/gallery/views/after_install.html.php
@@ -8,7 +8,7 @@
 </p>
 
 <p>
-  <?= t("You're logged in to the <b>%user_name</b> account.  The very first thing you should do is to change your password to something that you'll remember.", array("user_name" => p::clean($user->name))) ?>
+  <?= t("You're logged in to the <b>%user_name</b> account.  The very first thing you should do is to change your password to something that you'll remember.", array("user_name" => $user->name)) ?>
 </p>
 
 <p>
diff --git a/modules/gallery/views/move_tree.html.php b/modules/gallery/views/move_tree.html.php
index 5f70cf67..7818a42a 100644
--- a/modules/gallery/views/move_tree.html.php
+++ b/modules/gallery/views/move_tree.html.php
@@ -1,18 +1,18 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?= $parent->thumb_img(array(), 25); ?>
 <? if (!access::can("edit", $parent) || $source->is_descendant($parent)): ?>
-<a href="javascript:load_tree('<?= $parent->id ?>',1)"> <?= p::clean($parent->title) ?> <?= t("(locked)") ?> </a>
+<a href="javascript:load_tree('<?= $parent->id ?>',1)"> <?= SafeString::of($parent->title) ?> <?= t("(locked)") ?> </a>
 <? else: ?>
-<a href="javascript:load_tree('<?= $parent->id ?>',0)"> <?= p::clean($parent->title) ?></a>
+<a href="javascript:load_tree('<?= $parent->id ?>',0)"> <?= SafeString::of($parent->title) ?></a>
 <? endif ?>
 <ul id="tree_<?= $parent->id ?>">
   <? foreach ($children as $child): ?>
   <li id="node_<?= $child->id ?>" class="node">
     <?= $child->thumb_img(array(), 25); ?>
     <? if (!access::can("edit", $child) || $source->is_descendant($child)): ?>
-    <a href="javascript:load_tree('<?= $child->id ?>',1)"> <?= p::clean($child->title) ?> <?= t("(locked)") ?></a>
+    <a href="javascript:load_tree('<?= $child->id ?>',1)"> <?= SafeString::of($child->title) ?> <?= t("(locked)") ?></a>
     <? else: ?>
-    <a href="javascript:load_tree('<?= $child->id ?>',0)"> <?= p::clean($child->title) ?> </a>
+    <a href="javascript:load_tree('<?= $child->id ?>',0)"> <?= SafeString::of($child->title) ?> </a>
     <? endif ?>
   </li>
   <? endforeach ?>
diff --git a/modules/gallery/views/permissions_browse.html.php b/modules/gallery/views/permissions_browse.html.php
index 888a27f7..9ea0da25 100644
--- a/modules/gallery/views/permissions_browse.html.php
+++ b/modules/gallery/views/permissions_browse.html.php
@@ -35,14 +35,14 @@
     <? foreach ($parents as $parent): ?>
     <li>
       <a href="javascript:show(<?= $parent->id ?>)">
-        <?= p::clean($parent->title) ?>
+        <?= SafeString::of($parent->title) ?>
       </a>
       <div class="form" id="edit-<?= $parent->id ?>"></div>
       <ul>
         <? endforeach ?>
         <li>
           <a href="javascript:show(<?= $item->id ?>)">
-            <?= p::purify($item->title) ?>
+            <?= SafeString::purify($item->title) ?>
           </a>
           <div class="form" id="edit-<?= $item->id ?>">
             <?= $form ?>
diff --git a/modules/gallery/views/permissions_form.html.php b/modules/gallery/views/permissions_form.html.php
index ee5e3a24..adc0496f 100644
--- a/modules/gallery/views/permissions_form.html.php
+++ b/modules/gallery/views/permissions_form.html.php
@@ -6,7 +6,7 @@
     <tr>
       <th> </th>
       <? foreach ($groups as $group): ?>
-      <th> <?= p::clean($group->name) ?> </th>
+      <th> <?= SafeString::of($group->name) ?> </th>
       <? endforeach ?>
     </tr>
 
diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index 38ac518c..56e568f6 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -6,7 +6,7 @@
 <!-- hack to set the title for the dialog -->
 <form id="gAddPhotosForm" action="<?= url::site("simple_uploader/finish?csrf=$csrf") ?>">
   <fieldset>
-    <legend> <?= t("Add photos to %album_title", array("album_title" => p::purify($item->title))) ?> </legend>
+    <legend> <?= t("Add photos to %album_title", array("album_title" => SafeString::purify($item->title))) ?> </legend>
   </fieldset>
 </form>
 
@@ -26,9 +26,9 @@
   </p>
   <ul class="gBreadcrumbs">
     <? foreach ($item->parents() as $parent): ?>
-    <li> <?= p::clean($parent->title) ?> </li>
+    <li> <?= SafeString::of($parent->title) ?> </li>
     <? endforeach ?>
-    <li class="active"> <?= p::purify($item->title) ?> </li>
+    <li class="active"> <?= SafeString::purify($item->title) ?> </li>
   </ul>
 
   <p>
diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php
index f86ae39d..365a1021 100644
--- a/modules/info/views/info_block.html.php
+++ b/modules/info/views/info_block.html.php
@@ -2,18 +2,18 @@
 <ul class="gMetadata">
   <li>
     <strong class="caption"><?= t("Title:") ?></strong>
-    <?= p::purify($item->title) ?>
+    <?= SafeString::purify($item->title) ?>
   </li>
   <? if ($item->description): ?>
   <li>
     <strong class="caption"><?= t("Description:") ?></strong>
-     <?= nl2br(p::purify($item->description)) ?>
+     <?= nl2br(SafeString::purify($item->description)) ?>
   </li>
   <? endif ?>
   <? if ($item->id != 1): ?>
   <li>
     <strong class="caption"><?= t("Folder name:") ?></strong>
-    <?= p::clean($item->name) ?>
+    <?= SafeString::of($item->name) ?>
   </li>
   <? endif ?>
   <? if ($item->captured): ?>
@@ -26,9 +26,9 @@
   <li>
     <strong class="caption"><?= t("Owner:") ?></strong>
     <? if ($item->owner->url): ?>
-    <a href="<?= $item->owner->url ?>"><?= p::clean($item->owner->display_name()) ?></a>
+    <a href="<?= $item->owner->url ?>"><?= SafeString::of($item->owner->display_name()) ?></a>
     <? else: ?>
-    <?= p::clean($item->owner->display_name()) ?>
+    <?= SafeString::of($item->owner->display_name()) ?>
     <? endif ?>
   </li>
   <? endif ?>
diff --git a/modules/notification/views/comment_published.html.php b/modules/notification/views/comment_published.html.php
index 4a56cdad..02daf921 100644
--- a/modules/notification/views/comment_published.html.php
+++ b/modules/notification/views/comment_published.html.php
@@ -1,26 +1,26 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <html>
   <head>
-    <title><?= p::clean($subject) ?> </title>
+    <title><?= SafeString::of($subject) ?> </title>
   </head>
   <body>
-    <h2><?= p::clean($subject) ?></h2>
+    <h2><?= SafeString::of($subject) ?></h2>
     <table>
       <tr>
         <td><?= t("Comment:") ?></td>
-  <td><?= nl2br(p::purify($comment->text)) ?></td>
+  <td><?= nl2br(SafeString::purify($comment->text)) ?></td>
       </tr>
       <tr>
         <td><?= t("Author Name:") ?></td>
-        <td><?= p::clean($comment->author_name()) ?></td>
+        <td><?= SafeString::of($comment->author_name()) ?></td>
       </tr>
       <tr>
         <td><?= t("Author Email:") ?></td>
-        <td><?= p::clean($comment->author_email()) ?></td>
+        <td><?= SafeString::of($comment->author_email()) ?></td>
       </tr>
       <tr>
         <td><?= t("Author URL:") ?></td>
-        <td><?= p::clean($comment->author_url()) ?></td>
+        <td><?= SafeString::of($comment->author_url()) ?></td>
       </tr>
       <tr>
         <td><?= t("Url:") ?></td>
diff --git a/modules/notification/views/item_added.html.php b/modules/notification/views/item_added.html.php
index 86724927..70b8fca4 100644
--- a/modules/notification/views/item_added.html.php
+++ b/modules/notification/views/item_added.html.php
@@ -1,14 +1,14 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <html>
   <head>
-    <title><?= p::clean($subject) ?> </title>
+    <title><?= SafeString::of($subject) ?> </title>
   </head>
   <body>
-    <h2><?= p::clean($subject) ?></h2>
+    <h2><?= SafeString::of($subject) ?></h2>
     <table>
       <tr>
         <td><?= t("Title:") ?></td>
-        <td><?= p::purify($item->title) ?></td>
+        <td><?= SafeString::purify($item->title) ?></td>
       </tr>
       <tr>
         <td><?= t("Url:") ?></td>
@@ -21,7 +21,7 @@
       <? if ($item->description): ?>
       <tr>
         <td><?= t("Description:") ?></td>
-         <td><?= nl2br(p::purify($item->description)) ?></td>
+         <td><?= nl2br(SafeString::purify($item->description)) ?></td>
       </tr>
       <? endif ?>
     </table>
diff --git a/modules/notification/views/item_deleted.html.php b/modules/notification/views/item_deleted.html.php
index 92215211..e04fc71b 100644
--- a/modules/notification/views/item_deleted.html.php
+++ b/modules/notification/views/item_deleted.html.php
@@ -1,15 +1,15 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <html>
   <head>
-    <title><?= p::clean($subject) ?> </title>
+    <title><?= SafeString::of($subject) ?> </title>
   </head>
   <body>
-    <h2><?= p::clean($subject) ?></h2>
+    <h2><?= SafeString::of($subject) ?></h2>
     <table>
       <tr>
         <td colspan="2">
           <?= t("To view the changed album %title use the link below.",
-              array("title" => p::purify($item->parent()->title))) ?>
+              array("title" => SafeString::purify($item->parent()->title))) ?>
         </td>
       </tr>
       <tr>
diff --git a/modules/notification/views/item_updated.html.php b/modules/notification/views/item_updated.html.php
index 39f9113b..c3a4f795 100644
--- a/modules/notification/views/item_updated.html.php
+++ b/modules/notification/views/item_updated.html.php
@@ -1,18 +1,18 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <html>
   <head>
-    <title><?= p::clean($subject) ?> </title>
+    <title><?= SafeString::of($subject) ?> </title>
   </head>
   <body>
-    <h2> <?= p::clean($subject) ?> </h2>
+    <h2> <?= SafeString::of($subject) ?> </h2>
     <table>
       <tr>
         <? if ($item->original("title") != $item->title): ?>
         <td><?= t("New Title:") ?></td>
-        <td><?= p::clean($item->title) ?></td>
+        <td><?= SafeString::of($item->title) ?></td>
         <? else: ?>
         <td><?= t("Title:") ?></td>
-        <td><?= p::clean($item->title) ?></td>
+        <td><?= SafeString::of($item->title) ?></td>
         <? endif ?>
       </tr>
       <tr>
@@ -22,12 +22,12 @@
       <? if ($item->original("description") != $item->description): ?>
       <tr>
         <td><?= t("New Description:") ?></td>
-        <td><?= p::clean($item->description) ?></td>
+        <td><?= SafeString::of($item->description) ?></td>
       </tr>
       <? elseif (!empty($item->description)): ?>
       <tr>
         <td><?= t("Description:") ?></td>
-        <td><?= p::clean($item->description) ?></td>
+        <td><?= SafeString::of($item->description) ?></td>
       </tr>
       <? endif ?>
     </table>
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 898be509..d60aa838 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::purify($item->title),
-            "description" => empty($item->description) ? "" : p::purify($item->description)));
+      array("title" => SafeString::purify($item->title),
+            "description" => empty($item->description) ? "" : SafeString::purify($item->description)));
   }
 
   function tree($item, $parent) {
@@ -281,10 +281,10 @@ class Organize_Controller extends Controller {
 
       if ($item->is_album()) {
         log::success("content", "Updated album", "<a href=\"albums/$item->id\">view</a>");
-        $message = t("Saved album %album_title", array("album_title" => p::purify($item->title)));
+        $message = t("Saved album %album_title", array("album_title" => SafeString::purify($item->title)));
       } else {
         log::success("content", "Updated photo", "<a href=\"photos/$item->id\">view</a>");
-        $message = t("Saved photo %photo_title", array("photo_title" => p::purify($item->title)));
+        $message = t("Saved photo %photo_title", array("photo_title" => SafeString::purify($item->title)));
       }
       print json_encode(array("form" => $form->__toString(), "message" => $message));
     } else {
@@ -321,7 +321,7 @@ class Organize_Controller extends Controller {
       $item->save();
 
       log::success("content", "Updated album", "<a href=\"albums/$item->id\">view</a>");
-      $message = t("Saved album %album_title", array("album_title" => p::purify($item->title)));
+      $message = t("Saved album %album_title", array("album_title" => SafeString::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 1686d255..1182a887 100644
--- a/modules/organize/views/organize.html.php
+++ b/modules/organize/views/organize.html.php
@@ -16,7 +16,7 @@ var CONFIRM_DELETE = "<?= t("Do you really want to delete the selected albums an
   });
 </script>
 <fieldset style="display: none">
-  <legend><?= t("Organize %name", array("name" => p::purify($item->title))) ?></legend>
+  <legend><?= t("Organize %name", array("name" => SafeString::purify($item->title))) ?></legend>
 </fieldset>
 <div id="doc3" class="yui-t7">
   <div id="bd">
diff --git a/modules/organize/views/organize_album.html.php b/modules/organize/views/organize_album.html.php
index ae2d5d51..4933ed32 100644
--- a/modules/organize/views/organize_album.html.php
+++ b/modules/organize/views/organize_album.html.php
@@ -7,7 +7,7 @@
 
     <div id="gOrganizeBranch-<?= $album->id ?>" ref="<?= $album->id ?>"
           class="<?= $selected ? "gBranchSelected" : "" ?> gBranchText">
-      <?= p::clean($album->title) ?>
+      <?= SafeString::of($album->title) ?>
     </div>
     <div id="gOrganizeChildren-<?= $album->id ?>"
           class="<?= $album_icon == "ui-icon-plus" ? "gBranchCollapsed" : "" ?>">
diff --git a/modules/rss/views/feed.mrss.php b/modules/rss/views/feed.mrss.php
index 447179a5..7298b7f4 100644
--- a/modules/rss/views/feed.mrss.php
+++ b/modules/rss/views/feed.mrss.php
@@ -6,9 +6,9 @@
    xmlns:fh="http://purl.org/syndication/history/1.0">
   <channel>
     <generator>gallery3</generator>
-    <title><?= p::clean($feed->title) ?></title>
+    <title><?= SafeString::of($feed->title) ?></title>
     <link><?= $feed->uri ?></link>
-    <description><?= p::clean($feed->description) ?></description>
+    <description><?= SafeString::of($feed->description) ?></description>
     <language>en-us</language>
     <atom:link rel="self" href="<?= $feed->uri ?>" type="application/rss+xml" />
     <fh:complete/>
@@ -22,25 +22,25 @@
     <lastBuildDate><?= $pub_date ?></lastBuildDate>
     <? foreach ($feed->children as $child): ?>
     <item>
-      <title><?= p::clean($child->title) ?></title>
+      <title><?= SafeString::of($child->title) ?></title>
       <link><?= url::abs_site("{$child->type}s/{$child->id}") ?></link>
       <guid isPermaLink="true"><?= url::abs_site("{$child->type}s/{$child->id}") ?></guid>
       <pubDate><?= date("D, d M Y H:i:s T", $child->created); ?></pubDate>
       <content:encoded>
         <![CDATA[
-          <span><?= p::clean($child->description) ?></span>
+          <span><?= SafeString::of($child->description) ?></span>
           <p>
           <? if ($child->type == "photo" || $child->type == "album"): ?>
             <img alt="" src="<?= $child->resize_url(true) ?>"
-                 title="<?= p::clean($child->title) ?>"
+                 title="<?= SafeString::of($child->title) ?>"
                  height="<?= $child->resize_height ?>" width="<?= $child->resize_width ?>" /><br />
           <? else: ?>
             <a href="<?= url::abs_site("{$child->type}s/{$child->id}") ?>">
             <img alt="" src="<?= $child->thumb_url(true) ?>"
-                 title="<?= p::clean($child->title) ?>"
+                 title="<?= SafeString::of($child->title) ?>"
                  height="<?= $child->thumb_height ?>" width="<?= $child->thumb_width ?>" /></a><br />
           <? endif ?>
-            <?= p::clean($child->description) ?>
+            <?= SafeString::of($child->description) ?>
           </p>
         ]]>
       </content:encoded>
diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php
index 6a222ef1..e5c7b4a6 100644
--- a/modules/search/views/search.html.php
+++ b/modules/search/views/search.html.php
@@ -8,10 +8,10 @@
     <ul>
       <li>
         <label for="q"><?= t("Search the gallery") ?></label>
-        <input name="q" id="q" type="text" value="<?= p::clean($q) ?>"/>
+        <input name="q" id="q" type="text" value="<?= SafeString::of($q)->for_html_attr() ?>"/>
       </li>
       <li>
-        <input type="submit" value="<?= t("Search") ?>" />
+        <input type="submit" value="<?= t("Search")->for_html_attr() ?>" />
       </li>
     </ul>
   </fieldset>
@@ -31,10 +31,10 @@
       <a href="<?= url::site("items/$item->id") ?>">
         <?= $item->thumb_img() ?>
         <p>
-          <?= p::purify($item->title) ?>
+    <?= SafeString::purify($item->title) ?>
         </p>
         <div>
-    <?= nl2br(p::purify($item->description)) ?>
+    <?= nl2br(SafeString::purify($item->description)) ?>
         </div>
       </a>
     </li>
@@ -44,7 +44,7 @@
 
   <? else: ?>
   <p>
-    <?= t("No results found for <b>%term</b>", array("term" => p::clean($q))) ?>
+    <?= t("No results found for <b>%term</b>", array("term" => $q)) ?>
   </p>
 
   <? endif; ?>
diff --git a/modules/server_add/controllers/admin_server_add.php b/modules/server_add/controllers/admin_server_add.php
index 30109f42..fac2aa44 100644
--- a/modules/server_add/controllers/admin_server_add.php
+++ b/modules/server_add/controllers/admin_server_add.php
@@ -38,7 +38,7 @@ class Admin_Server_Add_Controller extends Admin_Controller {
         $path = $form->add_path->path->value;
         $paths[$path] = 1;
         module::set_var("server_add", "authorized_paths", serialize($paths));
-        message::success(t("Added path %path", array("path" => p::clean($path))));
+        message::success(t("Added path %path", array("path" => $path)));
         server_add::check_config($paths);
         url::redirect("admin/server_add");
       } else {
@@ -60,7 +60,7 @@ class Admin_Server_Add_Controller extends Admin_Controller {
     $paths = unserialize(module::get_var("server_add", "authorized_paths"));
     if (isset($paths[$path])) {
       unset($paths[$path]);
-      message::success(t("Removed path %path", array("path" => p::clean($path))));
+      message::success(t("Removed path %path", array("path" => $path)));
       module::set_var("server_add", "authorized_paths", serialize($paths));
       server_add::check_config($paths);
     }
diff --git a/modules/server_add/views/server_add_tree.html.php b/modules/server_add/views/server_add_tree.html.php
index 254a9da0..b68544ec 100644
--- a/modules/server_add/views/server_add_tree.html.php
+++ b/modules/server_add/views/server_add_tree.html.php
@@ -24,7 +24,7 @@
                 <? endif ?>
                 file="<?= $file ?>"
                 >
-            <?= p::clean(basename($file)) ?>
+            <?= SafeString::of(basename($file)) ?>
           </span>
         </li>
         <? endforeach ?>
diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index 21952849..533cad04 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -5,17 +5,17 @@
 </script>
 
 <div id="gServerAdd">
-  <h1 style="display: none;"><?= t("Add Photos to '%title'", array("title" => p::purify($item->title))) ?></h1>
+  <h1 style="display: none;"><?= t("Add Photos to '%title'", array("title" => SafeString::purify($item->title))) ?></h1>
 
   <p id="gDescription"><?= t("Photos will be added to album:") ?></p>
   <ul class="gBreadcrumbs">
     <? foreach ($item->parents() as $parent): ?>
     <li>
-      <?= p::purify($parent->title) ?>
+      <?= SafeString::purify($parent->title) ?>
     </li>
     <? endforeach ?>
     <li class="active">
-      <?= p::purify($item->title) ?>
+      <?= SafeString::purify($item->title) ?>
     </li>
   </ul>
 
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index dcdc16b9..f1b4ca3a 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -53,8 +53,8 @@ class Admin_Tags_Controller extends Admin_Controller {
       $name = $tag->name;
       Database::instance()->delete("items_tags", array("tag_id" => "$tag->id"));
       $tag->delete();
-      message::success(t("Deleted tag %tag_name", array("tag_name" => p::clean($name))));
-      log::success("tags", t("Deleted tag %tag_name", array("tag_name" => p::clean($name))));
+      message::success(t("Deleted tag %tag_name", array("tag_name" => $name)));
+      log::success("tags", t("Deleted tag %tag_name", array("tag_name" => $name)));
 
       print json_encode(
         array("result" => "success",
@@ -98,7 +98,7 @@ class Admin_Tags_Controller extends Admin_Controller {
       $tag->save();
 
       $message = t("Renamed tag %old_name to %new_name",
-                   array("old_name" => p::clean($old_name), "new_name" => p::clean($tag->name)));
+                   array("old_name" => $old_name, "new_name" => $tag->name));
       message::success($message);
       log::success("tags", $message);
 
@@ -106,7 +106,7 @@ class Admin_Tags_Controller extends Admin_Controller {
         array("result" => "success",
               "location" => url::site("admin/tags"),
               "tag_id" => $tag->id,
-              "new_tagname" => p::clean($tag->name)));
+              "new_tagname" => SafeString::of($tag->name)));
     } else {
       print json_encode(
         array("result" => "error",
diff --git a/modules/tag/helpers/tag_rss.php b/modules/tag/helpers/tag_rss.php
index f94508cf..7194586d 100644
--- a/modules/tag/helpers/tag_rss.php
+++ b/modules/tag/helpers/tag_rss.php
@@ -22,7 +22,7 @@ class tag_rss_Core {
   static function available_feeds($item, $tag) {
     if ($tag) {
       $feeds["tag/tag/{$tag->id}"] =
-        t("Tag feed for %tag_name", array("tag_name" => p::clean($tag->name)));
+        t("Tag feed for %tag_name", array("tag_name" => $tag->name));
       return $feeds;
     }
     return array();
diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index 7d201da7..5bd23112 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -47,7 +47,7 @@
           <? endif ?>
 
           <li>
-            <span id="gTag-<?= $tag->id ?>" class="gEditable tag-name"><?= p::clean($tag->name) ?></span>
+            <span id="gTag-<?= $tag->id ?>" class="gEditable tag-name"><?= SafeString::of($tag->name) ?></span>
             <span class="understate">(<?= $tag->count ?>)</span>
             <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>"
                class="gDialogLink delete-link gButtonLink">
diff --git a/modules/tag/views/tag_cloud.html.php b/modules/tag/views/tag_cloud.html.php
index eba615fc..b4c6ae34 100644
--- a/modules/tag/views/tag_cloud.html.php
+++ b/modules/tag/views/tag_cloud.html.php
@@ -3,7 +3,7 @@
   <? foreach ($tags as $tag): ?>
   <li class="size<?=(int)(($tag->count / $max_count) * 7) ?>">
     <span><?= $tag->count ?> photos are tagged with </span>
-    <a href="<?= url::site("tags/$tag->id") ?>"><?= p::clean($tag->name) ?></a>
+    <a href="<?= url::site("tags/$tag->id") ?>"><?= SafeString::of($tag->name) ?></a>
   </li>
   <? endforeach ?>
 </ul>
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index f87602b8..521f82fa 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -51,7 +51,7 @@ class Admin_Users_Controller extends Controller {
       $user->save();
       module::event("user_add_form_admin_completed", $user, $form);
 
-      message::success(t("Created user %user_name", array("user_name" => p::clean($user->name))));
+      message::success(t("Created user %user_name", array("user_name" => $user->name)));
       print json_encode(array("result" => "success"));
     } else {
       print json_encode(array("result" => "error",
@@ -84,7 +84,7 @@ class Admin_Users_Controller extends Controller {
                               "form" => $form->__toString()));
     }
 
-    $message = t("Deleted user %user_name", array("user_name" => p::clean($name)));
+    $message = t("Deleted user %user_name", array("user_name" => $name));
     log::success("user", $message);
     message::success($message);
     print json_encode(array("result" => "success"));
@@ -142,7 +142,7 @@ class Admin_Users_Controller extends Controller {
       $user->save();
       module::event("user_edit_form_admin_completed", $user, $form);
 
-      message::success(t("Changed user %user_name", array("user_name" => p::clean($user->name))));
+      message::success(t("Changed user %user_name", array("user_name" => $user->name)));
       print json_encode(array("result" => "success"));
     } else {
       print json_encode(array("result" => "error",
@@ -204,7 +204,7 @@ class Admin_Users_Controller extends Controller {
       $group = group::create($new_name);
       $group->save();
       message::success(
-        t("Created group %group_name", array("group_name" => p::clean($group->name))));
+        t("Created group %group_name", array("group_name" => $group->name)));
       print json_encode(array("result" => "success"));
     } else {
       print json_encode(array("result" => "error",
@@ -233,7 +233,7 @@ class Admin_Users_Controller extends Controller {
                               "form" => $form->__toString()));
     }
 
-    $message = t("Deleted group %group_name", array("group_name" => p::clean($name)));
+    $message = t("Deleted group %group_name", array("group_name" => $name));
     log::success("group", $message);
     message::success($message);
     print json_encode(array("result" => "success"));
@@ -271,11 +271,11 @@ class Admin_Users_Controller extends Controller {
       $group->name = $form->edit_group->inputs["name"]->value;
       $group->save();
       message::success(
-        t("Changed group %group_name", array("group_name" => p::clean($group->name))));
+        t("Changed group %group_name", array("group_name" => $group->name)));
       print json_encode(array("result" => "success"));
     } else {
       message::error(
-        t("Failed to change group %group_name", array("group_name" => p::clean($group->name))));
+        t("Failed to change group %group_name", array("group_name" => $group->name)));
       print json_encode(array("result" => "error",
                               "form" => $form->__toString()));
     }
diff --git a/modules/user/controllers/login.php b/modules/user/controllers/login.php
index 4d901051..b81b17b2 100644
--- a/modules/user/controllers/login.php
+++ b/modules/user/controllers/login.php
@@ -63,7 +63,7 @@ class Login_Controller extends Controller {
         log::warning(
           "user",
           t("Failed login for %name",
-            array("name" => p::clean($form->login->inputs["name"]->value))));
+            array("name" => $form->login->inputs["name"]->value)));
         $form->login->inputs["name"]->add_error("invalid_login", 1);
         $valid = false;
       }
@@ -71,7 +71,7 @@ class Login_Controller extends Controller {
 
     if ($valid) {
       user::login($user);
-      log::info("user", t("User %name logged in", array("name" => p::clean($user->name))));
+      log::info("user", t("User %name logged in", array("name" => $user->name)));
     }
 
     // Either way, regenerate the session id to avoid session trapping
diff --git a/modules/user/controllers/logout.php b/modules/user/controllers/logout.php
index 099b1952..4b141a1c 100644
--- a/modules/user/controllers/logout.php
+++ b/modules/user/controllers/logout.php
@@ -23,8 +23,8 @@ class Logout_Controller extends Controller {
 
     $user = user::active();
     user::logout();
-    log::info("user", t("User %name logged out", array("name" => p::clean($user->name))),
-              html::anchor("user/$user->id", p::clean($user->name)));
+    log::info("user", t("User %name logged out", array("name" => $user->name)),
+              html::anchor("user/$user->id", SafeString::of($user->name)));
     if ($continue_url = $this->input->get("continue")) {
       $item = url::get_item_from_uri($continue_url);
       if (access::can("view", $item)) {
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index 2af1b879..066efbba 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -74,7 +74,7 @@ class Password_Controller extends Controller {
 
       log::success(
         "user",
-        t("Password reset email sent for user %name", array("name" => p::clean($user->name))));
+        t("Password reset email sent for user %name", array("name" => $user->name)));
     } else {
       // Don't include the username here until you're sure that it's XSS safe
       log::warning(
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 542b8b8b..54c4847d 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -68,16 +68,16 @@
         <td id="user-<?= $user->id ?>" class="core-info gDraggable">
           <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
                title="<?= t("Drag user onto group below to add as a new member") ?>"
-               alt="<?= p::clean($user->name) ?>"
+               alt="<?= SafeString::of($user->name) ?>"
                width="20"
                height="20" />
-          <?= p::clean($user->name) ?>
+          <?= SafeString::of($user->name) ?>
         </td>
         <td>
-          <?= p::clean($user->full_name) ?>
+          <?= SafeString::of($user->full_name) ?>
         </td>
         <td>
-          <?= p::clean($user->email) ?>
+          <?= SafeString::of($user->email) ?>
         </td>
         <td>
           <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
index bfd79dba..f89a4392 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/user/views/admin_users_group.html.php
@@ -1,9 +1,9 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <h4>
-  <?= p::clean($group->name) ?>
+  <?= SafeString::of($group->name) ?>
   <? if (!$group->special): ?>
   <a href="<?= url::site("admin/users/delete_group_form/$group->id") ?>"
-    title="<?= t("Delete the %name group", array("name" => p::clean($group->name))) ?>"
+    title="<?= t("Delete the %name group", array("name" => $group->name)) ?>"
     class="gDialogLink gButtonLink ui-state-default ui-corner-all">
     <span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
   <? else: ?>
@@ -17,12 +17,12 @@
 <ul>
   <? foreach ($group->users as $i => $user): ?>
   <li class="gUser">
-    <?= p::clean($user->name) ?>
+    <?= SafeString::of($user->name) ?>
     <? if (!$group->special): ?>
     <a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)"
        class="gButtonLink ui-state-default ui-corner-all ui-icon-left"
        title="<?= t("Remove %user from %group group",
-              array("user" => p::clean($user->name), "group" => p::clean($group->name))) ?>">
+              array("user" => $user->name, "group" => $group->name)) ?>">
       <span class="ui-icon ui-icon-closethick"><?= t("remove") ?></span>
     </a>
     <? endif ?>
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index 97341762..e92513e7 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -8,11 +8,11 @@
   </li>
   <? else: ?>
   <li class="first">
-    <?= t('Logged in as %name', array('name' => SafeString::of(
+    <?= t('Logged in as %name', array('name' => SafeString::of_safe_html(
       '<a href="' . url::site("form/edit/users/{$user->id}") .
-      '" title="' . t("Edit Your Profile") .
+      '" title="' . t("Edit Your Profile")->for_html_attr() .
       '" id="gUserProfileLink" class="gDialogLink">' .
-      p::clean($user->display_name()) . '</a>')->mark_html_safe())) ?>
+      SafeString::of($user->display_name()) . '</a>'))) ?>
   </li>
   <li>
     <a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(url::current(true))) ?>"
diff --git a/modules/user/views/reset_password.html.php b/modules/user/views/reset_password.html.php
index 4c4672ee..3dc7aebf 100644
--- a/modules/user/views/reset_password.html.php
+++ b/modules/user/views/reset_password.html.php
@@ -6,7 +6,7 @@
   <body>
     <h2><?= t("Password Reset Request") ?> </h2>
     <p>
-      <?= t("Hello, %name,", array("name" => p::clean($user->full_name ? $user->full_name : $user->name))) ?>
+      <?= t("Hello, %name,", array("name" => $user->full_name ? $user->full_name : $user->name)) ?>
     </p>
     <p>
       <?= t("We received a request to reset your password for <a href=\"%site_url\">%site_url</a>.  If you made this request, you can confirm it by <a href=\"%confirm_url\">clicking this link</a>.  If you didn't request this password reset, it's ok to ignore this mail.", array("site_url" => url::base(false, "http"), "confirm_url" => $confirm_url)) ?>
diff --git a/system/helpers/request.php b/system/helpers/request.php
index 4203d0e5..15b8edfa 100644
--- a/system/helpers/request.php
+++ b/system/helpers/request.php
@@ -30,7 +30,7 @@ class request_Core {
 			// Set referrer
 			$ref = $_SERVER['HTTP_REFERER'];
 
-			if (strpos($ref, url::base(FALSE)) === 0)
+			if (strpos($ref, (string) url::base(FALSE)) === 0)
 			{
 				// Remove the base URL from the referrer
 				$ref = substr($ref, strlen(url::base(FALSE)));
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index c2f95731..ffb4b913 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -2,8 +2,8 @@
 <? // @todo Set hover on AlbumGrid list items for guest users ?>
 <div id="gInfo">
   <?= $theme->album_top() ?>
-  <h1><?= SafeString::of($item->title)->purified_html() ?></h1>
-  <div class="gDescription"><?= nl2br(SafeString::of($item->description)->purified_html()) ?></div>
+  <h1><?= SafeString::purify($item->title) ?></h1>
+  <div class="gDescription"><?= nl2br(SafeString::purify($item->description)) ?></div>
 </div>
 
 <ul id="gAlbumGrid">
diff --git a/themes/default/views/dynamic.html.php b/themes/default/views/dynamic.html.php
index 2d122e69..2d8e04a2 100644
--- a/themes/default/views/dynamic.html.php
+++ b/themes/default/views/dynamic.html.php
@@ -3,7 +3,7 @@
   <div id="gAlbumHeaderButtons">
     <?= $theme->dynamic_top() ?>
   </div>
-  <h1><?= p::clean($title) ?></h1>
+  <h1><?= SafeString::of($title) ?></h1>
 </div>
 
 <ul id="gAlbumGrid">
@@ -16,7 +16,7 @@
            width="<?= $child->thumb_width ?>"
            height="<?= $child->thumb_height ?>" />
     </a>
-    <h2><?= p::purify($child->title) ?></h2>
+    <h2><?= SafeString::purify($child->title) ?></h2>
     <?= $theme->thumb_bottom($child) ?>
     <ul class="gMetadata">
       <?= $theme->thumb_info($child) ?>
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index 2ba1e923..9e34401d 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -19,10 +19,10 @@
   <? foreach ($parents as $parent): ?>
   <li>
     <a href="<?= url::site("albums/{$parent->id}?show=$item->id") ?>">
-      <?= p::purify($parent->title) ?>
+      <?= SafeString::purify($parent->title) ?>
     </a>
   </li>
   <? endforeach ?>
-  <li class="active"><?= p::purify($item->title) ?></li>
+  <li class="active"><?= SafeString::purify($item->title) ?></li>
 </ul>
 <? endif ?>
diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
index 66c80ded..1f25a626 100644
--- a/themes/default/views/movie.html.php
+++ b/themes/default/views/movie.html.php
@@ -15,8 +15,8 @@
   <?= $item->movie_img(array("class" => "gMovie", "id" => "gMovieId-{$item->id}")) ?>
 
   <div id="gInfo">
-    <h1><?= p::purify($item->title) ?></h1>
-       <div><?= nl2br(p::purify($item->description)) ?></div>
+    <h1><?= SafeString::purify($item->title) ?></h1>
+       <div><?= nl2br(SafeString::purify($item->description)) ?></div>
   </div>
 
   <script type="text/javascript">
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 66282bae..ea2be37b 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -10,14 +10,14 @@
       <? else: ?>
         <? if ($theme->item()): ?>
           <? if ($theme->item()->is_album()): ?>
-          <?= t("Browse Album :: %album_title", array("album_title" => p::clean($theme->item()->title))) ?>
+          <?= t("Browse Album :: %album_title", array("album_title" => $theme->item()->title)) ?>
           <? elseif ($theme->item()->is_photo()): ?>
-          <?= t("Photo :: %photo_title", array("photo_title" => p::clean($theme->item()->title))) ?>
+	  <?= t("Photo :: %photo_title", array("photo_title" => $theme->item()->title)) ?>
           <? else: ?>
-          <?= t("Movie :: %movie_title", array("movie_title" => p::clean($theme->item()->title))) ?>
+          <?= t("Movie :: %movie_title", array("movie_title" => $theme->item()->title)) ?>
           <? endif ?>
         <? elseif ($theme->tag()): ?>
-          <?= t("Browse Tag :: %tag_title", array("tag_title" => p::clean($theme->tag()->name))) ?>
+          <?= t("Browse Tag :: %tag_title", array("tag_title" => $theme->tag()->name)) ?>
         <? else: /* Not an item, not a tag, no page_title specified.  Help! */ ?>
           <?= t("Gallery") ?>
         <? endif ?>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index bf4d9da3..1f92e9ba 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -50,8 +50,8 @@
   </div>
 
   <div id="gInfo">
-    <h1><?= p::purify($item->title) ?></h1>
-    <div><?= nl2br(p::purify($item->description)) ?></div>
+    <h1><?= SafeString::purify($item->title) ?></h1>
+    <div><?= nl2br(SafeString::purify($item->description)) ?></div>
   </div>
 
   <script type="text/javascript">
-- 
cgit v1.2.3


From d5660d2d3ea6e8172272f1eb27e8071a1a42d87b Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Sat, 29 Aug 2009 13:41:18 -0700
Subject: Fixing all detected XSS vectors in PHP->JS code.

Xss: Rename UNKNOWN back to DIRTY, JS_XSS to DIRTY_JS.
(using a different flag value to highlight potential XSS vectors in JS)
---
 modules/gallery/tests/Xss_Security_Test.php    | 15 +++++--
 modules/gallery/views/l10n_client.html.php     |  4 +-
 modules/gallery/views/simple_uploader.html.php | 61 +++++++++++++-------------
 modules/organize/views/organize.html.php       | 16 +++----
 themes/admin_default/views/admin.html.php      |  2 +-
 themes/default/views/movie.html.php            |  2 +-
 themes/default/views/page.html.php             |  2 +-
 themes/default/views/photo.html.php            |  4 +-
 8 files changed, 56 insertions(+), 50 deletions(-)

(limited to 'themes/default/views')

diff --git a/modules/gallery/tests/Xss_Security_Test.php b/modules/gallery/tests/Xss_Security_Test.php
index fd596c69..690dc760 100644
--- a/modules/gallery/tests/Xss_Security_Test.php
+++ b/modules/gallery/tests/Xss_Security_Test.php
@@ -178,10 +178,10 @@ class Xss_Security_Test extends Unit_Test_Case {
      * Generate the report
      *
      * States for uses of < ? = X ? >:
-     * JS_XSS:
+     * DIRTY_JS:
      *   In <script> block
      *     X can be anything without calling ->for_js()
-     * UNKNOWN:
+     * DIRTY:
      *   Outside <script> block:
      *     X can be anything without a call to ->for_html() or ->purified_html()
      * CLEAN:
@@ -196,9 +196,9 @@ class Xss_Security_Test extends Unit_Test_Case {
     ksort($found);
     foreach ($found as $view => $frames) {
       foreach ($frames as $frame) {
-	$state = "UNKNOWN";
+	$state = "DIRTY";
 	if ($frame->in_script_block()) {
-	  $state = "JS_XSS";
+	  $state = "DIRTY_JS";
 	  if ($frame->for_js_called() || $frame->json_encode_called()) {
 	    $state = "CLEAN";
 	  }
@@ -207,6 +207,13 @@ class Xss_Security_Test extends Unit_Test_Case {
 	    $state = "CLEAN";
 	  }
 	}
+
+	if ("CLEAN" == $state) {
+	  // Don't print CLEAN instances - No need to update the golden
+	  // file when adding / moving clean instances.
+	  continue;
+	}
+
 	fprintf($fd, "%-60s %-3s %-8s %s\n",
 		$view, $frame->line(), $state, $frame->expr());
       }
diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index c73719ca..523552c3 100644
--- a/modules/gallery/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
@@ -69,8 +69,8 @@
     </div>
   </div>
   <script type="text/javascript">
-    var MSG_TRANSLATE_TEXT = "<?= t("Translate Text") ?>";
-    var MSG_CLOSE_X = "<?= t("X") ?>";
+    var MSG_TRANSLATE_TEXT = "<?= t("Translate Text")->for_js() ?>";
+    var MSG_CLOSE_X = "<?= t("X")->for_js() ?>";
     var l10n_client_data = <?= json_encode($string_list) ?>;
     var plural_forms = <?= json_encode($plural_forms) ?>;
   </script>
diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index 56e568f6..fc426e8f 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -82,27 +82,26 @@
 
 <script type="text/javascript">
   var swfu = new SWFUpload({
-    flash_url: "<?= url::file("lib/swfupload/swfupload.swf") ?>",
-    upload_url: "<?= url::site("simple_uploader/add_photo/$item->id") ?>",
-    post_params: {
-      "g3sid": "<?= Session::instance()->id() ?>",
-      "user_agent": "<?= Input::instance()->server("HTTP_USER_AGENT") ?>",
-      "csrf": "<?= $csrf ?>"
-    },
-    file_size_limit: "<?= ini_get("upload_max_filesize") ? num::convert_to_bytes(ini_get("upload_max_filesize"))."B" : "100MB" ?>",
+    flash_url: "<?= url::file("lib/swfupload/swfupload.swf")->for_js() ?>",
+    upload_url: "<?= url::site("simple_uploader/add_photo/$item->id")->for_js() ?>",
+    post_params: <?= json_encode(array(
+      "g3sid" => Session::instance()->id(),
+      "user_agent" => Input::instance()->server("HTTP_USER_AGENT"),
+      "csrf" => $csrf)) ?>,
+    file_size_limit: "<?= SafeString::of(ini_get("upload_max_filesize") ? num::convert_to_bytes(ini_get("upload_max_filesize"))."B" : "100MB")->for_js() ?>",
     file_types: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4",
-    file_types_description: "<?= t("Photos and Movies") ?>",
+    file_types_description: "<?= t("Photos and Movies")->for_js() ?>",
     file_upload_limit: 1000,
     file_queue_limit: 0,
     custom_settings: { },
     debug: false,
 
     // Button settings
-    button_image_url: "<?= url::file("themes/default/images/select-photos-backg.png") ?>",
+    button_image_url: "<?= url::file("themes/default/images/select-photos-backg.png")->for_js() ?>",
     button_width: "202",
     button_height: "45",
     button_placeholder_id: "gChooseFilesButtonPlaceholder",
-    button_text: '<span class="swfUploadFont"><?= t("Select photos...") ?></span>',
+    button_text: <?= json_encode('<span class="swfUploadFont">' . t("Select photos...") . '</span>') ?>,
     button_text_style: ".swfUploadFont { color: #2E6E9E; font-size: 16px; font-family: Lucida Grande,Lucida Sans,Arial,sans-serif; font-weight: bold; }",
     button_text_left_padding: 30,
     button_text_top_padding: 10,
@@ -146,13 +145,13 @@
   function file_queued(file) {
     var fp = new File_Progress(file);
     fp.title.html(file.name);
-    fp.set_status("pending", "<?= t("Pending...") ?>");
+    fp.set_status("pending", "<?= t("Pending...")->for_js() ?>");
     // @todo add cancel button to call this.cancelUpload(file.id)
   }
 
   function file_queue_error(file, error_code, message) {
     if (error_code === SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED) {
-      alert("<?= t("You have attempted to queue too many files.") ?>");
+      alert("<?= t("You have attempted to queue too many files.")->for_js() ?>");
       return;
     }
 
@@ -160,20 +159,20 @@
     switch (error_code) {
     case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
       fp.title.html(file.name);
-      fp.set_status("error", "<?= t("<strong>File is too big.</strong> A likely error source is a too low value for <em>upload_max_filesize</em> (%upload_max_filesize) in your <em>php.ini</em>.", array("upload_max_filesize" => ini_get("upload_max_filesize"))) ?>");
+      fp.set_status("error", "<?= t("<strong>File is too big.</strong> A likely error source is a too low value for <em>upload_max_filesize</em> (%upload_max_filesize) in your <em>php.ini</em>.", array("upload_max_filesize" => ini_get("upload_max_filesize")))->for_js() ?>");
       break;
     case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
       fp.title.html(file.name);
-      fp.set_status("error", "<?= t("Cannot upload empty files.") ?>");
+      fp.set_status("error", "<?= t("Cannot upload empty files.")->for_js() ?>");
       break;
     case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:
       fp.title.html(file.name);
-      fp.set_status("error", "<?= t("Invalid file type.") ?>");
+      fp.set_status("error", "<?= t("Invalid file type.")->for_js() ?>");
       break;
     default:
       if (file !== null) {
         fp.title.html(file.name);
-        fp.set_status("error", "<?= t("Unknown error") ?>");
+        fp.set_status("error", "<?= t("Unknown error")->for_js() ?>");
       }
       break;
     }
@@ -194,7 +193,7 @@
     // no uploadProgress events are called (limitation in the Linux Flash VM).
     var fp = new File_Progress(file);
     fp.title.html(file.name);
-    fp.set_status("uploading", "<?= t("Uploading...") ?>");
+    fp.set_status("uploading", "<?= t("Uploading...")->for_js() ?>");
     $("#gAddPhotosCanvas").scrollTo(fp.box, 1000);
     return true;
     // @todo add cancel button to call this.cancelUpload(file.id)
@@ -203,7 +202,7 @@
   function upload_progress(file, bytes_loaded, bytes_total) {
     var percent = Math.ceil((bytes_loaded / bytes_total) * 100);
     var fp = new File_Progress(file);
-    fp.set_status("uploading", "<?= t("Uploading...") ?>");
+    fp.set_status("uploading", "<?= t("Uploading...")->for_js() ?>");
     fp.progress_bar.css("visibility", "visible");
     fp.progress_bar.progressbar("value", percent);
   }
@@ -211,42 +210,42 @@
   function upload_success(file, serverData) {
     var fp = new File_Progress(file);
     fp.progress_bar.progressbar("value", 100);
-    fp.set_status("complete", "<?= t("Complete.") ?>");
+    fp.set_status("complete", "<?= t("Complete.")->for_js() ?>");
   }
 
   function upload_error(file, error_code, message) {
     var fp = new File_Progress(file);
     switch (error_code) {
     case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:
-      fp.set_status("error", "<?= t("Upload error: ") ?>" + message);
+      fp.set_status("error", "<?= t("Upload error: ")->for_js() ?>" + message);
       break;
     case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:
-      fp.set_status("error", "<?= t("Upload failed") ?>");
+      fp.set_status("error", "<?= t("Upload failed")->for_js() ?>");
       break;
     case SWFUpload.UPLOAD_ERROR.IO_ERROR:
-      fp.set_status("error", "<?= t("Server error") ?>");
+      fp.set_status("error", "<?= t("Server error")->for_js() ?>");
       break;
     case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:
-      fp.set_status("error", "<?= t("Security error") ?>");
+      fp.set_status("error", "<?= t("Security error")->for_js() ?>");
       break;
     case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:
-      fp.set_status("error", "<?= t("Upload limit exceeded") ?>");
+      fp.set_status("error", "<?= t("Upload limit exceeded")->for_js() ?>");
       break;
     case SWFUpload.UPLOAD_ERROR.FILE_VALIDATION_FAILED:
-      fp.set_status("error", "<?= t("Failed validation.  File skipped") ?>");
+      fp.set_status("error", "<?= t("Failed validation.  File skipped")->for_js() ?>");
       break;
     case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:
       // If there aren't any files left (they were all cancelled) disable the cancel button
       if (this.getStats().files_queued === 0) {
         $("#gUploadCancel").hide();
       }
-      fp.set_status("error", "<?= t("Cancelled") ?>");
+      fp.set_status("error", "<?= t("Cancelled")->for_js() ?>");
       break;
     case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:
-      fp.set_status("error", "<?= t("Stopped") ?>");
+      fp.set_status("error", "<?= t("Stopped")->for_js() ?>");
       break;
     default:
-      fp.set_status("error", "<?= t("Unknown error: ") ?>" + error_code);
+      fp.set_status("error", "<?= t("Unknown error: ")->for_js() ?>" + error_code);
       break;
     }
   }
@@ -260,7 +259,7 @@
   }
 
   function get_completed_status_msg(stats) {
-    var msg = "<?= t("Upload Queue (completed %completed of %total)", array("completed" => "__COMPLETED__", "total" => "__TOTAL__")) ?>";
+    var msg = "<?= t("Upload Queue (completed %completed of %total)", array("completed" => "__COMPLETED__", "total" => "__TOTAL__"))->for_js() ?>";
     msg = msg.replace("__COMPLETED__", stats.successful_uploads);
     msg = msg.replace("__TOTAL__", stats.files_queued + stats.successful_uploads +
       stats.upload_errors + stats.upload_cancelled + stats.queue_errors);
@@ -269,7 +268,7 @@
 
   // This event comes from the Queue Plugin
   function queue_complete(num_files_uploaded) {
-    var status_msg = "<?= t("Uploaded: __COUNT__") ?>";
+    var status_msg = "<?= t("Uploaded: __COUNT__")->for_js() ?>";
     $("#gUploadStatus").html(status_msg.replace("__COUNT__", num_files_uploaded));
   }
 </script>
diff --git a/modules/organize/views/organize.html.php b/modules/organize/views/organize.html.php
index 1182a887..d2f0aa8c 100644
--- a/modules/organize/views/organize.html.php
+++ b/modules/organize/views/organize.html.php
@@ -1,16 +1,16 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <!-- ?= html::script("modules/organize/js/organize.js") ? -->
 <script>
-  var FATAL_ERROR = "<?= t("Fatal Error") ?>";
-  var PAUSE_BUTTON = "<?= t("Pause") ?>";
-  var RESUME_BUTTON = "<?= t("Resume") ?>";
-  var CANCEL_BUTTON = "<?= t("Cancel") ?>";
-  var INVALID_DROP_TARGET = "<div class=\"gError\"><?= t("Drop cancelled as it would result in a recursive move") ?></div>";
-var CONFIRM_DELETE = "<?= t("Do you really want to delete the selected albums and/or photos") ?>"
+  var FATAL_ERROR = "<?= t("Fatal Error")->for_js() ?>";
+  var PAUSE_BUTTON = "<?= t("Pause")->for_js() ?>";
+  var RESUME_BUTTON = "<?= t("Resume"->for_js()) ?>";
+  var CANCEL_BUTTON = "<?= t("Cancel")->for_js() ?>";
+  var INVALID_DROP_TARGET = "<div class=\"gError\"><?= t("Drop cancelled as it would result in a recursive move")->for_js() ?></div>";
+var CONFIRM_DELETE = "<?= t("Do you really want to delete the selected albums and/or photos")->for_js() ?>"
   var item_id = <?= $item->id ?>;
 
-  var csrf = "<?= $csrf ?>";
-  var rearrangeUrl = "<?= url::site("__URI__/__ITEM_ID____TASK_ID__?csrf=$csrf") ?>";
+  var csrf = <?= json_encode($csrf) ?>;
+  var rearrangeUrl = "<?= url::site("__URI__/__ITEM_ID____TASK_ID__?csrf=$csrf")->for_js() ?>";
   $("#doc3").ready(function() {
     organize_dialog_init();
   });
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index d27f9260..61821428 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -23,7 +23,7 @@
    <?= $theme->script("gallery.common.js") ?>
    <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
    <script type="text/javascript">
-   var MSG_CANCEL = "<?= t('Cancel') ?>";
+   var MSG_CANCEL = "<?= t('Cancel')->for_js() ?>";
    </script>
    <?= $theme->script("gallery.dialog.js") ?>
    <?= $theme->script("superfish/js/superfish.js") ?>
diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
index 1f25a626..75d51eff 100644
--- a/themes/default/views/movie.html.php
+++ b/themes/default/views/movie.html.php
@@ -20,7 +20,7 @@
   </div>
 
   <script type="text/javascript">
-    var ADD_A_COMMENT = "<?= t("Add a comment") ?>";
+    var ADD_A_COMMENT = "<?= t("Add a comment")->for_js() ?>";
   </script>
   <?= $theme->photo_bottom() ?>
 </div>
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index ea2be37b..8d9f0caa 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -51,7 +51,7 @@
     <?= $theme->script("gallery.common.js") ?>
     <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
     <script type="text/javascript">
-    var MSG_CANCEL = "<?= t('Cancel') ?>";
+    var MSG_CANCEL = "<?= t('Cancel')->for_js() ?>";
     </script>
     <?= $theme->script("gallery.dialog.js") ?>
     <?= $theme->script("gallery.form.js") ?>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index 1f92e9ba..fcf597cf 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -5,7 +5,7 @@
 <script>
   $(document).ready(function() {
     $(".gFullSizeLink").click(function() {
-      show_full_size("<?= $theme->item()->file_url() ?>", "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
+      show_full_size("<?= $theme->item()->file_url()->for_js() ?>", "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
       return false;
     });
   });
@@ -55,7 +55,7 @@
   </div>
 
   <script type="text/javascript">
-    var ADD_A_COMMENT = "<?= t("Add a comment") ?>";
+    var ADD_A_COMMENT = "<?= t("Add a comment")->for_js() ?>";
   </script>
   <?= $theme->photo_bottom() ?>
 </div>
-- 
cgit v1.2.3


From b9bd1681a3b1496c0f1bbe5e6254ab4fd0c9fe30 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Sat, 29 Aug 2009 22:54:20 -0700
Subject: Update all code to use helper method html::clean(), html::purify(),
 ... instead of SafeString directly.

---
 modules/comment/controllers/comments.php                   |  8 ++++----
 modules/comment/helpers/comment_rss.php                    |  8 ++++----
 modules/comment/views/admin_block_recent_comments.html.php |  6 +++---
 modules/comment/views/admin_comments.html.php              | 10 +++++-----
 modules/comment/views/comment.html.php                     |  6 +++---
 modules/comment/views/comment.mrss.php                     | 12 ++++++------
 modules/comment/views/comments.html.php                    |  6 +++---
 modules/digibug/controllers/digibug.php                    |  2 +-
 modules/exif/views/exif_dialog.html.php                    |  4 ++--
 modules/g2_import/helpers/g2_import.php                    |  2 +-
 modules/gallery/controllers/admin_advanced_settings.php    |  2 +-
 modules/gallery/controllers/quick.php                      | 10 +++++-----
 modules/gallery/helpers/MY_html.php                        |  4 ++--
 modules/gallery/helpers/gallery_rss.php                    |  4 ++--
 modules/gallery/helpers/gallery_task.php                   |  4 ++--
 modules/gallery/tests/Html_Helper_Test.php                 |  4 ++--
 modules/gallery/tests/Xss_Security_Test.php                |  4 ++--
 modules/gallery/views/admin_advanced_settings.html.php     |  6 +++---
 modules/gallery/views/admin_block_log_entries.html.php     |  2 +-
 modules/gallery/views/admin_block_photo_stream.html.php    |  4 ++--
 modules/gallery/views/admin_languages.html.php             |  4 ++--
 modules/gallery/views/admin_maintenance.html.php           |  4 ++--
 modules/gallery/views/admin_maintenance_show_log.html.php  |  2 +-
 modules/gallery/views/move_tree.html.php                   |  8 ++++----
 modules/gallery/views/permissions_browse.html.php          |  4 ++--
 modules/gallery/views/permissions_form.html.php            |  2 +-
 modules/gallery/views/simple_uploader.html.php             | 14 +++++++-------
 modules/info/views/info_block.html.php                     | 10 +++++-----
 modules/notification/views/comment_published.html.php      | 12 ++++++------
 modules/notification/views/item_added.html.php             |  8 ++++----
 modules/notification/views/item_deleted.html.php           |  6 +++---
 modules/notification/views/item_updated.html.php           | 12 ++++++------
 modules/organize/views/organize_dialog.html.php            |  2 +-
 modules/organize/views/organize_tree.html.php              |  6 +++---
 modules/rss/views/feed.mrss.php                            | 14 +++++++-------
 modules/rss/views/rss_block.html.php                       |  2 +-
 modules/search/views/search.html.php                       |  6 +++---
 modules/server_add/views/admin_server_add.html.php         |  2 +-
 modules/server_add/views/server_add_tree.html.php          |  4 ++--
 modules/server_add/views/server_add_tree_dialog.html.php   |  6 +++---
 modules/tag/controllers/admin_tags.php                     |  2 +-
 modules/tag/views/admin_tags.html.php                      |  6 +++---
 modules/tag/views/tag_cloud.html.php                       |  2 +-
 modules/user/controllers/logout.php                        |  2 +-
 modules/user/views/admin_users.html.php                    |  8 ++++----
 modules/user/views/admin_users_group.html.php              |  4 ++--
 modules/user/views/login.html.php                          |  2 +-
 themes/default/views/album.html.php                        |  6 +++---
 themes/default/views/dynamic.html.php                      |  4 ++--
 themes/default/views/header.html.php                       |  4 ++--
 themes/default/views/movie.html.php                        |  4 ++--
 themes/default/views/photo.html.php                        |  6 +++---
 52 files changed, 143 insertions(+), 143 deletions(-)

(limited to 'themes/default/views')

diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php
index 87633f4c..82b12893 100644
--- a/modules/comment/controllers/comments.php
+++ b/modules/comment/controllers/comments.php
@@ -39,9 +39,9 @@ class Comments_Controller extends REST_Controller {
       foreach ($comments as $comment) {
         $data[] = array(
           "id" => $comment->id,
-          "author_name" => SafeString::of($comment->author_name()),
+          "author_name" => html::clean($comment->author_name()),
           "created" => $comment->created,
-          "text" => nl2br(SafeString::purify($comment->text)));
+          "text" => nl2br(html::purify($comment->text)));
       }
       print json_encode($data);
       break;
@@ -126,9 +126,9 @@ class Comments_Controller extends REST_Controller {
         array("result" => "success",
               "data" => array(
                 "id" => $comment->id,
-                "author_name" => SafeString::of($comment->author_name()),
+                "author_name" => html::clean($comment->author_name()),
                 "created" => $comment->created,
-                "text" => nl2br(SafeString::purify($comment->text)))));
+                "text" => nl2br(html::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 4151dcd0..b539887b 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" => SafeString::purify($item->title)));
+        t("Comments on %title", array("title" => html::purify($item->title)));
     }
     return $feeds;
   }
@@ -49,13 +49,13 @@ class comment_rss_Core {
       $item = $comment->item();
       $feed->children[] = new ArrayObject(
         array("pub_date" => date("D, d M Y H:i:s T", $comment->created),
-              "text" => nl2br(SafeString::purify($comment->text)),
+              "text" => nl2br(html::purify($comment->text)),
               "thumb_url" => $item->thumb_url(),
               "thumb_height" => $item->thumb_height,
               "thumb_width" => $item->thumb_width,
               "item_uri" => url::abs_site("{$item->type}s/$item->id"),
-              "title" => SafeString::purify($item->title),
-              "author" => SafeString::of($comment->author_name())),
+              "title" => html::purify($item->title),
+              "author" => html::clean($comment->author_name())),
         ArrayObject::ARRAY_AS_PROPS);
     }
 
diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php
index 2c7a5cf1..dc3975e0 100644
--- a/modules/comment/views/admin_block_recent_comments.html.php
+++ b/modules/comment/views/admin_block_recent_comments.html.php
@@ -4,13 +4,13 @@
   <li class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
     <img src="<?= $comment->author()->avatar_url(32, $theme->url("images/avatar.jpg", true)) ?>"
          class="gAvatar"
-         alt="<?= SafeString::of($comment->author_name()) ?>"
+         alt="<?= html::clean($comment->author_name()) ?>"
          width="32"
          height="32" />
     <?= gallery::date_time($comment->created) ?>
     <?= t('<a href="#">%author_name</a> said <em>%comment_text</em>',
-          array("author_name" => SafeString::of($comment->author_name()),
-                "comment_text" => text::limit_words(nl2br(SafeString::purify($comment->text)), 50))); ?>
+          array("author_name" => html::clean($comment->author_name()),
+                "comment_text" => text::limit_words(nl2br(html::purify($comment->text)), 50))); ?>
   </li>
   <? endforeach ?>
 </ul>
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 8b0b4c29..801ce2b3 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -108,12 +108,12 @@
         <a href="#">
           <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
                class="gAvatar"
-               alt="<?= SafeString::of($comment->author_name()) ?>"
+               alt="<?= html::clean($comment->author_name()) ?>"
                width="40"
                height="40" />
         </a>
-        <p><a href="mailto:<?= SafeString::of($comment->author_email()) ?>"
-              title="<?= SafeString::of($comment->author_email()) ?>"> <?= SafeString::of($comment->author_name()) ?> </a></p>
+        <p><a href="mailto:<?= html::clean($comment->author_email()) ?>"
+              title="<?= html::clean($comment->author_email()) ?>"> <?= html::clean($comment->author_name()) ?> </a></p>
       </td>
       <td>
         <div class="right">
@@ -122,7 +122,7 @@
             <a href="<?= $item->url() ?>">
               <? if ($item->has_thumb()): ?>
               <img src="<?= $item->thumb_url() ?>"
-                 alt="<?= SafeString::purify($item->title) ?>"
+                 alt="<?= html::purify($item->title) ?>"
                  <?= photo::img_dimensions($item->thumb_width, $item->thumb_height, 75) ?>
               />
               <? else: ?>
@@ -132,7 +132,7 @@
           </div>
         </div>
         <p><?= gallery::date($comment->created) ?></p>
-           <?= nl2br(SafeString::purify($comment->text)) ?>
+           <?= nl2br(html::purify($comment->text)) ?>
       </td>
       <td>
         <ul class="gButtonSetVertical">
diff --git a/modules/comment/views/comment.html.php b/modules/comment/views/comment.html.php
index 31bb7f4d..1d0786cb 100644
--- a/modules/comment/views/comment.html.php
+++ b/modules/comment/views/comment.html.php
@@ -4,15 +4,15 @@
     <a href="#">
       <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
            class="gAvatar"
-           alt="<?= SafeString::of($comment->author_name()) ?>"
+           alt="<?= html::clean($comment->author_name()) ?>"
            width="40"
            height="40" />
     </a>
     <?= t("on %date_time, %author_name said",
           array("date_time" => gallery::date_time($comment->created),
-                "author_name" => SafeString::of($comment->author_name()))) ?>
+                "author_name" => html::clean($comment->author_name()))) ?>
   </p>
   <div>
-  <?= nl2br(SafeString::purify($comment->text)) ?>
+  <?= nl2br(html::purify($comment->text)) ?>
   </div>
 </li>
diff --git a/modules/comment/views/comment.mrss.php b/modules/comment/views/comment.mrss.php
index ae7762d9..c2a4b538 100644
--- a/modules/comment/views/comment.mrss.php
+++ b/modules/comment/views/comment.mrss.php
@@ -6,9 +6,9 @@
    xmlns:fh="http://purl.org/syndication/history/1.0">
   <channel>
     <generator>Gallery 3</generator>
-    <title><?= SafeString::of($feed->title) ?></title>
+    <title><?= html::clean($feed->title) ?></title>
     <link><?= $feed->uri ?></link>
-    <description><?= SafeString::of($feed->description) ?></description>
+    <description><?= html::clean($feed->description) ?></description>
     <language>en-us</language>
     <atom:link rel="self" href="<?= $feed->uri ?>" type="application/rss+xml" />
     <fh:complete/>
@@ -22,14 +22,14 @@
     <lastBuildDate><?= $pub_date ?></lastBuildDate>
     <? foreach ($feed->children as $child): ?>
     <item>
-      <title><?= SafeString::purify($child->title) ?></title>
-      <link><?= SafeString::of($child->item_uri) ?></link>
-      <author><?= SafeString::of($child->author) ?></author>
+      <title><?= html::purify($child->title) ?></title>
+      <link><?= html::clean($child->item_uri) ?></link>
+      <author><?= html::clean($child->author) ?></author>
       <guid isPermaLink="true"><?= $child->item_uri ?></guid>
       <pubDate><?= $child->pub_date ?></pubDate>
       <content:encoded>
         <![CDATA[
-          <p><?= nl2br(SafeString::purify($child->text)) ?></p>
+          <p><?= nl2br(html::purify($child->text)) ?></p>
           <p>
             <img alt="" src="<?= $child->thumb_url ?>"
                  height="<?= $child->thumb_height ?>" width="<?= $child->thumb_width ?>" />
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index 9eac0502..1e45c946 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -18,16 +18,16 @@
       <a href="#">
         <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
              class="gAvatar"
-             alt="<?= SafeString::of($comment->author_name()) ?>"
+             alt="<?= html::clean($comment->author_name()) ?>"
              width="40"
              height="40" />
       </a>
       <?= t('on %date <a href="#">%name</a> said',
             array("date" => date("Y-M-d H:i:s", $comment->created),
-                  "name" => SafeString::of($comment->author_name()))); ?>
+                  "name" => html::clean($comment->author_name()))); ?>
     </p>
     <div>
-      <?= nl2br(SafeString::purify($comment->text)) ?>
+      <?= nl2br(html::purify($comment->text)) ?>
     </div>
   </li>
   <? endforeach ?>
diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index 509a8b70..0939704b 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -50,7 +50,7 @@ class Digibug_Controller extends Controller {
       "image_width_1" => $item->width,
       "thumb_height_1" => $item->thumb_height,
       "thumb_width_1" => $item->thumb_width,
-      "title_1" => SafeString::purify($item->title));
+      "title_1" => html::purify($item->title));
 
     print $v;
   }
diff --git a/modules/exif/views/exif_dialog.html.php b/modules/exif/views/exif_dialog.html.php
index a981ca09..11d1e212 100644
--- a/modules/exif/views/exif_dialog.html.php
+++ b/modules/exif/views/exif_dialog.html.php
@@ -14,14 +14,14 @@
          <?= $details[$i]["caption"] ?>
          </td>
          <td class="gOdd">
-         <?= SafeString::of($details[$i]["value"]) ?>
+         <?= html::clean($details[$i]["value"]) ?>
          </td>
          <? if (!empty($details[++$i])): ?>
            <td class="gEven">
            <?= $details[$i]["caption"] ?>
            </td>
            <td class="gOdd">
-           <?= SafeString::of($details[$i]["value"]) ?>
+           <?= html::clean($details[$i]["value"]) ?>
            </td>
          <? else: ?>
            <td class="gEven"></td><td class="gOdd"></td>
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index a01ca1db..7e5c6f75 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -590,7 +590,7 @@ class g2_import_Core {
     self::map($g2_comment->getId(), $comment->id);
     return t("Imported comment '%comment' for item with id: %id",
              array("id" => $comment->item_id,
-                   "comment" => text::limit_words(nl2br(SafeString::purify($comment->text)), 50)));
+                   "comment" => text::limit_words(nl2br(html::purify($comment->text)), 50)));
   }
 
   /**
diff --git a/modules/gallery/controllers/admin_advanced_settings.php b/modules/gallery/controllers/admin_advanced_settings.php
index d727b654..43c77340 100644
--- a/modules/gallery/controllers/admin_advanced_settings.php
+++ b/modules/gallery/controllers/admin_advanced_settings.php
@@ -46,7 +46,7 @@ class Admin_Advanced_Settings_Controller extends Admin_Controller {
     module::set_var($module_name, $var_name, Input::instance()->post("value"));
     message::success(
       t("Saved value for %var (%module_name)",
-        array("var" => SafeString::of($var_name), "module_name" => $module_name)));
+        array("var" => html::clean($var_name), "module_name" => $module_name)));
 
     print json_encode(array("result" => "success"));
   }
diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index 8fddb563..20731f9c 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -75,7 +75,7 @@ class Quick_Controller extends Controller {
     access::required("view", $item->parent());
     access::required("edit", $item->parent());
 
-    $msg = t("Made <b>%title</b> this album's cover", array("title" => SafeString::purify($item->title)));
+    $msg = t("Made <b>%title</b> this album's cover", array("title" => html::purify($item->title)));
 
     item::make_album_cover($item);
     message::success($msg);
@@ -91,10 +91,10 @@ class Quick_Controller extends Controller {
     if ($item->is_album()) {
       print t(
         "Delete the album <b>%title</b>? All photos and movies in the album will also be deleted.",
-        array("title" => SafeString::purify($item->title)));
+        array("title" => html::purify($item->title)));
     } else {
       print t("Are you sure you want to delete <b>%title</b>?",
-              array("title" => SafeString::purify($item->title)));
+              array("title" => html::purify($item->title)));
     }
 
     $form = item::get_delete_form($item);
@@ -108,9 +108,9 @@ class Quick_Controller extends Controller {
     access::required("edit", $item);
 
     if ($item->is_album()) {
-      $msg = t("Deleted album <b>%title</b>", array("title" => SafeString::purify($item->title)));
+      $msg = t("Deleted album <b>%title</b>", array("title" => html::purify($item->title)));
     } else {
-      $msg = t("Deleted photo <b>%title</b>", array("title" => SafeString::purify($item->title)));
+      $msg = t("Deleted photo <b>%title</b>", array("title" => html::purify($item->title)));
     }
 
     $parent = $item->parent();
diff --git a/modules/gallery/helpers/MY_html.php b/modules/gallery/helpers/MY_html.php
index eb388811..75114898 100644
--- a/modules/gallery/helpers/MY_html.php
+++ b/modules/gallery/helpers/MY_html.php
@@ -65,11 +65,11 @@ class html extends html_Core {
    *
    * Example:<pre>
    *   <script type="text/javascript>"
-   *     var some_js_var = "<?= html::escape_for_js($php_var) ?>";
+   *     var some_js_var = "<?= html::clean_js($php_var) ?>";
    *   </script>
    * </pre>
    */
-  static function escape_for_js($string) {
+  static function clean_js($string) {
     return SafeString::of($string)->for_js();
   }
 
diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index affb3101..dee6ae40 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -53,9 +53,9 @@ class gallery_rss_Core {
         ->descendants($limit, $offset, array("type" => "photo"));
       $feed->max_pages = ceil(
         $item->viewable()->descendants_count(array("type" => "photo")) / $limit);
-      $feed->title = SafeString::purify($item->title);
+      $feed->title = html::purify($item->title);
       $feed->link = url::abs_site("albums/{$item->id}");
-      $feed->description = nl2br(SafeString::purify($item->description));
+      $feed->description = nl2br(html::purify($item->description));
 
       return $feed;
     }
diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index 8c0e8aa8..c9557324 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -64,10 +64,10 @@ class gallery_task_Core {
           if (!$success) {
             $ignored[$item->id] = 1;
             $errors[] = t("Unable to rebuild images for '%title'",
-                          array("title" => SafeString::purify($item->title)));
+                          array("title" => html::purify($item->title)));
           } else {
             $errors[] = t("Successfully rebuilt images for '%title'",
-                          array("title" => SafeString::purify($item->title)));
+                          array("title" => html::purify($item->title)));
           }
         }
 
diff --git a/modules/gallery/tests/Html_Helper_Test.php b/modules/gallery/tests/Html_Helper_Test.php
index 4d934ad5..a9903256 100644
--- a/modules/gallery/tests/Html_Helper_Test.php
+++ b/modules/gallery/tests/Html_Helper_Test.php
@@ -40,8 +40,8 @@ class Html_Helper_Test extends Unit_Test_Case {
 			$safe_string_2);
   }
 
-  public function escape_for_js_test() {
-    $string = html::escape_for_js("hello's <p  >world</p>");
+  public function clean_js_test() {
+    $string = html::clean_js("hello's <p  >world</p>");
     $this->assert_equal("hello\\'s <p  >world<\\/p>",
 			$string);
   }
diff --git a/modules/gallery/tests/Xss_Security_Test.php b/modules/gallery/tests/Xss_Security_Test.php
index 8e5f8354..16e5a856 100644
--- a/modules/gallery/tests/Xss_Security_Test.php
+++ b/modules/gallery/tests/Xss_Security_Test.php
@@ -151,7 +151,7 @@ class Xss_Security_Test extends Unit_Test_Case {
 	    if (self::_token_matches(array(T_DOUBLE_COLON, "::"), $tokens, $token_number + 1) &&
 		self::_token_matches(array(T_STRING), $tokens, $token_number + 2) &&
 		in_array($tokens[$token_number + 2][1],
-			 array("clean", "purify", "escape_for_js", "clean_attribute_test")) &&
+			 array("clean", "purify", "clean_js", "clean_attribute")) &&
 		self::_token_matches("(", $tokens, $token_number + 3)) {
               // Not checking for mark_safe(). We want such calls to be marked dirty (thus reviewed).
 
@@ -161,7 +161,7 @@ class Xss_Security_Test extends Unit_Test_Case {
 	      $token_number += 3;
 	      $token = $tokens[$token_number];
 
-              if ("escape_for_js" == $method) {
+              if ("clean_js" == $method) {
                 $frame->is_safe_js(true);
               } else {
                 $frame->is_safe_html(true);
diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index adc15b91..4235e8f8 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -20,13 +20,13 @@
     <? if ($var->module_name == "gallery" && $var->name == "_cache") continue ?>
     <tr class="setting">
       <td> <?= $var->module_name ?> </td>
-      <td> <?= SafeString::of($var->name) ?> </td>
+      <td> <?= html::clean($var->name) ?> </td>
       <td>
-        <a href="<?= url::site("admin/advanced_settings/edit/$var->module_name/" . SafeString::of($var->name)) ?>"
+        <a href="<?= url::site("admin/advanced_settings/edit/$var->module_name/" . html::clean($var->name)) ?>"
           class="gDialogLink"
           title="<?= t("Edit %var (%module_name)", array("var" => $var->name, "module_name" => $var->module_name)) ?>">
           <? if ($var->value): ?>
-          <?= SafeString::of($var->value) ?>
+          <?= html::clean($var->value) ?>
           <? else: ?>
           <i> <?= t("empty") ?> </i>
           <? endif ?>
diff --git a/modules/gallery/views/admin_block_log_entries.html.php b/modules/gallery/views/admin_block_log_entries.html.php
index b7afb22d..780ff2d0 100644
--- a/modules/gallery/views/admin_block_log_entries.html.php
+++ b/modules/gallery/views/admin_block_log_entries.html.php
@@ -2,7 +2,7 @@
 <ul>
   <? foreach ($entries as $entry): ?>
   <li class="<?= log::severity_class($entry->severity) ?>" style="direction: ltr">
-    <a href="<?= url::site("user/$entry->user_id") ?>"><?= SafeString::of($entry->user->name) ?></a>
+    <a href="<?= url::site("user/$entry->user_id") ?>"><?= html::clean($entry->user->name) ?></a>
     <?= gallery::date_time($entry->timestamp) ?>
     <?= $entry->message ?>
     <?= $entry->html ?>
diff --git a/modules/gallery/views/admin_block_photo_stream.html.php b/modules/gallery/views/admin_block_photo_stream.html.php
index 732bdc38..a50836ad 100644
--- a/modules/gallery/views/admin_block_photo_stream.html.php
+++ b/modules/gallery/views/admin_block_photo_stream.html.php
@@ -2,9 +2,9 @@
 <ul>
 <? foreach ($photos as $photo): ?>
   <li class="gItem gPhoto">
-    <a href="<?= url::site("photos/$photo->id") ?>" title="<?= SafeString::of($photo->title) ?>">
+    <a href="<?= url::site("photos/$photo->id") ?>" title="<?= html::clean($photo->title) ?>">
       <img <?= photo::img_dimensions($photo->width, $photo->height, 72) ?>
-        src="<?= $photo->thumb_url() ?>" alt="<?= SafeString::of($photo->title) ?>" />
+        src="<?= $photo->thumb_url() ?>" alt="<?= html::clean($photo->title) ?>" />
     </a>
   </li>
 <? endforeach ?>
diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php
index 4bee9bb1..052d749b 100644
--- a/modules/gallery/views/admin_languages.html.php
+++ b/modules/gallery/views/admin_languages.html.php
@@ -40,7 +40,7 @@
   </form>
 	
 	<script type="text/javascript">
-    var old_default_locale = "<?= SafeString::of($default_locale)->for_js() ?>";
+    var old_default_locale = "<?= html::escape_for_js($default_locale) ?>";
     
     $("input[name='installed_locales[]']").change(function (event) {
       if (this.checked) {
@@ -57,7 +57,7 @@
       dataType: "json",
       success: function(data) {
         if (data.result == "success") {
-          el = $('<a href="<?= url::site("admin/maintenance/start/gallery_task::update_l10n?csrf=$csrf")->for_js() ?>"></a>'); // this is a little hack to trigger the update_l10n task in a dialog
+          el = $('<a href="<?= html::escape_for_js(url::site("admin/maintenance/start/gallery_task::update_l10n?csrf=$csrf")) ?>"></a>'); // this is a little hack to trigger the update_l10n task in a dialog
           el.gallery_dialog();
           el.trigger('click');
         }
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index a1f7b126..05bc0923 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -93,7 +93,7 @@
           <?= $task->status ?>
         </td>
         <td>
-          <?= SafeString::of($task->owner()->name) ?>
+          <?= html::clean($task->owner()->name) ?>
         </td>
         <td>
           <? if ($task->state == "stalled"): ?>
@@ -164,7 +164,7 @@
           <?= $task->status ?>
         </td>
         <td>
-          <?= SafeString::of($task->owner()->name) ?>
+          <?= html::clean($task->owner()->name) ?>
         </td>
         <td>
           <? if ($task->done): ?>
diff --git a/modules/gallery/views/admin_maintenance_show_log.html.php b/modules/gallery/views/admin_maintenance_show_log.html.php
index 209aef03..8ea1beb6 100644
--- a/modules/gallery/views/admin_maintenance_show_log.html.php
+++ b/modules/gallery/views/admin_maintenance_show_log.html.php
@@ -12,7 +12,7 @@ appendTo('body').submit().remove();
 <div id="gTaskLogDialog">
   <h1> <?= $task->name ?> </h1>
   <div class="gTaskLog">
-    <pre><?= SafeString::purify($task->get_log()) ?></pre>
+    <pre><?= html::purify($task->get_log()) ?></pre>
   </div>
   <button id="gCloseButton" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Close") ?></button>
   <button id="gSaveButton" class="ui-state-default ui-corner-all" onclick="download()"><?= t("Save") ?></button>
diff --git a/modules/gallery/views/move_tree.html.php b/modules/gallery/views/move_tree.html.php
index 7818a42a..623f80ee 100644
--- a/modules/gallery/views/move_tree.html.php
+++ b/modules/gallery/views/move_tree.html.php
@@ -1,18 +1,18 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?= $parent->thumb_img(array(), 25); ?>
 <? if (!access::can("edit", $parent) || $source->is_descendant($parent)): ?>
-<a href="javascript:load_tree('<?= $parent->id ?>',1)"> <?= SafeString::of($parent->title) ?> <?= t("(locked)") ?> </a>
+<a href="javascript:load_tree('<?= $parent->id ?>',1)"> <?= html::clean($parent->title) ?> <?= t("(locked)") ?> </a>
 <? else: ?>
-<a href="javascript:load_tree('<?= $parent->id ?>',0)"> <?= SafeString::of($parent->title) ?></a>
+<a href="javascript:load_tree('<?= $parent->id ?>',0)"> <?= html::clean($parent->title) ?></a>
 <? endif ?>
 <ul id="tree_<?= $parent->id ?>">
   <? foreach ($children as $child): ?>
   <li id="node_<?= $child->id ?>" class="node">
     <?= $child->thumb_img(array(), 25); ?>
     <? if (!access::can("edit", $child) || $source->is_descendant($child)): ?>
-    <a href="javascript:load_tree('<?= $child->id ?>',1)"> <?= SafeString::of($child->title) ?> <?= t("(locked)") ?></a>
+    <a href="javascript:load_tree('<?= $child->id ?>',1)"> <?= html::clean($child->title) ?> <?= t("(locked)") ?></a>
     <? else: ?>
-    <a href="javascript:load_tree('<?= $child->id ?>',0)"> <?= SafeString::of($child->title) ?> </a>
+    <a href="javascript:load_tree('<?= $child->id ?>',0)"> <?= html::clean($child->title) ?> </a>
     <? endif ?>
   </li>
   <? endforeach ?>
diff --git a/modules/gallery/views/permissions_browse.html.php b/modules/gallery/views/permissions_browse.html.php
index 90970112..d9395b3f 100644
--- a/modules/gallery/views/permissions_browse.html.php
+++ b/modules/gallery/views/permissions_browse.html.php
@@ -39,13 +39,13 @@
     <? foreach ($parents as $parent): ?>
     <li id="item-<?= $parent->id ?>">
       <a href="javascript:show(<?= $parent->id ?>)">
-        <?= SafeString::purify($parent->title) ?>
+        <?= html::purify($parent->title) ?>
       </a>
     </li>
     <? endforeach ?>
     <li class="active" id="item-<?= $item->id ?>">
       <a href="javascript:show(<?= $item->id ?>)">
-    	<?= SafeString::purify($item->title) ?>
+    	<?= html::purify($item->title) ?>
       </a>
     </li>
   </ul>
diff --git a/modules/gallery/views/permissions_form.html.php b/modules/gallery/views/permissions_form.html.php
index adc0496f..e6b217c5 100644
--- a/modules/gallery/views/permissions_form.html.php
+++ b/modules/gallery/views/permissions_form.html.php
@@ -6,7 +6,7 @@
     <tr>
       <th> </th>
       <? foreach ($groups as $group): ?>
-      <th> <?= SafeString::of($group->name) ?> </th>
+      <th> <?= html::clean($group->name) ?> </th>
       <? endforeach ?>
     </tr>
 
diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index 1f185780..b136972a 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -6,7 +6,7 @@
 <!-- hack to set the title for the dialog -->
 <form id="gAddPhotosForm" action="<?= url::site("simple_uploader/finish?csrf=$csrf") ?>">
   <fieldset>
-    <legend> <?= t("Add photos to %album_title", array("album_title" => SafeString::purify($item->title))) ?> </legend>
+    <legend> <?= t("Add photos to %album_title", array("album_title" => html::purify($item->title))) ?> </legend>
   </fieldset>
 </form>
 
@@ -26,9 +26,9 @@
   </p>
   <ul class="gBreadcrumbs">
     <? foreach ($item->parents() as $parent): ?>
-    <li> <?= SafeString::of($parent->title) ?> </li>
+    <li> <?= html::clean($parent->title) ?> </li>
     <? endforeach ?>
-    <li class="active"> <?= SafeString::purify($item->title) ?> </li>
+    <li class="active"> <?= html::purify($item->title) ?> </li>
   </ul>
 
   <p>
@@ -82,13 +82,13 @@
 
 <script type="text/javascript">
   var swfu = new SWFUpload({
-    flash_url: "<?= url::file("lib/swfupload/swfupload.swf")->for_js() ?>",
-    upload_url: "<?= url::site("simple_uploader/add_photo/$item->id")->for_js() ?>",
+    flash_url: "<?= html::escape_for_js(url::file("lib/swfupload/swfupload.swf")) ?>",
+    upload_url: "<?= html::escape_for_js(url::site("simple_uploader/add_photo/$item->id")) ?>",
     post_params: <?= json_encode(array(
       "g3sid" => Session::instance()->id(),
       "user_agent" => Input::instance()->server("HTTP_USER_AGENT"),
       "csrf" => $csrf)) ?>,
-    file_size_limit: "<?= SafeString::of(ini_get("upload_max_filesize") ? num::convert_to_bytes(ini_get("upload_max_filesize"))."B" : "100MB")->for_js() ?>",
+    file_size_limit: "<?= html::escape_for_js(ini_get("upload_max_filesize") ? num::convert_to_bytes(ini_get("upload_max_filesize"))."B" : "100MB")) ?>",
     file_types: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4",
     file_types_description: "<?= t("Photos and Movies")->for_js() ?>",
     file_upload_limit: 1000,
@@ -97,7 +97,7 @@
     debug: false,
 
     // Button settings
-    button_image_url: "<?= url::file("themes/default/images/select-photos-backg.png")->for_js() ?>",
+    button_image_url: "<?= html::escape_for_js(url::file("themes/default/images/select-photos-backg.png")) ?>",
     button_width: "202",
     button_height: "45",
     button_placeholder_id: "gChooseFilesButtonPlaceholder",
diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php
index bfaaee99..d8f36984 100644
--- a/modules/info/views/info_block.html.php
+++ b/modules/info/views/info_block.html.php
@@ -2,18 +2,18 @@
 <ul class="gMetadata">
   <li>
     <strong class="caption"><?= t("Title:") ?></strong>
-    <?= SafeString::purify($item->title) ?>
+    <?= html::purify($item->title) ?>
   </li>
   <? if ($item->description): ?>
   <li>
     <strong class="caption"><?= t("Description:") ?></strong>
-     <?= nl2br(SafeString::purify($item->description)) ?>
+     <?= nl2br(html::purify($item->description)) ?>
   </li>
   <? endif ?>
   <? if (!$item->is_album()): ?>
   <li>
     <strong class="caption"><?= t("File name:") ?></strong>
-    <?= SafeString::of($item->name) ?>
+    <?= html::clean($item->name) ?>
   </li>
   <? endif ?>
   <? if ($item->captured): ?>
@@ -26,9 +26,9 @@
   <li>
     <strong class="caption"><?= t("Owner:") ?></strong>
     <? if ($item->owner->url): ?>
-    <a href="<?= $item->owner->url ?>"><?= SafeString::of($item->owner->display_name()) ?></a>
+    <a href="<?= $item->owner->url ?>"><?= html::clean($item->owner->display_name()) ?></a>
     <? else: ?>
-    <?= SafeString::of($item->owner->display_name()) ?>
+    <?= html::clean($item->owner->display_name()) ?>
     <? endif ?>
   </li>
   <? endif ?>
diff --git a/modules/notification/views/comment_published.html.php b/modules/notification/views/comment_published.html.php
index 02daf921..e39e39c6 100644
--- a/modules/notification/views/comment_published.html.php
+++ b/modules/notification/views/comment_published.html.php
@@ -1,26 +1,26 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <html>
   <head>
-    <title><?= SafeString::of($subject) ?> </title>
+    <title><?= html::clean($subject) ?> </title>
   </head>
   <body>
-    <h2><?= SafeString::of($subject) ?></h2>
+    <h2><?= html::clean($subject) ?></h2>
     <table>
       <tr>
         <td><?= t("Comment:") ?></td>
-  <td><?= nl2br(SafeString::purify($comment->text)) ?></td>
+  <td><?= nl2br(html::purify($comment->text)) ?></td>
       </tr>
       <tr>
         <td><?= t("Author Name:") ?></td>
-        <td><?= SafeString::of($comment->author_name()) ?></td>
+        <td><?= html::clean($comment->author_name()) ?></td>
       </tr>
       <tr>
         <td><?= t("Author Email:") ?></td>
-        <td><?= SafeString::of($comment->author_email()) ?></td>
+        <td><?= html::clean($comment->author_email()) ?></td>
       </tr>
       <tr>
         <td><?= t("Author URL:") ?></td>
-        <td><?= SafeString::of($comment->author_url()) ?></td>
+        <td><?= html::clean($comment->author_url()) ?></td>
       </tr>
       <tr>
         <td><?= t("Url:") ?></td>
diff --git a/modules/notification/views/item_added.html.php b/modules/notification/views/item_added.html.php
index 70b8fca4..f697fea6 100644
--- a/modules/notification/views/item_added.html.php
+++ b/modules/notification/views/item_added.html.php
@@ -1,14 +1,14 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <html>
   <head>
-    <title><?= SafeString::of($subject) ?> </title>
+    <title><?= html::clean($subject) ?> </title>
   </head>
   <body>
-    <h2><?= SafeString::of($subject) ?></h2>
+    <h2><?= html::clean($subject) ?></h2>
     <table>
       <tr>
         <td><?= t("Title:") ?></td>
-        <td><?= SafeString::purify($item->title) ?></td>
+        <td><?= html::purify($item->title) ?></td>
       </tr>
       <tr>
         <td><?= t("Url:") ?></td>
@@ -21,7 +21,7 @@
       <? if ($item->description): ?>
       <tr>
         <td><?= t("Description:") ?></td>
-         <td><?= nl2br(SafeString::purify($item->description)) ?></td>
+         <td><?= nl2br(html::purify($item->description)) ?></td>
       </tr>
       <? endif ?>
     </table>
diff --git a/modules/notification/views/item_deleted.html.php b/modules/notification/views/item_deleted.html.php
index e04fc71b..a51782ff 100644
--- a/modules/notification/views/item_deleted.html.php
+++ b/modules/notification/views/item_deleted.html.php
@@ -1,15 +1,15 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <html>
   <head>
-    <title><?= SafeString::of($subject) ?> </title>
+    <title><?= html::clean($subject) ?> </title>
   </head>
   <body>
-    <h2><?= SafeString::of($subject) ?></h2>
+    <h2><?= html::clean($subject) ?></h2>
     <table>
       <tr>
         <td colspan="2">
           <?= t("To view the changed album %title use the link below.",
-              array("title" => SafeString::purify($item->parent()->title))) ?>
+              array("title" => html::purify($item->parent()->title))) ?>
         </td>
       </tr>
       <tr>
diff --git a/modules/notification/views/item_updated.html.php b/modules/notification/views/item_updated.html.php
index c3a4f795..ba03540a 100644
--- a/modules/notification/views/item_updated.html.php
+++ b/modules/notification/views/item_updated.html.php
@@ -1,18 +1,18 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <html>
   <head>
-    <title><?= SafeString::of($subject) ?> </title>
+    <title><?= html::clean($subject) ?> </title>
   </head>
   <body>
-    <h2> <?= SafeString::of($subject) ?> </h2>
+    <h2> <?= html::clean($subject) ?> </h2>
     <table>
       <tr>
         <? if ($item->original("title") != $item->title): ?>
         <td><?= t("New Title:") ?></td>
-        <td><?= SafeString::of($item->title) ?></td>
+        <td><?= html::clean($item->title) ?></td>
         <? else: ?>
         <td><?= t("Title:") ?></td>
-        <td><?= SafeString::of($item->title) ?></td>
+        <td><?= html::clean($item->title) ?></td>
         <? endif ?>
       </tr>
       <tr>
@@ -22,12 +22,12 @@
       <? if ($item->original("description") != $item->description): ?>
       <tr>
         <td><?= t("New Description:") ?></td>
-        <td><?= SafeString::of($item->description) ?></td>
+        <td><?= html::clean($item->description) ?></td>
       </tr>
       <? elseif (!empty($item->description)): ?>
       <tr>
         <td><?= t("Description:") ?></td>
-        <td><?= SafeString::of($item->description) ?></td>
+        <td><?= html::clean($item->description) ?></td>
       </tr>
       <? endif ?>
     </table>
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 27d5b508..857499aa 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -5,7 +5,7 @@
   var sort_order_url = "<?= url::site("organize/sort_order/__ALBUM_ID__/__COL__/__DIR__?csrf=$csrf") ?>";
 </script>
 <div id="gOrganize" class="gDialogPanel">
-  <h1 style="display:none"><?= t("Organize %name", array("name" => SafeString::purify($album->title))) ?></h1>
+  <h1 style="display:none"><?= t("Organize %name", array("name" => html::purify($album->title))) ?></h1>
   <div id="bd">
     <div class="yui-gf">
       <div class="yui-u first">
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 387d5977..5b676889 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -5,7 +5,7 @@
   <span class="ui-icon ui-icon-minus">
   </span>
   <span class="gAlbumText" ref="<?= $parent->id ?>">
-    <?= SafeString::of($parent->title) ?>
+    <?= html::clean($parent->title) ?>
   </span>
   <ul class="ui-icon-plus">
     <? endforeach ?>
@@ -17,7 +17,7 @@
       </span>
       <span class="gAlbumText <?= $peer->id == $album->id ? "selected" : "" ?>"
             ref="<?= $peer->id ?>">
-        <?= SafeString::of($peer->title) ?>
+        <?= html::clean($peer->title) ?>
       </span>
 
       <? if ($peer->id == $album->id): ?>
@@ -29,7 +29,7 @@
           </span>
           <span class="gAlbumText"
                 ref="<?= $child->id ?>">
-            <?= SafeString::of($child->title) ?>
+            <?= html::clean($child->title) ?>
           </span>
         </li>
         <? endforeach ?>
diff --git a/modules/rss/views/feed.mrss.php b/modules/rss/views/feed.mrss.php
index 7298b7f4..731703c7 100644
--- a/modules/rss/views/feed.mrss.php
+++ b/modules/rss/views/feed.mrss.php
@@ -6,9 +6,9 @@
    xmlns:fh="http://purl.org/syndication/history/1.0">
   <channel>
     <generator>gallery3</generator>
-    <title><?= SafeString::of($feed->title) ?></title>
+    <title><?= html::clean($feed->title) ?></title>
     <link><?= $feed->uri ?></link>
-    <description><?= SafeString::of($feed->description) ?></description>
+    <description><?= html::clean($feed->description) ?></description>
     <language>en-us</language>
     <atom:link rel="self" href="<?= $feed->uri ?>" type="application/rss+xml" />
     <fh:complete/>
@@ -22,25 +22,25 @@
     <lastBuildDate><?= $pub_date ?></lastBuildDate>
     <? foreach ($feed->children as $child): ?>
     <item>
-      <title><?= SafeString::of($child->title) ?></title>
+      <title><?= html::clean($child->title) ?></title>
       <link><?= url::abs_site("{$child->type}s/{$child->id}") ?></link>
       <guid isPermaLink="true"><?= url::abs_site("{$child->type}s/{$child->id}") ?></guid>
       <pubDate><?= date("D, d M Y H:i:s T", $child->created); ?></pubDate>
       <content:encoded>
         <![CDATA[
-          <span><?= SafeString::of($child->description) ?></span>
+          <span><?= html::clean($child->description) ?></span>
           <p>
           <? if ($child->type == "photo" || $child->type == "album"): ?>
             <img alt="" src="<?= $child->resize_url(true) ?>"
-                 title="<?= SafeString::of($child->title) ?>"
+                 title="<?= html::clean($child->title) ?>"
                  height="<?= $child->resize_height ?>" width="<?= $child->resize_width ?>" /><br />
           <? else: ?>
             <a href="<?= url::abs_site("{$child->type}s/{$child->id}") ?>">
             <img alt="" src="<?= $child->thumb_url(true) ?>"
-                 title="<?= SafeString::of($child->title) ?>"
+                 title="<?= html::clean($child->title) ?>"
                  height="<?= $child->thumb_height ?>" width="<?= $child->thumb_width ?>" /></a><br />
           <? endif ?>
-            <?= SafeString::of($child->description) ?>
+            <?= html::clean($child->description) ?>
           </p>
         ]]>
       </content:encoded>
diff --git a/modules/rss/views/rss_block.html.php b/modules/rss/views/rss_block.html.php
index cd8db89d..737731b6 100644
--- a/modules/rss/views/rss_block.html.php
+++ b/modules/rss/views/rss_block.html.php
@@ -5,7 +5,7 @@
     <span class="ui-icon-left">
     <a href="<?= rss::url($url) ?>">
       <span class="ui-icon ui-icon-signal-diag"></span>
-      <?= SafeString::purify($title) ?>
+      <?= html::purify($title) ?>
     </a>
     </span>
   </li>
diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php
index e5c7b4a6..7963948d 100644
--- a/modules/search/views/search.html.php
+++ b/modules/search/views/search.html.php
@@ -8,7 +8,7 @@
     <ul>
       <li>
         <label for="q"><?= t("Search the gallery") ?></label>
-        <input name="q" id="q" type="text" value="<?= SafeString::of($q)->for_html_attr() ?>"/>
+        <input name="q" id="q" type="text" value="<?= html::clean_attribute($q) ?>"/>
       </li>
       <li>
         <input type="submit" value="<?= t("Search")->for_html_attr() ?>" />
@@ -31,10 +31,10 @@
       <a href="<?= url::site("items/$item->id") ?>">
         <?= $item->thumb_img() ?>
         <p>
-    <?= SafeString::purify($item->title) ?>
+    <?= html::purify($item->title) ?>
         </p>
         <div>
-    <?= nl2br(SafeString::purify($item->description)) ?>
+    <?= nl2br(html::purify($item->description)) ?>
         </div>
       </a>
     </li>
diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php
index c4439bda..b48a19da 100644
--- a/modules/server_add/views/admin_server_add.html.php
+++ b/modules/server_add/views/admin_server_add.html.php
@@ -16,7 +16,7 @@
            class="gRemoveDir ui-icon ui-icon-trash">
           X
         </a>
-        <?= SafeString::of($path) ?>
+        <?= html::clean($path) ?>
       </li>
       <? endforeach ?>
     </ul>
diff --git a/modules/server_add/views/server_add_tree.html.php b/modules/server_add/views/server_add_tree.html.php
index 2f65a590..dbae42c5 100644
--- a/modules/server_add/views/server_add_tree.html.php
+++ b/modules/server_add/views/server_add_tree.html.php
@@ -10,7 +10,7 @@
     <li class="ui-icon-left">
       <span class="ui-icon ui-icon-folder-open"></span>
       <span ondblclick="open_dir('<?= $dir ?>')">
-        <?= SafeString::of(basename($dir)) ?>
+        <?= html::clean(basename($dir)) ?>
       </span>
       <ul>
         <? endforeach ?>
@@ -24,7 +24,7 @@
                 <? endif ?>
                 file="<?= strtr($file, array('"' => '\\"')) ?>"
                 >
-            <?= SafeString::of(basename($file)) ?>
+            <?= html::clean(basename($file)) ?>
           </span>
         </li>
         <? endforeach ?>
diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index 912e69b6..8eb6e4df 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -5,17 +5,17 @@
 </script>
 
 <div id="gServerAdd">
-  <h1 style="display: none;"><?= t("Add Photos to '%title'", array("title" => SafeString::purify($item->title))) ?></h1>
+  <h1 style="display: none;"><?= t("Add Photos to '%title'", array("title" => html::purify($item->title))) ?></h1>
 
   <p id="gDescription"><?= t("Photos will be added to album:") ?></p>
   <ul class="gBreadcrumbs">
     <? foreach ($item->parents() as $parent): ?>
     <li>
-      <?= SafeString::purify($parent->title) ?>
+      <?= html::purify($parent->title) ?>
     </li>
     <? endforeach ?>
     <li class="active">
-      <?= SafeString::purify($item->title) ?>
+      <?= html::purify($item->title) ?>
     </li>
   </ul>
 
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index f1b4ca3a..8b8dde21 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -106,7 +106,7 @@ class Admin_Tags_Controller extends Admin_Controller {
         array("result" => "success",
               "location" => url::site("admin/tags"),
               "tag_id" => $tag->id,
-              "new_tagname" => SafeString::of($tag->name)));
+              "new_tagname" => html::clean($tag->name)));
     } else {
       print json_encode(
         array("result" => "error",
diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index 30dd0728..3d805c5e 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -32,7 +32,7 @@
           <? $current_letter = strtoupper(mb_substr($tag->name, 0, 1)) ?>
 
           <? if ($i == 0): /* first letter */ ?>
-            <strong><?= SafeString::of($current_letter) ?></strong>
+            <strong><?= html::clean($current_letter) ?></strong>
             <ul>
           <? elseif ($last_letter != $current_letter): /* new letter */ ?>
             <? if ($column_tag_count > $tags_per_column): /* new column */ ?>
@@ -42,12 +42,12 @@
             <? endif ?>
 
             </ul>
-            <strong><?= SafeString::of($current_letter) ?></strong>
+            <strong><?= html::clean($current_letter) ?></strong>
             <ul>
           <? endif ?>
 
           <li>
-            <span id="gTag-<?= $tag->id ?>" class="gEditable tag-name"><?= SafeString::of($tag->name) ?></span>
+            <span id="gTag-<?= $tag->id ?>" class="gEditable tag-name"><?= html::clean($tag->name) ?></span>
             <span class="understate">(<?= $tag->count ?>)</span>
             <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>"
                class="gDialogLink delete-link gButtonLink">
diff --git a/modules/tag/views/tag_cloud.html.php b/modules/tag/views/tag_cloud.html.php
index b4c6ae34..d6a0b5f8 100644
--- a/modules/tag/views/tag_cloud.html.php
+++ b/modules/tag/views/tag_cloud.html.php
@@ -3,7 +3,7 @@
   <? foreach ($tags as $tag): ?>
   <li class="size<?=(int)(($tag->count / $max_count) * 7) ?>">
     <span><?= $tag->count ?> photos are tagged with </span>
-    <a href="<?= url::site("tags/$tag->id") ?>"><?= SafeString::of($tag->name) ?></a>
+    <a href="<?= url::site("tags/$tag->id") ?>"><?= html::clean($tag->name) ?></a>
   </li>
   <? endforeach ?>
 </ul>
diff --git a/modules/user/controllers/logout.php b/modules/user/controllers/logout.php
index 4b141a1c..fc3ced56 100644
--- a/modules/user/controllers/logout.php
+++ b/modules/user/controllers/logout.php
@@ -24,7 +24,7 @@ class Logout_Controller extends Controller {
     $user = user::active();
     user::logout();
     log::info("user", t("User %name logged out", array("name" => $user->name)),
-              html::anchor("user/$user->id", SafeString::of($user->name)));
+              html::anchor("user/$user->id", html::clean($user->name)));
     if ($continue_url = $this->input->get("continue")) {
       $item = url::get_item_from_uri($continue_url);
       if (access::can("view", $item)) {
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 36c4f4fd..9455f9d9 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -68,16 +68,16 @@
         <td id="user-<?= $user->id ?>" class="core-info gDraggable">
           <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
                title="<?= t("Drag user onto group below to add as a new member") ?>"
-               alt="<?= SafeString::of($user->name) ?>"
+               alt="<?= html::clean($user->name) ?>"
                width="20"
                height="20" />
-          <?= SafeString::of($user->name) ?>
+          <?= html::clean($user->name) ?>
         </td>
         <td>
-          <?= SafeString::of($user->full_name) ?>
+          <?= html::clean($user->full_name) ?>
         </td>
         <td>
-          <?= SafeString::of($user->email) ?>
+          <?= html::clean($user->email) ?>
         </td>
         <td>
           <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
index f89a4392..8418ebc9 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/user/views/admin_users_group.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <h4>
-  <?= SafeString::of($group->name) ?>
+  <?= html::clean($group->name) ?>
   <? if (!$group->special): ?>
   <a href="<?= url::site("admin/users/delete_group_form/$group->id") ?>"
     title="<?= t("Delete the %name group", array("name" => $group->name)) ?>"
@@ -17,7 +17,7 @@
 <ul>
   <? foreach ($group->users as $i => $user): ?>
   <li class="gUser">
-    <?= SafeString::of($user->name) ?>
+    <?= html::clean($user->name) ?>
     <? if (!$group->special): ?>
     <a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)"
        class="gButtonLink ui-state-default ui-corner-all ui-icon-left"
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index e92513e7..85f673ce 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -12,7 +12,7 @@
       '<a href="' . url::site("form/edit/users/{$user->id}") .
       '" title="' . t("Edit Your Profile")->for_html_attr() .
       '" id="gUserProfileLink" class="gDialogLink">' .
-      SafeString::of($user->display_name()) . '</a>'))) ?>
+      html::clean($user->display_name()) . '</a>'))) ?>
   </li>
   <li>
     <a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(url::current(true))) ?>"
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 8c690f5f..caabeee3 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -2,8 +2,8 @@
 <? // @todo Set hover on AlbumGrid list items for guest users ?>
 <div id="gInfo">
   <?= $theme->album_top() ?>
-  <h1><?= SafeString::purify($item->title) ?></h1>
-  <div class="gDescription"><?= nl2br(SafeString::purify($item->description)) ?></div>
+  <h1><?= html::purify($item->title) ?></h1>
+  <div class="gDescription"><?= nl2br(html::purify($item->description)) ?></div>
 </div>
 
 <ul id="gAlbumGrid">
@@ -20,7 +20,7 @@
     </a>
     <?= $theme->thumb_bottom($child) ?>
     <?= $theme->context_menu($child, "#gItemId-{$child->id} .gThumbnail") ?>
-    <h2><span></span><a href="<?= $child->url() ?>"><?= SafeString::of($child->title) ?></a></h2>
+    <h2><span></span><a href="<?= $child->url() ?>"><?= html::clean($child->title) ?></a></h2>
     <ul class="gMetadata">
       <?= $theme->thumb_info($child) ?>
     </ul>
diff --git a/themes/default/views/dynamic.html.php b/themes/default/views/dynamic.html.php
index 2d8e04a2..9ed9d69b 100644
--- a/themes/default/views/dynamic.html.php
+++ b/themes/default/views/dynamic.html.php
@@ -3,7 +3,7 @@
   <div id="gAlbumHeaderButtons">
     <?= $theme->dynamic_top() ?>
   </div>
-  <h1><?= SafeString::of($title) ?></h1>
+  <h1><?= html::clean($title) ?></h1>
 </div>
 
 <ul id="gAlbumGrid">
@@ -16,7 +16,7 @@
            width="<?= $child->thumb_width ?>"
            height="<?= $child->thumb_height ?>" />
     </a>
-    <h2><?= SafeString::purify($child->title) ?></h2>
+    <h2><?= html::purify($child->title) ?></h2>
     <?= $theme->thumb_bottom($child) ?>
     <ul class="gMetadata">
       <?= $theme->thumb_info($child) ?>
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index 9e34401d..dcfa6fd8 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -19,10 +19,10 @@
   <? foreach ($parents as $parent): ?>
   <li>
     <a href="<?= url::site("albums/{$parent->id}?show=$item->id") ?>">
-      <?= SafeString::purify($parent->title) ?>
+      <?= html::purify($parent->title) ?>
     </a>
   </li>
   <? endforeach ?>
-  <li class="active"><?= SafeString::purify($item->title) ?></li>
+  <li class="active"><?= html::purify($item->title) ?></li>
 </ul>
 <? endif ?>
diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
index 237743b7..910814dd 100644
--- a/themes/default/views/movie.html.php
+++ b/themes/default/views/movie.html.php
@@ -28,8 +28,8 @@
   <?= $item->movie_img(array("class" => "gMovie", "id" => "gMovieId-{$item->id}")) ?>
 
   <div id="gInfo">
-    <h1><?= SafeString::purify($item->title) ?></h1>
-       <div><?= nl2br(SafeString::purify($item->description)) ?></div>
+    <h1><?= html::purify($item->title) ?></h1>
+       <div><?= nl2br(html::purify($item->description)) ?></div>
   </div>
 
   <?= $theme->photo_bottom() ?>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index 5b5cb12b..c601c4cc 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -5,7 +5,7 @@
 <script>
   $(document).ready(function() {
     $(".gFullSizeLink").click(function() {
-      $.gallery_show_full_size("<?= $theme->item()->file_url()->for_js() ?>", "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
+      $.gallery_show_full_size("<?= html::escape_for_js($theme->item()->file_url()) ?>", "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
       return false;
     });
   });
@@ -51,8 +51,8 @@
   </div>
 
   <div id="gInfo">
-    <h1><?= SafeString::purify($item->title) ?></h1>
-    <div><?= nl2br(SafeString::purify($item->description)) ?></div>
+    <h1><?= html::purify($item->title) ?></h1>
+    <div><?= nl2br(html::purify($item->description)) ?></div>
   </div>
 
   <?= $theme->photo_bottom() ?>
-- 
cgit v1.2.3


From d3b03026907b63e90d90cda1b9f777e0fbfe29b7 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Sat, 29 Aug 2009 23:15:28 -0700
Subject: Minor cleanup

---
 modules/gallery/views/admin_languages.html.php | 4 ++--
 modules/gallery/views/simple_uploader.html.php | 8 ++++----
 themes/default/views/photo.html.php            | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'themes/default/views')

diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php
index 052d749b..ae2b3383 100644
--- a/modules/gallery/views/admin_languages.html.php
+++ b/modules/gallery/views/admin_languages.html.php
@@ -40,7 +40,7 @@
   </form>
 	
 	<script type="text/javascript">
-    var old_default_locale = "<?= html::escape_for_js($default_locale) ?>";
+    var old_default_locale = "<?= html::clean_js($default_locale) ?>";
     
     $("input[name='installed_locales[]']").change(function (event) {
       if (this.checked) {
@@ -57,7 +57,7 @@
       dataType: "json",
       success: function(data) {
         if (data.result == "success") {
-          el = $('<a href="<?= html::escape_for_js(url::site("admin/maintenance/start/gallery_task::update_l10n?csrf=$csrf")) ?>"></a>'); // this is a little hack to trigger the update_l10n task in a dialog
+          el = $('<a href="<?= html::clean_js(url::site("admin/maintenance/start/gallery_task::update_l10n?csrf=$csrf")) ?>"></a>'); // this is a little hack to trigger the update_l10n task in a dialog
           el.gallery_dialog();
           el.trigger('click');
         }
diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index b136972a..b2d01ea7 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -82,13 +82,13 @@
 
 <script type="text/javascript">
   var swfu = new SWFUpload({
-    flash_url: "<?= html::escape_for_js(url::file("lib/swfupload/swfupload.swf")) ?>",
-    upload_url: "<?= html::escape_for_js(url::site("simple_uploader/add_photo/$item->id")) ?>",
+    flash_url: "<?= html::clean_js(url::file("lib/swfupload/swfupload.swf")) ?>",
+    upload_url: "<?= html::clean_js(url::site("simple_uploader/add_photo/$item->id")) ?>",
     post_params: <?= json_encode(array(
       "g3sid" => Session::instance()->id(),
       "user_agent" => Input::instance()->server("HTTP_USER_AGENT"),
       "csrf" => $csrf)) ?>,
-    file_size_limit: "<?= html::escape_for_js(ini_get("upload_max_filesize") ? num::convert_to_bytes(ini_get("upload_max_filesize"))."B" : "100MB")) ?>",
+    file_size_limit: "<?= html::clean_js(ini_get("upload_max_filesize") ? num::convert_to_bytes(ini_get("upload_max_filesize"))."B" : "100MB")) ?>",
     file_types: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4",
     file_types_description: "<?= t("Photos and Movies")->for_js() ?>",
     file_upload_limit: 1000,
@@ -97,7 +97,7 @@
     debug: false,
 
     // Button settings
-    button_image_url: "<?= html::escape_for_js(url::file("themes/default/images/select-photos-backg.png")) ?>",
+    button_image_url: "<?= html::clean_js(url::file("themes/default/images/select-photos-backg.png")) ?>",
     button_width: "202",
     button_height: "45",
     button_placeholder_id: "gChooseFilesButtonPlaceholder",
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index c601c4cc..00e157ce 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -5,7 +5,7 @@
 <script>
   $(document).ready(function() {
     $(".gFullSizeLink").click(function() {
-      $.gallery_show_full_size("<?= html::escape_for_js($theme->item()->file_url()) ?>", "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
+      $.gallery_show_full_size("<?= html::clean_js($theme->item()->file_url()) ?>", "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
       return false;
     });
   });
-- 
cgit v1.2.3


From 00c73ec852c29c214d72193ce368bc12a7305794 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Sun, 30 Aug 2009 15:34:46 -0700
Subject: Updating uses of html::js_string and SafeString::for_js (value now
 contains string delimiters)

---
 modules/gallery/views/admin_languages.html.php    | 86 +++++++++++------------
 modules/gallery/views/l10n_client.html.php        | 10 +--
 modules/gallery/views/permissions_browse.html.php | 17 ++---
 modules/gallery/views/simple_uploader.html.php    | 50 ++++++-------
 themes/admin_default/views/admin.html.php         |  2 +-
 themes/default/views/page.html.php                |  4 +-
 themes/default/views/photo.html.php               |  2 +-
 7 files changed, 85 insertions(+), 86 deletions(-)

(limited to 'themes/default/views')

diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php
index ae2b3383..fa97d299 100644
--- a/modules/gallery/views/admin_languages.html.php
+++ b/modules/gallery/views/admin_languages.html.php
@@ -11,12 +11,11 @@
       <tr>
         <th> <?= t("Installed") ?> </th>
         <th> <?= t("Language") ?> </th>
-				<th> <?= t("Default language") ?> </th>
+        <th> <?= t("Default language") ?> </th>
       </tr>
       <? $i = 0 ?>
       <? foreach ($available_locales as $code => $display_name):  ?>
-			
-			<? if ($i == (count($available_locales)/2)): ?>
+      <? if ($i == (count($available_locales)/2)): ?>
       <table>
         <tr>
           <th> <?= t("Installed") ?> </th>
@@ -24,24 +23,24 @@
           <th> <?= t("Default language") ?> </th>
         </tr>
       <? endif ?>
-			
+
       <tr class="<?= (isset($installed_locales[$code])) ? "installed" : "" ?><?= ($default_locale == $code) ? " default" : "" ?>">
         <td> <?= form::checkbox("installed_locales[]", $code, isset($installed_locales[$code])) ?> </td>
-				<td> <?= $display_name ?> </td>
-				<td>
-					<?= form::radio("default_locale", $code, ($default_locale == $code), ((isset($installed_locales[$code]))?'':'disabled="disabled"') ) ?>
-				</td>
+        <td> <?= $display_name ?> </td>
+        <td>
+        <?= form::radio("default_locale", $code, ($default_locale == $code), ((isset($installed_locales[$code]))?'':'disabled="disabled"') ) ?>
+        </td>
       </tr>
       <? $i++ ?>
-			
+
       <? endforeach ?>
     </table>
-		<input type="submit" value="<?= t("Update languages")->for_html_attr() ?>" />
+    <input type="submit" value="<?= t("Update languages")->for_html_attr() ?>" />
   </form>
-	
-	<script type="text/javascript">
-    var old_default_locale = "<?= html::clean_js($default_locale) ?>";
-    
+
+  <script type="text/javascript">
+    var old_default_locale = <?= html::js_string($default_locale) ?>;
+
     $("input[name='installed_locales[]']").change(function (event) {
       if (this.checked) {
         $("input[type='radio'][value='" + this.value + "']").enable();
@@ -57,7 +56,7 @@
       dataType: "json",
       success: function(data) {
         if (data.result == "success") {
-          el = $('<a href="<?= html::clean_js(url::site("admin/maintenance/start/gallery_task::update_l10n?csrf=$csrf")) ?>"></a>'); // this is a little hack to trigger the update_l10n task in a dialog
+          el = $('<a href="' + <?= html::js_string(url::site("admin/maintenance/start/gallery_task::update_l10n?csrf=$csrf")) ?> + '"></a>'); // this is a little hack to trigger the update_l10n task in a dialog
           el.gallery_dialog();
           el.trigger('click');
         }
@@ -68,38 +67,37 @@
 
 <div id="gTranslations">
   <h1> <?= t("Translations") ?> </h1>
-	<p>
+  <p>
     <?= t("Create your own translations and share them with the rest of the Gallery community.") ?>
   </p>
-	
-	<h3><?= t("Translating Gallery") ?></h3>
-	
-	<div class="gBlock">
-		<a href="http://codex.gallery2.org/Gallery3:Localization" target="_blank"
-		  class="gDocLink ui-state-default ui-corner-all ui-icon ui-icon-help"
-			title="<?= t("Localization documentation")->for_html_attr() ?>">
+
+  <h3><?= t("Translating Gallery") ?></h3>
+
+  <div class="gBlock">
+    <a href="http://codex.gallery2.org/Gallery3:Localization" target="_blank"
+       class="gDocLink ui-state-default ui-corner-all ui-icon ui-icon-help"
+       title="<?= t("Localization documentation")->for_html_attr() ?>">
       <?= t("Localization documentation") ?>
     </a>
-		
-		<p><?= t("<strong>Step 1:</strong> Make sure the target language is installed and up to date (check above).") ?></p>
-		
-      <p><?= t("<strong>Step 2:</strong> Make sure you have selected the right  target language (currently %default_locale).",
-               array("default_locale" => locales::display_name())) ?></p>
-		
-		<p><?= t("<strong>Step 3:</strong> Start the translation mode and the translation interface will appear at the bottom of each Gallery page.") ?></p>
-		
-		<a href="<?= url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token()) ?>"
-		  class="gButtonLink ui-state-default ui-corner-all ui-icon-left">
-		  <span class="ui-icon ui-icon-power"></span>
-                  <? if (Session::instance()->get("l10n_mode", false)): ?>
-                  <?= t("Stop translation mode") ?>
-                  <? else: ?>
-                  <?= t("Start translation mode") ?>
-                  <? endif ?>
-	  </a>
-	</div>
-	
-	<h3>Sharing your translations</h3>
-	
+
+    <p><?= t("<strong>Step 1:</strong> Make sure the target language is installed and up to date (check above).") ?></p>
+
+    <p><?= t("<strong>Step 2:</strong> Make sure you have selected the right  target language (currently %default_locale).",
+             array("default_locale" => locales::display_name())) ?></p>
+
+    <p><?= t("<strong>Step 3:</strong> Start the translation mode and the translation interface will appear at the bottom of each Gallery page.") ?></p>
+
+    <a href="<?= url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token()) ?>"
+       class="gButtonLink ui-state-default ui-corner-all ui-icon-left">
+      <span class="ui-icon ui-icon-power"></span>
+      <? if (Session::instance()->get("l10n_mode", false)): ?>
+      <?= t("Stop translation mode") ?>
+      <? else: ?>
+      <?= t("Start translation mode") ?>
+      <? endif ?>
+   </a>
+</div>
+
+<h3>Sharing your translations</h3>
   <?= $share_translations_form ?>
 </div>
diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index 520fd79e..aca1e654 100644
--- a/modules/gallery/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
@@ -2,9 +2,9 @@
 <div id="l10n-client" class="hidden">
   <div class="labels">
     <span id="l10n-client-toggler">
-    	<a id="gMinimizeL10n">_</a>
-			<a id="gCloseL10n" href="<?= url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token()) ?>">X</a>
-	  </span>
+      <a id="gMinimizeL10n">_</a>
+      <a id="gCloseL10n" href="<?= url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token()) ?>">X</a>
+    </span>
     <div class="label strings"><h2><?= t("Page Text") ?>
     <? if (!Input::instance()->get('show_all_l10n_messages')): ?>
       <a style="background-color:#fff" href="<?= url::site("admin/languages?show_all_l10n_messages=1") ?>"><?= t("(Show All)") ?></a>
@@ -72,8 +72,8 @@
     </div>
   </div>
   <script type="text/javascript">
-    var MSG_TRANSLATE_TEXT = "<?= t("Translate Text")->for_js() ?>";
-    var MSG_CLOSE_X = "<?= t("X")->for_js() ?>";
+    var MSG_TRANSLATE_TEXT = <?= t("Translate Text")->for_js() ?>;
+    var MSG_CLOSE_X = <?= t("X")->for_js() ?>;
     var l10n_client_data = <?= json_encode($string_list) ?>;
     var plural_forms = <?= json_encode($plural_forms) ?>;
   </script>
diff --git a/modules/gallery/views/permissions_browse.html.php b/modules/gallery/views/permissions_browse.html.php
index d9395b3f..231daa04 100644
--- a/modules/gallery/views/permissions_browse.html.php
+++ b/modules/gallery/views/permissions_browse.html.php
@@ -5,9 +5,9 @@
     $.ajax({
       url: form_url.replace("__ITEM__", id),
       success: function(data) {
-		    $("#gEditPermissionForm").html(data);
-		    $(".active").removeClass("active");
-		    $("#item-" + id).addClass("active");
+          $("#gEditPermissionForm").html(data);
+          $(".active").removeClass("active");
+          $("#item-" + id).addClass("active");
       }
     });
   }
@@ -28,13 +28,14 @@
   <? if (!$htaccess_works): ?>
   <ul id="gMessage">
     <li class="gError">
-      <?= t("Oh no!  Your server needs a configuration change in order for you to hide photos!  Ask your server administrator to enable <a %mod_rewrite_attrs>mod_rewrite</a> and set <a %apache_attrs><i>AllowOverride FileInfo Options</i></a> to fix this.", array("mod_rewrite_attrs" => "href=\"http://httpd.apache.org/docs/2.0/mod/mod_rewrite.html\" target=\"_blank\"", "apache_attrs" => "href=\"http://httpd.apache.org/docs/2.0/mod/core.html#allowoverride\" target=\"_blank\"")) ?>
+      <?= t("Oh no!  Your server needs a configuration change in order for you to hide photos!  Ask your server administrator to enable <a %mod_rewrite_attrs>mod_rewrite</a> and set <a %apache_attrs><i>AllowOverride FileInfo Options</i></a> to fix this.",
+            array("mod_rewrite_attrs" => html::mark_safe("href=\"http://httpd.apache.org/docs/2.0/mod/mod_rewrite.html\" target=\"_blank\"", "apache_attrs" => "href=\"http://httpd.apache.org/docs/2.0/mod/core.html#allowoverride\" target=\"_blank\""))) ?>
     </li>
   </ul>
   <? endif ?>
-  
+
   <p><?= t("Edit permissions for album:") ?></p>
-  
+
   <ul class="gBreadcrumbs">
     <? foreach ($parents as $parent): ?>
     <li id="item-<?= $parent->id ?>">
@@ -45,11 +46,11 @@
     <? endforeach ?>
     <li class="active" id="item-<?= $item->id ?>">
       <a href="javascript:show(<?= $item->id ?>)">
-    	<?= html::purify($item->title) ?>
+        <?= html::purify($item->title) ?>
       </a>
     </li>
   </ul>
-  
+
   <div id="gEditPermissionForm">
     <?= $form ?>
   </div>
diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index ccb166fc..9cf554ec 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -82,22 +82,22 @@
 
 <script type="text/javascript">
   var swfu = new SWFUpload({
-    flash_url: "<?= html::clean_js(url::file("lib/swfupload/swfupload.swf")) ?>",
-    upload_url: "<?= html::clean_js(url::site("simple_uploader/add_photo/$item->id")) ?>",
+    flash_url: <?= html::js_string(url::file("lib/swfupload/swfupload.swf")) ?>,
+    upload_url: <?= html::js_string(url::site("simple_uploader/add_photo/$item->id")) ?>,
     post_params: <?= json_encode(array(
       "g3sid" => Session::instance()->id(),
       "user_agent" => Input::instance()->server("HTTP_USER_AGENT"),
       "csrf" => $csrf)) ?>,
-    file_size_limit: "<?= html::clean_js(ini_get("upload_max_filesize") ? num::convert_to_bytes(ini_get("upload_max_filesize"))."B" : "100MB") ?>",
+    file_size_limit: <?= html::js_string(ini_get("upload_max_filesize") ? num::convert_to_bytes(ini_get("upload_max_filesize"))."B" : "100MB") ?>,
     file_types: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4",
-    file_types_description: "<?= t("Photos and Movies")->for_js() ?>",
+    file_types_description: <?= t("Photos and Movies")->for_js() ?>,
     file_upload_limit: 1000,
     file_queue_limit: 0,
     custom_settings: { },
     debug: false,
 
     // Button settings
-    button_image_url: "<?= html::clean_js(url::file("themes/default/images/select-photos-backg.png")) ?>",
+    button_image_url: <?= html::js_string(url::file("themes/default/images/select-photos-backg.png")) ?>,
     button_width: "202",
     button_height: "45",
     button_placeholder_id: "gChooseFilesButtonPlaceholder",
@@ -145,13 +145,13 @@
   function file_queued(file) {
     var fp = new File_Progress(file);
     fp.title.html(file.name);
-    fp.set_status("pending", "<?= t("Pending...")->for_js() ?>");
+    fp.set_status("pending", <?= t("Pending...")->for_js() ?>);
     // @todo add cancel button to call this.cancelUpload(file.id)
   }
 
   function file_queue_error(file, error_code, message) {
     if (error_code === SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED) {
-      alert("<?= t("You have attempted to queue too many files.")->for_js() ?>");
+      alert(<?= t("You have attempted to queue too many files.")->for_js() ?>);
       return;
     }
 
@@ -159,20 +159,20 @@
     switch (error_code) {
     case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
       fp.title.html(file.name);
-      fp.set_status("error", "<?= t("<strong>File is too big.</strong> A likely error source is a too low value for <em>upload_max_filesize</em> (%upload_max_filesize) in your <em>php.ini</em>.", array("upload_max_filesize" => ini_get("upload_max_filesize")))->for_js() ?>");
+      fp.set_status("error", <?= t("<strong>File is too big.</strong> A likely error source is a too low value for <em>upload_max_filesize</em> (%upload_max_filesize) in your <em>php.ini</em>.", array("upload_max_filesize" => ini_get("upload_max_filesize")))->for_js() ?>);
       break;
     case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
       fp.title.html(file.name);
-      fp.set_status("error", "<?= t("Cannot upload empty files.")->for_js() ?>");
+      fp.set_status("error", <?= t("Cannot upload empty files.")->for_js() ?>);
       break;
     case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:
       fp.title.html(file.name);
-      fp.set_status("error", "<?= t("Invalid file type.")->for_js() ?>");
+      fp.set_status("error", <?= t("Invalid file type.")->for_js() ?>);
       break;
     default:
       if (file !== null) {
         fp.title.html(file.name);
-        fp.set_status("error", "<?= t("Unknown error")->for_js() ?>");
+        fp.set_status("error", <?= t("Unknown error")->for_js() ?>);
       }
       break;
     }
@@ -193,7 +193,7 @@
     // no uploadProgress events are called (limitation in the Linux Flash VM).
     var fp = new File_Progress(file);
     fp.title.html(file.name);
-    fp.set_status("uploading", "<?= t("Uploading...")->for_js() ?>");
+    fp.set_status("uploading", <?= t("Uploading...")->for_js() ?>);
     $("#gAddPhotosCanvas").scrollTo(fp.box, 1000);
     return true;
     // @todo add cancel button to call this.cancelUpload(file.id)
@@ -202,7 +202,7 @@
   function upload_progress(file, bytes_loaded, bytes_total) {
     var percent = Math.ceil((bytes_loaded / bytes_total) * 100);
     var fp = new File_Progress(file);
-    fp.set_status("uploading", "<?= t("Uploading...")->for_js() ?>");
+    fp.set_status("uploading", <?= t("Uploading...")->for_js() ?>);
     fp.progress_bar.css("visibility", "visible");
     fp.progress_bar.progressbar("value", percent);
   }
@@ -210,42 +210,42 @@
   function upload_success(file, serverData) {
     var fp = new File_Progress(file);
     fp.progress_bar.progressbar("value", 100);
-    fp.set_status("complete", "<?= t("Complete.")->for_js() ?>");
+    fp.set_status("complete", <?= t("Complete.")->for_js() ?>);
   }
 
   function upload_error(file, error_code, message) {
     var fp = new File_Progress(file);
     switch (error_code) {
     case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:
-      fp.set_status("error", "<?= t("Upload error: bad image file")->for_js() ?>");
+      fp.set_status("error", <?= t("Upload error: bad image file")->for_js() ?>);
       break;
     case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:
-      fp.set_status("error", "<?= t("Upload failed")->for_js() ?>");
+      fp.set_status("error", <?= t("Upload failed")->for_js() ?>);
       break;
     case SWFUpload.UPLOAD_ERROR.IO_ERROR:
-      fp.set_status("error", "<?= t("Server error")->for_js() ?>");
+      fp.set_status("error", <?= t("Server error")->for_js() ?>);
       break;
     case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:
-      fp.set_status("error", "<?= t("Security error")->for_js() ?>");
+      fp.set_status("error", <?= t("Security error")->for_js() ?>);
       break;
     case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:
-      fp.set_status("error", "<?= t("Upload limit exceeded")->for_js() ?>");
+      fp.set_status("error", <?= t("Upload limit exceeded")->for_js() ?>);
       break;
     case SWFUpload.UPLOAD_ERROR.FILE_VALIDATION_FAILED:
-      fp.set_status("error", "<?= t("Failed validation.  File skipped")->for_js() ?>");
+      fp.set_status("error", <?= t("Failed validation.  File skipped")->for_js() ?>);
       break;
     case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:
       // If there aren't any files left (they were all cancelled) disable the cancel button
       if (this.getStats().files_queued === 0) {
         $("#gUploadCancel").hide();
       }
-      fp.set_status("error", "<?= t("Cancelled")->for_js() ?>");
+      fp.set_status("error", <?= t("Cancelled")->for_js() ?>);
       break;
     case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:
-      fp.set_status("error", "<?= t("Stopped")->for_js() ?>");
+      fp.set_status("error", <?= t("Stopped")->for_js() ?>);
       break;
     default:
-      fp.set_status("error", "<?= t("Unknown error: ")->for_js() ?>" + error_code);
+      fp.set_status("error", <?= t("Unknown error: ")->for_js() ?> + error_code);
       break;
     }
   }
@@ -259,7 +259,7 @@
   }
 
   function get_completed_status_msg(stats) {
-    var msg = "<?= t("Upload Queue (completed %completed of %total)", array("completed" => "__COMPLETED__", "total" => "__TOTAL__"))->for_js() ?>";
+    var msg = <?= t("Upload Queue (completed %completed of %total)", array("completed" => "__COMPLETED__", "total" => "__TOTAL__"))->for_js() ?>;
     msg = msg.replace("__COMPLETED__", stats.successful_uploads);
     msg = msg.replace("__TOTAL__", stats.files_queued + stats.successful_uploads +
       stats.upload_errors + stats.upload_cancelled + stats.queue_errors);
@@ -268,7 +268,7 @@
 
   // This event comes from the Queue Plugin
   function queue_complete(num_files_uploaded) {
-    var status_msg = "<?= t("Uploaded: __COUNT__")->for_js() ?>";
+    var status_msg = <?= t("Uploaded: __COUNT__")->for_js() ?>;
     $("#gUploadStatus").html(status_msg.replace("__COUNT__", num_files_uploaded));
   }
 </script>
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 2ed8c38e..3b1ff92c 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -23,7 +23,7 @@
    <?= $theme->script("gallery.common.js") ?>
    <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
    <script type="text/javascript">
-   var MSG_CANCEL = "<?= t('Cancel')->for_js() ?>";
+   var MSG_CANCEL = <?= t('Cancel')->for_js() ?>;
    </script>
    <?= $theme->script("gallery.ajax.js") ?>
    <?= $theme->script("gallery.dialog.js") ?>
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 844ef295..2696442b 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -12,7 +12,7 @@
           <? if ($theme->item()->is_album()): ?>
           <?= t("Browse Album :: %album_title", array("album_title" => $theme->item()->title)) ?>
           <? elseif ($theme->item()->is_photo()): ?>
-	  <?= t("Photo :: %photo_title", array("photo_title" => $theme->item()->title)) ?>
+          <?= t("Photo :: %photo_title", array("photo_title" => $theme->item()->title)) ?>
           <? else: ?>
           <?= t("Movie :: %movie_title", array("movie_title" => $theme->item()->title)) ?>
           <? endif ?>
@@ -51,7 +51,7 @@
     <?= $theme->script("gallery.common.js") ?>
     <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
     <script type="text/javascript">
-    var MSG_CANCEL = "<?= t('Cancel')->for_js() ?>";
+    var MSG_CANCEL = <?= t('Cancel')->for_js() ?>;
     </script>
     <?= $theme->script("gallery.ajax.js") ?>
     <?= $theme->script("gallery.dialog.js") ?>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index 00e157ce..5289b467 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -5,7 +5,7 @@
 <script>
   $(document).ready(function() {
     $(".gFullSizeLink").click(function() {
-      $.gallery_show_full_size("<?= html::clean_js($theme->item()->file_url()) ?>", "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
+      $.gallery_show_full_size(<?= html::js_string($theme->item()->file_url()) ?>, "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
       return false;
     });
   });
-- 
cgit v1.2.3


From 1e79ca2dcbad102aab876169f706e7c5eef587f3 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 30 Aug 2009 23:22:54 -0600
Subject: Move header and footer into page.html.php since they're not included
 in any other view template.

---
 themes/default/views/footer.html.php | 11 ----------
 themes/default/views/header.html.php | 28 --------------------------
 themes/default/views/page.html.php   | 39 ++++++++++++++++++++++++++++++++++--
 3 files changed, 37 insertions(+), 41 deletions(-)
 delete mode 100644 themes/default/views/footer.html.php
 delete mode 100644 themes/default/views/header.html.php

(limited to 'themes/default/views')

diff --git a/themes/default/views/footer.html.php b/themes/default/views/footer.html.php
deleted file mode 100644
index 040a4062..00000000
--- a/themes/default/views/footer.html.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<?= $theme->footer() ?>
-<? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
-<?= $footer_text ?>
-<? endif ?>
-
-<? if (module::get_var("gallery", "show_credits")): ?>
-<ul id="gCredits">
-  <?= $theme->credits() ?>
-</ul>
-<? endif ?>
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
deleted file mode 100644
index dcfa6fd8..00000000
--- a/themes/default/views/header.html.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gBanner">
-  <?= $theme->header_top() ?>
-  <? if ($header_text = module::get_var("gallery", "header_text")): ?>
-  <?= $header_text ?>
-  <? else: ?>
-  <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery home") ?>">
-    <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site") ?>" src="<?= $theme->url("images/logo.png") ?>" />
-  </a>
-  <? endif ?>
-  <div id="gSiteMenu">
-  <?= $theme->site_menu() ?>
-  </div>
-  <?= $theme->header_bottom() ?>
-</div>
-
-<? if (!empty($parents)): ?>
-<ul class="gBreadcrumbs">
-  <? foreach ($parents as $parent): ?>
-  <li>
-    <a href="<?= url::site("albums/{$parent->id}?show=$item->id") ?>">
-      <?= html::purify($parent->title) ?>
-    </a>
-  </li>
-  <? endforeach ?>
-  <li class="active"><?= html::purify($item->title) ?></li>
-</ul>
-<? endif ?>
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 2696442b..636b2f99 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -76,7 +76,33 @@
     <div id="doc4" class="yui-t5 gView">
       <?= $theme->site_status() ?>
       <div id="gHeader">
-        <?= new View("header.html") ?>
+        <div id="gBanner">
+          <?= $theme->header_top() ?>
+          <? if ($header_text = module::get_var("gallery", "header_text")): ?>
+          <?= $header_text ?>
+          <? else: ?>
+          <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery home") ?>">
+            <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site") ?>" src="<?= $theme->url("images/logo.png") ?>" />
+          </a>
+          <? endif ?>
+          <div id="gSiteMenu">
+          <?= $theme->site_menu() ?>
+          </div>
+          <?= $theme->header_bottom() ?>
+        </div>
+
+        <? if (!empty($parents)): ?>
+        <ul class="gBreadcrumbs">
+          <? foreach ($parents as $parent): ?>
+          <li>
+            <a href="<?= url::site("albums/{$parent->id}?show=$item->id") ?>">
+              <?= html::purify($parent->title) ?>
+            </a>
+          </li>
+          <? endforeach ?>
+          <li class="active"><?= html::purify($item->title) ?></li>
+        </ul>
+        <? endif ?>
       </div>
       <div id="bd">
         <div id="yui-main">
@@ -94,7 +120,16 @@
         </div>
       </div>
       <div id="gFooter">
-        <?= new View("footer.html") ?>
+        <?= $theme->footer() ?>
+        <? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
+        <?= $footer_text ?>
+        <? endif ?>
+
+        <? if (module::get_var("gallery", "show_credits")): ?>
+        <ul id="gCredits">
+          <?= $theme->credits() ?>
+        </ul>
+        <? endif ?>
       </div>
     </div>
     <?= $theme->page_bottom() ?>
-- 
cgit v1.2.3


From e6c2fe60c42efee8ce898e208befe63565d98ffc Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 17:17:14 -0700
Subject: Use $theme->item() instead of $item.

---
 themes/default/views/page.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'themes/default/views')

diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 636b2f99..ebe6b0cf 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -95,12 +95,12 @@
         <ul class="gBreadcrumbs">
           <? foreach ($parents as $parent): ?>
           <li>
-            <a href="<?= url::site("albums/{$parent->id}?show=$item->id") ?>">
+            <a href="<?= url::site("albums/{$parent->id}?show=$theme->item()->id") ?>">
               <?= html::purify($parent->title) ?>
             </a>
           </li>
           <? endforeach ?>
-          <li class="active"><?= html::purify($item->title) ?></li>
+          <li class="active"><?= html::purify($theme->item()->title) ?></li>
         </ul>
         <? endif ?>
       </div>
-- 
cgit v1.2.3


From 74a124b261dabfae2613449addbcabc4310994ac Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 17:41:34 -0700
Subject: Oops, fix up the show argument that I "fixed" in the last change.

---
 themes/default/views/page.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/default/views')

diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index ebe6b0cf..7d181ea0 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -95,7 +95,7 @@
         <ul class="gBreadcrumbs">
           <? foreach ($parents as $parent): ?>
           <li>
-            <a href="<?= url::site("albums/{$parent->id}?show=$theme->item()->id") ?>">
+            <a href="<?= url::site("albums/{$parent->id}?show={$theme->item()->id}") ?>">
               <?= html::purify($parent->title) ?>
             </a>
           </li>
-- 
cgit v1.2.3


From 2bc73e2e36fefc3c1ee1b8e97e686c6729e58dcb Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Mon, 31 Aug 2009 21:51:57 -0700
Subject: Fix XSS vectors in HTML attributes (mostly t() calls)

---
 .../views/admin_block_recent_comments.html.php     |  2 +-
 modules/comment/views/admin_comments.html.php      |  2 +-
 modules/comment/views/comment.html.php             |  2 +-
 modules/comment/views/comments.html.php            |  2 +-
 modules/exif/views/exif_sidebar.html.php           |  2 +-
 .../gallery/views/admin_advanced_settings.html.php |  2 +-
 .../views/admin_block_photo_stream.html.php        |  4 +--
 modules/gallery/views/admin_modules.html.php       |  2 +-
 modules/gallery/views/admin_themes.html.php        | 12 +++----
 modules/gallery/views/after_install.html.php       |  2 +-
 .../gallery/views/after_install_loader.html.php    |  2 +-
 modules/gallery/views/l10n_client.html.php         |  2 +-
 modules/gallery/views/move_browse.html.php         |  2 +-
 modules/gallery/views/permissions_form.html.php    | 42 +++++++++++-----------
 modules/gallery/views/simple_uploader.html.php     |  2 +-
 modules/rss/views/feed.mrss.php                    | 10 +++---
 modules/search/views/search_link.html.php          |  2 +-
 modules/user/views/admin_users.html.php            | 10 +++---
 modules/user/views/admin_users_group.html.php      |  6 ++--
 modules/user/views/login.html.php                  |  2 +-
 modules/watermark/views/admin_watermarks.html.php  |  6 ++--
 themes/admin_default/views/admin.html.php          |  2 +-
 themes/default/views/page.html.php                 |  4 +--
 themes/default/views/photo.html.php                |  2 +-
 24 files changed, 63 insertions(+), 63 deletions(-)

(limited to 'themes/default/views')

diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php
index dc3975e0..2afa5bf8 100644
--- a/modules/comment/views/admin_block_recent_comments.html.php
+++ b/modules/comment/views/admin_block_recent_comments.html.php
@@ -4,7 +4,7 @@
   <li class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
     <img src="<?= $comment->author()->avatar_url(32, $theme->url("images/avatar.jpg", true)) ?>"
          class="gAvatar"
-         alt="<?= html::clean($comment->author_name()) ?>"
+         alt="<?= html::clean_attribute($comment->author_name()) ?>"
          width="32"
          height="32" />
     <?= gallery::date_time($comment->created) ?>
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 588c3ebc..f5970ae1 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -122,7 +122,7 @@
             <a href="<?= $item->url() ?>">
               <? if ($item->has_thumb()): ?>
               <img src="<?= $item->thumb_url() ?>"
-                 alt="<?= html::purify($item->title) ?>"
+                 alt="<?= html::purify($item->title)->for_html_attr() ?>"
                  <?= photo::img_dimensions($item->thumb_width, $item->thumb_height, 75) ?>
               />
               <? else: ?>
diff --git a/modules/comment/views/comment.html.php b/modules/comment/views/comment.html.php
index 1d0786cb..ce4e197d 100644
--- a/modules/comment/views/comment.html.php
+++ b/modules/comment/views/comment.html.php
@@ -4,7 +4,7 @@
     <a href="#">
       <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
            class="gAvatar"
-           alt="<?= html::clean($comment->author_name()) ?>"
+           alt="<?= html::clean_attribute($comment->author_name()) ?>"
            width="40"
            height="40" />
     </a>
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index 1e45c946..b7ebdf3a 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -18,7 +18,7 @@
       <a href="#">
         <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
              class="gAvatar"
-             alt="<?= html::clean($comment->author_name()) ?>"
+             alt="<?= html::clean_attribute($comment->author_name()) ?>"
              width="40"
              height="40" />
       </a>
diff --git a/modules/exif/views/exif_sidebar.html.php b/modules/exif/views/exif_sidebar.html.php
index ee528613..60c0e1d4 100644
--- a/modules/exif/views/exif_sidebar.html.php
+++ b/modules/exif/views/exif_sidebar.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<a id="gExifDataLink" href="<?= url::site("exif/show/{$item->id}") ?>" title="<?= t("Photo Details") ?>"
+<a id="gExifDataLink" href="<?= url::site("exif/show/{$item->id}") ?>" title="<?= t("Photo Details")->for_html_attr() ?>"
   class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all">
   <span class="ui-icon ui-icon-info"></span>
   <?= t("View more information") ?>
diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index 4235e8f8..c3595da5 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -24,7 +24,7 @@
       <td>
         <a href="<?= url::site("admin/advanced_settings/edit/$var->module_name/" . html::clean($var->name)) ?>"
           class="gDialogLink"
-          title="<?= t("Edit %var (%module_name)", array("var" => $var->name, "module_name" => $var->module_name)) ?>">
+          title="<?= t("Edit %var (%module_name)", array("var" => $var->name, "module_name" => $var->module_name))->for_html_attr() ?>">
           <? if ($var->value): ?>
           <?= html::clean($var->value) ?>
           <? else: ?>
diff --git a/modules/gallery/views/admin_block_photo_stream.html.php b/modules/gallery/views/admin_block_photo_stream.html.php
index a50836ad..1b9d8ff5 100644
--- a/modules/gallery/views/admin_block_photo_stream.html.php
+++ b/modules/gallery/views/admin_block_photo_stream.html.php
@@ -2,9 +2,9 @@
 <ul>
 <? foreach ($photos as $photo): ?>
   <li class="gItem gPhoto">
-    <a href="<?= url::site("photos/$photo->id") ?>" title="<?= html::clean($photo->title) ?>">
+    <a href="<?= url::site("photos/$photo->id") ?>" title="<?= html::purify($photo->title)->for_html_attr() ?>">
       <img <?= photo::img_dimensions($photo->width, $photo->height, 72) ?>
-        src="<?= $photo->thumb_url() ?>" alt="<?= html::clean($photo->title) ?>" />
+        src="<?= $photo->thumb_url() ?>" alt="<?= html::purify($photo->title)->for_html_attr() ?>" />
     </a>
   </li>
 <? endforeach ?>
diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php
index 168e20d0..9cf03cb3 100644
--- a/modules/gallery/views/admin_modules.html.php
+++ b/modules/gallery/views/admin_modules.html.php
@@ -27,6 +27,6 @@
       <? $i++ ?>
       <? endforeach ?>
     </table>
-    <input type="submit" value="<?= t("Update") ?>"/>
+    <input type="submit" value="<?= t("Update")->for_html_attr() ?>"/>
   </form>
 </div>
diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php
index dc13a6a0..0aac4717 100644
--- a/modules/gallery/views/admin_themes.html.php
+++ b/modules/gallery/views/admin_themes.html.php
@@ -16,7 +16,7 @@
   <h2> <?= t("Gallery theme") ?> </h2>
   <div class="gBlock gSelected">
     <img src="<?= url::file("themes/{$site}/thumbnail.png") ?>"
-         alt="<?= $themes[$site]->name ?>" />
+         alt="<?= html::clean_attribute($themes[$site]->name) ?>" />
     <h3> <?= $themes[$site]->name ?> </h3>
     <p>
       <?= $themes[$site]->description ?>
@@ -30,9 +30,9 @@
     <? if (!$info->site) continue ?>
     <? if ($id == $site) continue ?>
     <div class="gBlock">
-      <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="gDialogLink" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name)) ?>">
+      <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="gDialogLink" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
         <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
-             alt="<?= $info->name ?>" />
+             alt="<?= html::clean_attribute($info->name) ?>" />
         <h3> <?= $info->name ?> </h3>
         <p>
           <?= $info->description ?>
@@ -54,7 +54,7 @@
   <h2> <?= t("Admin theme") ?> </h2>
   <div class="gBlock gSelected">
     <img src="<?= url::file("themes/{$admin}/thumbnail.png") ?>"
-         alt="<?= $themes[$admin]->name ?>" />
+         alt="<?= html::clean_attribute($themes[$admin]->name) ?>" />
     <h3> <?= $themes[$admin]->name ?> </h3>
     <p>
       <?= $themes[$admin]->description ?>
@@ -68,9 +68,9 @@
     <? if (!$info->admin) continue ?>
     <? if ($id == $admin) continue ?>
     <div class="gBlock">
-      <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="gDialogLink" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name)) ?>">
+      <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="gDialogLink" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
         <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
-             alt="<?= $info->name ?>" />
+             alt="<?= html::clean_attribute($info->name) ?>" />
         <h3> <?= $info->name ?> </h3>
         <p>
           <?= $info->description ?>
diff --git a/modules/gallery/views/after_install.html.php b/modules/gallery/views/after_install.html.php
index b77a1707..897946a2 100644
--- a/modules/gallery/views/after_install.html.php
+++ b/modules/gallery/views/after_install.html.php
@@ -13,7 +13,7 @@
 
 <p>
   <a href="<?= url::site("form/edit/users/{$user->id}") ?>"
-    title="<?= t("Edit Your Profile") ?>"
+    title="<?= t("Edit Your Profile")->for_html_attr() ?>"
     id="gAfterInstallChangePasswordLink" class="gButtonLink ui-state-default ui-corners-all"><?= t("Change Password Now") ?></a>
   <script>
     $("#gAfterInstallChangePasswordLink").gallery_dialog();
diff --git a/modules/gallery/views/after_install_loader.html.php b/modules/gallery/views/after_install_loader.html.php
index 54484963..c2e3e1d9 100644
--- a/modules/gallery/views/after_install_loader.html.php
+++ b/modules/gallery/views/after_install_loader.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <span id="gAfterInstall"
-      title="<?= t("Welcome to Gallery 3") ?>"
+      title="<?= t("Welcome to Gallery 3")->for_html_attr() ?>"
       href="<?= url::site("after_install") ?>"/>
 <script type="text/javascript">
   $(document).ready(function(){$("#gAfterInstall").gallery_dialog({immediate: true});});
diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index c68a63c8..3a43f7d3 100644
--- a/modules/gallery/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
@@ -66,7 +66,7 @@
           (<a href="http://www.unicode.org/cldr/data/charts/supplemental/language_plural_rules.html"><?= t("learn more about plural forms") ?></a>)
           <?= form::textarea("l10n-edit-plural-translation-other", "", ' rows="2"') ?>
         </div>
-        <input type="submit" name="l10n-edit-save" value="<?= t("Save translation") ?>"/>
+        <input type="submit" name="l10n-edit-save" value="<?= t("Save translation")->for_html_attr() ?>"/>
         <a href="javascript: Gallery.l10nClient.copySourceText()"
            class="gButtonLink ui-state-default ui-corner-all"><?= t("Copy source text") ?></a>
       </form>
diff --git a/modules/gallery/views/move_browse.html.php b/modules/gallery/views/move_browse.html.php
index 4f69c0e9..99728ecc 100644
--- a/modules/gallery/views/move_browse.html.php
+++ b/modules/gallery/views/move_browse.html.php
@@ -42,6 +42,6 @@
   <form method="post" action="<?= url::site("move/save/$source->id") ?>">
     <?= access::csrf_form_field() ?>
     <input type="hidden" name="target_id" value="" />
-    <input type="submit" id="gMoveButton" value="<?= t("Move") ?>" disabled="disabled"/>
+    <input type="submit" id="gMoveButton" value="<?= t("Move")->for_html_attr() ?>" disabled="disabled"/>
   </form>
 </div>
diff --git a/modules/gallery/views/permissions_form.html.php b/modules/gallery/views/permissions_form.html.php
index e6b217c5..a0bb35f2 100644
--- a/modules/gallery/views/permissions_form.html.php
+++ b/modules/gallery/views/permissions_form.html.php
@@ -20,9 +20,9 @@
 
         <? if ($lock): ?>
           <td class="gDenied">
-            <img src="<?= url::file('themes/default/images/ico-denied.png') ?>" title="<?= t('denied and locked through parent album') ?>" alt="<?= t('denied icon') ?>" />
-            <a href="javascript:show(<?= $lock->id ?>)" title="<?= t('click to go to parent album') ?>">
-              <img src="<?= url::file('themes/default/images/ico-lock.png') ?>" alt="<?= t('locked icon') ?>" />
+            <img src="<?= url::file('themes/default/images/ico-denied.png') ?>" title="<?= t('denied and locked through parent album')->for_html_attr() ?>" alt="<?= t('denied icon')->for_html_attr() ?>" />
+            <a href="javascript:show(<?= $lock->id ?>)" title="<?= t('click to go to parent album')->for_html_attr() ?>">
+              <img src="<?= url::file('themes/default/images/ico-lock.png') ?>" alt="<?= t('locked icon')->for_html_attr() ?>" />
             </a>
           </td>
         <? else: ?>
@@ -30,23 +30,23 @@
             <? if ($allowed): ?>
               <td class="gAllowed">
                 <a href="javascript:set('allow',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
-                  title="<?= t('allowed through parent album, click to allow explicitly') ?>">
-                  <img src="<?= url::file('themes/default/images/ico-success-pale.png') ?>" alt="<?= t('passive allowed icon') ?>" />
+                  title="<?= t('allowed through parent album, click to allow explicitly')->for_html_attr() ?>">
+                  <img src="<?= url::file('themes/default/images/ico-success-pale.png') ?>" alt="<?= t('passive allowed icon')->for_html_attr() ?>" />
                 </a>
                 <a href="javascript:set('deny',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
-                  title="<?= t('click to deny') ?>">
-                  <img src="<?= url::file('themes/default/images/ico-denied-gray.png') ?>" alt="<?= t('inactive denied icon') ?>" />
+                  title="<?= t('click to deny')->for_html_attr() ?>">
+                  <img src="<?= url::file('themes/default/images/ico-denied-gray.png') ?>" alt="<?= t('inactive denied icon')->for_html_attr() ?>" />
                 </a>
               </td>
             <? else: ?>
               <td class="gDenied">
                 <a href="javascript:set('allow',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
-                  title="<?= t('click to allow') ?>">
-                  <img src="<?= url::file('themes/default/images/ico-success-gray.png') ?>" alt="<?= t('inactive allowed icon') ?>" />
+                  title="<?= t('click to allow')->for_html_attr() ?>">
+                  <img src="<?= url::file('themes/default/images/ico-success-gray.png') ?>" alt="<?= t('inactive allowed icon')->for_html_attr() ?>" />
                 </a>
                 <a href="javascript:set('deny',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
-                  title="<?= t('denied through parent album, click to deny explicitly') ?>">
-                  <img src="<?= url::file('themes/default/images/ico-denied-pale.png') ?>" alt="<?= t('passive denied icon') ?>" />
+                  title="<?= t('denied through parent album, click to deny explicitly')->for_html_attr() ?>">
+                  <img src="<?= url::file('themes/default/images/ico-denied-pale.png') ?>" alt="<?= t('passive denied icon')->for_html_attr() ?>" />
                 </a>
               </td>
             <? endif ?>
@@ -54,31 +54,31 @@
           <? elseif ($intent === access::DENY): ?>
             <td class="gDenied">
               <a href="javascript:set('allow',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
-                title="<?= t('click to allow') ?>">
-                <img src="<?= url::file('themes/default/images/ico-success-gray.png') ?>" alt="<?= t('inactive allowed icon') ?>" />
+                title="<?= t('click to allow')->for_html_attr() ?>">
+                <img src="<?= url::file('themes/default/images/ico-success-gray.png') ?>" alt="<?= t('inactive allowed icon')->for_html_attr() ?>" />
               </a>
               <? if ($item->id == 1): ?>
-                <img src="<?= url::file('themes/default/images/ico-denied.png') ?>" alt="<?= t('denied icon') ?>" title="<?= t('denied') ?>"/>
+                <img src="<?= url::file('themes/default/images/ico-denied.png') ?>" alt="<?= t('denied icon')->for_html_attr() ?>" title="<?= t('denied')->for_html_attr() ?>"/>
               <? else: ?>
                 <a href="javascript:set('reset',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
-                  title="<?= t('denied, click to reset') ?>">
-                  <img src="<?= url::file('themes/default/images/ico-denied.png') ?>" alt="<?= t('denied icon') ?>" />
+                  title="<?= t('denied, click to reset')->for_html_attr() ?>">
+                  <img src="<?= url::file('themes/default/images/ico-denied.png') ?>" alt="<?= t('denied icon')->for_html_attr() ?>" />
                 </a>
               <? endif ?>
             </td>
           <? elseif ($intent === access::ALLOW): ?>
             <td class="gAllowed">
               <? if ($item->id == 1): ?>
-                <img src="<?= url::file('themes/default/images/ico-success.png') ?>" title="<?= t("allowed") ?>" alt="<?= t('allowed icon') ?>" />
+                <img src="<?= url::file('themes/default/images/ico-success.png') ?>" title="<?= t("allowed")->for_html_attr() ?>" alt="<?= t('allowed icon')->for_html_attr() ?>" />
               <? else: ?>
                 <a href="javascript:set('reset',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
-                  title="<?= t('allowed, click to reset') ?>">
-                  <img src="<?= url::file('themes/default/images/ico-success.png') ?>" alt="<?= t('allowed icon') ?>" />
+                  title="<?= t('allowed, click to reset')->for_html_attr() ?>">
+                  <img src="<?= url::file('themes/default/images/ico-success.png') ?>" alt="<?= t('allowed icon')->for_html_attr() ?>" />
                 </a>
               <? endif ?>
               <a href="javascript:set('deny',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
-                title="<?= t('click to deny') ?>">
-                <img src="<?= url::file('themes/default/images/ico-denied-gray.png') ?>" alt="<?= t('inactive denied icon') ?>" />
+                title="<?= t('click to deny')->for_html_attr() ?>">
+                <img src="<?= url::file('themes/default/images/ico-denied-gray.png') ?>" alt="<?= t('inactive denied icon')->for_html_attr() ?>" />
               </a>
             </td>
           <? endif ?>
diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index 9cf554ec..7f8a96df 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -35,7 +35,7 @@
     <span id="gUploadQueueInfo">
       <?= t("Upload Queue") ?>
     </span>
-    <a id="gUploadCancel" title="<?= t("Cancel all the pending uploads") ?>" onclick="swfu.cancelQueue();"><?= t("cancel") ?></a>
+    <a id="gUploadCancel" title="<?= t("Cancel all the pending uploads")->for_html_attr() ?>" onclick="swfu.cancelQueue();"><?= t("cancel") ?></a>
   </p>
   <div id="gAddPhotosCanvas" style="text-align: center;">
     <div id="gAddPhotosQueue"></div>
diff --git a/modules/rss/views/feed.mrss.php b/modules/rss/views/feed.mrss.php
index 731703c7..3612cbc0 100644
--- a/modules/rss/views/feed.mrss.php
+++ b/modules/rss/views/feed.mrss.php
@@ -22,25 +22,25 @@
     <lastBuildDate><?= $pub_date ?></lastBuildDate>
     <? foreach ($feed->children as $child): ?>
     <item>
-      <title><?= html::clean($child->title) ?></title>
+      <title><?= html::purify($child->title) ?></title>
       <link><?= url::abs_site("{$child->type}s/{$child->id}") ?></link>
       <guid isPermaLink="true"><?= url::abs_site("{$child->type}s/{$child->id}") ?></guid>
       <pubDate><?= date("D, d M Y H:i:s T", $child->created); ?></pubDate>
       <content:encoded>
         <![CDATA[
-          <span><?= html::clean($child->description) ?></span>
+          <span><?= html::purify($child->description) ?></span>
           <p>
           <? if ($child->type == "photo" || $child->type == "album"): ?>
             <img alt="" src="<?= $child->resize_url(true) ?>"
-                 title="<?= html::clean($child->title) ?>"
+                 title="<?= html::purify($child->title)->for_html_attr() ?>"
                  height="<?= $child->resize_height ?>" width="<?= $child->resize_width ?>" /><br />
           <? else: ?>
             <a href="<?= url::abs_site("{$child->type}s/{$child->id}") ?>">
             <img alt="" src="<?= $child->thumb_url(true) ?>"
-                 title="<?= html::clean($child->title) ?>"
+                 title="<?= html::purify($child->title)->for_html_attr() ?>"
                  height="<?= $child->thumb_height ?>" width="<?= $child->thumb_width ?>" /></a><br />
           <? endif ?>
-            <?= html::clean($child->description) ?>
+            <?= html::purify($child->description) ?>
           </p>
         ]]>
       </content:encoded>
diff --git a/modules/search/views/search_link.html.php b/modules/search/views/search_link.html.php
index 3f1bca91..51bb4e14 100644
--- a/modules/search/views/search_link.html.php
+++ b/modules/search/views/search_link.html.php
@@ -6,7 +6,7 @@
       <input type="text" name="q" id="gSearch"/>
     </li>
     <li>
-      <input type="submit" value="<?= t("Go") ?>" />
+      <input type="submit" value="<?= t("Go")->for_html_attr() ?>" />
     </li>
   </ul>
 </form>
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 9455f9d9..c065e4b1 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -44,7 +44,7 @@
 <div class="gBlock">
   <a href="<?= url::site("admin/users/add_user_form") ?>"
       class="gDialogLink gButtonLink right ui-icon-left ui-state-default ui-corner-all"
-      title="<?= t("Create a new user") ?>">
+      title="<?= t("Create a new user")->for_html_attr() ?>">
     <span class="ui-icon ui-icon-circle-plus"></span>
     <?= t("Add a new user") ?>
   </a>
@@ -67,8 +67,8 @@
       <tr id="gUser-<?= $user->id ?>" class="<?= text::alternate("gOddRow", "gEvenRow") ?> user <?= $user->admin ? "admin" : "" ?>">
         <td id="user-<?= $user->id ?>" class="core-info gDraggable">
           <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
-               title="<?= t("Drag user onto group below to add as a new member") ?>"
-               alt="<?= html::clean($user->name) ?>"
+               title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
+               alt="<?= html::clean_attribute($user->name) ?>"
                width="20"
                height="20" />
           <?= html::clean($user->name) ?>
@@ -92,7 +92,7 @@
               class="gDialogLink gButtonLink ui-state-default ui-corner-all ui-icon-left">
             <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
           <? else: ?>
-          <span title="<?= t("This user cannot be deleted") ?>"
+          <span title="<?= t("This user cannot be deleted")->for_html_attr() ?>"
               class="gButtonLink ui-state-disabled ui-corner-all ui-icon-left">
             <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></span>
           <? endif ?>
@@ -106,7 +106,7 @@
 <div id="gGroupAdmin" class="gBlock">
   <a href="<?= url::site("admin/users/add_group_form") ?>"
       class="gDialogLink gButtonLink right ui-icon-left ui-state-default ui-corner-all"
-      title="<?= t("Create a new group") ?>">
+      title="<?= t("Create a new group")->for_html_attr() ?>">
     <span class="ui-icon ui-icon-circle-plus"></span>
     <?= t("Add a new group") ?>
   </a>
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
index 8418ebc9..476e0817 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/user/views/admin_users_group.html.php
@@ -3,11 +3,11 @@
   <?= html::clean($group->name) ?>
   <? if (!$group->special): ?>
   <a href="<?= url::site("admin/users/delete_group_form/$group->id") ?>"
-    title="<?= t("Delete the %name group", array("name" => $group->name)) ?>"
+    title="<?= t("Delete the %name group", array("name" => $group->name))->for_html_attr() ?>"
     class="gDialogLink gButtonLink ui-state-default ui-corner-all">
     <span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
   <? else: ?>
-  <a title="<?= t("This default group cannot be deleted") ?>"
+  <a title="<?= t("This default group cannot be deleted")->for_html_attr() ?>"
      class="gDialogLink gButtonLink ui-state-disabled ui-corner-all ui-icon-left">
     <span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
   <? endif ?>
@@ -22,7 +22,7 @@
     <a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)"
        class="gButtonLink ui-state-default ui-corner-all ui-icon-left"
        title="<?= t("Remove %user from %group group",
-              array("user" => $user->name, "group" => $group->name)) ?>">
+              array("user" => $user->name, "group" => $group->name))->for_html_attr() ?>">
       <span class="ui-icon ui-icon-closethick"><?= t("remove") ?></span>
     </a>
     <? endif ?>
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index 27431ce8..bb670d51 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -3,7 +3,7 @@
   <? if ($user->guest): ?>
   <li class="first">
     <a href="<?= url::site("login/ajax") ?>"
-       title="<?= t("Login to Gallery") ?>"
+       title="<?= t("Login to Gallery")->for_html_attr() ?>"
        id="gLoginLink"><?= t("Login") ?></a>
   </li>
   <? else: ?>
diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php
index e83a7efa..ac69d21d 100644
--- a/modules/watermark/views/admin_watermarks.html.php
+++ b/modules/watermark/views/admin_watermarks.html.php
@@ -7,7 +7,7 @@
 
   <? if (empty($name)): ?>
   <a href="<?= url::site("admin/watermarks/form_add") ?>"
-     title="<?= t("Upload a watermark") ?>"
+     title="<?= t("Upload a watermark")->for_html_attr() ?>"
      class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-document-b"></span><?= t("Upload a watermark") ?></a>
   <? else: ?>
   <h2> <?= t("Active Watermark") ?> </h2>
@@ -26,10 +26,10 @@
     </div>
     <div class="controls">
       <a href="<?= url::site("admin/watermarks/form_edit") ?>"
-         title="<?= t("Edit Watermark") ?>"
+         title="<?= t("Edit Watermark")->for_html_attr() ?>"
          class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-pencil"></span><?= t("edit") ?></a>
       <a href="<?= url::site("admin/watermarks/form_delete") ?>"
-         title="<?= t("Delete Watermark") ?>"
+         title="<?= t("Delete Watermark")->for_html_attr() ?>"
          class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
     </div>
   </div>
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 3b1ff92c..c54fdcb5 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -48,7 +48,7 @@
           <li class="first"><?= html::anchor("albums/1", "&larr; ".t("Back to the Gallery")) ?></li>
           <li id="gLogoutLink"><a href="<?= url::site("logout?continue=albums/1&amp;csrf=$csrf") ?>"><?= t("Logout") ?></a></li>
         </ul>
-        <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery") ?>">
+        <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
           &larr; <?= t("back to the ...") ?>
         </a>
         <div id="gSiteAdminMenu" style="display: none;">
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 7d181ea0..1650debe 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -81,8 +81,8 @@
           <? if ($header_text = module::get_var("gallery", "header_text")): ?>
           <?= $header_text ?>
           <? else: ?>
-          <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery home") ?>">
-            <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site") ?>" src="<?= $theme->url("images/logo.png") ?>" />
+          <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
+            <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= $theme->url("images/logo.png") ?>" />
           </a>
           <? endif ?>
           <div id="gSiteMenu">
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index 5289b467..b0096043 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -40,7 +40,7 @@
   <div id="gPhoto">
     <?= $theme->resize_top($item) ?>
     <? if (access::can("view_full", $item)): ?>
-    <a href="<?= $item->file_url() ?>" class="gFullSizeLink" title="<?= t("View full size") ?>">
+    <a href="<?= $item->file_url() ?>" class="gFullSizeLink" title="<?= t("View full size")->for_html_attr() ?>">
       <? endif ?>
       <?= $item->resize_img(array("id" => "gPhotoId-{$item->id}", "class" => "gResize")) ?>
       <? if (access::can("view_full", $item)): ?>
-- 
cgit v1.2.3


From 1d3069145273bcb3514f08fa9eee2dbf55a07b01 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Tue, 1 Sep 2009 12:14:23 -0700
Subject: Add missing mark_clean() for t() calls with %attr parameter.

---
 modules/comment/views/comments.html.php          | 2 +-
 modules/recaptcha/views/admin_recaptcha.html.php | 2 +-
 themes/default/views/album.html.php              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'themes/default/views')

diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index b7ebdf3a..7eb34c20 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -8,7 +8,7 @@
 <? if (!$comments->count()): ?>
 <p id="gNoCommentsYet">
   <?= t("No comments yet. Be the first to <a %attrs>comment</a>!",
-      array("attrs" => "href=\"#add_comment_form\" class=\"showCommentForm\"")) ?>
+        array("attrs" => html::mark_clean("href=\"#add_comment_form\" class=\"showCommentForm\""))) ?>
 </p>
 <? endif ?>
 <ul>
diff --git a/modules/recaptcha/views/admin_recaptcha.html.php b/modules/recaptcha/views/admin_recaptcha.html.php
index 35722be4..0a4b1f8f 100644
--- a/modules/recaptcha/views/admin_recaptcha.html.php
+++ b/modules/recaptcha/views/admin_recaptcha.html.php
@@ -4,7 +4,7 @@
   <p>
     <?= t("reCAPTCHA is a free CAPTCHA service that helps to digitize books, newspapers and old time radio shows.  In order to use it, you need to sign up for a <a href=\"%domain_url\">reCAPTCHA Public/Private Key pair</a>, which is also free.  Once registered, the challenge and response strings are evaluated at <a href=\"%recaptcha_url\">recaptcha.net</a> to determine if the form content has been entered by a bot.",
           array("domain_url" => $form->get_key_url,
-                "recaptcha_url" => html::mark_safe("http://recaptcha.net"))) ?>
+                "recaptcha_url" => html::mark_clean("http://recaptcha.net"))) ?>
   </p>
 
      <?= $form ?>
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index caabeee3..8bc81a31 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -30,7 +30,7 @@
   <? if ($user->admin || access::can("add", $item)): ?>
   <? $addurl = url::file("index.php/simple_uploader/app/$item->id") ?>
   <li><?= t("There aren't any photos here yet! <a %attrs>Add some</a>.",
-            array("attrs" => "href=\"$addurl\" class=\"gDialogLink\"")) ?></li>
+            array("attrs" => html::mark_clean("href=\"$addurl\" class=\"gDialogLink\""))) ?></li>
   <? else: ?>
   <li><?= t("There aren't any photos here yet!") ?></li>
   <? endif; ?>
-- 
cgit v1.2.3


From bc147d1c6c95c1ba1394f0198d9e5b810071a4ac Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Tue, 1 Sep 2009 23:22:06 -0600
Subject: Merged admin_screen and screen style sheets in the admin theme.
 Removed some unsused admin styles in the process. Fixed problem in admin
 header that broke the theme's layout in IE7. Moved the Gallery logo and
 shortcut icon to lib/images for easier reuse.

---
 lib/images/logo.png                       | Bin 0 -> 10222 bytes
 themes/admin_default/css/admin_screen.css | 468 ---------------------
 themes/admin_default/css/fix-ie.css       |   3 +-
 themes/admin_default/css/screen.css       | 663 +++++++++++++++++-------------
 themes/admin_default/views/admin.html.php |   4 +-
 themes/default/images/favicon.ico         | Bin 1150 -> 0 bytes
 themes/default/images/logo.png            | Bin 10222 -> 0 bytes
 themes/default/views/page.html.php        |   4 +-
 8 files changed, 375 insertions(+), 767 deletions(-)
 create mode 100644 lib/images/logo.png
 delete mode 100644 themes/default/images/favicon.ico
 delete mode 100644 themes/default/images/logo.png

(limited to 'themes/default/views')

diff --git a/lib/images/logo.png b/lib/images/logo.png
new file mode 100644
index 00000000..7d7b9b9b
Binary files /dev/null and b/lib/images/logo.png differ
diff --git a/themes/admin_default/css/admin_screen.css b/themes/admin_default/css/admin_screen.css
index a8c16ae5..b940bd2d 100644
--- a/themes/admin_default/css/admin_screen.css
+++ b/themes/admin_default/css/admin_screen.css
@@ -1,472 +1,4 @@
-/**
- * Gallery 3 Default Admin Theme Screen Styles
- *
- * Extends themes/default/css/screen.css
- *
- * 1)  Basic HTML elements
- * 2) Reusable content blocks
- * 3) Page layout containers
- * 4) Content blocks in specific layout containers
- * 5) Browser hacks
- * 6) jQuery and jQuery UI
- * 7) Server Add
- * 8) Digibug Print Administration
- */
-
-/** *******************************************************************
- * 1) Basic HTML elements
- **********************************************************************/
-
-/** *******************************************************************
- * 2) Reusable content blocks
- **********************************************************************/
-
-.gBlock {
-  background-color: #fff;
-  border: 1px solid #ccc;
-  margin-bottom: 1em;
-  padding: 1em;
-}
-
-#gSidebar .gBlockContent {
-  padding: 0;
-}
-
-.gSelected img,
-.gAvailable .gBlock img {
-  float: left;
-  margin: 0 1em 1em 0;
-}
-
-.rtl .gSelected img,
-.rtl .gAvailable .gBlock img {
-  float: right;
-}
-
-.gSelected {
-  background: #e8e8e8;
-}
-
-.gAvailable .gInstalledToolkit:hover {
-  cursor: pointer;
-  background: #eee;
-}
-
-.gAvailable .gButtonLink {
-  width: 96%;
-}
-
-.gSelected .gButtonLink {
-  display: none;
-}
-
-.gUnavailable {
-  border-color: #999;
-  opacity: 0.4;
-}
-
-.gOddRow {
-  background-color: #eee;
-}
-
-.gEvenRow {
-  background-color: #fff;
-}
-
-/** *******************************************************************
- * 3) Page layout containers
- **********************************************************************/
-
-.gView {
-  min-width: 974px !important;
-}
-
-#gHeader {
-  background-color: #e8e8e8;
-  border-bottom: 1px solid #ccc;
-  margin-bottom: 20px;
-  padding: 0 20px;
-}
-
-#gContent {
-  font-size: 1.1em;
-  width: 96%;
-}
-
-/** *******************************************************************
- * 4) Content blocks in specific layout containers
- *********************************************************************/
-
-#gHeader #gLogo {
-  float: left;
-  margin: -22px 10px 0 0;
-  display: block;
-  padding-left: 2px;
-  width: 105px; /* 107px - padding-left */
-  height: 48px;
-  background-image: url('../../default/images/logo.png');
-  color: #A5A5A5 ! important;
-}
-#gHeader #gLogo:hover {
-  color: #FF6600 ! important;
-  text-decoration: none;
-}
-
-#gHeader #gLoginMenu {
-  float: none;
-  margin: 0;
-  padding: 5px 0 10px 0;
-  text-align: right;
-}
-
-
-.rtl #gHeader #gLoginMenu {
-  text-align: left;
-}
-
-#gHeader #gSiteAdminMenu {
-  float: left;
-  font-size: 1.2em;
-}
-
-.rtl #gHeader #gSiteAdminMenu {
-  float: right;
-}
-
-#gHeader #gSiteAdminMenu ul {
-  margin-bottom: 0;
-}
-
-.gBlock .ui-dialog-titlebar {
-  margin: -1em -1em 0;
-}
-
-#gSidebar .gBlock h2 {
-  background: none;
-}
-
-#gPhotoStream {
-  background-color: #e8e8e8;
-}
-
-#gPhotoStream .gBlockContent ul {
-  border-right: 1px solid #e8e8e8;
-  height: 135px;
-  overflow: auto;
-  overflow: -moz-scrollbars-horizontal; /* for FF */
-  overflow-x: scroll; /* scroll horizontal */
-  overflow-y: hidden; /* Hide vertical*/
-}
-
-#gContent #gPhotoStream .gItem {
-  background-color: #fff;
-  border: 1px solid #e8e8e8;
-  border-right-color: #ccc;
-  border-bottom-color: #ccc;
-  float: left;
-  height: 90px;
-  overflow: hidden;
-  text-align: center;
-  width: 90px;
-}
-
-.rtl #gContent #gPhotoStream .gItem {
-  float: right;
-}
-
-#gSiteStatus {
-  margin-bottom: 0;
-}
-
-#gContent .gItem {
-  background-color: #fff;
-  border: 1px solid #e8e8e8;
-  border-right-color: #ccc;
-  border-bottom-color: #ccc;
-  height: 90px;
-  padding: 14px 8px;
-  text-align: center;
-  width: 90px;
-}
-
-#gAdminCommentsMenu {
-  margin: 1em 0;
-}
-
-#gAdminCommentsMenu a {
-  margin: 0;
-  padding: .2em .6em;
-}
-
-#gAdminGraphics .gAvailable .gBlock {
-  clear: none;
-  float: left;
-  height: 17em;
-  margin-right: 1em;
-  width: 30%;
-}
-
-.rtl #gAdminGraphics .gAvailable .gBlock {
-  float: right;
-  margin-left: 1em;
-  margin-right: 0em;
-}
-
-#gSiteTheme,
-#gAdminTheme {
-  float: left;
-  width: 48%;
-}
-
-.rtl #gSiteTheme,
-.rtl #gAdminTheme {
-  float: right;
-}
-
-#gSiteTheme {
-  margin-right: 1em;
-}
-
-#gUserAdminList {
-  margin-bottom: 1em;
-}
-#gUserAdminList td {
-  vertical-align: bottom;
-}
-
-#gUserAdminList .gDraggable:hover {
-  border: 1px dashed black;
-}
-
-#gUserAdminList .admin {
-  color: #55f;
-  font-weight: bold;
-}
-
-.gActions a,
-.gActions span {
-  margin-right: 3em;
-}
-
-li.gGroup {
-  float: left;
-  display: block;
-  width: 200px;
-  border: 1px solid gray;
-  padding: 0;
-  margin: 0 1em 1em 0;
-}
-
-.rtl li.gGroup {
-  float: right;
-}
-
-li.gGroup h4 {
-  background-color: #eee;
-  border-bottom: 1px dashed ccc;
-  padding: .5em 0 .5em .5em;
-}
-li.gGroup .gButtonLink {
-  padding: 0;
-}
-li.gGroup ul, li.gGroup div {
-  height: 180px;
-  margin: 1px;
-  overflow: auto;
-  padding-top: .2em;
-}
-li.gGroup div p {
-  color: gray;
-  text-align: center;
-  padding: 2em .5em 0 .5em
-}
-li.gGroup .gUser {
-  padding: .2em 0 0 .5em;
-}
-li.gGroup .gUser .gButtonLink {
-  vertical-align: middle;
-}
-
-li.gDefaultGroup h4, li.gDefaultGroup .gUser {
-  color: gray;
-}
-
-#gAdminAdvancedSettings tr.setting:hover {
-  background: #ffc;
-}
-
-/** *******************************************************************
- * 5) Browser hacks
- *********************************************************************/
-
-#gHeader:after,
-#gAdminCommentsMenu:after,
-#gGroupAdmin:after,
-.gSelected:after,
-.gAvailable .gBlock:after,
-#gModuleCreateForm ul li ul:after,
-#gDeveloperTools:after,
-#gPhotoStream:after {
-  clear: both;
-  content: ".";
-  display: block;
-  height: 0;
-  visibility: hidden;
-}
-
 /** *******************************************************************
  * 6) jQuery and jQuery UI
  *********************************************************************/
 
-#gPanel {
-  display: none;
-  padding: 1em;
-}
-
-#gPanel legend {
-  display: none;
-}
-
-#gPanel fieldset {
-  border: none;
-}
-
-.ui-draggable {
-  cursor: move;
-}
-
-.gButtonSetVertical a {
-  width: 8em !important;
-}
-
-#gAdminDashboard .ui-dialog-titlebar,
-#gAdminDashboardSidebar .ui-dialog-titlebar {
-  padding: .2em .4em;
-}
-
-/**** Stuff that needs a home! ****/
-#gTagAdmin {
-  table-layout: fixed;
-}
-#gTagAdmin td {
-  border: 0;
-}
-#gTagAdmin ul {
-  padding-bottom: .3em;
-}
-#gTagAdmin li {
-  padding: .1em 0 .2em .3em;
-}
-#gTagAdmin .gColumn {
-  float: left;
-  width: 200px;
-}
-.rtl #gTagAdmin .gColumn {
-  float: right;
-}
-.gEditable {
-  padding: .1em .3em .2em .3em;
-}
-.gEditable:hover {
-  background-color: #ffc;
-  cursor: text;
-}
-#gRenameTagForm input {
-  padding: 0 .2em 0 .2em;
-  clear: none;
-  float: left;
-  margin: 0 .2em 0 0;
-}
-.rtl #gRenameTagForm input {
-  float: right;
-}
-#gRenameTagForm input[type="submit"] {
-  height: 25px;
-}
-#gRenameTagForm a, #gRenameTagForm span {
-  display: block;
-  float: left;
-  padding: .2em .2em 0 .1em;
-}
-.rtl #gRenameTagForm a, #gRenameTagForm span {
-  float: right;
-}
-
-#gTaskLogDialog h1 {
-  font-size: 1.1em;
-}
-
-.gTaskLog {
-  border: 1pt solid;
-  font-size: .9em;
-  height: 400px;
-  margin: .5em 0;
-  overflow: auto;
-  padding: .5em
-}
-
-
-/** *******************************************************************
- * 7) Server Add
- *********************************************************************/
-#gServerAddAdmin {
-  margin:auto;
-  text-align: left;
-}
-
-.rtl #gServerAddAdmin {
-  text-align: right;
-}
-
-#gServerAddAdmin form fieldset {
-  border: medium none;
-}
-
-#gServerAddAdmin legend {
-  display: none;
-}
-
-#gServerAddAdmin .gWarning {
-  background-color: #FFFF99;
-}
-
-#gAuthorizedPath {
-  margin: 0 !important;
-  padding: 0.3em 1.5em 0.3em 1em;
-}
-
-#gServerAdd Admin #path {
-  width: 80%;
-}
-
-.gRemoveDir:hover {
-  cursor: pointer;
-}
-
-#gLanguagesForm table {
-	width: 400px;
-	float: left;
-	margin: 0 3em 1em 0;
-}
-#gLanguagesForm .installed {
-  background-color: #EEEEEE;
-}
-#gLanguagesForm .default {
-	background-color: #C5DBEC;
-	font-weight: bold;
-}
-#gLanguagesForm input {
-	clear: both;
-}
-
-#gTranslations {
-	padding: 2em 0 0 0;
-	clear: both;
-}
-#gTranslations .gButtonLink {
-	padding: .5em;
-}
-
-.gDocLink {
-  float: right;
-}
diff --git a/themes/admin_default/css/fix-ie.css b/themes/admin_default/css/fix-ie.css
index 97c619eb..6bc2334c 100644
--- a/themes/admin_default/css/fix-ie.css
+++ b/themes/admin_default/css/fix-ie.css
@@ -1,9 +1,8 @@
 /**
- * Fix display in IE
+ * Fix display in IE 6 and 7
  */
 
 #gHeader,
-#gAdminMenu,
 #gGroupAdmin,
 #gDeveloperTools,
 .gAvailable .gBlock {
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index eb8f9224..24328133 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -267,8 +267,15 @@ li.gError select {
  *********************************************************************/
 
 .gBlock {
+  background-color: #fff;
+  border: 1px solid #ccc;
   clear: both;
   margin-bottom: 2.5em;
+  padding: 1em;
+}
+
+#gSidebar .gBlockContent {
+  padding: 0;
 }
 
 .gBlock h2 {
@@ -280,6 +287,47 @@ li.gError select {
   margin-top: 1em;
 }
 
+.gSelected img,
+.gAvailable .gBlock img {
+  float: left;
+  margin: 0 1em 1em 0;
+}
+
+.rtl .gSelected img,
+.rtl .gAvailable .gBlock img {
+  float: right;
+}
+
+.gSelected {
+  background: #e8e8e8;
+}
+
+.gAvailable .gInstalledToolkit:hover {
+  cursor: pointer;
+  background: #eee;
+}
+
+.gAvailable .gButtonLink {
+  width: 96%;
+}
+
+.gSelected .gButtonLink {
+  display: none;
+}
+
+.gUnavailable {
+  border-color: #999;
+  opacity: 0.4;
+}
+
+.gOddRow {
+  background-color: #eee;
+}
+
+.gEvenRow {
+  background-color: #fff;
+}
+
 /* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #gMessage {
@@ -375,22 +423,24 @@ table .gSuccess {
   background-color: #fff;
   border: 1px solid #ccc;
   border-bottom: none;
+  min-width: 974px !important;
 }
 
 /* Layout containers ~~~~~~~~~~~~~~~~~~~~~ */
 
 #gHeader {
   background-color: #e8e8e8;
-  border-bottom: 1px solid #fff;
+  border-bottom: 1px solid #ccc;
   font-size: .8em;
-  margin-bottom: 1em;
-  padding: 1em 20px 0 20px;
+  margin-bottom: 20px;
+  padding: 0 20px;
+  position: relative;
 }
 
 #gContent {
-  font-size: 1.2em;
+  font-size: 1.1em;
   padding-left: 20px;
-  width: 696px;
+  width: 96%;
 }
 
 #gSidebar {
@@ -414,9 +464,18 @@ table .gSuccess {
 
 /* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gHeader #gLogo img {
-  float: left;
-  margin: -4px 10px 0 0;
+#gHeader #gLogo {
+  background: transparent url('../../../lib/images/logo.png') no-repeat 0 .5em;
+  color: #A5A5A5 !important;
+  display: block;
+  height: 55px;
+  padding-top: 5px;
+  width: 105px;
+}
+
+#gHeader #gLogo:hover {
+  color: #f60 !important;
+  text-decoration: none;
 }
 
 #gHeader #gQuickSearchForm {
@@ -438,94 +497,6 @@ table .gSuccess {
   padding-left: 1em;
 }
 
-/* Album content ~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gContent #gAlbumGrid {
-  margin: 1em 0;
-}
-
-#gContent #gAlbumGrid .gItem {
-  border: 1px solid #e8e8e8;
-  border-right-color: #ccc;
-  border-bottom-color: #ccc;
-  float: left;
-  font-size: .7em;
-  height: 240px;
-  overflow: hidden;
-  padding: 15px 8px 30px 8px;
-  position: relative;
-  text-align: center;
-  width: 213px;
-}
-
-#gContent #gAlbumGrid .gItem h2 {
-  margin: 5px 0;
-}
-
-#gContent #gAlbumGrid .gAlbum {
-  background-color: #e8e8e8;
-}
-
-#gContent #gAlbumGrid .gAlbum h2 span {
-  background: transparent url('../images/ico-album.png') no-repeat top left !important;
-  display: inline-block;
-  height: 16px;
-  margin-right: 5px;
-  width: 16px;
-}
-
-/* Individual photo content ~~~~~~~~~~~~~~ */
-
-#gContent #gItem {
-  width: 99%;
-}
-
-#gContent #gPhoto {
-  position: relative;
-}
-
-#gContent #gItem .gFullSizeLink img {
-  display: block;
-  margin: 1em auto !important;
-}
-
-#gContent #gComments {
-  margin-top: 2em;
-}
-
-#gContent #gComments ul li {
-  margin: 1em 0;
-}
-
-#gContent #gComments .gAuthor {
-  border-bottom: 1px solid #ccc;
-  color: #999;
-  height: 32px;
-  line-height: 32px;
-}
-
-#gContent #gComments ul li div {
-  padding: 0 8px 8px 43px;
-}
-
-#gContent #gComments ul li #gRecaptcha {
-  padding: 0;
-}
-
-#gContent #gComments ul li #gRecaptcha div {
-  padding: 0;
-}
-
-#gContent #gComments .gAvatar {
-  height: 32px;
-  margin-right: .4em;
-  width: 32px;
-}
-
-#gContent #gAddCommentForm {
-  margin-top: 2em;
-}
-
 /* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #gHeader #gLoginMenu li,
@@ -546,190 +517,198 @@ table .gSuccess {
   padding-top: 1em;
 }
 
-/** *******************************************************************
- * 5) Navigation and menus
- *********************************************************************/
-
-#gSiteMenu,
-.gBreadcrumbs,
-#gTagCloud ul {
-  font-size: 1.2em;
+.gBlock .ui-dialog-titlebar {
+  margin: -1em -1em 0;
 }
 
-/* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#gSidebar .gBlock h2 {
+  background: none;
+}
 
-#gHeader #gLoginMenu {
-  color: #999;
-  float: right;
+#gPhotoStream {
+  background-color: #e8e8e8;
 }
 
-/* Site Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#gPhotoStream .gBlockContent ul {
+  border-right: 1px solid #e8e8e8;
+  height: 135px;
+  overflow: auto;
+  overflow: -moz-scrollbars-horizontal; /* for FF */
+  overflow-x: scroll; /* scroll horizontal */
+  overflow-y: hidden; /* Hide vertical*/
+}
 
-#gSiteMenu {
+#gContent #gPhotoStream .gItem {
+  background-color: #fff;
+  border: 1px solid #e8e8e8;
+  border-right-color: #ccc;
+  border-bottom-color: #ccc;
   float: left;
-  margin-top: 20px;
-  padding: 0 20px 0 0;
+  height: 90px;
+  overflow: hidden;
+  text-align: center;
+  width: 90px;
 }
 
-#gSiteMenu ul {
-  margin-bottom: 0;
+.rtl #gContent #gPhotoStream .gItem {
+  float: right;
 }
 
-/* Thumb Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gContent .gThumbMenu {
-  bottom: 0;
-  left: 0;
-  position: absolute;
-  width: 100%;
+#gSiteStatus {
+  margin-bottom: 0;
 }
 
-#gContent .gThumbMenu li {
-  border-left: none;
-  border-right: none;
-  border-bottom: none;
+#gContent .gItem {
+  background-color: #fff;
+  border: 1px solid #e8e8e8;
+  border-right-color: #ccc;
+  border-bottom-color: #ccc;
+  height: 90px;
+  padding: 14px 8px;
+  text-align: center;
+  width: 90px;
 }
 
-#gContent .gThumbMenu li li {
-  padding: .3em;
+#gAdminCommentsMenu {
+  margin: 1em 0;
 }
 
-#gContent .gThumbMenu a:hover {
-  text-decoration: none;
+#gAdminCommentsMenu a {
+  margin: 0;
+  padding: .2em .6em;
 }
 
-/* View Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gViewMenu {
-  margin-bottom: 1em;
+#gAdminGraphics .gAvailable .gBlock {
+  clear: none;
+  float: left;
+  height: 17em;
+  margin-right: 1em;
+  width: 30%;
 }
 
-#gViewMenu a {
-  background-repeat: no-repeat;
-  background-position: 50% 50%;
-  height: 28px !important;
-  width: 43px !important;
+.rtl #gAdminGraphics .gAvailable .gBlock {
+  float: right;
+  margin-left: 1em;
+  margin-right: 0em;
 }
 
-#gViewMenu #gHybridLink {
-  background-image: url('../images/ico-view-hybrid.png');
+#gSiteTheme,
+#gAdminTheme {
+  float: left;
+  width: 48%;
 }
 
-#gViewMenu #gSlideshowLink {
-  background-image: url('../images/ico-view-slideshow.png');
+.rtl #gSiteTheme,
+.rtl #gAdminTheme {
+  float: right;
 }
 
-#gViewMenu .gFullSizeLink {
-  background-image: url('../images/ico-view-fullsize.png');
+#gSiteTheme {
+  margin-right: 1em;
 }
 
-#gViewMenu #gCommentsLink {
-  background-image: url('../images/ico-view-comments.png');
+#gUserAdminList {
+  margin-bottom: 1em;
 }
-
-#gViewMenu #gDigibugLink {
-  background-image: url('../images/ico-print.png');
+#gUserAdminList td {
+  vertical-align: bottom;
 }
 
-/* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-.gBreadcrumbs {
-  background-color: #fff;
-  border-top: 1px solid #ccc;
-  clear: both;
-  margin: 0 -20px;
-  padding-left: 20px;
+#gUserAdminList .gDraggable:hover {
+  border: 1px dashed black;
 }
 
-.gBreadcrumbs li {
-  background: transparent url('../images/ico-separator.gif') no-repeat scroll left center;
-  float: left;
-  padding: 10px 6px 10px 16px !important;
+#gUserAdminList .admin {
+  color: #55f;
+  font-weight: bold;
 }
 
-.gBreadcrumbs li.root {
-  background: transparent;
+.gActions a,
+.gActions span {
+  margin-right: 3em;
 }
 
-.gBreadcrumbs li a,
-.gBreadcrumbs li span {
+li.gGroup {
+  float: left;
   display: block;
+  width: 200px;
+  border: 1px solid gray;
+  padding: 0;
+  margin: 0 1em 1em 0;
 }
 
-.gBreadcrumbs li.active,
-.gBreadcrumbs li.active span {
-  font-weight: bold;
+.rtl li.gGroup {
+  float: right;
 }
 
-#gAddPhotos .gBreadcrumbs {
-  font-size: .9em;
+li.gGroup h4 {
+  background-color: #eee;
+  border-bottom: 1px dashed ccc;
+  padding: .5em 0 .5em .5em;
 }
-
-/* Tags and cloud ~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gTagCloud ul {
-  text-align: justify;
+li.gGroup .gButtonLink {
+  padding: 0;
 }
-
-#gTagCloud ul li {
-  display: inline;
-  line-height: 1.5em;
-  text-align: justify;
+li.gGroup ul, li.gGroup div {
+  height: 180px;
+  margin: 1px;
+  overflow: auto;
+  padding-top: .2em;
 }
-
-#gTagCloud ul li a {
-  text-decoration: none;
+li.gGroup div p {
+  color: gray;
+  text-align: center;
+  padding: 2em .5em 0 .5em
 }
-
-#gTagCloud ul li span {
-  display: none;
+li.gGroup .gUser {
+  padding: .2em 0 0 .5em;
 }
-
-#gTagCloud ul li.size1 a {
-  color: #9cf;
-  font-size: 80%;
-  font-weight: 100;
+li.gGroup .gUser .gButtonLink {
+  vertical-align: middle;
 }
 
-#gTagCloud ul li.size2 a {
-  color: #69f;
-  font-size: 90%;
-  font-weight: 300;
+li.gDefaultGroup h4, li.gDefaultGroup .gUser {
+  color: gray;
 }
 
-#gTagCloud ul li.size3 a {
-  color: #69c;
-  font-size: 100%;
-  font-weight: 500;
+#gAdminAdvancedSettings tr.setting:hover {
+  background: #ffc;
 }
 
-#gTagCloud ul li.size4 a {
-  color: #369;
-  font-size: 110%;
-  font-weight: 700;
+/** *******************************************************************
+ * 5) Navigation and menus
+ *********************************************************************/
+
+#gSiteAdminMenu,
+#gTagCloud ul {
+  font-size: 1.2em;
 }
 
-#gTagCloud ul li.size5 a {
-  color: #0e2b52;
-  font-size: 120%;
-  font-weight: 900;
+/* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#gHeader #gLoginMenu {
+  color: #999;
+  float: right;
+  margin: 0;
+  padding: 5px 0;
 }
 
-#gTagCloud ul li.size6 a {
-  color: #0e2b52;
-  font-size: 130%;
-  font-weight: 900;
+.rtl #gHeader #gLoginMenu {
+  text-align: left;
 }
 
-#gTagCloud ul li.size7 a {
-  color: #0e2b52;
-  font-size: 140%;
-  font-weight: 900;
+/* Site Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#gSiteAdminMenu {
+  bottom: 0;
+	display: none;
+  font-size: 1.2em;
+  left: 140px;
+  position: absolute;
 }
 
-#gTagCloud ul li a:hover {
-  color: #f30;
-  text-decoration: underline;
+#gSiteAdminMenu ul {
+  margin-bottom: 0;
 }
 
 /* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -756,11 +735,15 @@ table .gSuccess {
  * 6) Browser hacks
  *********************************************************************/
 
-#gSiteMenu:after,
+#gSiteAdminMenu:after,
 #gHeader:after,
-.gBreadcrumbs:after,
-#gAlbumGrid:after,
-.gPager:after,
+#gAdminCommentsMenu:after,
+#gGroupAdmin:after,
+.gSelected:after,
+.gAvailable .gBlock:after,
+#gModuleCreateForm ul li ul:after,
+#gDeveloperTools:after,
+#gPhotoStream:after,
 #gViewMenu:after {
   clear: both;
   content: ".";
@@ -813,6 +796,32 @@ table .gSuccess {
 
 /* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
 
+#gPanel {
+  display: none;
+  padding: 1em;
+}
+
+#gPanel legend {
+  display: none;
+}
+
+#gPanel fieldset {
+  border: none;
+}
+
+.ui-draggable {
+  cursor: move;
+}
+
+.gButtonSetVertical a {
+  width: 8em !important;
+}
+
+#gAdminDashboard .ui-dialog-titlebar,
+#gAdminDashboardSidebar .ui-dialog-titlebar {
+  padding: .2em .4em;
+}
+
 .ui-widget-overlay {
   background: #000;
   opacity: .7;
@@ -885,7 +894,7 @@ table .gSuccess {
   background-position: -208px -64px;
 }
 
-/* STUFF THAT NEEDS A HOME */
+/*************** STUFF THAT NEEDS A HOME ****************/
 
 #gMove ul {
   padding-left: 1em;
@@ -895,71 +904,6 @@ table .gSuccess {
   background: #999;
 }
 
-/* Server Add */
-
-#gServerAdd button {
-  float: left;
-  margin-bottom: .5em;
-}
-
-#gServerAddTree {
-  cursor: pointer;
-  padding-left: 4px;
-}
-
-#gServerAddTree li {
-  padding: 0;
-  float: none;
-}
-
-#gServerAddTree span.selected {
-  background: #ddd;
-}
-
-#gServerAddTree {
-  border: 1px solid #ccc;
-  height: 25em;
-  overflow: auto;
-  margin-bottom: .5em;
-  padding-top: .5em;
-  padding-bottom: .5em;
-}
-
-#gServerAdd ul ul li {
-  padding-left: 1.2em;
-}
-
-#gServerAdd .gBreadcrumbs {
-  font-size: 1em;
-  padding: 0;
-  margin: 0;
-  border-top-width: 0;
-}
-
-#gServerAdd p {
-  margin: 0;
-}
-
-#gServerAdd .gBreadcrumbs li {
-  padding: 10px 6px 10px 16px;
-}
-
-/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gPermissions .gDenied,
-#gPermissions .gAllowed {
-  text-align: center;
-  vertical-align: middle;
-}
-#gPermissions .gDenied {
-  background-color: #fcc;
-}
-#gPermissions .gAllowed {
-  background-color: #cfc;
-}
-
-/*************** STUFF THAT NEEDS A HOME ****************/
-
 .gProgressBar {
   height: 1em;
   width: 100%;
@@ -1046,6 +990,144 @@ table .gSuccess {
   list-style-type: disc;
 }
 
+#gTagAdmin {
+  table-layout: fixed;
+}
+
+#gTagAdmin td {
+  border: 0;
+}
+
+#gTagAdmin ul {
+  padding-bottom: .3em;
+}
+
+#gTagAdmin li {
+  padding: .1em 0 .2em .3em;
+}
+
+#gTagAdmin .gColumn {
+  float: left;
+  width: 200px;
+}
+
+.rtl #gTagAdmin .gColumn {
+  float: right;
+}
+
+.gEditable {
+  padding: .1em .3em .2em .3em;
+}
+
+.gEditable:hover {
+  background-color: #ffc;
+  cursor: text;
+}
+
+#gRenameTagForm input {
+  padding: 0 .2em 0 .2em;
+  clear: none;
+  float: left;
+  margin: 0 .2em 0 0;
+}
+
+.rtl #gRenameTagForm input {
+  float: right;
+}
+
+#gRenameTagForm input[type="submit"] {
+  height: 25px;
+}
+
+#gRenameTagForm a, #gRenameTagForm span {
+  display: block;
+  float: left;
+  padding: .2em .2em 0 .1em;
+}
+
+.rtl #gRenameTagForm a, #gRenameTagForm span {
+  float: right;
+}
+
+#gTaskLogDialog h1 {
+  font-size: 1.1em;
+}
+
+.gTaskLog {
+  border: 1pt solid;
+  font-size: .9em;
+  height: 400px;
+  margin: .5em 0;
+  overflow: auto;
+  padding: .5em
+}
+
+#gServerAddAdmin {
+  margin:auto;
+  text-align: left;
+}
+
+.rtl #gServerAddAdmin {
+  text-align: right;
+}
+
+#gServerAddAdmin form fieldset {
+  border: medium none;
+}
+
+#gServerAddAdmin legend {
+  display: none;
+}
+
+#gServerAddAdmin .gWarning {
+  background-color: #FFFF99;
+}
+
+#gAuthorizedPath {
+  margin: 0 !important;
+  padding: 0.3em 1.5em 0.3em 1em;
+}
+
+#gServerAdd Admin #path {
+  width: 80%;
+}
+
+.gRemoveDir:hover {
+  cursor: pointer;
+}
+
+#gLanguagesForm table {
+	width: 400px;
+	float: left;
+	margin: 0 3em 1em 0;
+}
+
+#gLanguagesForm .installed {
+  background-color: #EEEEEE;
+}
+
+#gLanguagesForm .default {
+	background-color: #C5DBEC;
+	font-weight: bold;
+}
+
+#gLanguagesForm input {
+	clear: both;
+}
+
+#gTranslations {
+	padding: 2em 0 0 0;
+	clear: both;
+}
+
+#gTranslations .gButtonLink {
+	padding: .5em;
+}
+
+.gDocLink {
+  float: right;
+}
+
 /* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */
 
 .rtl {
@@ -1075,13 +1157,10 @@ table .gSuccess {
 .rtl input[type="submit"],
 .rtl input[type="reset"],
 .rtl .gShortForm li,
-.rtl #gHeader #gLogo img,
 .rtl #gContent #gAlbumGrid .gItem,
-.rtl #gSiteMenu,
-.rtl .gBreadcrumbs li,
+.rtl #gSiteAdminMenu,
 .rtl .gPager li,
 .rtl .gButtonSet li,
 .rtl .ui-icon-left .ui-icon {
   float: right;
 }
-
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index c54fdcb5..9c5f1413 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -5,13 +5,12 @@
   <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     <title><?= t("Admin Dashboard") ?></title>
-    <link rel="shortcut icon" href="<?= url::file("themes/default/images/favicon.ico") ?>" type="image/x-icon" />
+    <link rel="shortcut icon" href="<?= url::file("lib/images/favicon.ico") ?>" type="image/x-icon" />
 
     <?= $theme->css("yui/reset-fonts-grids.css") ?>
     <?= $theme->css("themeroller/ui.base.css") ?>
     <?= $theme->css("superfish/css/superfish.css") ?>
     <?= $theme->css("screen.css") ?>
-    <?= $theme->css("admin_screen.css") ?>
     <!--[if lt IE 8]>
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("fix-ie.css") ?>"
           media="screen,print,projection" />
@@ -28,7 +27,6 @@
    <?= $theme->script("gallery.ajax.js") ?>
    <?= $theme->script("gallery.dialog.js") ?>
    <?= $theme->script("superfish/js/superfish.js") ?>
-   <?= $theme->script("jquery.dropshadow.js") ?>
    <?= $theme->script("ui.init.js") ?>
 
    <?= $theme->admin_head() ?>
diff --git a/themes/default/images/favicon.ico b/themes/default/images/favicon.ico
deleted file mode 100644
index 66531d8e..00000000
Binary files a/themes/default/images/favicon.ico and /dev/null differ
diff --git a/themes/default/images/logo.png b/themes/default/images/logo.png
deleted file mode 100644
index 7d7b9b9b..00000000
Binary files a/themes/default/images/logo.png and /dev/null differ
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 1650debe..350ba41c 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -23,7 +23,7 @@
         <? endif ?>
       <? endif ?>
     </title>
-    <link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" />
+    <link rel="shortcut icon" href="<?= url::file("lib/images/favicon.ico") ?>" type="image/x-icon" />
     <?= $theme->css("yui/reset-fonts-grids.css") ?>
     <?= $theme->css("superfish/css/superfish.css") ?>
     <?= $theme->css("themeroller/ui.base.css") ?>
@@ -82,7 +82,7 @@
           <?= $header_text ?>
           <? else: ?>
           <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
-            <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= $theme->url("images/logo.png") ?>" />
+            <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= url::file("lib/images/logo.png") ?>" />
           </a>
           <? endif ?>
           <div id="gSiteMenu">
-- 
cgit v1.2.3


From 53e2df01ebc26337fab13da2c38e6f2555a673d0 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 3 Sep 2009 11:21:45 -0700
Subject: html::purify an item title.

---
 themes/default/views/album.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/default/views')

diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 8bc81a31..01f7be50 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -20,7 +20,7 @@
     </a>
     <?= $theme->thumb_bottom($child) ?>
     <?= $theme->context_menu($child, "#gItemId-{$child->id} .gThumbnail") ?>
-    <h2><span></span><a href="<?= $child->url() ?>"><?= html::clean($child->title) ?></a></h2>
+    <h2><span></span><a href="<?= $child->url() ?>"><?= html::purify($child->title) ?></a></h2>
     <ul class="gMetadata">
       <?= $theme->thumb_info($child) ?>
     </ul>
-- 
cgit v1.2.3


From 2aad580f53dbc06bb170c710467b47a5a532c6c8 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 8 Sep 2009 13:44:52 -0700
Subject: Move specialized (pretty) url generation back into Item_Model so that
 we're not relying on overriding url::site() to do tricks around item urls. 
 This means that you won't get item urls by doing url::site("albums/37"), for
 example, but it also means that we won't get pretty urls where we don't
 expect them (like in the action of a <form> element).

Incidentally, this will help us move over to using the slug format
because if you've got a bad character in a url, the edit forms will
now work on it since they'll be id based.
---
 modules/gallery/controllers/admin_themes.php       |  4 +-
 modules/gallery/controllers/after_install.php      |  2 +-
 modules/gallery/controllers/albums.php             | 16 ++++----
 modules/gallery/controllers/move.php               |  2 +-
 modules/gallery/controllers/movies.php             |  2 +-
 modules/gallery/controllers/photos.php             |  2 +-
 modules/gallery/controllers/quick.php              |  2 +-
 modules/gallery/helpers/MY_url.php                 | 19 ----------
 modules/gallery/helpers/gallery.php                | 44 +++++++++++-----------
 modules/gallery/helpers/gallery_rss.php            |  4 +-
 modules/gallery/helpers/item.php                   |  8 ++++
 modules/gallery/models/item.php                    | 21 +++++++++--
 .../views/admin_block_photo_stream.html.php        |  2 +-
 modules/gallery/views/upgrader.html.php            |  2 +-
 .../notification/views/comment_published.html.php  |  4 +-
 modules/notification/views/item_deleted.html.php   |  4 +-
 modules/search/views/search.html.php               |  2 +-
 modules/user/controllers/login.php                 |  2 +-
 modules/user/controllers/logout.php                |  2 +-
 modules/user/controllers/password.php              |  2 +-
 themes/admin_default/views/admin.html.php          |  6 +--
 themes/default/views/page.html.php                 |  4 +-
 22 files changed, 80 insertions(+), 76 deletions(-)

(limited to 'themes/default/views')

diff --git a/modules/gallery/controllers/admin_themes.php b/modules/gallery/controllers/admin_themes.php
index da001c55..24f91aba 100644
--- a/modules/gallery/controllers/admin_themes.php
+++ b/modules/gallery/controllers/admin_themes.php
@@ -38,7 +38,7 @@ class Admin_Themes_Controller extends Admin_Controller {
       $theme_info = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
       $theme_info->description = t($theme_info->description);
       $theme_info->name = t($theme_info->name);
-      
+
       $themes[$theme_name] = $theme_info;
     }
     return $themes;
@@ -54,7 +54,7 @@ class Admin_Themes_Controller extends Admin_Controller {
     if ($type == "admin") {
       $view->url = url::site("admin?theme=$theme_name");
     } else {
-      $view->url = url::site("albums/1?theme=$theme_name");
+      $view->url = item::root()->url("theme=$theme_name");
     }
     print $view;
   }
diff --git a/modules/gallery/controllers/after_install.php b/modules/gallery/controllers/after_install.php
index f066afe4..b640092f 100644
--- a/modules/gallery/controllers/after_install.php
+++ b/modules/gallery/controllers/after_install.php
@@ -20,7 +20,7 @@
 class After_Install_Controller extends Controller {
   public function index() {
     if (!user::active()->admin) {
-      url::redirect("albums/1");
+      url::redirect(item::root()->url());
     }
 
     $v = new View("after_install.html");
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index b7a9f339..abcabfa6 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -42,9 +42,9 @@ class Albums_Controller extends Items_Controller {
       $index = $album->get_position($show);
       $page = ceil($index / $page_size);
       if ($page == 1) {
-        url::redirect("albums/$album->id");
+        url::redirect($album->url());
       } else {
-        url::redirect("albums/$album->id?page=$page");
+        url::redirect($album->url("page=$page"));
       }
     }
 
@@ -55,9 +55,9 @@ class Albums_Controller extends Items_Controller {
 
     // Make sure that the page references a valid offset
     if ($page < 1) {
-      url::redirect("albums/$album->id");
+      url::redirect($album->url());
     } else if ($page > $max_pages) {
-      url::redirect("albums/$album->id?page=$max_pages");
+      url::redirect($album->url("page=$max_pages"));
     }
 
     $template = new Theme_View("page.html", "album");
@@ -116,8 +116,8 @@ class Albums_Controller extends Items_Controller {
 
       print json_encode(
         array("result" => "success",
-              "location" => url::site("albums/$new_album->id"),
-              "resource" => url::site("albums/$new_album->id")));
+              "location" => $new_album->url(),
+              "resource" => $new_album->url()));
     } else {
       print json_encode(
         array(
@@ -149,8 +149,8 @@ class Albums_Controller extends Items_Controller {
 
       print json_encode(
         array("result" => "success",
-              "resource" => url::site("photos/$photo->id"),
-              "location" => url::site("photos/$photo->id")));
+              "resource" => $photo->url(),
+              "location" => $photo->url()));
     } else {
       print json_encode(
         array("result" => "error",
diff --git a/modules/gallery/controllers/move.php b/modules/gallery/controllers/move.php
index 93ef05a6..87b73436 100644
--- a/modules/gallery/controllers/move.php
+++ b/modules/gallery/controllers/move.php
@@ -43,7 +43,7 @@ class Move_Controller extends Controller {
 
     print json_encode(
       array("result" => "success",
-            "location" => url::site("albums/{$target->id}")));
+            "location" => $target->url()));
   }
 
   public function show_sub_tree($source_id, $target_id) {
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index c549dbf8..1c266cc8 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -105,7 +105,7 @@ class Movies_Controller extends Items_Controller {
       $photo->save();
       module::event("item_edit_form_completed", $photo, $form);
 
-      log::success("content", "Updated photo", "<a href=\"photos/$photo->id\">view</a>");
+      log::success("content", "Updated photo", "<a href=\"{$photo->url()}\">view</a>");
       message::success(
         t("Saved photo %photo_title", array("photo_title" => $photo->title)));
 
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 959097b2..79ad674a 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -97,7 +97,7 @@ class Photos_Controller extends Items_Controller {
       $photo->save();
       module::event("item_edit_form_completed", $photo, $form);
 
-      log::success("content", "Updated photo", "<a href=\"photos/$photo->id\">view</a>");
+      log::success("content", "Updated photo", "<a href=\"{$photo->url()}\">view</a>");
       message::success(
                        t("Saved photo %photo_title",
                          array("photo_title" => html::purify($photo->title))));
diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index 20731f9c..2ac54754 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -121,7 +121,7 @@ class Quick_Controller extends Controller {
       print json_encode(array("result" => "success", "reload" => 1));
     } else {
       print json_encode(array("result" => "success",
-                              "location" => url::site("albums/$parent->id")));
+                              "location" => $parent->url()));
     }
   }
 
diff --git a/modules/gallery/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index 1ca9a58f..368c947e 100644
--- a/modules/gallery/helpers/MY_url.php
+++ b/modules/gallery/helpers/MY_url.php
@@ -18,25 +18,6 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class url extends url_Core {
-  static function site($uri, $protocol=false) {
-    if (($pos = strpos($uri, "?")) !== false) {
-      list ($uri, $query) = explode("?", $uri, 2);
-      $query = "?$query";
-    } else {
-      $query = "";
-    }
-
-    // @todo if we're only doing this for Item_Model, why not just put this
-    // all into Item_Model::url()?  It'd make url::site() faster.  Downside is that
-    // anywhere we refer to an item by id, eg url::site("albums/123") would have
-    // to load the item and do $item->url();
-    $parts = explode("/", $uri, 3);
-    if ($parts[0] == "albums" || $parts[0] == "photos" || $parts[0] == "movies") {
-      $uri = model_cache::get("item", $parts[1])->relative_url();
-    }
-    return parent::site($uri . $query, $protocol);
-  }
-
   static function parse_url() {
     if (Router::$controller) {
       return;
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index f72ef982..813134eb 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -82,9 +82,9 @@ class gallery_Core {
   static function site_menu($menu, $theme) {
     if ($theme->page_type != "login") {
       $menu->append(Menu::factory("link")
-              ->id("home")
-              ->label(t("Home"))
-              ->url(url::site("albums/1")));
+                    ->id("home")
+                    ->label(t("Home"))
+                    ->url(item::root()->url()));
 
       $item = $theme->item();
 
@@ -92,39 +92,39 @@ class gallery_Core {
       $can_add = $item && access::can("add", $item);
 
       if ($can_add) {
-              $menu->append($add_menu = Menu::factory("submenu")
-                    ->id("add_menu")
-                    ->label(t("Add")));
+        $menu->append($add_menu = Menu::factory("submenu")
+                      ->id("add_menu")
+                      ->label(t("Add")));
         $add_menu->append(Menu::factory("dialog")
-                    ->id("add_photos_item")
-                    ->label(t("Add photos"))
-                    ->url(url::site("simple_uploader/app/$item->id")));
+                          ->id("add_photos_item")
+                          ->label(t("Add photos"))
+                          ->url(url::site("simple_uploader/app/$item->id")));
         if ($item->is_album()) {
-                $add_menu->append(Menu::factory("dialog")
-                      ->id("add_album_item")
-                      ->label(t("Add an album"))
-                      ->url(url::site("form/add/albums/$item->id?type=album")));
-                                }
+          $add_menu->append(Menu::factory("dialog")
+                            ->id("add_album_item")
+                            ->label(t("Add an album"))
+                            ->url(url::site("form/add/albums/$item->id?type=album")));
+        }
       }
 
       $menu->append($options_menu = Menu::factory("submenu")
-              ->id("options_menu")
-              ->label(t("Photo options")));
+                    ->id("options_menu")
+                    ->label(t("Photo options")));
       if ($item && ($can_edit || $can_add)) {
         if ($can_edit) {
           $options_menu->append(Menu::factory("dialog")
-                          ->id("edit_item")
-                          ->label($item->is_album() ? t("Edit album") : t("Edit photo"))
-                          ->url(url::site("form/edit/{$item->type}s/$item->id")));
+                                ->id("edit_item")
+                                ->label($item->is_album() ? t("Edit album") : t("Edit photo"))
+                                ->url(url::site("form/edit/{$item->type}s/$item->id")));
         }
 
         if ($item->is_album()) {
           $options_menu->label(t("Album options"));
           if ($can_edit) {
             $options_menu->append(Menu::factory("dialog")
-                            ->id("edit_permissions")
-                            ->label(t("Edit permissions"))
-                            ->url(url::site("permissions/browse/$item->id")));
+                                  ->id("edit_permissions")
+                                  ->label(t("Edit permissions"))
+                                  ->url(url::site("permissions/browse/$item->id")));
           }
         }
       }
diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index dee6ae40..f30df092 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -40,7 +40,7 @@ class gallery_rss_Core {
 
       $feed->max_pages = ceil($all_children->find_all()->count() / $limit);
       $feed->title = t("Recent Updates");
-      $feed->link = url::abs_site("albums/1");
+      $feed->link = item::root()->abs_url();
       $feed->description = t("Recent Updates");
       return $feed;
 
@@ -54,7 +54,7 @@ class gallery_rss_Core {
       $feed->max_pages = ceil(
         $item->viewable()->descendants_count(array("type" => "photo")) / $limit);
       $feed->title = html::purify($item->title);
-      $feed->link = url::abs_site("albums/{$item->id}");
+      $feed->link = $item->abs_url();
       $feed->description = nl2br(html::purify($item->description));
 
       return $feed;
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 8da88b6e..d907a177 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -184,4 +184,12 @@ class item_Core {
 
     return $model;
   }
+
+  /**
+   * Return the root Item_Model
+   * @return Item_Model
+   */
+  static function root() {
+    return model_cache::get("item", 1);
+  }
 }
\ No newline at end of file
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 0ec5d048..6e9debea 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -168,9 +168,24 @@ class Item_Model extends ORM_MPTT {
    *
    * @param string $query the query string (eg "show=3")
    */
-  public function url($query=array(), $full_uri=false) {
-    $url = ($full_uri ? url::abs_site("{$this->type}s/$this->id")
-            : url::site("{$this->type}s/$this->id"));
+  public function url($query=null) {
+    $relative_url = $this->relative_url();
+    $url = url::site($relative_url);
+    if ($query) {
+      $url .= "?$query";
+    }
+    return $url;
+  }
+
+  /**
+   * album: url::abs_site("albums/2")
+   * photo: url::abs_site("photos/3")
+   *
+   * @param string $query the query string (eg "show=3")
+   */
+  public function abs_url($query=null) {
+    $relative_url = $this->relative_url();
+    $url = url::abs_site($relative_url);
     if ($query) {
       $url .= "?$query";
     }
diff --git a/modules/gallery/views/admin_block_photo_stream.html.php b/modules/gallery/views/admin_block_photo_stream.html.php
index 1b9d8ff5..4968c39b 100644
--- a/modules/gallery/views/admin_block_photo_stream.html.php
+++ b/modules/gallery/views/admin_block_photo_stream.html.php
@@ -2,7 +2,7 @@
 <ul>
 <? foreach ($photos as $photo): ?>
   <li class="gItem gPhoto">
-    <a href="<?= url::site("photos/$photo->id") ?>" title="<?= html::purify($photo->title)->for_html_attr() ?>">
+    <a href="<?= $photo->url() ?>" title="<?= html::purify($photo->title)->for_html_attr() ?>">
       <img <?= photo::img_dimensions($photo->width, $photo->height, 72) ?>
         src="<?= $photo->thumb_url() ?>" alt="<?= html::purify($photo->title)->for_html_attr() ?>" />
     </a>
diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
index 04200920..5f93c2d5 100644
--- a/modules/gallery/views/upgrader.html.php
+++ b/modules/gallery/views/upgrader.html.php
@@ -18,7 +18,7 @@
             <h1> <?= t("That's it!") ?> </h1>
             <p>
               <?= t("Your <a href=\"%url\">Gallery</a> is up to date.",
-                    array("url" => html::mark_clean(url::site("albums/1")))) ?>
+                    array("url" => html::mark_clean(item::root()->url()))) ?>
             </p>
           </div>
         </div>
diff --git a/modules/notification/views/comment_published.html.php b/modules/notification/views/comment_published.html.php
index e39e39c6..a8ca1899 100644
--- a/modules/notification/views/comment_published.html.php
+++ b/modules/notification/views/comment_published.html.php
@@ -25,8 +25,8 @@
       <tr>
         <td><?= t("Url:") ?></td>
         <td>
-          <a href="<?= $comment->item()->url(array(), true) ?>#comments">
-            <?= $comment->item()->url(array(), true) ?>#comments
+          <a href="<?= $comment->item()->abs_url() ?>#comments">
+            <?= $comment->item()->abs_url() ?>#comments
           </a>
         </td>
       </tr>
diff --git a/modules/notification/views/item_deleted.html.php b/modules/notification/views/item_deleted.html.php
index a51782ff..a95cdd89 100644
--- a/modules/notification/views/item_deleted.html.php
+++ b/modules/notification/views/item_deleted.html.php
@@ -15,8 +15,8 @@
       <tr>
         <td><?= t("Url:") ?></td>
         <td>
-          <a href="<?= $item->parent()->url(array(), true) ?>">
-            <?= $item->parent()->url(array(), true) ?>
+          <a href="<?= $item->parent()->abs_url() ?>">
+            <?= $item->parent()->abs_url() ?>
           </a>
         </td>
       </tr>
diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php
index 7963948d..91d9eec8 100644
--- a/modules/search/views/search.html.php
+++ b/modules/search/views/search.html.php
@@ -28,7 +28,7 @@
         <? $item_class = "gAlbum"; ?>
       <? endif ?>
    <li class="gItem <?= $item_class ?>">
-      <a href="<?= url::site("items/$item->id") ?>">
+      <a href="<?= $item->url() ?>">
         <?= $item->thumb_img() ?>
         <p>
     <?= html::purify($item->title) ?>
diff --git a/modules/user/controllers/login.php b/modules/user/controllers/login.php
index b81b17b2..dcac0723 100644
--- a/modules/user/controllers/login.php
+++ b/modules/user/controllers/login.php
@@ -48,7 +48,7 @@ class Login_Controller extends Controller {
 
     list ($valid, $form) = $this->_auth("login/auth_html");
     if ($valid) {
-      url::redirect("albums/1");
+      url::redirect(item::root()->url());
     } else {
       print $form;
     }
diff --git a/modules/user/controllers/logout.php b/modules/user/controllers/logout.php
index fc3ced56..3bf274a6 100644
--- a/modules/user/controllers/logout.php
+++ b/modules/user/controllers/logout.php
@@ -31,7 +31,7 @@ class Logout_Controller extends Controller {
         // Don't use url::redirect() because it'll call url::site() and munge the continue url.
         header("Location: $continue_url");
       } else {
-        url::redirect("albums/1");
+        url::redirect(item::root()->url());
       }
     }
   }
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index a6522369..8c18916e 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -130,7 +130,7 @@ class Password_Controller extends Controller {
       $user->hash = null;
       $user->save();
       message::success(t("Password reset successfully"));
-      url::redirect("albums/1");
+      url::redirect(item::root()->url());
     } else {
       print $view;
     }
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 9c5f1413..5564484c 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -43,10 +43,10 @@
       <div id="gHeader">
         <?= $theme->admin_header_top() ?>
         <ul id="gLoginMenu">
-          <li class="first"><?= html::anchor("albums/1", "&larr; ".t("Back to the Gallery")) ?></li>
-          <li id="gLogoutLink"><a href="<?= url::site("logout?continue=albums/1&amp;csrf=$csrf") ?>"><?= t("Logout") ?></a></li>
+          <li class="first"><?= html::anchor(item::root()->url(), "&larr; ".t("Back to the Gallery")) ?></li>
+          <li id="gLogoutLink"><a href="<?= url::site("logout?continue=items/1&amp;csrf=$csrf") ?>"><?= t("Logout") ?></a></li>
         </ul>
-        <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
+        <a id="gLogo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
           &larr; <?= t("back to the ...") ?>
         </a>
         <div id="gSiteAdminMenu" style="display: none;">
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 350ba41c..733534ea 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -81,7 +81,7 @@
           <? if ($header_text = module::get_var("gallery", "header_text")): ?>
           <?= $header_text ?>
           <? else: ?>
-          <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
+          <a id="gLogo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
             <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= url::file("lib/images/logo.png") ?>" />
           </a>
           <? endif ?>
@@ -95,7 +95,7 @@
         <ul class="gBreadcrumbs">
           <? foreach ($parents as $parent): ?>
           <li>
-            <a href="<?= url::site("albums/{$parent->id}?show={$theme->item()->id}") ?>">
+            <a href="<?= $parent->url("show={$theme->item()->id}") ?>">
               <?= html::purify($parent->title) ?>
             </a>
           </li>
-- 
cgit v1.2.3


From 711cdde5b9755140981000adc6dd7897d836ccc5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 12 Sep 2009 20:46:54 -0700
Subject: Only tack ?show=<current_id> on for the last parent, because that's
 the only parent for which the id is relevant.  In a perfect world each
 parent's link would have a ?show=<id> for the next child's id.  But that
 would require some confusing code and I don't want to put that into the
 default/example theme yet.

---
 themes/default/views/page.html.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'themes/default/views')

diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 733534ea..19d8cc00 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -95,7 +95,12 @@
         <ul class="gBreadcrumbs">
           <? foreach ($parents as $parent): ?>
           <li>
-            <a href="<?= $parent->url("show={$theme->item()->id}") ?>">
+            <!-- Adding ?show=<id> causes Gallery3 to display the page
+                 containing that photo.  For now, we just do it for
+                 the immediate parent so that when you go back up a
+                 level you're on the right page. -->
+            <a href="<?= $parent->url($parent == $theme->item()->parent() ?
+                     "show={$theme->item()->id}" : null) ?>">
               <?= html::purify($parent->title) ?>
             </a>
           </li>
-- 
cgit v1.2.3