chamilo / chamilo-lms

src/Chamilo/CoreBundle/Admin/UserGroupAdmin.php

Indentation +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
             ->add('users', 'sonata_type_collection', array(
                     'cascade_validation' => true,
                 ), array(
-                   // 'allow_delete' => true,
+                    // 'allow_delete' => true,
                     'by_reference' => false,
                     'edit'              => 'inline',
                     'inline'            => 'table',

src/Chamilo/CoreBundle/DependencyInjection/ChamiloCoreExtension.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     {
         $loader = new Loader\YamlFileLoader(
             $container,
-            new FileLocator(__DIR__ . '/../Resources/config')
+            new FileLocator(__DIR__.'/../Resources/config')
         );
 
         $loader->load('services.yml');

src/Chamilo/CoreBundle/Entity/Skill.php

Spacing +2 added lines, -2 removed lines

@@ -222,14 +222,14 @@
                 return \Display::return_icon('badges-default.png', null, null, ICON_SIZE_BIG, null, true);
             }
 
-            return api_get_path(WEB_UPLOAD_PATH) . 'badges/' . sha1($this->name) . '-small.png';
+            return api_get_path(WEB_UPLOAD_PATH).'badges/'.sha1($this->name).'-small.png';
         }
 
         if (empty($this->icon)) {
             return \Display::return_icon('badges-default.png', null, null, ICON_SIZE_HUGE, null, true);
         }
 
-        return api_get_path(WEB_UPLOAD_PATH) . "badges/{$this->icon}";
+        return api_get_path(WEB_UPLOAD_PATH)."badges/{$this->icon}";
     }
 
     /**

src/Chamilo/UserBundle/Repository/UserRepository.php

Indentation +3 added lines, -3 removed lines

@@ -25,10 +25,10 @@
 {
 
     /**
-    * @param string $keyword
+     * @param string $keyword
      *
-    * @return mixed
-    */
+     * @return mixed
+     */
     public function searchUserByKeyword($keyword)
     {
         $qb = $this->createQueryBuilder('a');

main/admin/user_update_import.php

Spacing +4 added lines, -4 removed lines

@@ -215,8 +215,8 @@ 
             // We are sure that the extra field exists.
             foreach ($extra_fields as $extras) {
                 if (isset($user[$extras[1]])) {
-                    $key 	= $extras[1];
-                    $value 	= $user[$extras[1]];
+                    $key = $extras[1];
+                    $value = $user[$extras[1]];
                     UserManager::update_extra_field_value($user_id, $key, $value);
                 }
             }
@@ -253,7 +253,7 @@ 
     global $current_tag;
     switch ($data) {
         case 'Contact':
-            $user = array ();
+            $user = array();
             break;
         default:
             $current_tag = $data;
@@ -350,7 +350,7 @@ 
 
     if (in_array($ext_import_file, $allowed_file_mimetype)) {
         if (strcmp($file_type, 'csv') === 0 && $ext_import_file == $allowed_file_mimetype[0]) {
-            $users	= parse_csv_data($_FILES['import_file']['tmp_name']);
+            $users = parse_csv_data($_FILES['import_file']['tmp_name']);
             $errors = validate_data($users);
             $error_kind_file = false;
         } elseif (strcmp($file_type, 'xml') === 0 && $ext_import_file == $allowed_file_mimetype[1]) {

Braces +4 added lines, -1 removed lines

@@ -454,7 +454,10 @@
     <blockquote>
         <pre>
             <b>UserName</b>;LastName;FirstName;Email;NewUserName;Password;AuthSource;OfficialCode;PhoneNumber;Status;ExpiryDate;Active;Language;Courses;ClassId;
-            xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;user/teacher/drh;0000-00-00 00:00:00;0/1;xxx;<span style="color:red;"><?php if (count($list_reponse) > 0) echo implode(';', $list_reponse).';'; ?></span>xxx1|xxx2|xxx3;1;<br />
+            xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;user/teacher/drh;0000-00-00 00:00:00;0/1;xxx;<span style="color:red;"><?php if (count($list_reponse) > 0) {
+    echo implode(';', $list_reponse).';';
+}
+?></span>xxx1|xxx2|xxx3;1;<br />
         </pre>
     </blockquote>
 <p><?php

Indentation +2 added lines, -2 removed lines

@@ -60,8 +60,8 @@
                     $user['error'] = get_lang('UserNameNotAvailable');
                     $errors[] = $user;
                 }
-             }
-          }
+                }
+            }
 
         // 3. Check status.
         if (isset($user['Status']) && !api_status_exists($user['Status'])) {

main/social/groups.php

Spacing +51 added lines, -51 removed lines

@@ -19,24 +19,24 @@ 
 $join_url = '';
 
 $this_section = SECTION_SOCIAL;
-$allowed_views = array('mygroups','newest','pop');
+$allowed_views = array('mygroups', 'newest', 'pop');
 $content = null;
 
 if (isset($_GET['view']) && in_array($_GET['view'], $allowed_views)) {
     if ($_GET['view'] == 'mygroups') {
-        $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
-        $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('MyGroups'));
-    } else if ( $_GET['view'] == 'newest') {
-        $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
-        $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Newest'));
-    } else  {
-        $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
-        $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Popular'));
+        $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('MyGroups'));
+    } else if ($_GET['view'] == 'newest') {
+        $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('Newest'));
+    } else {
+        $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('Popular'));
     }
 } else {
-    $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
+    $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
     if (!isset($_GET['id'])) {
-        $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('GroupList'));
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('GroupList'));
     }
 }
 
