[svn r17063] Move replace_dangerous_file() to main_api.lib.php (see FS#1947) by cvargas

main/inc/lib/fileUpload.lib.php

@@ -72,27 +72,6 @@ function api_replace_parameter($upload_path, $buffer, $param_name="src")
 ==============================================================================
 */
 
-
-/**
- * replaces "forbidden" characters in a filename string
- *
- * @author - Hugues Peeters <peeters@ipm.ucl.ac.be>
- * @author - Ren<EFBFBD> Haentjens, UGent (RH)
- * @param  - string $filename
- * @param  - string $strict (optional) remove all non-ASCII
- * @return - the cleaned filename
- */
-
-function replace_dangerous_char($filename, $strict = 'loose')
-{
-	$filename = ereg_replace("\.+$", "", substr(strtr(ereg_replace(
-	    "[^!-~\x80-\xFF]", "_", trim($filename)), '\/:*?"<>|\'',
-        /* Keep C1 controls for UTF-8 streams */  '-----_---_'), 0, 250));
-	if ($strict != 'strict') return $filename;
-
-	return ereg_replace("[^!-~]", "x", $filename);
-}
-
 /**
  * Replaces all accentuated characters by non-accentuated characters for filenames, as
  * well as special HTML characters by their HTML entity's first letter.

main/inc/lib/main_api.lib.php

@@ -2834,4 +2834,24 @@ function api_is_element_in_the_session($tool, $element_id, $session_id=null) {
 		}
 	}
 	return false;
+}
+
+/**
+ * replaces "forbidden" characters in a filename string
+ *
+ * @author - Hugues Peeters <peeters@ipm.ucl.ac.be>
+ * @author - Ren<EFBFBD> Haentjens, UGent (RH)
+ * @param  - string $filename
+ * @param  - string $strict (optional) remove all non-ASCII
+ * @return - the cleaned filename
+ */
+
+function replace_dangerous_char($filename, $strict = 'loose')
+{
+	$filename = ereg_replace("\.+$", "", substr(strtr(ereg_replace(
+	    "[^!-~\x80-\xFF]", "_", trim($filename)), '\/:*?"<>|\'',
+        /* Keep C1 controls for UTF-8 streams */  '-----_---_'), 0, 250));
+	if ($strict != 'strict') return $filename;
+
+	return ereg_replace("[^!-~]", "x", $filename);
 }

main/user/userInfoLib.php

@@ -619,27 +619,4 @@ function htmlize($phrase)
 {
 	global $charset;
 	return nl2br(htmlspecialchars($phrase,ENT_QUOTES,$charset));
-}
-
-
-/**
- * replaces some dangerous character in a string for HTML use
- *
- * @author - Hugues Peeters <peeters@ipm.ucl.ac.be>
- * @param  - string (string) string
- * @return - the string cleaned of dangerous character
- */
-
-function replace_dangerous_char($string)
-{
-	$search[]="/" ; $replace[]="-";
-	$search[]="\|"; $replace[]="-";
-	$search[]="\""; $replace[]=" ";
-
-	foreach($search as $key=>$char )
-	{
-		$string = str_replace($char, $replace[$key], $string);
-	}
-
-	return $string;
 }