From 5e83ebd6d0e1eccb1a865dc6c5fe2ef712bd421b Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 28 Jun 2009 16:50:55 -0700
Subject: Use $theme->script() method to render module javascript files

---
 modules/user/helpers/user_theme.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php
index 2a4a343a..ad9d4c63 100644
--- a/modules/user/helpers/user_theme.php
+++ b/modules/user/helpers/user_theme.php
@@ -25,11 +25,8 @@ class user_theme_Core {
   }
 
   static function admin_head($theme) {
-    $head = array();
     if (strpos(Router::$current_uri, "admin/users") !== false) {
-      $head[] = html::script("lib/gallery.panel.js");
+      $theme->script("lib/gallery.panel.js");
     }
-
-    return implode("\n", $head);
   }
 }
-- 
cgit v1.2.3


From 6e8a8c53e685a6c3f35f1426ab4dd6dcc18578e0 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 28 Jun 2009 19:49:48 -0700
Subject: Rename $theme->url() to $theme->theme_url() for consistency wiht
 $theme->theme_script().

---
 modules/comment/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/gallery/libraries/Gallery_View.php                 | 2 +-
 modules/user/views/admin_users.html.php                    | 2 +-
 themes/admin_default/views/admin.html.php                  | 4 ++--
 themes/default/views/header.html.php                       | 2 +-
 themes/default/views/page.html.php                         | 6 +++---
 9 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'modules/user')

diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php
index edaa19ae..af4d946e 100644
--- a/modules/comment/views/admin_block_recent_comments.html.php
+++ b/modules/comment/views/admin_block_recent_comments.html.php
@@ -2,7 +2,7 @@
 <ul>
   <? foreach ($comments as $i => $comment): ?>
   <li class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
-    <img src="<?= $comment->author()->avatar_url(32, $theme->url("images/avatar.jpg", true)) ?>"
+    <img src="<?= $comment->author()->avatar_url(32, $theme->theme_url("images/avatar.jpg", true)) ?>"
          class="gAvatar"
          alt="<?= p::clean($comment->author_name()) ?>"
          width="32"
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 86585c65..453cf849 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -106,7 +106,7 @@
     <tr id="gComment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
       <td>
         <a href="#">
-          <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
+          <img src="<?= $comment->author()->avatar_url(40, $theme->theme_url("images/avatar.jpg", true)) ?>"
                class="gAvatar"
                alt="<?= p::clean($comment->author_name()) ?>"
                width="40"
diff --git a/modules/comment/views/comment.html.php b/modules/comment/views/comment.html.php
index ce52951b..6d2cc592 100644
--- a/modules/comment/views/comment.html.php
+++ b/modules/comment/views/comment.html.php
@@ -2,7 +2,7 @@
 <li id="gComment-<?= $comment->id; ?>">
   <p class="gAuthor">
     <a href="#">
-      <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
+      <img src="<?= $comment->author()->avatar_url(40, $theme->theme_url("images/avatar.jpg", true)) ?>"
            class="gAvatar"
            alt="<?= p::clean($comment->author_name()) ?>"
            width="40"
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index 854f9554..d9405e5f 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -10,7 +10,7 @@
   <li id="gComment-<?= $comment->id ?>">
     <p class="gAuthor">
       <a href="#">
-        <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
+        <img src="<?= $comment->author()->avatar_url(40, $theme->theme_url("images/avatar.jpg", true)) ?>"
              class="gAvatar"
              alt="<?= p::clean($comment->author_name()) ?>"
              width="40"
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index f2298b7d..e21e83d8 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -43,7 +43,7 @@ class Gallery_View_Core extends View {
    * Provide a url to a resource within the current theme.  This allows us to refer to theme
    * resources without naming the theme itself which makes themes easier to copy.
    */
-  public function url($path, $absolute_url=false) {
+  public function theme_url($path, $absolute_url=false) {
     $arg = "themes/{$this->theme_name}/$path";
     return $absolute_url ? url::abs_file($arg) : url::file($arg);
   }
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 542b8b8b..b469f82d 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -66,7 +66,7 @@
       <? foreach ($users as $i => $user): ?>
       <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)) ?>"