@@ -73,16 +73,16 @@ 
         } elseif ($result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {
             $name .= ' '.Display::return_icon('social_group_moderator.png', get_lang('Moderator'), array('style'=>'vertical-align:middle'));
         }
-        $url  = '<a href="group_view.php?id='.$id.'">' . $name . '</a>';
+        $url = '<a href="group_view.php?id='.$id.'">'.$name.'</a>';
 
-        $count_users_group = count($usergroup->get_users_by_group($id, false, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR), 0 , 1000));
-        if ($count_users_group == 1 ) {
+        $count_users_group = count($usergroup->get_users_by_group($id, false, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR), 0, 1000));
+        if ($count_users_group == 1) {
             $count_users_group = $count_users_group.' '.get_lang('Member');
         } else {
             $count_users_group = $count_users_group.' '.get_lang('Members');
         }
 
-        $picture = $usergroup->get_picture_group($result['id'], $result['picture'],80);
+        $picture = $usergroup->get_picture_group($result['id'], $result['picture'], 80);
         $result['picture'] = '<img class="social-groups-image" src="'.$picture['file'].'" />';
 
         $members = Display::returnFontAwesomeIcon('user').$count_users_group;
@@ -94,9 +94,9 @@ 
         $html .= '<div class="title-groups">';
         $html .= Display::tag('h5', $url);
         $html .= '</div>';
-        $html .= '<div class="members-groups">' . $members . '</div>';
+        $html .= '<div class="members-groups">'.$members.'</div>';
         if ($result['description'] != '') {
-            $html .= '<div class="description-groups">' . cut($result['description'],100,true) . '</div>';
+            $html .= '<div class="description-groups">'.cut($result['description'], 100, true).'</div>';
         } else {
             $html .= '';
         }
@@ -104,12 +104,12 @@ 
         $html .= '</div>';
 
         $grid_item_2 = $html;
-        $grid_my_groups[]= array($grid_item_2);
+        $grid_my_groups[] = array($grid_item_2);
     }
 }
 
 // Newest groups
-$results = $usergroup->get_groups_by_age(4,false);
+$results = $usergroup->get_groups_by_age(4, false);
 
 $grid_newest_groups = array();
 foreach ($results as $result) {
@@ -118,16 +118,16 @@ 
     $id = $result['id'];
     $name = cut($result['name'], GROUP_TITLE_LENGTH, true);
 
-    $count_users_group = count($usergroup->get_users_by_group($id, false, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR), 0 , 1000));
-    if ($count_users_group == 1 ) {
+    $count_users_group = count($usergroup->get_users_by_group($id, false, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR), 0, 1000));
+    if ($count_users_group == 1) {
         $count_users_group = $count_users_group.' '.get_lang('Member');
     } else {
         $count_users_group = $count_users_group.' '.get_lang('Members');
     }
 
-    $url  = '<a href="group_view.php?id='.$id.'">' . $name . '</a>';
+    $url = '<a href="group_view.php?id='.$id.'">'.$name.'</a>';
 
-    $picture = $usergroup->get_picture_group($result['id'], $result['picture'],80);
+    $picture = $usergroup->get_picture_group($result['id'], $result['picture'], 80);
     $result['picture'] = '<img class="social-groups-image" src="'.$picture['file'].'" />';
     $members = Display::returnFontAwesomeIcon('user').$count_users_group;
 
@@ -139,15 +139,15 @@ 
     $html .= '<div class="title-groups">';
     $html .= Display::tag('h5', $url);
     $html .= '</div>';
