chamilo / chamilo-lms

main/exercise/export/aiken/aiken_import.inc.php

Indentation +1 added lines, -1 removed lines

@@ -281,7 +281,7 @@
             $correct_answer_index = array_search($matches[1], $answers_array);
             $exercise_info['question'][$question_index]['title'] = $matches[1];
         } elseif (preg_match('/^TAGS:\s?([A-Z])\s?/', $info, $matches)) {
-             //TAGS for chamilo >= 1.10
+                //TAGS for chamilo >= 1.10
             $exercise_info['question'][$question_index]['answer_tags'] = explode(',', $matches[1]);
         } elseif (preg_match('/^ETIQUETAS:\s?([A-Z])\s?/', $info, $matches)) {
             //TAGS for chamilo >= 1.10 (Spanish e-ducativa format)

main/lp/lp_ajax_save_item.php

Doc Comments +3 added lines, -3 removed lines

@@ -20,9 +20,9 @@
  * @param   int $user_id User ID
  * @param   int $view_id View ID
  * @param   int $item_id Item ID
- * @param   float  $score Current score
- * @param   float  $max Maximum score
- * @param   float  $min Minimum score
+ * @param   integer  $score Current score
+ * @param   integer  $max Maximum score
+ * @param   integer  $min Minimum score
  * @param   string  $status Lesson status
  * @param   int  $time Session time
  * @param   string  $suspend Suspend data

Indentation +1 added lines, -1 removed lines

@@ -458,7 +458,7 @@
     }
 
     if ($myLP->get_type() == 2) {
-         $return .= "update_stats();";
+            $return .= "update_stats();";
     }
 
     // To be sure progress is updated.

Braces +4 added lines, -2 removed lines

@@ -55,7 +55,8 @@ 
     $lmsFinish = 0,
     $userNavigatesAway = 0,
     $statusSignalReceived = 0
