Merge branch 'MDL-66965' of https://github.com/stronk7/moodle

backup/cc/cc_lib/gral_lib/pathutils.php

@@ -88,9 +88,9 @@ function stripUrl($path, $rootDir='') {
  */
 function toNativePath(&$path) {
     for ($count = 0 ; $count < strlen($path); ++$count) {
-        $chr = $path{$count};
+        $chr = $path[$count];
         if (($chr == '\\') || ($chr == '/')) {
-            $path{$count} = '/';
+            $path[$count] = '/';
         }
     }
 }
@@ -104,9 +104,9 @@ function toNativePath(&$path) {
  */
 function toNativePath2(&$path) {
     for ($count = 0 ; $count < strlen($path); ++$count) {
-        $chr = $path{$count};
+        $chr = $path[$count];
         if (($chr == '\\') || ($chr == '/')) {
-            $path{$count} = DIRECTORY_SEPARATOR;
+            $path[$count] = DIRECTORY_SEPARATOR;
         }
     }
 }
@@ -118,9 +118,9 @@ function toNativePath2(&$path) {
  */
 function toUrlPath(&$path) {
     for ($count = 0 ; $count < strlen($path); ++$count) {
-        $chr = $path{$count};
+        $chr = $path[$count];
         if (($chr == '\\')) {
-            $path{$count} = '/';
+            $path[$count] = '/';
         }
     }
 }

draftfile.php

@@ -41,7 +41,7 @@
 // relative path must start with '/'
 if (!$relativepath) {
     print_error('invalidargorconf');
-} else if ($relativepath{0} != '/') {
+} else if ($relativepath[0] != '/') {
     print_error('pathdoesnotstartslash');
 }
 

enrol/ldap/lib.php

@@ -434,7 +434,7 @@ public function sync_enrolments(progress_trace $trace, $onecourse = null) {
                     $ignorehidden = $this->get_config('ignorehiddencourses');
                     foreach($flat_records as $course) {
                         $course = array_change_key_case($course, CASE_LOWER);
-                        $idnumber = $course{$this->config->course_idnumber}[0];
+                        $idnumber = $course[$this->config->course_idnumber][0];
                         $trace->output(get_string('synccourserole', 'enrol_ldap', array('idnumber'=>$idnumber, 'role_shortname'=>$role->shortname)));
 
                         // Does the course exist in moodle already?

file.php

@@ -42,7 +42,7 @@
 // relative path must start with '/', because of backup/restore!!!
 if (!$relativepath) {
     print_error('invalidargorconf');
-} else if ($relativepath{0} != '/') {
+} else if ($relativepath[0] != '/') {
     print_error('pathdoesnotstartslash');
 }
 

lib/classes/text.php

@@ -721,19 +721,19 @@ public static function utf8ord($utf8char) {
         if ($utf8char == '') {
             return 0;
         }
-        $ord0 = ord($utf8char{0});
+        $ord0 = ord($utf8char[0]);
         if ($ord0 >= 0 && $ord0 <= 127) {
             return $ord0;
         }
-        $ord1 = ord($utf8char{1});
+        $ord1 = ord($utf8char[1]);
         if ($ord0 >= 192 && $ord0 <= 223) {
             return ($ord0 - 192) * 64 + ($ord1 - 128);
         }
-        $ord2 = ord($utf8char{2});
+        $ord2 = ord($utf8char[2]);
         if ($ord0 >= 224 && $ord0 <= 239) {
             return ($ord0 - 224) * 4096 + ($ord1 - 128) * 64 + ($ord2 - 128);
         }
-        $ord3 = ord($utf8char{3});
+        $ord3 = ord($utf8char[3]);
         if ($ord0 >= 240 && $ord0 <= 247) {
             return ($ord0 - 240) * 262144 + ($ord1 - 128 )* 4096 + ($ord2 - 128) * 64 + ($ord3 - 128);
         }

lib/moodlelib.php

@@ -5734,7 +5734,7 @@ function moodle_process_email($modargs, $body) {
     global $DB;
 
     // The first char should be an unencoded letter. We'll take this as an action.
-    switch ($modargs{0}) {
+    switch ($modargs[0]) {
         case 'B': { // Bounce.
             list(, $userid) = unpack('V', base64_decode(substr($modargs, 1, 8)));
             if ($user = $DB->get_record("user", array('id' => $userid), "id,email")) {

lib/weblib.php

@@ -2978,10 +2978,10 @@ function obfuscate_email($email) {
     $length = strlen($email);
     $obfuscated = '';
     while ($i < $length) {
-        if (rand(0, 2) && $email{$i}!='@') { // MDL-20619 some browsers have problems unobfuscating @.
-            $obfuscated.='%'.dechex(ord($email{$i}));
+        if (rand(0, 2) && $email[$i]!='@') { // MDL-20619 some browsers have problems unobfuscating @.
+            $obfuscated.='%'.dechex(ord($email[$i]));
         } else {
-            $obfuscated.=$email{$i};
+            $obfuscated.=$email[$i];
         }
         $i++;
     }

lib/wiki_to_markdown.php

@@ -147,7 +147,7 @@ function do_list( $line, $blank=false ) {
       $count = 0;
     }
     else {
-      $listchar = $line{0};
+      $listchar = $line[0];
       $count = strspn( $line, $listchar );
       $line = preg_replace( "/^[".$listchar."]+ /i", "", $line );
     }

mod/quiz/report/statistics/tests/statistics_test.php

@@ -157,9 +157,9 @@ public function get_fields_from_csv($line) {
         $cnt = count($items);
         for ($key = 0; $key < $cnt; $key++) {
             if ($items[$key]!='') {
-                if ($start = ($items[$key]{0}=='"')) {
+                if ($start = ($items[$key][0]=='"')) {
                     $items[$key] = substr($items[$key], 1);
-                    while (!$end = ($items[$key]{strlen($items[$key])-1}=='"')) {
+                    while (!$end = ($items[$key][strlen($items[$key])-1]=='"')) {
                         $item = $items[$key];
                         unset($items[$key]);
                         $key++;

question/engine/questionusage.php

@@ -701,7 +701,7 @@ public function prepare_simulated_post_data($simulatedresponses) {
             // Behaviour vars should not be processed by question type, just add prefix.
             $behaviourvars = $this->get_question_attempt($slot)->get_behaviour()->get_expected_data();
             foreach (array_keys($responsedata) as $responsedatakey) {
-                if ($responsedatakey{0} === '-') {
+                if ($responsedatakey[0] === '-') {
                     $behaviourvarname = substr($responsedatakey, 1);
                     if (isset($behaviourvars[$behaviourvarname])) {
                         // Expected behaviour var found.

question/format/gift/format.php

@@ -283,7 +283,7 @@ public function readquestion($lines) {
         } else if ($answertext == '') {
             $question->qtype = 'essay';
 
-        } else if ($answertext{0} == '#') {
+        } else if ($answertext[0] == '#') {
             $question->qtype = 'numerical';
 
         } else if (strpos($answertext, '~') !== false) {