Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 46 insertions, 23 deletions

diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index b7816954..b5c32ad2 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -18,44 +18,48 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class gallery_block_Core {
-  static function get_list() {
+  static function get_admin_list() {
     return array(
       "welcome" => t("Welcome to Gallery 3!"),
-      "photo_stream" => t("Photo Stream"),
-      "log_entries" => t("Log Entries"),
-      "stats" => t("Gallery Stats"),
-      "platform_info" => t("Platform Information"),
-      "project_news" => t("Gallery Project News"));
+      "photo_stream" => t("Photo stream"),
+      "log_entries" => t("Log entries"),
+      "stats" => t("Gallery stats"),
+      "platform_info" => t("Platform information"),
+      "project_news" => t("Gallery project news"));
+  }
+
+  static function get_site_list() {
+    return array("language" => t("Language preference"));
   }
 
   static function get($block_id) {
     $block = new Block();
     switch($block_id) {
     case "welcome":
-      $block->css_id = "gWelcome";
+      $block->css_id = "g-welcome";
       $block->title = t("Welcome to Gallery 3");
       $block->content = new View("admin_block_welcome.html");
       break;
 
     case "photo_stream":
-      $block->css_id = "gPhotoStream";
-      $block->title = t("Photo Stream");
+      $block->css_id = "g-photo-stream";
+      $block->title = t("Photo stream");
       $block->content = new View("admin_block_photo_stream.html");
       $block->content->photos =
         ORM::factory("item")->where("type", "photo")->orderby("created", "DESC")->find_all(10);
       break;
 
     case "log_entries":
-      $block->css_id = "gLogEntries";
-      $block->title = t("Log Entries");
+      $block->css_id = "g-log-entries";
+      $block->title = t("Log entries");
       $block->content = new View("admin_block_log_entries.html");
       $block->content->entries = ORM::factory("log")
         ->orderby(array("timestamp" => "DESC", "id" => "DESC"))->find_all(5);
       break;
 
     case "stats":
-      $block->css_id = "gStats";
-      $block->title = t("Gallery Stats");
+      $block->css_id = "g-stats";
+      $block->title = t("Gallery stats");
       $block->content = new View("admin_block_stats.html");
       $block->content->album_count =
         ORM::factory("item")->where("type", "album")->where("id <>", 1)->count_all();
@@ -63,38 +67,57 @@ class gallery_block_Core {
       break;
 
     case "platform_info":
-      $block->css_id = "gPlatform";
-      $block->title = t("Platform Information");
+      $block->css_id = "g-platform";
+      $block->title = t("Platform information");
       $block->content = new View("admin_block_platform.html");
       if (is_readable("/proc/loadavg")) {
         $block->content->load_average =
-          join(" ", array_slice(split(" ", array_shift(file("/proc/loadavg"))), 0, 3));
+          join(" ", array_slice(explode(" ", array_shift(file("/proc/loadavg"))), 0, 3));
       } else {
         $block->content->load_average = t("Unavailable");
       }
       break;
 
     case "project_news":
-      $block->css_id = "gProjectNews";
-      $block->title = t("Gallery Project News");
+      $block->css_id = "g-project-news";
+      $block->title = t("Gallery project news");
       $block->content = new View("admin_block_news.html");
       $block->content->feed = feed::parse("http://gallery.menalto.com/node/feed", 3);
       break;
 
     case "block_adder":
-      $block->css_id = "gBlockAdder";
-      $block->title = t("Dashboard Content");
+      $block->css_id = "g-block-adder";
+      $block->title = t("Dashboard content");
       $block->content = self::get_add_block_form();
-    }
+      break;
 
+    case "language":
+      $locales = locales::installed();
+      if (count($locales)) {
+        foreach ($locales as $locale => $display_name) {
+          $locales[$locale] = SafeString::of_safe_html($display_name);
+        }
+        $block = new Block();
+        $block->css_id = "g-user-language-block";
+        $block->title = t("Language preference");
+        $block->content = new View("user_languages_block.html");
+        $block->content->installed_locales =
+          array_merge(array("" => t("« none »")), $locales);
+        $block->content->selected = (string) locales::cookie_locale();
+      } else {
+        $block = "";
+      }
+      break;
+    }
     return $block;
   }
 
   static function get_add_block_form() {
     $form = new Forge("admin/dashboard/add_block", "", "post",
-                      array("id" => "gAddDashboardBlockForm"));
+                      array("id" => "g-add-dashboard-block-form"));
     $group = $form->group("add_block")->label(t("Add Block"));
-    $group->dropdown("id")->label(t("Available Blocks"))->options(block_manager::get_available());
+    $group->dropdown("id")->label(t("Available Blocks"))
+      ->options(block_manager::get_available_admin_blocks());
     $group->submit("center")->value(t("Add to center"));
     $group->submit("sidebar")->value(t("Add to sidebar"));
     return $form;