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.

---
 modules/gallery/helpers/user_profile.php | 55 ++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 modules/gallery/helpers/user_profile.php

(limited to 'modules/gallery/helpers/user_profile.php')

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;
+  }
+}
-- 
cgit v1.2.3


From 6023f2bb46598f9da096d63f7ab1dfb914eab6f7 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 25 Jan 2010 08:10:28 -0800
Subject: Remove the return url and change the return button on the user
 profile page to use javascript to return to the previous page.

---
 modules/gallery/controllers/user_profile.php |  1 -
 modules/gallery/helpers/user_profile.php     |  3 +--
 modules/gallery/views/user_profile.html.php  | 10 ++++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'modules/gallery/helpers/user_profile.php')

diff --git a/modules/gallery/controllers/user_profile.php b/modules/gallery/controllers/user_profile.php
index 53c76a48..a0e6619e 100644
--- a/modules/gallery/controllers/user_profile.php
+++ b/modules/gallery/controllers/user_profile.php
@@ -33,7 +33,6 @@ class User_Profile_Controller extends Controller {
     $v->content->user = $user;
     $v->content->not_current = !$is_current_active;
     $v->content->editable = identity::is_writable() && $display_all;
-    $v->content->return = SafeString::of(Input::instance()->get("return"));
 
     $event_data = (object)array("user" => $user, "display_all" => $display_all, "content" => array());
     module::event("show_user_profile", $event_data);
diff --git a/modules/gallery/helpers/user_profile.php b/modules/gallery/helpers/user_profile.php
index 018e1bd1..95a994bc 100644
--- a/modules/gallery/helpers/user_profile.php
+++ b/modules/gallery/helpers/user_profile.php
@@ -24,8 +24,7 @@ class user_profile_Core {
    * @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");
+    return url::site("user_profile/show/{$user_id}");
   }
 
   static function get_contact_form($user) {
diff --git a/modules/gallery/views/user_profile.html.php b/modules/gallery/views/user_profile.html.php
index bcfa5346..708b1613 100644
--- a/modules/gallery/views/user_profile.html.php
+++ b/modules/gallery/views/user_profile.html.php
@@ -21,8 +21,14 @@
     border: none;
     padding: 0;
   }
-
 </style>
+<script>
+  $(document).ready(function() {
+    $("#g-profile-return").click(function(event) {
+      history.go(-1);
+    })
+  });
+</script>
 <div id="g-user-profile">
   <h1>
     <a href="#">
@@ -55,7 +61,7 @@
     </a>
     <? endif ?>
 
-    <a class="g-button ui-icon-right ui-state-default ui-corner-all" href="<?= $return->for_html_attr() ?>">
+    <a id="g-profile-return" class="g-button ui-icon-right ui-state-default ui-corner-all" href="#">
       <?= t("Return") ?>
     </a>
   </div>
-- 
cgit v1.2.3