some cleaning, removed config.html for admin

diff --git a/blog/config.html b/blog/config.html
deleted file mode 100644 (file)
index 5408677..0000000
--- a/blog/config.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php //$Id$ 
-/**
- * config.html - 
- * part of moodle blog module
- *included from moodle/admin/blog.php. 
- * site administrator site wide preference settings
- */ ?>
-
-<form method="post" action="blog.php" name="form">
-<table cellpadding="9" cellspacing="0">
-<tr valign="top" align="center">
-    <td colspan="3" align="center">
-        <?php
-            print_string('helpadmin', 'blog');
-            print '&nbsp;&nbsp;';
-            helpbutton('admin', get_string('helpadmin', 'blog'), 'blog');
-        ?>
-    </td>
-</tr>
-<!--
-//templates removed from DB and placed in moodle/theme folder structure instead
-<tr valign="top">
-    <td align="right"><?php print_string('templateadministration', 'blog');?></strong>
-    </td>
-    <td colspan="2">
-        <a href="<?php echo $CFG->wwwroot;?>/blog/admin_tem.php">
-        <?php print_string('managetemplates', 'blog');?></a>
-    </td>
-</tr>
--->
-<tr valign="top">
-    <td align="right">
-        <p><enable_trackback_in:</p>
-    </td>
-    <td>
-        <?php choose_from_menu ($BLOG_YES_NO_MODES, 'blog_enable_trackback_in', $CFG->blog_enable_trackback_in, '', '', ''); ?>
-    </td>
-    <td>
-        <?php print_string('enabletrackbackindesc', 'blog') ?>
-    </td>
-</tr>
-<tr valign="top">
-    <td align="right">
-        <p>blog_enable_pingback_in:</p>
-    </td>
-    <td>
-        <?php choose_from_menu ($BLOG_YES_NO_MODES, 'blog_enable_pingback_in', $CFG->blog_enable_pingback_in, '', '', ''); ?>
-    </td>
-    <td>
-        <?php print_string('enablepingbackindesc', 'blog') ?>
-    </td>
-</tr>
-
-<tr valign="top">
-    <td align="right">
-        <p>blog_enable_trackback_out:</p>
-    </td>
-    <td>
-        <?php choose_from_menu ($BLOG_YES_NO_MODES, 'blog_enable_trackback_out', $CFG->blog_enable_trackback_out, '', '', ''); ?>
-    </td>
-    <td>
-        <?php print_string('enabletrackbackoutdesc', 'blog') ?>
-    </td>
-</tr>
-<tr valign="top">
-    <td align="right">
-        <p>blog_enable_pingback_out:</p>
-    </td>
-    <td>
-        <?php choose_from_menu ($BLOG_YES_NO_MODES, 'blog_enable_pingback_out', $CFG->blog_enable_pingback_out, '', '', ''); ?>
-    </td>
-    <td>
-        <?php print_string('enablepingbackoutdesc', 'blog') ?>
-    </td>
-</tr>
-
-<tr valign="top">
-    <td align="right"><p>blog_useweblog_rpc:</td>
-    <td>
-        <?php choose_from_menu ($BLOG_YES_NO_MODES, 'blog_useweblog_rpc', $CFG->blog_useweblog_rpc, '', '', ''); ?>
-    </td>
-    <td>
-    <?php print_string('useweblogrpcdesc', 'blog') ?>
-    </td>
-</tr>
-<?php if (! isset($CFG->blog_default_fetch_num_entries) ) { ?>
-    <tr valign="top">
-        <td align="right"><p>blog_default_fetch_num_entries:</td>
-        <td>
-            <input name="blog_default_fetch_num_entries" type="text" size="5" value="<?php 
-            if (isset($CFG->blog_default_fetch_num_entries)) {
-                p($CFG->blog_default_fetch_num_entries);
-            }?>" />
-        </td>
-        <td>
-            Default number of entries to display per page 
-        <?php print_string('defaultfetchnumentriesdesc', 'blog') ?>
-        </td>
-    </tr>
-<?php } ?>
-<tr valign="top">
-    <td align="right"><p>blog_ratename:</td>
-    <td>
-    <input name="blog_ratename" type="text" size="10" value="<?php 
-    if (isset($CFG->blog_ratename)) {
-        p($CFG->blog_ratename);
-    }?>" />
-    </td>
-    <td>
-    <?php print_string('ratenamedesc', 'blog') ?>
-    </td>
-</tr>
-<tr valign="top">
-    <td align="right"><p>blog_anon:</td>
-    <td>
-    <input name="blog_anon" type="text" size="10" value="<?php 
-    if (isset($CFG->blog_anon)) {
-        p($CFG->blog_anon);
-    }?>" />
-    </td>
-    <td>
-    <?php print_string('anondesc', 'blog') ?>
-    </td>
-</tr>
-<tr valign="top">
-    <td align="right"><p>blog_default_title:</td>
-    <td>
-    <input name="blog_default_title" type="text" size="10" value="<?php 
-    if (isset($CFG->blog_default_title)) {
-        p($CFG->blog_default_title);
-    }?>" />
-    </td>
-    <td>
-    <?php print_string('defaulttitledesc', 'blog') ?>
-    </td>
-</tr>
-<tr valign="top">
-    <td align="right">
-        <p>blog_enable_moderation:</p>
-    </td>
-    <td>
-        <?php choose_from_menu ($BLOG_YES_NO_MODES, 'blog_enable_moderation', $CFG->blog_enable_moderation, '', '', ''); ?>
-    </td>
-    <td>
-        <?php print_string('enablemoderationdesc', 'blog') ?>
-    </td>
-</tr>
-<tr>
-    <td colspan="3" align="center">
-    <input type="submit" value="<?php print_string('savechanges') ?>"></td>
-</tr>
-</table>
-</form>
\ No newline at end of file

