mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 16:04:25 +02:00
Code Issues Projects Releases Wiki Activity

MDL-9075 utf-8 bom is now stripped from uploaded users cvs file; merged from MOODLE_18_STABLE

Browse Source
This commit is contained in:
skodak 2007-04-10 15:32:37 +00:00
parent 413efd2200
commit 77b4d4be49
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/uploaduser.php
View File

@ -67,8 +67,11 @@ if ($um->preprocess_files() && confirm_sesskey()) {
@apache_child_terminate();
}
//Fix mac/dos newlines
$text = my_file_get_contents($filename);
//trim utf-8 bom
$textlib = new textlib();
$text = $textlib->trim_utf8_bom($text);
//Fix mac/dos newlines
$text = preg_replace('!\r\n?!',"\n",$text);
$fp = fopen($filename, "w");
fwrite($fp,$text);

10
lib/textlib.class.php
View File

@ -322,5 +322,15 @@ class textlib {
return $result;
}
/**
* Removes the BOM from unicode string - see http://unicode.org/faq/utf_bom.html
*/
function trim_utf8_bom($str) {
$bom = "\xef\xbb\xbf";
if (strpos($str, $bom) === 0) {
return substr($str, strlen($bom));
}
return $str;
}
}
?>