Completed
Pull Request — 1.11.x (#1589)
by José
46:32
created
plugin/ext_auth_chamilo_logout_button_behaviour/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
     api_get_setting('cas_activate') == 'true' &&
8 8
     $_user['auth_source'] == CAS_AUTH_SOURCE
9 9
 ) {
10
-    $_template['show_message']   = true;
10
+    $_template['show_message'] = true;
11 11
     // the link URL
12 12
     $link_url = "#";
13 13
     if (!empty($plugin_info['settings']['ext_auth_chamilo_logout_button_behaviour_eaclbb_form_link_url'])) {
Please login to merge, or discard this patch.
plugin/ext_auth_chamilo_logout_button_behaviour/plugin.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  */
11 11
 
12 12
 //the plugin title
13
-$plugin_info['title']      = 'Enable or disable logout button';
13
+$plugin_info['title'] = 'Enable or disable logout button';
14 14
 
15 15
 //the comments that go with the plugin
16 16
 $plugin_info['comment']     = "If you use some other authentication than local Chamilo authentication, you may have to disable the Chamilo logout button and give users information about your SSO logout.";
@@ -23,8 +23,8 @@  discard block
 block discarded – undo
23 23
 $form->addElement("html", "<div class='normal-message'>Fill the text boxes below to overwrite the default values used in this plugin</div>");
24 24
 $form->addElement('text', 'eaclbb_form_link_url', 'Page to load when clicking on the logout button');
25 25
 $form->addElement('text', 'eaclbb_form_link_infobulle', 'Tooltip text for the logout button (displayed on mouseover)');
26
-$form->addElement('checkbox', 'eaclbb_form_link_image', "Display the logout button disabled (black and white)", "",  array('checked' => true));
27
-$form->addElement('checkbox', 'eaclbb_form_alert_onoff', "Display an alert when clicking on the logout button", "",  array('checked' => true));
26
+$form->addElement('checkbox', 'eaclbb_form_link_image', "Display the logout button disabled (black and white)", "", array('checked' => true));
27
+$form->addElement('checkbox', 'eaclbb_form_alert_onoff', "Display an alert when clicking on the logout button", "", array('checked' => true));
28 28
 $form->addElement('text', 'eaclbb_form_alert_text', "Text displayed in the alert box when clickng on the logout button (if checkbox above has been checked).");
29 29
 
30 30
 $form->addButtonSave(get_lang('Save'), 'submit_button');
@@ -44,4 +44,4 @@  discard block
 block discarded – undo
44 44
 $plugin_info['settings_form'] = $form;
45 45
 
46 46
 // Set the templates that are going to be used
47
-$plugin_info['templates']   = array('template.tpl');
47
+$plugin_info['templates'] = array('template.tpl');
Please login to merge, or discard this patch.
plugin/bbb/cron.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-require __DIR__ . '/../../vendor/autoload.php';
4
-if (file_exists(__DIR__ . '/config.vm.php')) {
3
+require __DIR__.'/../../vendor/autoload.php';
4
+if (file_exists(__DIR__.'/config.vm.php')) {
5 5
 
6
-    require_once dirname(__FILE__) . '/config.php';
6
+    require_once dirname(__FILE__).'/config.php';
7 7
 
8
-    require __DIR__ . '/lib/vm/AbstractVM.php';
9
-    require __DIR__ . '/lib/vm/VMInterface.php';
10
-    require __DIR__ . '/lib/vm/DigitalOceanVM.php';
11
-    require __DIR__ . '/lib/VM.php';
8
+    require __DIR__.'/lib/vm/AbstractVM.php';
9
+    require __DIR__.'/lib/vm/VMInterface.php';
10
+    require __DIR__.'/lib/vm/DigitalOceanVM.php';
11
+    require __DIR__.'/lib/VM.php';
12 12
 
13
-    $config = require __DIR__ . '/config.vm.php';
13
+    $config = require __DIR__.'/config.vm.php';
14 14
 
15 15
     $vm = new VM($config);
16 16
 
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
             if (empty($activeSessions)) {
22 22
                 $vm->runCron();
23 23
             } else {
24
-                echo "Can't run cron active sessions found: " . $activeSessions;
24
+                echo "Can't run cron active sessions found: ".$activeSessions;
25 25
             }
26 26
         }
27 27
     }
Please login to merge, or discard this patch.
plugin/bbb/lib/VM.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
 
71 71
         foreach ($vmList as $vm) {
72 72
             if (isset($vm['enabled']) && $vm['enabled'] == true) {
73
-                $className = $vm['name'] . 'VM';
73
+                $className = $vm['name'].'VM';
74 74
 
75 75
                 return new $className($vm);
76 76
                 break;
Please login to merge, or discard this patch.
plugin/bbb/lib/vm/DigitalOceanVM.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
                         break;
101 101
                 }
102 102
             } else {
103
-                throw new \Exception(" Id " . $this->vmId . " doesn't exists.");
103
+                throw new \Exception(" Id ".$this->vmId." doesn't exists.");
104 104
             }
105 105
         } catch (Exception $e) {
106 106
             die($e->getMessage());
@@ -118,22 +118,22 @@  discard block
 block discarded – undo
118 118
 
119 119
         $powerOff = $droplets->powerOff($this->vmId);
120 120
 
121
-        $this->addMessage('Power off droplet #' . $this->vmId);
121
+        $this->addMessage('Power off droplet #'.$this->vmId);
122 122
 
123 123
         $this->waitForEvent($powerOff->event_id);
124 124
 
125
-        $this->addMessage('Current status: ' . $dropletInfo->droplet->status);
125
+        $this->addMessage('Current status: '.$dropletInfo->droplet->status);
126 126
 
127 127
         $resizeDroplet = $droplets->resize(
128 128
             $this->vmId,
129 129
             array('size_id' => intval($sizeId))
130 130
         );
131
-        $this->addMessage('Resize droplet to size id: ' . $sizeId);
131
+        $this->addMessage('Resize droplet to size id: '.$sizeId);
132 132
         $this->waitForEvent($resizeDroplet->event_id);
133 133
 
134 134
         $powerOn = $droplets->powerOn($this->vmId);
135 135
         $this->waitForEvent($powerOn->event_id);
136
-        $this->addMessage('Power on droplet #' . $this->vmId);
136
+        $this->addMessage('Power on droplet #'.$this->vmId);
137 137
 
138 138
     }
139 139
 
Please login to merge, or discard this patch.
plugin/dashboard/block_course/block_course.class.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -63,19 +63,19 @@  discard block
 block discarded – undo
63 63
         $content = $this->get_content_html();
64 64
         $html = '
65 65
 		            <div class="panel panel-default" id="intro">
66
-		                <div class="panel-heading">' . get_lang('CoursesInformation') . '
66
+		                <div class="panel-heading">' . get_lang('CoursesInformation').'
67 67
 		                    <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\'' . addslashes(
68 68
                 api_htmlentities(
69 69
                     get_lang('ConfirmYourChoice'),
70 70
                     ENT_QUOTES,
71 71
                     $charset
72 72
                 )
73
-            ) . '\')) return false;" href="index.php?action=disable_block&path=' . $this->path . '">
73
+            ).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
74 74
                 <em class="fa fa-times"></em>
