chamilo / chamilo-lms

main/gradebook/lib/GradebookUtils.php

Spacing +87 added lines, -87 removed lines

@@ -77,9 +77,9 @@ 
         $course_code = Database::escape_string($course_code);
         if (!empty($link_id)) {
             $link_id = intval($link_id);
-            $sql = 'UPDATE ' . Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK) . '
-                    SET weight = ' . "'" . Database::escape_string((float) $weight) . "'" . '
-                    WHERE course_code = "' . $course_code . '" AND id = ' . $link_id;
+            $sql = 'UPDATE '.Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK).'
+                    SET weight = ' . "'".Database::escape_string((float) $weight)."'".'
+                    WHERE course_code = "' . $course_code.'" AND id = '.$link_id;
             Database::query($sql);
         }
 
@@ -99,7 +99,7 @@ 
 
         // TODO find the corresponding category (the first one for this course, ordered by ID)
         $l = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-        $sql = "DELETE FROM $l WHERE id = ".(int)$link_id;
+        $sql = "DELETE FROM $l WHERE id = ".(int) $link_id;
         Database::query($sql);
 
         return true;
@@ -195,8 +195,8 @@ 
             $visibility_icon = ($cat->is_visible() == 0) ? 'invisible' : 'visible';
             $visibility_command = ($cat->is_visible() == 0) ? 'set_visible' : 'set_invisible';
 
-            $modify_icons .= '<a class="view_children" data-cat-id="' . $cat->get_id() . '" href="javascript:void(0);">' .
-                Display::return_icon('view_more_stats.gif', get_lang('Show'), '', ICON_SIZE_SMALL) . '</a>';
+            $modify_icons .= '<a class="view_children" data-cat-id="'.$cat->get_id().'" href="javascript:void(0);">'.
+                Display::return_icon('view_more_stats.gif', get_lang('Show'), '', ICON_SIZE_SMALL).'</a>';
 
             if (!api_is_allowed_to_edit(null, true)) {
                 $modify_icons .= Display::url(
@@ -206,9 +206,9 @@ 
                         '',
                         ICON_SIZE_SMALL
                     ),
-                    'personal_stats.php?' . http_build_query([
+                    'personal_stats.php?'.http_build_query([
                         'selectcat' => $cat->get_id()
-                    ]) . '&' . api_get_cidreq(),
+                    ]).'&'.api_get_cidreq(),
                     [
                         'class' => 'ajax',
                         'data-title' => get_lang('FlatView')
@@ -222,16 +222,16 @@ 
                 if (api_get_setting('gradebook_locking_enabled') == 'true') {
                     if ($cat->is_locked()) {
                         if (api_is_platform_admin()) {
-                            $modify_icons .= '&nbsp;<a onclick="javascript:if (!confirm(\'' . addslashes(get_lang('ConfirmToUnlockElement')) . '\')) return false;" href="' . api_get_self() . '?' . api_get_cidreq() . '&category_id=' . $cat->get_id() . '&action=unlock">' .
-                                Display::return_icon('lock.png', get_lang('UnLockEvaluation'), '', ICON_SIZE_SMALL) . '</a>';
+                            $modify_icons .= '&nbsp;<a onclick="javascript:if (!confirm(\''.addslashes(get_lang('ConfirmToUnlockElement')).'\')) return false;" href="'.api_get_self().'?'.api_get_cidreq().'&category_id='.$cat->get_id().'&action=unlock">'.
+                                Display::return_icon('lock.png', get_lang('UnLockEvaluation'), '', ICON_SIZE_SMALL).'</a>';
                         } else {
-                            $modify_icons .= '&nbsp;<a href="#">' . Display::return_icon('lock_na.png', get_lang('GradebookLockedAlert'), '', ICON_SIZE_SMALL) . '</a>';
+                            $modify_icons .= '&nbsp;<a href="#">'.Display::return_icon('lock_na.png', get_lang('GradebookLockedAlert'), '', ICON_SIZE_SMALL).'</a>';
                         }
-                        $modify_icons .= '&nbsp;<a href="gradebook_flatview.php?export_pdf=category&selectcat=' . $cat->get_id() . '" >' . Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_SMALL) . '</a>';
+                        $modify_icons .= '&nbsp;<a href="gradebook_flatview.php?export_pdf=category&selectcat='.$cat->get_id().'" >'.Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_SMALL).'</a>';
                     } else {
-                        $modify_icons .= '&nbsp;<a onclick="javascript:if (!confirm(\'' . addslashes(get_lang('ConfirmToLockElement')) . '\')) return false;" href="' . api_get_self() . '?' . api_get_cidreq() . '&category_id=' . $cat->get_id() . '&action=lock">' .
-                            Display::return_icon('unlock.png', get_lang('LockEvaluation'), '', ICON_SIZE_SMALL) . '</a>';
-                        $modify_icons .= '&nbsp;<a href="#" >' . Display::return_icon('pdf_na.png', get_lang('ExportToPDF'), '', ICON_SIZE_SMALL) . '</a>';
+                        $modify_icons .= '&nbsp;<a onclick="javascript:if (!confirm(\''.addslashes(get_lang('ConfirmToLockElement')).'\')) return false;" href="'.api_get_self().'?'.api_get_cidreq().'&category_id='.$cat->get_id().'&action=lock">'.
+                            Display::return_icon('unlock.png', get_lang('LockEvaluation'), '', ICON_SIZE_SMALL).'</a>';
+                        $modify_icons .= '&nbsp;<a href="#" >'.Display::return_icon('pdf_na.png', get_lang('ExportToPDF'), '', ICON_SIZE_SMALL).'</a>';
                     }
                 }
 
@@ -239,44 +239,44 @@ 
                     if ($cat->is_locked() && !api_is_platform_admin()) {
                         $modify_icons .= Display::return_icon('edit_na.png', get_lang('Modify'), '', ICON_SIZE_SMALL);
                     } else {
-                        $modify_icons .= '<a href="gradebook_edit_cat.php?' .'editcat=' . $cat->get_id() . '&cidReq=' .$cat->get_course_code() . '&id_session='.$cat->get_session_id().'">' .
+                        $modify_icons .= '<a href="gradebook_edit_cat.php?'.'editcat='.$cat->get_id().'&cidReq='.$cat->get_course_code().'&id_session='.$cat->get_session_id().'">'.
                             Display::return_icon(
                                 'edit.png',
                                 get_lang('Modify'),
                                 '',
                                 ICON_SIZE_SMALL
-                            ) . '</a>';
+                            ).'</a>';
                     }
                 }
 
-               $modify_icons .= '<a href="gradebook_edit_all.php?selectcat=' .$cat->get_id() . '&cidReq=' . $cat->get_course_code() . '&id_session='.$cat->get_session_id().'">' .
+               $modify_icons .= '<a href="gradebook_edit_all.php?selectcat='.$cat->get_id().'&cidReq='.$cat->get_course_code().'&id_session='.$cat->get_session_id().'">'.
                     Display::return_icon(
                         'percentage.png',
                         get_lang('EditAllWeights'),
                         '',
                         ICON_SIZE_SMALL
-                    ) . '</a>';
+                    ).'</a>';
 
-                $modify_icons .= '<a href="gradebook_flatview.php?selectcat=' .$cat->get_id() . '&cidReq=' . $cat->get_course_code() . '&id_session='.$cat->get_session_id(). '">' .
+                $modify_icons .= '<a href="gradebook_flatview.php?selectcat='.$cat->get_id().'&cidReq='.$cat->get_course_code().'&id_session='.$cat->get_session_id().'">'.
                     Display::return_icon(
                         'stats.png',
                         get_lang('FlatView'),
                         '',
                         ICON_SIZE_SMALL
-                    ) . '</a>';
-                $modify_icons .= '&nbsp;<a href="' . api_get_self() .'?visiblecat=' . $cat->get_id() . '&' .$visibility_command . '=&selectcat=' . $selectcat .'&cidReq=' . $cat->get_course_code() . '&id_session='.$cat->get_session_id(). '">' .
+                    ).'</a>';
+                $modify_icons .= '&nbsp;<a href="'.api_get_self().'?visiblecat='.$cat->get_id().'&'.$visibility_command.'=&selectcat='.$selectcat.'&cidReq='.$cat->get_course_code().'&id_session='.$cat->get_session_id().'">'.
                     Display::return_icon(
-                        $visibility_icon . '.png',
+                        $visibility_icon.'.png',
                         get_lang('Visible'),
                         '',
                         ICON_SIZE_SMALL
-                    ) . '</a>';
+                    ).'</a>';
 
                 if ($cat->is_locked() && !api_is_platform_admin()) {
                     $modify_icons .= Display::return_icon('delete_na.png', get_lang('DeleteAll'), '', ICON_SIZE_SMALL);
                 } else {
-                    $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?deletecat=' . $cat->get_id() . '&selectcat=' . $selectcat . '&cidReq=' . $cat->get_course_code() . '&id_session='.$cat->get_session_id(). '" onclick="return confirmation();">' .
-                        Display::return_icon('delete.png', get_lang('DeleteAll'), '', ICON_SIZE_SMALL) . '</a>';
+                    $modify_icons .= '&nbsp;<a href="'.api_get_self().'?deletecat='.$cat->get_id().'&selectcat='.$selectcat.'&cidReq='.$cat->get_course_code().'&id_session='.$cat->get_session_id().'" onclick="return confirmation();">'.
+                        Display::return_icon('delete.png', get_lang('DeleteAll'), '', ICON_SIZE_SMALL).'</a>';
                 }
             }
 
