Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

10 files changed, 113 insertions, 79 deletions

diff --git a/modules/server_add/controllers/admin_server_add.php b/modules/server_add/controllers/admin_server_add.php
index 38190fee..f32bb834 100644
--- a/modules/server_add/controllers/admin_server_add.php
+++ b/modules/server_add/controllers/admin_server_add.php
@@ -83,9 +83,9 @@ class Admin_Server_Add_Controller extends Admin_Controller {
 
   private function _get_admin_form() {
     $form = new Forge("admin/server_add/add_path", "", "post",
-                      array("id" => "gServerAddAdminForm"));
+                      array("id" => "g-server-add-admin-form", "class" => "g-short-form"));
     $add_path = $form->group("add_path");
-    $add_path->input("path")->label(t("Path"))->rules("required")
+    $add_path->input("path")->label(t("Path"))->rules("required")->id("g-path")
       ->error_messages("not_readable", t("This directory is not readable by the webserver"))
       ->error_messages("is_symlink", t("Symbolic links are not allowed"));
     $add_path->submit("add")->value(t("Add Path"));
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 9769cd6f..53a3d091 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -103,7 +103,7 @@ class Server_Add_Controller extends Admin_Controller {
     access::verify_csrf();
 
     $task = ORM::factory("task", $task_id);
-    if (!$task->loaded || $task->owner_id != user::active()->id) {
+    if (!$task->loaded || $task->owner_id != identity::active_user()->id) {
       access::forbidden();
     }
 
@@ -207,7 +207,7 @@ class Server_Add_Controller extends Admin_Controller {
         $task->set("mode", "done");
       }
 
-      $owner_id = user::active()->id;
+      $owner_id = identity::active_user()->id;
       foreach ($entries as $entry) {
         if (microtime(true) - $start > 0.5) {
           break;
diff --git a/modules/server_add/css/server_add.css b/modules/server_add/css/server_add.css
new file mode 100644
index 00000000..36746ab5
--- /dev/null
+++ b/modules/server_add/css/server_add.css
@@ -0,0 +1,38 @@
+#g-server-add button {
+  margin-bottom: .5em;
+}
+
+#g-server-add-tree {
+  cursor: pointer;
+  padding-left: 4px;
+  width: 95%;
+}
+
+#g-server-add-tree li {
+  padding: 0;
+  float: none;
+}
+
+#g-server-add-tree span.selected {
+  background: #ddd;
+}
+
+#g-server-add-tree {
+  border: 1px solid #ccc;
+  height: 20em;
+  overflow: auto;
+  margin-bottom: .5em;
+  padding: .5em;
+}
+
+#g-server-add ul ul li {
+  padding-left: 1.2em;
+}
+
+#g-server-add-paths li .ui-icon {
+  margin-top: .4em;
+}
+
+#g-server-add-admin-form .textbox  {
+  width: 400px;
+}
diff --git a/modules/server_add/helpers/server_add_event.php b/modules/server_add/helpers/server_add_event.php
index 4db83f74..e1295bd4 100644
--- a/modules/server_add/helpers/server_add_event.php
+++ b/modules/server_add/helpers/server_add_event.php
@@ -30,12 +30,12 @@ class server_add_event_Core {
     $item = $theme->item();
     $paths = unserialize(module::get_var("server_add", "authorized_paths"));
 
-    if ($item && user::active()->admin && $item->is_album() && !empty($paths) &&
+    if ($item && identity::active_user()->admin && $item->is_album() && !empty($paths) &&
         is_writable($item->is_album() ? $item->file_path() : $item->parent()->file_path())) {
       $menu->get("add_menu")
         ->append(Menu::factory("dialog")
                  ->id("server_add")
-                 ->label(t("Server add"))
+                 ->label(t("Server Add"))
                  ->url(url::site("server_add/browse/$item->id")));
     }
   }
diff --git a/modules/server_add/helpers/server_add_theme.php b/modules/server_add/helpers/server_add_theme.php
index 2ba2e167..84f28df2 100644
--- a/modules/server_add/helpers/server_add_theme.php
+++ b/modules/server_add/helpers/server_add_theme.php
@@ -19,7 +19,8 @@
  */
 class server_add_theme_Core {
   static function head($theme) {
-    if (user::active()->admin) {
+    if (identity::active_user()->admin) {
+      $theme->css("server_add.css");
       $theme->script("server_add.js");
     }
   }
@@ -27,10 +28,11 @@ class server_add_theme_Core {
   static function admin_head($theme) {
     $head = array();
     if (strpos(Router::$current_uri, "admin/server_add") !== false) {
+      $theme->css("server_add.css");
       $theme->css("jquery.autocomplete.css");
       $base = url::site("__ARGS__");
       $csrf = access::csrf_token();
-      $head[] = "<script> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
+      $head[] = "<script type=\"text/javascript\"> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
 
       $theme->script("jquery.autocomplete.js");
       $theme->script("admin.js");
diff --git a/modules/server_add/js/admin.js b/modules/server_add/js/admin.js
index 5440af2a..9d7bd181 100644
--- a/modules/server_add/js/admin.js
+++ b/modules/server_add/js/admin.js
@@ -3,6 +3,6 @@
  *
  */
 $("document").ready(function() {
-  $("#gServerAddAdmin input:text").autocomplete(
+  $("#g-path").autocomplete(
     base_url.replace("__ARGS__", "admin/server_add/autocomplete"), {max: 256});
 });
diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js
index 50a8c36b..02dda4c0 100644
--- a/modules/server_add/js/server_add.js
+++ b/modules/server_add/js/server_add.js
@@ -2,38 +2,38 @@
    $.widget("ui.gallery_server_add",  {
      _init: function() {
        var self = this;
-       $("#gServerAddAddButton", this.element).click(function(event) {
+       $("#g-server-add-add-button", this.element).click(function(event) {
          event.preventDefault();
-         $(".gProgressBar", this.element).
+         $(".g-progress-bar", this.element).
            progressbar().
            progressbar("value", 0);
-         $("#gServerAddProgress", this.element).slideDown("fast", function() { self.start_add(); });
+         $("#g-server-add-progress", this.element).slideDown("fast", function() { self.start_add(); });
        });
-       $("#gServerAddPauseButton", this.element).click(function(event) {
+       $("#g-server-add-pause-button", this.element).click(function(event) {
          self.pause = true;
-         $("#gServerAddPauseButton", this.element).hide();
-         $("#gServerAddContinueButton", this.element).show();
+         $("#g-server-add-pause-button", this.element).hide();
+         $("#g-server-add-continue-button", this.element).show();
        });
-       $("#gServerAddContinueButton", this.element).click(function(event) {
+       $("#g-server-add-continue-button", this.element).click(function(event) {
          self.pause = false;
-         $("#gServerAddPauseButton", this.element).show();
-         $("#gServerAddContinueButton", this.element).hide();
+         $("#g-server-add-pause-button", this.element).show();
+         $("#g-server-add-continue-button", this.element).hide();
          self.run_add();
        });
-       $("#gServerAddCloseButton", this.element).click(function(event) {
-         $("#gDialog").dialog("close");
+       $("#g-server-add-close-button", this.element).click(function(event) {
+         $("#g-dialog").dialog("close");
          window.location.reload();
        });
-       $("#gServerAddTree span.gDirectory", this.element).dblclick(function(event) {
+       $("#g-server-add-tree span.g-directory", this.element).dblclick(function(event) {
          self.open_dir(event);
        });
-       $("#gServerAddTree span.gFile, #gServerAddTree span.gDirectory", this.element).click(function(event) {
+       $("#g-server-add-tree span.g-file, #g-server-add-tree span.g-directory", this.element).click(function(event) {
          self.select_file(event);
        });
-       $("#gServerAddTree span.gDirectory", this.element).dblclick(function(event) {
+       $("#g-server-add-tree span.g-directory", this.element).dblclick(function(event) {
          self.open_dir(event);
        });
-       $("#gDialog").bind("dialogclose", function(event, ui) {
+       $("#g-dialog").bind("dialogclose", function(event, ui) {
          window.location.reload();
        });
      },
@@ -48,8 +48,8 @@
 	 paths.push($(this).attr("ref"));
        });
 
-       $("#gServerAddAddButton", this.element).hide();
-       $("#gServerAddPauseButton", this.element).show();
+       $("#g-server-add-add-button", this.element).hide();
+       $("#g-server-add-pause-button", this.element).show();
 
        $.ajax({
          url: START_URL,
@@ -58,8 +58,8 @@
          data: { "paths[]": paths },
          dataType: "json",
          success: function(data, textStatus) {
-           $("#gStatus").html(data.status);
-           $(".gProgressBar", self.element).progressbar("value", data.percent_complete);
+           $("#g-status").html(data.status);
+           $(".g-progress-bar", self.element).progressbar("value", data.percent_complete);
            self.taskURL = data.url;
            setTimeout(function() { self.run_add(); }, 25);
          }
@@ -74,13 +74,13 @@
          async: false,
          dataType: "json",
          success: function(data, textStatus) {
-           $("#gStatus").html(data.status);
-           $(".gProgressBar", self.element).progressbar("value", data.percent_complete);
+           $("#g-status").html(data.status);
+           $(".g-progress-bar", self.element).progressbar("value", data.percent_complete);
            if (data.done) {
-	     $("#gServerAddProgress", this.element).slideUp();
-             $("#gServerAddAddButton", this.element).show();
-             $("#gServerAddPauseButton", this.element).hide();
-             $("#gServerAddContinueButton", this.element).hide();
+	     $("#g-server-add-progress", this.element).slideUp();
+             $("#g-server-add-add-button", this.element).show();
+             $("#g-server-add-pause-button", this.element).hide();
+             $("#g-server-add-continue-button", this.element).hide();
            } else {
              if (!self.pause) {
                setTimeout(function() { self.run_add(); }, 25);
@@ -99,11 +99,11 @@
        $.ajax({
          url: GET_CHILDREN_URL.replace("__PATH__", path),
          success: function(data, textStatus) {
-           $("#gServerAddTree", self.element).html(data);
-           $("#gServerAddTree span.gDirectory", self.element).dblclick(function(event) {
+           $("#g-server-add-tree", self.element).html(data);
+           $("#g-server-add-tree span.g-directory", self.element).dblclick(function(event) {
              self.open_dir(event);
            });
-           $("#gServerAddTree span.gFile, #gServerAddTree span.gDirectory", this.element).click(function(event) {
+           $("#g-server-add-tree span.g-file, #g-server-add-tree span.g-directory", this.element).click(function(event) {
              self.select_file(event);
            });
          }
@@ -115,10 +115,10 @@
       */
      select_file:  function (event) {
        $(event.target).toggleClass("selected");
-       if ($("#gServerAdd span.selected").length) {
-         $("#gServerAddAddButton").enable(true).removeClass("ui-state-disabled");
+       if ($("#g-server-add span.selected").length) {
+         $("#g-server-add-add-button").enable(true).removeClass("ui-state-disabled");
        } else {
-         $("#gServerAddAddButton").enable(false).addClass("ui-state-disabled");
+         $("#g-server-add-add-button").enable(false).addClass("ui-state-disabled");
        }
      }
   });
diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php
index b48a19da..6dbb8637 100644
--- a/modules/server_add/views/admin_server_add.html.php
+++ b/modules/server_add/views/admin_server_add.html.php
@@ -1,25 +1,21 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gServerAddAdmin">
-  <h2>
-    <?= t("Add From Server Admininstration") ?>
-  </h2>
-  <div id="gAuthorizedPath">
-    <h3><?= t("Authorized Paths") ?></h3>
-    <ul id="gMessage"<? if (!empty($paths)): ?> style="display: none;"<? endif ?>>
-      <li class="gInfo"><?= t("No Authorized image source paths defined yet") ?></li>
-    </ul>
-    <ul id="gPathList">
+<div class="g-block">
+  <h1> <?= t("Add from server admininstration") ?> </h1>
+  <div class="g-block-content">
+    <?= $form ?>
+    <h2><?= t("Authorized paths") ?></h2>
+    <ul id="g-server-add-paths">
+      <? if (empty($paths)): ?>
+      <li class="g-module-status g-info"><?= t("No authorized image source paths defined yet") ?></li>
+      <? endif ?>
       <? foreach ($paths as $id => $path): ?>
-      <li class="ui-icon-left">
-        <a href="<?= url::site("admin/server_add/remove_path?path=" . urlencode($path) . "&amp;csrf=$csrf") ?>"
-           id="icon_<?= $id?>"
-           class="gRemoveDir ui-icon ui-icon-trash">
-          X
-        </a>
+      <li>
         <?= html::clean($path) ?>
+        <a href="<?= url::site("admin/server_add/remove_path?path=" . urlencode($path) . "&amp;csrf=$csrf") ?>"
+           id="icon_<?= $id ?>"
+           class="g-remove-dir g-button"><span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
       </li>
       <? endforeach ?>
     </ul>
   </div>
-  <?= $form ?>
 </div>
diff --git a/modules/server_add/views/server_add_tree.html.php b/modules/server_add/views/server_add_tree.html.php
index 4e5bf601..91354329 100644
--- a/modules/server_add/views/server_add_tree.html.php
+++ b/modules/server_add/views/server_add_tree.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <li class="ui-icon-left">
   <span class="ui-icon ui-icon-folder-open"></span>
-  <span class="gDirectory" ref="">
+  <span class="g-directory" ref="">
     <?= t("All") ?>
   </span>
   <ul>
@@ -9,7 +9,7 @@
     <? foreach ($parents as $dir): ?>
     <li class="ui-icon-left">
       <span class="ui-icon ui-icon-folder-open"></span>
-      <span class="gDirectory" ref="<?= html::clean_attribute($dir) ?>">
+      <span class="g-directory" ref="<?= html::clean_attribute($dir) ?>">
         <?= html::clean(basename($dir)) ?>
       </span>
       <ul>
@@ -18,7 +18,7 @@
         <? foreach ($files as $file): ?>
         <li class="ui-icon-left">
           <span class="ui-icon <?= is_dir($file) ? "ui-icon-folder-collapsed" : "ui-icon-document" ?>"></span>
-          <span class="<?= is_dir($file) ? "gDirectory" : "gFile" ?>"
+          <span class="<?= is_dir($file) ? "g-directory" : "g-file" ?>"
                 ref="<?= html::clean_attribute($file) ?>" >
             <?= html::clean(basename($file)) ?>
           </span>
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 fdb66d1c..824a86a6 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -4,50 +4,48 @@
   var START_URL = "<?= url::site("server_add/start?item_id={$item->id}&csrf=$csrf") ?>";
 </script>
 
-<div id="gServerAdd">
+<div id="g-server-add">
   <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">
+  <p id="g-description"><?= t("Photos will be added to album:") ?></p>
+  <ul class="g-breadcrumbs">
+    <? $i = 0 ?>
     <? foreach ($item->parents() as $parent): ?>
-    <li>
-      <?= html::purify($parent->title) ?>
-    </li>
+    <li<? if ($i == 0) print " class=\"g-first\"" ?>> <?= html::purify($parent->title) ?> </li>
+    <? $i++ ?>
     <? endforeach ?>
-    <li class="active">
-      <?= html::purify($item->title) ?>
-    </li>
+    <li class="g-active"> <?= html::purify($item->title) ?> </li>
   </ul>
 
-  <ul id="gServerAddTree" class="gCheckboxTree">
+  <ul id="g-server-add-tree" class="g-checkbox-tree">
     <?= $tree ?>
   </ul>
 
-  <div id="gServerAddProgress" style="display: none">
-    <div class="gProgressBar"></div>
-    <div id="gStatus"></div>
+  <div id="g-server-add-progress" style="display: none">
+    <div class="g-progress-bar"></div>
+    <div id="g-status"></div>
   </div>
 
   <span>
-    <button id="gServerAddAddButton" class="ui-state-default ui-state-disabled ui-corner-all"
+    <button id="g-server-add-add-button" class="ui-state-default ui-state-disabled ui-corner-all"
             disabled="disabled">
       <?= t("Add") ?>
     </button>
-    <button id="gServerAddPauseButton" class="ui-state-default ui-corner-all" style="display:none">
+    <button id="g-server-add-pause-button" class="ui-state-default ui-corner-all" style="display:none">
       <?= t("Pause") ?>
     </button>
-    <button id="gServerAddContinueButton" class="ui-state-default ui-corner-all" style="display:none">
+    <button id="g-server-add-continue-button" class="ui-state-default ui-corner-all" style="display:none">
       <?= t("Continue") ?>
     </button>
 
-    <button id="gServerAddCloseButton" class="ui-state-default ui-corner-all">
+    <button id="g-server-add-close-button" class="ui-state-default ui-corner-all">
       <?= t("Close") ?>
     </button>
   </span>
 
   <script type="text/javascript">
-    $("#gServerAdd").ready(function() {
-      $("#gServerAdd").gallery_server_add();
+    $("#g-server-add").ready(function() {
+      $("#g-server-add").gallery_server_add();
     });
   </script>