Combine edit post and new post

htdocs/artefact/blog/editpost.php

+<?php
+/**
+ * This program is part of Mahara
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ *
+ * @package    mahara
+ * @subpackage artefact-blog
+ * @author     Alastair Pharo <alastair@catalyst.net.nz>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
+ * @copyright  (C) 2006,2007 Catalyst IT Ltd http://catalyst.net.nz
+ *
+ */
+
+define('INTERNAL', 1);
+define('MENUITEM', 'myblogs');
+
+require(dirname(dirname(dirname(__FILE__))) . '/init.php');
+require_once('pieforms/pieform.php');
+safe_require('artefact', 'blog');
+
+// For a new post, the 'blog' parameter will be set to the blog's artefact id.
+// For an existing post, the 'post' parameter will be set to the blogpost's artefact id.
+
+$post = param_integer('post', 0);
+if (!$post) {
+    // This is a new post; get a create id so we can attach files to it.
+    $createid = $SESSION->get('createid');
+    if (empty($createid)) {
+        $createid = 0;
+    }
+    $SESSION->set('createid', $createid + 1);
+    $blog = param_integer('blog');
+    $post = '';
+    $title = '';
+    $description = '';
+    $checked = '';
+    $pagetitle = 'newblogpost';
+}
+else {
+    $blogpost = new ArtefactTypeBlogPost($post);
+    if ($blogpost->get('owner') != $USER->get('id')) {
+        return;
+    }
+    $blog = $blogpost->get('parent');
+    $title = $blogpost->get('title');
+    $description = $blogpost->get('description');
+    $checked = !$blogpost->get('published');
+    $pagetitle = 'editblogpost';
+}
+
+$form = pieform(array(
+    'name' => 'editpost',
+    'method' => 'post',
+    'action' => '',
+    'elements' => array(
+        'parent' => array(
+            'type' => 'hidden',
+            'value' => $blog,
+        ),
+        'id' => array(
+            'type' => 'hidden',
+            'value' => $post,
+        ),
+        'title' => array(
+            'type' => 'text',
+            'title' => get_string('posttitle', 'artefact.blog'),
+            'description' => get_string('posttitledesc', 'artefact.blog'),
+            'rules' => array(
+                'required' => true
+            ),
+            'defaultvalue' => $title
+        ),
+        'description' => array(
+            'type' => 'wysiwyg',
+            'rows' => 10,
+            'cols' => 80,
+            'title' => get_string('postbody', 'artefact.blog'),
+            'description' => get_string('postbodydesc', 'artefact.blog'),
+            'rules' => array(
+                'required' => true
+            ),
+            'defaultvalue' => $description
+        ),
+        'thisisdraft' => array(
+            'type' => 'checkbox',
+            'title' => get_string('thisisdraft', 'artefact.blog'),
+            'description' => get_string('thisisdraftdesc', 'artefact.blog'),
+            'checked' => $checked
+        ),
+        'submit' => array(
+            'type' => 'submitcancel',
+            'value' => array(
+                get_string('save', 'artefact.blog'),
+                get_string('cancel', 'artefact.blog')
+            )
+        )
+    )
+));
+
+$javascript = <<< EOF
+
+EOF;
+
+$smarty = smarty();
+$smarty->assign('pagetitle', $pagetitle);
+$smarty->assign_by_ref('editpostform', $form);
+$smarty->display('artefact:blog:editpost.tpl');
+exit;
+
+/**
+ * This function gets called to create a new blog post, and publish it
+ * simultaneously.
+ *
+ * @param array
+ */
+function editpost_submit(array $values) {
+    global $USER;
+
+    $values['published'] = !$values['thisisdraft'];
+    if ((!empty($values['id']) && ArtefactTypeBlogPost::edit_post($USER, $values))
+        || (empty($values['id']) && ArtefactTypeBlogPost::new_post($USER, $values))) {
+        // Redirect to the blog page.
+        redirect(get_config('wwwroot') . 'artefact/blog/view/?id=' . $values['parent']);
+    }
+
+    redirect(get_config('wwwroot') . 'artefact/blog/list/');
+}
+
+/** 
+ * This function get called to cancel the form submission. It returns to the
+ * blog list.
+ */
+function editpost_cancel_submit() {
+    $blog = param_integer('parent');
+    redirect(get_config('wwwroot') . 'artefact/blog/view/?id=' . $blog);
+}
+ 
+?>

htdocs/artefact/blog/lib.php

@@ -525,8 +525,9 @@ class ArtefactTypeBlogPost extends ArtefactType {
         $artefact->set('description', $values['description']);
         $artefact->set('published', $values['published']);
         $artefact->set('owner', $user->get('id'));
-        $artefact->set('parent', $values['id']);
+        $artefact->set('parent', $values['parent']);
         $artefact->commit();
+        return true;
     }
 
     /** 

htdocs/artefact/blog/theme/default/editpost.tpl

@@ -2,12 +2,23 @@
 
   This template displays the 'edit blog post' form
 
- *}{include file="header.tpl"}
+ *}
+
+{include file="header.tpl"}
+
+<div id="column-right">
 {include file="adminmenu.tpl"}
+</div>
 
-<div class="content">
-    <h2>{str section="artefact.blog" tag="editblogpost"}</h2>
-    {$editpostform}
+<div id="column-left">
+    <div class="content">
+        <div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
+	    <div class="maincontent">
+                <h2>{str section="artefact.blog" tag=$pagetitle}</h2>
+               {$editpostform}
+            </div>
+        </span></span></span></span></div>
+    </div>
 </div>
 
 {include file="footer.tpl"}

htdocs/artefact/blog/theme/default/view.tpl

@@ -22,7 +22,7 @@
                                 </div>
 
 				<div class="newpost">
-					<a href="{$WWWROOT}/artefact/blog/newpost/?id={$blog->get('id')}">{str section="artefact.blog" tag="addpost"}</a>
+					<a href="{$WWWROOT}/artefact/blog/editpost.php?blog={$blog->get('id')}">{str section="artefact.blog" tag="addpost"}</a>
 				</div>
 		
 			<table id="postlist">
@@ -33,7 +33,7 @@
 			</table>
 				
 				<div class="newpost">
-					<a href="{$WWWROOT}/artefact/blog/newpost/?id={$blog->get('id')}">{str section="artefact.blog" tag="addpost"}</a>
+					<a href="{$WWWROOT}/artefact/blog/editpost.php?blog={$blog->get('id')}">{str section="artefact.blog" tag="addpost"}</a>
 				</div>
 				
 			</div>

htdocs/artefact/blog/view/index.js.php

@@ -79,12 +79,12 @@ postlist.rowfunction = function(d, n, gd) {
     var edit = FORM(
         {
             'method' : 'get',
-            'action' : {$enc_wwwroot} + 'artefact/blog/editpost/'
+            'action' : {$enc_wwwroot} + 'artefact/blog/editpost.php'
         },
         INPUT(
             {
                 'type'  : 'hidden',
-                'name'  : 'id',
+                'name'  : 'post',
                 'value' : d.id
             }
         ),