Completed
Pull Request — 1.11.x (#1339)
by José
73:57 queued 34:43
created
main/inc/lib/timeline.lib.php 1 patch
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -25,10 +25,10 @@  discard block
 block discarded – undo
25 25
     );
26 26
     public $is_course_model = true;
27 27
 
28
-	public function __construct()
28
+    public function __construct()
29 29
     {
30 30
         $this->table =  Database::get_course_table(TABLE_TIMELINE);
31
-	}
31
+    }
32 32
 
33 33
     /**
34 34
      * Get the count of elements
@@ -52,16 +52,16 @@  discard block
 block discarded – undo
52 52
     /**
53 53
      * Displays the title + grid
54 54
      */
55
-	public function listing()
55
+    public function listing()
56 56
     {
57
-		// action links
58
-		$html = '<div class="actions">';
57
+        // action links
58
+        $html = '<div class="actions">';
59 59
         //$html .= '<a href="career_dashboard.php">'.Display::return_icon('back.png',get_lang('Back'),'','32').'</a>';
60
-		$html .= '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'),'','32').'</a>';
61
-		$html .= '</div>';
60
+        $html .= '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'),'','32').'</a>';
61
+        $html .= '</div>';
62 62
         $html .= Display::grid_html('timelines');
63 63
         return $html;
64
-	}
64
+    }
65 65
 
66 66
     public function get_status_list()
67 67
     {
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 
90 90
         $form->addElement('text', 'headline', get_lang('Name'), array('size' => '70'));
91 91
         //$form->addHtmlEditor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'Careers','Width' => '100%', 'Height' => '250'));
92
-	    $status_list = $this->get_status_list();
92
+        $status_list = $this->get_status_list();
93 93
         $form->addElement('select', 'status', get_lang('Status'), $status_list);
94 94
         if ($action == 'edit') {
95 95
             //$form->addElement('text', 'created_at', get_lang('CreatedAt'));
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 
174 174
         // Setting the rules
175 175
         $form->addRule('headline', get_lang('ThisFieldIsRequired'), 'required');
176
-		return $form;
176
+        return $form;
177 177
 
178 178
     }
179 179
 
@@ -184,11 +184,11 @@  discard block
 block discarded – undo
184 184
     public function save_item($params)
185 185
     {
186 186
         $params['c_id'] = api_get_course_int_id();
187
-	    $id = parent::save($params);
188
-	    if (!empty($id)) {
189
-	    	//event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
190
-   		}
191
-   		return $id;
187
+        $id = parent::save($params);
188
+        if (!empty($id)) {
189
+            //event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
190
+            }
191
+            return $id;
192 192
     }
193 193
 
194 194
     /**
@@ -199,16 +199,16 @@  discard block
 block discarded – undo
199 199
         $params['c_id'] = api_get_course_int_id();
200 200
         $params['parent_id'] = '0';
201 201
         $params['type'] = 'default';
202
-	    $id = parent::save($params);
203
-	    if (!empty($id)) {
204
-	    	//event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
205
-   		}
206
-   		return $id;
202
+        $id = parent::save($params);
203
+        if (!empty($id)) {
204
+            //event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
205
+            }
206
+            return $id;
207 207
     }
208 208
 
209 209
     public function delete($id) {
210
-	    parent::delete($id);
211
-	    //event_system(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
210
+        parent::delete($id);
211
+        //event_system(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
212 212
     }
213 213
 
214 214
     public function get_url($id) {
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
         $item['asset'] = array( 'media'     => $item['media'],
248 248
                                 'credit'    => $item['media_credit'],
249 249
                                 'caption'   => $item['media_caption'],
250
-         );
250
+            );
251 251
 
252 252
         //Cleaning items
253 253
         unset($item['id']);
Please login to merge, or discard this patch.
main/inc/lib/urlmanager.lib.php 1 patch
Indentation   +66 added lines, -66 removed lines patch added patch discarded remove patch
@@ -11,15 +11,15 @@  discard block
 block discarded – undo
11 11
 class UrlManager
12 12
 {
13 13
     /**
14
-    * Creates a new url access
15
-    *
16
-    * @author Julio Montoya <[email protected]>,
17
-    *
18
-    * @param	string	$url The URL of the site
19
-    * @param	string  $description The description of the site
20
-    * @param	int		$active is active or not
21
-    * @return boolean if success
22
-    */
14
+     * Creates a new url access
15
+     *
16
+     * @author Julio Montoya <[email protected]>,
17
+     *
18
+     * @param	string	$url The URL of the site
19
+     * @param	string  $description The description of the site
20
+     * @param	int		$active is active or not
21
+     * @return boolean if success
22
+     */
23 23
     public static function add($url, $description, $active)
24 24
     {
25 25
         $tms = time();
@@ -36,15 +36,15 @@  discard block
 block discarded – undo
36 36
     }
37 37
 
38 38
     /**
39
-    * Updates an URL access
40
-    * @author Julio Montoya <[email protected]>,
41
-    *
42
-    * @param	int 	$url_id The url id
43
-    * @param	string 	$url
44
-    * @param	string  $description The description of the site
45
-    * @param	int		$active is active or not
46
-    * @return 	boolean if success
47
-    */
39
+     * Updates an URL access
40
+     * @author Julio Montoya <[email protected]>,
41
+     *
42
+     * @param	int 	$url_id The url id
43
+     * @param	string 	$url
44
+     * @param	string  $description The description of the site
45
+     * @param	int		$active is active or not
46
+     * @return 	boolean if success
47
+     */
48 48
     public static function update($url_id, $url, $description, $active)
49 49
     {
50 50
         $url_id = intval($url_id);
@@ -63,12 +63,12 @@  discard block
 block discarded – undo
63 63
     }
64 64
 
65 65
     /**
66
-    * Deletes an url
67
-    * @author Julio Montoya
68
-    * @param int $id url id
66
+     * Deletes an url
67
+     * @author Julio Montoya
68
+     * @param int $id url id
69 69
      *
70
-    * @return boolean true if success
71
-    * */
70
+     * @return boolean true if success
71
+     * */
72 72
     public static function delete($id)
73 73
     {
74 74
         $id = intval($id);
@@ -200,12 +200,12 @@  discard block
 block discarded – undo
200 200
     }
201 201
 
202 202
     /**
203
-    * Gets the inner join of access_url and the course table
204
-    *
205
-    * @author Julio Montoya
206
-    * @param int  access url id
207
-    * @return array   Database::store_result of the result
208
-    **/
203
+     * Gets the inner join of access_url and the course table
204
+     *
205
+     * @author Julio Montoya
206
+     * @param int  access url id
207
+     * @return array   Database::store_result of the result
208
+     **/
209 209
     public static function get_url_rel_course_data($access_url_id = null)
210 210
     {
211 211
         $where = '';
@@ -362,12 +362,12 @@  discard block
 block discarded – undo
362 362
     }
363 363
 
364 364
     /**
365
-    * Checks the relationship between an URL and a User (return the num_rows)
366
-    * @author Julio Montoya
367
-    * @param int user id
368
-    * @param int url id
369
-    * @return boolean true if success
370
-    * */
365
+     * Checks the relationship between an URL and a User (return the num_rows)
366
+     * @author Julio Montoya
367
+     * @param int user id
368
+     * @param int url id
369
+     * @return boolean true if success
370
+     * */
371 371
     public static function relation_url_user_exist($user_id, $url_id)
372 372
     {
373 373
         $table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@@ -377,15 +377,15 @@  discard block
 block discarded – undo
377 377
         $num = Database::num_rows($result);
378 378
 
379 379
         return $num;
380
-	}
380
+    }
381 381
 