-    $html .= '<div class="members-groups">' . $members . '</div>';
+    $html .= '<div class="members-groups">'.$members.'</div>';
     if ($result['description'] != '') {
-        $html .= '<div class="description-groups">' . cut($result['description'],100,true) . '</div>';
+        $html .= '<div class="description-groups">'.cut($result['description'], 100, true).'</div>';
     } else {
         $html .= '';
     }
     //Avoiding my groups
 
-    if (!in_array($id,$my_group_list)) {
+    if (!in_array($id, $my_group_list)) {
         $html .= '<a class="btn" href="group_view.php?id='.$id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a> ';
     }
 
@@ -157,11 +157,11 @@ 
 
     $grid_item_2 = $html;
 
-    $grid_newest_groups[]= array($grid_item_2);
+    $grid_newest_groups[] = array($grid_item_2);
 }
 
 // Pop groups
-$results = $usergroup->get_groups_by_popularity(4,false);
+$results = $usergroup->get_groups_by_popularity(4, false);
 $grid_pop_groups = array();
 
 if (is_array($results) && count($results) > 0) {
@@ -169,18 +169,18 @@ 
         $result['name'] = Security::remove_XSS($result['name'], STUDENT, true);
         $result['description'] = Security::remove_XSS($result['description'], STUDENT, true);
         $id = $result['id'];
-        $name = cut($result['name'],GROUP_TITLE_LENGTH,true);
+        $name = cut($result['name'], GROUP_TITLE_LENGTH, true);
 
-        $count_users_group = count($usergroup->get_users_by_group($id, false, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR), 0 , 1000));
-        if ($count_users_group == 1 ) {
+        $count_users_group = count($usergroup->get_users_by_group($id, false, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR), 0, 1000));
+        if ($count_users_group == 1) {
             $count_users_group = $count_users_group.' '.get_lang('Member');
         } else {
             $count_users_group = $count_users_group.' '.get_lang('Members');
         }
 
-        $url  = '<a href="group_view.php?id='.$id.'">' . $name . '</a>';
+        $url = '<a href="group_view.php?id='.$id.'">'.$name.'</a>';
 
-        $picture = $usergroup->get_picture_group($result['id'], $result['picture'],80);
+        $picture = $usergroup->get_picture_group($result['id'], $result['picture'], 80);
         $result['picture'] = '<img class="social-groups-image" src="'.$picture['file'].'" />';
 
         $html = '<div class="row">';
@@ -191,15 +191,15 @@ 
         $html .= '<div class="title-groups">';
         $html .= Display::tag('h5', $url);
         $html .= '</div>';
-        $html .= '<div class="members-groups">' . $members . '</div>';
+        $html .= '<div class="members-groups">'.$members.'</div>';
         if ($result['description'] != '') {
-            $html .= '<div class="description-groups">' . cut($result['description'],100,true) . '</div>';
+            $html .= '<div class="description-groups">'.cut($result['description'], 100, true).'</div>';
         } else {
             $html .= '';
         }
         //Avoiding my groups
 
-        if (!in_array($id,$my_group_list)) {
+        if (!in_array($id, $my_group_list)) {
             $html .= '<a class="btn" href="group_view.php?id='.$id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a> ';
         }
 
@@ -208,7 +208,7 @@ 
         $html .= '</div>';
 
         $grid_item_2 = $html;
-        $grid_pop_groups[]= array($grid_item_2);
+        $grid_pop_groups[] = array($grid_item_2);
     }
 }
 
@@ -222,36 +222,36 @@ 
     switch ($view_group) {
         case 'mygroups':
             if (count($grid_my_groups) > 0) {
-                $my_group_content = Display::return_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
+                $my_group_content = Display::return_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true, false));
             }
             if (api_get_setting(
                     'social.allow_students_to_create_groups_in_social'
                 ) == 'true'
             ) {
-                $create_group_item =  '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
+                $create_group_item = '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
                     get_lang('CreateASocialGroup').'</a>';
             } else {
-                if (api_is_allowed_to_edit(null,true)) {
-                    $create_group_item =  '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
+                if (api_is_allowed_to_edit(null, true)) {
+                    $create_group_item = '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
                         get_lang('CreateASocialGroup').'</a>';
                 }
             }
             break;
         case 'newest':
             if (count($grid_newest_groups) > 0) {
-                $newest_content = Display::return_sortable_grid('newest', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
+                $newest_content = Display::return_sortable_grid('newest', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true, false));
             }
             break;
         default:
             if (count($grid_pop_groups) > 0) {
-                $popular_content = Display::return_sortable_grid('popular', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
+                $popular_content = Display::return_sortable_grid('popular', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true, true, true));
             }
             break;
     }
 } else {
     $my_group_content = null;
     if (count($grid_my_groups) > 0) {
-        $my_group_content = Display::return_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
+        $my_group_content = Display::return_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true, false));
     } else {
         $my_group_content = '<span class="muted">'.get_lang('GroupNone').'</span>';
     }
