From ab4679de45c9608f9a87f90a1093ae3a2ae6559d Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 11 Jun 2010 20:29:38 +0000
Subject: Small code cleanup on bookmarks. Added better logic for determining
 the username to use when adding a bookmark via the bookmarklet.

git-svn-id: http://code.elgg.org/elgg/trunk@6461 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 .../views/default/bookmarks/bookmarklet.php        | 25 +++++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'mod/bookmarks/views')

diff --git a/mod/bookmarks/views/default/bookmarks/bookmarklet.php b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
index 4ff05c68a..c12b461e3 100644
--- a/mod/bookmarks/views/default/bookmarks/bookmarklet.php
+++ b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Elgg get bookmarks bookmarklet view
- * 
+ *
  * @package ElggBookmarks
  * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
  * @author Curverider <info@elgg.com>
@@ -9,19 +9,28 @@
  * @link http://elgg.org/
  */
 
-$page_owner = $vars['pg_owner'];
-
+$page_owner = page_owner_entity();
 $bookmarktext = elgg_echo("bookmarks:this");
-if ($page_owner instanceof ElggGroup)	
-	$bookmarktext = sprintf(elgg_echo("bookmarks:this:group"), $page_owner->name)
+
+if ($page_owner instanceof ElggGroup) {
+	$bookmarktext = sprintf(elgg_echo("bookmarks:this:group"), $page_owner->name);
+	$name = "group:$page_owner->guid";
+} else {
+	$name = $page_owner->username;
+}
+
+if (!$name && ($user = get_loggedin_user())) {
+	$name = $user->username;
+}
+
 ?>
-<h3>Browser Bookmarklet</h3>
-<a href="javascript:location.href='<?php echo $vars['url']; ?>pg/bookmarks/<?php echo page_owner_entity()->username; ?>/add?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)"> <img src="<?php echo $vars['url']; ?>_graphics/elgg_bookmarklet.gif" border="0" title="<?php echo elgg_echo('bookmarks:this');?>" /> </a>
+<h3><?php echo elgg_echo('bookmarks:browser_bookmarklet')?></h3>
+<a href="javascript:location.href='<?php echo $vars['url']; ?>pg/bookmarks/<?php echo $name; ?>/add?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)"> <img src="<?php echo $vars['url']; ?>_graphics/elgg_bookmarklet.gif" border="0" title="<?php echo elgg_echo('bookmarks:this');?>" /> </a>
 <br />
 <a class="link" onclick="elgg_slide_toggle(this,'#elgg_sidebar','.bookmarklet');">Instructions</a>
 
 <div class="bookmarklet hidden">
 	<p><?php echo elgg_echo("bookmarks:bookmarklet:description"); ?></p>
 	<p><?php echo elgg_echo("bookmarks:bookmarklet:descriptionie"); ?></p>
-	<p><?php echo elgg_echo("bookmarks:bookmarklet:description:conclusion"); ?></p>		
+	<p><?php echo elgg_echo("bookmarks:bookmarklet:description:conclusion"); ?></p>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3