-) {
+)
+{
     //global $debug;
     $debug = 0;
     $return = null;
@@ -477,7 +478,8 @@ 
     if (is_array($_REQUEST['interact'])) {
         foreach ($_REQUEST['interact'] as $idx => $interac) {
             $interactions[$idx] = preg_split('/,/', substr($interac, 1, -1));
-            if (!isset($interactions[$idx][7])) { // Make sure there are 7 elements.
+            if (!isset($interactions[$idx][7])) {
+// Make sure there are 7 elements.
                 $interactions[$idx][7] = '';
             }
         }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -450,7 +450,7 @@
             $current_time = api_get_utc_datetime();
             $row = Database::fetch_array($q_last_connection);
             $i_id_last_connection = $row['login_id'];
-            $sql = "UPDATE $tbl_track_login
+            $sql = "update $tbl_track_login
                     SET logout_date='".$current_time."'
                     WHERE login_id = $i_id_last_connection";
             Database::query($sql);

main/lp/content_makers.inc.php

Indentation +5 added lines, -5 removed lines

@@ -13,11 +13,11 @@
     'Accent',
     'Accenture',
     'ADLNet',
-      'Articulate',
-      'ATutor',
-      'Blackboard',
-      'Calfat',
-      'Captivate',
+        'Articulate',
+        'ATutor',
+        'Blackboard',
+        'Calfat',
+        'Captivate',
     'Chamilo',
     'Chamilo 2',
     'Claroline',

main/lp/storageapi.php

Switch Indentation +46 added lines, -46 removed lines

@@ -15,52 +15,52 @@
 }
 
 switch ($_REQUEST['action']) {
-    case "get":
-        print storage_get($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
-        break;
-    case "set":
-        if (storage_can_set($_REQUEST['svuser'])) {
-            print storage_set($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svvalue']);
-        }
-        break;
-    case "getall":
-        print storage_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco']);
-        break;
-    case "stackpush":
-        if (storage_can_set($_REQUEST['svuser'])) {
-            print storage_stack_push($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svvalue']);
-        }
-        break;
-    case "stackpop":
-        if (storage_can_set($_REQUEST['svuser'])) {
-            print storage_stack_pop($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
-        }
-        break;
-    case "stacklength":
-        print storage_stack_length($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
-        break;
-    case "stackclear":
-        if (storage_can_set($_REQUEST['svuser'])) {
-            print storage_stack_clear($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
-        }
-        break;
-    case "stackgetall":
-        if (storage_can_set($_REQUEST['svuser']))
-            print storage_stack_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
-        break;
-    case "getposition":
-        print storage_get_position($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc']);
-        break;
-    case "getleaders":
-        print storage_get_leaders($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc'], $_REQUEST['svlength']);
-        break;
-    case "usersgetall":
-// security issue
-        print "NOT allowed, security issue, see sources";
-//		print storage_get_all_users();
-        break;
-    default:
-        // Do nothing
+        case "get":
+            print storage_get($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
+            break;
+        case "set":
+            if (storage_can_set($_REQUEST['svuser'])) {
+                print storage_set($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svvalue']);
+            }
+            break;
+        case "getall":
+            print storage_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco']);
+            break;
+        case "stackpush":
+            if (storage_can_set($_REQUEST['svuser'])) {
+                print storage_stack_push($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svvalue']);
+            }
+            break;
+        case "stackpop":
+            if (storage_can_set($_REQUEST['svuser'])) {
+                print storage_stack_pop($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
+            }
+            break;
+        case "stacklength":
+            print storage_stack_length($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
+            break;
+        case "stackclear":
+            if (storage_can_set($_REQUEST['svuser'])) {
+                print storage_stack_clear($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
+            }
+            break;
+        case "stackgetall":
+            if (storage_can_set($_REQUEST['svuser']))
+                print storage_stack_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
+            break;
+        case "getposition":
+            print storage_get_position($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc']);
+            break;
+        case "getleaders":
+            print storage_get_leaders($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc'], $_REQUEST['svlength']);
+            break;
+        case "usersgetall":
+    // security issue
+            print "NOT allowed, security issue, see sources";
+    //		print storage_get_all_users();
+            break;
+        default:
+            // Do nothing
 }
 
 function storage_can_set($sv_user) {

Braces +30 added lines, -20 removed lines

@@ -45,8 +45,9 @@ 
         }
         break;
     case "stackgetall":
-        if (storage_can_set($_REQUEST['svuser']))
-            print storage_stack_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
+        if (storage_can_set($_REQUEST['svuser'])) {
+                    print storage_stack_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
+        }
         break;
     case "getposition":
         print storage_get_position($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc']);
@@ -63,7 +64,8 @@ 
         // Do nothing
 }
 
-function storage_can_set($sv_user) {
+function storage_can_set($sv_user)
+{
     // platform admin can change any user's stored values, other users can only change their own values
     $allowed = ((api_is_platform_admin()) || ($sv_user == api_get_user_id()));
     if (!$allowed) {
@@ -72,7 +74,8 @@ 
     return $allowed;
 }
 
-function storage_get($sv_user, $sv_course, $sv_sco, $sv_key) {
+function storage_get($sv_user, $sv_course, $sv_sco, $sv_key)
+{
     $sql = "select sv_value
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)."
         where user_id= '$sv_user'
@@ -87,13 +90,13 @@ 
         } else {
             return $row['sv_value'];
         }
-    }
-    else {
+    } else {
         return null;
     }
 }
 
-function storage_get_leaders($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $sv_length) {
+function storage_get_leaders($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $sv_length)
+{
 
     // get leaders
     $sql_leaders = "select u.user_id, firstname, lastname, email, username, sv_value as value
@@ -127,7 +130,8 @@ 
     return json_encode($result);
 }
 
-function storage_get_position($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $sv_length) {
+function storage_get_position($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $sv_length)
+{
     $sql = "select count(list.user_id) as position
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)." search,
             ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)." list
@@ -144,13 +148,13 @@ 
     if (Database::num_rows($res) > 0) {
         $row = Database::fetch_assoc($res);
         return $row['position'];
-    }
-    else {
+    } else {
         return null;
     }
 }
 
-function storage_set($sv_user, $sv_course, $sv_sco, $sv_key, $sv_value) {
+function storage_set($sv_user, $sv_course, $sv_sco, $sv_key, $sv_value)
+{
     $sv_value = Database::escape_string($sv_value);
     $sql = "replace into ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)."
         (user_id, sco_id, course_id, sv_key, sv_value)
@@ -160,7 +164,8 @@ 
     return Database::affected_rows($res);
 }
 
-function storage_getall($sv_user, $sv_course, $sv_sco) {
+function storage_getall($sv_user, $sv_course, $sv_sco)
+{
     $sql = "select sv_key, sv_value
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)."
         where user_id= '$sv_user'
@@ -177,7 +182,8 @@ 
     return json_encode($data);
 }
 
-function storage_stack_push($sv_user, $sv_course, $sv_sco, $sv_key, $sv_value) {
+function storage_stack_push($sv_user, $sv_course, $sv_sco, $sv_key, $sv_value)
+{
     $sv_value = Database::escape_string($sv_value);
     Database::query("start transaction");
     $sqlorder = "select ifnull((select max(stack_order)
@@ -198,14 +204,14 @@ 
     if ($resorder && $resinsert) {
         Database::query("commit");
         return 1;
-    }
-    else {
+    } else {
         Database::query("rollback");
         return 0;
     }
 }
 
-function storage_stack_pop($sv_user, $sv_course, $sv_sco, $sv_key) {
+function storage_stack_pop($sv_user, $sv_course, $sv_sco, $sv_key)
+{
     Database::query("start transaction");
     $sqlselect = "select sv_value, stack_order
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK)."
@@ -239,7 +245,8 @@ 
     }
 }
 
-function storage_stack_length($sv_user, $sv_course, $sv_sco, $sv_key) {
+function storage_stack_length($sv_user, $sv_course, $sv_sco, $sv_key)
+{
     $sql = "select count(*) as length
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK)."
         where user_id= '$sv_user'
@@ -251,7 +258,8 @@ 
     return $row['length'];
 }
 
-function storage_stack_clear($sv_user, $sv_course, $sv_sco, $sv_key) {
+function storage_stack_clear($sv_user, $sv_course, $sv_sco, $sv_key)
+{
     $sql = "delete
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK)."
         where user_id= '$sv_user'
@@ -262,7 +270,8 @@ 
     return Database::num_rows($res);
 }
 
-function storage_stack_getall($sv_user, $sv_course, $sv_sco, $sv_key) {
+function storage_stack_getall($sv_user, $sv_course, $sv_sco, $sv_key)
+{
     $sql = "select stack_order as stack_order, sv_value as value
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK)."
         where user_id= '$sv_user'
@@ -280,7 +289,8 @@ 
     return json_encode($results);
 }
 
-function storage_get_all_users() {
+function storage_get_all_users()
+{
     $sql = "select user_id, username, firstname, lastname
         from ".Database::get_main_table(TABLE_MAIN_USER)."
         order by user_id asc";

main/admin/settings.lib.php

Doc Comments +4 added lines, -3 removed lines

@@ -1154,7 +1154,7 @@ 
 /**
  * Returns an array containing the list of options used to populate the gradebook_number_decimals variable
  * This function is called through a call_user_func() in the generate_settings_form function.
- * @return array List of gradebook_number_decimals options
+ * @return string[] List of gradebook_number_decimals options
  *
  * @author Guillaume Viguier <guillaume.viguier@beeznest.com>
  */
@@ -1575,8 +1575,9 @@ 
 }
 /**
  * Helper function to generates a form elements group
- * @param object $form The form where the elements group has to be added
+ * @param FormValidator $form The form where the elements group has to be added
  * @param array $values Values to browse through
+ * @param string $elementName
  * @return array
  */
 function formGenerateElementsGroup($form, $values = array(), $elementName)
@@ -1592,7 +1593,7 @@ 
 }
 /**
  * Helper function with allowed file types for CSS
- * @return  array Array of file types (no indexes)
+ * @return  string[] Array of file types (no indexes)
  */
 function getAllowedFileTypes()
 {

Indentation +2 added lines, -2 removed lines

@@ -426,8 +426,8 @@
                 if ($status) {
                     echo Display::return_message(get_lang('NewLogoUpdated'));
                     echo '<script>'
-                         . '$("#header-logo").attr("src","'.$url.$newLogoFileName.'");'
-                         . '</script>';
+                            . '$("#header-logo").attr("src","'.$url.$newLogoFileName.'");'
+                            . '</script>';
                 } else {
                     echo Display::return_message('Error - '.get_lang('UplNoFileUploaded'), 'error');
                 }

main/gradebook/lib/GradebookUtils.php

Doc Comments +1 added lines, -1 removed lines

@@ -732,7 +732,7 @@
     }
 
     /**
-     * @param null $course_code
+     * @param string $course_code
      * @param int $gradebook_model_id
      * @return mixed
      */

Indentation +1 added lines, -1 removed lines

@@ -250,7 +250,7 @@
                     }
                 }
 
-               $modify_icons .= '<a href="gradebook_edit_all.php?selectcat='.$cat->get_id().'&'.$courseParams.'">'.
+                $modify_icons .= '<a href="gradebook_edit_all.php?selectcat='.$cat->get_id().'&'.$courseParams.'">'.
                     Display::return_icon(
                         'percentage.png',
                         get_lang('EditAllWeights'),

main/inc/lib/glossary.lib.php

Doc Comments +3 added lines, -3 removed lines

@@ -95,7 +95,7 @@ 
      *
      * @param array  $values  Array of title + description (name => $title, description => $comment)
      *
-     * @return mixed   Term id on success, false on failure
+     * @return false|string   Term id on success, false on failure
      *
      */
     public static function save_glossary($values, $showMessage = true)
@@ -448,7 +448,7 @@ 
 
     /**
      * Display the glossary terms in a list
-     * @return bool true
+     * @return string true
      */
     public static function displayGlossaryList()
     {
@@ -585,7 +585,7 @@ 
      * Update action icons column
      *
      * @param integer $glossary_id
-     * @param array   $url_params Parameters to use to affect links
+     * @param string   $url_params Parameters to use to affect links
      * @param array   $row The line of results from a query on the glossary table
      *
      * @return string HTML string for the action icons columns

Upper-Lower-Casing +5 added lines, -5 removed lines

@@ -134,7 +134,7 @@ 
             $id = Database::insert($t_glossary, $params);
 
             if ($id) {
-                $sql = "UPDATE $t_glossary SET glossary_id = $id WHERE iid = $id";
+                $sql = "update $t_glossary SET glossary_id = $id WHERE iid = $id";
                 Database::query($sql);
 
                 //insert into item_property
@@ -180,7 +180,7 @@ 
 
             return false;
         } else {
-            $sql = "UPDATE $t_glossary SET
+            $sql = "update $t_glossary SET
                         name = '".Database::escape_string($values['name'])."',
                         description	= '".Database::escape_string($values['description'])."'
 					WHERE
@@ -639,7 +639,7 @@ 
 
         $i = 1;
         while ($data = Database::fetch_array($res)) {
-            $sql = "UPDATE $t_glossary SET display_order = $i
+            $sql = "update $t_glossary SET display_order = $i
                     WHERE c_id = $course_id AND glossary_id = '".intval($data['glossary_id'])."'";
             Database::query($sql);
             $i++;
@@ -682,9 +682,9 @@ 
                 $found = true;
             }
         }
-        $sql1 = "UPDATE $t_glossary SET display_order = '".Database::escape_string($next_display_order)."'
+        $sql1 = "update $t_glossary SET display_order = '".Database::escape_string($next_display_order)."'
                  WHERE c_id = $course_id  AND glossary_id = '".Database::escape_string($current_id)."'";
-        $sql2 = "UPDATE $t_glossary SET display_order = '".Database::escape_string($current_display_order)."'
+        $sql2 = "update $t_glossary SET display_order = '".Database::escape_string($current_display_order)."'
                  WHERE c_id = $course_id  AND glossary_id = '".Database::escape_string($next_id)."'";
         Database::query($sql1);
         Database::query($sql2);

main/inc/lib/course_description.lib.php

Doc Comments +6 added lines, -6 removed lines

@@ -359,7 +359,7 @@ 
 
     /**
      * Get description titles by default
-     * @return array
+     * @return string[]
      */
     public function get_default_description_title()
     {
@@ -378,7 +378,7 @@ 
 
     /**
      * Get description titles editable by default
-     * @return array
+     * @return boolean[]
      */
     public function get_default_description_title_editable()
     {
@@ -397,7 +397,7 @@ 
 
     /**
      * Get description icons by default
-     * @return array
+     * @return string[]
      */
     public function get_default_description_icon()
     {
@@ -417,7 +417,7 @@ 
 
     /**
      * Get questions by default for help
-     * @return array
+     * @return string[]
      */
     public function get_default_question()
     {
@@ -436,7 +436,7 @@ 
 
     /**
      * Get informations by default for help
-     * @return array
+     * @return string[]
      */
     public function get_default_information()
     {
@@ -574,7 +574,7 @@ 
     /**
      * get progress of a description
      *
-     * @return int
+     * @return string
      */
     public function get_progress()
     {

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -219,7 +219,7 @@
         $last_id = Database::insert($table, $params);
 
         if ($last_id > 0) {
-            $sql = "UPDATE $table SET id = iid WHERE iid = $last_id";
+            $sql = "update $table SET id = iid WHERE iid = $last_id";
             Database::query($sql);
 
             // insert into item_property

main/lp/openoffice_document.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -186,9 +186,9 @@
 
     /**
      * Get images files from remote host (with webservices)
-     * @param   array $file current ppt file details
+     * @param   string $file current ppt file details
      * @param   string  $size The expected final size of the rendered slides
-     * @return  array images files
+     * @return  string images files
      */
     private function _get_remote_ppt2lp_files($file, $size = null)
     {

Indentation +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
         // Create the directory
         $result = $this->generate_lp_folder($_course, $this->file_name);
 
-         // Create the directory
+            // Create the directory
         $this->base_work_dir = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
         ///learning_path/ppt_dirname directory
         $this->created_dir = $result['dir'];

Braces +8 added lines, -4 removed lines

@@ -103,7 +103,8 @@ 
             //var_dump( $this->base_work_dir.$this->created_dir.$this->file_path);
             $perm = api_get_setting('permissions_for_new_files');
 
-            if (IS_WINDOWS_OS) { // IS_WINDOWS_OS has been defined in main_api.lib.php
+            if (IS_WINDOWS_OS) {
+// IS_WINDOWS_OS has been defined in main_api.lib.php
                 $converter_path = str_replace('/', '\\', api_get_path(SYS_PATH).'main/inc/lib/ppt2png');
                 $class_path = $converter_path.';'.$converter_path.'/jodconverter-2.2.2.jar;'.$converter_path.'/jodconverter-cli-2.2.2.jar';
                 //$cmd = 'java -cp "'.$class_path.'" DokeosConverter';
@@ -130,7 +131,8 @@ 
             $return = 0;
             $shell = exec($cmd, $files, $return);
 
-            if ($return != 0) { // If the java application returns an error code.
+            if ($return != 0) {
+// If the java application returns an error code.
                 switch ($return) {
                     case 1:
                         // Can't connect to openoffice.
@@ -285,7 +287,8 @@ 
         }
 
         if ($ppt2lpHost == 'localhost') {
-            if (IS_WINDOWS_OS) { // IS_WINDOWS_OS has been defined in main_api.lib.php
+            if (IS_WINDOWS_OS) {
+// IS_WINDOWS_OS has been defined in main_api.lib.php
                 $converterPath = str_replace('/', '\\', api_get_path(SYS_PATH).'main/inc/lib/ppt2png');
                 $classPath = $converterPath.';'.$converterPath.'/jodconverter-2.2.2.jar;'.$converterPath.'/jodconverter-cli-2.2.2.jar';
                 $cmd = 'java -Dfile.encoding=UTF-8 -jar "'.$classPath.'/jodconverter-2.2.2.jar"';
@@ -312,7 +315,8 @@ 
             @chown($this->base_work_dir.'/'.$this->created_dir, 'www-data');
             @chmod($this->base_work_dir.'/'.$this->created_dir, $permissionFile);
 
-            if ($return != 0) { // If the java application returns an error code.
+            if ($return != 0) {
+// If the java application returns an error code.
                 switch ($return) {
                     case 1:
                         // Can't connect to openoffice.