75 75
                 </a></div>
76 76
 		                </div>
77 77
 		                <div class="panel-body">
78
-		                   ' . $content . '
78
+		                   ' . $content.'
79 79
 		                </div>
80 80
 		            </div>
81 81
 				';
@@ -93,17 +93,17 @@  discard block
 block discarded – undo
93 93
     {
94 94
         $course_data = $this->get_course_information_data();
95 95
         //$content = '<div style="margin:10px;">';
96
-        $content = '<h4>' . get_lang(
96
+        $content = '<h4>'.get_lang(
97 97
                 'YourCourseList'
98
-            ) . '</h4>';
98
+            ).'</h4>';
99 99
         $data_table = null;
100 100
         if (!empty($course_data)) {
101 101
             $data_table .= '<table class="data_table" width:"95%">';
102 102
             $data_table .= '<tr>
103
-	    						<th>' . get_lang('CourseTitle') . '</th>
104
-	    						<th width="20%">' . get_lang('NbStudents') . '</th>
105
-	    						<th width="20%">' . get_lang('AvgTimeSpentInTheCourse') . '</th>
106
-	    						<th width="20%">' . get_lang('ThematicAdvance') . '</th>
103
+	    						<th>' . get_lang('CourseTitle').'</th>
104
+	    						<th width="20%">' . get_lang('NbStudents').'</th>
105
+	    						<th width="20%">' . get_lang('AvgTimeSpentInTheCourse').'</th>
106
+	    						<th width="20%">' . get_lang('ThematicAdvance').'</th>
107 107
 	    					</tr>';
108 108
             $i = 1;
109 109
             foreach ($course_data as $course) {
@@ -112,12 +112,12 @@  discard block
 block discarded – undo
112 112
                 } else {
113 113
                     $class_tr = 'row_even';
114 114
                 }
115
-                $data_table .= '<tr class="' . $class_tr . '">';
115
+                $data_table .= '<tr class="'.$class_tr.'">';
116 116
                 if (!isset($course[2])) {
117 117
                     $course[2] = '0:00:00';
118 118
                 }
119 119
                 foreach ($course as $cell) {
120
-                    $data_table .= '<td align="right">' . $cell . '</td>';
120
+                    $data_table .= '<td align="right">'.$cell.'</td>';
121 121
                 }
122 122
                 $data_table .= '</tr>';
123 123
                 $i++;
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
         }
129 129
         $content .= $data_table;
130 130
         if (!empty($course_data)) {
131
-            $content .= '<div style="text-align:right;margin-top:10px;"><a href="' . api_get_path(WEB_CODE_PATH) . 'mySpace/course.php?follow">' . get_lang('SeeMore') . '</a></div>';
131
+            $content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/course.php?follow">'.get_lang('SeeMore').'</a></div>';
132 132
         }
133 133
         //$content .= '</div>';
134 134
 
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 
164 164
             // students directly subscribed to the course
165 165
             $sql = "SELECT user_id FROM $tbl_course_user as course_rel_user
166
-                    WHERE course_rel_user.status=" . STUDENT . " AND course_rel_user.c_id='$courseId'";
166
+                    WHERE course_rel_user.status=".STUDENT." AND course_rel_user.c_id='$courseId'";
167 167
             $rs = Database::query($sql);
168 168
             $users = array();
169 169
             while ($row = Database::fetch_array($rs)) {
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
             );
183 183
 
184 184
             if (!empty($tematic_advance)) {
185
-                $tematic_advance_progress = '<a title="' . get_lang('GoToThematicAdvance') . '" href="' . api_get_path(WEB_CODE_PATH) . 'course_progress/index.php?cidReq=' . $course_code . '&action=thematic_details">' . $tematic_advance . '%</a>';
185
+                $tematic_advance_progress = '<a title="'.get_lang('GoToThematicAdvance').'" href="'.api_get_path(WEB_CODE_PATH).'course_progress/index.php?cidReq='.$course_code.'&action=thematic_details">'.$tematic_advance.'%</a>';
186 186
             } else {
187 187
                 $tematic_advance_progress = '0%';
188 188
             }
Please login to merge, or discard this patch.
plugin/dashboard/block_student_graph/block_student_graph.class.php 2 patches
Indentation   +74 added lines, -74 removed lines patch added patch discarded remove patch
@@ -22,40 +22,40 @@  discard block
 block discarded – undo
22 22
 {
23 23
 
24 24
     private $user_id;
25
-	private $students;
26
-	private $path;
27
-	private $permission = array(DRH);
25
+    private $students;
26
+    private $path;
27
+    private $permission = array(DRH);
28 28
 
29
-	/**
30
-	 * Constructor
31
-	 */
29
+    /**
30
+     * Constructor
31
+     */
32 32
     public function __construct ($user_id)
33 33
     {
34
-    	$this->user_id  = $user_id;
35
-    	$this->path 	= 'block_student_graph';
36
-    	if ($this->is_block_visible_for_user($user_id)) {
37
-    		/*if (api_is_platform_admin()) {
34
+        $this->user_id  = $user_id;
35
+        $this->path 	= 'block_student_graph';
36
+        if ($this->is_block_visible_for_user($user_id)) {
37
+            /*if (api_is_platform_admin()) {
38 38
 	    		$this->students = UserManager::get_user_list(array('status' => STUDENT));
39 39
 	    	} else if (api_is_drh()) {*/
40
-	    		$this->students =  UserManager::get_users_followed_by_drh($user_id, STUDENT);
41
-	    	//}
42
-    	}
40
+                $this->students =  UserManager::get_users_followed_by_drh($user_id, STUDENT);
41
+            //}
42
+        }
43 43
     }
44 44
 
45 45
     /**
46
-	 * This method check if a user is allowed to see the block inside dashboard interface
47
-	 * @param	int		User id
48
-	 * @return	bool	Is block visible for user
49
-	 */
46
+     * This method check if a user is allowed to see the block inside dashboard interface
47
+     * @param	int		User id
48
+     * @return	bool	Is block visible for user
49
+     */
50 50
     public function is_block_visible_for_user($user_id)
51 51
     {
52
-    	$user_info = api_get_user_info($user_id);
53
-		$user_status = $user_info['status'];
54
-		$is_block_visible_for_user = false;
55
-    	if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
56
-    		$is_block_visible_for_user = true;
57
-    	}
58
-    	return $is_block_visible_for_user;
52
+        $user_info = api_get_user_info($user_id);
53
+        $user_status = $user_info['status'];
54
+        $is_block_visible_for_user = false;
55
+        if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
56
+            $is_block_visible_for_user = true;
57
+        }
58
+        return $is_block_visible_for_user;
59 59
     }
60 60
 
