瀏覽代碼

Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

Angel Fernando Quiroz Campos 8 年之前
父節點
當前提交
23c381f347

+ 2 - 1
main/admin/configure_homepage.php

@@ -1236,6 +1236,7 @@ switch ($action) {
                 </div>
             </div>
         </section>
-        <?php break;
+        <?php
+        break;
 }
 Display::display_footer();

+ 1 - 1
main/auth/cas/authcas.php

@@ -124,7 +124,7 @@ function cas_is_authenticated()
                             $user_added = $login;
                         }
                         break;
-                    default :
+                    default:
                         break;
                 }
                 return $user_added;

+ 1 - 1
main/exercise/export/aiken/aiken_classes.php

@@ -35,7 +35,7 @@ class Aiken2Question extends Question
             case MCUA :
                 $answer = new AikenAnswerMultipleChoice($this->id);
             	return $answer;
-            default :
+            default:
                 $answer = null;
                 break;
         }

+ 1 - 1
main/gradebook/lib/be/evallink.class.php

@@ -49,7 +49,7 @@ abstract class EvalLink extends AbstractLink
         if (api_is_allowed_to_edit()) {
             return 'gradebook_view_result.php?'.api_get_cidreq().'&selecteval='.$eval->get_id();
         } // students can go to the statistics page (if custom display enabled)
-        elseif (ScoreDisplay :: instance()->is_custom()) {
+        elseif (ScoreDisplay::instance()->is_custom()) {
             return 'gradebook_statistics.php?'.api_get_cidreq().'&selecteval='.$eval->get_id();
         } else {
             return null;

+ 3 - 1
main/gradebook/lib/fe/gradebooktable.class.php

@@ -982,7 +982,8 @@ class GradebookTable extends SortableTable
                     .$item->get_name()
                     .'</a>'
                     .($item->is_course() ? ' &nbsp;['.$item->get_course_code().']'.$show_message : '');
-            // evaluation
+                // evaluation
+                //no break because of return
             case 'E':
                 $cat = new Category();
                 $course_id = CourseManager::get_course_by_category($categoryId);
@@ -1021,6 +1022,7 @@ class GradebookTable extends SortableTable
                 } else {
                     return '['.get_lang('Evaluation').']&nbsp;&nbsp;'.$item->get_name().$show_message;
                 }
+                // no break because of return
             case 'L':
                 // link
                 $cat = new Category();

File diff suppressed because it is too large
+ 113 - 113
main/lp/learnpathItem.class.php


+ 0 - 1
main/lp/lp_controller.php

@@ -1197,7 +1197,6 @@ switch ($action) {
         require 'lp_view.php';
         break;
     case 'switch_view_mode':
-
         if (!$lp_found) {
             error_log('New LP - No learnpath given for switch', 0);
             require 'lp_list.php';

+ 1 - 1
main/webservices/cm_webservice_user.php

@@ -88,7 +88,7 @@ class WSCMUser extends WSCM
                 case 'bothlf' :
                     return $userInfo['lastname']." ".$userInfo['firstname'];
                     break;
-                default :
+                default:
                     return $userInfo['firstname'];
             }
 

+ 0 - 1
plugin/buycourses/src/process_confirm.php

@@ -163,7 +163,6 @@ switch ($sale['payment_type']) {
         break;
 
     case BuyCoursesPlugin::PAYMENT_TYPE_CULQI:
-
         // We need to include the main online script, acording to the Culqi documentation the JS needs to be loeaded
         // directly from the main url "https://integ-pago.culqi.com" because a local copy of this JS is not supported
         $htmlHeadXtra[] = '<script src="//integ-pago.culqi.com/js/v1"></script>';

+ 1 - 1
plugin/vchamilo/lib/Virtual.php

@@ -38,7 +38,7 @@ class Virtual
         // pre hook to chamilo main table and get alternate configuration.
         // sure Database object is not set up. Soo use bootstrap connection
         /** @var \Doctrine\DBAL\Connection $connection */
-        $connection = Virtual::bootConnection($_configuration);
+        $connection = self::bootConnection($_configuration);
 
         $query = "SELECT * FROM vchamilo WHERE root_web = '$virtualChamiloWebRoot'";
         $result = $connection->executeQuery($query);

Some files were not shown because too many files changed in this diff