382 382
     /**
383
-    * Checks the relationship between an URL and a Course (return the num_rows)
384
-    * @author Julio Montoya
385
-    * @param int $courseId
386
-    * @param int $urlId
387
-    * @return boolean true if success
388
-    * */
383
+     * Checks the relationship between an URL and a Course (return the num_rows)
384
+     * @author Julio Montoya
385
+     * @param int $courseId
386
+     * @param int $urlId
387
+     * @return boolean true if success
388
+     * */
389 389
     public static function relation_url_course_exist($courseId, $urlId)
390 390
     {
391 391
         $table_url_rel_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
@@ -420,12 +420,12 @@  discard block
 block discarded – undo
420 420
     }
421 421
 
422 422
     /**
423
-    * Checks the relationship between an URL and a Session (return the num_rows)
424
-    * @author Julio Montoya
425
-    * @param int user id
426
-    * @param int url id
427
-    * @return boolean true if success
428
-    * */
423
+     * Checks the relationship between an URL and a Session (return the num_rows)
424
+     * @author Julio Montoya
425
+     * @param int user id
426
+     * @param int url id
427
+     * @return boolean true if success
428
+     * */
429 429
     public static function relation_url_session_exist($session_id, $url_id)
430 430
     {
431 431
         $table_url_rel_session= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
@@ -737,13 +737,13 @@  discard block
 block discarded – undo
737 737
     }
738 738
 
739 739
     /**
740
-    * Deletes an url and user relationship
741
-    * @author Julio Montoya
742
-    * @param int user id
743
-    * @param int url id
740
+     * Deletes an url and user relationship
741
+     * @author Julio Montoya
742
+     * @param int user id
743
+     * @param int url id
744 744
      *
745
-    * @return boolean true if success
746
-    * */
745
+     * @return boolean true if success
746
+     * */
747 747
     public static function delete_url_rel_user($user_id, $url_id)
748 748
     {
749 749
         $table_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@@ -758,13 +758,13 @@  discard block
 block discarded – undo
758 758
     }
759 759
 
760 760
     /**
761
-    * Deletes an url and course relationship
762
-    * @author Julio Montoya
763
-    * @param  int  $courseId
764
-    * @param  int  $urlId
761
+     * Deletes an url and course relationship
762
+     * @author Julio Montoya
763
+     * @param  int  $courseId
764
+     * @param  int  $urlId
765 765
      *
766
-    * @return boolean true if success
767
-    * */
766
+     * @return boolean true if success
767
+     * */
768 768
     public static function delete_url_rel_course($courseId, $urlId)
769 769
     {
770 770
         $table_url_rel_course= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
@@ -814,13 +814,13 @@  discard block
 block discarded – undo
814 814
     }
815 815
 
