]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Rough first version of a new blog plugin.
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Fri, 12 Mar 2010 02:12:47 +0000 (02:12 +0000)
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Fri, 12 Mar 2010 02:12:47 +0000 (02:12 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@5370 36083f99-b078-4883-b0ff-0f9b5a30f544

38 files changed:
mod/blog/actions/add.php [deleted file]
mod/blog/actions/blog/delete.php [new file with mode: 0644]
mod/blog/actions/blog/save.php [new file with mode: 0644]
mod/blog/actions/blog/save_draft.php [new file with mode: 0644]
mod/blog/actions/delete.php [deleted file]
mod/blog/actions/edit.php [deleted file]
mod/blog/add.php [deleted file]
mod/blog/all.php [deleted file]
mod/blog/archive.php [deleted file]
mod/blog/blog_lib.php [new file with mode: 0644]
mod/blog/edit.php [deleted file]
mod/blog/endpoint/index.php [deleted file]
mod/blog/everyone.php [deleted file]
mod/blog/friends.php [deleted file]
mod/blog/index.php [deleted file]
mod/blog/languages/en.php [deleted file]
mod/blog/manifest.xml
mod/blog/preview.php [deleted file]
mod/blog/read.php [deleted file]
mod/blog/savedraft.php [deleted file]
mod/blog/shared.php [deleted file]
mod/blog/start.php
mod/blog/views/default/blog/archive.php [deleted file]
mod/blog/views/default/blog/categorylist.php [deleted file]
mod/blog/views/default/blog/css.php
mod/blog/views/default/blog/forms/edit.php
mod/blog/views/default/blog/gallery.php [deleted file]
mod/blog/views/default/blog/listing.php [deleted file]
mod/blog/views/default/blog/menu.php [deleted file]
mod/blog/views/default/blog/notfound.php [deleted file]
mod/blog/views/default/blog/previewpane.php [deleted file]
mod/blog/views/default/blog/sidebar_menu.php [new file with mode: 0644]
mod/blog/views/default/blog/stats.php [deleted file]
mod/blog/views/default/blog/view.php [deleted file]
mod/blog/views/default/object/blog.php
mod/blog/views/default/river/object/blog/annotate.php [deleted file]
mod/blog/views/default/river/object/blog/create.php [deleted file]
mod/blog/views/default/river/object/blog/update.php [deleted file]

diff --git a/mod/blog/actions/add.php b/mod/blog/actions/add.php
deleted file mode 100644 (file)
index ade0c25..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php\r
-\r
-       /**\r
-        * Elgg blog: add post action\r
-        * \r
-        * @package ElggBlog\r
-        * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2\r
-        * @author Curverider Ltd <info@elgg.com>\r
-        * @copyright Curverider Ltd 2008-2009\r
-        * @link http://elgg.org/\r
-        */\r
-\r
-       // Make sure we're logged in (send us to the front page if not)\r
-               gatekeeper();\r
-\r
-        // Make sure action is secure\r
-        action_gatekeeper();\r
-\r
-       // Get input data\r
-               $title = get_input('blogtitle');\r
-               $body = get_input('blogbody');\r
-               $tags = get_input('blogtags');\r
-               $access = get_input('access_id');\r
-               //there are three options for an excerpt 1) the user adds one 2) the user uses the {{more}} options \r
-               //3) we take the first 50 words - check for the excerpt first, then the more option, then grab 50 words\r
-               $excerpt = get_input('blogexcerpt');\r
-               if($excerpt){\r
-                       if(strlen($excerpt) > 300)\r
-                       $excerpt = substr($excerpt, 0, strpos($excerpt, ' ', 300));\r
-               else\r
-                       $excerpt = $excerpt;\r
-                       \r
-                       $show_excerpt = true;\r
-               }\r
-               //if(!$excerpt){\r
-                       //if no user excerpt,check for the {{more}} option in the post\r
-               //      $excerpt = explode("{{more}}", $body);\r
-               //      $excerpt = $excerpt[0];\r
-               //}\r
-               if(!$excerpt){\r
-                       //grab the first 300 characters\r
-                       if(strlen($body) > 300)\r
-                       $excerpt = substr($body, 0, strpos($body, ' ', 300)) . "...";\r
-               else\r
-                       $excerpt = $body;\r
-                       \r
-               $show_excerpt = false;\r
-       }\r
-               $comments_on = get_input('comments_select','Off');\r
-\r
-       // Cache to the session\r
-               $_SESSION['user']->blogtitle = $title;\r
-               $_SESSION['user']->blogbody = $body;\r
-               $_SESSION['user']->blogtags = $tags;\r
-               \r
-       // Convert string of tags into a preformatted array\r
-               $tagarray = string_to_tag_array($tags);\r
-               \r
-       // Make sure the title / description aren't blank\r
-               if (empty($title) || empty($body)) {\r
-                       register_error(elgg_echo("blog:blank"));\r
-                       forward($_SERVER['HTTP_REFERER']);\r
-                       \r
-       // Otherwise, save the blog post \r
-               } else {\r
-                       \r
-       // Initialise a new ElggObject\r
-                       $blog = new ElggObject();\r
-       // Tell the system it's a blog post\r
-                       $blog->subtype = "blog";\r
-       // Set its owner to the current user\r
-                       $blog->owner_guid = $_SESSION['user']->getGUID();\r
-       // Set it's container           \r
-                       $blog->container_guid = (int)get_input('container_guid', $_SESSION['user']->getGUID());\r
-       // For now, set its access to public (we'll add an access dropdown shortly)\r
-                       $blog->access_id = $access;\r
-       // Set its title and description appropriately\r
-                       $blog->title = $title;\r
-                       $blog->description = $body;\r
-       // Before we can set metadata, we need to save the blog post\r
-                       if (!$blog->save()) {\r
-                               register_error(elgg_echo("blog:error"));\r
-                               forward($_SERVER['HTTP_REFERER']);\r
-                       }\r
-       // Now let's add tags. We can pass an array directly to the object property! Easy.\r
-                       if (is_array($tagarray)) {\r
-                               $blog->tags = $tagarray;\r
-                       }\r
-                       $blog->comments_on = $comments_on; //whether the users wants to allow comments or not on the blog post\r
-                       $blog->excerpt = $excerpt;\r
-                       $blog->show_excerpt = $show_excerpt;\r
-\r
-       // Success message\r
-                       system_message(elgg_echo("blog:posted"));\r
-       // add to river\r
-               add_to_river('river/object/blog/create','create',$_SESSION['user']->guid,$blog->guid);\r
-       // Remove the blog post cache\r
-                       //unset($_SESSION['blogtitle']); unset($_SESSION['blogbody']); unset($_SESSION['blogtags']);\r
-                       remove_metadata($_SESSION['user']->guid,'blogtitle');\r
-                       remove_metadata($_SESSION['user']->guid,'blogbody');\r
-                       remove_metadata($_SESSION['user']->guid,'blogtags');\r
-                       \r
-       // Forward to the main blog page\r
-                       $page_owner = get_entity($blog->container_guid);\r
-                       if ($page_owner instanceof ElggUser)\r
-                               $username = $page_owner->username;\r
-                       else if ($page_owner instanceof ElggGroup)\r
-                               $username = "group:" . $page_owner->guid;\r
-                       forward("pg/blog/$username");\r
-                               \r
-               }\r
-               \r
-?>\r
diff --git a/mod/blog/actions/blog/delete.php b/mod/blog/actions/blog/delete.php
new file mode 100644 (file)
index 0000000..8fa1ff8
--- /dev/null
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Delete blog entity
+ *
+ * @package Blog
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.org/
+ */
+
+$blog_guid = get_input('guid');
+$blog = get_entity($blog_guid);
+
+if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
+       if ($blog->delete()) {
+               system_message(elgg_echo('blog:message:deleted_post'));
+       } else {
+               register_error(elgg_echo('blog:error:cannot_delete_post'));
+       }
+} else {
+       register_error(elgg_echo('blog:error:post_not_found'));
+}
+
+forward($_SERVER['HTTP_REFERER']);
\ No newline at end of file
diff --git a/mod/blog/actions/blog/save.php b/mod/blog/actions/blog/save.php
new file mode 100644 (file)
index 0000000..eade7ca
--- /dev/null
@@ -0,0 +1,282 @@
+<?php
+/**
+ * Save blog entity
+ *
+ * @package Blog
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.org/
+ */
+
+elgg_make_sticky_form();
+
+// edit or create a new entity
+$guid = get_input('guid');
+$user = get_loggedin_user();
+$ajax = get_input('ajax');
+
+// store errors to pass along
+$error = FALSE;
+$error_forward_url = $_SERVER['HTTP_REFERER'];
+
+if ($guid) {
+       $entity = get_entity($guid);
+       if (elgg_instanceof($entity, 'object', 'blog') && $entity->canEdit()) {
+               $blog = $entity;
+       } else {
+               register_error(elgg_echo('blog:error:post_not_found'));
+               forward(get_input('forward', $_SERVER['HTTP_REFERER']));
+       }
+       $success_forward_url = get_input('forward', $blog->getURL());
+} else {
+       $blog = new ElggObject();
+       $blog->subtype = 'blog';
+       $success_forward_url = get_input('forward');
+}
+
+// set defaults and required values.
+$values = array(
+       'title' => '',
+       'description' => '',
+       'status' => 'draft',
+       //'publish_date' => time(),
+       'access_id' => ACCESS_DEFAULT,
+       'comments_on' => 'On',
+       'excerpt' => '',
+       'tags' => '',
+       'container_guid' => ''
+);
+
+$required = array('title', 'description');
+
+foreach ($values as $name => $default) {
+       $values[$name] = get_input($name, $default);
+}
+
+
+// load from POST and do sanity and access checking
+foreach ($values as $name => $default) {
+       $value = get_input($name, $default);
+
+       if (in_array($name, $required) && empty($value)) {
+               $error = elgg_echo("blog:error:missing:$name");
+       }
+
+       if ($error) {
+               break;
+       }
+
+       switch ($name) {
+               case 'tags':
+                       if ($value) {
+                               $values[$name] = string_to_tag_array($value);
+                       } else {
+                               unset ($values[$name]);
+                       }
+                       break;
+
+               case 'excerpt':
+                       // restrict to 300 chars
+                       if ($value) {
+                               $value = substr(strip_tags($value), 0, 300);
+                       } else {
+                               $value = substr(strip_tags($values['description']), 0, 300);
+                       }
+                       $values[$name] = $value;
+                       break;
+
+               case 'container_guid':
+                       // this can't be empty.
+                       if (!empty($value)) {
+                               if (can_write_to_container($user->getGUID(), $value)) {
+                                       $values[$name] = $value;
+                               } else {
+                                       $error = elgg_echo("blog:error:cannot_write_to_container");
+                               }
+                       } else {
+                               unset($values[$name]);
+                       }
+                       break;
+
+               // don't try to set the guid
+               case 'guid':
+                       unset($values['guid']);
+                       break;
+
+               default:
+                       $values[$name] = $value;
+                       break;
+       }
+}
+
+// assign values to the entity, stopping on error.
+if (!$error) {
+       foreach ($values as $name => $value) {
+               if (!$blog->$name = $value) {
+                       $error = elgg_echo('blog:error:cannot_save1' . $name);
+                       break;
+               }
+       }
+}
+
+// only try to save base entity if no errors
+if (!$error && !$blog->save()) {
+       $error = elgg_echo('blog:error:cannot_save');
+}
+
+// forward with success or failure
+if ($ajax) {
+       if ($error) {
+               $json = array('success' => FALSE, 'message' => $error);
+               echo json_encode($json);
+       } else {
+               $msg = elgg_echo('blog:message:saved');
+               $json = array('success' => TRUE, 'message' => $msg, 'guid' => $blog->getGUID());
+               echo json_encode($json);
+       }
+} else {
+       if ($error) {
+               register_error($error);
+               forward($error_forward_url);
+       } else {
+               system_message(elgg_echo('blog:message:saved'));
+               forward($success_forward_url);
+       }
+}
+
+
+
+/*
+ * This might have been a good idea.
+ * It's not.
+
+// edit or create a new entity
+$guid = get_input('guid');
+$user = get_loggedin_user();
+$ajax = get_input('ajax', FALSE);
+
+// store errors to pass along
+$error = FALSE;
+$error_forward_url = $_SERVER['HTTP_REFERER'];
+
+if ($guid) {
+       $entity = get_entity($guid);
+       if (elgg_instanceof($entity, 'object', 'blog') && $entity->canEdit()) {
+               $blog = $entity;
+       } else {
+               register_error(elgg_echo('blog:error:post_not_found'));
+               forward(get_input('forward', $_SERVER['HTTP_REFERER']));
+       }
+       $success_forward_url = get_input('forward', $blog->getURL());
+} else {
+       $blog = new ElggObject();
+       $blog->subtype = 'blog';
+       $success_forward_url = get_input('forward');
+}
+
+// set defaults and required values.
+$values = array(
+       'title' => '',
+       'description' => '',
+       'access_id' => ACCESS_DEFAULT,
+       'comments_on' => 'On',
+       'excerpt' => '',
+       'tags' => '',
+       'container_guid' => ''
+);
+
+$required = array('title', 'description');
+
+foreach ($values as $name => $default) {
+       $values[$name] = get_input($name, $default);
+}
+
+
+// load from POST and do sanity and access checking
+foreach ($values as $name => $default) {
+
+       if ($error) {
+               break;
+       }
+
+       $value = get_input($name, $default);
+
+       if (in_array($name, $required) && empty($value)) {
+               register_error(elgg_echo("blog:error:missing:$name"));
+               forward($error_forward_url);
+       }
+
+       switch ($name) {
+               case 'tags':
+                       $values[$name] = string_to_tag_array($value);
+                       break;
+
+               case 'excerpt':
+                       // restrict to 300 chars
+                       if ($value) {
+                               $value = substr(strip_tags($value), 0, 300);
+                       } else {
+                               $value = substr(strip_tags($values['description']), 0, 300);
+                       }
+                       $values[$name] = $value;
+                       break;
+
+               case 'container_guid':
+                       // this can't be empty.
+                       if (!empty($value)) {
+                               if (can_write_to_container($user->getGUID(), $value)) {
+                                       $values[$name] = $value;
+                               } else {
+                                       $error = elgg_echo("blog:error:cannot_write_to_container");
+                               }
+                       } else {
+                               unset($values[$name]);
+                       }
+                       break;
+
+               // don't try to set the guid
+               case 'guid':
+                       unset($values['guid']);
+                       break;
+
+               default:
+                       $values[$name] = $value;
+                       break;
+       }
+}
+
+// assign values to the entity, stopping on error.
+foreach ($values as $name => $value) {
+       if (!$blog->$name = $value) {
+               $error = elgg_echo('blog:error:cannot_save');
+               break;
+       }
+}
+
+// only try to save base entity if no errors
+if (!$error && !$blog->save()) {
+       $error = elgg_echo('blog:error:cannot_save');
+}
+
+// forward or return ajax data.
+if ($ajax) {
+       if ($error) {
+               $json = array('success' => FALSE, 'message' => $error);
+               echo json_encode($json);
+       } else {
+               $msg = elgg_echo('blog:message:saved');
+               $json = array('success' => TRUE, 'message' => $msg);
+               echo json_encode($json);
+       }
+} else {
+       if ($error) {
+               register_error($error);
+               forward($error_forward_url);
+       } else {
+               system_message(elgg_echo('blog:message:saved'));
+               forward($success_forward_url);
+       }
+}
+
+*/
\ No newline at end of file
diff --git a/mod/blog/actions/blog/save_draft.php b/mod/blog/actions/blog/save_draft.php
new file mode 100644 (file)
index 0000000..64a79c6
--- /dev/null
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Save blog entity
+ *
+ * @package Blog
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.org/
+ */
+
+elgg_make_sticky_form();
+
+// edit or create a new entity
+$guid = get_input('guid');
+$user = get_loggedin_user();
+$ajax = get_input('ajax');
+
+// store errors to pass along
+$error = FALSE;
+$error_forward_url = $_SERVER['HTTP_REFERER'];
+
+if ($guid) {
+       $entity = get_entity($guid);
+       if (elgg_instanceof($entity, 'object', 'blog') && $entity->canEdit()) {
+               $blog = $entity;
+       } else {
+               register_error(elgg_echo('blog:error:post_not_found'));
+               forward(get_input('forward', $_SERVER['HTTP_REFERER']));
+       }
+       $success_forward_url = get_input('forward', $blog->getURL());
+} else {
+       $blog = new ElggObject();
+       $blog->subtype = 'blog';
+       $success_forward_url = get_input('forward');
+}
+
+// set defaults and required values.
+$values = array(
+       'title' => '',
+       'description' => '',
+       'status' => 'draft',
+       //'publish_date' => '',
+       'access_id' => ACCESS_DEFAULT,
+       'comments_on' => 'On',
+       'excerpt' => '',
+       'tags' => '',
+       'container_guid' => ''
+);
+
+$required = array('title', 'description');
+
+foreach ($values as $name => $default) {
+       $values[$name] = get_input($name, $default);
+}
+
+
+// load from POST and do sanity and access checking
+foreach ($values as $name => $default) {
+       $value = get_input($name, $default);
+
+       if (in_array($name, $required) && empty($value)) {
+               $error = elgg_echo("blog:error:missing:$name");
+       }
+
+       if ($error) {
+               break;
+       }
+
+       switch ($name) {
+               case 'tags':
+                       if ($value) {
+                               $values[$name] = string_to_tag_array($value);
+                       } else {
+                               unset ($values[$name]);
+                       }
+                       break;
+
+               case 'excerpt':
+                       // restrict to 300 chars
+                       if ($value) {
+                               $value = substr(strip_tags($value), 0, 300);
+                       } else {
+                               $value = substr(strip_tags($values['description']), 0, 300);
+                       }
+                       $values[$name] = $value;
+                       break;
+
+               case 'container_guid':
+                       // this can't be empty.
+                       if (!empty($value)) {
+                               if (can_write_to_container($user->getGUID(), $value)) {
+                                       $values[$name] = $value;
+                               } else {
+                                       $error = elgg_echo("blog:error:cannot_write_to_container");
+                               }
+                       } else {
+                               unset($values[$name]);
+                       }
+                       break;
+
+               // don't try to set the guid
+               case 'guid':
+                       unset($values['guid']);
+                       break;
+
+               default:
+                       $values[$name] = $value;
+                       break;
+       }
+}
+
+// assign values to the entity, stopping on error.
+if (!$error) {
+       foreach ($values as $name => $value) {
+               if (!$blog->$name = $value) {
+                       $error = elgg_echo('blog:error:cannot_save');
+                       break;
+               }
+       }
+}
+
+// only try to save base entity if no errors
+if (!$error && !$blog->save()) {
+       $error = elgg_echo('blog:error:cannot_save');
+}
+
+// forward with success or failure
+if ($ajax) {
+       if ($error) {
+               $json = array('success' => FALSE, 'message' => $error);
+               echo json_encode($json);
+       } else {
+               $msg = elgg_echo('blog:message:saved');
+               $json = array('success' => TRUE, 'message' => $msg, 'guid' => $blog->getGUID());
+               echo json_encode($json);
+       }
+} else {
+       if ($error) {
+               register_error($error);
+               forward($error_forward_url);
+       } else {
+               system_message(elgg_echo('blog:message:saved'));
+               forward($success_forward_url);
+       }
+}
\ No newline at end of file
diff --git a/mod/blog/actions/delete.php b/mod/blog/actions/delete.php
deleted file mode 100644 (file)
index 5b0120c..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php\r
-\r
-/**\r
- * Elgg blog: delete post action\r
- */\r
-\r
-// Make sure we're logged in (send us to the front page if not)\r
-gatekeeper();\r
-\r
-// Get input data\r
-$guid = (int) get_input('blogpost');\r
-               \r
-// Make sure we actually have permission to edit\r
-$blog = get_entity($guid);\r
-if ($blog->getSubtype() == "blog" && $blog->canEdit()) {\r
-       $container = get_entity($blog->container_guid);\r
-       \r
-       // Get owning user\r
-       $owner = get_entity($blog->getOwner());\r
-       // Delete it!\r
-       $rowsaffected = $blog->delete();\r
-       if ($rowsaffected > 0) {\r
-       // Success message\r
-                       system_message(elgg_echo("blog:deleted"));\r
-       } else {\r
-                       register_error(elgg_echo("blog:notdeleted"));\r
-       }\r
-       // Forward to the main blog page\r
-       forward("pg/blog/" . $container->username);\r
-}else{\r
-       forward($_SERVER['HTTP_REFERER']);\r
-}
\ No newline at end of file
diff --git a/mod/blog/actions/edit.php b/mod/blog/actions/edit.php
deleted file mode 100644 (file)
index 3c16a2e..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php\r
-\r
-       /**\r
-        * Elgg blog: edit post action\r
-        * \r
-        * @package ElggBlog\r
-        * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2\r
-        * @author Curverider Ltd <info@elgg.com>\r
-        * @copyright Curverider Ltd 2008-2009\r
-        * @link http://elgg.org/\r
-        */\r
-\r
-       // Make sure we're logged in (send us to the front page if not)\r
-               gatekeeper();\r
-\r
-        // make sure action is secure\r
-        action_gatekeeper();\r
-\r
-       // Get input data\r
-               $guid = (int) get_input('blogpost');\r
-               $title = get_input('blogtitle');\r
-               $body = get_input('blogbody');\r
-               $access = get_input('access_id');\r
-               $tags = get_input('blogtags');\r
-               $comments_on = get_input('comments_select','Off');\r
-               $excerpt = get_input('blogexcerpt');\r
-               if($excerpt){\r
-                       if(strlen($excerpt) > 300)\r
-                       $excerpt = substr($excerpt, 0, strpos($excerpt, ' ', 300));\r
-               else\r
-                       $excerpt = strip_tags($excerpt);\r
-                       \r
-                       $show_excerpt = true;\r
-               }\r
-               if(!$excerpt){\r
-                       //grab the first 300 characters\r
-                       if(strlen($body) > 300)\r
-                       $excerpt = substr($body, 0, strpos($body, ' ', 300)) . "...";\r
-               else\r
-                       $excerpt = strip_tags($body);\r
-               \r
-               $show_excerpt = false;\r
-       }\r
-               \r
-       // Make sure we actually have permission to edit\r
-               $blog = get_entity($guid);\r
-               if ($blog->getSubtype() == "blog" && $blog->canEdit()) {\r
-       \r
-               // Cache to the session\r
-                       \r
-                       $_SESSION['user']->blogtitle = $title;\r
-                       $_SESSION['user']->blogbody = $body;\r
-                       $_SESSION['user']->blogtags = $tags;\r
-                       \r
-               // Convert string of tags into a preformatted array\r
-                       $tagarray = string_to_tag_array($tags);\r
-                       \r
-               // Make sure the title / description aren't blank\r
-                       if (empty($title) || empty($body)) {\r
-                               register_error(elgg_echo("blog:blank"));\r
-                               forward("mod/blog/add.php");\r
-                               \r
-               // Otherwise, save the blog post \r
-                       } else {\r
-                               \r
-               // Get owning user\r
-                               $owner = get_entity($blog->getOwner());\r
-               // For now, set its access to public (we'll add an access dropdown shortly)\r
-                               $blog->access_id = $access;\r
-               // Set its title and description appropriately\r
-                               $blog->title = $title;\r
-                               $blog->description = $body;\r
-               // Before we can set metadata, we need to save the blog post\r
-                               if (!$blog->save()) {\r
-                                       register_error(elgg_echo("blog:error"));\r
-                                       forward("mod/blog/edit.php?blogpost=" . $guid);\r
-                               }\r
-               // Now let's add tags. We can pass an array directly to the object property! Easy.\r
-                               $blog->clearMetadata('tags');\r
-                               if (is_array($tagarray)) {\r
-                                       $blog->tags = $tagarray;\r
-                               }\r
-                               $blog->excerpt = $excerpt;\r
-                               $blog->comments_on = $comments_on; //whether the users wants to allow comments or not on the blog post\r
-                               $blog->show_excerpt = $show_excerpt;\r
-                               \r
-               // Success message\r
-                               system_message(elgg_echo("blog:posted"));\r
-               //add to the river\r
-                               add_to_river('river/object/blog/update','update',$_SESSION['user']->guid,$blog->guid);\r
-               // Remove the blog post cache\r
-                               //unset($_SESSION['blogtitle']); unset($_SESSION['blogbody']); unset($_SESSION['blogtags']);\r
-                               remove_metadata($_SESSION['user']->guid,'blogtitle');\r
-                               remove_metadata($_SESSION['user']->guid,'blogbody');\r
-                               remove_metadata($_SESSION['user']->guid,'blogtags');\r
-               // Forward to the main blog page\r
-                       $page_owner = get_entity($blog->container_guid);\r
-                       if ($page_owner instanceof ElggUser)\r
-                               $username = $page_owner->username;\r
-                       else if ($page_owner instanceof ElggGroup)\r
-                               $username = "group:" . $page_owner->guid;\r
-                       forward("pg/blog/$username");\r
-                                       \r
-                       }\r
-               \r
-               }\r
-               \r
-?>\r
diff --git a/mod/blog/add.php b/mod/blog/add.php
deleted file mode 100644 (file)
index efc6afc..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php\r
-\r
-/**\r
- * Elgg blog add entry page\r
- */\r
-\r
-// Load Elgg engine\r
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");\r
-gatekeeper();\r
-               \r
-// Get the current page's owner\r
-$page_owner = page_owner_entity();\r
-if ($page_owner === false || is_null($page_owner)) {\r
-       $page_owner = $_SESSION['user'];\r
-       set_page_owner($_SESSION['guid']);\r
-}\r
-if ($page_owner instanceof ElggGroup)\r
-       $container = $page_owner->guid;\r
-               \r
-//set breadcrumbs\r
-//$area1 = elgg_view('elggcampus_layout/breadcrumbs_general', array('object_type' => 'blog'));\r
-       \r
-// Get the form\r
-$area1 .= elgg_view("blog/forms/edit", array('container_guid' => $container));\r
-               \r
-// Display page\r
-page_draw(elgg_echo('blog:addpost'),elgg_view_layout("one_column", $area1));
\ No newline at end of file
diff --git a/mod/blog/all.php b/mod/blog/all.php
deleted file mode 100644 (file)
index ab1832d..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-       /**
-        * Elgg view all blog posts from all users page
-        */
-
-       // Load Elgg engine
-               define('everyoneblog','true');
-               require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-       
-       // Get the current page's owner
-               $page_owner = $_SESSION['user'];
-               set_page_owner($_SESSION['guid']);
-               
-       //set blog title
-               //$area1 = elgg_view('blog/blog_header', array('context' => "everyone", 'type' => 'blog'));
-               set_context('search');
-               $area2 .= "<div id='blogs'>" . list_entities('object','blog',0,10,false) . "<div class='clearfloat'></div></div>";
-               set_context('blog');
-
-       // Get categories, if they're installed
-               global $CONFIG;
-               //$area3 = elgg_view('blog/categorylist',array('baseurl' => $CONFIG->wwwroot . 'search/?subtype=blog&tagtype=universal_categories&tag=','subtype' => 'blog'));  
-       //include a view for plugins to extend
-               //$area3 .= elgg_view("blogs/favourite", array("object_type" => 'blog'));
-       //get the latest comments on all blogs
-               $comments = get_annotations(0, "object", "blog", "generic_comment", "", 0, 4, 0, "desc");
-               //$area3 .= elgg_view('page_elements/latest_comments', array('comments' => $comments));         
-       //include a view for plugins to extend
-               //$area3 .= elgg_view("blogs/sidebar_options", array("object_type" => 'blog'));
-               
-               $area3 .= elgg_view('blog/stats');      
-       
-               $body = elgg_view_layout("one_column_with_sidebar", $area1.$area2, $area3);
-               
-       // Display page
-               page_draw(elgg_echo('blog:all'),$body);
-               
-?>
\ No newline at end of file
diff --git a/mod/blog/archive.php b/mod/blog/archive.php
deleted file mode 100644 (file)
index 9648c75..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php\r
-\r
-/**\r
- * Elgg blog archive page\r
- */\r
-\r
-// Load Elgg engine\r
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");\r
-               \r
-// Get the current page's owner\r
-$page_owner = page_owner_entity();\r
-if ($page_owner === false || is_null($page_owner)) {\r
-       $page_owner = $_SESSION['user'];\r
-       set_page_owner($_SESSION['guid']);\r
-}\r
-//set breadcrumbs if in a group\r
-//$area1 = elgg_view('elggcampus_layout/breadcrumbs_general', array('object_type' => 'blog')); \r
-// Get timestamp upper and lower bounds\r
-$timelower = (int) get_input('param2');\r
-$timeupper = (int) get_input('param3');\r
-if (empty($timelower)) {\r
-       forward('pg/blog/'.$page_owner->username);\r
-       exit;\r
-}\r
-if (empty($timeupper)) {\r
-       $timeupper = $timelower + (86400 * 30);\r
-}\r
-\r
-// Set blog title\r
-$area2 = elgg_view_title(sprintf(elgg_echo('date:month:'.date('m',$timelower)),date('Y',$timelower)));\r
-\r
-set_context('search');\r
-// Get a list of blog posts\r
-$blogs = list_user_objects($page_owner->getGUID(),'blog',10,false,false,true,$timelower,$timeupper);\r
-$area2 .= "<div id=\"blogs\">" . $blogs  . "<div class='clearfloat'></div></div>";\r
-set_context('blog');\r
-\r
-///if the logged in user is not looking at their stuff, display the ownerblock otherwise\r
-//show the users favourites\r
-if(page_owner()        != get_loggedin_user()->guid){\r
-       $area3 = elgg_view('blog/ownerblock');\r
-}\r
-\r
-//get the latest comments on user's blog posts\r
-$comments = get_annotations(0, "object", "blog", "generic_comment", "", 0, 4, 0, "desc",0,0,page_owner());\r
-$area3 .= elgg_view('elggcampus_layout/latest_comments', array('comments' => $comments));\r
-//a view for the favourites plugin to extend\r
-$area3 .= elgg_view("blogs/sidebar_options", array("object_type" => 'blog'));\r
-//display archive\r
-$area3 .= elgg_view("blog/archive");\r
-               \r
-// Display them in the page\r
-$body = elgg_view_layout("one_column_with_sidebar", $area1 . $area2, $area3);\r
-               \r
-// Display page\r
-page_draw(sprintf(elgg_echo('blog:user'),$page_owner->name),$body);
\ No newline at end of file
diff --git a/mod/blog/blog_lib.php b/mod/blog/blog_lib.php
new file mode 100644 (file)
index 0000000..0fe1b80
--- /dev/null
@@ -0,0 +1,181 @@
+<?php
+/**
+ * Blog helper functions
+ *
+ * @package Blog
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.org/
+ */
+
+
+/**
+ * Returns HTML for a blog post.
+ *
+ * @param int $guid of a blog entity.
+ * @return string html
+ */
+function blog_get_page_content_read($owner_guid, $guid) {
+       if ($guid) {
+               $blog = get_entity($guid);
+
+               if (!elgg_instanceof($blog, 'object', 'blog') && $blog->status == 'final') {
+                       $content = elgg_echo('blog:error:post_not_found');
+               } else {
+                       elgg_push_breadcrumb($blog->title, $blog->getURL());
+                       $content = elgg_view_entity($blog, TRUE);
+               }
+       } else {
+               $content = elgg_list_entities_from_metadata(array(
+                       'type' => 'object',
+                       'subtype' => 'blog',
+                       'owner_guid' => $owner_guid,
+                       'full_view' => FALSE,
+                       'metadata_name_value_pair' => array('name' => 'status', 'value' => 'final')
+               ));
+       }
+
+       return $content;
+}
+
+/**
+ * Returns HTML to edit a blog post.
+ *
+ * @param int $guid
+ * @return string html
+ */
+function blog_get_page_content_edit($guid) {
+       $vars = array();
+       if ($guid) {
+               $blog = get_entity($guid);
+               $vars['entity'] = $blog;
+
+               if (!elgg_instanceof($blog, 'object', 'blog') || !$blog->canEdit()) {
+                       $content = elgg_echo('blog:error:post_not_found');
+               }
+
+               elgg_push_breadcrumb($blog->title, $blog->getURL());
+               elgg_push_breadcrumb(elgg_echo('edit'));
+       } else {
+               elgg_push_breadcrumb(elgg_echo('blog:new'));
+       }
+
+       $content = elgg_view('blog/forms/edit', $vars);
+
+       return $content;
+}
+
+/**
+ * Saves a blog
+ *
+ * @param array $info An array of name=>value pairs to save to the blog entity
+ *
+ * @return array('success' => BOOL, 'message' => string);
+ */
+function blog_save_blog($info) {
+       // store errors to pass along
+       $error = FALSE;
+
+       if ($info['guid']) {
+               $entity = get_entity($info['guid']);
+               if (elgg_instanceof($entity, 'object', 'blog') && $entity->canEdit()) {
+                       $blog = $entity;
+               } else {
+                       $error = elgg_echo('blog:error:post_not_found');
+               }
+       } else {
+               $blog = new ElggObject();
+               $blog->subtype = 'blog';
+       }
+
+       // check required vars
+       $required = array('title', 'description');
+
+       // load from POST and do sanity and access checking
+       foreach ($info as $name => $value) {
+               if (in_array($name, $required) && empty($value)) {
+                       $error = elgg_echo("blog:error:missing:$name");
+               }
+
+               if ($error) {
+                       break;
+               }
+
+               switch ($name) {
+                       case 'tags':
+                               if ($value) {
+                                       $info[$name] = string_to_tag_array($value);
+                               } else {
+                                       unset ($info[$name]);
+                               }
+                               break;
+
+                       case 'excerpt':
+                               // restrict to 300 chars
+                               if ($value) {
+                                       $value = substr(strip_tags($value), 0, 300);
+                               } else {
+                                       $value = substr(strip_tags($info['description']), 0, 300);
+                               }
+                               $info[$name] = $value;
+                               break;
+
+                       case 'container_guid':
+                               // this can't be empty.
+                               if (!empty($value)) {
+                                       if (can_write_to_container($user->getGUID(), $value)) {
+                                               $info[$name] = $value;
+                                       } else {
+                                               $error = elgg_echo("blog:error:cannot_write_to_container");
+                                       }
+                               } else {
+                                       unset($info[$name]);
+                               }
+                               break;
+
+                       // don't try to set the guid
+                       case 'guid':
+                               unset($info['guid']);
+                               break;
+
+                       default:
+                               $info[$name] = $value;
+                               break;
+               }
+       }
+
+       // assign values to the entity, stopping on error.
+       if (!$error) {
+               foreach ($info as $name => $value) {
+                       if (!$blog->$name = $value) {
+                               $error = elgg_echo('blog:error:cannot_save');
+                               break;
+                       }
+               }
+       }
+
+       // only try to save base entity if no errors
+       if (!$error && !$blog->save()) {
+               $error = elgg_echo('blog:error:cannot_save');
+       }
+
+       if ($error) {
+               $return = array(
+                       'success' => FALSE,
+                       'message' => $error
+               );
+       } else {
+               $return = array(
+                       'success' => TRUE,
+                       'message' => elgg_echo('blog:message:saved')
+               );
+       }
+
+       return $return;
+}
+
+
+class ElggBlog extends ElggObject {
+
+}
\ No newline at end of file
diff --git a/mod/blog/edit.php b/mod/blog/edit.php
deleted file mode 100644 (file)
index 2d605b6..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php\r
-\r
-/**\r
-* Elgg blog edit entry page\r
-*/\r
-\r
-//Load Elgg engine\r
-       require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");\r
-       gatekeeper();\r
-               \r
-//Get the current page's owner\r
-       $page_owner = page_owner_entity();\r
-       if ($page_owner === false || is_null($page_owner)) {\r
-               $page_owner = $_SESSION['user'];\r
-               set_page_owner($_SESSION['guid']);\r
-       }\r
-               \r
-//Get the post, if it exists\r
-       $blogpost = (int) get_input('blogpost');\r
-       if ($post = get_entity($blogpost)) {    \r
-               if ($post->canEdit()) { \r
-                       //$area1 = elgg_view('elggcampus_layout/breadcrumbs_edit', array('object' => $post, 'object_type' => 'blog'));\r
-                       $area1 .= elgg_view("blog/forms/edit", array('entity' => $post));\r
-                       $body = elgg_view_layout("one_column", $area1);\r
-               }       \r
-       }\r
-               \r
-//Display page\r
-       page_draw(sprintf(elgg_echo('blog:editpost'),$post->title),$body);
\ No newline at end of file
diff --git a/mod/blog/endpoint/index.php b/mod/blog/endpoint/index.php
deleted file mode 100644 (file)
index 013770e..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-    /**
-        * Elgg external blog. Turns your internal blog into an external one.
-        */
-
-    // Load Elgg engine will not include plugins
-    require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
-       
-    global $CONFIG;
-    
-    $user = get_input('user');
-    $user_object = get_user_by_username($user);
-    
-    // Get a list of blog posts
-       set_context('search');
-       $area2 = "<div id=\"blogs\">" . list_user_objects($user_object->guid,'blog',10,false, false) . "<div class='clearfloat'></div></div>";
-       set_context('blog');
-       
-       //get some user details
-       $user_name = $user_object->name;
-       $user_desc = $user_object->briefdescription;
-       $user_location = $user_object->location;
-       
-       //get archive list
-       if ($dates = get_entity_dates('object','blog',$user_object->guid)) {
-               foreach($dates as $date) {
-                       $timestamplow = mktime(0,0,0,substr($date,4,2),1,substr($date,0,4));
-                       $timestamphigh = mktime(0,0,0,((int) substr($date,4,2)) + 1,1,substr($date,0,4));
-                       $link = $CONFIG->wwwroot . 'pg/blog/' . $page_owner->username . '/archive/' . $timestamplow . '/' . $timestamphigh;
-                       $year = substr($date,0,-2);
-                       $month = date('F',mktime(0, 0, 0, substr($date,4,2), 1)); //substr($date,4,2);
-                       $display_date = $month . " " . $year;   
-                       $archive_list .= "<li><a href=\"{$link}\">" . $display_date . "</a></li>";
-               }                                                               
-       }
-?>
-<html>
-<head>
-<title>Brighton news blog</title>
-<?php
-       //require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/mod/blog/themes/ColdBlue/css/style.php");
-?>
-</head>
-<body>
-       <div id="header"><div class="inner clear">
-               <h1><a href=""><?php echo $user_object->name; ?>: blog</a></h1>
-               <ul id="navigation">
-                       <li><a href="<?php echo $CONFIG->wwwroot . 'pg/blog/' . $user .'?view=rss'; ?>">RSS Feed</a></li>
-               </ul>
-       </div></div>
-       <div id="search"><div class="inner clear">
-               <a id="rss-link" href="<?php echo $CONFIG->wwwroot . 'pg/blog/' . $user .'?view=rss'; ?>"><strong>Subscribe to the RSS Feed</strong></a>
-               <a id="technorati-link" href="http://technorati.com/faves?add=""><strong>Add to your Favorites</strong></a>
-       </div></div>
-       <div id="wrapper" class="clear">
-       <div id="content">
-       <?php echo $area2; ?>
-               <div class="post-navigation">
-                       <div class="left"></div>
-                       <div class="right"></div>
-               </div>
-       </div>
-<ul id="sidebar">
-<li><h2>About</h2>
-       <ul>
-               <li>
-                       <p><b><?php echo $user_name; ?></b></p>
-                       <p><b><?php echo $user_desc; ?></b></p>
-                       <p><b>Location: <?php echo $user_location; ?></b></p>
-               </li>
-       </ul>
-</li>
-<li><h2>Archives</h2>
-       <ul>
-       <?php 
-               //archives
-               echo $archive_list;
-       ?>
-       </ul>
-</li>
-</ul>
-</div>
-<div id="footer">
-       <p id="blog-name">Copyright &copy; 2009 <a href="<?php echo $user_object->getURL(); ?>"><?php echo $user_object->name; ?></a></p>
-       <p id="webrevolutionary-link">
-               <a href="http://webrevolutionary.com/coldblue/">ColdBlue</a> v1.0 &mdash; A theme by <a href="http://webrevolutionary.com/">WebRevolutionary</a> &amp; <a href="http://www.forwebdesigners.com/">ForWebdesigners</a>
-       </p>
-</div>
-<!-- ColdBlue v1.0 theme designed by WebRevolutionary.com -->
-</body>
-</html>
\ No newline at end of file
diff --git a/mod/blog/everyone.php b/mod/blog/everyone.php
deleted file mode 100644 (file)
index 9270b33..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-       /**
-        * Elgg view all blog posts from all users page
-        * 
-        * @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.com/
-        */
-
-       // Load Elgg engine
-               define('everyoneblog','true');
-               require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-       
-// Get the current page's owner
-               $page_owner = $_SESSION['user'];
-               set_page_owner($_SESSION['guid']);
-               
-               $area2 = elgg_view_title(elgg_echo('blog:everyone'));
-
-               $area2 .= "<div id='blogs'>" . elgg_list_entities(array('type' => 'object', 'subtype' => 'blog', 'limit' => 10, 'full_view' => FALSE)) . "<div class='clearfloat'></div></div>";
-
-               // get tagcloud
-               // $area3 = "This will be a tagcloud for all blog posts";
-
-               // Get categories, if they're installed
-               global $CONFIG;
-               $area3 = elgg_view('blog/categorylist',array('baseurl' => $CONFIG->wwwroot . 'search/?subtype=blog&tagtype=universal_categories&tag=','subtype' => 'blog'));
-
-               $body = elgg_view_layout("one_column_with_sidebar", $area2, $area3);
-               
-       // Display page
-               page_draw(elgg_echo('blog:everyone'),$body);
-               
-?>
\ No newline at end of file
diff --git a/mod/blog/friends.php b/mod/blog/friends.php
deleted file mode 100644 (file)
index 24aa36c..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php\r
-\r
-       /**\r
-        * Elgg blog friends page\r
-        */\r
-\r
-       // Load Elgg engine\r
-               define('everyoneblog','true');\r
-               require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");\r
-               \r
-       // Get the current page's owner\r
-               $page_owner = page_owner_entity();\r
-               if ($page_owner === false || is_null($page_owner)) {\r
-                       $page_owner = $_SESSION['user'];\r
-                       set_page_owner($_SESSION['guid']);\r
-               }\r
-               if (!($page_owner instanceof ElggEntity)) forward();\r
-\r
-       //set blog title\r
-               $area1 = elgg_view('blog/blog_header', array('context' => "friends", 'type' => 'blog'));\r
-               \r
-       // Get a list of blog posts\r
-               set_context('search');\r
-               $area2 .= "<div id='blogs'>" . list_user_friends_objects($page_owner->getGUID(),'blog',10,false) . "<div class='clearfloat'></div></div>";\r
-               set_context('blog');\r
-               \r
-       // Get categories, if they're installed\r
-               global $CONFIG;\r
-               //$area3 .= elgg_view("blogs/favourite", array("object_type" => 'blog'));\r
-               $comments = get_annotations(0, "object", "blog", "generic_comment", "", 0, 4, 0, "desc");\r
-               $area3 .= elgg_view('page_elements/latest_comments', array('comments' => $comments));\r
-       //include a view for plugins to extend\r
-               $area3 .= elgg_view("blogs/sidebar_options", array("object_type" => 'blog'));\r
-               \r
-       // Display them in the page\r
-        $body = elgg_view_layout("one_column_with_sidebar", $area1.$area2, $area3);\r
-               \r
-       // Display page\r
-               page_draw(elgg_echo('blog:friends'),$body);\r
-               \r
-?>
\ No newline at end of file
diff --git a/mod/blog/index.php b/mod/blog/index.php
deleted file mode 100644 (file)
index 5d03ce4..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php\r
-\r
-/**\r
- * Elgg blog index page\r
- */\r
-\r
-// Load Elgg engine\r
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");\r
-               \r
-// Get the current page's owner\r
-$page_owner = page_owner_entity();\r
-if ($page_owner === false || is_null($page_owner)) {\r
-       $page_owner = $_SESSION['user'];\r
-       set_page_owner($_SESSION['guid']);\r
-}\r
-\r
-//set breadcrumbs if in a group\r
-//$area1 = elgg_view('elggcampus_layout/breadcrumbs_general', array('object_type' => 'blog'));\r
-       \r
-//set blog header\r
-if(page_owner()== get_loggedin_user()->guid){\r
-       $area1 .= elgg_view('blog/blog_header', array('context' => "own", 'type' => 'blog'));\r
-}elseif($page_owner instanceof ElggGroup){\r
-       $area1 .= elgg_view('groups/blog_header_group');\r
-}else{\r
-       $area1 .= elgg_view('blog/blog_header_visit', array('type' => 'blog'));\r
-}\r
-               \r
-// Get a list of blog posts\r
-set_context('search');\r
-$blogs = list_user_objects($page_owner->getGUID(),'blog',10,false, false);\r
-if(!$blogs && ($page_owner->guid == get_loggedin_user()->guid))\r
-       $blogs = elgg_view('help/blogs');\r
-$area2 = "<div id=\"blogs\">" . $blogs  . "<div class='clearfloat'></div></div>";\r
-set_context('blog');\r
-//if the logged in user is not looking at their stuff, display the ownerblock otherwise\r
-//show the users favourites\r
-if(page_owner()        != get_loggedin_user()->guid){\r
-       $area3 = elgg_view('blog/ownerblock');\r
-}else{ \r
-       //a view for the favourites plugin to extend\r
-       //$area3 .= elgg_view("blogs/favourite", array("object_type" => 'blog'));\r
-}\r
-//get the latest comments on user's blog posts\r
-$comments = get_annotations(0, "object", "blog", "generic_comment", "", 0, 4, 0, "desc",0,0,page_owner());\r
-$area3 .= elgg_view('page_elements/latest_comments', array('comments' => $comments));\r
-//a view for the favourites plugin to extend\r
-$area3 .= elgg_view("blogs/sidebar_options", array("object_type" => 'blog'));\r
-//display archive\r
-$area3 .= elgg_view("blog/archive");\r
-// Display them in the page\r
-$body = elgg_view_layout("one_column_with_sidebar", $area1.$area2, $area3);\r
-       \r
-// Display page\r
-page_draw(sprintf(elgg_echo('blog:user'),$page_owner->name),$body);
\ No newline at end of file
diff --git a/mod/blog/languages/en.php b/mod/blog/languages/en.php
deleted file mode 100644 (file)
index 3e4b3d6..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-       $english = array(
-       
-               /**
-                * Menu items and titles
-                */
-       
-                       'blog' => "Blog", 
-                       'blogs' => "Blogs",
-                       'blog:user' => "%s's blog",
-                       'blog:user:friends' => "%s's friends' blog",
-                       'blog:yours' => "My blog",
-                       'blog:posttitle' => "%s's blog: %s",
-                       'blog:friends' => "Friends' blogs",
-                       'blog:workgroup' => "Work Group blogs",
-                       'blog:yourfriends' => "Your friends' latest blogs",
-                       'blog:all' => "All site blogs",
-                       'blog:new' => "New blog post",
-                       'blog:posts' => "Latest blog posts",
-                       'blog:title' => "Blog title",
-                       'blog:via' => "via blog",
-                       'blog:read' => "Read blog",
-                       'blog:backto' => "Back to blogs",
-                       'blog:addpost' => "New blog post",
-                       'blog:editpost' => "Edit blog post",
-                       'blog:defaultaccess' => "Your site wide access level is:",
-                       'blog:text' => "Blog text",
-                       'blog:access' => "This blog's access is:",
-                       'blog:strapline' => "%s",
-                       'blog:none' => "There are no blog posts to display",
-                       'item:object:blog' => 'Blog posts',
-                       'blog:latestcomments' => 'Latest comments',
-                       'blog:never' => 'never',
-                       'blog:preview' => 'Preview',
-                       'blog:archive' => 'Archive',
-                       'blog:excerpt' => 'Excerpt (Optional)',
-                       'blog:excerptdesc' => 'An optional short summary, displayed on blog and search listings<br />(instead of the first 200 characters).',
-                       'blog:draft:save' => 'Save draft',
-                       'blog:readmore' => 'Read more',
-                       'blog:draft:saved' => 'Draft last saved',
-                       'blog:comments:allow' => 'Allow comments',
-                       'blog:widget:description' => 'This widget will display your latest blog post titles on your profile.',
-       
-                       'blog:preview:description' => 'This is an unsaved preview of your blog post.',
-                       'blog:preview:description:link' => 'To continue editing or save your post, click here.',
-       
-                       'blog:enableblog' => 'Enable community blog',
-       
-                       'blog:group' => 'Group blog',
-                       
-         /**
-            * Blog river
-            **/
-               
-               //generic terms to use
-               'blog:river:created' => "%s wrote",
-               'blog:river:updated' => "%s updated",
-               'blog:river:posted' => "%s posted",
-               
-               //these get inserted into the river links to take the user to the entity
-               'blog:river:create' => "a blog post",
-               'blog:river:update' => "a blog post",
-               'blog:river:annotate' => "a comment on the blog post",
-                       
-       
-               /**
-                * Status messages
-                */
-       
-                       'blog:posted' => "Your blog post was successfully posted.",
-                       'blog:deleted' => "Your blog post was successfully deleted.",
-       
-               /**
-                * Error messages
-                */
-       
-                       'blog:error' => 'Something went wrong. Please try again.',
-                       'blog:save:failure' => "Your blog post could not be saved. Please try again.",
-                       'blog:blank' => "Sorry; you need to fill in both the title and body before you can make a post.",
-                       'blog:notfound' => "Sorry; we could not find the specified blog post.",
-                       'blog:notdeleted' => "Sorry; we could not delete this blog post.",
-       
-       );
-                                       
-       add_translation("en",$english);
-
-?>
\ No newline at end of file
index e2b8f89f49b33a70d6314de1d9e4cfa16114f140..483e83fabad90483dbce8a0ce4958f6590bc383f 100644 (file)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-        <field key="author" value="Curverider" />
-        <field key="version" value="1.8" />
-        <field key="description" value="Elgg blog plugin" />
-        <field key="website" value="http://www.elgg.org/" />
-        <field key="copyright" value="(C) Curverider 2008-2010" />
-        <field key="licence" value="GNU Public License version 2" />
-        <field key="elgg_version" value="2010030101" />
+               <field key="author" value="Curverider" />
+               <field key="version" value="1.8" />
+               <field key="description" value="Elgg blog plugin" />
+               <field key="website" value="http://www.elgg.org/" />
+               <field key="copyright" value="(C) Curverider 2008-2010" />
+               <field key="licence" value="GNU Public License version 2" />
+               <field key="elgg_version" value="2010030101" />
 </plugin_manifest>