+          <img src="<?= $user->avatar_url(20, $theme->theme_url("images/avatar.jpg", true)) ?>"
                title="<?= t("Drag user onto group below to add as a new member") ?>"
                alt="<?= p::clean($user->name) ?>"
                width="20"
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 2a91a76c..62f9761f 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -14,10 +14,10 @@
         media="screen,projection" />
     <link rel="stylesheet" type="text/css" href="<?= url::file("themes/default/css/screen.css") ?>"
         media="screen,projection" />
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
+    <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/screen.css") ?>"
         media="screen,projection" />
    <!--[if IE]>
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
+    <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/fix-ie.css") ?>"
         media="screen,print,projection" />
    <![endif]-->
 
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index e1e52bda..b38cffed 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -4,7 +4,7 @@
 <?= $header_text ?>
 <? else: ?>
 <a href="<?= url::site("albums/1") ?>">
-  <img width="107" height="48" id="gLogo" alt="<?= t("Gallery: Your photos on your web site") ?>" src="<?= $theme->url("images/logo.png") ?>" />
+  <img width="107" height="48" id="gLogo" alt="<?= t("Gallery: Your photos on your web site") ?>" src="<?= $theme->theme_url("images/logo.png") ?>" />
 </a>
 <? endif ?>
 
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 8b9466ac..3ae3e155 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -23,17 +23,17 @@
         <? endif ?>
       <? endif ?>
     </title>
-    <link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" />
+    <link rel="shortcut icon" href="<?= $theme->theme_url("images/favicon.ico") ?>" type="image/x-icon" />
     <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>"
           media="screen,print,projection" />
     <link rel="stylesheet" type="text/css" href="<?= url::file("lib/superfish/css/superfish.css") ?>"
           media="screen" />
     <link rel="stylesheet" type="text/css" href="<?= url::file("lib/themeroller/ui.base.css") ?>"
           media="screen,print,projection" />
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
+    <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/screen.css") ?>"
           media="screen,print,projection" />
     <!--[if lt IE 8]>
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
+    <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/fix-ie.css") ?>"
           media="screen,print,projection" />
     <![endif]-->
     <? if ($theme->page_type == 'album'): ?>
-- 
cgit v1.2.3


From 8f9a943f55c1342177d7687e3d891f5d1c9eff30 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 1 Jul 2009 17:57:39 -0700
Subject: Fix a bunch of XSS vulnerabilities turned up by manual inspection
 using the checklist in ticket #385.

---
 modules/gallery/controllers/admin_advanced_settings.php |  2 +-
 modules/gallery/controllers/admin_modules.php           |  2 +-
 modules/gallery/controllers/albums.php                  |  9 ++++++---
 modules/gallery/controllers/movies.php                  |  3 ++-
 modules/gallery/controllers/photos.php                  |  3 ++-
 modules/gallery/controllers/quick.php                   | 11 ++++++-----
 modules/gallery/helpers/l10n_client.php                 |  4 +++-
 modules/organize/controllers/organize.php               |  6 +++---
 modules/server_add/controllers/admin_server_add.php     |  4 ++--
 modules/server_add/controllers/server_add.php           |  2 +-
 modules/tag/controllers/admin_tags.php                  |  6 +++---
 modules/user/controllers/admin_users.php                | 17 ++++++++++-------
 modules/user/controllers/login.php                      |  5 +++--
 modules/user/controllers/logout.php                     |  4 ++--
 modules/user/controllers/password.php                   |  4 +++-
 15 files changed, 48 insertions(+), 34 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/controllers/admin_advanced_settings.php b/modules/gallery/controllers/admin_advanced_settings.php
