From 603c3049a1ce7249c55ff8338fc3ea69323f0cb3 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 22 Jan 2010 09:39:29 -0800
Subject: Treat identity providers just like other modules and use the
 admin_module to install and switch to a different identity provider.

---
 modules/gallery/helpers/gallery_event.php | 32 ++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 679d65c2..1d8e3581 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -30,21 +30,23 @@ class gallery_event_Core {
 
   static function user_deleted($user) {
     $admin = identity::admin_user();
-    db::build()
-      ->update("tasks")
-      ->set("owner_id", $admin->id)
-      ->where("owner_id", "=", $user->id)
-      ->execute();
-    db::build()
-      ->update("items")
-      ->set("owner_id", $admin->id)
-      ->where("owner_id", "=", $user->id)
-      ->execute();
-    db::build()
-      ->update("logs")
-      ->set("user_id", $admin->id)
-      ->where("user_id", "=", $user->id)
-      ->execute();
+    if (!empty($admin)) {          // could be empty if there is not identity provider
+      db::build()
+        ->update("tasks")
+        ->set("owner_id", $admin->id)
+        ->where("owner_id", "=", $user->id)
+        ->execute();
+      db::build()
+        ->update("items")
+        ->set("owner_id", $admin->id)
+        ->where("owner_id", "=", $user->id)
+        ->execute();
+      db::build()
+        ->update("logs")
+        ->set("user_id", $admin->id)
+        ->where("user_id", "=", $user->id)
+        ->execute();
+    }
   }
 
   static function identity_provider_changed($old_provider, $new_provider) {
-- 
cgit v1.2.3


From dabd5b84b21c711592a1f3bcd2ca298dd6d7fde2 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 22 Jan 2010 12:22:31 -0800
Subject: Remove the identity manager screens and controller as alterntive
 identity providers are installed in the admin module screen.

---
 modules/gallery/controllers/admin_identity.php     | 76 ----------------------
 modules/gallery/helpers/gallery_event.php          |  6 +-
 modules/gallery/views/admin_identity.html.php      | 59 -----------------
 .../gallery/views/admin_identity_confirm.html.php  | 10 ---
 4 files changed, 1 insertion(+), 150 deletions(-)
 delete mode 100644 modules/gallery/controllers/admin_identity.php
 delete mode 100644 modules/gallery/views/admin_identity.html.php
 delete mode 100644 modules/gallery/views/admin_identity_confirm.html.php

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/controllers/admin_identity.php b/modules/gallery/controllers/admin_identity.php
deleted file mode 100644
index 354e6c0c..00000000
--- a/modules/gallery/controllers/admin_identity.php
+++ /dev/null
@@ -1,76 +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 Admin_Identity_Controller extends Admin_Controller {
-  public function index() {
-    $view = new Admin_View("admin.html");
-    $view->content = new View("admin_identity.html");
-    $view->content->available = identity::providers();
-    $view->content->active = module::get_var("gallery", "identity_provider", "user");
-    print $view;
-  }
-
-  public function confirm() {
-    access::verify_csrf();
-
-    $v = new View("admin_identity_confirm.html");
-    $v->new_provider = Input::instance()->post("provider");
-
-    print $v;
-  }
-
-  public function change() {
-    access::verify_csrf();
-
-    $active_provider = module::get_var("gallery", "identity_provider", "user");
-    $providers = identity::providers();
-    $new_provider = Input::instance()->post("provider");
-
-    if ($new_provider != $active_provider) {
-
-      module::deactivate($active_provider);
-
-      // Switch authentication
-      identity::reset();
-      module::set_var("gallery", "identity_provider", $new_provider);
-
-      module::install($new_provider);
-      module::activate($new_provider);
-
-      module::event("identity_provider_changed", $active_provider, $new_provider);
-
-      module::uninstall($active_provider);
-
-      message::success(t("Changed to %description",
-                         array("description" => $providers->$new_provider)));
-
-      try {
-        Session::instance()->destroy();
-      } catch (Exception $e) {
-        // We don't care if there was a problem destroying the session.
-      }
-      url::redirect(item::root()->abs_url());
-    }
-
-    message::info(t("The selected provider \"%description\" is already active.",
-                    array("description" => $providers->$new_provider)));
-    url::redirect("admin/identity");
-  }
-}
-
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 1d8e3581..6c7c2ea4 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -230,11 +230,7 @@ class gallery_event_Core {
                ->append(Menu::factory("link")
                         ->id("advanced")
                         ->label(t("Advanced"))
-                        ->url(url::site("admin/advanced_settings")))
-               ->append(Menu::factory("link")
-                        ->id("authentication")
-                        ->label(t("Authentication"))
-                        ->url(url::site("admin/identity"))))
+                        ->url(url::site("admin/advanced_settings"))))
       ->append(Menu::factory("link")
                ->id("modules")
                ->label(t("Modules"))
diff --git a/modules/gallery/views/admin_identity.html.php b/modules/gallery/views/admin_identity.html.php
deleted file mode 100644
index 51eaa58a..00000000
--- a/modules/gallery/views/admin_identity.html.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<script type="text/javascript">
-  $(document).ready(function() {
-    $("#g-modules form").submit(function() {
-      var eDialog = '<div id="g-dialog"></div>';
-      var params = $(this).serialize();
-      var url = $(this).attr("action");
-      $("body").append(eDialog);
-      $.post($(this).attr("action"), $(this).serialize(), function(data, textStatus) {
-        $("#g-dialog").html(data);
-        $("#g-dialog").dialog({
-          bgiframe: true,
-          title: <?= t("Confirm identity provider change")->for_js() ?>,
-          resizable: false,
-          height:180,
-          modal: true,
-          overlay: {
-            backgroundColor: '#000',
-            opacity: 0.5
-          },
-          buttons: {
-            "Continue": function() {
-              $("#g-dialog form").submit();
-            },
-            Cancel: function() {
-              $(this).dialog('destroy').remove();
-            }
-          }
-        });
-      });
-      return false;
-    });
-  });
-
-</script>
-<div id="g-modules">
-  <h1> <?= t("Manage identity providers") ?> </h1>
-  <p>
-    <?= t("Choose a different user/group management provider.") ?>
-  </p>
-
-  <form method="post" action="<?= url::site("admin/identity/confirm") ?>">
-    <?= access::csrf_form_field() ?>
-    <table>
-      <tr>
-        <th> <?= t("Active") ?> </th>
-        <th> <?= t("Description") ?> </th>
-      </tr>
-      <? foreach ($available as $module_name => $description):  ?>
-      <tr class="<?= text::alternate("g-odd", "g-even") ?>">
-        <? $data = array("name" => "provider"); ?>
-        <td> <?= form::radio($data, $module_name, $module_name == $active) ?> </td>
-        <td> <?= t($description) ?> </td>
-      </tr>
-      <? endforeach ?>
-    </table>
-    <input type="submit" value="<?= t("Change")->for_html_attr() ?>" />
-  </form>
-</div>
diff --git a/modules/gallery/views/admin_identity_confirm.html.php b/modules/gallery/views/admin_identity_confirm.html.php
deleted file mode 100644
index 54aae9c8..00000000
--- a/modules/gallery/views/admin_identity_confirm.html.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<form method="post" action="<?= url::site("admin/identity/change") ?>">
-  <?= access::csrf_form_field() ?>
-  <?= form::hidden("provider", $new_provider) ?>
-
-  <p><span class="ui-icon ui-icon-alert" style="float: left; margin:0 7px 20px 0;"></span>
-  <?= t("Are you sure you want to change your Identity Provider? Continuing will delete all existing users.") ?>
-  </p>
-</form>
-
-- 
cgit v1.2.3


From df313cac567bee77f5a73308381fe67dcac9b92c Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 22 Jan 2010 12:30:17 -0800
Subject: Change the check_environment method in the module helper and the
 module installers to can_activate to reflect that it is doing more than just
 checking the environment.

---
 modules/gallery/controllers/admin_modules.php     | 2 +-
 modules/gallery/helpers/module.php                | 8 ++++----
 modules/slideshow/helpers/slideshow_installer.php | 2 +-
 modules/user/helpers/user_installer.php           | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/controllers/admin_modules.php b/modules/gallery/controllers/admin_modules.php
index 46defbef..a2168280 100644
--- a/modules/gallery/controllers/admin_modules.php
+++ b/modules/gallery/controllers/admin_modules.php
@@ -42,7 +42,7 @@ class Admin_Modules_Controller extends Admin_Controller {
       if ($info->active && !$desired && module::is_active($module_name)) {
         $messages = array_merge($messages, module::can_deactivate($module_name));
       } else if (!$info->active && $desired && !module::is_active($module_name)) {
-        $messages = array_merge($messages, module::check_environment($module_name));
+        $messages = array_merge($messages, module::can_activate($module_name));
       }
     }
 
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 595f600b..f680ff6a 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -120,17 +120,17 @@ class module_Core {
   }
 
   /**
-   * Check that the module can be installed. (i.e. all the prerequistes exist)
+   * Check that the module can be activated. (i.e. all the prerequistes exist)
    * @param string $module_name
    * @return array an array of warning or error messages to be displayed
    */
-  static function check_environment($module_name) {
+  static function can_activate($module_name) {
     module::_add_to_path($module_name);
     $messages = array();
 
     $installer_class = "{$module_name}_installer";
-    if (method_exists($installer_class, "check_environment")) {
-      $messages = call_user_func(array($installer_class, "check_environment"));
+    if (method_exists($installer_class, "can_activate")) {
+      $messages = call_user_func(array($installer_class, "can_activate"));
     }
 
     // Remove it from the active path
diff --git a/modules/slideshow/helpers/slideshow_installer.php b/modules/slideshow/helpers/slideshow_installer.php
index 319e2e79..8d612f3e 100644
--- a/modules/slideshow/helpers/slideshow_installer.php
+++ b/modules/slideshow/helpers/slideshow_installer.php
@@ -34,7 +34,7 @@ class slideshow_installer {
     site_status::clear("slideshow_needs_rss");
   }
 
-  static function check_environment() {
+  static function can_activate() {
     $messages = array();
     if (!module::is_active("rss")) {
       $messages["warn"][] = t("The Slideshow module requires the RSS module.");
diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php
index 3882f5f2..38f8020b 100644
--- a/modules/user/helpers/user_installer.php
+++ b/modules/user/helpers/user_installer.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class user_installer {
-  static function check_environment() {
+  static function can_activate() {
     return array("warn" => array(IdentityProvider::confirmation_message()));
   }
 
-- 
cgit v1.2.3


From abdeb21ccbb25aee564335dbbfca4a8afaf49384 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 23 Jan 2010 13:29:49 -0800
Subject: Add a user_menu method to the Admin_View and then use this method to
 get the user menu.  Since the information displayed is identical in both
 admin and theme views, it makes sense to combine the generation to it is done
 in a common location.

---
 modules/gallery/helpers/gallery_event.php |  3 +--
 modules/gallery/libraries/Admin_View.php  | 10 ++++++++++
 themes/admin_wind/css/screen.css          |  5 +++++
 themes/admin_wind/views/admin.html.php    | 15 +--------------
 4 files changed, 17 insertions(+), 16 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 982bf094..6175e049 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -111,12 +111,11 @@ class gallery_event_Core {
                       ->label(t("Login")));
       } else {
         $csrf = access::csrf_token();
-        $item = $theme->item();
         $menu->append(Menu::factory("dialog")
                       ->id("user_menu_edit_profile")
                       ->css_id("g-user-profile-link")
                       ->view("login_current_user.html")
-                      ->url(url::site("form/edit/users/{$user->id}"))
+                      ->url(url::site("form/edit/user/{$user->id}"))
                       ->label($user->display_name()));
         $menu->append(Menu::factory("link")
                       ->id("user_menu_logout")
diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index a990e4ca..e3f9dff0 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -36,6 +36,8 @@ class Admin_View_Core extends Gallery_View {
     $this->sidebar = "";
     $this->set_global("theme", $this);
     $this->set_global("user", identity::active_user());
+    $this->set_global("page_type", "admin");
+    $this->set_global("page_subtype", $name);
   }
 
   public function admin_menu() {
@@ -44,6 +46,14 @@ class Admin_View_Core extends Gallery_View {
     return $menu->render();
   }
 
+  public function user_menu() {
+    $menu = Menu::factory("root")
+      ->css_id("g-login-menu")
+      ->css_class("g-inline ui-helper-clear-fix");
+    module::event("user_menu", $menu, $this);
+    return $menu->render();
+  }
+
   /**
    * Print out any site wide status information.
    */
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 73ec8ac5..ac47a3db 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -229,6 +229,7 @@ th {
 
 #g-header #g-login-menu {
   margin-top: 1em;
+  float: right;
 }
 
 /* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -473,6 +474,10 @@ th {
   right: 150px;
 }
 
+.rtl #g-header #g-login-menu {
+  float: left;
+}
+
 .rtl #g-header #g-login-menu li {
   margin-left: 0;
   padding-left: 0;
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index 25ba1c97..fa79119a 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -43,23 +43,10 @@
       <?= $theme->site_status() ?>
       <div id="g-header" class="ui-helper-clearfix">
         <?= $theme->admin_header_top() ?>
-        <ul id="g-login-menu" class="g-inline g-right">
-          <li class="g-first">
-            <? if (identity::is_writable()): ?>
-            <?= t('Logged in as %name', array('name' => html::mark_clean(
-              '<a href="' . url::site("form/edit/users/{$user->id}") .
-              '" title="' . t("Edit your profile")->for_html_attr() .
-              '" id="g-user-profile-link" class="g-dialog-link">' .
-              html::clean($user->display_name()) . '</a>'))) ?>
-            <? else: ?>
-            <?= t('Logged in as %name', array('name' => html::clean($user->display_name()))) ?>
-            <? endif ?>
-          </li>
-          <li id="g-logout-link"><a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li>
-        </ul>
         <a id="g-logo" class="g-left" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
           &larr; <?= t("back to the ...") ?>
         </a>
+        <?= $theme->user_menu() ?>
         <div id="g-site-admin-menu" class="ui-helper-clearfix">
           <?= $theme->admin_menu() ?>
         </div>
-- 
cgit v1.2.3


From c9b775c21abdf157b635ee023100f25488b89a03 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Sat, 23 Jan 2010 15:46:01 -0800
Subject: Fix for bug 984, consistently interpret installed / available locales
 as array. On the current hostgater setup (PHP 5.2.12), locales::available()
 was returning an array and isset($locales->$code) would always (silently)
 return false.

Choosing array over stdClass since count($someStdClass) will always return 1, and not the number of object members.
---
 modules/gallery/helpers/locales.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php
index 8d76e333..5c8c227a 100644
--- a/modules/gallery/helpers/locales.php
+++ b/modules/gallery/helpers/locales.php
@@ -41,7 +41,7 @@ class locales_Core {
     $default = module::get_var("gallery", "default_locale");
     $codes = explode("|", module::get_var("gallery", "installed_locales", $default));
     foreach ($codes as $code) {
-      if (isset($available->$code)) {
+      if (isset($available[$code])) {
         $installed[$code] = $available[$code];
       }
     }
@@ -127,7 +127,7 @@ class locales_Core {
     }
     $locale or $locale = Gallery_I18n::instance()->locale();
 
-    return self::$locales["$locale"];
+    return self::$locales[$locale];
   }
 
   static function is_rtl($locale=null) {
-- 
cgit v1.2.3


From ed5b07b335d8bd1520f3b54bf28272f853bbfbfb Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 23 Jan 2010 21:38:01 -0800
Subject: Create a user profile page that is used as a landing page when
 referencing a user in messages or pages. Partial fix for ticket #889 and a
 fix for #931.

---
 .../views/admin_block_recent_comments.html.php     |  3 +-
 modules/comment/views/comment.html.php             |  3 +-
 modules/comment/views/comments.html.php            |  3 +-
 modules/gallery/controllers/user_profile.php       | 80 ++++++++++++++++++++++
 modules/gallery/helpers/gallery_event.php          |  4 +-
 modules/gallery/helpers/user_profile.php           | 55 +++++++++++++++
 .../gallery/views/admin_block_log_entries.html.php |  2 +-
 modules/gallery/views/login_current_user.html.php  |  9 +--
 modules/gallery/views/user_profile.html.php        | 69 +++++++++++++++++++
 modules/recaptcha/helpers/recaptcha_event.php      |  6 ++
 10 files changed, 222 insertions(+), 12 deletions(-)
 create mode 100644 modules/gallery/controllers/user_profile.php
 create mode 100644 modules/gallery/helpers/user_profile.php
 create mode 100644 modules/gallery/views/user_profile.html.php

(limited to 'modules/gallery/helpers')

diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php
index d9776def..99f72a30 100644
--- a/modules/comment/views/admin_block_recent_comments.html.php
+++ b/modules/comment/views/admin_block_recent_comments.html.php
@@ -8,8 +8,9 @@
          width="32"
          height="32" />
     <?= gallery::date_time($comment->created) ?>
-    <?= t('<a href="#">%author_name</a> said <em>%comment_text</em>',
+    <?= t('<a href="%url">%author_name</a> said <em>%comment_text</em>',
           array("author_name" => html::clean($comment->author_name()),
+                "url" => user_profile::url($comment->author_id),
                 "comment_text" => text::limit_words(nl2br(html::purify($comment->text)), 50))); ?>
   </li>
   <? endforeach ?>
diff --git a/modules/comment/views/comment.html.php b/modules/comment/views/comment.html.php
index 2c485b53..c4cf1ce0 100644
--- a/modules/comment/views/comment.html.php
+++ b/modules/comment/views/comment.html.php
@@ -8,8 +8,9 @@
            width="40"
            height="40" />
     </a>
-    <?= t("on %date_time,  <a href=\"#\">%name</a> said",
+    <?= t("on %date_time,  <a href=\"%url\">%name</a> said",
           array("date_time" => gallery::date_time($comment->created),
+                "url" => user_profile::url($comment->author_id),
                 "name" => html::clean($comment->author_name()))) ?>
   </p>
   <div>
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index fc54e3d2..c8236997 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -22,8 +22,9 @@
              width="40"
              height="40" />
       </a>
-      <?= t('on %date <a href="#">%name</a> said',
+      <?= t('on %date <a href="%url">%name</a> said',
             array("date" => date("Y-M-d H:i:s", $comment->created),
+                  "url" => user_profile::url($comment->author_id),
                   "name" => html::clean($comment->author_name()))); ?>
     </p>
     <div>
diff --git a/modules/gallery/controllers/user_profile.php b/modules/gallery/controllers/user_profile.php
new file mode 100644
index 00000000..808531da
--- /dev/null
+++ b/modules/gallery/controllers/user_profile.php
@@ -0,0 +1,80 @@
+<?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 User_Profile_Controller extends Controller {
+  public function show($id) {
+    // If we get here, then we should have a user id other than guest.
+    $user = identity::lookup_user($id);
+    $active_user = identity::active_user();
+    $is_current_active = $active_user->id == $id;
+    $display_all =  $active_user->admin || ($is_current_active && !$active_user->guest);
+
+    $v = new Theme_View("page.html", "other", "profile");
+    $v->page_title = t("%name Profile", array("name" => $user->display_name()));
+    $v->content = new View("user_profile.html");
+
+    // @todo modify user_home to supply a link to their album,
+    // @todo add list of watches
+    // @todo add all comments
+    // @todo add rest api key
+    $v->content->user = $user;
+    $v->content->height = 250;
+    $v->content->not_current = !$is_current_active;
+    $v->content->editable = identity::is_writable() && $display_all;
+    $v->content->return = SafeString::of(Input::instance()->get("return"));
+
+    $fields = array("name" => t("Name"), "locale" => t("Locale"), "email" => t("Email"),
+                    "full_name" => t("Full name"), "url" => "Web site");
+    if (!$display_all) {
+      $fields = array("name" => t("Name"), "full_name" => t("Full name"), "url" => "Web site");
+    }
+    $v->content->fields = array();
+    foreach ($fields as $field => $label) {
+      if (!empty($user->$field)) {
+        $v->content->fields[(string)$label->for_html()] = $user->$field;
+      }
+    }
+
+    print $v;
+  }
+
+  public function contact($id) {
+    $user = identity::lookup_user($id);
+    print user_profile::get_contact_form($user);
+  }
+
+  public function send($id) {
+    $user = identity::lookup_user($id);
+    $form = user_profile::get_contact_form($user);
+    if ($form->validate()) {
+      Sendmail::factory()
+        ->to($user->email)
+        ->subject($form->message->subject->value)
+        ->header("Mime-Version", "1.0")
+        ->header("Content-type", "text/html; charset=iso-8859-1")
+        ->reply_to($form->message->reply_to->value)
+        ->message($form->message->message->value)
+        ->send();
+      message::success(t("Sent message to %user_name", array("user_name" => $user->display_name())));
+      print json_encode(array("result" => "success"));
+    } else {
+      print json_encode(array("result" => "error", "form" => (string)$form));
+    }
+  }
+}
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 6175e049..29940ac6 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -111,11 +111,11 @@ class gallery_event_Core {
                       ->label(t("Login")));
       } else {
         $csrf = access::csrf_token();
-        $menu->append(Menu::factory("dialog")
+        $menu->append(Menu::factory("link")
                       ->id("user_menu_edit_profile")
                       ->css_id("g-user-profile-link")
                       ->view("login_current_user.html")
-                      ->url(url::site("form/edit/user/{$user->id}"))
+                      ->url(user_profile::url($user->id))
                       ->label($user->display_name()));
         $menu->append(Menu::factory("link")
                       ->id("user_menu_logout")
diff --git a/modules/gallery/helpers/user_profile.php b/modules/gallery/helpers/user_profile.php
new file mode 100644
index 00000000..018e1bd1
--- /dev/null
+++ b/modules/gallery/helpers/user_profile.php
@@ -0,0 +1,55 @@
+<?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 user_profile_Core {
+  /**
+   * Generate the url to display the profile
+   * @return url for the profile display
+   */
+  static function url($user_id) {
+    $return_url = urlencode(url::abs_current());
+    return url::site("user_profile/show/{$user_id}?return=$return_url");
+  }
+
+  static function get_contact_form($user) {
+    $form = new Forge("user_profile/send/{$user->id}", "", "post",
+                      array("id" => "g-user-profile-contact-form"));
+    $group = $form->group("message")
+      ->label(t("Compose message to %name", array("name" => $user->display_name())));
+    $group->input("reply_to")
+      ->label(t("From:"))
+      ->rules("required|length[1, 256]|valid_email")
+      ->error_messages("required", t("Field is required"))
+      ->error_messages("max_length", t("Field exceeds 256 bytes"))
+      ->error_messages("valid_email", t("Field is not a valid email address"));
+    $group->input("subject")
+      ->label(t("Subject:"))
+      ->rules("required|length[1, 256]")
+      ->error_messages("required", t("Field is required"))
+      ->error_messages("max_length", t("Field exceeds 256 bytes"));
+    $group->textarea("message")
+      ->label(t("Message:"))
+      ->rules("required")
+      ->error_messages("required", t("Field is required"));
+    module::event("user_profile_contact_form", $form);
+    $group->submit("")->value(t("Send"));
+    return $form;
+  }
+}
diff --git a/modules/gallery/views/admin_block_log_entries.html.php b/modules/gallery/views/admin_block_log_entries.html.php
index 780ff2d0..90ce88a7 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") ?>"><?= html::clean($entry->user->name) ?></a>
+    <a href="<?= user_profile::url($entryr->id) ?>"><?= html::clean($entry->user->name) ?></a>
     <?= gallery::date_time($entry->timestamp) ?>
     <?= $entry->message ?>
     <?= $entry->html ?>
diff --git a/modules/gallery/views/login_current_user.html.php b/modules/gallery/views/login_current_user.html.php
index e3b3688f..39f52b51 100644
--- a/modules/gallery/views/login_current_user.html.php
+++ b/modules/gallery/views/login_current_user.html.php
@@ -1,11 +1,8 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <li>
   <? $name = $menu->label->for_html() ?>
-  <? if (identity::is_writable()): ?>
+  <? $hover_text = Identity::is_writable() ? t("Edit your profile")->for_html_attr() :
+                                             t("Display your profile")->for_html_attr() ?>
   <?= t("Logged in as %name", array("name" => html::mark_clean(
-        "<a href='$menu->url' title='" . t("Edit your profile")->for_html_attr() .
-        "' id='$menu->id' class='g-dialog-link'>{$name}</a>"))) ?>
-  <? else: ?>
-  <?= t("Logged in as %name", array("name" => $name)) ?>
-  <? endif ?>
+        "<a href='$menu->url' title='$hover_text' id='$menu->id'>{$name}</a>"))) ?>
 </li>
diff --git a/modules/gallery/views/user_profile.html.php b/modules/gallery/views/user_profile.html.php
new file mode 100644
index 00000000..e7ce56b3
--- /dev/null
+++ b/modules/gallery/views/user_profile.html.php
@@ -0,0 +1,69 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<style>
+  #g-user-profile #g-profile-buttons {
+    bottom: 0;
+    position: absolute;
+    right: 0;
+  }
+
+  #g-user-profile fieldset {
+    border: 1px solid #CCCCCC;
+    padding: 0 1em 0.8em;
+  }
+
+  #g-user-profile fieldset label {
+    font-weight: bold;
+  }
+
+  #g-user-profile fieldset div {
+    padding-left: 1em;
+  }
+
+  #g-user-profile td {
+    border: none;
+    padding: 0;
+  }
+
+</style>
+<script>
+  $("#g-user-profile").ready(function() {
+                                           //$("#g-profile-return").click(function(event) {
+    //  window.location = <?= $return->for_js() ?>;
+                                           //});
+  });
+</script>
+<div id="g-user-profile" style="height: <?= $height ?>px">
+  <h1 style="display: none"><?= t("%name Profile", array("name" => $user->display_name())) ?></h1>
+  <div>
+    <fieldset>
+    <label><?= t("User information") ?></label>
+    <div>
+    <table>
+    <? foreach ($fields as $field => $value): ?>
+    <tr>
+      <td><?= $field ?></td>
+      <td><?= $value ?></td>
+    </tr>
+    <? endforeach ?>
+    </table>
+    </div>
+    </fieldset>
+  </div>
+  <div id="g-profile-buttons" class="ui-helper-clearfix g-right">
+    <? if (!$user->guest && $not_current && !empty($user->email)): ?>
+    <a class="g-button ui-icon-right ui-state-default ui-corner-all g-dialog-link"
+       href="<?= url::site("user_profile/contact/{$user->id}") ?>">
+      <?= t("Contact") ?>
+    </a>
+    <? endif ?>
+    <? if ($editable): ?>
+       <a class="g-button ui-icon-right ui-state-default ui-corner-all g-dialog-link" href="<?= url::site("form/edit/users/{$user->id}") ?>">
+      <?= t("Edit") ?>
+    </a>
+    <? endif ?>
+
+    <a class="g-button ui-icon-right ui-state-default ui-corner-all" href="<?= $return->for_html_attr() ?>">
+      <?= t("Return") ?>
+    </a>
+  </div>
+</div>
\ No newline at end of file
diff --git a/modules/recaptcha/helpers/recaptcha_event.php b/modules/recaptcha/helpers/recaptcha_event.php
index e7ded3ab..a7f64bdd 100644
--- a/modules/recaptcha/helpers/recaptcha_event.php
+++ b/modules/recaptcha/helpers/recaptcha_event.php
@@ -18,6 +18,12 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class recaptcha_event_Core {
+  static function user_profile_contact_form($form) {
+    if (module::get_var("recaptcha", "public_key")) {
+      $form->message->recaptcha("recaptcha")->label("")->id("g-recaptcha");
+    }
+  }
+
   static function comment_add_form($form) {
     if (module::get_var("recaptcha", "public_key")) {
       $form->add_comment->recaptcha("recaptcha")->label("")->id("g-recaptcha");
-- 
cgit v1.2.3