61 61
     /**
@@ -67,12 +67,12 @@  discard block
 block discarded – undo
67 67
     public function get_block()
68 68
     {
69 69
 
70
-    	global $charset;
71
-    	$column = 1;
72
-    	$data   = array();
73
-		$students_attendance_graph = $this->get_students_attendance_graph();
70
+        global $charset;
71
+        $column = 1;
72
+        $data   = array();
73
+        $students_attendance_graph = $this->get_students_attendance_graph();
74 74
 
75
-		$html = '<div class="panel panel-default" id="intro">
75
+        $html = '<div class="panel panel-default" id="intro">
76 76
 	                <div class="panel-heading">
77 77
 	                    '.get_lang('StudentsInformationsGraph').'
78 78
 	                    <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
@@ -84,51 +84,51 @@  discard block
 block discarded – undo
84 84
 						'.$students_attendance_graph.'
85 85
 	                </div>
86 86
 	            </div>';
87
-    	$data['column'] = $column;
88
-    	$data['content_html'] = $html;
89
-    	return $data;
87
+        $data['column'] = $column;
88
+        $data['content_html'] = $html;
89
+        return $data;
90 90
     }
91 91
 
92 92
     /**
93
- 	 * This method return a graph containing information about students evaluation,
93
+     * This method return a graph containing information about students evaluation,
94 94
      * it's used inside get_block method for showing it inside dashboard interface
95
- 	 * @return string  img html
96
- 	 */
95
+     * @return string  img html
96
+     */
97 97
     public function get_students_attendance_graph()
98 98
     {
99 99
 
100
-		$students = $this->students;
101
- 		$attendance = new Attendance();
102
-
103
- 		// get data
104
- 		$attendances_faults_avg = array();
105
- 		if (is_array($students) && count($students) > 0) {
106
-	 		foreach ($students as $student) {
107
-	 			$student_id = $student['user_id'];
108
-	 			//$student_info = api_get_user_info($student_id);
109
-				// get average of faults in attendances by student
110
-	 			$results_faults_avg = $attendance->get_faults_average_inside_courses($student_id);
111
-
112
-	 			if (!empty($results_faults_avg)) {
113
-	 				$attendances_faults_avg[$student['lastname']] = $results_faults_avg['porcent'];
114
-	 			} else {
115
-	 				$attendances_faults_avg[$student['lastname']] = 0;
116
-	 			}
117
-	 		}
118
- 		}
100
+        $students = $this->students;
101
+            $attendance = new Attendance();
102
+
103
+            // get data
104
+            $attendances_faults_avg = array();
105
+            if (is_array($students) && count($students) > 0) {
106
+                foreach ($students as $student) {
107
+                    $student_id = $student['user_id'];
108
+                    //$student_info = api_get_user_info($student_id);
109
+                // get average of faults in attendances by student
110
+                    $results_faults_avg = $attendance->get_faults_average_inside_courses($student_id);
111
+
112
+                    if (!empty($results_faults_avg)) {
113
+                        $attendances_faults_avg[$student['lastname']] = $results_faults_avg['porcent'];
114
+                    } else {
115
+                        $attendances_faults_avg[$student['lastname']] = 0;
116
+                    }
117
+                }
118
+            }
119 119
 
120
- 		arsort($attendances_faults_avg);
121
-		$usernames = array_keys($attendances_faults_avg);
120
+            arsort($attendances_faults_avg);
121
+        $usernames = array_keys($attendances_faults_avg);
122 122
 
123
-		$faults = array();
124
-		foreach ($usernames as $username) {
125
-			$faults[] = $attendances_faults_avg[$username];
126
-		}
123
+        $faults = array();
124
+        foreach ($usernames as $username) {
125
+            $faults[] = $attendances_faults_avg[$username];
126
+        }
127 127
 
128
-		$graph = '';
129
-		$img_file = '';
128
+        $graph = '';
129
+        $img_file = '';
130 130
 
131
-		if (is_array($usernames) && count($usernames) > 0) {
131
+        if (is_array($usernames) && count($usernames) > 0) {
132 132
 
133 133
             // Defining data
134 134
             $dataSet = new pData();
@@ -233,19 +233,19 @@  discard block
 block discarded – undo
233 233
                 $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
234 234
             }
235 235
             $graph = '<img src="' . $imgPath . '" >';
236
-		} else {
237
-			$graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'),'UTF-8').'</p>';
238
-		}
236
+        } else {
237
+            $graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'),'UTF-8').'</p>';
238
+        }
239 239
 
240
- 		return $graph;
241
- 	}
240
+            return $graph;
241
+        }
242 242
 
243 243
     /**
244
-	 * Get number of students
245
-	 * @return int
246
-	 */
247
-	function get_number_of_students()
244
+     * Get number of students
245
+     * @return int
246
+     */
247
+    function get_number_of_students()
248 248
     {
249
-		return count($this->students);
250
-	}
249
+        return count($this->students);
250
+    }
251 251
 }
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -29,15 +29,15 @@  discard block
 block discarded – undo
29 29
 	/**
30 30
 	 * Constructor
31 31
 	 */
32
-    public function __construct ($user_id)
32
+    public function __construct($user_id)
33 33
     {
34
-    	$this->user_id  = $user_id;
35
-    	$this->path 	= 'block_student_graph';
34
+    	$this->user_id = $user_id;
35
+    	$this->path = 'block_student_graph';
36 36
     	if ($this->is_block_visible_for_user($user_id)) {
37 37
     		/*if (api_is_platform_admin()) {
38 38
 	    		$this->students = UserManager::get_user_list(array('status' => STUDENT));
39 39
 	    	} else if (api_is_drh()) {*/
40
-	    		$this->students =  UserManager::get_users_followed_by_drh($user_id, STUDENT);
40
+	    		$this->students = UserManager::get_users_followed_by_drh($user_id, STUDENT);
41 41
 	    	//}
42 42
     	}
43 43
     }
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 		$html = '<div class="panel panel-default" id="intro">
76 76
 	                <div class="panel-heading">
77 77
 	                    '.get_lang('StudentsInformationsGraph').'
78
-	                    <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
78
+	                    <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
79 79
 	                    <em class="fa fa-times"></em>
80 80
 	                    </a></div>
81 81
 	                </div>
@@ -155,9 +155,9 @@  discard block
 block discarded – undo
155 155
             $myCache = new pCache(array('CacheFolder' => substr($cachePath, 0, strlen($cachePath) - 1)));
156 156
             $chartHash = $myCache->getHash($dataSet);
157 157
             if ($myCache->isInCache($chartHash)) {
158
-                $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
158
+                $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
159 159
                 $myCache->saveFromCache($chartHash, $imgPath);
160
-                $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
160
+                $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
161 161
             } else {
162 162
 
163 163
                 $maxCounts = max(count($usernames), count($faults));
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
                 /* Set the default font */
183 183
                 $myPicture->setFontProperties(
184 184
                     array(
185
-                        'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
185
+                        'FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
186 186
                         'FontSize' => 10
187 187
                     )
188 188
                 );
@@ -228,13 +228,13 @@  discard block
 block discarded – undo
228 228
 
229 229
                 /* Write and save into cache */
230 230
                 $myCache->writeToCache($chartHash, $myPicture);
231
-                $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
231
+                $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
232 232
                 $myCache->saveFromCache($chartHash, $imgPath);
233
-                $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
233
+                $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
234 234
             }
235
-            $graph = '<img src="' . $imgPath . '" >';
235
+            $graph = '<img src="'.$imgPath.'" >';
236 236
 		} else {
237
-			$graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'),'UTF-8').'</p>';
237
+			$graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'), 'UTF-8').'</p>';
238 238
 		}
239 239
 