diff --git a/blog/lib.php b/blog/lib.php
index 6d5e2f783b72eb82e38f2096cb9d71851419b7eb..3836845009e72fe774306a8e9e729544f713ccb5 100755 (executable)
--- a/blog/lib.php
+++ b/blog/lib.php
@@ -3,6 +3,7 @@
 /**
  * Library of functions and constants for blog
  */
+ 
 require_once($CFG->dirroot .'/blog/class.BlogInfo.php');
 require_once($CFG->dirroot .'/blog/class.BlogEntry.php');
 require_once($CFG->dirroot .'/blog/class.BlogFilter.php');

diff --git a/blog/preferences.html b/blog/preferences.html
index 7904d7036f296e2f8879877da03a1b367a74b08b..60ec485a01a136539a5630f20deb3591a160e252 100755 (executable)
--- a/blog/preferences.html
+++ b/blog/preferences.html
@@ -4,7 +4,7 @@
 ?>
 
 <form method="post" action="preferences.php" name="entry" id="entry">
-
+<input type="hidden" name="referrer" value="<?php echo $referrer; ?>" />
 <table cellpadding="9" cellspacing="0">
 <tr>
     <td><?php print_string('pagesize', 'blog');?>:</td>

diff --git a/blog/preferences.php b/blog/preferences.php
index d9823f9bd6be67c37c5fef3a96ca72d7ef5e93c1..86f3c2479fdc3fa2eefd20c7e09e1cd986191b8a 100755 (executable)
--- a/blog/preferences.php
+++ b/blog/preferences.php
@@ -8,10 +8,13 @@
     global $USER;
 
     // detemine where the user is coming from in case we need to send them back there
-    if (isset($_SERVER['HTTP_REFERER'])) {
-        $referrer = $_SERVER['HTTP_REFERER'];
-    } else {
-        $referrer = $CFG->wwwroot;
+
+    if (!$referrer = optional_param('referrer','', PARAM_NOTAGS)) {
+        if (isset($_SERVER['HTTP_REFERER'])) {
+            $referrer = $_SERVER['HTTP_REFERER'];
+        } else {
+            $referrer = $CFG->wwwroot;
+        }
     }
 
     //ensure that the logged in user is not using the guest account
@@ -31,7 +34,6 @@
         print_header();
 
         set_user_preference('blogpagesize', optional_param('pagesize', 10, PARAM_INT));
-        
         redirect($referrer, get_string('changessaved'), 1);
         exit;
     }

diff --git a/blog/tags.php b/blog/tags.php
index c8cd7b57cc97ec979a65600e1fc309b55602490e..38495ca7f77248ee222942db99af0821e4c6b57f 100755 (executable)
--- a/blog/tags.php
+++ b/blog/tags.php
@@ -2,7 +2,6 @@
 require_once('../config.php');
 
 //form process
-
 $mode = optional_param('mode','',PARAM_ALPHA);
 
 switch ($mode) {