diff --git a/mod/blog/preview.php b/mod/blog/preview.php
deleted file mode 100644 (file)
index 93e11c2..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php\r
-\r
-       /**\r
-        * Elgg blog: preview page\r
-        */\r
-\r
-               require_once(dirname(dirname(dirname(__FILE__))).'/engine/start.php');\r
-\r
-       // Make sure we're logged in (send us to the front page if not)\r
-               gatekeeper();\r
-\r
-       // Get input data\r
-       \r
-               $blogpost = new stdClass;\r
-               $blogpost->title = get_input('blogtitle');\r
-               $blogpost->description = get_input('blogbody');\r
-               $blogpost->tags = get_input('blogtags');\r
-               $blogpost->access = get_input('access_id');\r
-               $blogpost->comments_on = get_input('comments_select');\r
-               $blogpost->time_created = time();\r
-               \r
-       // Convert string of tags into a preformatted array\r
-               $blogpost->tags = string_to_tag_array($blogpost->tags);\r
-               \r
-       // Display it\r
-               $area2 = elgg_view("blog/previewpane") .\r
-                                elgg_view("object/blog",array(\r
-                                                                                       'entity' => $blogpost,\r
-                                                                                       'entity_owner' => $_SESSION['user']->guid,\r
-                                                                                       'comments' => false,\r
-                                                                                       'full' => true\r
-                                                                                       ));\r
-                                                                                       \r
-       // Set the title appropriately\r
-               $title = sprintf(elgg_echo("blog:posttitle"),$_SESSION['user']->name,$blogpost->title);\r
-\r
-       // Display through the correct canvas area\r
-               $body = elgg_view_layout("one_column_with_sidebar", $area1 . $area2);                   \r
-               echo page_draw($blogpost->title,$body);\r
-\r
-?>\r
diff --git a/mod/blog/read.php b/mod/blog/read.php
deleted file mode 100644 (file)
index 291a7bd..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php\r
-\r
-       /**\r
-        * Elgg read blog post page\r
-        * @package ElggBlog\r
-        * @copyright Curverider Ltd 2008-2009\r
-        */\r
-\r
-// Load Elgg engine\r
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");\r
-\r
-// Get the specified blog post\r
-$post = (int) get_input('blogpost');\r
-\r
-// If we can get out the blog post ...\r
-if ($blogpost = get_entity($post)) {\r
-       // Set variables\r
-       $blog_acl = '';                 \r
-       // Set the page owner\r
-       if ($blogpost->container_guid)\r
-               set_page_owner($blogpost->container_guid);\r
-       else\r
-               set_page_owner($blogpost->owner_guid);\r
-               \r
-       //set breadcrumbs\r
-       //$area2 = elgg_view('elggcampus_layout/breadcrumbs', array('object_title' => $blogpost->title, 'object_type' => 'blog'));\r
-       // Display it\r
-       $area2 .= elgg_view_entity($blogpost, true);\r
-       //get the blog's access level\r
-       $blog_acl = get_readable_access_level($blogpost->access_id);                                    \r
-       // Set the title appropriately\r
-       $title = $blogpost->title;\r
-       //set blog ownerblock if not your own\r
-       if($blogpost->owner_guid != get_loggedin_user()->guid){\r
-               $area3 = elgg_view('blog/ownerblock');\r
-       }\r
-       //display the read sidebar\r
-       //$area3 .= elgg_view('blog/read_sidebar', array('blog_acl' => $blog_acl, 'entity' => $blogpost));\r
-       //if the logged in user is not looking at their stuff, display the ownerblock otherwise\r
-       //show the users favourites\r
-       if(page_owner() != get_loggedin_user()->guid){\r
-               $area3 = elgg_view('blog/ownerblock');\r
-       }else{  \r
-               //a view for the favourites plugin to extend\r
-               $area3 .= elgg_view("blogs/sidebar_options", array("object_type" => 'blog'));\r
-       }\r
-       //display archive\r
-       $area3 .= elgg_view("blog/archive");\r
-       //get the latest comments on user's blog posts\r
-       $comments = get_annotations(0, "object", "blog", "generic_comment", "", 0, 4, 0, "desc",0,0,page_owner());\r
-       $area3 .= elgg_view('page_elements/latest_comments', array('comments' => $comments));\r
-\r
-       // Display through the correct canvas area\r
-       $body = elgg_view_layout("one_column_with_sidebar", $area1.$area2, $area3);\r
-                       \r
-// If we're not allowed to see the blog post\r
-} else {               \r
-       // Display the 'post not found' page instead\r
-       $body = elgg_view("blog/notfound");\r
-       $title = elgg_echo("blog:notfound");            \r
-}\r
-               \r
-// Display page\r
-page_draw($title,$body);\r
-               \r
-?>
\ No newline at end of file
diff --git a/mod/blog/savedraft.php b/mod/blog/savedraft.php
deleted file mode 100644 (file)
index 4533939..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php\r
-\r
-       /**\r
-        * Elgg blog autosaver\r
-        */\r
-\r
-       // Load engine\r
-               require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');\r
-               gatekeeper();\r
-               \r
-       // Get input data\r
-               $title = $_POST['blogtitle'];\r
-               $body = $_POST['blogbody'];\r
-               $tags = $_POST['blogtags'];\r
-       \r
-               $_SESSION['user']->blogtitle = $title;\r
-               $_SESSION['user']->blogbody = $body;\r
-               $_SESSION['user']->blogtags = $tags;\r
-               \r
-?>
\ No newline at end of file
diff --git a/mod/blog/shared.php b/mod/blog/shared.php
deleted file mode 100644 (file)
index 67dae20..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * Elgg blog shared page
- */
-
-// Load Elgg engine
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-               
-// Get the current page's owner
-$page_owner = page_owner_entity();
-if ($page_owner === false || is_null($page_owner)) {
-       $page_owner = $_SESSION['user'];
-       set_page_owner($_SESSION['guid']);
-}
-
-//get the shared access collection
-$sac = get_input('sac');
-
-//set breadcrumbs
-//$area1 = elgg_view('elggcampus_layout/breadcrumbs_general', array('object_type' => 'blog', 'context' => 'shared', 'sac' => $sac));
-
-//set blog header
-if(page_owner()== get_loggedin_user()->guid){
-       $area1 .= elgg_view('blog/blog_header', array('context' => "own", 'type' => 'blog'));
-}elseif($page_owner instanceof ElggGroup){
-       $area1 .= elgg_view('groups/blog_header_group');
-}else{
-       $area1 .= elgg_view('blog/blog_header_visit', array('type' => 'blog'));
-}
-               
-// Get a list of blog posts
-set_context('search');
-$get_blogs = list_entities_from_access_id($sac, "object", "blog", 0, 10, false, false,true);
-if($get_blogs != "")
-       $area2 = "<div id=\"blogs\">" . $get_blogs . "<div class='clearfloat'></div></div>";
-else
-       $area2 = "<div class=\"ContentWrapper\">There are no blog posts in this work group.</div>";
-set_context('blog');
-//if the logged in user is not looking at their stuff, display the ownerblock otherwise
-//show the users favourites
-if(page_owner()        != get_loggedin_user()->guid){
-       $area3 = elgg_view('blog/ownerblock');
-}else{ 
-       //a view for the favourites plugin to extend
-       $area3 .= elgg_view("blogs/favourite", array("object_type" => 'blog'));
-}
-//get the latest comments on user's blog posts
-$comments = get_annotations(0, "object", "blog", "generic_comment", "", 0, 4, 0, "desc",0,0,page_owner());
-$area3 .= elgg_view('page_elements/latest_comments', array('comments' => $comments));
-//a view for the favourites plugin to extend
-$area3 .= elgg_view("blogs/sidebar_options", array("object_type" => 'blog'));
-//display archive
-$area3 .= elgg_view("blog/archive");
-// Display them in the page
-$body = elgg_view_layout("one_column_with_sidebar", $area1.$area2, $area3);
-       
-// Display page
-page_draw(sprintf(elgg_echo('blog:workgroup'),$page_owner->name),$body);
\ No newline at end of file
index c2ccb190228905cc7b0cb3a74e061768b3eb84f5..bbae1eb6c87bc6984cb8901355ca7cf4ac01f1c0 100644 (file)
-<?php\r
-\r
-       /**\r
-        * Elgg blog plugin\r
-        **/\r
-\r
-               function blog_init() {\r
-                       \r
-                       // Load system configuration\r
-                               global $CONFIG;\r
-                               \r
-                       // Set up menu for logged in users\r
-                               if (isloggedin()) {\r
-                               \r
-                                       add_menu(elgg_echo('blog:yours'), $CONFIG->wwwroot . "pg/blog/" . $_SESSION['user']->username);\r
-                                       \r
-                       // And for logged out users\r
-                               } else {\r
-                                       add_menu(elgg_echo('blog'), $CONFIG->wwwroot . "mod/blog/everyone.php",array(\r
-                                       ));\r
-                               }\r
-                               \r
-                       // Extend system CSS with our own styles, which are defined in the blog/css view\r
-                               extend_view('css','blog/css');\r
-                               \r
-                       // Extend hover-over menu       \r
-                               extend_view('profile/menu/links','blog/menu');\r
-                               \r
-                       // Register a page handler, so we can have nice URLs\r
-                               register_page_handler('blog','blog_page_handler');\r
-                               \r
-                       // Register a URL handler for blog posts\r
-                               register_entity_url_handler('blog_url','object','blog');\r
-                               \r
-                       // Register this plugin's object for sending pingbacks\r
-                               register_plugin_hook('pingback:object:subtypes', 'object', 'blog_pingback_subtypes');\r
-\r
-                       // Register granular notification for this type\r
-                       if (is_callable('register_notification_object'))\r
-                               register_notification_object('object', 'blog', elgg_echo('blog:newpost'));\r
-\r
-                       // Listen to notification events and supply a more useful message\r
-                       register_plugin_hook('notify:entity:message', 'object', 'blog_notify_message');\r
-\r
-                       // Add a new blog widget\r
-                               add_widget_type('blog',elgg_echo("blog"),elgg_echo("blog:widget:description"),'profile, dashboard');\r
-                       \r
-                       // Listen for new pingbacks\r
-                               register_elgg_event_handler('create', 'object', 'blog_incoming_ping');\r
-                               \r
-                       // Register entity type\r
-                               register_entity_type('object','blog');\r
-                               \r
-                       // Register an annotation handler for comments etc\r
-                               register_plugin_hook('entity:annotate', 'object', 'blog_annotate_comments');\r
-                               \r
-                       // Add group menu option\r
-                               add_group_tool_option('blog',elgg_echo('blog:enableblog'),true);\r
-               }\r
-               \r
-               function blog_pagesetup() {\r
-                       \r
-                       global $CONFIG;\r
-\r
-                       //add submenu options\r
-                               if (get_context() == "blog") {\r
-                                       $page_owner = page_owner_entity();\r
-                                               \r
-                                       if ((page_owner() == $_SESSION['guid'] || !page_owner()) && isloggedin()) {\r
-                                               add_submenu_item(elgg_echo('blog:your'),$CONFIG->wwwroot."pg/blog/" . $_SESSION['user']->username);\r
-                                               add_submenu_item(elgg_echo('blog:friends'),$CONFIG->wwwroot."pg/blog/" . $_SESSION['user']->username . "/friends/");\r
-                                               add_submenu_item(elgg_echo('blog:everyone'),$CONFIG->wwwroot."mod/blog/everyone.php");\r
-                                               \r
-                                       } else if (page_owner()) {\r
-                                               add_submenu_item(sprintf(elgg_echo('blog:user'),$page_owner->name),$CONFIG->wwwroot."pg/blog/" . $page_owner->username);\r
-                                               if ($page_owner instanceof ElggUser) { // Sorry groups, this isn't for you.\r
-                                                       add_submenu_item(sprintf(elgg_echo('blog:user:friends'),$page_owner->name),$CONFIG->wwwroot."pg/blog/" . $page_owner->username . "/friends/");\r
-                                               }\r
-                                               add_submenu_item(elgg_echo('blog:everyone'),$CONFIG->wwwroot."mod/blog/everyone.php");\r
-                                       } else {\r
-                                               add_submenu_item(elgg_echo('blog:everyone'),$CONFIG->wwwroot."mod/blog/everyone.php");\r
-                                       }\r
-                                       \r
-                                       if (can_write_to_container(0, page_owner()) && isloggedin())\r
-                                               add_submenu_item(elgg_echo('blog:addpost'),$CONFIG->wwwroot."pg/blog/{$page_owner->username}/new/");\r
-                                               \r
-                                       if (!defined('everyoneblog') && page_owner()) {\r
-                                               \r
-                                               if ($dates = get_entity_dates('object','blog',page_owner())) {\r
-                                                       foreach($dates as $date) {\r
-                                                               $timestamplow = mktime(0,0,0,substr($date,4,2),1,substr($date,0,4));\r
-                                                               $timestamphigh = mktime(0,0,0,((int) substr($date,4,2)) + 1,1,substr($date,0,4));\r
-                                                               if (!isset($page_owner)) $page_owner = page_owner_entity();\r
-                                                               $link = $CONFIG->wwwroot . 'pg/blog/' . $page_owner->username . '/archive/' . $timestamplow . '/' . $timestamphigh;\r
-                                                               add_submenu_item(sprintf(elgg_echo('date:month:'.substr($date,4,2)),substr($date,0,4)),$link,'filter');\r
-                                                       }                                                               \r
-                                               }\r
-                                               \r
-                                       }\r
-                                       \r
-                               }\r
-                               \r
-                       // Group submenu\r
-                               $page_owner = page_owner_entity();\r
-                               \r
-                               if ($page_owner instanceof ElggGroup && get_context() == 'groups') {\r
-                               if($page_owner->blog_enable != "no"){\r
-                                           add_submenu_item(sprintf(elgg_echo("blog:group"),$page_owner->name), $CONFIG->wwwroot . "pg/blog/" . $page_owner->username );\r
-                                   }\r
-                               }\r
-               }\r
-               \r
-               /**\r
-                * Blog page handler; allows the use of fancy URLs\r
-                *\r
-                * @param array $page From the page_handler function\r
-                * @return true|false Depending on success\r
-                */\r
-               function blog_page_handler($page) {\r
-                       \r
-                       // The first component of a blog URL is the username\r
-                       if (isset($page[0])) {\r
-                               set_input('username',$page[0]);\r
-                       }\r
-                       \r
-                       // In case we have further input\r
-                       if (isset($page[2])) {\r
-                               set_input('param2',$page[2]);\r
-                       }\r
-                       // In case we have further input\r
-                       if (isset($page[3])) {\r
-                               set_input('param3',$page[3]);\r
-                       }\r
-                       \r
-                       // The second part dictates what we're doing\r
-                       if (isset($page[1])) {\r
-                               switch($page[1]) {\r
-                                       case "read":            set_input('blogpost',$page[2]);\r
-                                                                               include(dirname(__FILE__) . "/read.php"); return true;\r
-                                                                               break;\r
-                                       case "archive":         include(dirname(__FILE__) . "/archive.php"); return true;\r
-                                                                               break;\r
-                                       case "friends":         include(dirname(__FILE__) . "/friends.php"); return true;\r
-                                                                               break;\r
-                                       case "new":                     include(dirname(__FILE__) . "/add.php"); return true;\r
-                                                                               break;\r
-                                       \r
-                               }\r
-                       // If the URL is just 'blog/username', or just 'blog/', load the standard blog index\r
-                       } else {\r
-                               @include(dirname(__FILE__) . "/index.php");\r
-                               return true;\r
-                       }\r
-                       \r
-                       return false;\r
-                       \r
-               }\r
-               \r
-               /**\r
-                * Hook into the framework and provide comments on blog entities.\r
-                *\r
-                * @param unknown_type $hook\r
-                * @param unknown_type $entity_type\r
-                * @param unknown_type $returnvalue\r
-                * @param unknown_type $params\r
-                * @return unknown\r
-                */\r
-               function blog_annotate_comments($hook, $entity_type, $returnvalue, $params)\r
-               {\r
-                       $entity = $params['entity'];\r
-                       $full = $params['full'];\r
-                       \r
-                       if (\r
-                               ($entity instanceof ElggEntity) &&      // Is the right type \r
-                               ($entity->getSubtype() == 'blog') &&  // Is the right subtype\r
-                               ($entity->comments_on!='Off') && // Comments are enabled\r
-                               ($full) // This is the full view\r
-                       )\r
-                       {\r
-                               // Display comments\r
-                               return elgg_view_comments($entity);\r
-                       }\r
-                       \r
-               }\r
-               \r
-               /**\r
-                * Returns a more meaningful message\r
-                *\r
-                * @param unknown_type $hook\r
-                * @param unknown_type $entity_type\r
-                * @param unknown_type $returnvalue\r
-                * @param unknown_type $params\r
-                */\r
-               function blog_notify_message($hook, $entity_type, $returnvalue, $params)\r
-               {\r
-                       $entity = $params['entity'];\r
-                       $to_entity = $params['to_entity'];\r
-                       $method = $params['method'];\r
-                       if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'blog'))\r
-                       {\r
-                               $descr = $entity->description;\r
-                               $title = $entity->title;\r
-                               if ($method == 'sms') {\r
-                                       $owner = $entity->getOwnerEntity();\r
-                                       return $owner->username . ' via blog: ' . $title;\r
-                               }\r
-                               if ($method == 'email') {\r
-                                       $owner = $entity->getOwnerEntity();\r
-                                       return $owner->username . ' via blog: ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL();\r
-                               }\r
-                       }\r
-                       return null;\r
-               }\r
-\r
-\r
-               /**\r
-                * Populates the ->getUrl() method for blog objects\r
-                *\r
-                * @param ElggEntity $blogpost Blog post entity\r
-                * @return string Blog post URL\r
-                */\r
-               function blog_url($blogpost) {\r
-                       \r
-                       global $CONFIG;\r
-                       $title = $blogpost->title;\r
-                       $title = friendly_title($title);\r
-                       return $CONFIG->url . "pg/blog/" . $blogpost->getOwnerEntity()->username . "/read/" . $blogpost->getGUID() . "/" . $title;\r
-                       \r
-               }\r
-               \r
-               /**\r
-                * This function adds 'blog' to the list of objects which will be looked for pingback urls.\r
-                *\r
-                * @param unknown_type $hook\r
-                * @param unknown_type $entity_type\r
-                * @param unknown_type $returnvalue\r
-                * @param unknown_type $params\r
-                * @return unknown\r
-                */\r
-               function blog_pingback_subtypes($hook, $entity_type, $returnvalue, $params)\r
-               {\r
-                       $returnvalue[] = 'blog';\r
-                       \r
-                       return $returnvalue;\r
-               }\r
-               \r
-               /**\r
-                * Listen to incoming pings, this parses an incoming target url - sees if its for me, and then\r
-                * either passes it back or prevents it from being created and attaches it as an annotation to a given\r
-                *\r
-                * @param unknown_type $event\r
-                * @param unknown_type $object_type\r
-                * @param unknown_type $object\r
-                */\r
-               function blog_incoming_ping($event, $object_type, $object)\r
-               {\r
-                       // TODO: Get incoming ping object, see if its a ping on a blog and if so attach it as a comment\r
-               }\r
-               \r
-               /** \r
-                * remove the more link in the blog text\r
-                **/\r
-               function remove_more($body){\r
-                       $text = str_replace("{{more}}", " ", $body);\r
-                       return $text;\r
-               }\r
-\r
-       // Make sure the blog initialisation function is called on initialisation\r
-               register_elgg_event_handler('init','system','blog_init');\r
-               register_elgg_event_handler('pagesetup','system','blog_pagesetup');\r
-               \r
-       // Register actions\r
-               global $CONFIG;\r
-               register_action("blog/add",false,$CONFIG->pluginspath . "blog/actions/add.php");\r
-               register_action("blog/edit",false,$CONFIG->pluginspath . "blog/actions/edit.php");\r
-               register_action("blog/delete",false,$CONFIG->pluginspath . "blog/actions/delete.php");\r
-               \r
-?>
\ No newline at end of file
+<?php
+/**
+ * Blogs
+ *
+ * @package Blog
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.org/
+ *
+ * @todo
+ *
+ * Show all your drafts
+ * Show revision history
+ *
+ * Show your blog posts
+ * Show friends blog posts
+ *
+ * Group blogs
+ *     Forward to container instead of owner
+ *     GROUPS SUCK.
+ *
+ * Pingbacks
+ * Notifications
+ */
+
+/**
+ * Init blog plugin.
+ *
+ * @return TRUE
+ */
+function blog_init() {
+       global $CONFIG;
+       require_once dirname(__FILE__) . '/blog_lib.php';
+
+       // Set up menus
+       add_menu(elgg_echo('blog'), "{$CONFIG->wwwroot}pg/blog/", array());
+
+       extend_view('css', 'blog/css');
+
+       register_page_handler('blog', 'blog_page_handler');
+       register_page_handler('blog_ajax', 'blog_ajax_page_handler');
+
+       register_entity_url_handler('blog_url_handler', 'object', 'blog');
+
+       // notifications
+       register_notification_object('object', 'blog', elgg_echo('blog:newpost'));
+       register_plugin_hook('notify:entity:message', 'object', 'blog_notify_message');
+
+       // pingbacks
+       //register_elgg_event_handler('create', 'object', 'blog_incoming_ping');
+       //register_plugin_hook('pingback:object:subtypes', 'object', 'blog_pingback_subtypes');
+
+       // Register for search.
+       register_entity_type('object','blog');
+
+       //add_group_tool_option('blog', elgg_echo('blog:enableblog'), true);
+       add_widget_type('blog', elgg_echo('blog'), elgg_echo('blog:widget:description'), 'profile, dashboard');
+
+       $action_path = dirname(__FILE__) . '/actions/blog';
+
+       register_action('blog/save', FALSE, "$action_path/save.php");
+       register_action('blog/delete', FALSE, "$action_path/delete.php");
+}
+
+/**
+ * Dispatches blog pages.
+ * To maintain URL backward compatibility, expects old-style URLs like:
+ *     pg/blog/[username/[read|edit|archive|new/[time_start|guid/[time_end|title]]]]
+ *
+ * Without a username, show all blogs
+ * Without an action (read|edit|archive|new), forward to pg/blog/username/read.
+ * Without a guid, show all post for that user.
+ * Title is ignored
+ *
+ * If archive, uses time_start/end
+ *
+ * @todo There is no way to say "show me archive view for all blog posts" with the
+ * current URL scheme because $param[0] is the username instead of an action.
+ * Could do something hideous like make '*' mean "all users" (since a username can't be *).
+ * Can't change the URL scheme because of URL compatibility.
+ *
+ * @param array $page
+ * @return NULL
+ */
+function blog_page_handler($page) {
+       global $CONFIG;
+
+       elgg_push_breadcrumb(elgg_echo('blog:blogs'), "{$CONFIG->site->url}pg/blog");
+
+       // see if we're showing all or just a user's
+       if (isset($page[0]) && !empty($page[0])) {
+               $username = $page[0];
+
+               // forward away if invalid user.
+               if (!$user = get_user_by_username($username)) {
+                       register_error('blog:error:unknown_username');
+                       forward($_SERVER['HTTP_REFERER']);
+               }
+
+               set_page_owner($user->getGUID());
+               $crumbs_title = sprintf(elgg_echo('blog:owned_blogs'), $user->name);
+               $crumbs_url = "{$CONFIG->site->url}pg/blog/$username/read";
+               elgg_push_breadcrumb($crumbs_title, $crumbs_url);
+
+               $action = isset($page[1]) ? $page[1] : FALSE;
+               // yeah these are crap names, but they're used for different things.
+               $page2 = isset($page[2]) ? $page[2] : FALSE;
+               $page3 = isset($page[3]) ? $page[3] : FALSE;
+
+               switch ($action) {
+                       case 'read':
+                               $title = sprintf(elgg_echo('blog:title:user_blogs'), $user->name);
+                               $content = elgg_view('page_elements/content_header', array('context' => $content, 'type' => 'blog'));
+                               $content .= blog_get_page_content_read($user->getGUID(), $page2);
+                               break;
+
+                       case 'new':
+                       case 'edit':
+                               $content = blog_get_page_content_edit($page2);
+                               break;
+
+                       case 'archives':
+                               $content = elgg_view('page_elements/content_header', array('context' => $content, 'type' => 'blog'));
+                               $content .= blog_get_page_content_archive($user->getGUID(), $page2, $page3);
+                               break;
+
+                       case 'friends':
+                               $content = elgg_view('page_elements/content_header', array('context' => $content, 'type' => 'blog'));
+                               $content .= blog_get_page_content_archive($user->getGUID());
+                               break;
+
+                       default:
+                               forward("pg/blog/{$username}/read/");
+                               break;
+               }
+       } else {
+               $title = elgg_echo('blog:title:all_blogs');
+               $content = elgg_view('page_elements/content_header', array('context' => $content, 'type' => 'blog'));
+               $content .= elgg_list_entities_from_metadata(array(
+                       'type' => 'object',
+                       'subtype' => 'blog',
+                       'full_view' => FALSE,
+                       'metadata_name_value_pair' => array('name' => 'status', 'value' => 'final')
+               ));
+       }
+
+       $sidebar = elgg_view('blog/sidebar_menu');
+       $content = elgg_view('navigation/breadcrumbs') . $content;
+
+       $body = elgg_view_layout('one_column_with_sidebar', $content, $sidebar);
+
+       page_draw($title, $body);
+}
+
+/**
+ * Handles ajax calls for blog.
+ *
+ * @param array $page
+ */
+function blog_ajax_page_handler($page) {
+       $action = isset($page[0]) ? $page[0] : FALSE;
+
+       var_dump($page);
+
+       switch ($action) {
+               case 'save_draft':
+                       // @todo recycle the save action
+                       $values = array(
+                               'title' => '',
+                               'description' => '',
+                               'status' => 'draft',
+                               'access_id' => ACCESS_DEFAULT,
+                               'comments_on' => 'On',
+                               'excerpt' => '',
+                               'tags' => '',
+                               'container_guid' => '',
+                               'guid' => ''
+                       );
+
+                       foreach ($values as $name => $default) {
+                               $values[$name] = get_input($name, $default);
+                       }
+
+
+
+                       /*
+                       If a title and body, create a blog post marked as a draft and update the
+                       GUID
+                       */
+                       break;
+
+               default:
+                       $content = 0;
+                       break;
+       }
+
+       exit;
+}
+
+
+/**
+ * Format and return the correct URL for blogs.
+ *
+ * @param ElggObject $entity
+ * @return string URL of blog.
+ */
+function blog_url_handler($entity) {
+       global $CONFIG;
+
+       if (!$user = get_entity($entity->owner_guid)) {
+               // default to a standard view if no owner.
+               return FALSE;
+       }
+
+       $friendly_title = friendly_title($entity->title);
+
+       $url = "{$CONFIG->site->url}pg/blog/{$user->username}/read/{$entity->getGUID()}/$friendly_title";
+       return $url;
+}
+
+
+register_elgg_event_handler('init', 'system', 'blog_init');
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/archive.php b/mod/blog/views/default/blog/archive.php
deleted file mode 100644 (file)
index 76ae166..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-//get blog archives
-global $CONFIG;
-if (!defined('everyoneblog') && page_owner()) {
-       echo "<div class='SidebarBox'>";
-       echo "<h3>" . elgg_echo('blog:archive') ."</h3>";
-       echo "<div class='ContentWrapper'><div id='Owner_Block_Links'><ul>";
-       if ($dates = get_entity_dates('object','blog',page_owner())) {
-               foreach($dates as $date) {
-                       $timestamplow = mktime(0,0,0,substr($date,4,2),1,substr($date,0,4));
-                       $timestamphigh = mktime(0,0,0,((int) substr($date,4,2)) + 1,1,substr($date,0,4));
-                       if (!isset($page_owner)) $page_owner = page_owner_entity();
-                       $link = $CONFIG->wwwroot . 'pg/blog/' . $page_owner->username . '/archive/' . $timestamplow . '/' . $timestamphigh;
-                       //echo (sprintf(elgg_echo('date:month:'.substr($date,4,2)),substr($date,0,4)),$link,'filter');
-                       $year = substr($date,0,-2);
-                       $month = date('F',mktime(0, 0, 0, substr($date,4,2), 1)); //substr($date,4,2);
-                       $display_date = $month . " " . $year;   
-                       echo "<li><a href=\"{$link}\">" . $display_date . "</a></li>";
-               }                                                               
-       }
-       echo "</ul></div></div></div>";
-}
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/categorylist.php b/mod/blog/views/default/blog/categorylist.php
deleted file mode 100644 (file)
index 799c837..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php\r
-       $list = elgg_view('categories/list',$vars);\r
-       if (!empty($list)) {\r
-?>\r
-\r
-       <div class="blog_categories">\r
-               <?php echo $list; ?>\r
-       </div>\r
-\r
-<?php\r
-\r
-       }\r
-\r
-?>
\ No newline at end of file
index 361e1572cd65589831aad16729e7ef1368996be7..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -1,269 +0,0 @@
-<?php
-
-       /**
-        * Elgg blog css
-        * 
-        */
-
-?>
-#blogs .pagination {
-/*
-       margin:5px 10px 0 10px;
-       padding:5px;
-       display:block;
-*/
-}
-
-.singleview {
-       /* margin-top:10px !important; */
-}
-
-/*
-we're partly using the #NewListStyle on blogs
-ItemMetaData block only
-*/ 
-#blogs .ContentWrapper.Welcome {
-       padding:10px 0 10px 0;
-}
-#blogs .search_listing .search_listing_info .ItemMetaData {
-       float:right;
-       margin-left:15px;
-       margin-top:0;
-       margin-right: 3px;
-       color:#AAAAAA;
-       text-align: right;
-       font-size:90%;
-}
-#blogs .search_listing .search_listing_info .ItemMetaData table {
-       width:200px;
-       /* float:right; removed for ie7 compatability */
-}
-#blogs .search_listing .search_listing_info .ItemMetaData .EditItem a {
-       color:#AAAAAA;
-       margin:0 0 0 10px;
-}
-#blogs .search_listing .search_listing_info .ItemMetaData .EditItem a:hover {
-       color: #0054a7;
-       text-decoration: underline;
-}
-
-#blogs .search_listing .search_listing_info .ItemMetaData td.FavouriteItem {
-       padding-top:0;
-}
-/* IE7 */
-*:first-child+html #blogs .search_listing .search_listing_info .ItemMetaData td.FavouriteItem { width:auto; }
-
-
-/* BLOG TITLE IN LIST VIEWS */
-#blogs h2.blog_title {
-       line-height:1.1em;
-       margin-top:0;
-       font-size:1.4em;
-}
-#blogs h2.blog_title a {
-       color:#0054A7;
-}
-#blogs .search_listing_info p.blog_excerpt {
-       margin-top:3px;
-       padding-top:2px;
-       border-top:1px solid #cccccc;
-}
-#blogs .search_listing_info p.owner_timestamp {
-       margin-top:2px;
-}
-
-.Page_Header_Options .cancel_button {
-       float:right;
-       margin:0 10px 0 0;
-}
-
-.blog_post_icon {
-       float:left;
-       margin:0 0 0 0;
-       padding:0;
-}
-#blogs .search_listing_info {
-       margin-left:34px;
-}
-
-.blog_post #content_area_user_title {
-       
-}
-.blog_post #content_area_user_title h2 {
-       margin:0 0 5px;
-       padding:0 0 5px;
-       border-bottom:1px solid #cccccc;
-}
-.blog_post .strapline {
-       margin: 0 0 0 30px;
-       padding:0;
-       color: #aaa;
-       line-height:0.8em;
-}
-.blog_post .strapline .generic_access,
-.blog_post .strapline .shared_collection,
-.blog_post .strapline .group_open,
-.blog_post .strapline .group_closed {
-       line-height:1.4em;
-       display:block;
-}
-.blog_post p.tags {
-       background:transparent url(<?php echo $vars['url']; ?>_graphics/icon_tag.png) no-repeat scroll left 2px;
-       margin:0;
-       padding:0 0 0 16px;
-       min-height:22px;
-}
-.blog_post .options {
-       margin:0;
-       padding:0;
-}
-.blog_post_body {
-       margin-top:2px;
-       padding-top:8px;
-       border-top:1px solid #cccccc;
-}
-.blog_post_body img[align="left"] {
-       margin: 10px 10px 10px 0;
-       float:left;
-}
-.blog_post_body img[align="right"] {
-       margin: 10px 0 10px 10px;
-       float:right;
-}
-.blog_post_body img {
-       margin: 10px !important;
-}
-
-.blog-comments h3 {
-       font-size: 150%;
-       margin-bottom: 10px;
-}
-.blog-comment {
-       margin-top: 10px;
-       margin-bottom:20px;
-       border-bottom: 1px solid #aaaaaa;
-}
-.blog-comment img {
-       float:left;
-       margin: 0 10px 0 0;
-}
-.blog-comment-menu {
-       margin:0;
-}
-.blog-comment-byline {
-       background: #dddddd;
-       height:22px;
-       padding-top:3px;
-       margin:0;
-}
-.blog-comment-text {
-       margin:5px 0 5px 0;
-}
-
-
-
-
-/* unsaved blog post preview */
-.blog_previewpane {
-    border:1px solid #D3322A;
-    background:#F7DAD8;
-       padding:10px;
-       margin:10px;
-       -webkit-border-radius: 8px; 
-       -moz-border-radius: 8px;        
-}
-.blog_previewpane p {
-       margin:0;
-}
-
-#blog_edit_page .publish_controls,
-#blog_edit_page .blog_access,
-#blog_edit_page .publish_options,
-#blog_edit_page .publish_blog,
-#blog_edit_page .allow_comments,
-#blog_edit_page .categories {
-       margin:0 5px 5px 5px;
-       border-top:1px solid #cccccc;
-}
-#blog_edit_page ul {
-       padding-left:0px;
-       margin:5px 0 5px 0;
-       list-style: none;
-}
-#blog_edit_page p {
-       margin:5px 0 5px 0;
-}
-#blog_edit_page .publish_blog input[type="submit"] {
-       font-weight: bold;
-       padding:2px;
-       height:auto;
-}
-#blog_edit_page .preview_button a {
-       font: 12px/100% Arial, Helvetica, sans-serif;
-       font-weight: bold;
-       background:white;
-       border: 1px solid #cccccc;
-       color:#999999;
-       -webkit-border-radius: 4px; 
-       -moz-border-radius: 4px;
-       width: auto;
-       height: auto;
-       padding: 3px;
-       margin:1px 1px 5px 10px;
-       cursor: pointer;
-       float:right;
-}
-#blog_edit_page .preview_button a:hover {
-       background:#4690D6;
-       color:white;
-       text-decoration: none;
-       border: 1px solid #4690D6;
-}
-#blog_edit_page .allow_comments label {
-       font-size: 100%;
-}
-
-
-/* blog edit page */
-#blogPostForm .ContentWrapper {
-       margin-top:10px;
-}
-#blogPostForm .ContentWrapper #excerpt_editarea {
-       margin-top:15px;
-       margin-bottom:15px;
-}
-#excerpt_editarea .input_textarea {
-       height:80px;
-}
-#blogPostForm .current_access {
-       color:inherit;
-       font-size:inherit;
-       line-height:1.0em;
-       padding-top:0;
-}
-
-/* blog widget on groups */
-.collapsable_box_content .ContentWrapper.blogs.more {
-       margin:0 10px;
-       padding:5px 10px;
-}
-.collapsable_box_content .ContentWrapper.blogs {
-       line-height:1.2em;
-       margin-bottom:5px;
-}
-.collapsable_box_content .ContentWrapper.blogs .river_object_blog_create {
-       background-position:left 2px;
-       min-height:17px;
-       padding:2px 0 2px 19px;
-       border-bottom:1px solid #DDDDDD;
-       line-height:1.1em;
-}
-.collapsable_box_content .ContentWrapper.blogs .river_object_blog_create:first-child {
-       border-top:1px solid #DDDDDD;
-}
-.collapsable_box_content .ContentWrapper.blogs .river_object_blog_create span {
-       font-size: 90%;
-       color:#666666;
-}
-
-
index 28a0980a4ffc5569b7388150a1d064bf6205c88d..3c9912daaf51dfb43b68fbd60a27643e7cc0add5 100644 (file)
-<script>
-$(document).ready(function(){
-       $('#excerpt.excerpt').each(function(){
-               var allowed = 200;
-       
-               // set the initial value
-               $('#countervalue').text(allowed);
-               
-               // bind on key up event
-               $(this).keyup(function(){
-                       var counter_value = ((allowed - ($(this).val().length)));
-                       
-                       $("#countervalue").removeClass();
-                       
-                       if ((counter_value > 10)) {
-                               $("#countervalue").addClass("positive");
-                       }
-                       else if ((counter_value <= 10) && (counter_value >= 0)) {
-                               $("#countervalue").addClass("gettingclose");
-                       }
-                       else if ((counter_value < 0)) {
-                               $("#countervalue").addClass("negative");
-                       }
-               
-                       // insert new length
-                       $('#countervalue').text(counter_value);
-                                               
-               });
-       });
-});
-</script>
 <?php
 /**
-* Elgg blog edit/add page
-*/
-
-//access details
-$loggedin_user_access = get_default_access(get_loggedin_user());
-$user_acl = get_readable_access_level($loggedin_user_access);
-
-//Populate the title, body and acction variables if it is an edit, declare them if it is a new post
-if (isset($vars['entity'])) {
-       $title = sprintf(elgg_echo("blog:editpost"),$object->title);
-       $action = "blog/edit";
-       $title = $vars['entity']->title;
-       $body = $vars['entity']->description;
-       $tags = $vars['entity']->tags;
-       if ($vars['entity']->comments_on == 'Off')
-               $comments_on = false;
-       else
-               $comments_on = true;
-       $access_id = $vars['entity']->access_id;
-       $show_excerpt = $vars['entity']->show_excerpt;
-       if($show_excerpt)
-               $excerpt = $vars['entity']->excerpt;
-       else
-               $excerpt = "";
-       $page_title =  elgg_view_title(elgg_echo('blog:editpost'));
-}else{
-       $title = elgg_echo("blog:addpost");
-       $action = "blog/add";
-       $tags = "";
-       $title = "";
-       $comments_on = true;
-       $description = "";
-       $excerpt = "";
-       $show_excerpt = '';
-       $page_title =  elgg_view_title(elgg_echo('blog:addpost'));
-       if(page_owner_entity() instanceof ElggGroup){
-               //if in a group, set the access level to default to the group
-               $access_id = page_owner_entity()->group_acl;
-       }else{
-               $access_id = $loggedin_user_access;
-       }               
-       $container = $vars['container_guid'] ? elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => $vars['container_guid'])) : "";
-}
+ * Edit blog form
+ *
+ * @package Blog
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.org/
+ */
+
+$values = array(
+       'title' => NULL,
+       'description' => NULL,
+       'status' => 'final',
+       //'publish_date' => NULL,
+       'access_id' => ACCESS_DEFAULT,
+       'comments_on' => 'On',
+       'excerpt' => NULL,
+       'tags' => NULL,
+       'container_guid' => NULL,
+       'guid' => NULL
+);
+
+$forward = $_SERVER['HTTP_REFERER'];
+
+$action_buttons = '';
+$guid_input = '';
 