240 240
  		return $graph;
Please login to merge, or discard this patch.
plugin/dashboard/block_teacher/block_teacher.class.php 3 patches
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -27,10 +27,10 @@  discard block
 block discarded – undo
27 27
 	/**
28 28
 	 * Controller
29 29
 	 */
30
-    public function __construct ($user_id)
30
+    public function __construct($user_id)
31 31
     {
32
-    	$this->user_id  = $user_id;
33
-    	$this->path 	= 'block_teacher';
32
+    	$this->user_id = $user_id;
33
+    	$this->path = 'block_teacher';
34 34
     	if ($this->is_block_visible_for_user($user_id)) {
35 35
 	        $this->teachers = UserManager::get_users_followed_by_drh($user_id, COURSEMANAGER);
36 36
     	}
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
                 <div class="panel panel-default" id="intro">
70 70
                     <div class="panel-heading">
71 71
                         '.get_lang('TeachersInformationsList').'
72
-                        <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
72
+                        <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
73 73
                         <em class="fa fa-times"></em>
74 74
                         </a></div>
75 75
                     </div>
@@ -112,18 +112,18 @@  discard block
 block discarded – undo
112 112
 
113 113
 	 			$teacher_id = $teacher['user_id'];
114 114
 	 			$firstname 	= $teacher['firstname'];
115
-	 			$lastname 	= $teacher['lastname'];
116
-	 			$username	= $teacher['username'];
115
+	 			$lastname = $teacher['lastname'];
116
+	 			$username = $teacher['username'];
117 117
 
118 118
 	 			$time_on_platform = api_time_to_hms(Tracking :: get_time_spent_on_the_platform($teacher_id));
119 119
 	 			$last_connection = Tracking :: get_last_connection_date($teacher_id);
120 120
 
121
-				if ($i%2 == 0) $class_tr = 'row_odd';
121
+				if ($i % 2 == 0) $class_tr = 'row_odd';
122 122
 			    else $class_tr = 'row_even';
123 123
 
124 124
 				$teachers_table .= '
125 125
 									<tr class="'.$class_tr.'">
126
-										<td>'.api_get_person_name($firstname,$lastname).' ('.$username.')</td>
126
+										<td>'.api_get_person_name($firstname, $lastname).' ('.$username.')</td>
127 127
 										<td align="right">'.$time_on_platform.'</td>
128 128
 										<td align="right">'.$last_connection.'</td>
129 129
 									</tr>
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
         $teachers_table = null;
156 156
  		if (count($teachers) > 0) {
157 157
  			$a_last_week = get_last_week();
158
- 			$last_week 	 = date('Y-m-d',$a_last_week[0]).' '.get_lang('To').' '.date('Y-m-d', $a_last_week[6]);
158
+ 			$last_week 	 = date('Y-m-d', $a_last_week[0]).' '.get_lang('To').' '.date('Y-m-d', $a_last_week[6]);
159 159
 
160 160
 	 		$teachers_table .= '<table class="data_table" width:"95%">';
161 161
 	 		$teachers_table .= '
@@ -171,13 +171,13 @@  discard block
 block discarded – undo
171 171
 	 			$teacher_id = $teacher['user_id'];
172 172
 	 			$firstname  = $teacher['firstname'];
173 173
 	 			$lastname   = $teacher['lastname'];
174
-				$username	= $teacher['username'];
175
-	 			$time_on_platform = api_time_to_hms(Tracking :: get_time_spent_on_the_platform($teacher_id,true));
174
+				$username = $teacher['username'];
175
+	 			$time_on_platform = api_time_to_hms(Tracking :: get_time_spent_on_the_platform($teacher_id, true));
176 176
 
177
-	 			if ($i%2 == 0) $class_tr = 'row_odd';
177
+	 			if ($i % 2 == 0) $class_tr = 'row_odd';
178 178
 	    		else $class_tr = 'row_even';
179 179
 	    		$teachers_table .= '<tr class="'.$class_tr.'">
180
-										<td>'.api_get_person_name($firstname,$lastname).' ('.$username.')</td>
180
+										<td>'.api_get_person_name($firstname, $lastname).' ('.$username.')</td>
181 181
 										<td align="right">'.$time_on_platform.'</td>
182 182
 									</tr>';
183 183
 
Please login to merge, or discard this patch.
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -118,8 +118,11 @@  discard block
 block discarded – undo
118 118
 	 			$time_on_platform = api_time_to_hms(Tracking :: get_time_spent_on_the_platform($teacher_id));
119 119
 	 			$last_connection = Tracking :: get_last_connection_date($teacher_id);
120 120
 
121
-				if ($i%2 == 0) $class_tr = 'row_odd';
122
-			    else $class_tr = 'row_even';
121
+				if ($i%2 == 0) {
122
+				    $class_tr = 'row_odd';
123
+				} else {
124
+			        $class_tr = 'row_even';
125
+			    }
123 126
 
124 127
 				$teachers_table .= '
125 128
 									<tr class="'.$class_tr.'">
@@ -174,8 +177,11 @@  discard block
 block discarded – undo
174 177
 				$username	= $teacher['username'];
175 178
 	 			$time_on_platform = api_time_to_hms(Tracking :: get_time_spent_on_the_platform($teacher_id,true));
176 179
 
177
-	 			if ($i%2 == 0) $class_tr = 'row_odd';
178
-	    		else $class_tr = 'row_even';
180
+	 			if ($i%2 == 0) {
181
+	 			    $class_tr = 'row_odd';
182
+	 			} else {
183
+	    		    $class_tr = 'row_even';
184
+	    		}
179 185
 	    		$teachers_table .= '<tr class="'.$class_tr.'">
180 186
 										<td>'.api_get_person_name($firstname,$lastname).' ('.$username.')</td>
181 187
 										<td align="right">'.$time_on_platform.'</td>
Please login to merge, or discard this patch.
Indentation   +98 added lines, -98 removed lines patch added patch discarded remove patch
@@ -24,32 +24,32 @@  discard block
 block discarded – undo
24 24
     private $path;
25 25
     private $permission = array(DRH);
26 26
 
27
-	/**
28
-	 * Controller
29
-	 */
27
+    /**
28
+     * Controller
29
+     */
30 30
     public function __construct ($user_id)
31 31
     {
32
-    	$this->user_id  = $user_id;
33
-    	$this->path 	= 'block_teacher';
34
-    	if ($this->is_block_visible_for_user($user_id)) {
35
-	        $this->teachers = UserManager::get_users_followed_by_drh($user_id, COURSEMANAGER);
36
-    	}
32
+        $this->user_id  = $user_id;
33
+        $this->path 	= 'block_teacher';
34
+        if ($this->is_block_visible_for_user($user_id)) {
35
+            $this->teachers = UserManager::get_users_followed_by_drh($user_id, COURSEMANAGER);
36
+        }
37 37
     }
38 38
 
39 39
     /**
40
-	 * This method check if a user is allowed to see the block inside dashboard interface
41
-	 * @param	int		User id
42
-	 * @return	bool	Is block visible for user
43
-	 */
40
+     * This method check if a user is allowed to see the block inside dashboard interface
41
+     * @param	int		User id
42
+     * @return	bool	Is block visible for user
43
+     */
44 44
     public function is_block_visible_for_user($user_id)
45 45
     {
46
-    	$user_info = api_get_user_info($user_id);
47
-		$user_status = $user_info['status'];
48
-		$is_block_visible_for_user = false;
49
-    	if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
50
-    		$is_block_visible_for_user = true;
51
-    	}
52
-    	return $is_block_visible_for_user;
46
+        $user_info = api_get_user_info($user_id);
47
+        $user_status = $user_info['status'];
48
+        $is_block_visible_for_user = false;
49
+        if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
50
+            $is_block_visible_for_user = true;
51
+        }
52
+        return $is_block_visible_for_user;
53 53
     }
