1 files changed, 185 insertions, 91 deletions

diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index f3d059ae3..9753f27a8 100644
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -20,17 +20,27 @@ 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') || !$blog->canEdit()) {
-		$return['content'] = elgg_echo('blog:error:post_not_found');
-		return $return;
+	if (!elgg_instanceof($blog, 'object', 'blog')) {
+		register_error(elgg_echo('noaccess'));
+		$_SESSION['last_forward_from'] = current_page_url();
+		forward('');
+	}
+
+	$return['title'] = $blog->title;
+
+	$container = $blog->getContainerEntity();
+	$crumbs_title = $container->name;
+	if (elgg_instanceof($container, 'group')) {
+		elgg_push_breadcrumb($crumbs_title, "blog/group/$container->guid/all");
+	} else {
+		elgg_push_breadcrumb($crumbs_title, "blog/owner/$container->username");
 	}
 
 	elgg_push_breadcrumb($blog->title);
-	$return['content'] = elgg_view_entity($blog, TRUE);
-	//check to see if comment are on
-	if ($blog->comments_on != 'Off') {
+	$return['content'] = elgg_view_entity($blog, array('full_view' => true));
+	// check to see if we should allow comments
+	if ($blog->comments_on != 'Off' && $blog->status == 'published') {
 		$return['content'] .= elgg_view_comments($blog);
 	}
 
@@ -40,49 +50,65 @@ function blog_get_page_content_read($guid = NULL) {
 /**
  * Get page components to list a user's or all blogs.
  *
- * @param int $owner_guid The GUID of the page owner or NULL for all blogs
+ * @param int $container_guid The GUID of the page owner or NULL for all blogs
  * @return array
  */
-function blog_get_page_content_list($owner_guid = NULL) {
+function blog_get_page_content_list($container_guid = NULL) {
 
 	$return = array();
 
-	$return['filter_context'] = $owner_guid ? 'mine' : 'all';
+	$return['filter_context'] = $container_guid ? 'mine' : 'all';
 
 	$options = array(
 		'type' => 'object',
 		'subtype' => 'blog',
-		'full_view' => FALSE,
-		//'order_by_metadata' => array('name'=>'publish_date', 'direction'=>'DESC', 'as'=>'int')
+		'full_view' => false,
 	);
 
-	$loggedin_userid = get_loggedin_userid();
-	if ($owner_guid) {
-		$options['owner_guid'] = $owner_guid;
+	$current_user = elgg_get_logged_in_user_entity();
 
-		// do not want to highlight the current page so pop what was already added
-		elgg_pop_breadcrumb();
-		$crumbs_title = elgg_echo('blog:owned_blogs', array(get_user($owner_guid)->name));
-		elgg_push_breadcrumb($crumbs_title);
+	if ($container_guid) {
+		// access check for closed groups
+		group_gatekeeper();
 
+		$options['container_guid'] = $container_guid;
+		$container = get_entity($container_guid);
+		if (!$container) {
+
+		}
+		$return['title'] = elgg_echo('blog:title:user_blogs', array($container->name));
 
-		if ($owner_guid == $loggedin_userid) {
+		$crumbs_title = $container->name;
+		elgg_push_breadcrumb($crumbs_title);
+
+		if ($current_user && ($container_guid == $current_user->guid)) {
 			$return['filter_context'] = 'mine';
-		} else{
+		} else if (elgg_instanceof($container, 'group')) {
+			$return['filter'] = false;
+		} else {
 			// do not show button or select a tab when viewing someone else's posts
 			$return['filter_context'] = 'none';
-			$return['buttons'] = '';
 		}
 	} else {
 		$return['filter_context'] = 'all';
+		$return['title'] = elgg_echo('blog:title:all_blogs');
+		elgg_pop_breadcrumb();
+		elgg_push_breadcrumb(elgg_echo('blog:blogs'));
 	}
 
+	elgg_register_title_button();
+
 	// show all posts for admin or users looking at their own blogs
 	// show only published posts for other users.
-	if (!(isadminloggedin() || (isloggedin() && $owner_guid == $loggedin_userid))) {
+	$show_only_published = true;
+	if ($current_user) {
+		if (($current_user->guid == $container_guid) || $current_user->isAdmin()) {
+			$show_only_published = false;
+		}
+	}
+	if ($show_only_published) {
 		$options['metadata_name_value_pairs'] = array(
 			array('name' => 'status', 'value' => 'published'),
-			//array('name' => 'publish_date', 'operand' => '<', 'value' => time())
 		);
 	}
 
@@ -104,11 +130,21 @@ function blog_get_page_content_list($owner_guid = NULL) {
  */
 function blog_get_page_content_friends($user_guid) {
 
-	elgg_push_breadcrumb(elgg_echo('friends'));
+	$user = get_user($user_guid);
+	if (!$user) {
+		forward('blog/all');
+	}
 
 	$return = array();
 
 	$return['filter_context'] = 'friends';
+	$return['title'] = elgg_echo('blog:title:friends');
+
+	$crumbs_title = $user->name;
+	elgg_push_breadcrumb($crumbs_title, "blog/owner/{$user->username}");
+	elgg_push_breadcrumb(elgg_echo('friends'));
+
+	elgg_register_title_button();
 
 	if (!$friends = get_user_friends($user_guid, ELGG_ENTITIES_ANY_VALUE, 0)) {
 		$return['content'] .= elgg_echo('friends:none:you');
@@ -118,7 +154,6 @@ function blog_get_page_content_friends($user_guid) {
 			'type' => 'object',
 			'subtype' => 'blog',
 			'full_view' => FALSE,
-			'order_by_metadata' => array('name'=>'publish_date', 'direction'=>'DESC', 'as'=>'int'),
 		);
 
 		foreach ($friends as $friend) {
@@ -127,11 +162,14 @@ function blog_get_page_content_friends($user_guid) {
 
 		// admin / owners can see any posts
 		// everyone else can only see published posts
-		if (!(isadminloggedin() || (isloggedin() && $owner_guid == get_loggedin_userid()))) {
-			if ($upper > $now) {
-				$upper = $now;
+		$show_only_published = true;
+		$current_user = elgg_get_logged_in_user_entity();
+		if ($current_user) {
+			if (($user_guid == $current_user->guid) || $current_user->isAdmin()) {
+				$show_only_published = false;
 			}
-
+		}
+		if ($show_only_published) {
 			$options['metadata_name_value_pairs'][] = array(
 				array('name' => 'status', 'value' => 'published')
 			);
@@ -160,6 +198,16 @@ function blog_get_page_content_archive($owner_guid, $lower = 0, $upper = 0) {
 
 	$now = time();
 
+	$owner = get_entity($owner_guid);
+	elgg_set_page_owner_guid($owner_guid);
+
+	$crumbs_title = $owner->name;
+	if (elgg_instanceof($owner, 'user')) {
+		$url = "blog/owner/{$owner->username}";
+	} else {
+		$url = "blog/group/$owner->guid/all";
+	}
+	elgg_push_breadcrumb($crumbs_title, $url);
 	elgg_push_breadcrumb(elgg_echo('blog:archives'));
 
 	if ($lower) {
@@ -174,16 +222,15 @@ function blog_get_page_content_archive($owner_guid, $lower = 0, $upper = 0) {
 		'type' => 'object',
 		'subtype' => 'blog',
 		'full_view' => FALSE,
-		'order_by_metadata' => array('name'=>'publish_date', 'direction'=>'DESC', 'as'=>'int'),
 	);
 
 	if ($owner_guid) {
-		$options['owner_guid'] = $owner_guid;
+		$options['container_guid'] = $owner_guid;
 	}
 
 	// admin / owners can see any posts
 	// everyone else can only see published posts
-	if (!(isadminloggedin() || (isloggedin() && $owner_guid == get_loggedin_userid()))) {
+	if (!(elgg_is_admin_logged_in() || (elgg_is_logged_in() && $owner_guid == elgg_get_logged_in_user_guid()))) {
 		if ($upper > $now) {
 			$upper = $now;
 		}
@@ -194,57 +241,51 @@ function blog_get_page_content_archive($owner_guid, $lower = 0, $upper = 0) {
 	}
 
 	if ($lower) {
-		$options['metadata_name_value_pairs'][] = array(
-			'name' => 'publish_date',
-			'operand' => '>',
-			'value' => $lower
-		);
+		$options['created_time_lower'] = $lower;
 	}
 
 	if ($upper) {
-		$options['metadata_name_value_pairs'][] = array(
-			'name' => 'publish_date',
-			'operand' => '<',
-			'value' => $upper
-		);
+		$options['created_time_upper'] = $upper;
 	}
 
 	$list = elgg_list_entities_from_metadata($options);
 	if (!$list) {
-		$content .= elgg_echo('blog:none');
+		$content = elgg_echo('blog:none');
 	} else {
-		$content .= $list;
+		$content = $list;
 	}
 
-	$title = elgg_echo('date:month:' . date('n', $lower), array(date('Y', $lower)));
+	$title = elgg_echo('date:month:' . date('m', $lower), array(date('Y', $lower)));
 
 	return array(
 		'content' => $content,
 		'title' => $title,
-		'buttons' => '',
 		'filter' => '',
 	);
 }
 
 /**
- * Get page components to edit a blog post.
+ * Get page components to edit/create a blog post.
  *
- * @param int     $guid     GUID of blog post
+ * @param string  $page     'edit' or 'new'
+ * @param int     $guid     GUID of blog post or container
  * @param int     $revision Annotation id for revision to edit (optional)
  * @return array
  */
-function blog_get_page_content_edit($guid, $revision = NULL) {
+function blog_get_page_content_edit($page, $guid = 0, $revision = NULL) {
+
+	elgg_load_js('elgg.blog');
 
 	$return = array(
-		'buttons' => '',
 		'filter' => '',
 	);
 
 	$vars = array();
-	$vars['internalid'] = 'blog-post-edit';
-	$vars['internalname'] = 'blog_post';
+	$vars['id'] = 'blog-post-edit';
+	$vars['class'] = 'elgg-form-alt';
 
-	if ($guid) {
+	$sidebar = '';
+	if ($page == 'edit') {
 		$blog = get_entity((int)$guid);
 
 		$title = elgg_echo('blog:edit');
@@ -255,7 +296,7 @@ function blog_get_page_content_edit($guid, $revision = NULL) {
 			$title .= ": \"$blog->title\"";
 
 			if ($revision) {
-				$revision = get_annotation((int)$revision);
+				$revision = elgg_get_annotation_from_id((int)$revision);
 				$vars['revision'] = $revision;
 				$title .= ' ' . elgg_echo('blog:edit_revision_notice');
 
@@ -271,20 +312,20 @@ function blog_get_page_content_edit($guid, $revision = NULL) {
 
 			elgg_push_breadcrumb($blog->title, $blog->getURL());
 			elgg_push_breadcrumb(elgg_echo('edit'));
+			
+			elgg_load_js('elgg.blog');
 
 			$content = elgg_view_form('blog/save', $vars, $body_vars);
-			$content .= elgg_view('js/blog/save_draft');
-			$sidebar = elgg_view('blog/sidebar_revisions', $vars);
+			$sidebar = elgg_view('blog/sidebar/revisions', $vars);
 		} else {
 			$content = elgg_echo('blog:error:cannot_edit_post');
 		}
 	} else {
-		elgg_push_breadcrumb(elgg_echo('blog:new'));
-		$body_vars = blog_prepare_form_vars($blog);
+		elgg_push_breadcrumb(elgg_echo('blog:add'));
+		$body_vars = blog_prepare_form_vars(null);
 
-		$title = elgg_echo('blog:new');
+		$title = elgg_echo('blog:add');
 		$content = elgg_view_form('blog/save', $vars, $body_vars);
-		$content .= elgg_view('js/blog/save_draft');
 	}
 
 	$return['title'] = $title;
@@ -307,7 +348,6 @@ function blog_prepare_form_vars($post = NULL, $revision = NULL) {
 		'title' => NULL,
 		'description' => NULL,
 		'status' => 'published',
-		'publish_date' => NULL,
 		'access_id' => ACCESS_DEFAULT,
 		'comments_on' => 'On',
 		'excerpt' => NULL,
@@ -317,12 +357,29 @@ function blog_prepare_form_vars($post = NULL, $revision = NULL) {
 		'draft_warning' => '',
 	);
 
-	if (!$post) {
-		return $values;
+	if ($post) {
+		foreach (array_keys($values) as $field) {
+			if (isset($post->$field)) {
+				$values[$field] = $post->$field;
+			}
+		}
+
+		if ($post->status == 'draft') {
+			$values['access_id'] = $post->future_access;
+		}
 	}
 
-	foreach (array_keys($values) as $field) {
-		$values[$field] = $post->$field;
+	if (elgg_is_sticky_form('blog')) {
+		$sticky_values = elgg_get_sticky_values('blog');
+		foreach ($sticky_values as $key => $value) {
+			$values[$key] = $value;
+		}
+	}
+	
+	elgg_clear_sticky_form('blog');
+
+	if (!$post) {
+		return $values;
 	}
 
 	// load the revision annotation if requested
@@ -336,49 +393,86 @@ function blog_prepare_form_vars($post = NULL, $revision = NULL) {
 	if ($auto_save_annotations = $post->getAnnotations('blog_auto_save', 1)) {
 		$auto_save = $auto_save_annotations[0];
 	} else {
-		$auto_save == FALSE;
+		$auto_save = false;
 	}
 
 	if ($auto_save && $auto_save->id != $revision->id) {
 		$values['draft_warning'] = elgg_echo('blog:messages:warning:draft');
 	}
 
-	elgg_clear_sticky_form('blog');
-
 	return $values;
 }
 
 /**
- * Returns a list of years and months for all blogs optionally for a user.
- * Very similar to get_entity_dates() except uses a metadata field.
+ * Forward to the new style of URLs
+ * 
+ * Pre-1.7.5
+ * Group blogs page: /blog/group:<container_guid>/
+ * Group blog view:  /blog/group:<container_guid>/read/<guid>/<title>
+ * 1.7.5-1.8
+ * Group blogs page: /blog/owner/group:<container_guid>/
+ * Group blog view:  /blog/read/<guid>
+ * 
  *
- * @param int $user_guid
- * @param int $container_guid
- * @return array
+ * @param string $page
  */
-function blog_get_blog_months($user_guid = NULL, $container_guid = NULL) {
-	global $CONFIG;
+function blog_url_forwarder($page) {
+
+	$viewtype = elgg_get_viewtype();
+	$qs = ($viewtype === 'default') ? "" : "?view=$viewtype";
+
+	$url = "blog/all";
 
-	$subtype = get_subtype_id('object', 'blog');
+	// easier to work with & no notices
+	$page = array_pad($page, 4, "");
 
-	$q = "SELECT DISTINCT EXTRACT(YEAR_MONTH FROM FROM_UNIXTIME(mdv.string)) AS yearmonth
-		FROM {$CONFIG->dbprefix}entities e, {$CONFIG->dbprefix}metadata, {$CONFIG->dbprefix}metastrings mdn, {$CONFIG->dbprefix}metastrings mdv
-		WHERE e.guid = {$CONFIG->dbprefix}metadata.entity_guid
-		AND {$CONFIG->dbprefix}metadata.name_id = mdn.id
-		AND {$CONFIG->dbprefix}metadata.value_id = mdv.id
-		AND mdn.string = 'publish_date'";
+	// group usernames
+	if (preg_match('~/group\:([0-9]+)/~', "/{$page[0]}/{$page[1]}/", $matches)) {
+		$guid = $matches[1];
+		$entity = get_entity($guid);
+		if (elgg_instanceof($entity, 'group')) {
+			if (!empty($page[2])) {
+				$url = "blog/view/$page[2]/";
+			} else {
+				$url = "blog/group/$guid/all";
+			}
+			register_error(elgg_echo("changebookmark"));
+			forward($url . $qs);
+		}
+	}
 
-	if ($user_guid) {
-		$user_guid = (int)$user_guid;
-		$q .= " AND e.owner_guid = $user_guid";
+	if (empty($page[0])) {
+		return;
 	}
 
-	if ($container_guid) {
-		$container_guid = (int)$container_guid;
-		$q .= " AND e.container_guid = $container_guid";
+	// user usernames
+	$user = get_user_by_username($page[0]);
+	if (!$user) {
+		return;
 	}
 
-	$q .= ' AND ' . get_access_sql_suffix('e');
+	if (empty($page[1])) {
+		$page[1] = 'owner';
+	}
+
+	switch ($page[1]) {
+		case "read":
+			$url = "blog/view/{$page[2]}/{$page[3]}";
+			break;
+		case "archive":
+			$url = "blog/archive/{$page[0]}/{$page[2]}/{$page[3]}";
+			break;
+		case "friends":
+			$url = "blog/friends/{$page[0]}";
+			break;
+		case "new":
+			$url = "blog/add/$user->guid";
+			break;
+		case "owner":
+			$url = "blog/owner/{$page[0]}";
+			break;
+	}
 
-	return get_data($q);
+	register_error(elgg_echo("changebookmark"));
+	forward($url . $qs);
 }