-//Just in case we have some cached details
-if (empty($body)) {
-       $body = $vars['user']->blogbody;
-       if (!empty($body)) {
-               $title = $vars['user']->blogtitle;
-               $tags = $vars['user']->blogtags;
+// if entity is set, we're editing.
+if (isset ($vars['entity'])) {
+       $blog = $vars['entity'];
+
+       if ($blog && ($blog instanceof ElggObject) && ($blog->getSubtype() == 'blog')) {
+               foreach (array_keys($values) as $field) {
+                       $values[$field] = $blog->$field;
+               }
+       } else {
+               echo elgg_echo('blog:error:post_not_found');
+               return FALSE;
        }
+
+       // add a delete button if editing
+       $delete_url = "{$vars['url']}action/blog/delete?guid={$blog->getGUID()}";
+       $delete_link = elgg_view('output/confirmlink', array(
+               'href' => $delete_url,
+               'text' => elgg_echo('delete'),
+               'class' => 'action_button'
+       ));
+
+       $action_buttons = $delete_link;
+
+       $guid_input = elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $values['guid']));
 }
 
-//set the required input fields
-$title_label = elgg_echo('blog:title');
-$title_textbox = elgg_view('input/text', array('internalname' => 'blogtitle', 'value' => $title));
-$text_label = elgg_echo('blog:text');
-$text_textarea = elgg_view('input/longtext', array('internalname' => 'blogbody', 'value' => $body));
+$save_button = elgg_view('input/submit', array('value' => elgg_echo('save'), 'class' => 'action_button'));
+$action_buttons .= $save_button;
+
+$title_label = elgg_echo('title');
+$title_input = elgg_view('input/text', array(
+       'internalname' => 'title',
+       'internalid' => 'blog_title',
+       'value' => $values['title']
+));
+
 $excerpt_label = elgg_echo('blog:excerpt');