54 54
 
55 55
     /**
@@ -60,12 +60,12 @@  discard block
 block discarded – undo
60 60
     public function get_block()
61 61
     {
62 62
 
63
-    	global $charset;
64
-    	$column = 1;
65
-    	$data = array();
66
-		$teacher_content_html = $this->get_teachers_content_html_for_drh();
63
+        global $charset;
64
+        $column = 1;
65
+        $data = array();
66
+        $teacher_content_html = $this->get_teachers_content_html_for_drh();
67 67
 
68
-		$html = '
68
+        $html = '
69 69
                 <div class="panel panel-default" id="intro">
70 70
                     <div class="panel-heading">
71 71
                         '.get_lang('TeachersInformationsList').'
@@ -79,27 +79,27 @@  discard block
 block discarded – undo
79 79
                 </div>
80 80
 				';
81 81
 
82
-    	$data['column'] = $column;
83
-    	$data['content_html'] = $html;
82
+        $data['column'] = $column;
83
+        $data['content_html'] = $html;
84 84
 
85
-    	return $data;
85
+        return $data;
86 86
 
87 87
     }
88 88
 
89 89
     /**
90
- 	 * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
91
- 	 * @return string  content html
92
- 	 */
90
+     * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
91
+     * @return string  content html
92
+     */
93 93
     public function get_teachers_content_html_for_platform_admin()
94 94
     {
95
-	 	$teachers = $this->teachers;
96
-		//$content = '<div style="margin:10px;">';
97
-		$content = '<h4>'.get_lang('YourTeachers').'</h4>';
95
+            $teachers = $this->teachers;
96
+        //$content = '<div style="margin:10px;">';
97
+        $content = '<h4>'.get_lang('YourTeachers').'</h4>';
98 98
 
99 99
         $teachers_table = null;
100
-		if (count($teachers) > 0) {
101
-	 		$teachers_table .= '<table class="data_table" width:"95%">';
102
-	 		$teachers_table .= '
100
+        if (count($teachers) > 0) {
101
+                $teachers_table .= '<table class="data_table" width:"95%">';
102
+                $teachers_table .= '
103 103
 								<tr>
104 104
 									<th>'.get_lang('User').'</th>
105 105
 									<th>'.get_lang('TimeSpentOnThePlatform').'</th>
@@ -107,103 +107,103 @@  discard block
 block discarded – undo
107 107
 								</tr>
108 108
 							';
109 109
 
110
-	 		$i = 1;
111
-	 		foreach ($teachers as $teacher) {
110
+                $i = 1;
111
+                foreach ($teachers as $teacher) {
112 112
 
113
-	 			$teacher_id = $teacher['user_id'];
114
-	 			$firstname 	= $teacher['firstname'];
115
-	 			$lastname 	= $teacher['lastname'];
116
-	 			$username	= $teacher['username'];
113
+                    $teacher_id = $teacher['user_id'];
114
+                    $firstname 	= $teacher['firstname'];
115
+                    $lastname 	= $teacher['lastname'];
116
+                    $username	= $teacher['username'];
117 117
 
118
-	 			$time_on_platform = api_time_to_hms(Tracking :: get_time_spent_on_the_platform($teacher_id));
119
-	 			$last_connection = Tracking :: get_last_connection_date($teacher_id);
118
+                    $time_on_platform = api_time_to_hms(Tracking :: get_time_spent_on_the_platform($teacher_id));
119
+                    $last_connection = Tracking :: get_last_connection_date($teacher_id);
120 120
 
121
-				if ($i%2 == 0) $class_tr = 'row_odd';
122
-			    else $class_tr = 'row_even';
121
+                if ($i%2 == 0) $class_tr = 'row_odd';
122
+                else $class_tr = 'row_even';
123 123
 
124
-				$teachers_table .= '
124
+                $teachers_table .= '
125 125
 									<tr class="'.$class_tr.'">
126 126
 										<td>'.api_get_person_name($firstname,$lastname).' ('.$username.')</td>
127 127
 										<td align="right">'.$time_on_platform.'</td>
128 128
 										<td align="right">'.$last_connection.'</td>
129 129
 									</tr>
130 130
 									';
131
-	 			$i++;
132
-	 		}
133
-	 		$teachers_table .= '</table>';
134
-		} else {
135
-			$teachers_table .= get_lang('ThereIsNoInformationAboutYourTeachers');
136
-		}
131
+                    $i++;
132
+                }
133
+                $teachers_table .= '</table>';
134
+        } else {
135
+            $teachers_table .= get_lang('ThereIsNoInformationAboutYourTeachers');
136
+        }
137 137
 
138
-	 	$content .= $teachers_table;
138
+            $content .= $teachers_table;
139 139
 
140
- 		if (count($teachers) > 0) {
141
-			$content .= '<div style="text-align:right;margin-top:10px;">
140
+            if (count($teachers) > 0) {
141
+            $content .= '<div style="text-align:right;margin-top:10px;">
142 142
 			<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin">'.get_lang('SeeMore').'</a></div>';
143
-		}
143
+        }
144 144
 
145
-		//$content .= '</div>';
145
+        //$content .= '</div>';
146 146
 
147
- 		return $content;
148
-	}
147
+            return $content;
148
+    }
149 149
 