@@ -259,30 +259,30 @@ 
             'social.allow_students_to_create_groups_in_social'
         ) == 'true'
     ) {
-        $create_group_item =  '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
+        $create_group_item = '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
             get_lang('CreateASocialGroup').'</a>';
     } else {
-        if (api_is_allowed_to_edit(null,true)) {
-            $create_group_item =  '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.get_lang('CreateASocialGroup').'</a>';
+        if (api_is_allowed_to_edit(null, true)) {
+            $create_group_item = '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.get_lang('CreateASocialGroup').'</a>';
         }
     }
     if (count($grid_newest_groups) > 0) {
-        $newest_content = Display::return_sortable_grid('mygroups', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
+        $newest_content = Display::return_sortable_grid('mygroups', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true, false));
     } else {
         $newest_content = '<span class="muted">'.get_lang('GroupNone').'</span>';
     }
     if (count($grid_pop_groups) > 0) {
-        $popular_content = Display::return_sortable_grid('mygroups', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
+        $popular_content = Display::return_sortable_grid('mygroups', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true, true, true));
     } else {
         $popular_content = '<span class="muted">'.get_lang('GroupNone').'</span>';
     }
 }
 
 if (!empty($create_group_item)) {
-    $social_right_content .=  Display::page_subheader($create_group_item);
+    $social_right_content .= Display::page_subheader($create_group_item);
 }
 $headers = array(get_lang('Newest'), get_lang('Popular'), get_lang('MyGroups'));
-$social_right_content .= Display::tabs($headers, array($newest_content, $popular_content, $my_group_content),'tab_browse');
+$social_right_content .= Display::tabs($headers, array($newest_content, $popular_content, $my_group_content), 'tab_browse');
 
 if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'show_message' && isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'topic_deleted') {
     Display::return_message(get_lang('Deleted'), 'success');

main/social/my_skills_report.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 $isDRH = api_is_drh();
 
 if (!$isStudent && !$isStudentBoss && !$isDRH) {
-    header('Location: ' . api_get_path(WEB_CODE_PATH) . 'social/skills_wheel.php');
+    header('Location: '.api_get_path(WEB_CODE_PATH).'social/skills_wheel.php');
     exit;
 }
 

main/course_progress/thematic_plan.php

Indentation +9 added lines, -9 removed lines

@@ -47,15 +47,15 @@
         $form->addElement('hidden', 'description_type['.$id.']', $id);
         $form->addText('title['.$id.']', get_lang('Title'), false, array('size'=>'50'));
         $form->addHtmlEditor(
-           'description['.$id.']',
-           get_lang('Description'),
-           false,
-           false,
-           array(
-               'ToolbarStartExpanded' => 'false',
-               'ToolbarSet' => 'TrainingDescription',
-               'Height' => '150'
-           )
+            'description['.$id.']',
+            get_lang('Description'),
+            false,
+            false,
+            array(
+                'ToolbarStartExpanded' => 'false',
+                'ToolbarSet' => 'TrainingDescription',
+                'Height' => '150'
+            )
         );
 
         if (!empty($thematic_simple_list) && in_array($id, $thematic_simple_list)) {

Spacing +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
 // actions menu
 $new_thematic_plan_data = array();
 if (!empty($thematic_plan_data))
-foreach($thematic_plan_data as $thematic_item) {
+foreach ($thematic_plan_data as $thematic_item) {
     $thematic_simple_list[] = $thematic_item['description_type'];
     $new_thematic_plan_data[$thematic_item['description_type']] = $thematic_item;
 }
@@ -25,7 +25,7 @@ 
     }
 }
 
-$i=1;
+$i = 1;
 
 echo Display::tag('h2', $thematic_data['title']);
 echo $thematic_data['content'];
@@ -67,8 +67,8 @@ 
             $thematic_plan = null;
         } else {
             $thematic_plan = null;
-            $default['title['.$id.']']       = $title;
-            $default['description['.$id.']']= '';
+            $default['title['.$id.']'] = $title;
+            $default['description['.$id.']'] = '';
         }
         $form->setDefaults($default);
     }

Braces +3 added lines, -2 removed lines

@@ -9,9 +9,10 @@
 
 // actions menu
 $new_thematic_plan_data = array();
-if (!empty($thematic_plan_data))
-foreach($thematic_plan_data as $thematic_item) {
+if (!empty($thematic_plan_data)) {
+    foreach($thematic_plan_data as $thematic_item) {
     $thematic_simple_list[] = $thematic_item['description_type'];
+}
     $new_thematic_plan_data[$thematic_item['description_type']] = $thematic_item;
 }
 

main/inc/lib/exercise_show_functions.lib.php

Braces +1 added lines, -2 removed lines

@@ -434,8 +434,7 @@
             } else {
                 echo $question->options[2];
             }
