more cleaning

diff --git a/blog/edit.html b/blog/edit.html
index 251d475e797b45819b139d36d0d54c1b6773aac2..cc59bc85645774c530590267bcd0329f66dbe35e 100755 (executable)
--- a/blog/edit.html
+++ b/blog/edit.html
@@ -15,7 +15,6 @@
     }
 ?>
 
-
 <!-- the following form is based on moodle/mod/forum/post.html -->
 
 <form name="entry" method="post" action="<?php echo $CFG->wwwroot;?>/blog/edit.php" id="entry" <?php echo $onsubmit; ?> enctype="multipart/form-data">
@@ -54,8 +53,6 @@
     <td>
     <b><?php print_string('otags','blog'); ?></b>
     </td>
-    
-    
     <td>
     <b><?php print_string('ptags','blog'); ?></b>
     </td>
@@ -128,32 +125,12 @@
     </td>
     <td align="left" colspan="2">
     <?php
-        if (isset($post->useextendedbody) && $post->useextendedbody) {
-            print_string('entrybodydesc', 'blog');
-        } else {
-            print_string('entrybodyonlydesc', 'blog');
-        }
+        print_string('entrybodyonlydesc', 'blog');
         print '<br />'."\n";
         // usage: print_textarea($usehtmleditor, $rows, $cols, $width, $height, $name, $value="", $courseid)
         print_textarea($usehtmleditor, 6, 60, 600, 500, 'body', $post->body, $post->courseid); ?>
     </td>
 </tr>
-<?php
-    if (isset($post->useextendedbody) && $post->useextendedbody) {
-        print '<tr valign=top>'."\n";
-        print '<td align=right><strong>'."\n";
-        print_string('entryextendedbody', 'blog');
-        print ':</strong></td>'. "\n";
-        print '<td align=left colspan=2>'."\n";
-        print_string('entryextendedbodydesc', 'blog');
-        print '<br />'."\n";
-        print_textarea($usehtmleditor, 25, 60, 600, 500, 'extendedbody', $post->extendedbody, $post->courseid);
-        print '</td></tr>';
-   } else {
-        print '<input type="hidden" name="extendedbody" value="" />';
-   }
-
-?>
 <tr valign="top">
     <td align="right"><strong><?php print_string('formattexttype'); ?>:</strong></td>
     <td colspan="2">
@@ -170,8 +147,6 @@
 <tr>
     <td align="center" colspan="3">
         <input type="hidden" name="editform" value="1" id="editform" />
-        <input type="hidden" name="courseid" value="<?php p($post->courseid) ?>" id="courseid" />
-        <input type="hidden" name="userid" value="<?php p($post->userid) ?>" id="userid" />
         <input type="hidden" name="userid" value="<?php echo $userid; ?>" id="userid" />
         <input type="hidden" name="tem" id="tem" />
 <?php

diff --git a/blog/edit.php b/blog/edit.php
index 41c3be0da9eb2c44fdce08ee67ac33d216f9819d..81b33c88e32aae1602209762bfe85af97f7d1d00 100755 (executable)
--- a/blog/edit.php
+++ b/blog/edit.php
@@ -13,14 +13,12 @@ if (isset($_SERVER['HTTP_REFERER'])) {
 
 //first verify that user is not a guest
 if (isguest()) {
-    error(get_string('noguestpost', 'forum'), $referrer);
+    error(get_string('noguestpost', 'blog'), $referrer);
 }
 
 $userid = optional_param('userid', 0, PARAM_INT);
 $editid = optional_param('editid', 0, PARAM_INT);
 
-global $USER, $CFG;
-
 //check to see if there is a requested blog to edit
 if (!empty($userid) && $userid != 0) {
     if (blog_isLoggedIn() && $userid == $USER->id ) {
@@ -56,10 +54,16 @@ if ( !blog_user_has_rights($PAGE->bloginfo) ) {
 
 //////////// SECURITY AND SETUP COMPLETE - NOW PAGE LOGIC ///////////////////
 
-if (isset($act) && $act == 'del')
+if (isset($act) && $act == 'del' && confirm_sesskey())
 {
-    require_variable($postid);
-    do_delete($PAGE->bloginfo, $postid);
+    if (optional_param($confirm,0,PARAM_INT)) {
+        require_variable($postid);
+        do_delete($PAGE->bloginfo, $postid);
+    } else {
+    /// prints blog entry and what confirmation form
+
+
+    }
 }
 if ($usehtmleditor = can_use_richtext_editor()) {
     $defaultformat = FORMAT_HTML;

diff --git a/blog/lib.php b/blog/lib.php
index a64451cab5455b930bbc7d237507199038c83109..872c24d6ee18c4280f0a4d02f44d24168a017cba 100755 (executable)
--- a/blog/lib.php
+++ b/blog/lib.php
@@ -847,11 +847,11 @@ function blog_print_entry_content ($template, $entryid, $filtertype='', $filters
 
     if (isset($USER->id)) {
         if (($template['userid'] == $USER->id) or isteacher($course->id)) {
-                echo '<a href="'.$CFG->wwwroot.'/blog/edit.php?editid='.$entryid.'">'.$stredit.'</a>';
+                echo '<a href="'.$CFG->wwwroot.'/blog/edit.php?editid='.$entryid.'&amplsesskey='.sesskey().'">'.$stredit.'</a>';
         }
 
         if (($template['userid'] == $USER->id) or isteacher($course->id)) {
-            echo '| <a href="'.$CFG->wwwroot.'/blog/edit.php?act=del&amp;postid='.$entryid.'">'.$strdelete.'</a>';
+            echo '| <a href="'.$CFG->wwwroot.'/blog/edit.php?act=del&amp;postid='.$entryid.'&amplsesskey='.sesskey().'">'.$strdelete.'</a>';
         }
     }
 

diff --git a/blog/preferences.html b/blog/preferences.html
index 60ec485a01a136539a5630f20deb3591a160e252..6cbee778427acc5600cb943af40c98a6eda4b411 100755 (executable)
--- a/blog/preferences.html
+++ b/blog/preferences.html
@@ -11,18 +11,6 @@
     <td><input type="text" size="32" maxlength="128" name="pagesize" value="<?php echo get_user_preferences('blogpagesize',8);?>" />
     </td>
 </tr>
-<?php  if (!empty($CFG->allowblogthemes)) { ?>
-<tr valign="top">
-    <td align="right"> <?php print_string("forcetheme") ?>: </td>
-    <td>
-      <?php
-         $themes[''] = get_string("forceno");
-         $themes += get_list_of_themes();
-         choose_from_menu($themes, 'theme', $bloginfo->get_blog_theme(), "", "", "");
-      ?>
-    </td>
-</tr>
-<?php } ?>
 <tr>
     <td colspan="2" align="center">
        <input type="submit" value="<?php print_string("savechanges") ?>" /></td>