L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing drift between CVS and git

Browse Source
This commit is contained in:
Moodle HQ git importer
2009-11-23 01:33:09 +00:00
parent dcb7585070
commit 2b7cefa2f5
12 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/wiki/ewiki/fragments/nuke_mod_wiki_index
+1 -1
View File
@@ -15,7 +15,7 @@
#-- stupid legacy code
if (!preg_match("/modules.php/i", $PHP_SELF)) {
if (!eregi("modules.php", $PHP_SELF)) {
die ("You can't access this file directly...");
}
mod/wiki/lib.php
+2 -2
View File
@@ -1569,11 +1569,11 @@ function wiki_admin_checklinks($pagetocheck) {
}
/// Remove old Notices
$content = preg_replace('/ µµ__~\['.get_string("offline","wiki").'\]__µµ /i','', $content);
$content = eregi_replace(' µµ__~\['.get_string("offline","wiki").'\]__µµ ','', $content);
#-- replace dead links
foreach ($badlinks as $href) {
$content = preg_replace("/\377^(.*)($href)\377m", '$1 µµ__~['.get_string("offline","wiki").']__µµ $2/', $content);
$content = preg_replace("\377^(.*)($href)\377m", '$1 µµ__~['.get_string("offline","wiki").']__µµ $2', $content);
}
#-- compare against db content
pix/smartpix.php
+4 -4
View File
@@ -21,10 +21,10 @@ function makesafe($param) {
$param = str_replace('\\\'', '\'', $param);
$param = str_replace('\\"', '"', $param);
$param = str_replace('\\', '/', $param);
$param = preg_replace('/[[:cntrl:]]|[<>"`\|\':]/', '', $param);
$param = preg_replace('/\.\.+/', '', $param);
$param = preg_replace('#//+#', '/', $param);
return preg_replace('#/(\./)+#', '/', $param);
$param = ereg_replace('[[:cntrl:]]|[<>"`\|\':]', '', $param);
$param = ereg_replace('\.\.+', '', $param);
$param = ereg_replace('//+', '/', $param);
return ereg_replace('/(\./)+', '/', $param);
}
// Nicked from weblib
question/format.php
+2 -2
View File
@@ -438,7 +438,7 @@ class qformat_default {
$filearray = file($filename);
/// Check for Macintosh OS line returns (ie file on one line), and fix
if (preg_match("/\r/", $filearray[0]) AND !preg_match("/\n/", $filearray[0])) {
if (ereg("\r", $filearray[0]) AND !ereg("\n", $filearray[0])) {
return explode("\r", $filearray[0]);
} else {
return $filearray;
@@ -583,7 +583,7 @@ class qformat_default {
fclose( $fh );
// return the (possibly) new filename
$newfile = preg_replace("#{$CFG->dataroot}/{$this->course->id}/#", '',$newfullpath);
$newfile = ereg_replace("{$CFG->dataroot}/{$this->course->id}/", '',$newfullpath);
return $newfile;
}
question/format/gift/format.php
+5 -5
View File
@@ -119,7 +119,7 @@ class qformat_gift extends qformat_default {
$question = $this->defaultquestion();
$comment = NULL;
// define replaced by simple assignment, stop redefine notices
$gift_answerweight_regex = "/^%\-*([0-9]{1,2})\.?([0-9]*)%/";
$gift_answerweight_regex = "^%\-*([0-9]{1,2})\.?([0-9]*)%";
// REMOVED COMMENTED LINES and IMPLODE
foreach ($lines as $key => $line) {
@@ -139,7 +139,7 @@ class qformat_gift extends qformat_default {
$text = $this->escapedchar_pre($text);
// Look for category modifier
if (preg_match( '/^\$CATEGORY:/', $text)) {
if (ereg( '^\$CATEGORY:', $text)) {
// $newcategory = $matches[1];
$newcategory = trim(substr( $text, 10 ));
@@ -317,7 +317,7 @@ class qformat_gift extends qformat_default {
$answer_weight = 1;
$answer = substr($answer, 1);
} elseif (preg_match($gift_answerweight_regex, $answer)) { // check for properly formatted answer weight
} elseif (ereg($gift_answerweight_regex, $answer)) { // check for properly formatted answer weight
$answer_weight = $this->answerweightparser($answer);
} else { //default, i.e., wrong anwer
@@ -408,7 +408,7 @@ class qformat_gift extends qformat_default {
$answer = trim($answer);
// Answer Weight
if (preg_match($gift_answerweight_regex, $answer)) { // check for properly formatted answer weight
if (ereg($gift_answerweight_regex, $answer)) { // check for properly formatted answer weight
$answer_weight = $this->answerweightparser($answer);
} else { //default, i.e., full-credit anwer
$answer_weight = 1;
@@ -456,7 +456,7 @@ class qformat_gift extends qformat_default {
$answer = trim($answer);
// Answer weight
if (preg_match($gift_answerweight_regex, $answer)) { // check for properly formatted answer weight
if (ereg($gift_answerweight_regex, $answer)) { // check for properly formatted answer weight
$answer_weight = $this->answerweightparser($answer);
} else { //default, i.e., full-credit anwer
$answer_weight = 1;
question/format/qti2/format.php
+2 -2
View File
@@ -33,8 +33,8 @@ class qformat_qti2 extends qformat_default {
// Remove all tabs.
$source = str_replace("\t", '', $source);
// Remove all space after ">" and before "<".
$source = preg_replace("/>( )*/", ">", $source);
$source = preg_replace("/( )*</", "<", $source);
$source = ereg_replace(">( )*", ">", $source);
$source = ereg_replace("( )*<", "<", $source);
// Iterate through the source.
$level = 0;
question/format/webct/format.php
+49 -49
View File
@@ -70,21 +70,21 @@ function qformat_webct_convert_formula($formula) {
$formula = str_replace(' ', '', $formula);
// Remove paranthesis after e,E and *10**:
while (preg_match('/[0-9.](e|E|\\*10\\*\\*)\\([+-]?[0-9]+\\)/', $formula, $regs)) {
while (ereg('[0-9.](e|E|\\*10\\*\\*)\\([+-]?[0-9]+\\)', $formula, $regs)) {
$formula = str_replace(
$regs[0], preg_replace('/[)(]/', '', $regs[0]), $formula);
$regs[0], ereg_replace('[)(]', '', $regs[0]), $formula);
}
// Replace *10** with e where possible
while (preg_match(
'/(^[+-]?|[^eE][+-]|[^0-9eE+-])[0-9.]+\\*10\\*\\*[+-]?[0-9]+([^0-9.eE]|$)/',
while (ereg(
'(^[+-]?|[^eE][+-]|[^0-9eE+-])[0-9.]+\\*10\\*\\*[+-]?[0-9]+([^0-9.eE]|$)',
$formula, $regs)) {
$formula = str_replace(
$regs[0], str_replace('*10**', 'e', $regs[0]), $formula);
}
// Replace other 10** with 1e where possible
while (preg_match('/(^|[^0-9.eE])10\\*\\*[+-]?[0-9]+([^0-9.eE]|$)/', $formula, $regs)) {
while (ereg('(^|[^0-9.eE])10\\*\\*[+-]?[0-9]+([^0-9.eE]|$)', $formula, $regs)) {
$formula = str_replace(
$regs[0], str_replace('10**', '1e', $regs[0]), $formula);
}
@@ -94,17 +94,17 @@ function qformat_webct_convert_formula($formula) {
while (2 == count($splits = explode('**', $formula, 2))) {
// Find $base
if (preg_match('/^(.*[^0-9.eE])?(([0-9]+(\\.[0-9]*)?|\\.[0-9]+)([eE][+-]?[0-9]+)?|\\{[^}]*\\})$/',
if (ereg('^(.*[^0-9.eE])?(([0-9]+(\\.[0-9]*)?|\\.[0-9]+)([eE][+-]?[0-9]+)?|\\{[^}]*\\})$',
$splits[0], $regs)) {
// The simple cases
$base = $regs[2];
$splits[0] = $regs[1];
} else if (preg_match('/\\)$/', $splits[0])) {
} else if (ereg('\\)$', $splits[0])) {
// Find the start of this parenthesis
$deep = 1;
for ($i = 1 ; $deep ; ++$i) {
if (!preg_match('/^(.*[^[:alnum:]_])?([[:alnum:]_]*([)(])([^)(]*[)(]){'.$i.'})$/',
if (!ereg('^(.*[^[:alnum:]_])?([[:alnum:]_]*([)(])([^)(]*[)(]){'.$i.'})$',
$splits[0], $regs)) {
error("Parenthesis before ** is not properly started in $splits[0]**");
}
@@ -124,17 +124,17 @@ function qformat_webct_convert_formula($formula) {
}
// Find $exp (similar to above but a little easier)
if (preg_match('/^([+-]?(\\{[^}]\\}|([0-9]+(\\.[0-9]*)?|\\.[0-9]+)([eE][+-]?[0-9]+)?))(.*)/',
if (ereg('^([+-]?(\\{[^}]\\}|([0-9]+(\\.[0-9]*)?|\\.[0-9]+)([eE][+-]?[0-9]+)?))(.*)',
$splits[1], $regs)) {
// The simple case
$exp = $regs[1];
$splits[1] = $regs[6];
} else if (preg_match('/^[+-]?[[:alnum:]_]*\\(/', $splits[1])) {
} else if (ereg('^[+-]?[[:alnum:]_]*\\(', $splits[1])) {
// Find the end of the parenthesis
$deep = 1;
for ($i = 1 ; $deep ; ++$i) {
if (!preg_match('/^([+-]?[[:alnum:]_]*([)(][^)(]*){'.$i.'}([)(]))(.*)/',
if (!ereg('^([+-]?[[:alnum:]_]*([)(][^)(]*){'.$i.'}([)(]))(.*)',
$splits[1], $regs)) {
error("Parenthesis after ** is not properly closed in **$splits[1]");
}
@@ -190,7 +190,7 @@ class qformat_webct extends qformat_default {
// Processing multiples lines strings
if (isset($questiontext) and is_string($questiontext)) {
if (preg_match("/^:/",$line)) {
if (ereg("^:",$line)) {
$question->questiontext = addslashes(trim($questiontext));
unset($questiontext);
}
@@ -201,7 +201,7 @@ class qformat_webct extends qformat_default {
}
if (isset($answertext) and is_string($answertext)) {
if (preg_match("/^:/",$line)) {
if (ereg("^:",$line)) {
$answertext = addslashes(trim($answertext));
$question->answer[$currentchoice] = $answertext;
$question->subanswers[$currentchoice] = $answertext;
@@ -214,7 +214,7 @@ class qformat_webct extends qformat_default {
}
if (isset($responsetext) and is_string($responsetext)) {
if (preg_match("/^:/",$line)) {
if (ereg("^:",$line)) {
$question->subquestions[$currentchoice] = addslashes(trim($responsetext));
unset($responsetext);
}
@@ -225,7 +225,7 @@ class qformat_webct extends qformat_default {
}
if (isset($feedbacktext) and is_string($feedbacktext)) {
if (preg_match("/^:/",$line)) {
if (ereg("^:",$line)) {
$question->feedback[$currentchoice] = addslashes(trim($feedbacktext));
unset($feedbacktext);
}
@@ -236,7 +236,7 @@ class qformat_webct extends qformat_default {
}
if (isset($generalfeedbacktext) and is_string($generalfeedbacktext)) {
if (preg_match("/^:/",$line)) {
if (ereg("^:",$line)) {
$question->tempgeneralfeedback= addslashes(trim($generalfeedbacktext));
unset($generalfeedbacktext);
}
@@ -248,7 +248,7 @@ class qformat_webct extends qformat_default {
$line = trim($line);
if (preg_match("/^:(TYPE|EOF):/i",$line)) {
if (eregi("^:(TYPE|EOF):",$line)) {
// New Question or End of File
if (isset($question)) { // if previous question exists, complete, check and save it
@@ -382,7 +382,7 @@ class qformat_webct extends qformat_default {
// Processing Question Header
if (preg_match("/^:TYPE:MC:1(.*)/i",$line,$webct_options)) {
if (eregi("^:TYPE:MC:1(.*)",$line,$webct_options)) {
// Multiple Choice Question with only one good answer
$question = $this->defaultquestion();
$question->feedback = array();
@@ -392,7 +392,7 @@ class qformat_webct extends qformat_default {
continue;
}
if (preg_match("/^:TYPE:MC:N(.*)/i",$line,$webct_options)) {
if (eregi("^:TYPE:MC:N(.*)",$line,$webct_options)) {
// Multiple Choice Question with several good answers
$question = $this->defaultquestion();
$question->feedback = array();
@@ -402,7 +402,7 @@ class qformat_webct extends qformat_default {
continue;
}
if (preg_match("/^:TYPE:S/i",$line)) {
if (eregi("^:TYPE:S",$line)) {
// Short Answer Question
$question = $this->defaultquestion();
$question->feedback = array();
@@ -412,7 +412,7 @@ class qformat_webct extends qformat_default {
continue;
}
if (preg_match("/^:TYPE:C/i",$line)) {
if (eregi("^:TYPE:C",$line)) {
// Calculated Question
/* $warnings[] = get_string("calculatedquestion", "quiz", $nLineCounter);
unset($question);
@@ -434,7 +434,7 @@ class qformat_webct extends qformat_default {
continue;
}
if (preg_match("/^:TYPE:M/i",$line)) {
if (eregi("^:TYPE:M",$line)) {
// Match Question
$question = $this->defaultquestion();
$question->qtype = MATCH;
@@ -443,7 +443,7 @@ class qformat_webct extends qformat_default {
continue;
}
if (preg_match("/^:TYPE:P/i",$line)) {
if (eregi("^:TYPE:P",$line)) {
// Paragraph Question
$warnings[] = get_string("paragraphquestion", "quiz", $nLineCounter);
unset($question);
@@ -451,7 +451,7 @@ class qformat_webct extends qformat_default {
continue;
}
if (preg_match("/^:TYPE:/i",$line)) {
if (eregi("^:TYPE:",$line)) {
// Unknow Question
$warnings[] = get_string("unknowntype", "quiz", $nLineCounter);
unset($question);
@@ -463,7 +463,7 @@ class qformat_webct extends qformat_default {
continue;
}
if (preg_match("/^:TITLE:(.*)/i",$line,$webct_options)) {
if (eregi("^:TITLE:(.*)",$line,$webct_options)) {
$name = trim($webct_options[1]);
if (strlen($name) > 255) {
$name = substr($name,0,250)."...";
@@ -473,9 +473,9 @@ class qformat_webct extends qformat_default {
continue;
}
if (preg_match("/^:IMAGE:(.*)/",$line,$webct_options)) {
if (eregi("^:IMAGE:(.*)",$line,$webct_options)) {
$filename = trim($webct_options[1]);
if (preg_match("#^http://#",$filename)) {
if (eregi("^http://",$filename)) {
$question->image = $filename;
}
continue;
@@ -486,9 +486,9 @@ class qformat_webct extends qformat_default {
if (!isset($question)) {
continue;
}
if (isset($question->qtype ) && CALCULATED == $question->qtype && preg_match(
"/^:([[:lower:]].*|::.*)-(MIN|MAX|DEC|VAL([0-9]+))::?:?($webctnumberregex)/", $line, $webct_options)) {
$datasetname = preg_replace('/^::/', '', $webct_options[1]);
if (isset($question->qtype ) && CALCULATED == $question->qtype && ereg(
"^:([[:lower:]].*|::.*)-(MIN|MAX|DEC|VAL([0-9]+))::?:?($webctnumberregex)", $line, $webct_options)) {
$datasetname = ereg_replace('^::', '', $webct_options[1]);
$datasetvalue = qformat_webct_convert_formula($webct_options[4]);
switch ($webct_options[2]) {
case 'MIN':
@@ -512,27 +512,27 @@ class qformat_webct extends qformat_default {
}
$bIsHTMLText = preg_match("/:H$/",$line); // True if next lines are coded in HTML
if (preg_match("/^:QUESTION/",$line)) {
$bIsHTMLText = eregi(":H$",$line); // True if next lines are coded in HTML
if (eregi("^:QUESTION",$line)) {
$questiontext=""; // Start gathering next lines
continue;
}
if (preg_match("/^:ANSWER([0-9]+):([^:]+):([0-9\.\-]+):(.*)/i",$line,$webct_options)) { /// SHORTANSWER
if (eregi("^:ANSWER([0-9]+):([^:]+):([0-9\.\-]+):(.*)",$line,$webct_options)) { /// SHORTANSWER
$currentchoice=$webct_options[1];
$answertext=$webct_options[2]; // Start gathering next lines
$question->fraction[$currentchoice]=($webct_options[3]/100);
continue;
}
if (preg_match("/^:ANSWER([0-9]+):([0-9\.\-]+)/i",$line,$webct_options)) {
if (eregi("^:ANSWER([0-9]+):([0-9\.\-]+)",$line,$webct_options)) {
$answertext=""; // Start gathering next lines
$currentchoice=$webct_options[1];
$question->fraction[$currentchoice]=($webct_options[2]/100);
continue;
}
if (preg_match('/^:FORMULA:(.*)/i', $line, $webct_options)) {
if (eregi('^:FORMULA:(.*)', $line, $webct_options)) {
// Answer for a CALCULATED question
++$currentchoice;
$question->answers[$currentchoice] =
@@ -556,60 +556,60 @@ class qformat_webct extends qformat_default {
continue;
}
if (preg_match("/^:L([0-9]+)/i",$line,$webct_options)) {
if (eregi("^:L([0-9]+)",$line,$webct_options)) {
$answertext=""; // Start gathering next lines
$currentchoice=$webct_options[1];
$question->fraction[$currentchoice]=1;
continue;
}
if (preg_match("/^:R([0-9]+)/i",$line,$webct_options)) {
if (eregi("^:R([0-9]+)",$line,$webct_options)) {
$responsetext=""; // Start gathering next lines
$currentchoice=$webct_options[1];
continue;
}
if (preg_match("/^:REASON([0-9]+):?/i",$line,$webct_options)) {
if (eregi("^:REASON([0-9]+):?",$line,$webct_options)) {
$feedbacktext=""; // Start gathering next lines
$currentchoice=$webct_options[1];
continue;
}
if (preg_match("/^:FEEDBACK([0-9]+):?/i",$line,$webct_options)) {
if (eregi("^:FEEDBACK([0-9]+):?",$line,$webct_options)) {
$generalfeedbacktext=""; // Start gathering next lines
$currentchoice=$webct_options[1];
continue;
}
if (preg_match('/^:FEEDBACK:(.*)/i',$line,$webct_options)) {
if (eregi('^:FEEDBACK:(.*)',$line,$webct_options)) {
$generalfeedbacktext=""; // Start gathering next lines
continue;
}
if (preg_match('/^:LAYOUT:(.*)/i',$line,$webct_options)) {
if (eregi('^:LAYOUT:(.*)',$line,$webct_options)) {
// ignore since layout in question_multichoice is no more used in moodle
// $webct_options[1] contains either vertical or horizontal ;
continue;
}
if (isset($question->qtype ) && CALCULATED == $question->qtype && preg_match('/^:ANS-DEC:([1-9][0-9]*)/i', $line, $webct_options)) {
if (isset($question->qtype ) && CALCULATED == $question->qtype && eregi('^:ANS-DEC:([1-9][0-9]*)', $line, $webct_options)) {
// We can but hope that this always appear before the ANSTYPE property
$question->correctanswerlength[$currentchoice] = $webct_options[1];
continue;
}
if (isset($question->qtype )&& CALCULATED == $question->qtype && preg_match("/^:TOL:($webctnumberregex)/i", $line, $webct_options)) {
if (isset($question->qtype )&& CALCULATED == $question->qtype && eregi("^:TOL:($webctnumberregex)", $line, $webct_options)) {
// We can but hope that this always appear before the TOL property
$question->tolerance[$currentchoice] =
qformat_webct_convert_formula($webct_options[1]);
continue;
}
if (isset($question->qtype )&& CALCULATED == $question->qtype && preg_match('/^:TOLTYPE:percent/', $line)) {
if (isset($question->qtype )&& CALCULATED == $question->qtype && eregi('^:TOLTYPE:percent', $line)) {
// Percentage case is handled as relative in Moodle:
$question->tolerance[$currentchoice] /= 100;
$question->tolerancetype[$currentchoice] = 1; // Relative
continue;
}
if (preg_match('/^:UNITS:(.+)/', $line, $webct_options)
if (eregi('^:UNITS:(.+)', $line, $webct_options)
and $webctunits = trim($webct_options[1])) {
// This is a guess - I really do not know how different webct units are separated...
$webctunits = explode(':', $webctunits);
@@ -621,7 +621,7 @@ class qformat_webct extends qformat_default {
continue;
}
if (!empty($question->units) && preg_match('/^:UNITREQ:(.*)/', $line, $webct_options)
if (!empty($question->units) && eregi('^:UNITREQ:(.*)', $line, $webct_options)
&& !$webct_options[1]) {
// There are units but units are not required so add the no unit alternative
// We can but hope that the UNITS property always appear before this property
@@ -631,17 +631,17 @@ class qformat_webct extends qformat_default {
continue;
}
if (!empty($question->units) && preg_match('/^:UNITCASE:/', $line)) {
if (!empty($question->units) && eregi('^:UNITCASE:', $line)) {
// This could be important but I was not able to figure out how
// it works so I ignore it for now
continue;
}
if (isset($question->qtype )&& CALCULATED == $question->qtype && preg_match('/^:ANSTYPE:dec/', $line)) {
if (isset($question->qtype )&& CALCULATED == $question->qtype && eregi('^:ANSTYPE:dec', $line)) {
$question->correctanswerformat[$currentchoice]='1';
continue;
}
if (isset($question->qtype )&& CALCULATED == $question->qtype && preg_match('/^:ANSTYPE:sig/', $line)) {
if (isset($question->qtype )&& CALCULATED == $question->qtype && eregi('^:ANSTYPE:sig', $line)) {
$question->correctanswerformat[$currentchoice]='2';
continue;
}
question/format/xml/format.php
+2 -2
View File
@@ -921,9 +921,9 @@ class qformat_xml extends qformat_default {
case MULTIANSWER:
$a_count=1;
foreach($question->options->questions as $question) {
$thispattern = '/'.addslashes("{#".$a_count."}").'/';
$thispattern = addslashes("{#".$a_count."}");
$thisreplace = $question->questiontext;
$expout=preg_replace($thispattern, $thisreplace, $expout );
$expout=ereg_replace($thispattern, $thisreplace, $expout );
$a_count++;
}
break;
question/type/calculated/edit_calculated_form.php
+1 -1
View File
@@ -170,7 +170,7 @@ class question_edit_calculated_form extends question_edit_form {
$qtextremaining = str_replace('{'.$name.'}', '1', $qtextremaining);
}
// echo "numericalquestion qtextremaining <pre>";print_r($possibledatasets);
while (preg_match('/\{=([^[:space:]}]*)}/', $qtextremaining, $regs1)) {
while (ereg('\{=([^[:space:]}]*)}', $qtextremaining, $regs1)) {
$qtextsplits = explode($regs1[0], $qtextremaining, 2);
$qtext =$qtext.$qtextsplits[0];
$qtextremaining = $qtextsplits[1];
question/type/calculated/questiontype.php
+11 -11
View File
@@ -382,7 +382,7 @@ class question_calculated_qtype extends question_dataset_dependent_questiontype
//evaluate the equations i.e {=5+4)
$qtext = "";
$qtextremaining = $numericalquestion->questiontext ;
while (preg_match('/\{=([^[:space:]}]*)}/', $qtextremaining, $regs1)) {
while (ereg('\{=([^[:space:]}]*)}', $qtextremaining, $regs1)) {
$qtextsplits = explode($regs1[0], $qtextremaining, 2);
$qtext =$qtext.$qtextsplits[0];
$qtextremaining = $qtextsplits[1];
@@ -501,7 +501,7 @@ class question_calculated_qtype extends question_dataset_dependent_questiontype
function custom_generator_set_data($datasetdefs, $formdata){
$idx = 1;
foreach ($datasetdefs as $datasetdef){
if (preg_match('/^(uniform|loguniform):([^:]*):([^:]*):([0-9]*)$/', $datasetdef->options, $regs)) {
if (ereg('^(uniform|loguniform):([^:]*):([^:]*):([0-9]*)$', $datasetdef->options, $regs)) {
$defid = "$datasetdef->type-$datasetdef->category-$datasetdef->name";
$formdata["calcdistribution[$idx]"] = $regs[1];
$formdata["calcmin[$idx]"] = $regs[2];
@@ -514,7 +514,7 @@ class question_calculated_qtype extends question_dataset_dependent_questiontype
}
function custom_generator_tools($datasetdef) {
if (preg_match('/^(uniform|loguniform):([^:]*):([^:]*):([0-9]*)$/',
if (ereg('^(uniform|loguniform):([^:]*):([^:]*):([0-9]*)$',
$datasetdef->options, $regs)) {
$defid = "$datasetdef->type-$datasetdef->category-$datasetdef->name";
for ($i = 0 ; $i<10 ; ++$i) {
@@ -723,7 +723,7 @@ class question_calculated_qtype extends question_dataset_dependent_questiontype
}
function generate_dataset_item($options) {
if (!preg_match('/^(uniform|loguniform):([^:]*):([^:]*):([0-9]*)$/',
if (!ereg('^(uniform|loguniform):([^:]*):([^:]*):([0-9]*)$',
$options, $regs)) {
// Unknown options...
return false;
@@ -825,7 +825,7 @@ class question_calculated_qtype extends question_dataset_dependent_questiontype
// list($options, $selected) = $this->dataset_optionsa($form, $name);
foreach ($options as $key => $whatever) {
if (!preg_match('/^'.LITERAL.'-/', $key) && $key != '0') {
if (!ereg('^'.LITERAL.'-', $key) && $key != '0') {
unset($options[$key]);
}
}
@@ -1173,7 +1173,7 @@ function qtype_calculated_calculate_answer($formula, $individualdata,
if ($answerlength) {
/* Try to include missing zeros at the end */
if (preg_match('/^(.*\\.)(.*)$/', $calculated->answer, $regs)) {
if (ereg('^(.*\\.)(.*)$', $calculated->answer, $regs)) {
$calculated->answer = $regs[1] . substr(
$regs[2] . '00000000000000000000000000000000000000000x',
0, $answerlength)
@@ -1233,7 +1233,7 @@ function qtype_calculated_calculate_answer($formula, $individualdata,
$calculated->answer = $sign.$answer.$unit;
} else {
// Could be an idea to add some zeros here
$answer .= (preg_match('/^[0-9]*$/', $answer) ? '.' : '')
$answer .= (ereg('^[0-9]*$', $answer) ? '.' : '')
. '00000000000000000000000000000000000000000x';
$oklen = $answerlength + ($p10 < 1 ? 2-$p10 : 1);
$calculated->answer = $sign.substr($answer, 0, $oklen).$unit;
@@ -1254,7 +1254,7 @@ function qtype_calculated_find_formula_errors($formula) {
/// Returns false if everything is alright.
/// Otherwise it constructs an error message
// Strip away dataset names
while (preg_match('/\\{[[:alpha:]][^>} <{"\']*\\}/', $formula, $regs)) {
while (ereg('\\{[[:alpha:]][^>} <{"\']*\\}', $formula, $regs)) {
$formula = str_replace($regs[0], '1', $formula);
}
@@ -1265,7 +1265,7 @@ function qtype_calculated_find_formula_errors($formula) {
$operatorornumber = "[$safeoperatorchar.0-9eE]";
while (preg_match("/(^|[$safeoperatorchar,(])([a-z0-9_]*)\\(($operatorornumber+(,$operatorornumber+((,$operatorornumber+)+)?)?)?\\)/",
while (ereg("(^|[$safeoperatorchar,(])([a-z0-9_]*)\\(($operatorornumber+(,$operatorornumber+((,$operatorornumber+)+)?)?)?\\)",
$formula, $regs)) {
switch ($regs[2]) {
@@ -1328,11 +1328,11 @@ function qtype_calculated_find_formula_errors($formula) {
$formula = str_replace($regs[0], $regs[1] . '1', $formula);
} else {
// The function call starts the formula
$formula = preg_replace("/^$regs[2]\\([^)]*\\)/", '1', $formula);
$formula = ereg_replace("^$regs[2]\\([^)]*\\)", '1', $formula);
}
}
if (preg_match("/[^$safeoperatorchar.0-9eE]+/", $formula, $regs)) {
if (ereg("[^$safeoperatorchar.0-9eE]+", $formula, $regs)) {
return get_string('illegalformulasyntax', 'quiz', $regs[0]);
} else {
// Formula just might be valid
question/type/datasetdependent/abstractqtype.php
+3 -3
View File
@@ -49,7 +49,7 @@ class question_dataset_dependent_questiontype extends default_questiontype {
}
function restore_session_and_responses(&$question, &$state) {
if (!preg_match('/^dataset([0-9]+)[^-]*-(.*)$/',
if (!ereg('^dataset([0-9]+)[^-]*-(.*)$',
$state->responses[''], $regs)) {
notify ("Wrongly formatted raw response answer " .
"{$state->responses['']}! Could not restore session for " .
@@ -732,7 +732,7 @@ class question_dataset_dependent_questiontype extends default_questiontype {
/// Returns the possible dataset names found in the text as an array
/// The array has the dataset name for both key and value
$datasetnames = array();
while (preg_match('/\\{([[:alpha:]][^>} <{"\']*)\\}/', $text, $regs)) {
while (ereg('\\{([[:alpha:]][^>} <{"\']*)\\}', $text, $regs)) {
$datasetnames[$regs[1]] = $regs[1];
$text = str_replace($regs[0], '', $text);
}
@@ -740,7 +740,7 @@ class question_dataset_dependent_questiontype extends default_questiontype {
}
function create_virtual_nameprefix($nameprefix, $datasetinput) {
if (!preg_match('/([0-9]+)/' . $this->name() . '$', $nameprefix, $regs)) {
if (!ereg('([0-9]+)' . $this->name() . '$', $nameprefix, $regs)) {
error("Wrongly formatted nameprefix $nameprefix");
}
$virtualqtype = $this->get_virtual_qtype();
search/documents/assignment_document.php
+1 -1
View File
@@ -140,7 +140,7 @@ function assignment_get_content_for_index(&$assignment) {
} elseif ($submitted->source = 'files'){
$SUBMITTED = opendir($submitted->path);
while($entry = readdir($SUBMITTED)){
if (preg_match("/^\./", $entry)) continue; // exclude hidden and dirs . and ..
if (ereg("^\.", $entry)) continue; // exclude hidden and dirs . and ..
$path = "{$submitted->path}/{$entry}";
$documents[] = assignment_get_physical_file($submission, $assignment, $cm, $path, $context_id, $documents);
mtrace("finished attachement $path for {$submission->authors} in assignement {$assignment->name}");