-$excerpt_counter = "<div class='thewire_characters_remaining'><span id='countervalue'></span></div>";
-$excerpt_textarea = elgg_view('input/text', array('internalname' => 'blogexcerpt', 'internalid' => 'excerpt', 'class' => 'excerpt input_textarea', 'value' => $excerpt));
-$excerpt_desc = elgg_echo('blog:excerptdesc');
-$show_excerpt_field = elgg_view('input/hidden', array('internalname' => 'show_excerpt', 'value' => $show_excerpt));
-$tag_label = elgg_echo('tags');
-$tag_input = elgg_view('input/tags', array('internalname' => 'blogtags', 'value' => $tags));
+$excerpt_input = elgg_view('input/text', array(
+       'internalname' => 'excerpt',
+       'internalid' => 'blog_excerpt',
+       'value' => $values['excerpt']
+));
+
+$body_label = elgg_echo('blog:body');
+$body_input = elgg_view('input/longtext', array(
+       'internalname' => 'description',
+       'internalid' => 'blog_description',
+       'value' => $values['description']
+));
+
+$save_status = elgg_echo('blog:save_status');
+$never = elgg_echo('never');
+
+$status_label = elgg_echo('blog:status');
+$status_input = elgg_view('input/pulldown', array(
+       'internalname' => 'status',
+       'internalid' => 'blog_status',
+       'value' => $values['status'],
+       'options_values' => array(
+               'draft' => elgg_echo('blog:draft'),
+               'final' => elgg_echo('blog:final')
+       )
+));
+
+$comments_label = elgg_echo('comments');
+$comments_input = elgg_view('input/pulldown', array(
+       'internalname' => 'comments_on',
+       'internalid' => 'blog_comments_on',
+       'value' => $values['comments_on'],
+       'options_values' => array('On' => elgg_echo('on'), 'Off' => elgg_echo('off'))
+));
+
+$tags_label = elgg_echo('tags');
+$tags_input = elgg_view('input/tags', array(
+       'internalname' => 'tags',
+       'internalid' => 'blog_tags',
+       'value' => $values['tags']
+));
+
 $access_label = elgg_echo('access');