-        }
-        else {
+        } else {
             echo '-';
         }
         ?>

Indentation +107 added lines, -107 removed lines

@@ -17,25 +17,25 @@ 
  */
 class ExerciseShowFunctions
 {
-	/**
-	 * Shows the answer to a fill-in-the-blanks question, as HTML
+    /**
+     * Shows the answer to a fill-in-the-blanks question, as HTML
      * @param int $feedbackType
-	 * @param string    $answer
-	 * @param int $id       Exercise ID
-	 * @param int $questionId      Question ID
+     * @param string    $answer
+     * @param int $id       Exercise ID
+     * @param int $questionId      Question ID
      * @param int $resultsDisabled
      * @param string $originalStudentAnswer
      *
-	 * @return void
-	 */
-	public static function display_fill_in_blanks_answer(
-	    $feedbackType,
-	    $answer,
-	    $id,
-	    $questionId,
-	    $resultsDisabled,
-	    $originalStudentAnswer = '',
-	    $showTotalScoreAndUserChoices
+     * @return void
+     */
+    public static function display_fill_in_blanks_answer(
+        $feedbackType,
+        $answer,
+        $id,
+        $questionId,
+        $resultsDisabled,
+        $originalStudentAnswer = '',
+        $showTotalScoreAndUserChoices
     ) {
         $answerHTML = FillBlanks::getHtmlDisplayForAnswer($answer, $resultsDisabled, $showTotalScoreAndUserChoices);
         if (strpos($originalStudentAnswer, 'font color') !== false) {
@@ -64,7 +64,7 @@ 
             </tr>
         <?php
         }
-	}
+    }
 
     /**
      * Shows the answer to a calculated question, as HTML
@@ -105,20 +105,20 @@ 
         }
     }
 
-	/**
-	 * Shows the answer to a free-answer question, as HTML
-	 * @param string    Answer text
-	 * @param int       Exercise ID
-	 * @param int       Question ID
-	 * @return void
-	 */
-	public static function display_free_answer(
-	    $feedback_type,
-	    $answer,
-	    $exe_id,
-	    $questionId,
-	    $questionScore = null,
-	    $results_disabled = 0
+    /**
+     * Shows the answer to a free-answer question, as HTML
+     * @param string    Answer text
+     * @param int       Exercise ID
+     * @param int       Question ID
+     * @return void
+     */
+    public static function display_free_answer(
+        $feedback_type,
+        $answer,
+        $exe_id,
+        $questionId,
+        $questionScore = null,
+        $results_disabled = 0
     ) {
         $comments = Event::get_comments($exe_id, $questionId);
 
@@ -136,17 +136,17 @@ 
                 echo '</tr>';
             }
         }
-	}
+    }
 
     /**
-    * @param $feedback_type
-    * @param $answer
-    * @param $id
-    * @param $questionId
-    * @param null $nano
-    * @param int $results_disabled
+     * @param $feedback_type
+     * @param $answer
+     * @param $id
+     * @param $questionId
+     * @param null $nano
+     * @param int $results_disabled
      */
-	public static function display_oral_expression_answer($feedback_type, $answer, $id, $questionId, $fileUrl = null, $results_disabled = 0)
+    public static function display_oral_expression_answer($feedback_type, $answer, $id, $questionId, $fileUrl = null, $results_disabled = 0)
     {
         if (isset($fileUrl)) {
             echo '
@@ -184,8 +184,8 @@ 
         }
     }
 
-	/**
-	 * Displays the answer to a hotspot question
+    /**
+     * Displays the answer to a hotspot question
      * @param int $feedback_type
      * @param int $answerId
      * @param string $answer
@@ -194,7 +194,7 @@ 
      * @param int $resultsDisabled
      * @param int $orderColor
      */
-	public static function display_hotspot_answer(
+    public static function display_hotspot_answer(
         $feedback_type,
         $answerId,
         $answer,
@@ -217,7 +217,7 @@ 
             }
         }
 
