From 2c9ea2cd34a1dd782e165b163899d7ba1ec1f41c Mon Sep 17 00:00:00 2001 From: pete Date: Tue, 9 Mar 2010 18:17:16 +0000 Subject: Blogs updated to new UI (needs Brett to look over first) git-svn-id: http://code.elgg.org/elgg/trunk@5335 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/blog/actions/add.php | 197 +++++++++++++++++++++++++------------------- mod/blog/actions/delete.php | 70 +++++++--------- mod/blog/actions/edit.php | 194 ++++++++++++++++++++++++------------------- 3 files changed, 253 insertions(+), 208 deletions(-) (limited to 'mod/blog/actions') diff --git a/mod/blog/actions/add.php b/mod/blog/actions/add.php index 97634638e..ade0c2544 100644 --- a/mod/blog/actions/add.php +++ b/mod/blog/actions/add.php @@ -1,84 +1,113 @@ - - * @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"); - -?> + + * @copyright Curverider Ltd 2008-2009 + * @link http://elgg.org/ + */ + + // Make sure we're logged in (send us to the front page if not) + gatekeeper(); + + // Make sure action is secure + action_gatekeeper(); + + // Get input data + $title = get_input('blogtitle'); + $body = get_input('blogbody'); + $tags = get_input('blogtags'); + $access = get_input('access_id'); + //there are three options for an excerpt 1) the user adds one 2) the user uses the {{more}} options + //3) we take the first 50 words - check for the excerpt first, then the more option, then grab 50 words + $excerpt = get_input('blogexcerpt'); + if($excerpt){ + if(strlen($excerpt) > 300) + $excerpt = substr($excerpt, 0, strpos($excerpt, ' ', 300)); + else + $excerpt = $excerpt; + + $show_excerpt = true; + } + //if(!$excerpt){ + //if no user excerpt,check for the {{more}} option in the post + // $excerpt = explode("{{more}}", $body); + // $excerpt = $excerpt[0]; + //} + if(!$excerpt){ + //grab the first 300 characters + if(strlen($body) > 300) + $excerpt = substr($body, 0, strpos($body, ' ', 300)) . "..."; + else + $excerpt = $body; + + $show_excerpt = false; + } + $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']); + + // Otherwise, save the blog post + } else { + + // 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 = $_SESSION['user']->getGUID(); + // Set it's container + $blog->container_guid = (int)get_input('container_guid', $_SESSION['user']->getGUID()); + // 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($_SERVER['HTTP_REFERER']); + } + // Now let's add tags. We can pass an array directly to the object property! Easy. + 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 + $blog->excerpt = $excerpt; + $blog->show_excerpt = $show_excerpt; + + // Success message + system_message(elgg_echo("blog:posted")); + // add to river + add_to_river('river/object/blog/create','create',$_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"); + + } + +?> diff --git a/mod/blog/actions/delete.php b/mod/blog/actions/delete.php index c01ca3844..5b0120cef 100644 --- a/mod/blog/actions/delete.php +++ b/mod/blog/actions/delete.php @@ -1,38 +1,32 @@ - - * @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 +getSubtype() == "blog" && $blog->canEdit()) { + $container = get_entity($blog->container_guid); + + // 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("pg/blog/" . $container->username); +}else{ + forward($_SERVER['HTTP_REFERER']); +} \ No newline at end of file diff --git a/mod/blog/actions/edit.php b/mod/blog/actions/edit.php index b44106645..3c16a2e8d 100644 --- a/mod/blog/actions/edit.php +++ b/mod/blog/actions/edit.php @@ -1,86 +1,108 @@ - - * @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"); - - } - - } - -?> + + * @copyright Curverider Ltd 2008-2009 + * @link http://elgg.org/ + */ + + // Make sure we're logged in (send us to the front page if not) + gatekeeper(); + + // make sure action is secure + action_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'); + $excerpt = get_input('blogexcerpt'); + if($excerpt){ + if(strlen($excerpt) > 300) + $excerpt = substr($excerpt, 0, strpos($excerpt, ' ', 300)); + else + $excerpt = strip_tags($excerpt); + + $show_excerpt = true; + } + if(!$excerpt){ + //grab the first 300 characters + if(strlen($body) > 300) + $excerpt = substr($body, 0, strpos($body, ' ', 300)) . "..."; + else + $excerpt = strip_tags($body); + + $show_excerpt = false; + } + + // 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->excerpt = $excerpt; + $blog->comments_on = $comments_on; //whether the users wants to allow comments or not on the blog post + $blog->show_excerpt = $show_excerpt; + + // 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"); + + } + + } + +?> -- cgit v1.2.3