816 816
     /**
817
-    * Deletes an url and session relationship
818
-    * @author Julio Montoya
819
-    * @param  char  course code
820
-    * @param  int url id
817
+     * Deletes an url and session relationship
818
+     * @author Julio Montoya
819
+     * @param  char  course code
820
+     * @param  int url id
821 821
      *
822
-    * @return boolean true if success
823
-    * */
822
+     * @return boolean true if success
823
+     * */
824 824
     public static function delete_url_rel_session($session_id, $url_id)
825 825
     {
826 826
         $table_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
Please login to merge, or discard this patch.
main/inc/lib/userportal.lib.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -248,17 +248,17 @@  discard block
 block discarded – undo
248 248
                 }
249 249
             }
250 250
 
251
-			if (trim($home_top_temp) == '' && api_is_platform_admin()) {
252
-				$home_top_temp = '<div class="welcome-mascot">' . get_lang('PortalHomepageDefaultIntroduction') . '</div>';
253
-			} else {
254
-				$home_top_temp = '<div class="welcome-home-top-temp">' . $home_top_temp . '</div>';
255
-			}
256
-			$open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
257
-			$html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
258
-		}
259
-
260
-		return $html;
261
-	}
251
+            if (trim($home_top_temp) == '' && api_is_platform_admin()) {
252
+                $home_top_temp = '<div class="welcome-mascot">' . get_lang('PortalHomepageDefaultIntroduction') . '</div>';
253
+            } else {
254
+                $home_top_temp = '<div class="welcome-home-top-temp">' . $home_top_temp . '</div>';
255
+            }
256
+            $open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
257
+            $html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
258
+        }
259
+
260
+        return $html;
261
+    }
262 262
 
263 263
     function return_notice()
264 264
     {
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
                     $thereIsSubCat = true;
510 510
                 } elseif (api_get_setting('show_empty_course_categories') == 'true') {
511 511
                     /* End changed code to eliminate the (0 courses) after empty categories. */
512
-                      $htmlListCat .= '<li>';
512
+                        $htmlListCat .= '<li>';
513 513
                     $htmlListCat .= $catLine['name'];
514 514
                     $htmlListCat .= "</li>";
515 515
                     $thereIsSubCat = true;
@@ -639,11 +639,11 @@  discard block
 block discarded – undo
639 639
     }
640 640
 
641 641
     /**
642
-    * retrieves all the courses that the user has already subscribed to
643
-    * @author Patrick Cool <[email protected]>, Ghent University, Belgium
644
-    * @param int $user_id: the id of the user
645
-    * @return array an array containing all the information of the courses of the given user
646
-    */
642
+     * retrieves all the courses that the user has already subscribed to
643
+     * @author Patrick Cool <[email protected]>, Ghent University, Belgium
644
+     * @param int $user_id: the id of the user
645
+     * @return array an array containing all the information of the courses of the given user
646
+     */
647 647
     public function get_courses_of_user($user_id)
648 648
     {
649 649
         $table_course = Database::get_main_table(TABLE_MAIN_COURSE);
Please login to merge, or discard this patch.
main/tracking/course_log_tools.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 
79 79
 // getting all the students of the course
80 80
 if (empty($session_id)) {
81
-	// Registered students in a course outside session.
81
+    // Registered students in a course outside session.
82 82
     $a_students = CourseManager:: get_student_list_from_course_code(
83 83
         api_get_course_id(),
84 84
         false,
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
         api_get_group_id()
90 90
     );
91 91
 } else {
92
-	// Registered students in session.
92
+    // Registered students in session.
93 93
     $a_students = CourseManager:: get_student_list_from_course_code(
94 94
         api_get_course_id(),
95 95
         true,
Please login to merge, or discard this patch.
main/tracking/courseLog.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@
 block discarded – undo
111 111
                             get_lang('HideColumn'),
112 112
                             array('align' => 'absmiddle', 'hspace' => '3px'),
113 113
                             ICON_SIZE_SMALL
114
-                         ) . "</div>'
114
+                            ) . "</div>'
115 115
                     );
116 116
                 }
117 117
             );
Please login to merge, or discard this patch.
main/tracking/course_session_report.php 1 patch
Indentation   +122 added lines, -122 removed lines patch added patch discarded remove patch
@@ -14,23 +14,23 @@  discard block
 block discarded – undo
14 14
 $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_courseCoach || $is_sessionAdmin;
15 15
 
16 16
 if (!$is_allowedToTrack) {
17
-	api_not_allowed(true);
17
+    api_not_allowed(true);
18 18
 }
19 19
 
20 20
 $export_to_xls = false;
21 21
 if (isset($_GET['export'])) {
22
-	$export_to_xls = true;
22
+    $export_to_xls = true;
23 23
 }
24 24
 if (api_is_platform_admin() ) {
25
-	$global = true;
25
+    $global = true;
26 26
 } else {
27
-	$global = false;
27
+    $global = false;
28 28
 }
29 29
 $global = true;
30 30
 
31 31
 $session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
32 32
 if (empty($session_id)) {
33
-	$session_id  = 1;
33
+    $session_id  = 1;
34 34
 }
35 35
 
36 36
 $form = new FormValidator('search_simple','POST','','',null,false);
@@ -39,10 +39,10 @@  discard block
 block discarded – undo
39 39
 $session_list = SessionManager::get_sessions_list(array(), array('name'));
40 40
 $my_session_list = array();