index 79bc1183..64007fdb 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" => $var_name, "module_name" => $module_name)));
+        array("var" => p::clean($var_name), "module_name" => $module_name)));
 
     print json_encode(array("result" => "success"));
   }
diff --git a/modules/gallery/controllers/admin_modules.php b/modules/gallery/controllers/admin_modules.php
index ed1f7665..dfa49a0e 100644
--- a/modules/gallery/controllers/admin_modules.php
+++ b/modules/gallery/controllers/admin_modules.php
@@ -56,7 +56,7 @@ class Admin_Modules_Controller extends Admin_Controller {
 
     module::event("module_change", $changes);
 
-    // @todo this type of collation is questionable from a i18n perspective
+    // @todo this type of collation is questionable from an i18n perspective
     if ($activated_names) {
       message::success(t("Activated: %names", array("names" => join(", ", $activated_names))));
     }
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 22f50fb8..d141d157 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -111,7 +111,8 @@ 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" => $new_album->title)));
+      message::success(
+        t("Created album %album_title", array("album_title" => p::clean($new_album->title))));
 
       print json_encode(
         array("result" => "success",
@@ -143,7 +144,8 @@ class Albums_Controller extends Items_Controller {
         user::active()->id);
 
       log::success("content", "Added a photo", html::anchor("photos/$photo->id", "view photo"));
-      message::success(t("Added photo %photo_title", array("photo_title" => $photo->title)));
+      message::success(
+        t("Added photo %photo_title", array("photo_title" => p::clean($photo->title))));
 
       print json_encode(
         array("result" => "success",
@@ -197,7 +199,8 @@ class Albums_Controller extends Items_Controller {
       module::event("item_updated", $orig, $album);
 
       log::success("content", "Updated album", "<a href=\"albums/$album->id\">view</a>");
-      message::success(t("Saved album %album_title", array("album_title" => $album->title)));
+      message::success(
+        t("Saved album %album_title", array("album_title" => p::clean($album->title))));
 
       print json_encode(
         array("result" => "success",
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index d8cca825..30a5d78c 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -94,7 +94,8 @@ class Movies_Controller extends Items_Controller {
       module::event("item_updated", $orig, $photo);
 
       log::success("content", "Updated photo", "<a href=\"photos/$photo->id\">view</a>");
-      message::success(t("Saved photo %photo_title", array("photo_title" => $photo->title)));
+      message::success(
+        t("Saved photo %photo_title", array("photo_title" => p::clean($photo->title))));
 
       print json_encode(
         array("result" => "success",
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index f5be5d59..6a62e859 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -87,7 +87,8 @@ class Photos_Controller extends Items_Controller {
       module::event("item_updated", $orig, $photo);
 
       log::success("content", "Updated photo", "<a href=\"photos/$photo->id\">view</a>");
-      message::success(t("Saved photo %photo_title", array("photo_title" => $photo->title)));
+      message::success(
+        t("Saved photo %photo_title", array("photo_title" => p::clean($photo->title))));
 
       print json_encode(
         array("result" => "success",
diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index e89d9701..5d3d8885 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" => $item->title));
+    $msg = t("Made <b>%title</b> this album's cover", array("title" => p::clean($item->title)));
 
     item::make_album_cover($item);
     message::success($msg);
@@ -105,9 +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" => $item->title));
+        array("title" => p::clean($item->title)));
     } else {
-      print t("Are you sure you want to delete <b>%title</b>?", array("title" => $item->title));
+      print t("Are you sure you want to delete <b>%title</b>?",
+              array("title" => p::clean($item->title)));
     }
 
     $form = item::get_delete_form($item);
@@ -121,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" => $item->title));
+      $msg = t("Deleted album <b>%title</b>", array("title" => p::clean($item->title)));
     } else {
-      $msg = t("Deleted photo <b>%title</b>", array("title" => $item->title));
+      $msg = t("Deleted photo <b>%title</b>", array("title" => p::clean($item->title)));
     }
 
     $item->delete();
diff --git a/modules/gallery/helpers/l10n_client.php b/modules/gallery/helpers/l10n_client.php
index 20f81ecc..e153532c 100644
--- a/modules/gallery/helpers/l10n_client.php
+++ b/modules/gallery/helpers/l10n_client.php
@@ -112,7 +112,9 @@ class l10n_client_Core {
     //    {key:<key_2>, ...}
     //   ]
     $count = count($response);
-    log::info("translations", "Installed $count new / updated translation messages");
+    log::info("translations",
+              t2("Installed 1 new / updated translation message",
+                 "Installed %count new / updated translation messages", $count));
 
     foreach ($response as $message_data) {
       // @todo Better input validation
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 57709cb5..5f80805c 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -283,10 +283,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" => $item->title));
+        $message = t("Saved album %album_title", array("album_title" => p::clean($item->title)));
       } else {
         log::success("content", "Updated photo", "<a href=\"photos/$item->id\">view</a>");
-        $message = t("Saved photo %photo_title", array("photo_title" => $item->title));
+        $message = t("Saved photo %photo_title", array("photo_title" => p::clean($item->title)));
       }
       print json_encode(array("form" => $form->__toString(), "message" => $message));
     } else {
@@ -325,7 +325,7 @@ class Organize_Controller extends Controller {
       module::event("item_updated", $orig, $item);
 
       log::success("content", "Updated album", "<a href=\"albums/$item->id\">view</a>");
-      $message = t("Saved album %album_title", array("album_title" => $item->title));
+      $message = t("Saved album %album_title", array("album_title" => p::clean($item->title)));
       print json_encode(array("form" => $form->__toString(), "message" => $message));
     } else {
       print json_encode(array("form" => $form->__toString()));
diff --git a/modules/server_add/controllers/admin_server_add.php b/modules/server_add/controllers/admin_server_add.php
index a3f9aa96..a30215b8 100644
--- a/modules/server_add/controllers/admin_server_add.php
+++ b/modules/server_add/controllers/admin_server_add.php
@@ -40,7 +40,7 @@ class Admin_Server_Add_Controller extends Admin_Controller {
         module::set_var("server_add", "authorized_paths", serialize($paths));
         $form->add_path->inputs->path->value = "";
 
-        message::success(t("Added path %path", array("path" => $path)));
+        message::success(t("Added path %path", array("path" => p::clean($path))));
 
         server_add::check_config($paths);
         url::redirect("admin/server_add");
@@ -62,7 +62,7 @@ class Admin_Server_Add_Controller extends Admin_Controller {
     $path = $this->input->get("path");
     $paths = unserialize(module::get_var("server_add", "authorized_paths"));
     unset($paths[$path]);
-    message::success(t("Removed path %path", array("path" => $path)));
+    message::success(t("Removed path %path", array("path" => p::clean($path))));
     module::set_var("server_add", "authorized_paths", serialize($paths));
     server_add::check_config($paths);
 
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index c92b4f7e..05ea5058 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -110,7 +110,7 @@ class Server_Add_Controller extends Controller {
                               "url" => "",
                               "task" => array(
                                 "id" => -1, "done" => 1, "percent_complete" => 100,
-                                "status" => t("No Eligible files, import cancelled"))));
+                                "status" => t("No eligible files, import cancelled"))));
       return;
     }
 
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index af5055ff..dcdc16b9 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" => $name)));
-      log::success("tags", t("Deleted tag %tag_name", array("tag_name" => $name)));
+      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))));
 
       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" => $old_name, "new_name" => $tag->name));
+                   array("old_name" => p::clean($old_name), "new_name" => p::clean($tag->name)));
       message::success($message);
       log::success("tags", $message);
 
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index fe8061aa..b5dc6cb5 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -50,7 +50,7 @@ class Admin_Users_Controller extends Controller {
       }
 
       $user->save();
-      message::success(t("Created user %user_name", array("user_name" => $user->name)));
+      message::success(t("Created user %user_name", array("user_name" => p::clean($user->name))));
       print json_encode(array("result" => "success"));
     } else {
       print json_encode(array("result" => "error",
@@ -83,7 +83,7 @@ class Admin_Users_Controller extends Controller {
                               "form" => $form->__toString()));
     }
 
-    $message = t("Deleted user %user_name", array("user_name" => $name));
+    $message = t("Deleted user %user_name", array("user_name" => p::clean($name)));
     log::success("user", $message);
     message::success($message);
     print json_encode(array("result" => "success"));
@@ -139,7 +139,7 @@ class Admin_Users_Controller extends Controller {
       }
       $user->save();
 
-      message::success(t("Changed user %user_name", array("user_name" => $user->name)));
+      message::success(t("Changed user %user_name", array("user_name" => p::clean($user->name))));
       print json_encode(array("result" => "success"));
     } else {
       print json_encode(array("result" => "error",
@@ -200,7 +200,8 @@ class Admin_Users_Controller extends Controller {
     if ($valid) {
       $group = group::create($new_name);
       $group->save();
-      message::success(t("Created group %group_name", array("group_name" => $group->name)));
+      message::success(
+        t("Created group %group_name", array("group_name" => p::clean($group->name))));
       print json_encode(array("result" => "success"));
     } else {
       print json_encode(array("result" => "error",
@@ -229,7 +230,7 @@ class Admin_Users_Controller extends Controller {
                               "form" => $form->__toString()));
     }
 
-    $message = t("Deleted group %group_name", array("group_name" => $name));
+    $message = t("Deleted group %group_name", array("group_name" => p::clean($name)));
     log::success("group", $message);
     message::success($message);
     print json_encode(array("result" => "success"));
@@ -266,10 +267,12 @@ class Admin_Users_Controller extends Controller {
     if ($valid) {
       $group->name = $form->edit_group->inputs["name"]->value;
       $group->save();
-      message::success(t("Changed group %group_name", array("group_name" => $group->name)));
+      message::success(
+        t("Changed group %group_name", array("group_name" => p::clean($group->name))));
       print json_encode(array("result" => "success"));
     } else {
-      message::error(t("Failed to change group %group_name", array("group_name" => $group->name)));
+      message::error(
+        t("Failed to change group %group_name", array("group_name" => p::clean($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 54a7905e..4d901051 100644
--- a/modules/user/controllers/login.php
+++ b/modules/user/controllers/login.php
@@ -62,7 +62,8 @@ class Login_Controller extends Controller {
       if (!$user->loaded || !user::is_correct_password($user, $form->login->password->value)) {
         log::warning(
           "user",
-          t("Failed login for %name", array("name" => $form->login->inputs["name"]->value)));
+          t("Failed login for %name",
+            array("name" => p::clean($form->login->inputs["name"]->value))));
         $form->login->inputs["name"]->add_error("invalid_login", 1);
         $valid = false;
       }
@@ -70,7 +71,7 @@ class Login_Controller extends Controller {
 
     if ($valid) {
       user::login($user);
-      log::info("user", t("User %name logged in", array("name" => $user->name)));
+      log::info("user", t("User %name logged in", array("name" => p::clean($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 a541ed9b..63971789 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" => $user->name)),
-              html::anchor("user/$user->id", $user->name));
+    log::info("user", t("User %name logged out", array("name" => p::clean($user->name))),
+              html::anchor("user/$user->id", p::clean($user->name)));
     if ($this->input->get("continue")) {
       $item = url::get_item_from_uri($this->input->get("continue"));
       if (access::can("view", $item)) {
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index 2dde11b8..ed3b9736 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -72,7 +72,9 @@ class Password_Controller extends Controller {
         ->message($message->render())
         ->send();
 
-      log::success("user", "Password reset email sent for user $user->name");
+      log::success(
+        "user",
+        t("Password reset email sent for user %name", array("name" => p::clean($user->name)));
     } else {
       // Don't include the username here until you're sure that it's XSS safe
       log::warning(
-- 
cgit v1.2.3


From 93e9efed971c1eee8e754c900972c863984e066e Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Thu, 2 Jul 2009 20:49:47 -0700
Subject: Use Unicode characters (looks better to translator, and fixes
 normalization issue in translation server)

---
 modules/user/helpers/user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/user')

diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 9e9d4ca1..a59588f8 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -82,7 +82,7 @@ class user_Core {
     $locales = locale::installed();
     if (count($locales) > 1) {
       // Put "none" at the first position in the array
-      $locales = array_merge(array("" => t("&laquo; none &raquo;")), $locales);
+      $locales = array_merge(array("" => t("« none »")), $locales);
       $selected_locale = ($user && $user->locale) ? $user->locale : "";
       $form->dropdown("locale")
         ->label(t("Language Preference"))
-- 
cgit v1.2.3


From e2a9a1d28459b96e412004df4d4ec010fb9b30e2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 13 Jul 2009 10:36:55 -0700
Subject: Add quotes around all values that contain spaces in them, and add a
 test to make sure that we continue to do so.

This makes sure that we don't have problems with 5.3 which treats the
literal "on" as a boolean.
---
 modules/akismet/module.info                   |  2 +-
 modules/comment/module.info                   |  2 +-
 modules/digibug/module.info                   |  4 +--
 modules/exif/module.info                      |  2 +-
 modules/g2_import/module.info                 |  4 +--
 modules/gallery/module.info                   |  4 +--
 modules/gallery/tests/File_Structure_Test.php | 37 +++++++++++++++++++++++++++
 modules/image_block/module.info               |  4 +--
 modules/info/module.info                      |  4 +--
 modules/notification/module.info              |  2 +-
 modules/organize/module.info                  |  4 +--
 modules/recaptcha/module.info                 |  2 +-
 modules/rss/module.info                       |  4 +--
 modules/search/module.info                    |  4 +--
 modules/server_add/module.info                |  4 +--
 modules/slideshow/module.info                 |  4 +--
 modules/tag/module.info                       |  4 +--
 modules/user/module.info                      |  4 +--
 modules/watermark/module.info                 |  4 +--
 themes/admin_default/theme.info               |  6 ++---
 themes/default/theme.info                     |  6 ++---
 21 files changed, 74 insertions(+), 37 deletions(-)

(limited to 'modules/user')

diff --git a/modules/akismet/module.info b/modules/akismet/module.info
index d45d8a7b..b61ed107 100644
--- a/modules/akismet/module.info
+++ b/modules/akismet/module.info
@@ -1,3 +1,3 @@
-name = Akismet
+name = "Akismet"
 description = "Filter comments through the Akismet web service to detect and eliminate spam (http://akismet.com).  You'll need a WordPress.com API key to use it."
 version = 1
diff --git a/modules/comment/module.info b/modules/comment/module.info
index 55997317..c371cf27 100644
--- a/modules/comment/module.info
+++ b/modules/comment/module.info
@@ -1,3 +1,3 @@
-name = Comments
+name = "Comments"
 description = "Allows users and guests to leave comments on photos and albums."
 version = 2
diff --git a/modules/digibug/module.info b/modules/digibug/module.info
index c25a2454..be4e880a 100644
--- a/modules/digibug/module.info
+++ b/modules/digibug/module.info
@@ -1,3 +1,3 @@
-name = Digibug
-description = Digibug Photo Printing Module
+name = "Digibug"
+description = "Digibug Photo Printing Module"
 version = 2
diff --git a/modules/exif/module.info b/modules/exif/module.info
index 1e16a5ff..c8ae688e 100644
--- a/modules/exif/module.info
+++ b/modules/exif/module.info
@@ -1,3 +1,3 @@
-name = Exif Data
+name = "Exif Data"
 description = "Extract Exif data and display it on photo pages."
 version = 1
diff --git a/modules/g2_import/module.info b/modules/g2_import/module.info
index 9e04f49b..554cf33b 100644
--- a/modules/g2_import/module.info
+++ b/modules/g2_import/module.info
@@ -1,3 +1,3 @@
-name = Gallery2 Import
-description = Import your Gallery 2 content into Gallery 3
+name = "Gallery2 Import"
+description = "Import your Gallery 2 content into Gallery 3"
 version = 1
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index c184aba7..64a30b1f 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
-name = Gallery 3
-description = Gallery core application
+name = "Gallery 3"
+description = "Gallery core application"
 version = 6
diff --git a/modules/gallery/tests/File_Structure_Test.php b/modules/gallery/tests/File_Structure_Test.php
index 06f456ff..8a97e00b 100644
--- a/modules/gallery/tests/File_Structure_Test.php
+++ b/modules/gallery/tests/File_Structure_Test.php
@@ -213,6 +213,43 @@ class File_Structure_Test extends Unit_Test_Case {
       }
     }
   }
+
+  public function module_info_is_well_formed_test() {
+    $info_files = array_merge(
+      glob("modules/*/module.info"),
+      glob("themes/*/module.info"));
+
+    $errors = array();
+    foreach ($info_files as $file) {
+      foreach (file($file) as $line) {
+        $parts = explode("=", $line, 2);
+        $values[trim($parts[0])] = trim($parts[1]);
+      }
+
+      $module = dirname($file);
+      // Certain keys must exist
+      foreach (array("name", "description", "version") as $key) {
+        if (!array_key_exists($key, $values)) {
+          $errors[] = "$module: missing key $key";
+        }
+      }
+
+      // Any values containing spaces must be quoted
+      foreach ($values as $key => $value) {
+        if (strpos($value, " ") !== false && !preg_match('/^".*"$/', $value)) {
+          $errors[] = "$module: value for $key must be quoted";
+        }
+      }
+
+      // The file must parse
+      if (!is_array(parse_ini_file($file))) {
+        $errors[] = "$module: info file is not parseable";
+      }
+    }
+    if ($errors) {
+      $this->assert_true(false, $errors);
+    }
+  }
 }
 
 class PhpCodeFilterIterator extends FilterIterator {
diff --git a/modules/image_block/module.info b/modules/image_block/module.info
index 8852d33c..e6d85048 100644
--- a/modules/image_block/module.info
+++ b/modules/image_block/module.info
@@ -1,3 +1,3 @@
-name = Image Block
-description = Display a random image in the sidebar
+name = "Image Block"
+description = "Display a random image in the sidebar"
 version = 1
diff --git a/modules/info/module.info b/modules/info/module.info
index ce03473e..e352213c 100644
--- a/modules/info/module.info
+++ b/modules/info/module.info
@@ -1,3 +1,3 @@
-name = Info
-description = Display extra information about photos and albums
+name = "Info"
+description = "Display extra information about photos and albums"
 version = 1
diff --git a/modules/notification/module.info b/modules/notification/module.info
index d4dc34e0..31684ccf 100644
--- a/modules/notification/module.info
+++ b/modules/notification/module.info
@@ -1,3 +1,3 @@
-name = Notification
+name = "Notification"
 description = "Send notifications to users when changes are made to watched albums."
 version = 1
diff --git a/modules/organize/module.info b/modules/organize/module.info
index b3ae94a3..5c6b1de0 100644
--- a/modules/organize/module.info
+++ b/modules/organize/module.info
@@ -1,3 +1,3 @@
-name = Organize
-description = Organize your gallery by apply tags or moving images
+name = "Organize"
+description = "Organize your gallery by apply tags or moving images"
 version = 1
diff --git a/modules/recaptcha/module.info b/modules/recaptcha/module.info
index 9f44648a..cfa1bf7a 100644
--- a/modules/recaptcha/module.info
+++ b/modules/recaptcha/module.info
@@ -1,3 +1,3 @@
-name = reCAPTCHA
+name = "reCAPTCHA"
 description = "reCAPTCHA displays a graphical verification that protects the input form from abuse from 'bots,' or automated programs usually written to generate spam (http://recaptcha.net)."
 version = 1
diff --git a/modules/rss/module.info b/modules/rss/module.info
index ffd26192..81ee7848 100644
--- a/modules/rss/module.info
+++ b/modules/rss/module.info
@@ -1,3 +1,3 @@
-name = RSS
-description = Provide a RSS feeds
+name = "RSS"
+description = "Provide a RSS feeds"
 version = 1
diff --git a/modules/search/module.info b/modules/search/module.info
index b286ab6c..f417c4fa 100644
--- a/modules/search/module.info
+++ b/modules/search/module.info
@@ -1,3 +1,3 @@
-name = Search
-description = Allows users to search their Gallery
+name = "Search"
+description = "Allows users to search their Gallery"
 version = 1
diff --git a/modules/server_add/module.info b/modules/server_add/module.info
index 295d3beb..23acab94 100644
--- a/modules/server_add/module.info
+++ b/modules/server_add/module.info
@@ -1,3 +1,3 @@
-name = Server Add
-description = Allows authorized users to load images directly from your web server
+name = "Server Add"
+description = "Allows authorized users to load images directly from your web server"
 version = 3
diff --git a/modules/slideshow/module.info b/modules/slideshow/module.info
index 5eb69ce3..6841199a 100644
--- a/modules/slideshow/module.info
+++ b/modules/slideshow/module.info
@@ -1,3 +1,3 @@
-name = Slideshow
-description = Allows users to view a slideshow of photos
+name = "Slideshow"
+description = "Allows users to view a slideshow of photos"
 version = 1
diff --git a/modules/tag/module.info b/modules/tag/module.info
index 562d5c32..e505dd81 100644
--- a/modules/tag/module.info
+++ b/modules/tag/module.info
@@ -1,3 +1,3 @@
-name = Tags
-description = Allows users to tag photos and albums
+name = "Tags"
+description = "Allows users to tag photos and albums"
 version = 1
diff --git a/modules/user/module.info b/modules/user/module.info
index 2dba517d..8a9af407 100644
--- a/modules/user/module.info
+++ b/modules/user/module.info
@@ -1,3 +1,3 @@
-name = Users and Groups
-description = Provides user and group management
+name = "Users and Groups"
+description = "Provides user and group management"
 version = 1
diff --git a/modules/watermark/module.info b/modules/watermark/module.info
index 7f866695..abd4a3cf 100644
--- a/modules/watermark/module.info
+++ b/modules/watermark/module.info
@@ -1,3 +1,3 @@
-name = Watermarks
-description = Allows users to watermark their photos
+name = "Watermarks"
+description = "Allows users to watermark their photos"
 version = 1
diff --git a/themes/admin_default/theme.info b/themes/admin_default/theme.info
index d21b0ff5..b3d9741d 100644
--- a/themes/admin_default/theme.info
+++ b/themes/admin_default/theme.info
@@ -1,6 +1,6 @@
-name = Gallery Default
-description = A crisp Site Administration theme with soft colors and drop down menus.
+name = "Gallery Default"
+description = "A crisp Site Administration theme with soft colors and drop down menus."
 version = 1
-author = Gallery Team
+author = "Gallery Team"
 admin = 1
 site = 0
diff --git a/themes/default/theme.info b/themes/default/theme.info
index 71e8a740..5f19d0d7 100644
--- a/themes/default/theme.info
+++ b/themes/default/theme.info
@@ -1,6 +1,6 @@
-name = Gallery Default
-description = A crisp and distinctive theme that uses large fonts and icons for easy navigation and an enjoyable browsing experience.
+name = "Gallery Default"
+description = "A crisp and distinctive theme that uses large fonts and icons for easy navigation and an enjoyable browsing experience."
 version = 1
-author = Gallery Team
+author = "Gallery Team"
 site = 1
 admin = 0
-- 
cgit v1.2.3