Minor cosmetic changes

main/admin/extra_fields.php

@@ -182,4 +182,4 @@ switch ($action) {
         $obj->display();
         break;
 }
-Display :: display_footer();
+Display :: display_footer();

main/exercice/exercise_reminder.php

@@ -154,10 +154,7 @@ $remind_list = $exercise_stat_info['questions_to_check'];
 $remind_list = explode(',', $remind_list);
 
 echo Display::label(get_lang('QuestionWithNoAnswer'), 'warning');
-//echo ' ';
-//echo Display::label(get_lang('Categories'), 'info');
 echo '<hr>';
-
 echo '<div class="clear"></div><br />';
 
 $table = '<div class="row">';
@@ -175,6 +172,7 @@ $cols = 1;
 
 // Loop over all question to show results for each of them, one by one
 $currentCategory = null;
+
 foreach ($question_list as $questionId) {
 
     // creates a temporary Question object
@@ -210,7 +208,6 @@ foreach ($question_list as $questionId) {
         $question_title = Display::label($question_title, 'warning');
     }
 
-    //var_dump($objQuestionTmp->category_list);
     $rootCategories = null;
     global $app;
     $repo = $app['orm.em']->getRepository('Entity\CQuizCategory');
@@ -264,4 +261,4 @@ echo Display::div($exercise_actions, array('class' => 'form-actions'));
 if ($origin != 'learnpath') {
     //we are not in learnpath tool
     Display::display_footer();
-}
+}

main/inc/lib/formvalidator/FormValidator.class.php

@@ -303,13 +303,13 @@ EOT;
      */
     function add_html_editor($name, $label, $required = true, $full_page = false, $config = null)
     {
-
         $this->addElement('html_editor', $name, $label, 'rows="15" cols="80"', $config);
         $this->applyFilter($name, 'trim');
         $html_type = STUDENT_HTML;
         if (!empty($_SESSION['status'])) {
             $html_type = $_SESSION['status'] == COURSEMANAGER ? TEACHER_HTML : STUDENT_HTML;
         }
+
         if (is_array($config)) {
             if (isset($config['FullPage'])) {
                 $full_page = is_bool($config['FullPage']) ? $config['FullPage'] : ($config['FullPage'] === 'true');
@@ -319,6 +319,7 @@ EOT;
         } else {
             $config = array('FullPage' => (bool) $full_page);
         }
+
         if ($full_page) {
             $html_type = isset($_SESSION['status']) && $_SESSION['status'] == COURSEMANAGER ? TEACHER_HTML_FULLPAGE : STUDENT_HTML_FULLPAGE;
             //First *filter* the HTML (markup, indenting, ...)
@@ -327,9 +328,11 @@ EOT;
             //First *filter* the HTML (markup, indenting, ...)
             //$this->applyFilter($name,'html_filter_teacher');
         }
+
         if ($required) {
             $this->addRule($name, get_lang('ThisFieldIsRequired'), 'required');
         }
+
         if ($full_page) {
             $el = $this->getElement($name);
             $el->fullPage = true;
@@ -564,4 +567,4 @@ function html_filter_teacher_fullpage($html)
 function html_filter_student_fullpage($html)
 {
     return html_filter($html, STUDENT_HTML_FULLPAGE);
-}
+}

main/inc/lib/internationalization.lib.php

@@ -139,6 +139,7 @@ function get_lang($variable, $reserved = null, $language = null)
     }
     return $translated;*/
     global $app;
+
     $language_interface = isset($app['language_interface']) ? $app['language_interface'] : api_get_language_interface();
 
     global

main/inc/lib/pear/HTML/QuickForm.php

@@ -2086,15 +2086,18 @@ class HTML_QuickForm extends HTML_Common
      * Returns the rich editor status
      * @return bool status
      */
-    public function getAllowRichEditorInForm() {
+    public function getAllowRichEditorInForm()
+    {
         return $this->allowRichEditorInForm;
     }
 
-    public function setAllowedRichEditorList($array) {
+    public function setAllowedRichEditorList($array)
+    {
         $this->allowedRichEditorList = $array;
     }
 
-    public function getAllowedRichEditorList() {
+    public function getAllowedRichEditorList()
+    {
         return $this->allowedRichEditorList;
     }
 
@@ -2141,4 +2144,4 @@ class HTML_QuickForm_Error extends PEAR_Error {
         }
     }
     // }}}
-} // end class HTML_QuickForm_Error
+} // end class HTML_QuickForm_Error

main/template/default/layout/head.tpl

@@ -15,23 +15,21 @@
 {{ js_file_to_string }}
 {{ extra_headers }}
 <script>
-//<![CDATA[
 // This is a patch for the "__flash__removeCallback" bug, see FS#4378.
 {% raw %}
 if ((navigator.userAgent.toLowerCase().indexOf('msie') != -1 ) && ( navigator.userAgent.toLowerCase().indexOf('opera') == -1 )) {
     window.attachEvent( 'onunload', function() {
-            window['__flash__removeCallback'] = function ( instance, name ) {
-                try {
-                    if ( instance ) {
-                        instance[name] = null ;
-                    }
-                } catch ( flashEx ) {
+        window['__flash__removeCallback'] = function ( instance, name ) {
+            try {
+                if ( instance ) {
+                    instance[name] = null ;
                 }
-            } ;
+            } catch ( flashEx ) {
+            }
+        } ;
     });
 }
 {% endraw %}
-//]]>
 
 
 
@@ -230,7 +228,7 @@ $(function() {
         header: ".accordion-heading"
     });
 
-    //Global popup
+    // Global popup
     $('.ajax').on('click', function() {
         var url     = this.href;
         var dialog  = $("#dialog");
@@ -290,6 +288,14 @@ $(function() {
             },200);
         }
     );
+
+    // Tiny mce
+    /*tinymce.init({
+       plugins: "media,image,elfinder",
+       selector: "textarea"
+    });*/
+
+
     /*
     $(".td_actions").hide();
 

src/ChamiloLMS/Controller/EditorController.php

@@ -17,30 +17,32 @@ class EditorController
 {
     /**
      * @param Application $app
+     * @return Response
      */
     public function filemanagerAction(Application $app)
     {
-        //$response = $app['template']->render_layout('javascript/elfinder.tpl');
         $response = $app['template']->render_template('javascript/elfinder.tpl');
-
-        //return new Response($response, 200, array('Cache-Control' => 's-maxage=3600, public'));
         return new Response($response, 200, array());
     }
 
+    /**
+     * @param Application $app
+     */
     public function connectorAction(Application $app)
     {
         $chamiloConnector = new Connector();
         $opts = $chamiloConnector->getOperations();
 
-        error_reporting(0); // Set E_ALL for debuging
+        error_reporting(0);
 
         include_once api_get_path(LIBRARY_PATH).'elfinder/php/elFinderConnector.class.php';
         include_once api_get_path(LIBRARY_PATH).'elfinder/php/elFinder.class.php';
         include_once api_get_path(LIBRARY_PATH).'elfinder/php/elFinderVolumeDriver.class.php';
         include_once api_get_path(LIBRARY_PATH).'elfinder/php/elFinderVolumeLocalFileSystem.class.php';
 
-        // run elFinder
+        // Run elFinder
         $connector = new \elFinderConnector(new \elFinder($opts));
         $connector->run();
     }
+
 }