41 41
 foreach($session_list as $sesion_item) {
42
-	$my_session_list[$sesion_item['id']] = $sesion_item['name'];
42
+    $my_session_list[$sesion_item['id']] = $sesion_item['name'];
43 43
 }
44 44
 if (count($session_list) == 0) {
45
-	$my_session_list[0] = get_lang('None');
45
+    $my_session_list[0] = get_lang('None');
46 46
 }
47 47
 $form->addElement('select', 'session_id', get_lang('Sessions'), $my_session_list);
48 48
 $form->addButtonFilter(get_lang('Filter'));
@@ -51,32 +51,32 @@  discard block
 block discarded – undo
51 51
 if (!empty($_REQUEST['session_id'])) $session_id = intval($_REQUEST['session_id']); else $session_id = 0;
52 52
 
53 53
 if (empty($session_id)) {
54
-	$session_id = key($my_session_list);
54
+    $session_id = key($my_session_list);
55 55
 }
56 56
 $form->setDefaults(array('session_id'=>$session_id));
57 57
 $course_list = SessionManager::get_course_list_by_session_id($session_id);
58 58
 
59 59
 if (!$export_to_xls) {
60
-	Display :: display_header(get_lang("MySpace"));
61
-	echo '<div class="actions">';
60
+    Display :: display_header(get_lang("MySpace"));
61
+    echo '<div class="actions">';
62 62
 
63
-	if ($global) {
64
-		echo MySpace::getTopMenu();
65
-	} else {
66
-		echo '<div style="float:left; clear:left">
63
+    if ($global) {
64
+        echo MySpace::getTopMenu();
65
+    } else {
66
+        echo '<div style="float:left; clear:left">
67 67
 				<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.get_lang('StudentsTracking').'</a>&nbsp;|
68 68
 				<a href="courseLog.php?'.api_get_cidreq().'&studentlist=false">'.get_lang('CourseTracking').'</a>&nbsp;';
69
-		echo '</div>';
70
-	}
71
-	echo '</div>';
69
+        echo '</div>';
70
+    }
71
+    echo '</div>';
72 72
 
73
-	if  (api_is_platform_admin()) {
74
-		echo MySpace::getAdminActions();
75
-	}
73
+    if  (api_is_platform_admin()) {
74
+        echo MySpace::getAdminActions();
75
+    }
76 76
 
77
-	echo '<h2>'.get_lang('LPExerciseResultsBySession').'</h2>';
78
-	$form->display();
79
-	Display::display_normal_message(get_lang('StudentScoreAverageIsCalculatedBaseInAllLPsAndAllAttempts'));
77
+    echo '<h2>'.get_lang('LPExerciseResultsBySession').'</h2>';
78
+    $form->display();
79
+    Display::display_normal_message(get_lang('StudentScoreAverageIsCalculatedBaseInAllLPsAndAllAttempts'));
80 80
 }
81 81
 
82 82
 $users = SessionManager::get_users_by_session($session_id);
@@ -86,15 +86,15 @@  discard block
 block discarded – undo
86 86
 $main_result = array();
87 87
 //Getting course list
88 88
 foreach ($course_list  as $current_course ) {
89
-	$course_info = api_get_course_info($current_course['code']);
90
-	$_course = $course_info;
91
-	$attempt_result = array();
89
+    $course_info = api_get_course_info($current_course['code']);
90
+    $_course = $course_info;
91
+    $attempt_result = array();
92 92
 
93
-	//Getting LP list
94
-	$list = new LearnpathList('', $current_course['code'], $session_id);
95
-	$lp_list = $list->get_flat_list();
93
+    //Getting LP list
94
+    $list = new LearnpathList('', $current_course['code'], $session_id);
95
+    $lp_list = $list->get_flat_list();
96 96
 
97
-	// Looping LPs
97
+    // Looping LPs
98 98
     foreach ($lp_list as $lp_id =>$lp) {
99 99
         $exercise_list = Event::get_all_exercises_from_lp($lp_id, $course_info['real_id']);
100 100
         // Looping Chamilo Exercises in LP
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
             }
112 112
         }
113 113
     }
114
-	$main_result[$current_course['code']] = $attempt_result;
114
+    $main_result[$current_course['code']] = $attempt_result;
115 115
 }
116 116
 
117 117
 $total_average_score = 0;
@@ -119,102 +119,102 @@  discard block
 block discarded – undo
119 119
 $html_result = '';
