Yannick Warnier 8 лет назад
Родитель
Сommit
6bbe303a26

+ 2 - 2
main/exercise/exercise_result.class.php

@@ -179,7 +179,7 @@ class ExerciseResult
                             FROM $TBL_TRACK_ATTEMPT_RECORDING
                             WHERE 
                                 author != '' AND 
-                                exe_id = ".Database :: escape_string($result['exid'])."
+                                exe_id = ".Database::escape_string($result['exid'])."
                             LIMIT 1";
                 $query = Database::query($sql_exe);
 
@@ -374,7 +374,7 @@ class ExerciseResult
 
             // Email
             $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
-            $data .= str_replace("\r\n",'  ',implode(", ", GroupManager :: get_user_group_name($row['user_id']))).';';
+            $data .= str_replace("\r\n",'  ',implode(", ", GroupManager::get_user_group_name($row['user_id']))).';';
 
             if ($export_user_fields) {
                 //show user fields data, if any, for this user

+ 2 - 2
main/inc/lib/add_courses_to_session_functions.lib.php

@@ -100,7 +100,7 @@ class AddCourseToSession
             $rs = Database::query($sql);
             $course_list = array();
             if ($type == 'single') {
-                while ($course = Database :: fetch_array($rs)) {
+                while ($course = Database::fetch_array($rs)) {
                     $course_list[] = $course['code'];
                     $course_title = str_replace("'", "\'", $course_title);
                     $return .= '<a href="javascript: void(0);" onclick="javascript: add_course_to_session(\''.$course['id'].'\',\''.$course_title.' ('.$course['visual_code'].')'.'\')">'.$course['title'].' ('.$course['visual_code'].')</a><br />';
@@ -108,7 +108,7 @@ class AddCourseToSession
                 $xajax_response -> addAssign('ajax_list_courses_single', 'innerHTML', api_utf8_encode($return));
             } else {
                 $return .= '<select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:340px;">';
-                while ($course = Database :: fetch_array($rs)) {
+                while ($course = Database::fetch_array($rs)) {
                     $course_list[] = $course['code'];
                     $course_title = str_replace("'", "\'", $course_title);
                     $return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['title'].' ('.$course['visual_code'].')', ENT_QUOTES).'">'.$course['title'].' ('.$course['visual_code'].')</option>';

+ 2 - 2
main/inc/lib/database.lib.php

@@ -572,11 +572,11 @@ class Database
                         if (is_array($value_array)) {
                             $clean_values = array();
                             foreach ($value_array as $item) {
-                                $item = Database::escape_string($item);
+                                $item = self::escape_string($item);
                                 $clean_values[]= $item;
                             }
                         } else {
-                            $value_array = Database::escape_string($value_array);
+                            $value_array = self::escape_string($value_array);
                             $clean_values = $value_array;
                         }
 

+ 1 - 1
main/inc/lib/document.lib.php

@@ -1035,7 +1035,7 @@ class DocumentManager
             			a.ref = $document_id 
                     LIMIT 1";
             $result = Database::query($sql);
-            $doc_details = Database ::fetch_array($result, 'ASSOC');
+            $doc_details = Database::fetch_array($result, 'ASSOC');
 
             if ($doc_details['readonly'] == 1) {
                 return !($doc_details['insert_user_id'] == $user_id || api_is_platform_admin());

+ 2 - 2
main/inc/lib/myspace.lib.php

@@ -2341,7 +2341,7 @@ class MySpace
             case 'Contact' :
                 $user = array ();
                 break;
-            default :
+            default:
                 $current_tag = $data;
         }
     }
@@ -2361,7 +2361,7 @@ class MySpace
                 $user['UserName'] = UserManager::purify_username($user['UserName'], $purification_option_for_usernames);
                 $users[] = $user;
                 break;
-            default :
+            default:
                 $user[$data] = $current_value;
                 break;
         }

+ 12 - 1
main/install/install.lib.php

@@ -3050,9 +3050,11 @@ function get_group_picture_path_by_id($id, $type = 'web', $preview = false, $ano
 }
 
 /**
+ * Control the different steps of the migration through a big switch
  * @param string $fromVersion
  * @param EntityManager $manager
  * @param bool $processFiles
+ * @return bool Always returns true except if the process is broken
  */
 function migrateSwitch($fromVersion, $manager, $processFiles = true)
 {
@@ -3068,17 +3070,26 @@ function migrateSwitch($fromVersion, $manager, $processFiles = true)
 
     switch ($fromVersion) {
         case '1.9.0':
+            //no break
         case '1.9.2':
+            //no break
         case '1.9.4':
+            //no break
         case '1.9.6':
+            //no break
         case '1.9.6.1':
+            //no break
         case '1.9.8':
+            //no break
         case '1.9.8.1':
+            //no break
         case '1.9.8.2':
+            //no break
         case '1.9.10':
+            //no break
         case '1.9.10.2':
+            //no break
         case '1.9.10.4':
-
             $database = new Database();
             $database->setManager($manager);
 

+ 2 - 2
main/webservices/cm_webservice_inbox.php

@@ -84,7 +84,7 @@ class WSCMInbox extends WSCM
                     $htmlcode = true;
                     $field_table = "content";
                     break;
-                default :
+                default:
                     $field_table = "title";
             }
 
@@ -152,7 +152,7 @@ class WSCMInbox extends WSCM
                     $htmlcode = true;
                     $field_table = "content";
                     break;
-                default :
+                default:
                     $field_table = "title";
 
             }