-if($comments_on)
-       $comments_on_switch = "checked=\"checked\"";
-else
-       $comment_on_switch = "";
-//if it is a group, pull out the group access view
-if(page_owner_entity() instanceof ElggGroup){
-       $options = group_access_options(page_owner_entity());
-}else{
-       $options = '';
-} 
-$access_input = elgg_view('input/access', array('internalname' => 'access_id', 'value' => $access_id, 'options' => $options));
-$submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('publish')));
-$conversation = elgg_echo('Conversation');
-$publish = elgg_echo('publish');
-$cat = elgg_echo('categories');
-$preview = elgg_echo('blog:preview');
-$privacy = elgg_echo('access');
-$savedraft = elgg_echo('blog:draft:save');
-$draftsaved = elgg_echo('blog:draft:saved');
-$never = elgg_echo('blog:never');
-$allowcomments = elgg_echo('blog:comments:allow');
-$user_default_access = elgg_echo('blog:defaultaccess');
-$ownerblock = elgg_view('blog/ownerblock', array('entity' => $vars['entity']));
-if($vars['entity']){
-       $deletepage = elgg_view('output/confirmlink',array(     
-                               'href' => $vars['url'] . "action/blog/delete?blogpost=" . $vars['entity']->getGUID(),
-                               'text' => elgg_echo("delete"),
-                               'confirm' => elgg_echo("blog:delete:confirm"),
-                               'class' => "Action_Button Disabled")); 
-}else{
-       $deletepage = "";
-}
+$access_input = elgg_view('input/access', array(
+       'internalname' => 'access_id',
+       'internalid' => 'blog_access_id',
+       'value' => $values['access_id']
+));
 