-		$hotspot_colors = array(
+        $hotspot_colors = array(
             "", // $i starts from 1 on next loop (ugly fix)
             "#4271B5",
             "#FE8E16",
@@ -234,7 +234,7 @@ 
             "#F7BDE2"
         );
 
-		?>
+        ?>
 		<table class="data_table">
 		<tr>
             <td class="text-center" width="5%">
@@ -246,10 +246,10 @@ 
 			<td class="text-left" width="10%">
 				<?php
                 if (!$hide_expected_answer) {
-    				$my_choice = $studentChoice ? get_lang('Correct') : get_lang('Fault');
-    				echo $my_choice;
+                    $my_choice = $studentChoice ? get_lang('Correct') : get_lang('Fault');
+                    echo $my_choice;
                 }
-				?>
+                ?>
 			</td>
 			<?php if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
 			<td class="text-left" width="60%">
@@ -257,29 +257,29 @@ 
                 if ($studentChoice) {
                     echo '<span style="font-weight: bold; color: #008000;">'.nl2br($answerComment).'</span>';
                 }
-				?>
+                ?>
 			</td>
 			<?php } else { ?>
 				<td class="text-left" width="60%">&nbsp;</td>
 			<?php } ?>
 		</tr>
 		<?php
-	}
-
-	/**
-	 * Display the answers to a multiple choice question
-	 * @param int $feedback_type Feedback type
-	 * @param integer Answer type
-	 * @param integer Student choice
-	 * @param string  Textual answer
-	 * @param string  Comment on answer
-	 * @param string  Correct answer comment
-	 * @param integer Exercise ID
-	 * @param integer Question ID
-	 * @param boolean Whether to show the answer comment or not
-	 * @return void
-	 */
-	public static function display_unique_or_multiple_answer(
+    }
+
+    /**
+     * Display the answers to a multiple choice question
+     * @param int $feedback_type Feedback type
+     * @param integer Answer type
+     * @param integer Student choice
+     * @param string  Textual answer
+     * @param string  Comment on answer
+     * @param string  Correct answer comment
+     * @param integer Exercise ID
+     * @param integer Question ID
+     * @param boolean Whether to show the answer comment or not
+     * @return void
+     */
+    public static function display_unique_or_multiple_answer(
         $feedback_type,
         $answerType,
         $studentChoice,
@@ -307,14 +307,14 @@ 
         }
 
         $icon = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio':'checkbox';
-		$icon .= $studentChoice?'_on':'_off';
-		$icon .= '.gif';
+        $icon .= $studentChoice?'_on':'_off';
+        $icon .= '.gif';
 
-		$iconAnswer = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio':'checkbox';
-		$iconAnswer .= $answerCorrect?'_on':'_off';
-		$iconAnswer .= '.gif';
+        $iconAnswer = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio':'checkbox';
+        $iconAnswer .= $answerCorrect?'_on':'_off';
+        $iconAnswer .= '.gif';
 
-		?>
+        ?>
 		<tr>
 		<td width="5%">
 			<?php echo Display::return_icon($icon); ?>
@@ -328,39 +328,39 @@ 
 		</td>
 		<td width="40%">
 			<?php
-			echo $answer;
-			?>
+            echo $answer;
+            ?>
 		</td>
 
 		<?php if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
 		<td width="20%">
 			<?php
             if ($studentChoice) {
-				if ($answerCorrect) {
+                if ($answerCorrect) {
                     $color = 'green';
-					//echo '<span style="font-weight: bold; color: #008000;">'.nl2br($answerComment).'</span>';
-				} else {
+                    //echo '<span style="font-weight: bold; color: #008000;">'.nl2br($answerComment).'</span>';
+                } else {
                     $color = 'black';
                     //echo '<span style="font-weight: bold; color: #FF0000;">'.nl2br($answerComment).'</span>';
-				}
-				if ($hide_expected_answer) {
-				    $color = '';
-				}
+                }
+                if ($hide_expected_answer) {
+                    $color = '';
+                }
                 echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br($answerComment).'</span>';
-			}
-			?>
+            }
+            ?>
 		</td>
 			<?php
-		    if ($ans==1) {
-		        $comm = Event::get_comments($id,$questionId);
-			}
-		    ?>
+            if ($ans==1) {
+                $comm = Event::get_comments($id,$questionId);
+            }
+            ?>
 		 <?php } else { ?>
 			<td>&nbsp;</td>
 		<?php } ?>
 		</tr>
 		<?php
