From 0f7ae214b37c2bcf6f7c0af82ec68b7c9224cfaf Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Tue, 4 Oct 2011 22:56:15 -0400
Subject: Fixes #3793 blogs respect closed groups for main index page

---
 mod/blog/lib/blog.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'mod/blog/lib/blog.php')

diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index b7b1a2baa..f24e6f58d 100644
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -67,6 +67,9 @@ function blog_get_page_content_list($container_guid = NULL) {
 
 	$loggedin_userid = elgg_get_logged_in_user_guid();
 	if ($container_guid) {
+		// access check for closed groups
+		group_gatekeeper();
+
 		$options['container_guid'] = $container_guid;
 		$container = get_entity($container_guid);
 		if (!$container) {
-- 
cgit v1.2.3


From ff75f99e734b6b99da77ba946e953f08a6e81a5b Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Mon, 10 Oct 2011 20:25:20 -0400
Subject: Refs #3916 added checks to all content plugins in master for page
 owner in mine and friends pages

---
 mod/blog/lib/blog.php                     | 3 +++
 mod/bookmarks/pages/bookmarks/friends.php | 3 +++
 mod/bookmarks/pages/bookmarks/owner.php   | 3 +++
 mod/file/pages/file/friends.php           | 3 +++
 mod/file/pages/file/owner.php             | 3 +++
 mod/pages/pages/pages/friends.php         | 2 +-
 mod/pages/pages/pages/owner.php           | 2 +-
 mod/thewire/pages/thewire/friends.php     | 3 +++
 mod/thewire/pages/thewire/owner.php       | 3 +++
 9 files changed, 23 insertions(+), 2 deletions(-)

(limited to 'mod/blog/lib/blog.php')

diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index f24e6f58d..41924f336 100644
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -124,6 +124,9 @@ function blog_get_page_content_list($container_guid = NULL) {
 function blog_get_page_content_friends($user_guid) {
 
 	$user = get_user($user_guid);
+	if (!$user) {
+		forward('blog/all');
+	}
 
 	$return = array();
 
diff --git a/mod/bookmarks/pages/bookmarks/friends.php b/mod/bookmarks/pages/bookmarks/friends.php
index 3491090a5..be164fcec 100644
--- a/mod/bookmarks/pages/bookmarks/friends.php
+++ b/mod/bookmarks/pages/bookmarks/friends.php
@@ -6,6 +6,9 @@
  */
 
 $owner = elgg_get_page_owner_entity();
+if (!$page_owner) {
+	forward('bookmarks/all');
+}
 
 elgg_push_breadcrumb($owner->name, "bookmarks/owner/$owner->username");
 elgg_push_breadcrumb(elgg_echo('friends'));
diff --git a/mod/bookmarks/pages/bookmarks/owner.php b/mod/bookmarks/pages/bookmarks/owner.php
index 679c986be..7f55e08de 100644
--- a/mod/bookmarks/pages/bookmarks/owner.php
+++ b/mod/bookmarks/pages/bookmarks/owner.php
@@ -6,6 +6,9 @@
  */
 
 $page_owner = elgg_get_page_owner_entity();
+if (!$page_owner) {
+	forward('bookmarks/all');
+}
 
 elgg_push_breadcrumb($page_owner->name);
 
diff --git a/mod/file/pages/file/friends.php b/mod/file/pages/file/friends.php
index 0b351efaf..f504bdc1f 100644
--- a/mod/file/pages/file/friends.php
+++ b/mod/file/pages/file/friends.php
@@ -6,6 +6,9 @@
  */
 
 $owner = elgg_get_page_owner_entity();
+if (!$owner) {
+	forward('file/all');
+}
 
 elgg_push_breadcrumb(elgg_echo('file'), "file/all");
 elgg_push_breadcrumb($owner->name, "file/owner/$owner->username");
diff --git a/mod/file/pages/file/owner.php b/mod/file/pages/file/owner.php
index 4e2ec89d4..fb87af1b2 100644
--- a/mod/file/pages/file/owner.php
+++ b/mod/file/pages/file/owner.php
@@ -9,6 +9,9 @@
 group_gatekeeper();
 
 $owner = elgg_get_page_owner_entity();
+if (!$owner) {
+	forward('file/all');
+}
 
 elgg_push_breadcrumb(elgg_echo('file'), "file/all");
 elgg_push_breadcrumb($owner->name);
diff --git a/mod/pages/pages/pages/friends.php b/mod/pages/pages/pages/friends.php
index c55b27466..87ac631c2 100644
--- a/mod/pages/pages/pages/friends.php
+++ b/mod/pages/pages/pages/friends.php
@@ -7,7 +7,7 @@
 
 $owner = elgg_get_page_owner_entity();
 if (!$owner) {
-
+	forward('pages/all');
 }
 
 elgg_push_breadcrumb($owner->name, "pages/owner/$owner->username");
diff --git a/mod/pages/pages/pages/owner.php b/mod/pages/pages/pages/owner.php
index 2ff310ac8..2ff45ae0c 100644
--- a/mod/pages/pages/pages/owner.php
+++ b/mod/pages/pages/pages/owner.php
@@ -7,7 +7,7 @@
 
 $owner = elgg_get_page_owner_entity();
 if (!$owner) {
-
+	forward('pages/all');
 }
 
 // access check for closed groups
diff --git a/mod/thewire/pages/thewire/friends.php b/mod/thewire/pages/thewire/friends.php
index 265b73eab..26ad03da6 100644
--- a/mod/thewire/pages/thewire/friends.php
+++ b/mod/thewire/pages/thewire/friends.php
@@ -4,6 +4,9 @@
  */
 
 $owner = elgg_get_page_owner_entity();
+if (!$owner) {
+	forward('thewire/all');
+}
 
 $title = elgg_echo('thewire:friends');
 
diff --git a/mod/thewire/pages/thewire/owner.php b/mod/thewire/pages/thewire/owner.php
index b6449b217..a95786b0a 100644
--- a/mod/thewire/pages/thewire/owner.php
+++ b/mod/thewire/pages/thewire/owner.php
@@ -5,6 +5,9 @@
  */
 
 $owner = elgg_get_page_owner_entity();
+if (!$owner) {
+	forward('thewire/all');
+}
 
 $title = elgg_echo('thewire:user', array($owner->name));
 
-- 
cgit v1.2.3


From ef0d4ab9c2b037eb76c4f9af0a9220be1fdd72b4 Mon Sep 17 00:00:00 2001
From: Brett Profitt <brett.profitt@gmail.com>
Date: Sat, 29 Oct 2011 17:47:55 -0700
Subject: Refs #3859. Added elgg_register_simplecache_view() to core plugins'
 js.

---
 mod/blog/lib/blog.php       | 3 ---
 mod/blog/start.php          | 1 +
 mod/notifications/index.php | 4 ----
 mod/thewire/start.php       | 1 +
 mod/tinymce/start.php       | 1 +
 5 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'mod/blog/lib/blog.php')

diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 41924f336..792f32c42 100644
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -317,9 +317,6 @@ function blog_get_page_content_edit($page, $guid = 0, $revision = NULL) {
 
 		$title = elgg_echo('blog:add');
 		$content = elgg_view_form('blog/save', $vars, $body_vars);
-		
-		$blog_js = elgg_get_simplecache_url('js', 'blog/save_draft');
-		elgg_register_js('elgg.blog', $blog_js);
 	}
 
 	$return['title'] = $title;
diff --git a/mod/blog/start.php b/mod/blog/start.php
index 2d8f75ed2..9e77b0a93 100644
--- a/mod/blog/start.php
+++ b/mod/blog/start.php
@@ -32,6 +32,7 @@ function blog_init() {
 
 	// register the blog's JavaScript
 	$blog_js = elgg_get_simplecache_url('js', 'blog/save_draft');
+	elgg_register_simplecache_view('js/blog/save_draft');
 	elgg_register_js('elgg.blog', $blog_js);
 
 	// routing of urls
diff --git a/mod/notifications/index.php b/mod/notifications/index.php
index b54677681..e56042b73 100644
--- a/mod/notifications/index.php
+++ b/mod/notifications/index.php
@@ -14,10 +14,6 @@ gatekeeper();
 elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
 $user = elgg_get_page_owner_guid();
 
-$js_url = elgg_get_simplecache_url('js', 'friendsPickerv1');
-elgg_register_js('friendsPickerv1', $js_url);
-elgg_load_js('friendsPickerv1');
-
 // Set the context to settings
 elgg_set_context('settings');
 
diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index 9d3993b6f..d5e995359 100644
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -26,6 +26,7 @@ function thewire_init() {
 
 	// register the wire's JavaScript
 	$thewire_js = elgg_get_simplecache_url('js', 'thewire');
+	elgg_register_simplecache_view('js/thewire');
 	elgg_register_js('elgg.thewire', $thewire_js, 'footer');
 
 	// add a site navigation item
diff --git a/mod/tinymce/start.php b/mod/tinymce/start.php
index ee7154d22..48625f456 100644
--- a/mod/tinymce/start.php
+++ b/mod/tinymce/start.php
@@ -13,6 +13,7 @@ function tinymce_init() {
 
 	elgg_register_js('tinymce', 'mod/tinymce/vendor/tinymce/jscripts/tiny_mce/tiny_mce.js');
 	elgg_register_js('elgg.tinymce', elgg_get_simplecache_url('js', 'tinymce'));
+	elgg_register_simplecache_view('js/tinymce');
 	
 	elgg_extend_view('input/longtext', 'tinymce/init');
 	
-- 
cgit v1.2.3


From 508fe03a44dec3a275c19fe2c63ab63fd04c0880 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Tue, 1 Nov 2011 21:08:22 -0400
Subject: Fixes #4035 made the entity view pages consistent for blog,
 bookmarks, file, pages, and forum posts

---
 mod/blog/lib/blog.php                               |  1 -
 mod/blog/views/default/object/blog.php              |  1 -
 mod/bookmarks/pages/bookmarks/view.php              |  1 -
 mod/bookmarks/views/default/object/bookmarks.php    |  1 -
 mod/file/views/default/object/file.php              |  1 -
 mod/groups/views/default/object/groupforumtopic.php |  1 -
 mod/pages/views/default/object/page_top.php         |  1 -
 views/default/object/elements/full.php              | 10 +---------
 8 files changed, 1 insertion(+), 16 deletions(-)

(limited to 'mod/blog/lib/blog.php')

diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 792f32c42..590547a8c 100644
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -20,7 +20,6 @@ function blog_get_page_content_read($guid = NULL) {
 
 	// no header or tabs for viewing an individual blog
 	$return['filter'] = '';
-	$return['header'] = '';
 
 	if (!elgg_instanceof($blog, 'object', 'blog')) {
 		$return['content'] = elgg_echo('blog:error:post_not_found');
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 05ddf62c7..3525b3d48 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -77,7 +77,6 @@ if ($full) {
 	$summary = elgg_view('object/elements/summary', $params);
 
 	echo elgg_view('object/elements/full', array(
-		'title' => $blog->title,
 		'summary' => $summary,
 		'icon' => $owner_icon,
 		'body' => $body,
diff --git a/mod/bookmarks/pages/bookmarks/view.php b/mod/bookmarks/pages/bookmarks/view.php
index 8e097b090..2439d2ee8 100644
--- a/mod/bookmarks/pages/bookmarks/view.php
+++ b/mod/bookmarks/pages/bookmarks/view.php
@@ -28,7 +28,6 @@ $body = elgg_view_layout('content', array(
 	'content' => $content,
 	'title' => $title,
 	'filter' => '',
-	'header' => '',
 ));
 
 echo elgg_view_page($title, $body);
diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index ba8029a54..89a0d03e0 100644
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -79,7 +79,6 @@ HTML;
 
 	echo elgg_view('object/elements/full', array(
 		'entity' => $bookmark,
-		'title' => $bookmark->title,
 		'icon' => $owner_icon,
 		'summary' => $summary,
 		'body' => $body,
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index 81421133f..1db9863c9 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -69,7 +69,6 @@ if ($full && !elgg_in_context('gallery')) {
 
 	$params = array(
 		'entity' => $file,
-		'title' => false,
 		'metadata' => $metadata,
 		'subtitle' => $subtitle,
 		'tags' => $tags,
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index f3d5f96d5..a579d89a4 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -64,7 +64,6 @@ if ($full) {
 
 	$params = array(
 		'entity' => $topic,
-		'title' => false,
 		'metadata' => $metadata,
 		'subtitle' => $subtitle,
 		'tags' => $tags,
diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php
index 0a1c33458..e78289f28 100644
--- a/mod/pages/views/default/object/page_top.php
+++ b/mod/pages/views/default/object/page_top.php
@@ -80,7 +80,6 @@ if ($full) {
 
 	$params = array(
 		'entity' => $page,
-		'title' => false,
 		'metadata' => $metadata,
 		'subtitle' => $subtitle,
 		'tags' => $tags,
diff --git a/views/default/object/elements/full.php b/views/default/object/elements/full.php
index 4a2991442..9b89f9706 100644
--- a/views/default/object/elements/full.php
+++ b/views/default/object/elements/full.php
@@ -2,8 +2,7 @@
 /**
  * Object full rendering
  *
- * Sample output
- * <h2>Title</h3>
+ * Sample output:
  * <div class="elgg-content">
  *     <div class="elgg-image-block">
  *     </div>
@@ -12,14 +11,12 @@
  * </div>
  *
  * @uses $vars['entity']   ElggEntity
- * @uses $vars['title']    Title (false for no title)
  * @uses $vars['icon']     HTML for the content icon
  * @uses $vars['summary']  HTML for the content summary
  * @uses $vars['body']     HTML for the content body
  * @uses $vars['class']    Optional additional class for the content wrapper
  */
 
-$title = elgg_extract('title', $vars);
 $icon = elgg_extract('icon', $vars);
 $summary = elgg_extract('summary', $vars);
 $body = elgg_extract('body', $vars);
@@ -30,14 +27,9 @@ if ($class) {
 	$class = "elgg-content";
 }
 
-if ($title) {
-	$title = elgg_view_title($title);
-}
-
 $header = elgg_view_image_block($icon, $summary);
 
 echo <<<HTML
-$title
 <div class="$class">
 $header
 $body
-- 
cgit v1.2.3