-//INSERT EXTRAS HERE
-$extras = elgg_view('categories',$vars);
-if (!empty($extras)) $extras = '<div class="SidebarBox">' .$cat .'<div class="ContentWrapper">'. $extras . '</div></div>';
-                 
-?>
+$publish_date_label = elgg_echo('blog:publish_date');
+$publish_date_input = elgg_view('input/datepicker', array(
+       'internalname' => 'publish_date',
+       'internalid' => 'blog_publish_date',
+       'value' => $vars['publish_date']
+));
+
+// hidden inputs
+//$container_guid_input = elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => $values['container_guid']));
+$forward_input = elgg_view('input/hidden', array('internalname' => 'forward', 'value' => $forward));
+
+$form_body = <<<___END
+<p>
+       <label for="blog_title">$title_label</label>
+       $title_input
+</p>
+
+<p>
+       <label for="blog_excerpt">$excerpt_label</label>
+$excerpt_input
+</p>
+
+<p>
+       <label for="blog_description">$body_label</label>
+       $body_input
+</p>
+
+<p id="blog_save_status">
+       $save_status:<span id="blog_save_status_time">$never</span>
+</p>
+
+<p>
+       <label for="blog_publish_date">$publish_date_label</label>
+       $publish_date_input
+</p>
+
+
+<p>
+       <label for="blog_tags">$tags_label</label>
+       $tags_input
+</p>
+
+<p>
+       <label for="blog_comments_on">$comments_label</label>
+       $comments_input
+</p>
+
+<p>
+       <label for="blog_access_id">$access_label</label>
+       $access_input
+</p>
+
+
+
+<p>
+       <label for="blog_status">$status_label</label>
+       $status_input
+</p>
+
+$guid_input
+$container_guid_input
+$forward_input
+
+$action_buttons
+
+<span>
+
+___END;
+
+echo elgg_view('input/form', array(
+       'internalname' => 'blog_post',
+       'action' => "{$vars['url']}action/blog/save",
+       'body' => $form_body
+));
 