@@ -303,21 +303,21 @@ 
             if ($is_locked && !api_is_platform_admin()) {
                 $modify_icons = Display::return_icon('edit_na.png', get_lang('Modify'), '', ICON_SIZE_SMALL);
             } else {
-                $modify_icons = '<a href="gradebook_edit_eval.php?editeval=' . $eval->get_id() . '&cidReq=' . $eval->get_course_code() . '&id_session='.$eval->getSessionId(). '">' .
-                    Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                $modify_icons = '<a href="gradebook_edit_eval.php?editeval='.$eval->get_id().'&cidReq='.$eval->get_course_code().'&id_session='.$eval->getSessionId().'">'.
+                    Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
             }
 
-            $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?visibleeval=' . $eval->get_id() . '&' . $visibility_command . '=&selectcat=' . $selectcat . '&id_session='.$eval->getSessionId(). ' ">' .
-                Display::return_icon($visibility_icon . '.png', get_lang('Visible'), '', ICON_SIZE_SMALL) . '</a>';
+            $modify_icons .= '&nbsp;<a href="'.api_get_self().'?visibleeval='.$eval->get_id().'&'.$visibility_command.'=&selectcat='.$selectcat.'&id_session='.$eval->getSessionId().' ">'.
+                Display::return_icon($visibility_icon.'.png', get_lang('Visible'), '', ICON_SIZE_SMALL).'</a>';
             if (api_is_allowed_to_edit(null, true)) {
-                $modify_icons .= '&nbsp;<a href="gradebook_showlog_eval.php?visiblelog=' . $eval->get_id() . '&selectcat=' . $selectcat . ' &cidReq=' . $eval->get_course_code() . '&id_session='.$eval->getSessionId(). '">' .
-                    Display::return_icon('history.png', get_lang('GradebookQualifyLog'), '', ICON_SIZE_SMALL) . '</a>';
+                $modify_icons .= '&nbsp;<a href="gradebook_showlog_eval.php?visiblelog='.$eval->get_id().'&selectcat='.$selectcat.' &cidReq='.$eval->get_course_code().'&id_session='.$eval->getSessionId().'">'.
+                    Display::return_icon('history.png', get_lang('GradebookQualifyLog'), '', ICON_SIZE_SMALL).'</a>';
             }
 
             if ($is_locked && !api_is_platform_admin()) {
-                $modify_icons .= '&nbsp;' . Display::return_icon('delete_na.png', get_lang('Delete'), '', ICON_SIZE_SMALL);
+                $modify_icons .= '&nbsp;'.Display::return_icon('delete_na.png', get_lang('Delete'), '', ICON_SIZE_SMALL);
             } else {
-                $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?deleteeval=' . $eval->get_id() . '&selectcat=' . $selectcat . ' &cidReq=' . $eval->get_course_code() . '&id_session='.$eval->getSessionId(). '" onclick="return confirmation();">' . Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL) . '</a>';
+                $modify_icons .= '&nbsp;<a href="'.api_get_self().'?deleteeval='.$eval->get_id().'&selectcat='.$selectcat.' &cidReq='.$eval->get_course_code().'&id_session='.$eval->getSessionId().'" onclick="return confirmation();">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
             }
             return $modify_icons;
         }
@@ -347,21 +347,21 @@ 
             if ($is_locked && !api_is_platform_admin()) {
                 $modify_icons = Display::return_icon('edit_na.png', get_lang('Modify'), '', ICON_SIZE_SMALL);
             } else {
-                $modify_icons = '<a href="gradebook_edit_link.php?editlink=' . $link->get_id() . '&cidReq=' . $link->get_course_code() . '&id_session='.$link->get_session_id().'">' .
-                    Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                $modify_icons = '<a href="gradebook_edit_link.php?editlink='.$link->get_id().'&cidReq='.$link->get_course_code().'&id_session='.$link->get_session_id().'">'.
+                    Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
             }
-            $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?visiblelink=' . $link->get_id() . '&' . $visibility_command . '=&selectcat=' . $selectcat . '&id_session='.$link->get_session_id(). ' ">' .
-                Display::return_icon($visibility_icon . '.png', get_lang('Visible'), '', ICON_SIZE_SMALL) . '</a>';
-            $modify_icons .= '&nbsp;<a href="gradebook_showlog_link.php?visiblelink=' . $link->get_id() . '&selectcat=' . $selectcat . '&cidReq=' . $link->get_course_code() . '&id_session='.$link->get_session_id(). '">' .
-                Display::return_icon('history.png', get_lang('GradebookQualifyLog'), '', ICON_SIZE_SMALL) . '</a>';
+            $modify_icons .= '&nbsp;<a href="'.api_get_self().'?visiblelink='.$link->get_id().'&'.$visibility_command.'=&selectcat='.$selectcat.'&id_session='.$link->get_session_id().' ">'.
+                Display::return_icon($visibility_icon.'.png', get_lang('Visible'), '', ICON_SIZE_SMALL).'</a>';
+            $modify_icons .= '&nbsp;<a href="gradebook_showlog_link.php?visiblelink='.$link->get_id().'&selectcat='.$selectcat.'&cidReq='.$link->get_course_code().'&id_session='.$link->get_session_id().'">'.
+                Display::return_icon('history.png', get_lang('GradebookQualifyLog'), '', ICON_SIZE_SMALL).'</a>';
 
             //If a work is added in a gradebook you can only delete the link in the work tool
 
             if ($is_locked && !api_is_platform_admin()) {
-                $modify_icons .= '&nbsp;' . Display::return_icon('delete_na.png', get_lang('Delete'), '', ICON_SIZE_SMALL);
+                $modify_icons .= '&nbsp;'.Display::return_icon('delete_na.png', get_lang('Delete'), '', ICON_SIZE_SMALL);
             } else {
-                $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?deletelink=' . $link->get_id() . '&selectcat=' . $selectcat . ' &cidReq=' . $link->get_course_code() . '&id_session='.$link->get_session_id(). '" onclick="return confirmation();">' .
-                    Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL) . '</a>';
+                $modify_icons .= '&nbsp;<a href="'.api_get_self().'?deletelink='.$link->get_id().'&selectcat='.$selectcat.' &cidReq='.$link->get_course_code().'&id_session='.$link->get_session_id().'" onclick="return confirmation();">'.
+                    Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
             }
             return $modify_icons;
         }
@@ -382,8 +382,8 @@ 
         $sql = "SELECT * FROM $table l
                 WHERE
                     course_code = '$course_code' AND
-                    type = ".(int)$resource_type . " AND
-                    ref_id = " . (int)$resource_id;
+                    type = ".(int) $resource_type." AND
+                    ref_id = " . (int) $resource_id;
         $res = Database::query($sql);
 
         if (Database::num_rows($res) < 1) {
@@ -405,7 +405,7 @@ 
         }
         // TODO find the corresponding category (the first one for this course, ordered by ID)
         $l = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-        $sql = "SELECT * FROM $l WHERE id = " . (int) $link_id;
+        $sql = "SELECT * FROM $l WHERE id = ".(int) $link_id;
         $res = Database::query($sql);
         $row = array();
         if (Database::num_rows($res) > 0) {
@@ -423,10 +423,10 @@ 
     {
         $course_table = Database::get_main_table(TABLE_MAIN_COURSE);
         $tbl_grade_links = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-        $sql = 'SELECT c.id FROM ' . $course_table . ' c
-                INNER JOIN ' . $tbl_grade_links . ' l
+        $sql = 'SELECT c.id FROM '.$course_table.' c
+                INNER JOIN ' . $tbl_grade_links.' l
                 ON c.code = l.course_code
-                WHERE l.id=' . intval($id_link) . ' OR l.category_id=' . intval($id_link);
+                WHERE l.id=' . intval($id_link).' OR l.category_id='.intval($id_link);
         $res = Database::query($sql);
         $array = Database::fetch_array($res, 'ASSOC');
         return $array['id'];
@@ -535,7 +535,7 @@ 
     {
         $result = Result :: load($resid);
         if ($importscore > $eval_max) {
-            header('Location: gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']) . '&overwritemax=');
+            header('Location: gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']).'&overwritemax=');
             exit;
         }
         $result[0]->set_score($importscore);
@@ -576,8 +576,8 @@ 
     {
         $table = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CERTIFICATE);
         $sql = 'SELECT COUNT(*) as count
-                FROM ' . $table . ' gc
-                WHERE gc.cat_id="' . intval($cat_id) . '" AND user_id="' . intval($user_id) . '" ';
+                FROM ' . $table.' gc
+                WHERE gc.cat_id="' . intval($cat_id).'" AND user_id="'.intval($user_id).'" ';
         $rs_exist = Database::query($sql);
         $row = Database::fetch_array($rs_exist);
         if ($row['count'] == 0) {
@@ -600,8 +600,8 @@ 
     public static function get_certificate_by_user_id($cat_id, $user_id)
     {
         $table_certificate = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CERTIFICATE);
-        $sql = 'SELECT * FROM ' . $table_certificate . '
-                WHERE cat_id="' . intval($cat_id) . '" AND user_id="' . intval($user_id) . '"';
+        $sql = 'SELECT * FROM '.$table_certificate.'
+                WHERE cat_id="' . intval($cat_id).'" AND user_id="'.intval($user_id).'"';
 
         $result = Database::query($sql);
         $row = Database::fetch_array($result, 'ASSOC');
@@ -620,18 +620,18 @@ 
         $table_certificate = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CERTIFICATE);
         $table_user = Database::get_main_table(TABLE_MAIN_USER);
         $sql = 'SELECT DISTINCT u.user_id, u.lastname, u.firstname, u.username