120 120
 if (!empty($users) && is_array($users)) {
121 121
 
122
-	$html_result .= '<table  class="data_table">';
123
-	$html_result .= '<tr><th>'.get_lang('User').'</th>';
124
-	foreach($course_list as $item ) {
125
-		$html_result .= '<th>'.$item['title'].'<br /> '.get_lang('AverageScore').' %</th>';
126
-	}
127
-	$html_result .= '<th>'.get_lang('AverageScore').' %</th>';
128
-	$html_result .= '<th>'.get_lang('LastConnexionDate').'</th></tr>';
129
-
130
-	foreach ($users  as $user) {
131
-		$total_student = 0;
132
-		$counter ++;
133
-		$s_css_class = 'row_even';
134
-		if ($counter % 2 ==0 ) {
135
-			$s_css_class = 'row_odd';
136
-		}
137
-		$html_result .= "<tr class='$s_css_class'>
122
+    $html_result .= '<table  class="data_table">';
123
+    $html_result .= '<tr><th>'.get_lang('User').'</th>';
124
+    foreach($course_list as $item ) {
125
+        $html_result .= '<th>'.$item['title'].'<br /> '.get_lang('AverageScore').' %</th>';
126
+    }
127
+    $html_result .= '<th>'.get_lang('AverageScore').' %</th>';
128
+    $html_result .= '<th>'.get_lang('LastConnexionDate').'</th></tr>';
129
+
130
+    foreach ($users  as $user) {
131
+        $total_student = 0;
132
+        $counter ++;
133
+        $s_css_class = 'row_even';
134
+        if ($counter % 2 ==0 ) {
135
+            $s_css_class = 'row_odd';
136
+        }
137
+        $html_result .= "<tr class='$s_css_class'>
138 138
 							<td >";
139
-		$html_result .= $user['firstname'].' '.$user['lastname'];
140
-		$html_result .= "</td>";
141
-
142
-		// Getting course list
143
-
144
-		$counter = 0;
145
-		$total_result_by_user = 0;
146
-		foreach ($course_list  as $current_course ) {
147
-			$total_course = 0;
148
-			$html_result .= "<td>";
149
-
150
-
151
-			$result  = '-';
152
-			if (isset($main_result[$current_course['code']][$user['user_id']])) {
153
-				$user_info_stat = $main_result[$current_course['code']][$user['user_id']];
154
-				if (!empty($user_info_stat['result']) && !empty($user_info_stat['attempts'])) {
155
-					$result = round(
156
-						$user_info_stat['result'] / $user_info_stat['attempts'] * 100,
157
-						2
158
-					);
159
-					$total_course += $result;
160
-					$total_result_by_user += $result;
161
-					$course_average[$current_course['code']] += $total_course;
162
-					$course_average_counter[$current_course['code']]++;
163
-					$result = $result . ' (' . $user_info_stat['attempts'] . ' ' . get_lang(
164
-							'Attempts'
165
-						) . ')';
166
-					$counter++;
167
-				}
168
-			}
169
-
170
-			$html_result .= $result;
171
-			$html_result .= "</td>";
172
-		}
173
-		if (empty($counter)) {
174
-			$total_student = '-';
175
-		} else {
176
-			$total_student = $total_result_by_user/$counter;
177
-			$total_average_score+=$total_student;
178
-			$total_average_score_count++;
179
-		}
180
-		$string_date=Tracking :: get_last_connection_date($user['user_id'],true);
181
-		$html_result .="<td>$total_student</td><td>$string_date</td></tr>";
182
-	}
183
-
184
-	$html_result .="<tr><th>".get_lang('AverageScore')."</th>";
185
-	$total_average = 0;
186
-	$counter = 0;
187
-	foreach($course_list as $course_item) {
188
-		if (!empty($course_average_counter[$course_item['code']])) {
189
-			$average_per_course = round(
190
-				$course_average[$course_item['code']]/($course_average_counter[$course_item['code']]*100)*100,
191
-				2
192
-			);
193
-		} else {
194
-			$average_per_course = '-';
195
-		}
196
-		if (!empty($average_per_course)) {
197
-			$counter++;
198
-		}
199
-		$total_average = $total_average + $average_per_course;
200
-		$html_result .="<td>$average_per_course</td>";
201
-	}
202
-	if (!empty($total_average_score_count)) {
203
-		$total_average = round($total_average_score/($total_average_score_count*100)*100,2);
204
-	} else {
205
-		$total_average = '-';
206
-	}
207
-
208
-	$html_result .='<td>'.$total_average.'</td>';
209
-	$html_result .="<td>-</td>";
210
-	$html_result .="</tr>";
211
-	$html_result .= '</table>';
139
+        $html_result .= $user['firstname'].' '.$user['lastname'];
140
+        $html_result .= "</td>";
141
+
142
+        // Getting course list
143
+
144
+        $counter = 0;
145
+        $total_result_by_user = 0;
146
+        foreach ($course_list  as $current_course ) {
147
+            $total_course = 0;
148
+            $html_result .= "<td>";
149
+
150
+
151
+            $result  = '-';
152
+            if (isset($main_result[$current_course['code']][$user['user_id']])) {
153
+                $user_info_stat = $main_result[$current_course['code']][$user['user_id']];
154
+                if (!empty($user_info_stat['result']) && !empty($user_info_stat['attempts'])) {
155
+                    $result = round(
156
+                        $user_info_stat['result'] / $user_info_stat['attempts'] * 100,
157
+                        2
158
+                    );
159
+                    $total_course += $result;
160
+                    $total_result_by_user += $result;
161
+                    $course_average[$current_course['code']] += $total_course;
162
+                    $course_average_counter[$current_course['code']]++;
163
+                    $result = $result . ' (' . $user_info_stat['attempts'] . ' ' . get_lang(
164
+                            'Attempts'
165
+                        ) . ')';
166
+                    $counter++;
167
+                }
168
+            }
169
+
170
+            $html_result .= $result;
171
+            $html_result .= "</td>";
172
+        }
173
+        if (empty($counter)) {
174
+            $total_student = '-';
175
+        } else {
176
+            $total_student = $total_result_by_user/$counter;
177
+            $total_average_score+=$total_student;
178
+            $total_average_score_count++;
179
+        }
180
+        $string_date=Tracking :: get_last_connection_date($user['user_id'],true);
181
+        $html_result .="<td>$total_student</td><td>$string_date</td></tr>";
182
+    }
183
+
184
+    $html_result .="<tr><th>".get_lang('AverageScore')."</th>";
185
+    $total_average = 0;
186
+    $counter = 0;
187
+    foreach($course_list as $course_item) {
188
+        if (!empty($course_average_counter[$course_item['code']])) {
189
+            $average_per_course = round(
190
+                $course_average[$course_item['code']]/($course_average_counter[$course_item['code']]*100)*100,
191
+                2
192
+            );
193
+        } else {
194
+            $average_per_course = '-';
195
+        }
196
+        if (!empty($average_per_course)) {
197
+            $counter++;
198
+        }
199
+        $total_average = $total_average + $average_per_course;
200
+        $html_result .="<td>$average_per_course</td>";
201
+    }
202
+    if (!empty($total_average_score_count)) {
203
+        $total_average = round($total_average_score/($total_average_score_count*100)*100,2);
204
+    } else {
205
+        $total_average = '-';
206
+    }
207
+
208
+    $html_result .='<td>'.$total_average.'</td>';
209
+    $html_result .="<td>-</td>";
210
+    $html_result .="</tr>";
211
+    $html_result .= '</table>';
212 212
 } else {
213
-	Display::display_warning_message(get_lang('NoResults'));
213
+    Display::display_warning_message(get_lang('NoResults'));
214 214
 }