-<?php
-//construct the form
-$form_body = <<<EOT
-<div id="LayoutCanvas_2ColumnRHS_Sidebar">
-       {$ownerblock}
-       <div class="SidebarBox">
-                       <h3>{$publish}</h3>
-
-               <div class="ContentWrapper">
-
-                       <div class="blog_access">
-                               <p>{$privacy}: {$access_input}</p>
-                       </div>
-                       <div class="current_access">{$user_default_access}<br /><b>{$user_acl}</b></span></div>
-               </div>
-               
-               <div class="ContentWrapper">
-                       <div class="allow_comments">
-                                       <label><input type="checkbox" name="comments_select"  {$comments_on_switch} /> {$allowcomments}</label>
-                       </div>
-               </div>
-                       
-               <div class="ContentWrapper">
-
-                       <div class="publish_blog">
-                               <div class="publish_controls">
-                                       {$draftsaved}: <span id="draftSavedCounter">{$never}</span>
-                                       <a href="#" onclick="javascript:saveDraft(false);return false;">{$savedraft}</a>
-                               </div>
-
-                               {$submit_input}
-                       </div>
-               </div>
-       </div>
-
-       {$extras}
-       {$container}
-</div>
-
-<!-- main content -->
-<div id="LayoutCanvas_2ColumnRHS_MainArea">
-
-
-<div id="Page_Header">
-       <div class="Page_Header_Title">
-               {$page_title}
-       </div>
-
-       <div class="Page_Header_Options">
-
-       <a class="Action_Button" onclick="javascript:saveDraft(true);return true;">{$preview}</a>
-       {$deletepage}
-       </div><div class='clearfloat'></div>
-</div>
-
-
-
-
-<div class="ContentWrapper">
-EOT;
-
-if (isset($vars['entity']))
-       $entity_hidden = elgg_view('input/hidden', array('internalname' => 'blogpost', 'value' => $vars['entity']->getGUID()));
-else
-       $entity_hidden = '';
-
-$form_body .= <<<EOT
-       <p><label>$title_label</label><br />$title_textbox</p>
-       <p class='longtext_editarea'>
-            $text_textarea
-       </p>
-       <div id='excerpt_editarea'>
-                       <label>$excerpt_label</label><br />$excerpt_desc $excerpt_counter<br />
-            $excerpt_textarea        
-       </div>
-       <p><label>$tag_label</label><br />$tag_input</p>
-       <p>$entity_hidden</p>
-       $show_excerpt_field
-</div>
-</div>
-<div class="clearfloat"></div>
-EOT;
-
-//display the form
-echo elgg_view('input/form', array('action' => "{$vars['url']}action/$action", 'body' => $form_body, 'internalid' => 'blogPostForm'));
 ?>
 
 <script type="text/javascript">