-                FROM ' . $table_user . ' u
-                INNER JOIN ' . $table_certificate . ' gc
+                FROM ' . $table_user.' u
+                INNER JOIN ' . $table_certificate.' gc
                 ON u.user_id=gc.user_id ';
         if (!is_null($cat_id) && $cat_id > 0) {
-            $sql.=' WHERE cat_id=' . intval($cat_id);
+            $sql .= ' WHERE cat_id='.intval($cat_id);
         }
         if (!empty($userList)) {
             $userList = array_map('intval', $userList);
             $userListCondition = implode("','", $userList);
             $sql .= " AND u.user_id IN ('$userListCondition')";
         }
-        $sql.=' ORDER BY u.firstname';
+        $sql .= ' ORDER BY u.firstname';
         $rs = Database::query($sql);
 
         $list_users = array();
@@ -652,10 +652,10 @@ 
     {
         $table_certificate = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CERTIFICATE);
         $sql = 'SELECT gc.score_certificate, gc.created_at, gc.path_certificate, gc.cat_id, gc.user_id, gc.id
-                FROM  ' . $table_certificate . ' gc
-                WHERE gc.user_id="' . intval($user_id) . '" ';
+                FROM  ' . $table_certificate.' gc
+                WHERE gc.user_id="' . intval($user_id).'" ';
         if (!is_null($cat_id) && $cat_id > 0) {
-            $sql.=' AND cat_id=' . intval($cat_id);
+            $sql .= ' AND cat_id='.intval($cat_id);
         }
 
         $rs = Database::query($sql);
@@ -693,12 +693,12 @@ 
             $variables = $content_html['variables'];
         }
 
-        $path_image = api_get_path(WEB_COURSE_PATH) . api_get_course_path($course_code) . '/document/images/gallery';
+        $path_image = api_get_path(WEB_COURSE_PATH).api_get_course_path($course_code).'/document/images/gallery';
         $new_content_html = str_replace('../images/gallery', $path_image, $new_content_html);
 
-        $path_image_in_default_course = api_get_path(WEB_CODE_PATH) . 'default_course_document';
+        $path_image_in_default_course = api_get_path(WEB_CODE_PATH).'default_course_document';
         $new_content_html = str_replace('/main/default_course_document', $path_image_in_default_course, $new_content_html);
-        $new_content_html = str_replace(SYS_CODE_PATH . 'img/', api_get_path(WEB_IMG_PATH), $new_content_html);
+        $new_content_html = str_replace(SYS_CODE_PATH.'img/', api_get_path(WEB_IMG_PATH), $new_content_html);
 
         //add print header
         if ($hide_print_button == false) {
@@ -709,7 +709,7 @@ 
         }
 
         // Add header