215 215
 
216 216
 if (!$export_to_xls) {
217
-	echo $html_result;
217
+    echo $html_result;
218 218
 }
219 219
 
220 220
 Display :: display_footer();
Please login to merge, or discard this patch.
main/tracking/question_course_report.php 1 patch
Indentation   +107 added lines, -107 removed lines patch added patch discarded remove patch
@@ -14,20 +14,20 @@  discard block
 block discarded – undo
14 14
 $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_courseCoach || $is_sessionAdmin;
15 15
 
16 16
 if (!$is_allowedToTrack) {
17
-	Display :: display_header(null);
18
-	api_not_allowed();
19
-	Display :: display_footer();
17
+    Display :: display_header(null);
18
+    api_not_allowed();
19
+    Display :: display_footer();
20 20
 }
21 21
 
22 22
 $export_to_xls = false;
23 23
 if (isset($_GET['export'])) {
24
-	$export_to_xls = true;
24
+    $export_to_xls = true;
25 25
 }
26 26
 
27 27
 if (api_is_platform_admin() ) {
28
-	$global = true;
28
+    $global = true;
29 29
 } else {
30
-	$global = false;
30
+    $global = false;
31 31
 }
32 32
 $global = true;
33 33
 
@@ -45,14 +45,14 @@  discard block
 block discarded – undo
45 45
 $session_id = isset($_REQUEST['session_id']) ? intval($_REQUEST['session_id']) : null;
46 46
 
47 47
 if (empty($session_id)) {
48
-	$temp_course_list = CourseManager :: get_courses_list();
48
+    $temp_course_list = CourseManager :: get_courses_list();
49 49
 } else {
50
-	$temp_course_list = SessionManager::get_course_list_by_session_id($session_id);
50
+    $temp_course_list = SessionManager::get_course_list_by_session_id($session_id);
51 51
 }
52 52
 
53 53
 foreach ($temp_course_list  as $temp_course_item) {
54
-	$course_item = CourseManager ::get_course_information($temp_course_item['code']);
55
-	$course_select_list[$temp_course_item['code']]	= $course_item['title'];
54
+    $course_item = CourseManager ::get_course_information($temp_course_item['code']);
55
+    $course_select_list[$temp_course_item['code']]	= $course_item['title'];
56 56
 }
57 57
 
58 58
 //Get session list
@@ -95,132 +95,132 @@  discard block
 block discarded – undo
95 95
 $course_info = api_get_course_info($course_code);
96 96
 