-       setInterval( "saveDraft(false)", 120000);
-       function saveDraft(preview) {
-               temppreview = preview;
+       setInterval("blogSaveDraft()", 60000);
+
+       /*
+        * Attempt to save and update the input with the guid.
+        */
+       function blogSaveDraftCallback(data, textStatus, XHR) {
+               if (textStatus == 'success' && data.success == true) {
+                       var form = $('form[name=blog_post]');
+                       form.append('<input type="hidden" name="guid" value="' + data.guid + '" />');
 
-               if (typeof(tinyMCE) != 'undefined') {
-                       tinyMCE.triggerSave();
-               }
-               
-               var drafturl = "<?php echo $vars['url']; ?>mod/blog/savedraft.php";
-               var temptitle = $("input[name='blogtitle']").val();
-               var tempbody = $("textarea[name='blogbody']").val();
-               var temptags = $("input[name='blogtags']").val();
-               
-               var postdata = { blogtitle: temptitle, blogbody: tempbody, blogtags: temptags };
-               
-               $.post(drafturl, postdata, function() {
                        var d = new Date();
                        var mins = d.getMinutes() + '';
                        if (mins.length == 1) mins = '0' + mins;
-                       $("span#draftSavedCounter").html(d.getHours() + ":" + mins);
-                       if (temppreview == true) {
-                               $("form#blogPostForm").attr("action","<?php echo $vars['url']; ?>mod/blog/preview.php");
-                               $("input[name='submit']").click();
-                               //$("form#blogPostForm").submit();
-                               //document.blogPostForm.submit();
+                       $("#blog_save_status_time").html(d.getHours() + ":" + mins);
+
+               } else {
+                       $("#blog_save_status_time").html("<?php echo elgg_echo('error'); ?>");
+               }
+       }
+
+       function blogSaveDraft() {
+               if (typeof(tinyMCE) != 'undefined') {
+                       tinyMCE.triggerSave();
+               }
+
+               // only save when content exists
+               var form = $('form[name=blog_post]');
+               var title = form.children('input[name=title]').val();
+               var description = form.children('textarea[name=description]').val();
+
+               if (!(title && description)) {
+                       return false;
+               }
+
+               var draftURL = "<?php echo $vars['url']; ?>action/blog/save?ajax=1";
+               var postData = form.serializeArray();
+
+               // force draft status
+               $(postData).each(function(i, e) {
+                       if (e.name == 'status') {
+                               e.value = 'draft';
                        }
                });
-                               
+
+               $.post(draftURL, postData, blogSaveDraftCallback, 'json');
+
        }
-       
-</script>
+
+       $(document).ready(function(){
+               $('#excerpt.excerpt').each(function(){
+                       var allowed = 200;
+
+                       // set the initial value
+                       $('#countervalue').text(allowed);
+
+                       // bind on key up event
+                       $(this).keyup(function(){
+                               var counter_value = ((allowed - ($(this).val().length)));
+
+                               $("#countervalue").removeClass();
+
+                               if ((counter_value > 10)) {
+                                       $("#countervalue").addClass("positive");
+                               }
+                               else if ((counter_value <= 10) && (counter_value >= 0)) {
+                                       $("#countervalue").addClass("gettingclose");
+                               }
+                               else if ((counter_value < 0)) {
+                                       $("#countervalue").addClass("negative");
+                               }
+
+                               // insert new length
+                               $('#countervalue').text(counter_value);
+
+                       });
+               });
+       });
+
+</script>
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/gallery.php b/mod/blog/views/default/blog/gallery.php
deleted file mode 100644 (file)
index 7fa0504..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php\r
-\r
-/**\r
- * Elgg blog listing\r
- */\r
-$owner = $vars['entity']->getOwnerEntity();\r
-$friendlytime = friendly_time($vars['entity']->time_created);\r
-$icon = elgg_view(\r
-                       "profile/icon", array(\r
-                                                                       'entity' => $owner,\r
-                                                                       'size' => 'small',\r
-                                                                 )\r
-               );\r
-$info = "<p>" . elgg_echo('blog') . ": <a href=\"{$vars['entity']->getURL()}\">{$vars['entity']->title}</a></p>";\r
-$info .= "<p><a href=\"{$owner->getURL()}\">{$owner->name}</a> {$friendlytime}</p>";\r
-\r
-//display\r
-echo "<div class=\"blog_gallery\">";\r
-echo "<div class=\"blog_gallery_icon\">" . $icon . "</div>";\r
-echo "<div class=\"blog_gallery_content\">" . $info . "</div>";\r
-echo "</div>";
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/listing.php b/mod/blog/views/default/blog/listing.php
deleted file mode 100644 (file)
index 7aae87b..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * Elgg blog listing
- */
-
-$owner = $vars['entity']->getOwnerEntity();
-$friendlytime = sprintf(elgg_echo("blog:strapline"),
-                                                                       date("F j, Y",$vars['entity']->time_created)
-                                       );
-$tags = elgg_view('output/tags', array('tags' => $vars['entity']->tags));
-$num_comments = elgg_count_comments($vars['entity']);
-$icon = elgg_view(
-               "profile/icon", array(
-                                                               'entity' => $owner,
-                                                               'size' => 'tiny',
-                                                         )
-       );
-//sort out the access level for display
-$object_acl = get_readable_access_level($vars['entity']->access_id);
-//files with these access level don't need an icon
-$general_access = array('Public', 'Logged in users', 'Friends');
-//set the right class for access level display - need it to set on groups and shared access only
-$check_is_group = get_entity($vars['entity']->container_guid);
-if($check_is_group instanceof ElggGroup){
-       //get the membership type open/closed
-       $membership = $check_is_group->membership;
-       //we decided to show that the item is in a group, rather than its actual access level
-       $object_acl = "Group: " . $is_group->name;
-       if($membership == 2)
-               $access_level = "class='group_open'";
-       else
-               $access_level = "class='group_closed'";
-}elseif($object_acl == 'Private'){
-               $access_level = "class='private'";
-}else{
-       if(!in_array($object_acl, $general_access))
-               $access_level = "class='shared_collection'";
-       else
-               $access_level = "class='generic_access'";
-}
-//display the access level
-       $info = "<div class='ItemMetaData'><table><tr>";
-
-       //$table_column_number = "";
-//include edit and delete options
-if ($vars['entity']->canEdit()) {
-       $info .= "<td class='EditItem'><span class='EditItem'><a href=\"{$vars['url']}mod/blog/edit.php?blogpost={$vars['entity']->getGUID()}\">" . elgg_echo('edit') . "</a></span></td>";
-       $info .= "<td class='DeleteItem'><div class='Delete_Button'>" . elgg_view('output/confirmlink',array('href' => $vars['url'] . "action/blog/delete?blogpost=" . $vars['entity']->getGUID(), 'text' => elgg_echo("delete"),'confirm' => elgg_echo("file:delete:confirm"),)). "</div></td>";  
-       //$table_column_number = " colspan='3' ";
-}
-
-       $info .= "<td class='FavouriteItem'>" . elgg_view("blogs/options",array('entity' => $vars['entity'])) ."</td>";
-
-$info .= "</tr></table><div><span {$access_level}>" . $object_acl . "</span></div></div>";
-
-
-$info .= "<h2 class='blog_title'><a href=\"{$vars['entity']->getURL()}\">{$vars['entity']->title}</a></h2>";
-$info .= "<p class='owner_timestamp'><a href=\"{$vars['url']}pg/blog/{$owner->username}\">{$owner->name}</a> {$friendlytime}, ";
-$info .= "<a href='{$vars['entity']->getURL()}'>" . sprintf(elgg_echo("comments")) . " (" . $num_comments . ")</a></p>";
-$info .= "<p class='blog_excerpt'>" . display_objects(strip_tags($vars['entity']->excerpt)) . "</p>";
-
-echo elgg_view_listing($icon,$info);
-
diff --git a/mod/blog/views/default/blog/menu.php b/mod/blog/views/default/blog/menu.php
deleted file mode 100644 (file)
index 15e6706..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php\r
-/**\r
- * Elgg hoverover extender for blog\r
- */\r
-?>\r
-\r
-       <li class="user_menu_blog">\r
-               <a href="<?php echo $vars['url']; ?>pg/blog/<?php echo $vars['entity']->username; ?>"><?php echo elgg_echo("blog"); ?></a>      \r
-       </li>
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/notfound.php b/mod/blog/views/default/blog/notfound.php
deleted file mode 100644 (file)
index 2ef231b..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php\r
-/**\r
- * Elgg blog not found page\r
- */\r
-?>\r
-\r
-       <p>\r
-               <?php\r
-\r
-                       echo elgg_echo("blog:notfound");\r
-               \r
-               ?>\r
-       </p>
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/previewpane.php b/mod/blog/views/default/blog/previewpane.php
deleted file mode 100644 (file)
index da8fac2..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="blog_previewpane">\r
-       <p>\r
-               <?php echo elgg_echo("blog:preview:description"); ?>\r
-               <a href="javascript:history.go(-1);"><?php echo elgg_echo("blog:preview:description:link"); ?></a>\r
-       </p>\r
-</div>
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/sidebar_menu.php b/mod/blog/views/default/blog/sidebar_menu.php
new file mode 100644 (file)
index 0000000..74d6935
--- /dev/null
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Blog sidebar menu.
+ *
+ * @package Blog
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.org/
+ */
+
+// a few cases to consider:
+// 1. looking at all posts
+// 2. looking at a user's post
+// 3. looking at your posts
+
+/*
+Logged in or not doesn't matter unless you're looking at your blog.
+       Does it matter then on the side bar?
+
+All blogs:
+       Archives
+
+Owned blogs;
+       Archives
+
+
+
+*/
+
+$loggedin_user = get_loggedin_user();
+$page_owner = page_owner_entity();
+
+if ($loggedin_user) {
+
+}
+
+?>
+
+<ul>
+<li>Drafts</li>
+</ul>
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/stats.php b/mod/blog/views/default/blog/stats.php
deleted file mode 100644 (file)
index d5bfe5b..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * All site blog stats
- **/
-$count_blogs = get_entities("object", "blog",0,"",10,0,true,0,null,0,0);
-$count_blog_comments = count_annotations(0, "object", "blog","generic_comment");
-
-echo "<div class='SidebarBox'>";
-echo "<h3>Blog stats</h3>";
-echo "<div class='ContentWrapper'>";
-echo $count_blogs . " blog posts written with " . $count_blog_comments . " comments.";
-echo "</div></div>";
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/view.php b/mod/blog/views/default/blog/view.php
deleted file mode 100644 (file)
index a90f177..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php\r
-\r
-/**\r
- * Elgg blog view page\r
- * @uses $vars['posts'] An array of posts to view\r
- */\r
-\r
-// If there are any posts to view, view them\r
-if (is_array($vars['posts']) && sizeof($vars['posts']) > 0) {\r
-       foreach($vars['posts'] as $post) {\r
-               echo elgg_view_entity($post);\r
-       }\r
-}else{\r
-       echo elgg_echo('blog:none');\r
-}
\ No newline at end of file
index 8a7cd52b8b7a4f3f07d3a4a4c42efb24f346b0bf..7a40de67da8785ffcdfa25c68fbce7cb669a0a24 100644 (file)
-<?php\r
-/**\r
- * Elgg blog individual post view\r
- */\r
-\r
-$page_owner = page_owner_entity();\r
-\r
-if (isset($vars['entity'])) {\r
-\r
-       //display comments link?\r
-       if ($vars['entity']->comments_on == 'Off') {\r
-               $comments_on = false;\r
-       } else {\r
-               $comments_on = true;\r
-       }       \r
-       if (get_context() == "search" && $vars['entity'] instanceof ElggObject) {       \r
-               //display the correct layout depending on gallery or list view\r
-               if (get_input('search_viewtype') == "gallery") {\r
-                       //display the gallery view\r
-                       echo elgg_view("blog/gallery",$vars);\r
-               } else {\r
-                       echo elgg_view("blog/listing",$vars);\r
-               }               \r
-       } else {\r
-               if ($vars['entity'] instanceof ElggObject) {            \r
-                       $url = $vars['entity']->getURL();\r
-                       $owner = $vars['entity']->getOwnerEntity();\r
-                       $canedit = $vars['entity']->canEdit();          \r
-               } else {        \r
-                       $url = 'javascript:history.go(-1);';\r
-                       $owner = $vars['user'];\r
-                       $canedit = false;       \r
-               }\r
-                               \r
-?>\r
-\r
-<div id="Page_Header">\r
-       <div class="Page_Header_Title">\r
-               <div id="content_area_user_title"><h2><?php echo $page_owner->name; ?>'s Blog</h2></div>\r
-       </div>\r
-\r
-       <div class="Page_Header_Options">\r
-       <?php\r
-               if ($vars['entity']->canEdit()) {\r
-       ?>\r
-       <a class="Action_Button" href="<?php echo $vars['url']; ?>mod/blog/edit.php?blogpost=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo('blog:editpost'); ?></a>\r
-       <?php \r
-               echo elgg_view('output/confirmlink',array(      \r
-                               'href' => $vars['url'] . "action/blog/delete?blogpost=" . $vars['entity']->getGUID(),\r
-                               'text' => elgg_echo("delete"),\r
-                               'confirm' => elgg_echo("blog:delete:confirm"),\r
-                               'class' => "Action_Button Disabled",));  \r
-               }\r
-       ?>\r
-       </div><div class='clearfloat'></div>\r
-</div>\r
-\r
-<div class="ContentWrapper singleview">\r
-       <div class="blog_post">\r
-                       <?php\r
-                               // Allow plugins to extend\r
-                               echo elgg_view("blogs/options",array('entity' => $vars['entity']));\r
-                       ?>\r
-       <div id="content_area_user_title">\r
-               <h2><a href="<?php echo $url; ?>"><?php echo $vars['entity']->title; ?></a></h2>\r
-       </div>\r
-               <!-- display the user icon -->\r
-               <div class="blog_post_icon">\r
-                   <?php\r
-                       echo elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny'));\r
-                       ?>\r
-           </div>\r
-                       <p class="strapline">\r
-                       <!-- username -->\r
-                       <a href="<?php echo $vars['url']; ?>pg/blog/<?php echo $owner->username; ?>"><?php echo $owner->name; ?></a>\r
-                       \r
-                               <?php\r
-                       \r
-                                       echo sprintf(elgg_echo("blog:strapline"),\r
-                                                                       date("F j, Y",$vars['entity']->time_created)\r
-                                       );\r
-                               \r
-                               ?> \r
-                               <!-- display the comments link -->\r
-                               <?php\r
-                                       if($comments_on && $vars['entity'] instanceof ElggObject){\r
-                               //get the number of comments\r
-                                       $num_comments = elgg_count_comments($vars['entity']);\r
-                           ?>\r
-                               <a href="<?php echo $url; ?>"><?php echo sprintf(elgg_echo("comments")) . " (" . $num_comments . ")"; ?></a>\r
-                           <?php\r
-                               }\r
-                               //sort out the access level for display\r
-                                       $object_acl = get_readable_access_level($vars['entity']->access_id);\r
-                               //files with these access level don't need an icon\r
-                                       $general_access = array('Public', 'Logged in users', 'Friends');\r
-                               //set the right class for access level display - need it to set on groups and shared access only\r
-                               $is_group = get_entity($vars['entity']->container_guid);\r
-                                       if($is_group instanceof ElggGroup){\r
-                                               //get the membership type open/closed\r
-                                               $membership = $is_group->membership;\r
-                                               if($membership == 2)\r
-                                                       $access_level = "class='group_open'";\r
-                                               else\r
-                                                       $access_level = "class='group_closed'";\r
-                                       }elseif($object_acl == 'Private'){\r
-                                               $access_level = "class='private'";\r
-                                       }else{\r
-                                               if(!in_array($object_acl, $general_access))\r
-                                                       $access_level = "class='shared_collection'";\r
-                                               else\r
-                                                       $access_level = "class='generic_access'";\r
-                                       }\r
-                               echo "<br /><span {$access_level}>" . $object_acl . "</span>";\r
-                       ?>\r
-                       </p>\r
-\r
-                       <div class="clearfloat"></div>\r
-                       <div class="blog_post_body">\r
-                       <!-- display the actual blog post and excerpt if appropriate -->\r
-                       <?php\r
-                               if($vars['entity']->show_excerpt){\r
-                                       //echo "<div class='show_excerpt'>";\r
-                                       //echo elgg_view('output/longtext',array('value' => $vars['entity']->excerpt));\r
-                                       //echo "</div>";\r
-                               }\r
-                               echo elgg_view('output/longtext',array('value' => $vars['entity']->description));\r
-                       ?>\r
-                       </div><div class="clearfloat"></div>                    \r
-                       <!-- display edit options if it is the blog post owner -->\r
-                       <p class="options">\r
-                       <?php\r
-                               // Allow plugins to extend\r
-                               echo elgg_view("blogs/extend",array('entity' => $vars['entity']));\r
-                       ?>\r
-                       </p>\r
-                       \r
-                       <!-- display tags -->\r
-                               <?php\r
-       \r
-                                       $tags = elgg_view('output/tags', array('tags' => $vars['entity']->tags));\r
-                                       if (!empty($tags)) {\r
-                                               echo '<p class="tags">' . $tags . '</p>';\r
-                                       }\r
-                               \r
-                                       $categories = elgg_view('categories/view', $vars);\r
-                                       if (!empty($categories)) {\r
-                                               echo '<p class="categories">' . $categories . '</p>';\r
-                                       }\r
-                               \r
-                               ?>\r
-                       \r
-                       <div class="clearfloat"></div>\r
-       </div>\r
-</div>\r
-<?php\r
-       }\r
-}else{\r
-\r
-       echo "<div class='ContentWrapper singleview'>" . elgg_echo('blog:none') . "</div>";\r
+<?php
+/**
+ * View for blog objects
+ *
+ * @package Blog
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.org/
+ */
+
+$full = (isset($vars['full'])) ? $vars['full'] : FALSE;
+$blog = (isset($vars['entity'])) ? $vars['entity'] : FALSE;
+
+if (!$blog) {
+       return '';
+}
+
+$owner = get_entity($blog->owner_guid);
+$container = get_entity($blog->container_guid);
+$linked_title = "<a href=\"{$blog->getURL()}\" title=\"" . htmlentities($blog->title) . "\">{$blog->title}</a>";
+$categories = elgg_view('categories/view', $vars);
+$excerpt = $blog->excerpt;
+$body = $blog->description;
+$owner_icon = elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny'));
+$tags = elgg_view('output/tags', array('tags' => $blog->tags));
+$date = friendly_time($blog->time_created);
+
+if ($blog->comments_on == 'Yes') {
+       $comments_count = elgg_count_comments($blog);
+       $comments_link = "<a href=\"{$blog->getURL()}#annotations\">" . sprintf(elgg_echo("comments"), $comments_count) . '</a>';
+} else {
+       $comments_link = '';
+}
+
+// links to delete or edit.
+if ($blog->canEdit()) {
+       $edit_url = "{$vars['url']}pg/blog/{$owner->username}/edit/{$blog->getGUID()}/";
+       $edit_link = "<a class=\"action_button\" href=\"$edit_url\">" . elgg_echo('edit') . '</a>';
+
+       $delete_url = "{$vars['url']}action/blog/delete?guid={$blog->getGUID()}";
+       $delete_link = elgg_view('output/confirmlink', array(
+               'href' => $delete_url,
+               'text' => elgg_echo('delete'),
+               'class' => 'action_button'
+       ));
+
+       $edit = "$edit_link $delete_link";
+} else {
+       $edit = '';
+}
+
+if ($full) {
+       // The "on" status changes for comments, so best to check for !Off
+       if ($blog->comments_on != 'Off') {
+               $comments = elgg_view_comments($blog);
+       } else {
+               $comments = '';
+       }
+
+       $owner_title = sprintf(elgg_echo('blog:owner_title'), $user->name);
+
+echo <<<___END
+<div class="blog clearfloat">
+       <h1>$owner_title</h2>
+       $edit
+       <h2 class="entity_title">{$blog->title}</h2>
+       <div class="blog entity_listing_icon">
+               $owner_icon
+       </div>
+       <div class="entity_listing_info">
+               <p class="entity_subtext">
+                       $date
+                       $tags
+                       $categories
+                       $comments_link
+               </p>
+               <p class="blog body">$body</p>
+       </div>
+</div>
+
+$comments
+
+___END;
+
+} else {
+       echo <<<___END
+<div class="blog entity_listing clearfloat">
+       <div class="entity_listing_icon">
+               $owner_icon
+       </div>
+       <div class="entity_listing_info">
+               $edit
+               <p class="entity_title">$linked_title</p>
+               <p class="entity_subtext">
+                       $date
+                       $tags
+                       $categories
+                       $comments_link
+               </p>
+               <p>$excerpt</p>
+       </div>
+</div>
+
+___END;
 }
\ No newline at end of file
diff --git a/mod/blog/views/default/river/object/blog/annotate.php b/mod/blog/views/default/river/object/blog/annotate.php
deleted file mode 100644 (file)
index 77b75c6..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-       $statement = $vars['statement'];
-       $performed_by = $statement->getSubject();
-       $object = $statement->getObject();
-       
-       $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-       $string = sprintf(elgg_echo("blog:river:posted"),$url) . " ";
-       $string .= elgg_echo("blog:river:annotate:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
-
-?>
-
-<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/blog/views/default/river/object/blog/create.php b/mod/blog/views/default/river/object/blog/create.php
deleted file mode 100644 (file)
index b5b3dc2..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-       $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
-       $object = get_entity($vars['item']->object_guid);
-       $url = $object->getURL();
-       
-       $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-       $contents = strip_tags($object->description); //strip tags from the contents to stop large images etc blowing out the river view
-       $string = sprintf(elgg_echo("blog:river:created"),$url) . " ";
-       $string .= elgg_echo("blog:river:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
-       $string .= "<div class=\"river_content_display\">";
-       if(strlen($contents) > 200) {
-               $string .= substr($contents, 0, strpos($contents, ' ', 200)) . "...";
-    }else{
-           $string .= $contents;
-    }
-       $string .= "</div>";
-?>
-
-<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/blog/views/default/river/object/blog/update.php b/mod/blog/views/default/river/object/blog/update.php
deleted file mode 100644 (file)
index cf98afa..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-       $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
-       $object = get_entity($vars['item']->object_guid);
-       $url = $object->getURL();
-       
-       $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-       $string = sprintf(elgg_echo("blog:river:updated"),$url) . " ";
-    $string .= elgg_echo("blog:river:update") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
-       
-?>
-
-<?php echo $string; ?>
\ No newline at end of file