From: moodler <moodler>
Date: Mon, 12 May 2003 06:35:32 +0000 (+0000)
Subject: Fixes for detect_munged_arguments() and default values for p() s() etc
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=393c9b4ff434199bf5e612b558fc4a8e6917385f;p=moodle.git

Fixes for detect_munged_arguments() and default values for p() s() etc
---

diff --git a/lib/weblib.php b/lib/weblib.php
index 7ccc021087..7f46217f78 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -46,13 +46,13 @@ $ALLOWED_TAGS = "<p><br><b><i><u><font><table><tbody><span><div><tr><td><ol><ul>
 
 /// Functions
 
-function s($var) {
+function s($var="") {
 /// returns $var with HTML characters (like "<", ">", etc.) properly quoted,
 
     return htmlSpecialChars(stripslashes_safe($var));
 }
 
-function p($var) {
+function p($var="") {
 /// prints $var with HTML characters (like "<", ">", etc.) properly quoted,
 
     echo htmlSpecialChars(stripslashes_safe($var));
@@ -379,13 +379,10 @@ function validate_email ($address) {
 }
 
 function detect_munged_arguments($string) {
-    if (ereg("\.\.", $string)) { // check for parent URLs
+    if (ereg('\.\.', $string)) { // check for parent URLs
         return true;
     }
-    if (ereg("\|", $string)) {  // check for pipes
-        return true;
-    }
-    if (ereg("\'", $string)) {  // check for backquotes
+    if (ereg('[\|\`]', $string)) {  // check for other bad characters
         return true;
     }
     return false;