-        $new_content_html =  $contentHead. $print . '</head>' . $new_content_html;
+        $new_content_html = $contentHead.$print.'</head>'.$new_content_html;
 
         return array(
             'content' => $new_content_html,
@@ -731,9 +731,9 @@ 
             $session_id = api_get_session_id();
 
             $t = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
-            $sql = "SELECT * FROM $t WHERE course_code = '" . Database::escape_string($course_code) . "' ";
+            $sql = "SELECT * FROM $t WHERE course_code = '".Database::escape_string($course_code)."' ";
             if (!empty($session_id)) {
-                $sql .= " AND session_id = " . (int) $session_id;
+                $sql .= " AND session_id = ".(int) $session_id;
             } else {
                 $sql .= " AND (session_id IS NULL OR session_id = 0) ";
             }
@@ -745,7 +745,7 @@ 
                 if (!empty($session_id)) {
                     $my_session_id = api_get_session_id();
                     $s_name = api_get_session_name($my_session_id);
-                    $cat->set_name($course_code . ' - ' . get_lang('Session') . ' ' . $s_name);
+                    $cat->set_name($course_code.' - '.get_lang('Session').' '.$s_name);
                     $cat->set_session_id($session_id);
                 } else {
                     $cat->set_name($course_code);
@@ -867,13 +867,13 @@ 
 
         if ($use_grade_model) {
             if ($parent_id == 0) {
-                $title = api_strtoupper(get_lang('Average')) . '<br />' . get_lang('Detailed');
+                $title = api_strtoupper(get_lang('Average')).'<br />'.get_lang('Detailed');
             } else {
-                $title = api_strtoupper(get_lang('Average')) . '<br />' . $cat[0]->get_description() . ' - (' . $cat[0]->get_name() . ')';
+                $title = api_strtoupper(get_lang('Average')).'<br />'.$cat[0]->get_description().' - ('.$cat[0]->get_name().')';
             }
         } else {
             if ($parent_id == 0) {
-                $title = api_strtoupper(get_lang('Average')) . '<br />' . get_lang('Detailed');
+                $title = api_strtoupper(get_lang('Average')).'<br />'.get_lang('Detailed');
             } else {
                 $title = api_strtoupper(get_lang('Average'));
             }
@@ -927,11 +927,11 @@ 
         } else {
             $column = 0;
             $table->setCellContents($row, $column, get_lang('NoResults'));
-            $table->updateCellAttributes($row, $column, 'colspan="' . $columns . '" align="center" class="row_odd"');
+            $table->updateCellAttributes($row, $column, 'colspan="'.$columns.'" align="center" class="row_odd"');
         }
 
         $pdfParams = array(
-            'filename' => get_lang('FlatView') . '_' . api_get_utc_datetime(),
+            'filename' => get_lang('FlatView').'_'.api_get_utc_datetime(),
             'pdf_title' => $title,
             'course_code' => $course_code,
             'add_signatures' => true
@@ -1016,7 +1016,7 @@ 
         $a_students = array();
         while ($user = Database::fetch_array($result)) {
             if (!array_key_exists($user['user_id'], $a_students)) {
-                $a_current_student = array ();
+                $a_current_student = array();
                 $a_current_student[] = $user['user_id'];
                 $a_current_student[] = $user['username'];
                 $a_current_student[] = $user['lastname'];
@@ -1074,7 +1074,7 @@ 
         foreach ($links as $link) {
             // links are always in a course
             $coursecode = $link->get_course_code();
-            if (!array_key_exists($coursecode,$coursecodes)) {
+            if (!array_key_exists($coursecode, $coursecodes)) {
                 $coursecodes[$coursecode] = '1';
                 $users = array_merge($users, GradebookUtils::get_users_in_course($coursecode));
             }
@@ -1087,7 +1087,7 @@ 
      * Search students matching a given last name and/or first name
      * @author Bert Steppé
      */
-    public static function find_students($mask= '')
+    public static function find_students($mask = '')
     {
         // students shouldn't be here // don't search if mask empty
         if (!api_is_allowed_to_edit() || empty ($mask)) {
@@ -1098,23 +1098,23 @@ 
         $tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
         $tbl_cru = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
         $sql = 'SELECT DISTINCT user.user_id, user.lastname, user.firstname, user.email, user.official_code
-                FROM ' . $tbl_user . ' user';
+                FROM ' . $tbl_user.' user';
         if (!api_is_platform_admin()) {
-            $sql .= ', ' . $tbl_cru . ' cru';
+            $sql .= ', '.$tbl_cru.' cru';
         }
 
-        $sql .= ' WHERE user.status = ' . STUDENT;
-        $sql .= ' AND (user.lastname LIKE '."'%" . $mask . "%'";
-        $sql .= ' OR user.firstname LIKE '."'%" . $mask . "%')";
+        $sql .= ' WHERE user.status = '.STUDENT;
+        $sql .= ' AND (user.lastname LIKE '."'%".$mask."%'";
+        $sql .= ' OR user.firstname LIKE '."'%".$mask."%')";
 
         if (!api_is_platform_admin()) {
             $sql .= ' AND user.user_id = cru.user_id AND
                       cru.relation_type <> '.COURSE_RELATION_TYPE_RRHH.' AND
                       cru.c_id in (
-                            SELECT c_id FROM '.$tbl_cru . '
+                            SELECT c_id FROM '.$tbl_cru.'
                             WHERE
-                                user_id = ' . api_get_user_id() . ' AND
-                                status = ' . COURSEMANAGER . '
+                                user_id = ' . api_get_user_id().' AND
+                                status = ' . COURSEMANAGER.'
                         )
                     ';
         }
@@ -1157,7 +1157,7 @@ 
         $sql = 'SELECT ref_id FROM '.$table_link.'
                 WHERE id = '.$linkId.' AND type='.LINK_ATTENDANCE;
 
-        $rs_attendance  = Database::query($sql);
+        $rs_attendance = Database::query($sql);
         if (Database::num_rows($rs_attendance) > 0) {
             $row_attendance = Database::fetch_array($rs_attendance);
             $sql = 'UPDATE '.$tbl_attendance.' SET attendance_weight ='.$weight.'
@@ -1243,7 +1243,7 @@ 
                 'course' => $courseInfo['title'],
                 'score' => $certificateInfo['score_certificate'],
                 'date' => api_format_date($certificateInfo['created_at'], DATE_FORMAT_SHORT),
-                'link' => api_get_path(WEB_PATH) . "certificates/index.php?id={$certificateInfo['id']}"
+                'link' => api_get_path(WEB_PATH)."certificates/index.php?id={$certificateInfo['id']}"
             ];
         }
 
@@ -1307,7 +1307,7 @@ 
                     'course' => $course['title'],
                     'score' => $certificateInfo['score_certificate'],
                     'date' => api_format_date($certificateInfo['created_at'], DATE_FORMAT_SHORT),
-                    'link' => api_get_path(WEB_PATH) . "certificates/index.php?id={$certificateInfo['id']}"
+                    'link' => api_get_path(WEB_PATH)."certificates/index.php?id={$certificateInfo['id']}"
                 ];
             }
         }

main/gradebook/lib/fe/resulttable.class.php

Spacing +19 added lines, -19 removed lines

@@ -18,9 +18,9 @@ 
 	/**
 	 * Constructor
 	 */
-    public function ResultTable ($evaluation, $results = array(), $iscourse, $addparams = null,$forprint = false)
+    public function ResultTable($evaluation, $results = array(), $iscourse, $addparams = null, $forprint = false)
 	{
-    	parent :: __construct ('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1);
+    	parent :: __construct('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1);
 
 		$this->datagen = new ResultsDataGenerator($evaluation, $results, true);
 
@@ -28,14 +28,14 @@ 
 		$this->iscourse = $iscourse;
 		$this->forprint = $forprint;
 
-		if (isset ($addparams))  {
+		if (isset ($addparams)) {
 			$this->set_additional_parameters($addparams);
 		}
 		$scoredisplay = ScoreDisplay :: instance();
-		$column= 0;
+		$column = 0;
 		if ($this->iscourse == '1') {
 			$this->set_header($column++, '', false);
-			$this->set_form_actions(array (
+			$this->set_form_actions(array(
 					'delete' => get_lang('Delete')
 			));
 		}
@@ -51,7 +51,7 @@ 
 			$this->set_header($column++, get_lang('Display'));
 		}
 		if (!$this->forprint) {
-			$this->set_header($column++, get_lang('Modify'),false);
+			$this->set_header($column++, get_lang('Modify'), false);
 		}
     }
 
@@ -59,7 +59,7 @@ 
 	/**
 	 * Function used by SortableTable to get total number of items in the table
 	 */
-	public function get_total_number_of_items ()
+	public function get_total_number_of_items()
     {
 		return $this->datagen->get_total_results_count();
 	}
@@ -112,7 +112,7 @@ 
 		// generate the data to display
 		$sortable_data = array();
 		foreach ($data_array as $item) {
-			$row = array ();
+			$row = array();
 			if ($this->iscourse == '1') {
 				 $row[] = $item['result_id'];
 			}
@@ -124,13 +124,13 @@ 
 				$row[] = $item['firstname'];
 			}
 
-			$row[] =  Display::bar_progress($item['percentage_score'], false, $item['score']);
+			$row[] = Display::bar_progress($item['percentage_score'], false, $item['score']);
             //$row[] =  Display::bar_progress($item['percentage_score'], true);
 			if ($scoredisplay->is_custom()) {
 				$row[] = $item['display'];
 			}
 			if (!$this->forprint) {
-				$row[] = $this->build_edit_column ($item);
+				$row[] = $this->build_edit_column($item);
 			}
 			$sortable_data[] = $row;
 		}
@@ -138,23 +138,23 @@ 
 		return $sortable_data;
 	}
 
-	private function build_edit_column ($item)
+	private function build_edit_column($item)
 	{
-		$status=CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
+		$status = CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
 		$locked_status = $this->evaluation->get_locked();
 		if (api_is_allowed_to_edit(null, true) && $locked_status == 0) {
 			//api_is_course_admin()
-			$edit_column = '<a href="' . api_get_self() . '?editres=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
-				Display::return_icon('edit.png', get_lang('Modify'),'','22').'</a>';
-			$edit_column .= ' <a href="' . api_get_self() . '?delete_mark=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
-				Display::return_icon('delete.png', get_lang('Delete'),'','22').'</a>';
+			$edit_column = '<a href="'.api_get_self().'?editres='.$item['result_id'].'&selecteval='.$this->evaluation->get_id().'&'.api_get_cidreq().'">'.
+				Display::return_icon('edit.png', get_lang('Modify'), '', '22').'</a>';
+			$edit_column .= ' <a href="'.api_get_self().'?delete_mark='.$item['result_id'].'&selecteval='.$this->evaluation->get_id().'&'.api_get_cidreq().'">'.
+				Display::return_icon('delete.png', get_lang('Delete'), '', '22').'</a>';
 		}
 
 		if ($this->evaluation->get_course_code() == null) {
-			$edit_column .= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();">';
+			$edit_column .= '&nbsp;<a href="'.api_get_self().'?resultdelete='.$item['result_id'].'&selecteval='.$this->evaluation->get_id().'" onclick="return confirmationuser();">';
 			$edit_column .= Display::return_icon('delete.png', get_lang('Delete'));
 			$edit_column .= '</a>';
-		    $edit_column .= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '&'.api_get_cidreq().'">';
+		    $edit_column .= '&nbsp;<a href="user_stats.php?userid='.$item['id'].'&selecteval='.$this->evaluation->get_id().'&'.api_get_cidreq().'">';
 			$edit_column .= Display::return_icon('statistics.gif', get_lang('Statistics'));
 		    $edit_column .= '</a>';
 		}
@@ -165,7 +165,7 @@ 
 			$doc_url = $link->get_view_url($item['id']);
 
 			if ($doc_url != null) {
-				$edit_column .= '&nbsp;<a href="'. $doc_url . '" target="_blank">';
+				$edit_column .= '&nbsp;<a href="'.$doc_url.'" target="_blank">';
 				$edit_column .= Display::return_icon('link.gif', get_lang('OpenDocument').'</a>';
 			}
 		}

main/inc/lib/statsUtils.lib.inc.php

Spacing +5 added lines, -5 removed lines

@@ -155,7 +155,7 @@ 
             $last_day = -1;
             while ($row = Database::fetch_row($res)) {
                 $date_array = getdate($row[0]);
-                $display_date = $date_array['mday'] . ' ' . $MonthsShort[$date_array['mon'] - 1] . ' ' . $date_array['year'];
+                $display_date = $date_array['mday'].' '.$MonthsShort[$date_array['mon'] - 1].' '.$date_array['year'];
                 if ($date_array['mday'] == $last_day) {
                     $days_array[$display_date]++;
                 } else {
@@ -221,7 +221,7 @@ 
                      
                 </td>
                 <td width='10%'>
-                    <b>" . get_lang('Hits') . "</b>
+                    <b>".get_lang('Hits')."</b>
                 </td>
                 <td width='15%'>
                     <b>%</b>
@@ -249,7 +249,7 @@ 
                     echo "<img src='".Display::returnIconPath('bar_1m.gif')."' width='1' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />";
                 }
                 if ($pourcent != 100) {
-                    echo "<img src='".Display::returnIconPath('bar_1r.gif')."' width='" . ($maxSize - $barwidth) . "' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />";
+                    echo "<img src='".Display::returnIconPath('bar_1r.gif')."' width='".($maxSize - $barwidth)."' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />";
                 }
                 echo "<img src='".Display::returnIconPath('bar_1.gif')."' width='1' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />
                     </td>
@@ -265,13 +265,13 @@ 
         }
         echo "<tr bgcolor='#E6E6E6'>
                 <td width='15%' align='center'>
-                    " . get_lang('Total') . "
+                    " . get_lang('Total')."
                 </td>
                 <td align='right' width='60%'>
                     &nbsp;
                 </td>
                 <td align='center' width='10%'>
-                    " . $period_array['total'] . "
+                    " . $period_array['total']."
                 </td>
                 <td width='15%'>
                     &nbsp;

main/inc/lib/upload.xajax.php

Spacing +5 added lines, -5 removed lines

@@ -7,7 +7,7 @@ 
  */
 include(dirname(__FILE__).'/../global.inc.php');
 $xajax_upload = new Xajax();
-$xajax_upload -> registerFunction ('updateProgress');
+$xajax_upload -> registerFunction('updateProgress');
 $xajax_upload -> processRequests();
 
 /**
@@ -19,11 +19,11 @@ 
 
 	$objResponse = new xajaxResponse();
 	$ul_info = uploadprogress_get_info($upload_id);
-	$percent = intval($ul_info['bytes_uploaded']*100/$ul_info['bytes_total']);
-	if($waitAfterupload && $ul_info['est_sec']<2) {
+	$percent = intval($ul_info['bytes_uploaded'] * 100 / $ul_info['bytes_total']);
+	if ($waitAfterupload && $ul_info['est_sec'] < 2) {
 		$percent = 100;
-		$objResponse->addAssign($div_id.'_label' , 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
-		$objResponse->addAssign($div_id.'_waiter_frame','innerHTML', Display::return_icon('progress_bar.gif'));
+		$objResponse->addAssign($div_id.'_label', 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
+		$objResponse->addAssign($div_id.'_waiter_frame', 'innerHTML', Display::return_icon('progress_bar.gif'));
 		$objResponse->addScript('clearInterval("myUpload.__progress_bar_interval")');
 	}
 	$objResponse->addAssign($div_id.'_label', 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');

main/tracking/lp_results_by_user.php

Spacing +16 added lines, -16 removed lines

@@ -26,7 +26,7 @@ 
 	$export_to_csv = true;
 }
 
-if (api_is_platform_admin() ) {
+if (api_is_platform_admin()) {
 	$global = true;
 } else {
 	$global = false;
@@ -34,7 +34,7 @@ 
 
 if ($global) {
 	$temp_course_list = CourseManager :: get_courses_list();
-	foreach($temp_course_list  as $temp_course_item) {
+	foreach ($temp_course_list  as $temp_course_item) {
 		$course_item = CourseManager ::get_course_information($temp_course_item['code']);
         $course_list[] = array(
             'code' => $course_item['code'],
@@ -47,14 +47,14 @@ 
 }
 
 $new_course_select = array();
-foreach($course_list as $data) {
+foreach ($course_list as $data) {
     $new_course_select[$data['code']] = $data['title'];
 }
 
 $form = new FormValidator('search_simple', 'POST', '', '', null, false);
-$form->addElement('select','course_code',get_lang('Course'), $new_course_select);
+$form->addElement('select', 'course_code', get_lang('Course'), $new_course_select);
 if ($global) {
-	$form->addElement('hidden','view','admin');
+	$form->addElement('hidden', 'view', 'admin');
 } else {
 	//Get exam lists
     $course_id = api_get_course_int_id();
@@ -64,7 +64,7 @@ 
 	                 ORDER BY quiz.title ASC";
 	$resultExercices = Database::query($sqlExercices);
 	$exercise_list[0] = get_lang('All');
-	while($a_exercices = Database::fetch_array($resultExercices)) {
+	while ($a_exercices = Database::fetch_array($resultExercices)) {
 		$exercise_list[$a_exercices['id']] = $a_exercices['title'];
 	}
 	$form->addElement('select', 'exercise_id', get_lang('Exercise'), $exercise_list);
@@ -87,7 +87,7 @@ 
 
         echo '<div style="float:right"> <a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'">
                 '.Display::return_icon('csv.gif').'
-                &nbsp;'.get_lang('ExportAsCSV').'</a>' .
+                &nbsp;'.get_lang('ExportAsCSV').'</a>'.
                 '<a href="javascript: void(0);" onclick="javascript: window.print()">
                 '.Display::return_icon('printmgr.gif').'
                 &nbsp;'.get_lang('Print').'</a>
@@ -101,10 +101,10 @@ 
         }
 		$menu_items[] = get_lang('ExamTracking');
 		$nb_menu_items = count($menu_items);
-		if($nb_menu_items>1) {
-			foreach($menu_items as $key=> $item) {
+		if ($nb_menu_items > 1) {
+			foreach ($menu_items as $key=> $item) {
 				echo $item;
-				if($key!=$nb_menu_items-1) {
+				if ($key != $nb_menu_items - 1) {
 					echo ' | ';
 				}
 			}
@@ -128,7 +128,7 @@ 
 $session_id = 0;
 $user_list = array();
 // Getting course list
-foreach ($course_list  as $current_course ) {
+foreach ($course_list  as $current_course) {
 	$course_info = api_get_course_info($current_course['code']);
 	$_course = $course_info;
 
@@ -162,7 +162,7 @@ 
 }
 
 if (!empty($user_list)) {
-    foreach($user_list as $user_id) {
+    foreach ($user_list as $user_id) {
         $user_data = api_get_user_info($user_id);
 		$user_list_name[$user_id] = api_get_person_name(
 			$user_data['firstname'],
@@ -170,7 +170,7 @@ 
 		);
     }
 }
-$export_array =  array();
+$export_array = array();
 if (!empty($main_result)) {
 
     $html_result .= '<table  class="data_table">';
@@ -193,9 +193,9 @@ 
 
             foreach ($exercises as $exercise_id => $exercise_data) {
                 $users = $exercise_data['users'];
-                foreach($users as $user_id => $attempts) {
+                foreach ($users as $user_id => $attempts) {
                     $attempt = 1;
-                    foreach($attempts as $exe_id => $attempt_data) {
+                    foreach ($attempts as $exe_id => $attempt_data) {
                         $html_result .= '<tr colspan="">';
                         $html_result .= Display::tag('td', $course_code);
                         $html_result .= Display::tag('td', $lp_list_name[$lp_id]);
@@ -222,7 +222,7 @@ 
             }
         }
     }
-    $html_result .='</table>';
+    $html_result .= '</table>';
 }
 
 if (!$export_to_csv) {

main/exercice/hotspot_admin.inc.php

Spacing +49 added lines, -49 removed lines

@@ -25,7 +25,7 @@ 
 
 if ($modifyIn) {
     if ($debug > 0) {
-        echo '$modifyIn was set' . "<br />\n";
+        echo '$modifyIn was set'."<br />\n";
     }
     // if the user has chosen to modify the question only in the current exercise
     if ($modifyIn == 'thisExercise') {
@@ -64,7 +64,7 @@ 
     unset($buttonBack);
 }
 
-$hotspot_admin_url = api_get_path(WEB_CODE_PATH) . 'exercice/admin.php?' . api_get_cidreq() . '&exerciseId=' . $exerciseId;
+$hotspot_admin_url = api_get_path(WEB_CODE_PATH).'exercice/admin.php?'.api_get_cidreq().'&exerciseId='.$exerciseId;
 
 // the answer form has been submitted
 $submitAnswers = isset($_POST['submitAnswers']) ? true : false;
@@ -74,13 +74,13 @@ 
 if ($submitAnswers || $buttonBack) {
     if ($answerType == HOT_SPOT) {
         if ($debug > 0) {
-            echo '$submitAnswers or $buttonBack was set' . "<br />\n";
+            echo '$submitAnswers or $buttonBack was set'."<br />\n";
         }
 
         $questionWeighting = $nbrGoodAnswers = 0;
         for ($i = 1; $i <= $nbrAnswers; $i++) {
             if ($debug > 0) {
-                echo str_repeat('&nbsp;', 4) . '$answerType is HOT_SPOT' . "<br />\n";
+                echo str_repeat('&nbsp;', 4).'$answerType is HOT_SPOT'."<br />\n";
             }
 
             $reponse[$i] = trim($reponse[$i]);
@@ -114,7 +114,7 @@ 
         if (empty($msgErr)) {
             for ($i = 1; $i <= $nbrAnswers; $i++) {
                 if ($debug > 0) {
-                    echo str_repeat('&nbsp;', 4) . '$answerType is HOT_SPOT' . "<br />\n";
+                    echo str_repeat('&nbsp;', 4).'$answerType is HOT_SPOT'."<br />\n";
                 }
 
                 $reponse[$i] = trim($reponse[$i]);
@@ -122,7 +122,7 @@ 
                 $weighting[$i] = ($weighting[$i]); //it can be float
 
                 if ($weighting[$i]) {
-                    $questionWeighting+=$weighting[$i];
+                    $questionWeighting += $weighting[$i];
                 }
 
                 // creates answer
@@ -145,15 +145,15 @@ 
 
             $editQuestion = $questionId;
             unset($modifyAnswers);
-            echo '<script type="text/javascript">window.location.href="' . $hotspot_admin_url . '&message=ItemUpdated"</script>';
+            echo '<script type="text/javascript">window.location.href="'.$hotspot_admin_url.'&message=ItemUpdated"</script>';
         }
 
         if ($debug > 0) {
-            echo '$modifyIn was set - end' . "<br />\n";
+            echo '$modifyIn was set - end'."<br />\n";
         }
     } else {
         if ($debug > 0) {
-            echo '$submitAnswers or $buttonBack was set' . "<br />\n";
+            echo '$submitAnswers or $buttonBack was set'."<br />\n";
         }
 
         $questionWeighting = $nbrGoodAnswers = 0;
@@ -168,7 +168,7 @@ 
 
         for ($i = 1; $i <= $nbrAnswers; $i++) {
             if ($debug > 0) {
-                echo str_repeat('&nbsp;', 4) . '$answerType is HOT_SPOT' . "<br />\n";
+                echo str_repeat('&nbsp;', 4).'$answerType is HOT_SPOT'."<br />\n";
             }
 
             $reponse[$i] = trim($reponse[$i]);
@@ -193,7 +193,7 @@ 
                 $threadhold3_str = intval($threadhold3[$i]);
             }
 
-            $threadhold_total = $threadhold1_str . ';' . $threadhold2_str . ';' . $threadhold3_str;
+            $threadhold_total = $threadhold1_str.';'.$threadhold2_str.';'.$threadhold3_str;
 
             if (isset($try[$i]) && $try[$i] == 'on') {
                 $try_str = 1;
@@ -219,7 +219,7 @@ 
                 $question_str = $select_question[$i];
             }
 
-            $destination[$i] = $threadhold_total . '@@' . $try_str . '@@' . $lp_str . '@@' . $question_str . '@@' . $url_str;
+            $destination[$i] = $threadhold_total.'@@'.$try_str.'@@'.$lp_str.'@@'.$question_str.'@@'.$url_str;
 
             // checks if field is empty
             if (empty($reponse[$i]) && $reponse[$i] != '0') {
@@ -277,12 +277,12 @@ 
             $question_str = $selectQuestionNoError;
         }
 
-        $destination_noerror = $threadhold_total . '@@' . $try_str . '@@' . $lp_str . '@@' . $question_str . '@@' . $url_str;
+        $destination_noerror = $threadhold_total.'@@'.$try_str.'@@'.$lp_str.'@@'.$question_str.'@@'.$url_str;
 
         if (empty($msgErr)) {
             for ($i = 1; $i <= $nbrAnswers; $i++) {
                 if ($debug > 0) {
-                    echo str_repeat('&nbsp;', 4) . '$answerType is HOT_SPOT' . "<br />\n";
+                    echo str_repeat('&nbsp;', 4).'$answerType is HOT_SPOT'."<br />\n";
                 }
 
                 $reponse[$i] = trim($reponse[$i]);
@@ -290,7 +290,7 @@ 
                 $weighting[$i] = ($weighting[$i]); //it can be float
 
                 if ($weighting[$i]) {
-                    $questionWeighting+=$weighting[$i];
+                    $questionWeighting += $weighting[$i];
                 }
                 // creates answer
                 $objAnswer->createAnswer(
@@ -325,14 +325,14 @@ 
             $editQuestion = $questionId;
             unset($modifyAnswers);
 
-            echo '<script type="text/javascript">window.location.href="' . $hotspot_admin_url . '&message=ItemUpdated"</script>';
+            echo '<script type="text/javascript">window.location.href="'.$hotspot_admin_url.'&message=ItemUpdated"</script>';
         }
     }
 }
 
 if ($modifyAnswers) {
     if ($debug > 0) {
-        echo str_repeat('&nbsp;', 0) . '$modifyAnswers is set' . "<br />\n";
+        echo str_repeat('&nbsp;', 0).'$modifyAnswers is set'."<br />\n";
     }
 
     // construction of the Answer object
@@ -340,7 +340,7 @@ 
     Session::write('objAnswer', $objAnswer);
 
     if ($debug > 0) {
-        echo str_repeat('&nbsp;', 2) . '$answerType is HOT_SPOT' . "<br />\n";
+        echo str_repeat('&nbsp;', 2).'$answerType is HOT_SPOT'."<br />\n";
     }
 
     if ($answerType == HOT_SPOT_DELINEATION) {
@@ -521,11 +521,11 @@ 
     }
 
     if ($debug > 0) {
-        echo str_repeat('&nbsp;', 2) . '$usedInSeveralExercises is untrue' . "<br />\n";
+        echo str_repeat('&nbsp;', 2).'$usedInSeveralExercises is untrue'."<br />\n";
     }
 
     if ($debug > 0) {
-        echo str_repeat('&nbsp;', 4) . '$answerType is HOT_SPOT' . "<br />\n";
+        echo str_repeat('&nbsp;', 4).'$answerType is HOT_SPOT'."<br />\n";
     }
 
     if ($answerType == HOT_SPOT_DELINEATION) {
@@ -565,14 +565,14 @@ 
 
     Display::tag(
         'h3',
-        get_lang('Question') . ": " . $questionName . Display::return_icon('info3.gif', strip_tags(get_lang('HotspotChoose')))
+        get_lang('Question').": ".$questionName.Display::return_icon('info3.gif', strip_tags(get_lang('HotspotChoose')))
     );
 
     if (!empty($msgErr)) {
         Display::display_normal_message($msgErr); //main API
     }
 
-    $hotspot_admin_url = api_get_path(WEB_CODE_PATH) . 'exercice/admin.php?' . api_get_cidreq() . '&hotspotadmin=' . $modifyAnswers . '&exerciseId=' . $exerciseId . '&' . api_get_cidreq();
+    $hotspot_admin_url = api_get_path(WEB_CODE_PATH).'exercice/admin.php?'.api_get_cidreq().'&hotspotadmin='.$modifyAnswers.'&exerciseId='.$exerciseId.'&'.api_get_cidreq();
     ?>
     <form method="post" action="<?php echo $hotspot_admin_url; ?>" class="form-horizontal" id="frm_exercise" name="frm_exercise">
         <div class="form-group">
@@ -611,7 +611,7 @@ 
                                 <th><?php echo get_lang('Comment'); ?></th>
                                 <?php
                                 if ($answerType == HOT_SPOT_DELINEATION) {
-                                    echo '<th >' . get_lang('Scenario') . '</th>';
+                                    echo '<th >'.get_lang('Scenario').'</th>';
                                 }
                                 ?>
                                 <?php
@@ -643,36 +643,36 @@ 
                                         $isSelected = true;
                                         $selected = 'selected="selected"';
                                     }
-                                    $option_lp.='<option value="' . $id . '" ' . $selected . '>' . $details['lp_name'] . '</option>';
+                                    $option_lp .= '<option value="'.$id.'" '.$selected.'>'.$details['lp_name'].'</option>';
                                 }
 
                                 if ($isSelected) {
-                                    $option_lp = '<option value="0">' . get_lang('SelectTargetLP') . '</option>' . $option_lp;
+                                    $option_lp = '<option value="0">'.get_lang('SelectTargetLP').'</option>'.$option_lp;
                                 } else {
-                                    $option_lp = '<option value="0" selected="selected" >' . get_lang('SelectTargetLP') . '</option>' . $option_lp;
+                                    $option_lp = '<option value="0" selected="selected" >'.get_lang('SelectTargetLP').'</option>'.$option_lp;
                                 }
 
                                 // Feedback SELECT
                                 $question_list = $objExercise->selectQuestionList();
                                 $option_feed = '';
-                                $option_feed.='<option value="0">' . get_lang('SelectTargetQuestion') . '</option>';
+                                $option_feed .= '<option value="0">'.get_lang('SelectTargetQuestion').'</option>';
 
                                 foreach ($question_list as $key => $questionid) {
                                     $selected = '';
                                     $question = Question::read($questionid);
-                                    $val = 'Q' . $key . ' :' . substrwords($question->selectTitle(), ICON_SIZE_SMALL);
+                                    $val = 'Q'.$key.' :'.substrwords($question->selectTitle(), ICON_SIZE_SMALL);
 
                                     if (isset($select_question[$i]) && $questionid == $select_question[$i]) {
                                         $selected = 'selected="selected"';
                                     }
 
-                                    $option_feed.='<option value="' . $questionid . '" ' . $selected . ' >' . $val . '</option>';
+                                    $option_feed .= '<option value="'.$questionid.'" '.$selected.' >'.$val.'</option>';
                                 }
 
                                 if (isset($select_question[$i]) && $select_question[$i] == -1) {
-                                    $option_feed .= '<option value="-1" selected="selected" >' . get_lang('ExitTest') . '</option>';
+                                    $option_feed .= '<option value="-1" selected="selected" >'.get_lang('ExitTest').'</option>';
                                 } else {
-                                    $option_feed .= '<option value="-1">' . get_lang('ExitTest') . '</option>';
+                                    $option_feed .= '<option value="-1">'.get_lang('ExitTest').'</option>';
                                 }
 
                                 //-------- IF it is a delineation
@@ -688,9 +688,9 @@ 
                                             $selected2 = 'selected="selected"';
                                         if ($k == $threadhold3[$i])
                                             $selected3 = 'selected="selected"';
-                                        $option1.='<option ' . $selected1 . ' >' . $k . ' % </option>';
-                                        $option2.='<option ' . $selected2 . ' >' . $k . ' % </option>';
-                                        $option3.='<option ' . $selected3 . '>' . $k . ' %</option>';
+                                        $option1 .= '<option '.$selected1.' >'.$k.' % </option>';
+                                        $option2 .= '<option '.$selected2.' >'.$k.' % </option>';
+                                        $option3 .= '<option '.$selected3.'>'.$k.' %</option>';
                                     }
                                     ?>
                                     <tr>
@@ -734,7 +734,7 @@ 
                                                 <div class="checkbox">
                                                     <p>
                                                         <label>
-                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]"  <?php if ($try[$i] == 1) echo'checked'; ?> />
+                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try['.$i; ?>]"  <?php if ($try[$i] == 1) echo'checked'; ?> />
                                                             <?php echo get_lang('TryAgain'); ?>
                                                         </label>
                                                     </p>
@@ -787,7 +787,7 @@ 
                                                             <div class="checkbox">
                                                                 <p>
                                                                     <label>
-                                                                        <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if ($try[$i] == 1) echo'checked'; ?> />
+                                                                        <input type="checkbox" class="checkbox" name="<?php echo 'try['.$i; ?>]" <?php if ($try[$i] == 1) echo'checked'; ?> />
                                                                         <?php echo get_lang('TryAgain'); ?>
                                                                     </label>
                                                                 </p>
@@ -852,7 +852,7 @@ 
                                                 <div class="checkbox">
                                                     <p>
                                                         <label>
-                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if (isset($try[$i]) && $try[$i] == 1) echo'checked'; ?> />
+                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try['.$i; ?>]" <?php if (isset($try[$i]) && $try[$i] == 1) echo'checked'; ?> />
                                                             <?php echo get_lang('TryAgain'); ?>
                                                         </label>
                                                     </p>
@@ -892,12 +892,12 @@ 
                                         <input class="form-control" type="text" name="reponse[<?php echo $i; ?>]" value="<?php echo Security::remove_XSS($responseValue); ?>" />
                                     </td>
                                     <?php
-                                    $form = new FormValidator('form_' . $i);
+                                    $form = new FormValidator('form_'.$i);
                                     $config = array(
                                         'ToolbarSet' => 'TestProposedAnswer',
                                         'cols-size' => [0, 12, 0]
                                     );
-                                    $form->addHtmlEditor('comment[' . $i . ']', null, false, false, $config);
+                                    $form->addHtmlEditor('comment['.$i.']', null, false, false, $config);
                                     $renderer = $form->defaultRenderer();
                                     $form_template = '{content}';
                                     $renderer->setFormTemplate($form_template);
@@ -906,7 +906,7 @@ 
                                         {element}';
                                     $renderer->setElementTemplate($element_template);
 
-                                    $form->setDefaults(array('comment[' . $i . ']' => $commentValue));
+                                    $form->setDefaults(array('comment['.$i.']' => $commentValue));
                                     $return = $form->return_form();
                                     ?>
                                     <td colspan="2" align="left" ><?php echo $return; ?></td>
@@ -945,36 +945,36 @@ 
                                 $selected = 'selected="selected"';
                                 $isSelected = true;
                             }
-                            $option_lp.='<option value="' . $id . '" ' . $selected . '>' . $details['lp_name'] . '</option>';
+                            $option_lp .= '<option value="'.$id.'" '.$selected.'>'.$details['lp_name'].'</option>';
                         }
 
                         if ($isSelected) {
-                            $option_lp = '<option value="0">' . get_lang('SelectTargetLP') . '</option>' . $option_lp;
+                            $option_lp = '<option value="0">'.get_lang('SelectTargetLP').'</option>'.$option_lp;
                         } else {
-                            $option_lp = '<option value="0" selected="selected" >' . get_lang('SelectTargetLP') . '</option>' . $option_lp;
+                            $option_lp = '<option value="0" selected="selected" >'.get_lang('SelectTargetLP').'</option>'.$option_lp;
                         }
 
                         // Feedback SELECT
                         $question_list = $objExercise->selectQuestionList();
                         $option_feed = '';
-                        $option_feed.='<option value="0">' . get_lang('SelectTargetQuestion') . '</option>';
+                        $option_feed .= '<option value="0">'.get_lang('SelectTargetQuestion').'</option>';
                         $details = isset($details) ? $details : null;
                         $id = isset($id) ? $id : 0;
                         $selectQuestionNoError = isset($selectQuestionNoError) ? $selectQuestionNoError : null;
                         foreach ($question_list as $key => $questionid) {
                             $selected = '';
                             $question = Question::read($questionid);
-                            $val = 'Q' . $key . ' :' . substrwords($question->selectTitle(), ICON_SIZE_SMALL);
+                            $val = 'Q'.$key.' :'.substrwords($question->selectTitle(), ICON_SIZE_SMALL);
                             $select_lp_id[$id] = $details['lp_name'];
                             if ($questionid == $selectQuestionNoError) {
                                 $selected = 'selected="selected"';
                             }
-                            $option_feed.='<option value="' . $questionid . '" ' . $selected . ' >' . $val . '</option>';
+                            $option_feed .= '<option value="'.$questionid.'" '.$selected.' >'.$val.'</option>';
                         }
                         if ($selectQuestionNoError == -1) {
-                            $option_feed.='<option value="-1" selected="selected" >' . get_lang('ExitTest') . '</option>';
+                            $option_feed .= '<option value="-1" selected="selected" >'.get_lang('ExitTest').'</option>';
                         } else {
-                            $option_feed.='<option value="-1">' . get_lang('ExitTest') . '</option>';
+                            $option_feed .= '<option value="-1">'.get_lang('ExitTest').'</option>';
                         }
 
                         if ($answerType == HOT_SPOT_DELINEATION) {
@@ -1065,6 +1065,6 @@ 
     </script>
     <?php
     if ($debug > 0) {
-        echo str_repeat('&nbsp;', 0) . '$modifyAnswers was set - end' . "<br />\n";
+        echo str_repeat('&nbsp;', 0).'$modifyAnswers was set - end'."<br />\n";
     }
 }

main/upload/upload.document.php

Spacing +23 added lines, -23 removed lines

@@ -9,9 +9,9 @@ 
  * @author Yannick Warnier <ywarnier@beeznest.org>
  */
 
-$courseDir = $_course['path'] . "/document";
+$courseDir = $_course['path']."/document";
 $sys_course_path = api_get_path(SYS_COURSE_PATH);
-$base_work_dir = $sys_course_path . $courseDir;
+$base_work_dir = $sys_course_path.$courseDir;
 $noPHP_SELF = true;
 $max_filled_space = DocumentManager::get_course_quota();
 
@@ -34,14 +34,14 @@ 
 
 $nameTools = get_lang('UplUploadDocument');
 $interbreadcrumb[] = array(
-    "url" => "./document.php?curdirpath=" . urlencode(
+    "url" => "./document.php?curdirpath=".urlencode(
             $path
-        ) . $req_gid,
+        ).$req_gid,
     "name" => $langDocuments
 );
 Display::display_header($nameTools, "Doc");
 //show the title
-api_display_tool_title($nameTools . $add_group_to_title);
+api_display_tool_title($nameTools.$add_group_to_title);
 
 /**
  * Process
@@ -71,11 +71,11 @@ 
         	$ct = '';
         	if ($new_comment) $ct .= ", comment='$new_comment'";
         	if ($new_title)   $ct .= ", title='$new_title'";
-        	Database::query("UPDATE $table_document SET" . substr($ct, 1) ." WHERE id = '$docid'");
+        	Database::query("UPDATE $table_document SET".substr($ct, 1)." WHERE id = '$docid'");
     	}
         //check for missing images in html files
         $missing_files = check_for_missing_files($base_work_dir.$_POST['curdirpath'].$new_path);
-        if ($missing_files)  {
+        if ($missing_files) {
             //show a form to upload the missing files
             Display::display_normal_message(
                 build_missing_files_form(
@@ -94,7 +94,7 @@ 
     if ($number_of_uploaded_images > 0) {
         //we could also create a function for this, I'm not sure...
         //create a directory for the missing files
-        $img_directory = str_replace('.','_',$_POST['related_file']."_files");
+        $img_directory = str_replace('.', '_', $_POST['related_file']."_files");
         $folderData = create_unexisting_directory(
             $_course,
             $_user['user_id'],
@@ -120,15 +120,15 @@ 
         replace_img_path_in_html_file(
             $_POST['img_file_path'],
             $paths_to_replace_in_file,
-            $base_work_dir . $_POST['related_file']
+            $base_work_dir.$_POST['related_file']
         );
         //update parent folders
-        item_property_update_on_folder($_course,$_POST['curdirpath'],$_user['user_id']);
+        item_property_update_on_folder($_course, $_POST['curdirpath'], $_user['user_id']);
     }
 }
 //they want to create a directory
-if (isset($_POST['create_dir']) && $_POST['dirname']!='') {
-	$added_slash = ($path=='/')?'':'/';
+if (isset($_POST['create_dir']) && $_POST['dirname'] != '') {
+	$added_slash = ($path == '/') ? '' : '/';
 	$dir_name = $path.$added_slash.api_replace_dangerous_char($_POST['dirname']);
     $created_dir = create_unexisting_directory(
         $_course,
@@ -152,7 +152,7 @@ 
 	//create the form that asks for the directory name
 	$new_folder_text = '<form action="'.api_get_self().'" method="POST">';
 	$new_folder_text .= '<input type="hidden" name="curdirpath" value="'.$path.'"/>';
-	$new_folder_text .= get_lang('NewDir') .' ';
+	$new_folder_text .= get_lang('NewDir').' ';
 	$new_folder_text .= '<input type="text" name="dirname"/>';
 	$new_folder_text .= '<input type="submit" name="create_dir" value="'.get_lang('Ok').'"/>';
 	$new_folder_text .= '</form>';
@@ -163,7 +163,7 @@ 
 	<p>
         <a href="<?php echo api_get_self(); ?>?path=<?php echo $path; ?>&amp;createdir=1">
             <?php echo Display::return_icon('new_folder.gif'); ?>
-            <?php echo(get_lang('CreateDir'));?>
+            <?php echo(get_lang('CreateDir')); ?>
         </a>
     </p>
 <?php
@@ -186,11 +186,11 @@ 
 </td>
 </tr>
 <tr>
-<td><?php echo get_lang('Title');?></td>
+<td><?php echo get_lang('Title'); ?></td>
 <td><input type="text" size="20" name="title" style="width:300px;"></td>
 </tr>
 <tr>
-<td valign="top"><?php echo get_lang('Comment');?></td>
+<td valign="top"><?php echo get_lang('Comment'); ?></td>
 <td><textarea rows="3" cols="20" name="comment" wrap="virtual" style="width:300px;"></textarea></td>
 </tr>
 <tr>
@@ -198,22 +198,22 @@ 
 <?php echo get_lang('Options'); ?>
 </td>
 <td>
-- <input type="checkbox" name="unzip" value="1" onclick="check_unzip()"/> <?php echo(get_lang('Uncompress'));?><br/>
-- <?php echo (get_lang('UplWhatIfFileExists'));?><br/>
-&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="nothing" title="<?php echo (get_lang('UplDoNothingLong'));?>" checked="checked"/>  <?php echo (get_lang('UplDoNothing'));?><br/>
-&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="overwrite" title="<?php echo (get_lang('UplOverwriteLong'));?>"/> <?php echo (get_lang('UplOverwrite'));?><br/>
-&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="rename" title="<?php echo (get_lang('UplRenameLong'));?>"/> <?php echo (get_lang('UplRename'));?>
+- <input type="checkbox" name="unzip" value="1" onclick="check_unzip()"/> <?php echo(get_lang('Uncompress')); ?><br/>
+- <?php echo (get_lang('UplWhatIfFileExists')); ?><br/>
+&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="nothing" title="<?php echo (get_lang('UplDoNothingLong')); ?>" checked="checked"/>  <?php echo (get_lang('UplDoNothing')); ?><br/>
+&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="overwrite" title="<?php echo (get_lang('UplOverwriteLong')); ?>"/> <?php echo (get_lang('UplOverwrite')); ?><br/>
+&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="rename" title="<?php echo (get_lang('UplRenameLong')); ?>"/> <?php echo (get_lang('UplRename')); ?>
 
 </td>
 </tr>
 </table>
 
-<input type="submit" value="<?php echo(get_lang('Ok'));?>">
+<input type="submit" value="<?php echo(get_lang('Ok')); ?>">
 </form>
 <!-- end upload form -->
 
  <!-- so they can get back to the documents   -->
- <p><?php echo (get_lang('Back'));?> <?php echo (get_lang('To'));?> <a href="document.php?curdirpath=<?php echo $path; ?>"><?php echo (get_lang('DocumentsOverview'));?></a></p>
+ <p><?php echo (get_lang('Back')); ?> <?php echo (get_lang('To')); ?> <a href="document.php?curdirpath=<?php echo $path; ?>"><?php echo (get_lang('DocumentsOverview')); ?></a></p>
 <?php
 
 Display::display_footer();

main/upload/upload_word.php

Spacing +17 added lines, -17 removed lines

@@ -10,7 +10,7 @@ 
 
 include '../inc/global.inc.php';
 
-$form_style= '<style>
+$form_style = '<style>
 .row {
     width: 200px;
 }
@@ -28,20 +28,20 @@ 
 </script>';
 $htmlHeadXtra[] = $form_style;
 
-if (api_get_setting('search_enabled')=='true') {
+if (api_get_setting('search_enabled') == 'true') {
     $specific_fields = get_specific_field_list();
 }
 
 if (isset($_POST['convert'])) {
     $cwdir = getcwd();
     if (isset($_FILES['user_file'])) {
-        $allowed_extensions = array('doc','docx','odt','txt','sxw','rtf');
-        if (in_array(strtolower(pathinfo($_FILES['user_file']['name'],PATHINFO_EXTENSION)),$allowed_extensions)) {
+        $allowed_extensions = array('doc', 'docx', 'odt', 'txt', 'sxw', 'rtf');
+        if (in_array(strtolower(pathinfo($_FILES['user_file']['name'], PATHINFO_EXTENSION)), $allowed_extensions)) {
             require('../newscorm/lp_upload.php');
             if (isset($o_doc) && $first_item_id != 0) {
                 // Search-related section
-                if (api_get_setting('search_enabled')=='true') {
-                    require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');
+                if (api_get_setting('search_enabled') == 'true') {
+                    require_once(api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php');
                     $specific_fields = get_specific_field_list();
 
                     foreach ($specific_fields as $specific_field) {
@@ -77,7 +77,7 @@ 
     api_not_allowed(true);
 }
 
-$interbreadcrumb[]= array ("url"=>"../newscorm/lp_controller.php?action=list", "name"=> get_lang("Doc"));
+$interbreadcrumb[] = array("url"=>"../newscorm/lp_controller.php?action=list", "name"=> get_lang("Doc"));
 $nameTools = get_lang("WoogieConversionPowerPoint");
 Display :: display_header($nameTools);
 
@@ -97,7 +97,7 @@ 
          border-color: #4171B5;
          color: #000;";
 
-$s_style_error="border-width: 1px;
+$s_style_error = "border-width: 1px;
          border-style: solid;
          margin-left: 0;
          margin-top: 10px;
@@ -123,7 +123,7 @@ 
 
 // build the form
 
-$form -> addElement ('html','<br>');
+$form -> addElement('html', '<br>');
 
 $div_upload_limit = '&nbsp;&nbsp;'.get_lang('UploadMaxSize').' : '.ini_get('post_max_size');
 
@@ -136,7 +136,7 @@ 
         <!-- BEGIN error --><br /><span class="form_error">{error}</span><!-- END error -->
 </div>
 EOT;
-$renderer->setElementTemplate($user_file_template,'user_file');
+$renderer->setElementTemplate($user_file_template, 'user_file');
 
 // set template for other elements
 $user_file_template =
@@ -148,7 +148,7 @@ 
 EOT;
 $renderer->setCustomElementTemplate($user_file_template);
 
-$form -> addElement ('file', 'user_file', Display::return_icon('word_big.gif'));
+$form -> addElement('file', 'user_file', Display::return_icon('word_big.gif'));
 if (api_get_setting('search_enabled') == 'true') {
     $form->addElement('checkbox', 'index_document', '', get_lang('SearchFeatureDoIndexDocument'));
     $form->addElement('html', '<br />');
@@ -162,7 +162,7 @@ 
     foreach ($specific_fields as $specific_field) {
         $form->addElement('text', $specific_field['code'], $specific_field['name'].' : ');
     }
-    $form -> addElement ('html','</div>');
+    $form -> addElement('html', '</div>');
 }
 
 /*
@@ -170,11 +170,11 @@ 
  * $form -> addElement ('radio', 'split_steps',null, get_lang('SplitStepsPerPage'),'per_page');
  * $form -> addElement ('radio', 'split_steps',null, get_lang('SplitStepsPerChapter'),'per_chapter');
  */
-$form -> addElement ('hidden', 'split_steps','per_page');
-$form -> addElement ('submit', 'convert', get_lang('ConvertToLP'), 'class="convert_button"');
-$form -> addElement ('hidden', 'woogie', 'true');
-$form -> add_real_progress_bar(md5(rand(0,10000)), 'user_file', 1, true);
-$defaults = array('split_steps'=>'per_page','index_document'=>'checked="checked"');
+$form -> addElement('hidden', 'split_steps', 'per_page');
+$form -> addElement('submit', 'convert', get_lang('ConvertToLP'), 'class="convert_button"');
+$form -> addElement('hidden', 'woogie', 'true');
+$form -> add_real_progress_bar(md5(rand(0, 10000)), 'user_file', 1, true);
+$defaults = array('split_steps'=>'per_page', 'index_document'=>'checked="checked"');
 $form -> setDefaults($defaults);
 
 // display the form

main/social/search.php

Spacing +14 added lines, -14 removed lines

@@ -20,13 +20,13 @@ 
 $tool_name = get_lang('Search');
 $interbreadcrumb[] = array('url' => 'profile.php', 'name' => get_lang('SocialNetwork'));
 
-$query = isset($_GET['q']) ? Security::remove_XSS($_GET['q']): null;
-$query_search_type = isset($_GET['search_type']) && in_array($_GET['search_type'], array('0','1','2')) ? $_GET['search_type'] : null;
+$query = isset($_GET['q']) ? Security::remove_XSS($_GET['q']) : null;
+$query_search_type = isset($_GET['search_type']) && in_array($_GET['search_type'], array('0', '1', '2')) ? $_GET['search_type'] : null;
 $extra_fields = UserManager::get_extra_filtrable_fields();
 $query_vars = array('q' => $query, 'search_type' => $query_search_type);
 if (!empty($extra_fields)) {
     foreach ($extra_fields as $extra_field) {
-        $field_name = 'field_' . $extra_field['variable'];
+        $field_name = 'field_'.$extra_field['variable'];
         if (isset($_GET[$field_name]) && $_GET[$field_name] != '0') {
             $query_vars[$field_name] = $_GET[$field_name];
         }
@@ -46,10 +46,10 @@ 
 $usergroup = new UserGroup();
 
 // I'm searching something
-if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) ) {
+if ($query != '' || ($query_vars['search_type'] == '1' && count($query_vars) > 2)) {
     $itemPerPage = 8;
 
-    if ($_GET['search_type']=='0' || $_GET['search_type']=='1') {
+    if ($_GET['search_type'] == '0' || $_GET['search_type'] == '1') {
         $page = isset($_GET['users_page_nr']) ? intval($_GET['users_page_nr']) : 1;
         $totalUsers = UserManager::get_all_user_tags($_GET['q'], 0, 0, $itemPerPage, true);
 
@@ -58,7 +58,7 @@ 
         $users = UserManager::get_all_user_tags($_GET['q'], 0, $from, $itemPerPage);
     }
 
-    if ($_GET['search_type']=='0' || $_GET['search_type']=='2') {
+    if ($_GET['search_type'] == '0' || $_GET['search_type'] == '2') {
         $pageGroup = isset($_GET['groups_page_nr']) ? intval($_GET['groups_page_nr']) : 1;
         // Groups
         $fromGroups = intval(($pageGroup - 1) * $itemPerPage);
@@ -84,7 +84,7 @@ 
 
             // Show send invitation icon if they are not friends yet
             if ($relation_type != 3 && $relation_type != 4 && $user_info['user_id'] != api_get_user_id()) {
-                $send_inv = '<a href="#" class="'.$buttonClass.' btn-to-send-invitation" data-send-to="' . $user_info['user_id'] . '">
+                $send_inv = '<a href="#" class="'.$buttonClass.' btn-to-send-invitation" data-send-to="'.$user_info['user_id'].'">
                              <em class="fa fa-user"></em> '.get_lang('SendInvitation').'</a>';
             }
 
@@ -130,7 +130,7 @@ 
                                 </div>
                                 <div class="user-info">
                                    <p>'.$user_info['complete_name'].'</p>
-                                   <div class="items-user-status">' . $status_icon . $user_icon . '</div>
+                                   <div class="items-user-status">' . $status_icon.$user_icon.'</div>
                                    <div class="toolbar">
                                     '.$invitations.'
                                    </div>
@@ -187,7 +187,7 @@ 
             $tags = null;
             $group['picture'] = '<img class="img-responsive img-circle" src="'.$picture['file'].'" />';
 
-            $members = Display::returnFontAwesomeIcon('user') . '( ' .$count_users_group . ' )';
+            $members = Display::returnFontAwesomeIcon('user').'( '.$count_users_group.' )';
             $item_1  = Display::tag('p', $url_open.$name.$url_close);
 
             $block_groups .= '
@@ -198,10 +198,10 @@ 
                         </div>
                         <div class="user-info">
                             '.$item_1.'
-                            <p>' . $members . '</p>    
-                            <p>' . $group['description'] . '</p>
-                            <p>' . $tags . '</p>
-                            <p>' . $url_open.get_lang('SeeMore') . $url_close . '</p>
+                            <p>' . $members.'</p>    
+                            <p>' . $group['description'].'</p>
+                            <p>' . $tags.'</p>
+                            <p>' . $url_open.get_lang('SeeMore').$url_close.'</p>
                         </div>
                     </div>
                 </div>';
@@ -241,7 +241,7 @@ 
 $tpl->assign('social_search', $block_search);
 $tpl->assign('search_form', $searchForm);
 
-$formModalTpl =  new Template();
+$formModalTpl = new Template();
 $formModalTpl->assign('invitation_form', MessageManager::generate_invitation_form('send_invitation'));
 $formModals = $formModalTpl->fetch('default/social/form_modals.tpl');