97 97
 if (!empty($course_info)) {
98
-	$list = new LearnpathList('', $course_code);
99
-	$lp_list = $list->get_flat_list();
98
+    $list = new LearnpathList('', $course_code);
99
+    $lp_list = $list->get_flat_list();
100 100
 
101
-	$main_question_list = array();
101
+    $main_question_list = array();
102 102
 
103
-	foreach ($lp_list as $lp_id => $lp) {
103
+    foreach ($lp_list as $lp_id => $lp) {
104 104
         $exercise_list = Event::get_all_exercises_from_lp(
105 105
             $lp_id,
106 106
             $course_info['real_id']
107 107
         );
108 108
 
109
-		foreach ($exercise_list as $exercise) {
110
-			$my_exercise = new Exercise($course_info['real_id']);
111
-			$my_exercise->read($exercise['path']);
112
-			$question_list = $my_exercise->selectQuestionList();
113
-
114
-			$exercise_stats = Event::get_all_exercise_event_from_lp(
115
-				$exercise['path'],
116
-				$course_info['real_id'],
117
-				$session_id
118
-			);
119
-
120
-			foreach ($question_list as $question_id) {
121
-				$question_data = Question::read($question_id);
122
-				$main_question_list[$question_id] = $question_data;
123
-				$quantity_exercises = 0;
124
-				$question_result = 0;
125
-
126
-				foreach ($exercise_stats as $stats) {
127
-					if (!empty($stats['question_list'])) {
128
-						foreach($stats['question_list'] as $my_question_stat) {
129
-							if ($question_id == $my_question_stat['question_id']) {
130
-								$question_result =  $question_result + $my_question_stat['marks'];
131
-								$quantity_exercises++;
132
-							}
133
-						}
134
-					}
135
-				}
136
-
137
-				if (!empty($quantity_exercises)) {
138
-					// Score % average
139
-					$main_question_list[$question_id]->results = ($question_result / ($quantity_exercises));
140
-				} else {
141
-					$main_question_list[$question_id]->results = 0;
142
-				}
143
-
144
-				$main_question_list[$question_id]->quantity = $quantity_exercises;
145
-			}
146
-		}
147
-	}
109
+        foreach ($exercise_list as $exercise) {
110
+            $my_exercise = new Exercise($course_info['real_id']);
111
+            $my_exercise->read($exercise['path']);
112
+            $question_list = $my_exercise->selectQuestionList();
113
+
114
+            $exercise_stats = Event::get_all_exercise_event_from_lp(
115
+                $exercise['path'],
116
+                $course_info['real_id'],
117
+                $session_id
118
+            );
119
+
120
+            foreach ($question_list as $question_id) {
121
+                $question_data = Question::read($question_id);
122
+                $main_question_list[$question_id] = $question_data;
123
+                $quantity_exercises = 0;
124
+                $question_result = 0;
125
+
126
+                foreach ($exercise_stats as $stats) {
127
+                    if (!empty($stats['question_list'])) {
128
+                        foreach($stats['question_list'] as $my_question_stat) {
129
+                            if ($question_id == $my_question_stat['question_id']) {
130
+                                $question_result =  $question_result + $my_question_stat['marks'];
131
+                                $quantity_exercises++;
132
+                            }
133
+                        }
134
+                    }
135
+                }
136
+
137
+                if (!empty($quantity_exercises)) {
138
+                    // Score % average
139
+                    $main_question_list[$question_id]->results = ($question_result / ($quantity_exercises));
140
+                } else {
141
+                    $main_question_list[$question_id]->results = 0;
142
+                }
143
+
144
+                $main_question_list[$question_id]->quantity = $quantity_exercises;
145
+            }
146
+        }
147
+    }
148 148
 }
149 149
 
150 150
 if (!$export_to_xls) {
151
-	Display :: display_header(get_lang("MySpace"));
152
-	echo '<div class="actions">';
153
-	if ($global) {
154
-		echo MySpace::getTopMenu();
155
-	} else {
156
-		echo '<div style="float:left; clear:left">
151
+    Display :: display_header(get_lang("MySpace"));
152
+    echo '<div class="actions">';
153
+    if ($global) {
154
+        echo MySpace::getTopMenu();
155
+    } else {
156
+        echo '<div style="float:left; clear:left">
157 157
 				<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.
158 158
                     get_lang('StudentsTracking').'</a>&nbsp;|
159 159
 				<a href="courseLog.php?'.api_get_cidreq().'&studentlist=false">'.
160 160
                     get_lang('CourseTracking').'</a>&nbsp;';
161
-		echo '</div>';
162
-	}
163
-	echo '</div>';
161
+        echo '</div>';
162
+    }
163
+    echo '</div>';
164 164
 
165
-	if (api_is_platform_admin()) {
166
-		echo MySpace::getAdminActions();
167
-	}
168
-	echo '<br />';
169
-	echo '<h2>'.get_lang('LPQuestionListResults').'</h2>';
165
+    if (api_is_platform_admin()) {
166
+        echo MySpace::getAdminActions();
167
+    }
168
+    echo '<br />';
169
+    echo '<h2>'.get_lang('LPQuestionListResults').'</h2>';
170 170
 
171
-	$form->display();
171
+    $form->display();
172 172
 
173
-	if (empty($course_code)) {
174
-		Display::display_warning_message(get_lang('PleaseSelectACourse'));
175
-	}
173
+    if (empty($course_code)) {
174
+        Display::display_warning_message(get_lang('PleaseSelectACourse'));
175
+    }
176 176
 }
177 177
 
178 178
 $course_average = array();
179 179
 $counter = 0;
180 180
 
