Changeset 84

Timestamp:

05/23/2006 06:10:49 PM (4 years ago)

Author:

DarTar

Message:

handlers/edit.php: fixed minor validation problem, added edit note check depending on config option, changed markup for error messages to <em class="error"> ; wikka.php: added config option for edit note (0: optional/1: required/2: disabled); setup/install.php: added upgrade instructions for new config option - fixes #114 (Credits SamuelDr)

Location:

trunk

Files:

• handlers/page/edit.php (modified) (5 diffs)
• setup/install.php (modified) (1 diff)
• wikka.php (modified) (1 diff)

trunk/handlers/page/edit.php

@@ -10 +10 @@
 <div class="page"<?php echo $ondblclick;?>>
 <?php
-if (!(preg_match("/^[A-Za-zÄÖÜßäöü]+[A-Za-z0-9ÄÖÜßäöü]*$/s", $this->tag))) {
+if (!(preg_match("/^[A-Za-zÄÖÜßäöü]+[A-Za-z0-9ÄÖÜßäöü]*$/s", $this->tag))) { //TODO use central regex library
         echo '<em>The page name is invalid. Valid page names must start with a letter and contain only letters and numbers.</em>';
 }
@@ -35 +35 @@
                                 if ($this->page['id'] != $_POST['previous'])
                                 {
-                                        $error = 'OVERWRITE ALERT: This page was modified by someone else while you were editing it.<br />'."\n".'Please copy your changes and re-edit this page.';
+                                        $error = 'OVERWRITE ALERT: This page was modified by someone else while you were editing it.<br />'."\n".'Please copy your changes and re-edit this page.<br />';
                                 }
+                        }
+                        // check for edit note
+                        if (($this->config['require_edit_note'] == 1) && $_POST['note']=='')
+                        {
+                                $error .= 'MISSING EDIT NOTE: Please fill in an edit note!<br />'."\n";
                         }
                         // store
@@ -83 +88 @@
         {
                 $previewButtons =
-                        "<hr />\n".
+                        "<hr />\n";
                         // We need to escape ALL entity refs before display so we display them _as_ entities instead of interpreting them
                         // so we use htmlspecialchars on the edit note (as on the body)
-                        '<input size="50" type="text" name="note" value="'.htmlspecialchars($note).'"/> Note on your edit.<br />'."\n".
-                        '<input name="submit" type="submit" value="Store" accesskey="s" />'."\n".
+                if ($this->config['require_edit_note'] != 2) //check if edit_notes are enabled
+                {
+                        $previewButtons .= '<input size="50" type="text" name="note" value="'.htmlspecialchars($note).'"/> Note on your edit.<br />'."\n";
+                }
+                $previewButtons .= '<input name="submit" type="submit" value="Store" accesskey="s" />'."\n".
                         '<input name="submit" type="submit" value="Re-Edit" accesskey="p" id="reedit_id" />'."\n".
                         '<input type="button" value="Cancel" onclick="document.location=\''.$this->href('').'\';" />'."\n";
@@ -123 +131 @@
                 if ($error)
                 {
-                        $output .= '<div class="error">'.$error.'</div>'."\n";
+                        $output .= '<em class="error">'.$error.'</em>'."\n";
                 }
 
@@ -137 +145 @@
                         // We need to escape ALL entity refs before display so we display them _as_ entities instead of interpreting them
                         // hence htmlspecialchars() instead of htmlspecialchars_ent() which UNescapes entities!
-                        '<textarea id="body" name="body" style="width: 100%; height: 500px">'.htmlspecialchars($body).'</textarea><br />'."\n".
+                        '<textarea id="body" name="body" style="width: 100%; height: 500px">'.htmlspecialchars($body).'</textarea><br />'."\n";
                         //note add Edit
                         // We need to escape ALL entity refs before display so we display them _as_ entities instead of interpreting them
                         // so we use htmlspecialchars on the edit note (as on the body)
-                        '<input size="40" type="text" name="note" value="'.htmlspecialchars($note).'" /> Please add a note on your edit.<br />'."\n".
-                        //finish
-                        '<input name="submit" type="submit" value="Store" accesskey="s" /> <input name="submit" type="submit" value="Preview" accesskey="p" /> <input type="button" value="Cancel" onclick="document.location=\''.$this->Href('').'\';" />'."\n".
+                if ($this->config['require_edit_note'] != 2) //check if edit_notes are enabled
+                {
+                        $output .= '<input size="40" type="text" name="note" value="'.htmlspecialchars($note).'" /> Please add a note on your edit.<br />'."\n";
+                }
+                //finish
+                $output .=      '<input name="submit" type="submit" value="Store" accesskey="s" /> <input name="submit" type="submit" value="Preview" accesskey="p" /> <input type="button" value="Cancel" onclick="document.location=\''.$this->Href('').'\';" />'."\n".
                         $this->FormClose();
 
-                if ($this->GetConfigValue('gui_editor') == 1) {
-                        $output .=
-                                        '<script language="JavaScript" src="3rdparty/plugins/wikiedit/protoedit.js"></script>'."\n".
-                                        '<script language="JavaScript" src="3rdparty/plugins/wikiedit/wikiedit2.js"></script>'."\n";
+                if ($this->config['gui_editor'] == 1) 
+                {
+                        $output .= '<script type="text/javascript" src="3rdparty/plugins/wikiedit/protoedit.js"></script>'."\n".
+                                        '<script type="text/javascript" src="3rdparty/plugins/wikiedit/wikiedit2.js"></script>'."\n";
                         $output .= '<script type="text/javascript">'."  wE = new WikiEdit(); wE.init('body','WikiEdit','editornamecss');".'</script>'."\n";
                 }

trunk/setup/install.php

@@ -285 +285 @@
         test(sprintf(ADDING_CONFIG_ENTRY, 'wiki_suffix'), 1);
         $config["wiki_suffix"] = '@wikka';
+        test(sprintf(ADDING_CONFIG_ENTRY, 'require_edit_note'), 1);
+        $config["require_edit_note"] = '0';
         // cookie names have changed -- logout user and delete the old cookies
         test(DELETING_COOKIES, 1);

trunk/wikka.php

@@ -130 +130 @@
         'xml_recent_changes'            => '10',
         'hide_comments'                 => '0',
+        'require_edit_note'             => '0',         # edit note optional (0, default), edit note required (1) edit note disabled (2)
         'anony_delete_own_comments'     => '1',
         'double_doublequote_html'       => 'safe',