-	}
+    }
 
     /**
      * Display the answers to a multiple choice question
@@ -413,7 +413,7 @@ 
         if (isset($new_options[$studentChoice])) {
             echo get_lang($new_options[$studentChoice]['name']);
         } else {
-        	echo '-';
+            echo '-';
         }
 
         ?>
@@ -421,7 +421,7 @@ 
         <td width="5%">
         <?php
 
-		//Expected choice
+        //Expected choice
         if (!$hide_expected_answer) {
             if (isset($new_options[$answerCorrect])) {
                 echo get_lang($new_options[$answerCorrect]['name']);
@@ -447,8 +447,8 @@ 
                 }
 
                 if ($hide_expected_answer) {
-				    $color = '';
-				}
+                    $color = '';
+                }
 
                 echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br($answerComment).'</span>';
             }
@@ -466,19 +466,19 @@ 
         <?php
     }
 
-     /**
-     * Display the answers to a multiple choice question
-     *
-     * @param integer Answer type
-     * @param integer Student choice
-     * @param string  Textual answer
-     * @param string  Comment on answer
-     * @param string  Correct answer comment
-     * @param integer Exercise ID
-     * @param integer Question ID
-     * @param boolean Whether to show the answer comment or not
-     * @return void
-     */
+        /**
+         * Display the answers to a multiple choice question
+         *
+         * @param integer Answer type
+         * @param integer Student choice
+         * @param string  Textual answer
+         * @param string  Comment on answer
+         * @param string  Correct answer comment
+         * @param integer Exercise ID
+         * @param integer Question ID
+         * @param boolean Whether to show the answer comment or not
+         * @return void
+         */
     public static function display_multiple_answer_combination_true_false(
         $feedback_type,
         $answerType,
@@ -509,7 +509,7 @@ 
         <tr>
         <td width="5%">
         <?php
-		//Your choice
+        //Your choice
         $question = new MultipleAnswerCombinationTrueFalse();
         if (isset($question->options[$studentChoice])) {
             echo $question->options[$studentChoice];
@@ -520,7 +520,7 @@ 
         </td>
         <td width="5%">
         <?php
-		//Expected choice
+        //Expected choice
         if (!$hide_expected_answer) {
             if (isset($question->options[$answerCorrect])) {
                 echo $question->options[$answerCorrect];
@@ -545,14 +545,14 @@ 
             <?php
             //@todo replace this harcoded value
             if ($studentChoice) {
-                 $color = "black";
+                    $color = "black";
                 if ($studentChoice == $answerCorrect) {
                     $color = "green";
                 }
-            	//echo '<span style="font-weight: bold; color: #000;">'.nl2br($answerComment).'</span>';
+                //echo '<span style="font-weight: bold; color: #000;">'.nl2br($answerComment).'</span>';
                 if ($hide_expected_answer) {
                     $color = '';
-				}
+                }
                 echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br($answerComment).'</span>';
             }
             ?>

Spacing +17 added lines, -17 removed lines

@@ -54,7 +54,7 @@ 
                 </td>
 
                 <?php
-                if (!api_is_allowed_to_edit(null,true) && $feedbackType != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
+                if (!api_is_allowed_to_edit(null, true) && $feedbackType != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
                     <td>
                         <?php
                         $comm = Event::get_comments($id, $questionId);
@@ -82,7 +82,7 @@ 
         $showTotalScoreAndUserChoices
     ) {
         if (empty($id)) {
-            echo '<tr><td>'. Security::remove_XSS($answer).'</td></tr>';
+            echo '<tr><td>'.Security::remove_XSS($answer).'</td></tr>';
         } else {
         ?>
             <tr>
@@ -93,10 +93,10 @@ 
                 </td>
 
             <?php
-            if (!api_is_allowed_to_edit(null,true) && $feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
+            if (!api_is_allowed_to_edit(null, true) && $feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
                 <td>
                     <?php
-                    $comm = Event::get_comments($id,$questionId);
+                    $comm = Event::get_comments($id, $questionId);
                     ?>
                 </td>
             <?php } ?>
@@ -151,7 +151,7 @@ 
         if (isset($fileUrl)) {
             echo '
                 <tr>
-                    <td><audio src="' . $fileUrl . '" controls></audio></td>
+                    <td><audio src="' . $fileUrl.'" controls></audio></td>
                 </tr>
             ';
         }
@@ -162,7 +162,7 @@ 
             echo '</tr>';
             if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
                 echo '<tr>';
-                echo Display::tag('td',get_lang('notCorrectedYet'), array('width'=>'45%'));
+                echo Display::tag('td', get_lang('notCorrectedYet'), array('width'=>'45%'));
                 echo '</tr>';
             } else {
                 echo '<tr><td>&nbsp;</td></tr>';
@@ -175,9 +175,9 @@ 
             }
             echo '</td>';
 
-            if (!api_is_allowed_to_edit(null,true) && $feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
+            if (!api_is_allowed_to_edit(null, true) && $feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
                 echo '<td>';
-                $comm = Event::get_comments($id,$questionId);
+                $comm = Event::get_comments($id, $questionId);
                 echo '</td>';
             }
             echo '</tr>';
@@ -306,12 +306,12 @@ 
             }
         }
 
-        $icon = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio':'checkbox';
-		$icon .= $studentChoice?'_on':'_off';
+        $icon = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio' : 'checkbox';
+		$icon .= $studentChoice ? '_on' : '_off';
 		$icon .= '.gif';
 
-		$iconAnswer = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio':'checkbox';
-		$iconAnswer .= $answerCorrect?'_on':'_off';
+		$iconAnswer = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio' : 'checkbox';
+		$iconAnswer .= $answerCorrect ? '_on' : '_off';
 		$iconAnswer .= '.gif';
 
 		?>
@@ -351,8 +351,8 @@ 
 			?>
 		</td>
 			<?php
-		    if ($ans==1) {
-		        $comm = Event::get_comments($id,$questionId);
+		    if ($ans == 1) {
+		        $comm = Event::get_comments($id, $questionId);
 			}
 		    ?>
 		 <?php } else { ?>
@@ -455,7 +455,7 @@ 
             ?>
         </td>
             <?php
-            if ($ans==1) {
+            if ($ans == 1) {
                 $comm = Event::get_comments($id, $questionId);
             }
             ?>
@@ -558,8 +558,8 @@ 
             ?>
         </td>
             <?php
-            if ($ans==1) {
-                $comm = Event::get_comments($id,$questionId);
+            if ($ans == 1) {
+                $comm = Event::get_comments($id, $questionId);
             }
             ?>
          <?php } else { ?>

Doc Comments +36 added lines, -4 removed lines

@@ -25,6 +25,7 @@ 
 	 * @param int $questionId      Question ID
      * @param int $resultsDisabled
      * @param string $originalStudentAnswer
+     * @param boolean $showTotalScoreAndUserChoices
      *
 	 * @return void
 	 */
@@ -71,6 +72,11 @@ 
      * @param string    Answer text
      * @param int       Exercise ID
      * @param int       Question ID
+     * @param integer $feedback_type
+     * @param string $answer
+     * @param integer $id
+     * @param integer $questionId
+     * @param boolean|string $showTotalScoreAndUserChoices
      * @return void
      */
     public static function display_calculated_answer(
@@ -110,6 +116,9 @@ 
 	 * @param string    Answer text
 	 * @param int       Exercise ID
 	 * @param int       Question ID
+	 * @param integer $feedback_type
+	 * @param integer $exe_id
+	 * @param integer $questionId
 	 * @return void
 	 */
 	public static function display_free_answer(
@@ -139,11 +148,10 @@ 
 	}
 
     /**
-    * @param $feedback_type
+    * @param integer $feedback_type
     * @param $answer
-    * @param $id
-    * @param $questionId
-    * @param null $nano
+    * @param integer $id
+    * @param integer $questionId
     * @param int $results_disabled
      */
 	public static function display_oral_expression_answer($feedback_type, $answer, $id, $questionId, $fileUrl = null, $results_disabled = 0)
@@ -193,6 +201,7 @@ 
      * @param string $answerComment
      * @param int $resultsDisabled
      * @param int $orderColor
+     * @param boolean $showTotalScoreAndUserChoices
      */
 	public static function display_hotspot_answer(
         $feedback_type,
@@ -277,6 +286,13 @@ 
 	 * @param integer Exercise ID
 	 * @param integer Question ID
 	 * @param boolean Whether to show the answer comment or not
+	 * @param integer $answerType
+	 * @param string $answer
+	 * @param string $answerComment
+	 * @param integer $answerCorrect
+	 * @param integer $id
+	 * @param integer $questionId
+	 * @param boolean $showTotalScoreAndUserChoices
 	 * @return void
 	 */
 	public static function display_unique_or_multiple_answer(
@@ -373,6 +389,14 @@ 
      * @param integer Exercise ID
      * @param integer Question ID
      * @param boolean Whether to show the answer comment or not
+     * @param integer $feedback_type
+     * @param integer $answerType
+     * @param string $answer
+     * @param string $answerComment
+     * @param integer $answerCorrect
+     * @param integer $id
+     * @param integer $questionId
+     * @param boolean $showTotalScoreAndUserChoices
      * @return void
      */
     public static function display_multiple_answer_true_false(
@@ -477,6 +501,14 @@ 
      * @param integer Exercise ID
      * @param integer Question ID
      * @param boolean Whether to show the answer comment or not
+     * @param integer $feedback_type
+     * @param integer $answerType
+     * @param string $answer
+     * @param string $answerComment
+     * @param integer $answerCorrect
+     * @param integer $id
+     * @param integer $questionId
+     * @param boolean $showTotalScoreAndUserChoices
      * @return void
      */
     public static function display_multiple_answer_combination_true_false(