181 181
 if (!empty($main_question_list) && is_array($main_question_list)) {
182
-	$html_result .= '<table  class="data_table">';
183
-	$html_result .= '<tr><th>'.get_lang('Question').
182
+    $html_result .= '<table  class="data_table">';
183
+    $html_result .= '<tr><th>'.get_lang('Question').
184 184
                     Display :: return_icon('info3.gif', get_lang('QuestionsAreTakenFromLPExercises'), array('align' => 'absmiddle', 'hspace' => '3px')).'</th>';
185
-	$html_result .= '<th>'.$course_info['visual_code'].' '.get_lang('AverageScore').Display :: return_icon('info3.gif', get_lang('AllStudentsAttemptsAreConsidered'), array('align' => 'absmiddle', 'hspace' => '3px')).' </th>';
186
-	$html_result .= '<th>'.get_lang('Quantity').'</th>';
187
-
188
-	foreach ($main_question_list as $question) {
189
-		$total_student = 0;
190
-		$counter ++;
191
-		$s_css_class = 'row_even';
192
-		if ($counter % 2 ==0 ) {
193
-			$s_css_class = 'row_odd';
194
-		}
195
-		$html_result .= "<tr class='$s_css_class'>
185
+    $html_result .= '<th>'.$course_info['visual_code'].' '.get_lang('AverageScore').Display :: return_icon('info3.gif', get_lang('AllStudentsAttemptsAreConsidered'), array('align' => 'absmiddle', 'hspace' => '3px')).' </th>';
186
+    $html_result .= '<th>'.get_lang('Quantity').'</th>';
187
+
188
+    foreach ($main_question_list as $question) {
189
+        $total_student = 0;
190
+        $counter ++;
191
+        $s_css_class = 'row_even';
192
+        if ($counter % 2 ==0 ) {
193
+            $s_css_class = 'row_odd';
194
+        }
195
+        $html_result .= "<tr class='$s_css_class'>
196 196
 							<td >";
197
-		$question_title = trim($question->question);
198
-		if (empty($question_title)) {
199
-			$html_result .= get_lang('Untitled').' '.get_lang('Question').' #'.$question->id;
200
-		} else {
201
-			$html_result .= $question->question;
202
-		}
203
-
204
-		$html_result .= "</td>";
205
-		$html_result .= "<td>";
206
-		$html_result .= round($question->results, 2).' / '.$question->weighting;
207
-		$html_result .= "</td>";
208
-
209
-		$html_result .= "<td>";
210
-		$html_result .= $question->quantity;
211
-		$html_result .= "</td>";
212
-	}
213
-
214
-	$html_result .="</tr>";
215
-	$html_result .= '</table>';
197
+        $question_title = trim($question->question);
198
+        if (empty($question_title)) {
199
+            $html_result .= get_lang('Untitled').' '.get_lang('Question').' #'.$question->id;
200
+        } else {
201
+            $html_result .= $question->question;
202
+        }
203
+
204
+        $html_result .= "</td>";
205
+        $html_result .= "<td>";
206
+        $html_result .= round($question->results, 2).' / '.$question->weighting;
207
+        $html_result .= "</td>";
208
+
209
+        $html_result .= "<td>";
210
+        $html_result .= $question->quantity;
211
+        $html_result .= "</td>";
212
+    }
213
+
214
+    $html_result .="</tr>";
215
+    $html_result .= '</table>';
216 216
 } else {
217
-	if (!empty($course_code)) {
218
-		Display::display_warning_message(get_lang('NoResults'));
219
-	}
217
+    if (!empty($course_code)) {
218
+        Display::display_warning_message(get_lang('NoResults'));
219
+    }
220 220
 }
221 221
 
222 222
 if (!$export_to_xls) {
223
-	echo $html_result;
223
+    echo $html_result;
224 224
 }
225 225
 
226 226
 Display :: display_footer();
Please login to merge, or discard this patch.
main/install/update-configuration.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
         if (stripos($line, '$_configuration[\'system_version\']') !== false) {
39 39
             $found_version = true;
40 40
             $line = '$_configuration[\'system_version\'] = \'' . $new_version . '\';' . "\r\n";
41
-       } elseif (stripos($line, '$_configuration[\'system_stable\']') !== false) {
41
+        } elseif (stripos($line, '$_configuration[\'system_stable\']') !== false) {
42 42
             $found_stable = true;
43 43
             $line = '$_configuration[\'system_stable\'] = ' . ($new_version_stable ? 'true' : 'false') . ';' . "\r\n";
44 44
         } elseif (stripos($line, '$_configuration[\'software_name\']') !== false) {
Please login to merge, or discard this patch.
main/course_description/listing.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -18,27 +18,27 @@  discard block
 block discarded – undo
18 18
     }
19 19
     $categories[ADD_BLOCK] = get_lang('NewBloc');
20 20
 
21
-	$i=1;
22
-	echo '<div class="actions" style="margin-bottom:30px">';
23
-	ksort($categories);
24
-	foreach ($categories as $id => $title) {
25
-		if ($i==ADD_BLOCK) {
26
-			echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
21
+    $i=1;
22
+    echo '<div class="actions" style="margin-bottom:30px">';
23
+    ksort($categories);
24
+    foreach ($categories as $id => $title) {
25
+        if ($i==ADD_BLOCK) {
26
+            echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
27 27
                 Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
28
-			break;
29
-		} else {
30
-			echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
28
+            break;
29
+        } else {
30
+            echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
31 31
                 Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
32
-			$i++;
33
-		}
34
-	}
35
-	echo '</div>';
32
+            $i++;
33
+        }
34
+    }
35
+    echo '</div>';
36 36
 }
37 37
 $history = isset($history) ? $history : null;
38 38
 
39 39
 // display course description list
40 40
 if ($history) {
41
-	echo '<div>
41
+    echo '<div>
42 42
         <table width="100%">
43 43
             <tr>
44 44
                 <td><h3>'.get_lang('ThematicAdvanceHistory').'</h3></td>
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 $user_info = api_get_user_info();
50 50
 
51 51
 if (isset($descriptions) && count($descriptions) > 0) {
52
-	foreach ($descriptions as $id => $description) {
52
+    foreach ($descriptions as $id => $description) {
53 53
         if (!empty($description)) {
54 54
             $actions = '';
55 55
             if (api_is_allowed_to_edit(null,true) && !$history) {
Please login to merge, or discard this patch.