150
-	public function get_teachers_content_html_for_drh()
150
+    public function get_teachers_content_html_for_drh()
151 151
     {
152
-  		$teachers = $this->teachers;
153
- 		//$content = '<div style="margin:10px;">';
154
- 		$content = '<h4>'.get_lang('YourTeachers').'</h4>';
152
+            $teachers = $this->teachers;
153
+            //$content = '<div style="margin:10px;">';
154
+            $content = '<h4>'.get_lang('YourTeachers').'</h4>';
155 155
         $teachers_table = null;
156
- 		if (count($teachers) > 0) {
157
- 			$a_last_week = get_last_week();
158
- 			$last_week 	 = date('Y-m-d',$a_last_week[0]).' '.get_lang('To').' '.date('Y-m-d', $a_last_week[6]);
156
+            if (count($teachers) > 0) {
157
+                $a_last_week = get_last_week();
158
+                $last_week 	 = date('Y-m-d',$a_last_week[0]).' '.get_lang('To').' '.date('Y-m-d', $a_last_week[6]);
159 159
 
160
-	 		$teachers_table .= '<table class="data_table" width:"95%">';
161
-	 		$teachers_table .= '
160
+                $teachers_table .= '<table class="data_table" width:"95%">';
161
+                $teachers_table .= '
162 162
 								<tr>
163 163
 									<th>'.get_lang('User').'</th>
164 164
 									<th>'.get_lang('TimeSpentLastWeek').'<br />'.$last_week.'</th>
165 165
 								</tr>
166 166
 							';
167 167
 
168
-	 		$i = 1;
169
-	 		foreach ($teachers as $teacher) {
168
+                $i = 1;
169
+                foreach ($teachers as $teacher) {
170 170
 
171
-	 			$teacher_id = $teacher['user_id'];
172
-	 			$firstname  = $teacher['firstname'];
173
-	 			$lastname   = $teacher['lastname'];
174
-				$username	= $teacher['username'];
175
-	 			$time_on_platform = api_time_to_hms(Tracking :: get_time_spent_on_the_platform($teacher_id,true));
171
+                    $teacher_id = $teacher['user_id'];
172
+                    $firstname  = $teacher['firstname'];
173
+                    $lastname   = $teacher['lastname'];
174
+                $username	= $teacher['username'];
175
+                    $time_on_platform = api_time_to_hms(Tracking :: get_time_spent_on_the_platform($teacher_id,true));
176 176
 
177
-	 			if ($i%2 == 0) $class_tr = 'row_odd';
178
-	    		else $class_tr = 'row_even';
179
-	    		$teachers_table .= '<tr class="'.$class_tr.'">
177
+                    if ($i%2 == 0) $class_tr = 'row_odd';
178
+                else $class_tr = 'row_even';
179
+                $teachers_table .= '<tr class="'.$class_tr.'">
180 180
 										<td>'.api_get_person_name($firstname,$lastname).' ('.$username.')</td>
181 181
 										<td align="right">'.$time_on_platform.'</td>
182 182
 									</tr>';
183 183
 
184
-	 			$i++;
185
-	 		}
186
-	 		$teachers_table .= '</table>';
187
- 		} else {
188
- 			$teachers_table .= get_lang('ThereIsNoInformationAboutYourTeachers');
189
- 		}
184
+                    $i++;
185
+                }
186
+                $teachers_table .= '</table>';
187
+            } else {
188
+                $teachers_table .= get_lang('ThereIsNoInformationAboutYourTeachers');
189
+            }
190 190
 
191
-  		$content .= $teachers_table;
191
+            $content .= $teachers_table;
192 192
 
193
- 		if (count($teachers) > 0) {
194
-			$content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/teachers.php">'.get_lang('SeeMore').'</a></div>';
195
-		}
196
-		//$content .= '</div>';
193
+            if (count($teachers) > 0) {
194
+            $content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/teachers.php">'.get_lang('SeeMore').'</a></div>';
195
+        }
196
+        //$content .= '</div>';
197 197
 
198
-  		return $content;
199
-  	}
198
+            return $content;
199
+        }
200 200
 
201 201
     /**
202
-	 * Get number of teachers
203
-	 * @return int
204
-	 */
205
-	function get_number_of_teachers()
202
+     * Get number of teachers
203
+     * @return int
204
+     */
205
+    function get_number_of_teachers()
206 206
     {
207
-		return count($this->teachers);
208
-	}
207
+        return count($this->teachers);
208
+    }
209 209
 }
Please login to merge, or discard this patch.
plugin/dashboard/block_student/block_student.class.php 2 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -21,12 +21,12 @@  discard block
 block discarded – undo
21 21
 	/**
22 22
 	 * Constructor
23 23
 	 */
24
-    public function __construct ($user_id)
24
+    public function __construct($user_id)
25 25
     {
26
-    	$this->user_id  = $user_id;
27
-    	$this->path 	= 'block_student';
26
+    	$this->user_id = $user_id;
27
+    	$this->path = 'block_student';
28 28
     	if ($this->is_block_visible_for_user($user_id)) {
29
-            $this->students =  UserManager::get_users_followed_by_drh($user_id, STUDENT);
29
+            $this->students = UserManager::get_users_followed_by_drh($user_id, STUDENT);
30 30
     	}
31 31
     }
32 32
 
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 		$html = '<div class="panel panel-default" id="intro">
62 62
                     <div class="panel-heading">
63 63
                         '.get_lang('StudentsInformationsList').'
64
-                        <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
64
+                        <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
65 65
                             <em class="fa fa-times"></em>
66 66
                         </a>
67 67
                         </div>
@@ -102,9 +102,9 @@  discard block
 block discarded – undo
102 102
 
103 103
 	 			$courses_by_user = CourseManager::get_courses_list_by_user_id($student['user_id'], true);
104 104
 	 			$count_courses = count($courses_by_user);
105
-				$rowspan = $count_courses?$count_courses+1:2;
105
+				$rowspan = $count_courses ? $count_courses + 1 : 2;
106 106
 
