Minor - removing whitespaces adding comments

main/admin/extra_field_options.php

@@ -23,7 +23,6 @@ if ($type == 'question') {
     api_protect_admin_script();
 }
 
-
 //Add the JS needed to use the jqgrid
 $htmlHeadXtra[] = api_get_jqgrid_js();
 

main/exercice/question.class.php

@@ -1471,7 +1471,6 @@ abstract class Question
             $form->addElement('html', '</div>');
         }
 
-
         // hidden values
         $my_id = isset($_REQUEST['myid']) ? intval($_REQUEST['myid']) : null;
         $form->addElement('hidden', 'myid', $my_id);
@@ -1518,7 +1517,6 @@ abstract class Question
             $form->addElement('select', 'parent_id', get_lang('AttachToMedia'), $course_medias);
 
             // Inject question extra fields!
-            //Extra fields
             $extraFields = new ExtraField('question');
             $extraFields->add_elements($form, $this->id);
 
@@ -1527,7 +1525,7 @@ abstract class Question
             }
         }
 
-        //@todo why we need this condition??
+        // @todo why we need this condition??
         if ($this->setDefaultQuestionValues) {
             switch ($answerType) {
                 case 1:

main/inc/global.inc.php

@@ -194,9 +194,7 @@ require_once __DIR__.'/../../src/ChamiloLMS/Resources/config/dev.php';
 
 // Classic way of render pages or the Controller approach
 $app['classic_layout'] = false;
-
 $app['full_width'] = false;
-
 $app['breadcrumb'] = array();
 
 // The script is allowed? This setting is modified when calling api_is_not_allowed()

main/inc/lib/main_api.lib.php

@@ -3574,8 +3574,9 @@ function api_get_language_from_type($lang_type)
             break;
         case 'course_lang':
             $_course = api_get_course_info();
-            if (isset($_course['language']) && !empty($_course['language']) )
+            if (isset($_course['language']) && !empty($_course['language'])) {
                 $language = $_course['language'];
+            }
             break;
         default :
             $language = false;
@@ -6821,6 +6822,8 @@ function api_get_language_interface() {
             $language_interface = $courseInfo['language'];
         }
 
+        //error_log('$language_interface: '.$language_interface);
+
         // Lang priorities could be: course_lang, user_profil_lang, user_selected_lang , platform_lang
 
         $language_priority1 = api_get_setting('languagePriority1');
@@ -6828,6 +6831,11 @@ function api_get_language_interface() {
         $language_priority3 = api_get_setting('languagePriority3');
         $language_priority4 = api_get_setting('languagePriority4');
 
+        /*error_log('$language_interface1: '.$language_priority1);
+        error_log('$language_interface2: '.$language_priority2);
+        error_log('$language_interface3: '.$language_priority3);
+        error_log('$language_interface4: '.$language_priority4);*/
+
         if (!empty($language_priority4) && api_get_language_from_type($language_priority4) !== false) {
             $language_interface = api_get_language_from_type($language_priority4);
         }

tests/doctrine_console/cli-config.php

@@ -135,6 +135,9 @@ sudo mkdir mapping generated repository
 You can add a Namespace if you want to with: --namespace "Entity"
 sudo php5 doctrine.php orm:convert-mapping --force --from-database --namespace "Entity" annotation mapping
 
+with no namepsace
+sudo php5 doctrine.php orm:convert-mapping --force --from-database annotation mapping
+
 
 1. Generate entities