Pulled in the interface changes.

git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544

3 files changed, 208 insertions, 0 deletions

diff --git a/mod/blog/actions/add.php b/mod/blog/actions/add.php
new file mode 100644
index 000000000..97634638e
--- /dev/null
+++ b/mod/blog/actions/add.php
@@ -0,0 +1,84 @@
+<?php
+
+	/**
+	 * Elgg blog: add post action
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Make sure we're logged in (send us to the front page if not)
+		gatekeeper();
+
+	// Get input data
+		$title = get_input('blogtitle');
+		$body = get_input('blogbody');
+		$tags = get_input('blogtags');
+		$access = get_input('access_id');
+		$comments_on = get_input('comments_select','Off');
+
+	// Cache to the session
+		$_SESSION['user']->blogtitle = $title;
+		$_SESSION['user']->blogbody = $body;
+		$_SESSION['user']->blogtags = $tags;
+		
+	// Convert string of tags into a preformatted array
+		$tagarray = string_to_tag_array($tags);
+		
+	// Make sure the title / description aren't blank
+		if (empty($title) || empty($body)) {
+			register_error(elgg_echo("blog:blank"));
+			forward($_SERVER['HTTP_REFERER']);
+		}
+
+	
+	// Initialise a new ElggObject
+		$blog = new ElggObject();
+	// Tell the system it's a blog post
+		$blog->subtype = "blog";
+	// Set its owner to the current user
+		$blog->owner_guid = get_loggedin_userid();
+	// Set it's container
+		$blog->container_guid = (int)get_input('container_guid', get_loggedin_userid());
+	// For now, set its access
+		$blog->access_id = $access;
+	// Set its title and description appropriately
+		$blog->title = $title;
+		$blog->description = $body;
+	// Now let's add tags. We can pass an array directly to the object property! Easy.
+		if (is_array($tagarray)) {
+			$blog->tags = $tagarray;
+		}
+	//whether the user wants to allow comments or not on the blog post
+		$blog->comments_on = $comments_on;
+		
+	// Now save the object
+		if (!$blog->save()) {
+			register_error(elgg_echo("blog:error"));
+			forward($_SERVER['HTTP_REFERER']);
+		}
+
+	// Success message
+		system_message(elgg_echo("blog:posted"));
+	// add to river
+		add_to_river('river/object/blog/create', 'create', get_loggedin_userid(), $blog->guid);
+	// Remove the blog post cache
+		//unset($_SESSION['blogtitle']); unset($_SESSION['blogbody']); unset($_SESSION['blogtags']);
+		remove_metadata($_SESSION['user']->guid,'blogtitle');
+		remove_metadata($_SESSION['user']->guid,'blogbody');
+		remove_metadata($_SESSION['user']->guid,'blogtags');
+			
+	// Forward to the main blog page
+		$page_owner = get_entity($blog->container_guid);
+		if ($page_owner instanceof ElggUser) {
+			$username = $page_owner->username;
+		} else if ($page_owner instanceof ElggGroup) {
+			$username = "group:" . $page_owner->guid;
+		}
+		
+		forward("pg/blog/$username");
+		
+?>
diff --git a/mod/blog/actions/delete.php b/mod/blog/actions/delete.php
new file mode 100644
index 000000000..c01ca3844
--- /dev/null
+++ b/mod/blog/actions/delete.php
@@ -0,0 +1,38 @@
+<?php
+
+	/**
+	 * Elgg blog: delete post action
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Make sure we're logged in (send us to the front page if not)
+		gatekeeper();
+
+	// Get input data
+		$guid = (int) get_input('blogpost');
+		
+	// Make sure we actually have permission to edit
+		$blog = get_entity($guid);
+		if ($blog->getSubtype() == "blog" && $blog->canEdit()) {
+	
+		// Get owning user
+				$owner = get_entity($blog->getOwner());
+		// Delete it!
+				$rowsaffected = $blog->delete();
+				if ($rowsaffected > 0) {
+		// Success message
+					system_message(elgg_echo("blog:deleted"));
+				} else {
+					register_error(elgg_echo("blog:notdeleted"));
+				}
+		// Forward to the main blog page
+				forward("mod/blog/?username=" . $owner->username);
+		
+		}
+		
+?>
\ No newline at end of file
diff --git a/mod/blog/actions/edit.php b/mod/blog/actions/edit.php
new file mode 100644
index 000000000..b44106645
--- /dev/null
+++ b/mod/blog/actions/edit.php
@@ -0,0 +1,86 @@
+<?php
+
+	/**
+	 * Elgg blog: edit post action
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Make sure we're logged in (send us to the front page if not)
+		gatekeeper();
+
+	// Get input data
+		$guid = (int) get_input('blogpost');
+		$title = get_input('blogtitle');
+		$body = get_input('blogbody');
+		$access = get_input('access_id');
+		$tags = get_input('blogtags');
+		$comments_on = get_input('comments_select','Off');
+		
+	// Make sure we actually have permission to edit
+		$blog = get_entity($guid);
+		if ($blog->getSubtype() == "blog" && $blog->canEdit()) {
+	
+		// Cache to the session
+			
+			$_SESSION['user']->blogtitle = $title;
+			$_SESSION['user']->blogbody = $body;
+			$_SESSION['user']->blogtags = $tags;
+			
+		// Convert string of tags into a preformatted array
+			$tagarray = string_to_tag_array($tags);
+			
+		// Make sure the title / description aren't blank
+			if (empty($title) || empty($body)) {
+				register_error(elgg_echo("blog:blank"));
+				forward("mod/blog/add.php");
+				
+		// Otherwise, save the blog post 
+			} else {
+				
+		// Get owning user
+				$owner = get_entity($blog->getOwner());
+		// For now, set its access to public (we'll add an access dropdown shortly)
+				$blog->access_id = $access;
+		// Set its title and description appropriately
+				$blog->title = $title;
+				$blog->description = $body;
+		// Before we can set metadata, we need to save the blog post
+				if (!$blog->save()) {
+					register_error(elgg_echo("blog:error"));
+					forward("mod/blog/edit.php?blogpost=" . $guid);
+				}
+		// Now let's add tags. We can pass an array directly to the object property! Easy.
+				$blog->clearMetadata('tags');
+				if (is_array($tagarray)) {
+					$blog->tags = $tagarray;
+				}
+
+				$blog->comments_on = $comments_on; //whether the users wants to allow comments or not on the blog post
+
+		// Success message
+				system_message(elgg_echo("blog:posted"));
+		//add to the river
+				add_to_river('river/object/blog/update','update',$_SESSION['user']->guid,$blog->guid);
+		// Remove the blog post cache
+				//unset($_SESSION['blogtitle']); unset($_SESSION['blogbody']); unset($_SESSION['blogtags']);
+				remove_metadata($_SESSION['user']->guid,'blogtitle');
+				remove_metadata($_SESSION['user']->guid,'blogbody');
+				remove_metadata($_SESSION['user']->guid,'blogtags');
+		// Forward to the main blog page
+			$page_owner = get_entity($blog->container_guid);
+			if ($page_owner instanceof ElggUser)
+				$username = $page_owner->username;
+			else if ($page_owner instanceof ElggGroup)
+				$username = "group:" . $page_owner->guid;
+			forward("pg/blog/$username");
+					
+			}
+		
+		}
+		
+?>