107
-				if ($i%2 == 0) {
107
+				if ($i % 2 == 0) {
108 108
                     $style = ' style="background-color:#F2F2F2" ';
109 109
                 } else {
110 110
                     $style = ' style="background-color:#FFF" ';
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 	 			$student_id = $student['user_id'];
170 170
 	 			$firstname  = $student['firstname'];
171 171
 	 			$lastname   = $student['lastname'];
172
-	 			$username	= $student['username'];
172
+	 			$username = $student['username'];
173 173
 
174 174
 
175 175
 				// get average of faults in attendances by student
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 	 				$cats = Category::load(null, null, $course_code, null, null, null, false);
189 189
 	 				$scoretotal = array();
190 190
 	 				if (isset($cats) && isset($cats[0])) {
191
-		 				$scoretotal= $cats[0]->calc_score($student_id, null, $course_code);
191
+		 				$scoretotal = $cats[0]->calc_score($student_id, null, $course_code);
192 192
 	 				}
193 193
 
194 194
 	 				if (!empty($scoretotal)) {
@@ -198,10 +198,10 @@  discard block
 block discarded – undo
198 198
 	 			}
199 199
 
200 200
 	 			if (!empty($weight)) {
201
-	 				$evaluations_avg = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.round($score,2).'/'.round($weight,2).'('.round(($score / $weight) * 100,2) . ' %)</a>';
201
+	 				$evaluations_avg = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.round($score, 2).'/'.round($weight, 2).'('.round(($score / $weight) * 100, 2).' %)</a>';
202 202
 	 			}
203 203
 
204
-	 			if ($i%2 == 0) {
204
+	 			if ($i % 2 == 0) {
205 205
                     $class_tr = 'row_odd';
206 206
                 } else {
207 207
                     $class_tr = 'row_even';
Please login to merge, or discard this patch.
Indentation   +141 added lines, -141 removed lines patch added patch discarded remove patch
@@ -14,36 +14,36 @@  discard block
 block discarded – undo
14 14
 class BlockStudent extends Block
15 15
 {
16 16
     private $user_id;
17
-	private $students;
18
-	private $path;
19
-	private $permission = array(DRH);
17
+    private $students;
18
+    private $path;
19
+    private $permission = array(DRH);
20 20
 
21
-	/**
22
-	 * Constructor
23
-	 */
21
+    /**
22
+     * Constructor
23
+     */
24 24
     public function __construct ($user_id)
25 25
     {
26
-    	$this->user_id  = $user_id;
27
-    	$this->path 	= 'block_student';
28
-    	if ($this->is_block_visible_for_user($user_id)) {
26
+        $this->user_id  = $user_id;
27
+        $this->path 	= 'block_student';
28
+        if ($this->is_block_visible_for_user($user_id)) {
29 29
             $this->students =  UserManager::get_users_followed_by_drh($user_id, STUDENT);
30
-    	}
30
+        }
31 31
     }
32 32
 
33 33
     /**
34
-	 * This method check if a user is allowed to see the block inside dashboard interface
35
-	 * @param	int		User id
36
-	 * @return	bool	Is block visible for user
37
-	 */
34
+     * This method check if a user is allowed to see the block inside dashboard interface
35
+     * @param	int		User id
36
+     * @return	bool	Is block visible for user
37
+     */
38 38
     public function is_block_visible_for_user($user_id)
39 39
     {
40
-    	$user_info = api_get_user_info($user_id);
41
-		$user_status = $user_info['status'];
42
-		$is_block_visible_for_user = false;
43
-    	if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
44
-    		$is_block_visible_for_user = true;
45
-    	}
46
-    	return $is_block_visible_for_user;
40
+        $user_info = api_get_user_info($user_id);
41
+        $user_status = $user_info['status'];
42
+        $is_block_visible_for_user = false;
43
+        if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
44
+            $is_block_visible_for_user = true;
45
+        }
46
+        return $is_block_visible_for_user;
47 47
     }
48 48
 
49 49
     /**
@@ -53,12 +53,12 @@  discard block
 block discarded – undo
53 53
      */
54 54
     public function get_block()
55 55
     {
56
-    	global $charset;
57
-    	$column = 1;
58
-    	$data   = array();
56
+        global $charset;
57
+        $column = 1;
58
+        $data   = array();
59 59
 
60 60
         $student_content_html = $this->get_students_content_html_for_drh();
61
-		$html = '<div class="panel panel-default" id="intro">
61
+        $html = '<div class="panel panel-default" id="intro">
62 62
                     <div class="panel-heading">
63 63
                         '.get_lang('StudentsInformationsList').'
64 64
                         <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
@@ -70,24 +70,24 @@  discard block
 block discarded – undo
70 70
                         '.$student_content_html.'
71 71
                     </div>
72 72
                     </div>';
73
-    	$data['column'] = $column;
74
-    	$data['content_html'] = $html;
75
-    	return $data;
73
+        $data['column'] = $column;
74
+        $data['content_html'] = $html;
75
+        return $data;
76 76
     }
77 77
 
78 78
     /**
79
- 	 * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
80
- 	 * @return string  content html
81
- 	 */
79
+     * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
80
+     * @return string  content html
81
+     */
82 82
     public function get_students_content_html_for_platform_admin()
83 83
     {
84
- 		$students = $this->students;
85
- 		//$content = '<div style="margin:10px;">';
86
- 		$content = '<h4>'.get_lang('YourStudents').'</h4>';
84
+            $students = $this->students;
85
+            //$content = '<div style="margin:10px;">';
86
+            $content = '<h4>'.get_lang('YourStudents').'</h4>';
87 87
         $students_table = null;
88
- 		if (count($students) > 0) {
89
-	 		$students_table .= '<table class="data_table">';
90
-	 		$students_table .= '<tr>
88
+            if (count($students) > 0) {
89
+                $students_table .= '<table class="data_table">';
90
+                $students_table .= '<tr>
91 91
 									<th width="10%" rowspan="2">'.get_lang('FirstName').'</th>
92 92
 									<th width="10%" rowspan="2">'.get_lang('LastName').'</th>
93 93
 									<th width="30%" colspan="2">'.get_lang('CourseInformation').'</th>
@@ -97,146 +97,146 @@  discard block
 block discarded – undo
97 97
 									<th width="10%">'.get_lang('Time').'</th>
98 98
 								</tr>';
99 99
 
100
-	 		$i = 1;
101
-	 		foreach ($students as $student) {
100
+                $i = 1;
101
+                foreach ($students as $student) {
102 102
 
103
-	 			$courses_by_user = CourseManager::get_courses_list_by_user_id($student['user_id'], true);
104
-	 			$count_courses = count($courses_by_user);
105
-				$rowspan = $count_courses?$count_courses+1:2;
103
+                    $courses_by_user = CourseManager::get_courses_list_by_user_id($student['user_id'], true);
104
+                    $count_courses = count($courses_by_user);
105
+                $rowspan = $count_courses?$count_courses+1:2;
106 106
 
107
-				if ($i%2 == 0) {
107
+                if ($i%2 == 0) {
108 108
                     $style = ' style="background-color:#F2F2F2" ';
109 109
                 } else {
110 110
                     $style = ' style="background-color:#FFF" ';
111 111
                 }
112 112
 
113
-	 			$students_table .= '<tr '.$style.'>
113
+                    $students_table .= '<tr '.$style.'>
114 114
 										<td rowspan="'.$rowspan.'">'.$student['firstname'].'</td>
115 115
 										<td rowspan="'.$rowspan.'">'.$student['lastname'].'</td>
116 116
 									</tr>';
117 117
 
118
-	 			// courses information about the student
119
-	 			if (!empty($courses_by_user)) {
120
-		 			foreach ($courses_by_user as $course) {
121
-		 				$course_code = $course['code'];
122
-						$courseInfo = api_get_course_info($course_code);
123
-						$courseId = $courseInfo['real_id'];
124
-		 				$course_title = $course['title'];
125
-		 				$time = api_time_to_hms(Tracking :: get_time_spent_on_the_course($student['user_id'], $courseId));
126
-		 				$students_table .= '<tr '.$style.'>
118
+                    // courses information about the student
119
+                    if (!empty($courses_by_user)) {
120
+                        foreach ($courses_by_user as $course) {
121
+                            $course_code = $course['code'];
122
+                        $courseInfo = api_get_course_info($course_code);
123
+                        $courseId = $courseInfo['real_id'];
124
+                            $course_title = $course['title'];
125
+                            $time = api_time_to_hms(Tracking :: get_time_spent_on_the_course($student['user_id'], $courseId));
126
+                            $students_table .= '<tr '.$style.'>
127 127
 											<td align="right">'.$course_title.'</td>
128 128
 											<td align="right">'.$time.'</td>
129 129
 											</tr>';
130
-		 			}
131
-	 			} else {
132
-	 				$students_table .= '<tr '.$style.'>
130
+                        }
131
+                    } else {
132
+                        $students_table .= '<tr '.$style.'>
133 133
 											<td align="center" colspan="2"><i>'.get_lang('Empty').'</i></td>
134 134
 										</tr>';
135
-	 			}
136
-	 			$i++;
137
-	 		}
138
-	 		$students_table .= '</table>';
139
- 		} else {
140
- 			$students_table .= get_lang('ThereIsNoInformationAboutYourStudents');
141
- 		}
142
-
143
- 		$content .= $students_table;
144
-
145
- 		if (count($students) > 0) {
146
-			$content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin&display=useroverview">'.get_lang('SeeMore').'</a></div>';
147
-		}
148
-		//$content .= '</div>';
149
-
150
- 		return $content;
151
- 	}
152
-
153
-  	public function get_students_content_html_for_drh() {
154
-  		$attendance = new Attendance();
155
-  		$students = $this->students;
156
- 		//$content = '<div style="margin:5px;">';
157
- 		$content = '<h4>'.get_lang('YourStudents').'</h4>';
135
+                    }
136
+                    $i++;
137
+                }
138
+                $students_table .= '</table>';
139
+            } else {
140
+                $students_table .= get_lang('ThereIsNoInformationAboutYourStudents');
141
+            }
142
+
143
+            $content .= $students_table;
144
+
145
+            if (count($students) > 0) {
146
+            $content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin&display=useroverview">'.get_lang('SeeMore').'</a></div>';
147
+        }
148
+        //$content .= '</div>';
149
+
150
+            return $content;
151
+        }
152
+
153
+        public function get_students_content_html_for_drh() {
154
+            $attendance = new Attendance();
155
+            $students = $this->students;
156
+            //$content = '<div style="margin:5px;">';
157
+            $content = '<h4>'.get_lang('YourStudents').'</h4>';
158 158
         $students_table = null;
159
- 		if (count($students) > 0) {
160
-	 		$students_table .= '<table class="data_table">';
161
-	 		$students_table .= '<tr>
159
+            if (count($students) > 0) {
160
+                $students_table .= '<table class="data_table">';
161
+                $students_table .= '<tr>
162 162
 									<th>'.get_lang('User').'</th>
163 163
 									<th>'.get_lang('AttendancesFaults').'</th>
164 164
 									<th>'.get_lang('Evaluations').'</th>
165 165
 								</tr>';
166
-	 		$i = 1;
167
-	 		foreach ($students as $student) {
168
-
169
-	 			$student_id = $student['user_id'];
170
-	 			$firstname  = $student['firstname'];
171
-	 			$lastname   = $student['lastname'];
172
-	 			$username	= $student['username'];
173
-
174
-
175
-				// get average of faults in attendances by student
176
-	 			$results_faults_avg = $attendance->get_faults_average_inside_courses($student_id);
177
-	 			if (!empty($results_faults_avg)) {
178
-	 				$attendances_faults_avg = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.$results_faults_avg['faults'].'/'.$results_faults_avg['total'].' ('.$results_faults_avg['porcent'].'%)</a>';
179
-	 			} else {
180
-	 				$attendances_faults_avg = '0%';
181
-	 			}
182
-
183
-	 			$courses_by_user = CourseManager::get_courses_list_by_user_id($student_id, true);
184
-				$evaluations_avg  = 0;
185
-				$score = $weight = 0;
186
-	 			foreach ($courses_by_user as $course) {
187
-	 				$course_code = $course['code'];
188
-	 				$cats = Category::load(null, null, $course_code, null, null, null, false);
189
-	 				$scoretotal = array();
190
-	 				if (isset($cats) && isset($cats[0])) {
191
-		 				$scoretotal= $cats[0]->calc_score($student_id, null, $course_code);
192
-	 				}
193
-
194
-	 				if (!empty($scoretotal)) {
195
-	 					$score  += $scoretotal[0];
196
-	 					$weight += $scoretotal[1];
197
-	 				}
198
-	 			}
199
-
200
-	 			if (!empty($weight)) {
201
-	 				$evaluations_avg = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.round($score,2).'/'.round($weight,2).'('.round(($score / $weight) * 100,2) . ' %)</a>';
202
-	 			}
203
-
204
-	 			if ($i%2 == 0) {
166
+                $i = 1;
167
+                foreach ($students as $student) {
168
+
169
+                    $student_id = $student['user_id'];
170
+                    $firstname  = $student['firstname'];
171
+                    $lastname   = $student['lastname'];
172
+                    $username	= $student['username'];
173
+
174
+
175
+                // get average of faults in attendances by student
176
+                    $results_faults_avg = $attendance->get_faults_average_inside_courses($student_id);
177
+                    if (!empty($results_faults_avg)) {
178
+                        $attendances_faults_avg = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.$results_faults_avg['faults'].'/'.$results_faults_avg['total'].' ('.$results_faults_avg['porcent'].'%)</a>';
179
+                    } else {
180
+                        $attendances_faults_avg = '0%';
181
+                    }
182
+
183
+                    $courses_by_user = CourseManager::get_courses_list_by_user_id($student_id, true);
184
+                $evaluations_avg  = 0;
185
+                $score = $weight = 0;
186
+                    foreach ($courses_by_user as $course) {
187
+                        $course_code = $course['code'];
188
+                        $cats = Category::load(null, null, $course_code, null, null, null, false);
189
+                        $scoretotal = array();
190
+                        if (isset($cats) && isset($cats[0])) {
191
+                            $scoretotal= $cats[0]->calc_score($student_id, null, $course_code);
192
+                        }
193
+
194
+                        if (!empty($scoretotal)) {
195
+                            $score  += $scoretotal[0];
196
+                            $weight += $scoretotal[1];
197
+                        }
198
+                    }
199
+
200
+                    if (!empty($weight)) {
201
+                        $evaluations_avg = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.round($score,2).'/'.round($weight,2).'('.round(($score / $weight) * 100,2) . ' %)</a>';
202
+                    }
203
+
204
+                    if ($i%2 == 0) {
205 205
                     $class_tr = 'row_odd';
206 206
                 } else {
207 207
                     $class_tr = 'row_even';
208 208
                 }
209
-	    		$students_table .= '<tr class="'.$class_tr.'">
209
+                $students_table .= '<tr class="'.$class_tr.'">
210 210
 										<td>'.api_get_person_name($firstname, $lastname).' ('.$username.')</td>
211 211
 										<td>'.$attendances_faults_avg.'</td>
212 212
 										<td>'.$evaluations_avg.'</td>
213 213
 									</tr>';
214 214
 
215
-	 			$i++;
216
-	 		}
217
-	 		$students_table .= '</table>';
218
- 		} else {
219
- 			$students_table .= get_lang('ThereIsNoInformationAboutYourStudents');
220
- 		}
215
+                    $i++;
216
+                }
217
+                $students_table .= '</table>';
218
+            } else {
219
+                $students_table .= get_lang('ThereIsNoInformationAboutYourStudents');
220
+            }
221 221
 
222
-  		$content .= $students_table;
222
+            $content .= $students_table;
223 223
 
224
- 		if (count($students) > 0) {
225
-			$content .= '<div style="text-align:right;margin-top:10px;">
224
+            if (count($students) > 0) {
225
+            $content .= '<div style="text-align:right;margin-top:10px;">
226 226
                             <a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin&display=yourstudents">'.get_lang('SeeMore').'</a>
227 227
                          </div>';
228
-		}
229
-		//$content .= '</div>';
228
+        }
229
+        //$content .= '</div>';
230 230
 
231
-  		return $content;
232
-  	}
231
+            return $content;
232
+        }
233 233
 
234 234
     /**
235
-	 * Get number of students
236
-	 * @return int
237
-	 */
238
-	function get_number_of_students()
235
+     * Get number of students
236
+     * @return int
237
+     */
238
+    function get_number_of_students()
239 239
     {
240
-		return count($this->students);
241
-	}
240
+        return count($this->students);
241
+    }
242 242
 }
Please login to merge, or discard this patch.