Completed
Pull Request — 1.11.x (#1593)
by José
27:44
created
main/gradebook/lib/be/learnpathlink.class.php 4 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
 
96 96
 	/**
97 97
 	 * Get the progress of this learnpath. Only the last attempt are taken into account.
98
-	 * @param $stud_id student id (default: all students who have results - then the average is returned)
98
+	 * @param integer $stud_id student id (default: all students who have results - then the average is returned)
99 99
 	 * @return	array (score, max) if student is given
100 100
 	 * 			array (sum of scores, number of scores) otherwise
101 101
 	 * 			or null if no scores available
Please login to merge, or discard this patch.
Braces   +12 added lines, -8 removed lines patch added patch discarded remove patch
@@ -29,8 +29,9 @@  discard block
 block discarded – undo
29 29
 	public function get_not_created_links()
30 30
 	{
31 31
 		return false;
32
-		if (empty($this->course_code))
33
-			die('Error in get_not_created_links() : course code not set');
32
+		if (empty($this->course_code)) {
33
+					die('Error in get_not_created_links() : course code not set');
34
+		}
34 35
 
35 36
 		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
36 37
 
@@ -57,8 +58,9 @@  discard block
 block discarded – undo
57 58
 	 */
58 59
 	public function get_all_links()
59 60
 	{
60
-		if (empty($this->course_code))
61
-			die('Error in get_not_created_links() : course code not set');
61
+		if (empty($this->course_code)) {
62
+					die('Error in get_not_created_links() : course code not set');
63
+		}
62 64
 
63 65
 		$session_id = api_get_session_id();
64 66
 		if (empty($session_id)) {
@@ -111,8 +113,9 @@  discard block
 block discarded – undo
111 113
                     lp_id = ".$this->get_ref_id()." AND
112 114
                     session_id = $session_id ";
113 115
 
114
-		if (isset($stud_id))
115
-			$sql .= ' AND user_id = '.intval($stud_id);
116
+		if (isset($stud_id)) {
117
+					$sql .= ' AND user_id = '.intval($stud_id);
118
+		}
116 119
 
117 120
 		// order by id, that way the student's first attempt is accessed first
118 121
 		$sql .= ' ORDER BY view_count DESC';
@@ -122,8 +125,9 @@  discard block
 block discarded – undo
122 125
 		if (isset($stud_id)) {
123 126
 			if ($data = Database::fetch_array($scores)) {
124 127
 				return array ($data['progress'], 100);
125
-			} else
126
-				return null;
128
+			} else {
129
+							return null;
130
+			}
127 131
 		} else {
128 132
 			// all students -> get average
129 133
 			$students = array();  // user list, needed to make sure we only
Please login to merge, or discard this patch.
Indentation   +243 added lines, -243 removed lines patch added patch discarded remove patch
@@ -9,261 +9,261 @@
 block discarded – undo
9 9
  */
10 10
 class LearnpathLink extends AbstractLink
11 11
 {
12
-	private $course_info = null;
13
-	private $learnpath_table = null;
14
-	private $learnpath_data = null;
15
-
16
-	/**
17
-	 * Constructor
18
-	 */
19
-	public function __construct()
20
-	{
21
-		parent::__construct();
22
-		$this->set_type(LINK_LEARNPATH);
23
-	}
24
-
25
-	/**
26
-	 * Generate an array of learnpaths that a teacher hasn't created a link for.
27
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
28
-	 */
29
-	public function get_not_created_links()
30
-	{
31
-		return false;
32
-		if (empty($this->course_code))
33
-			die('Error in get_not_created_links() : course code not set');
34
-
35
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
36
-
37
-		$sql = 'SELECT id, name from '.$this->get_learnpath_table().' lp
12
+    private $course_info = null;
13
+    private $learnpath_table = null;
14
+    private $learnpath_data = null;
15
+
16
+    /**
17
+     * Constructor
18
+     */
19
+    public function __construct()
20
+    {
21
+        parent::__construct();
22
+        $this->set_type(LINK_LEARNPATH);
23
+    }
24
+
25
+    /**
26
+     * Generate an array of learnpaths that a teacher hasn't created a link for.
27
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
28
+     */
29
+    public function get_not_created_links()
30
+    {
31
+        return false;
32
+        if (empty($this->course_code))
33
+            die('Error in get_not_created_links() : course code not set');
34
+
35
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
36
+
37
+        $sql = 'SELECT id, name from '.$this->get_learnpath_table().' lp
38 38
 				WHERE c_id = '.$this->course_id.' AND id NOT IN '
39
-			.' (SELECT ref_id FROM '.$tbl_grade_links
40
-			.' WHERE type = '.LINK_LEARNPATH
41
-			." AND course_code = '".$this->get_course_code()."'"
42
-			.') AND lp.session_id='.api_get_session_id().'';
43
-
44
-		$result = Database::query($sql);
45
-
46
-		$cats=array();
47
-		while ($data=Database::fetch_array($result)) {
48
-			$cats[] = array ($data['id'], $data['name']);
49
-		}
50
-
51
-		return $cats;
52
-	}
53
-
54
-	/**
55
-	 * Generate an array of all learnpaths available.
56
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
57
-	 */
58
-	public function get_all_links()
59
-	{
60
-		if (empty($this->course_code))
61
-			die('Error in get_not_created_links() : course code not set');
62
-
63
-		$session_id = api_get_session_id();
64
-		if (empty($session_id)) {
65
-			$session_condition = api_get_session_condition(0, true);
66
-		} else {
67
-			$session_condition = api_get_session_condition($session_id, true, true);
68
-		}
69
-
70
-		$sql = 'SELECT id, name FROM '.$this->get_learnpath_table().'
39
+            .' (SELECT ref_id FROM '.$tbl_grade_links
40
+            .' WHERE type = '.LINK_LEARNPATH
41
+            ." AND course_code = '".$this->get_course_code()."'"
42
+            .') AND lp.session_id='.api_get_session_id().'';
43
+
44
+        $result = Database::query($sql);
45
+
46
+        $cats=array();
47
+        while ($data=Database::fetch_array($result)) {
48
+            $cats[] = array ($data['id'], $data['name']);
49
+        }
50
+
51
+        return $cats;
52
+    }
53
+
54
+    /**
55
+     * Generate an array of all learnpaths available.
56
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
57
+     */
58
+    public function get_all_links()
59
+    {
60
+        if (empty($this->course_code))
61
+            die('Error in get_not_created_links() : course code not set');
62
+
63
+        $session_id = api_get_session_id();
64
+        if (empty($session_id)) {
65
+            $session_condition = api_get_session_condition(0, true);
66
+        } else {
67
+            $session_condition = api_get_session_condition($session_id, true, true);
68
+        }
69
+
70
+        $sql = 'SELECT id, name FROM '.$this->get_learnpath_table().'
71 71
                 WHERE c_id = '.$this->course_id.' '.$session_condition.' ';
72
-		$result = Database::query($sql);
72
+        $result = Database::query($sql);
73 73
 
74
-		$cats = array();
75
-		while ($data=Database::fetch_array($result)) {
76
-			$cats[] = array ($data['id'], $data['name']);
77
-		}
74
+        $cats = array();
75
+        while ($data=Database::fetch_array($result)) {
76
+            $cats[] = array ($data['id'], $data['name']);
77
+        }
78 78
 
79
-		return $cats;
80
-	}
79
+        return $cats;
80
+    }
81 81
 
82 82
 
83
-	/**
84
-	 * Has anyone used this learnpath yet ?
85
-	 */
86
-	public function has_results()
87
-	{
88
-		$tbl_stats = Database::get_course_table(TABLE_LP_VIEW);
89
-		$sql = "SELECT count(id) AS number FROM $tbl_stats
83
+    /**
84
+     * Has anyone used this learnpath yet ?
85
+     */
86
+    public function has_results()
87
+    {
88
+        $tbl_stats = Database::get_course_table(TABLE_LP_VIEW);
89
+        $sql = "SELECT count(id) AS number FROM $tbl_stats
90 90
 				WHERE c_id = ".$this->course_id." AND lp_id = ".$this->get_ref_id();
91
-		$result = Database::query($sql);
92
-		$number = Database::fetch_array($result,'NUM');
93
-		return ($number[0] != 0);
94
-	}
95
-
96
-	/**
97
-	 * Get the progress of this learnpath. Only the last attempt are taken into account.
98
-	 * @param $stud_id student id (default: all students who have results - then the average is returned)
99
-	 * @return	array (score, max) if student is given
100
-	 * 			array (sum of scores, number of scores) otherwise
101
-	 * 			or null if no scores available
102
-	 */
103
-	public function calc_score($stud_id = null, $type = null)
104
-	{
105
-		$tbl_stats = Database::get_course_table(TABLE_LP_VIEW);
106
-		$session_id = api_get_session_id();
107
-
108
-		$sql = "SELECT * FROM $tbl_stats
91
+        $result = Database::query($sql);
92
+        $number = Database::fetch_array($result,'NUM');
93
+        return ($number[0] != 0);
94
+    }
95
+
96
+    /**
97
+     * Get the progress of this learnpath. Only the last attempt are taken into account.
98
+     * @param $stud_id student id (default: all students who have results - then the average is returned)
99
+     * @return	array (score, max) if student is given
100
+     * 			array (sum of scores, number of scores) otherwise
101
+     * 			or null if no scores available
102
+     */
103
+    public function calc_score($stud_id = null, $type = null)
104
+    {
105
+        $tbl_stats = Database::get_course_table(TABLE_LP_VIEW);
106
+        $session_id = api_get_session_id();
107
+
108
+        $sql = "SELECT * FROM $tbl_stats
109 109
                 WHERE
110 110
                 	c_id = ".$this->course_id." AND
111 111
                     lp_id = ".$this->get_ref_id()." AND
112 112
                     session_id = $session_id ";
113 113
 
114
-		if (isset($stud_id))
115
-			$sql .= ' AND user_id = '.intval($stud_id);
116
-
117
-		// order by id, that way the student's first attempt is accessed first
118
-		$sql .= ' ORDER BY view_count DESC';
119
-
120
-		$scores = Database::query($sql);
121
-		// for 1 student
122
-		if (isset($stud_id)) {
123
-			if ($data = Database::fetch_assoc($scores)) {
124
-				return array ($data['progress'], 100);
125
-			} else
126
-				return null;
127
-		} else {
128
-			// all students -> get average
129
-			$students = array();  // user list, needed to make sure we only
130
-			// take first attempts into account
131
-			$rescount = 0;
132
-			$sum = 0;
133
-			$bestResult = 0;
134
-			$sumResult = 0;
135
-			while ($data = Database::fetch_array($scores)) {
136
-				if (!(array_key_exists($data['user_id'], $students))) {
137
-					$students[$data['user_id']] = $data['progress'];
138
-					$rescount++;
139
-					$sum += $data['progress'] / 100;
140
-					$sumResult += $data['progress'];
141
-
142
-					if ($data['progress'] > $bestResult) {
143
-						$bestResult = $data['progress'];
144
-					}
145
-				}
146
-			}
147
-
148
-			if ($rescount == 0) {
149
-				return null;
150
-			} else {
151
-
152
-				switch ($type) {
153
-					case 'best':
154
-						return array($bestResult, 100);
155
-						break;
156
-					case 'average':
157
-						return array($sumResult/$rescount, 100);
158
-						break;
159
-					case 'ranking':
160
-						return AbstractLink::getCurrentUserRanking($stud_id, $students);
161
-						break;
162
-					default:
163
-						return array($sum, $rescount);
164
-						break;
165
-				}
166
-			}
167
-		}
168
-	}
169
-
170
-	/**
171
-	 * Get URL where to go to if the user clicks on the link.
172
-	 */
173
-	public function get_link()
174
-	{
175
-		$session_id = api_get_session_id();
176
-		$url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?'.api_get_cidreq_params($this->get_course_code(), $session_id).'&gradebook=view';
177
-
178
-		if (!api_is_allowed_to_edit() || $this->calc_score(api_get_user_id()) == null) {
179
-			$url .= '&action=view&lp_id='.$this->get_ref_id();
180
-		} else {
181
-			$url .= '&action=build&lp_id='.$this->get_ref_id();
182
-		}
183
-		return $url;
184
-	}
185
-
186
-	/**
187
-	 * Get name to display: same as learnpath title
188
-	 */
189
-	public function get_name()
190
-	{
191
-		$data = $this->get_learnpath_data();
192
-		return $data['name'];
193
-	}
194
-
195
-	/**
196
-	 * Get description to display: same as learnpath description
197
-	 */
198
-	public function get_description()
199
-	{
200
-		$data = $this->get_learnpath_data();
201
-		return $data['description'];
202
-	}
203
-
204
-	/**
205
-	 * Check if this still links to a learnpath
206
-	 */
207
-	public function is_valid_link() {
208
-		$sql = 'SELECT count(id) FROM '.$this->get_learnpath_table().'
114
+        if (isset($stud_id))
115
+            $sql .= ' AND user_id = '.intval($stud_id);
116
+
117
+        // order by id, that way the student's first attempt is accessed first
118
+        $sql .= ' ORDER BY view_count DESC';
119
+
120
+        $scores = Database::query($sql);
121
+        // for 1 student
122
+        if (isset($stud_id)) {
123
+            if ($data = Database::fetch_assoc($scores)) {
124
+                return array ($data['progress'], 100);
125
+            } else
126
+                return null;
127
+        } else {
128
+            // all students -> get average
129
+            $students = array();  // user list, needed to make sure we only
130
+            // take first attempts into account
131
+            $rescount = 0;
132
+            $sum = 0;
133
+            $bestResult = 0;
134
+            $sumResult = 0;
135
+            while ($data = Database::fetch_array($scores)) {
136
+                if (!(array_key_exists($data['user_id'], $students))) {
137
+                    $students[$data['user_id']] = $data['progress'];
138
+                    $rescount++;
139
+                    $sum += $data['progress'] / 100;
140
+                    $sumResult += $data['progress'];
141
+
142
+                    if ($data['progress'] > $bestResult) {
143
+                        $bestResult = $data['progress'];
144
+                    }
145
+                }
146
+            }
147
+
148
+            if ($rescount == 0) {
149
+                return null;
150
+            } else {
151
+
152
+                switch ($type) {
153
+                    case 'best':
154
+                        return array($bestResult, 100);
155
+                        break;
156
+                    case 'average':
157
+                        return array($sumResult/$rescount, 100);
158
+                        break;
159
+                    case 'ranking':
160
+                        return AbstractLink::getCurrentUserRanking($stud_id, $students);
161
+                        break;
162
+                    default:
163
+                        return array($sum, $rescount);
164
+                        break;
165
+                }
166
+            }
167
+        }
168
+    }
169
+
170
+    /**
171
+     * Get URL where to go to if the user clicks on the link.
172
+     */
173
+    public function get_link()
174
+    {
175
+        $session_id = api_get_session_id();
176
+        $url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?'.api_get_cidreq_params($this->get_course_code(), $session_id).'&gradebook=view';
177
+
178
+        if (!api_is_allowed_to_edit() || $this->calc_score(api_get_user_id()) == null) {
179
+            $url .= '&action=view&lp_id='.$this->get_ref_id();
180
+        } else {
181
+            $url .= '&action=build&lp_id='.$this->get_ref_id();
182
+        }
183
+        return $url;
184
+    }
185
+
186
+    /**
187
+     * Get name to display: same as learnpath title
188
+     */
189
+    public function get_name()
190
+    {
191
+        $data = $this->get_learnpath_data();
192
+        return $data['name'];
193
+    }
194
+
195
+    /**
196
+     * Get description to display: same as learnpath description
197
+     */
198
+    public function get_description()
199
+    {
200
+        $data = $this->get_learnpath_data();
201
+        return $data['description'];
202
+    }
203
+
204
+    /**
205
+     * Check if this still links to a learnpath
206
+     */
207
+    public function is_valid_link() {
208
+        $sql = 'SELECT count(id) FROM '.$this->get_learnpath_table().'
209 209
                 WHERE c_id = '.$this->course_id.' AND id = '.$this->get_ref_id().' ';
210
-		$result = Database::query($sql);
211
-		$number = Database::fetch_row($result,'NUM');
212
-		return ($number[0] != 0);
213
-	}
214
-
215
-	public function get_type_name()
216
-	{
217
-		return get_lang('LearningPaths');
218
-	}
219
-
220
-	public function needs_name_and_description()
221
-	{
222
-		return false;
223
-	}
224
-
225
-	public function needs_max()
226
-	{
227
-		return false;
228
-	}
229
-
230
-	public function needs_results()
231
-	{
232
-		return false;
233
-	}
234
-
235
-	public function is_allowed_to_change_name()
236
-	{
237
-		return false;
238
-	}
239
-
240
-	// INTERNAL FUNCTIONS
241
-
242
-	/**
243
-	 * Lazy load function to get the database table of the learnpath
244
-	 */
245
-	private function get_learnpath_table()
246
-	{
247
-		$this->learnpath_table = Database :: get_course_table(TABLE_LP_MAIN);
248
-		return $this->learnpath_table;
249
-	}
250
-
251
-	/**
252
-	 * Lazy load function to get the database contents of this learnpath
253
-	 */
254
-	private function get_learnpath_data()
255
-	{
256
-		if (!isset($this->learnpath_data)) {
257
-			$sql = 'SELECT * FROM '.$this->get_learnpath_table().'
210
+        $result = Database::query($sql);
211
+        $number = Database::fetch_row($result,'NUM');
212
+        return ($number[0] != 0);
213
+    }
214
+
215
+    public function get_type_name()
216
+    {
217
+        return get_lang('LearningPaths');
218
+    }
219
+
220
+    public function needs_name_and_description()
221
+    {
222
+        return false;
223
+    }
224
+
225
+    public function needs_max()
226
+    {
227
+        return false;
228
+    }
229
+
230
+    public function needs_results()
231
+    {
232
+        return false;
233
+    }
234
+
235
+    public function is_allowed_to_change_name()
236
+    {
237
+        return false;
238
+    }
239
+
240
+    // INTERNAL FUNCTIONS
241
+
242
+    /**
243
+     * Lazy load function to get the database table of the learnpath
244
+     */
245
+    private function get_learnpath_table()
246
+    {
247
+        $this->learnpath_table = Database :: get_course_table(TABLE_LP_MAIN);
248
+        return $this->learnpath_table;
249
+    }
250
+
251
+    /**
252
+     * Lazy load function to get the database contents of this learnpath
253
+     */
254
+    private function get_learnpath_data()
255
+    {
256
+        if (!isset($this->learnpath_data)) {
257
+            $sql = 'SELECT * FROM '.$this->get_learnpath_table().'
258 258
                     WHERE c_id = '.$this->course_id.' AND id = '.$this->get_ref_id().' ';
259
-			$result = Database::query($sql);
260
-			$this->learnpath_data = Database::fetch_array($result);
261
-		}
262
-		return $this->learnpath_data;
263
-	}
264
-
265
-	public function get_icon_name()
266
-	{
267
-		return 'learnpath';
268
-	}
259
+            $result = Database::query($sql);
260
+            $this->learnpath_data = Database::fetch_array($result);
261
+        }
262
+        return $this->learnpath_data;
263
+    }
264
+
265
+    public function get_icon_name()
266
+    {
267
+        return 'learnpath';
268
+    }
269 269
 }
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -43,9 +43,9 @@  discard block
 block discarded – undo
43 43
 
44 44
 		$result = Database::query($sql);
45 45
 
46
-		$cats=array();
47
-		while ($data=Database::fetch_array($result)) {
48
-			$cats[] = array ($data['id'], $data['name']);
46
+		$cats = array();
47
+		while ($data = Database::fetch_array($result)) {
48
+			$cats[] = array($data['id'], $data['name']);
49 49
 		}
50 50
 
51 51
 		return $cats;
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
72 72
 		$result = Database::query($sql);
73 73
 
74 74
 		$cats = array();
75
-		while ($data=Database::fetch_array($result)) {
76
-			$cats[] = array ($data['id'], $data['name']);
75
+		while ($data = Database::fetch_array($result)) {
76
+			$cats[] = array($data['id'], $data['name']);
77 77
 		}
78 78
 
79 79
 		return $cats;
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 		$sql = "SELECT count(id) AS number FROM $tbl_stats
90 90
 				WHERE c_id = ".$this->course_id." AND lp_id = ".$this->get_ref_id();
91 91
 		$result = Database::query($sql);
92
-		$number = Database::fetch_array($result,'NUM');
92
+		$number = Database::fetch_array($result, 'NUM');
93 93
 		return ($number[0] != 0);
94 94
 	}
95 95
 
@@ -121,12 +121,12 @@  discard block
 block discarded – undo
121 121
 		// for 1 student
122 122
 		if (isset($stud_id)) {
123 123
 			if ($data = Database::fetch_assoc($scores)) {
124
-				return array ($data['progress'], 100);
124
+				return array($data['progress'], 100);
125 125
 			} else
126 126
 				return null;
127 127
 		} else {
128 128
 			// all students -> get average
129
-			$students = array();  // user list, needed to make sure we only
129
+			$students = array(); // user list, needed to make sure we only
130 130
 			// take first attempts into account
131 131
 			$rescount = 0;
132 132
 			$sum = 0;
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 						return array($bestResult, 100);
155 155
 						break;
156 156
 					case 'average':
157
-						return array($sumResult/$rescount, 100);
157
+						return array($sumResult / $rescount, 100);
158 158
 						break;
159 159
 					case 'ranking':
160 160
 						return AbstractLink::getCurrentUserRanking($stud_id, $students);
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 	public function get_link()
174 174
 	{
175 175
 		$session_id = api_get_session_id();
176
-		$url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?'.api_get_cidreq_params($this->get_course_code(), $session_id).'&gradebook=view';
176
+		$url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq_params($this->get_course_code(), $session_id).'&gradebook=view';
177 177
 
178 178
 		if (!api_is_allowed_to_edit() || $this->calc_score(api_get_user_id()) == null) {
179 179
 			$url .= '&action=view&lp_id='.$this->get_ref_id();
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 		$sql = 'SELECT count(id) FROM '.$this->get_learnpath_table().'
209 209
                 WHERE c_id = '.$this->course_id.' AND id = '.$this->get_ref_id().' ';
210 210
 		$result = Database::query($sql);
211
-		$number = Database::fetch_row($result,'NUM');
211
+		$number = Database::fetch_row($result, 'NUM');
212 212
 		return ($number[0] != 0);
213 213
 	}
214 214
 
Please login to merge, or discard this patch.
main/gradebook/lib/fe/gradebooktable.class.php 3 patches
Doc Comments   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,6 +32,8 @@  discard block
 block discarded – undo
32 32
      * @param array $evals
33 33
      * @param array $links
34 34
      * @param null $addparams
35
+     * @param boolean $showTeacherView
36
+     * @param integer $userId
35 37
      */
36 38
     public function __construct(
37 39
         $currentcat,
@@ -895,7 +897,7 @@  discard block
 block discarded – undo
895 897
 
896 898
     /**
897 899
      * @param $item
898
-     * @return mixed
900
+     * @return string|null
899 901
      */
900 902
     private function build_course_code($item)
901 903
     {
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -256,10 +256,11 @@
 block discarded – undo
256 256
         }
257 257
 
258 258
         // Categories.
259
-        if (!empty($data_array))
260
-        foreach ($data_array as $data) {
259
+        if (!empty($data_array)) {
260
+                foreach ($data_array as $data) {
261 261
             // list of items inside the gradebook (exercises, lps, forums, etc)
262 262
             $row  = array();
263
+        }
263 264
             /** @var AbstractLink $item */
264 265
             $item = $mainCategory = $data[0];
265 266
 
Please login to merge, or discard this patch.
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
             $this->set_additional_parameters($addparams);
72 72
         }
73 73
 
74
-        $column= 0;
74
+        $column = 0;
75 75
         if ($this->teacherView) {
76 76
             if ($this->exportToPdf == false) {
77 77
                 $this->set_header($column++, '', '', 'width="25px"');
@@ -281,13 +281,13 @@  discard block
 block discarded – undo
281 281
                 $main_categories[$item->get_id()]['name'] = $item->get_name();
282 282
             } else {
283 283
                 $name = $this->build_name_link($item, $type);
284
-                $row[] = $invisibility_span_open.$name. $invisibility_span_close;
284
+                $row[] = $invisibility_span_open.$name.$invisibility_span_close;
285 285
                 $main_categories[$item->get_id()]['name'] = $name;
286 286
             }
287 287
 
288 288
             $this->dataForGraph['categories'][] = $item->get_name();
289 289
 
290
-            $main_categories[$item->get_id()]['weight']= $item->get_weight();
290
+            $main_categories[$item->get_id()]['weight'] = $item->get_weight();
291 291
             $total_categories_weight += $item->get_weight();
292 292
 
293 293
             // Description.
@@ -307,9 +307,9 @@  discard block
 block discarded – undo
307 307
             );
308 308
 
309 309
             if ($this->teacherView) {
310
-                $row[] = $invisibility_span_open .Display::tag('p', $weight, array('class' => 'score')).$invisibility_span_close;
310
+                $row[] = $invisibility_span_open.Display::tag('p', $weight, array('class' => 'score')).$invisibility_span_close;
311 311
             } else {
312
-                $row[] = $invisibility_span_open .$weight.$invisibility_span_close;
312
+                $row[] = $invisibility_span_open.$weight.$invisibility_span_close;
313 313
             }
314 314
 
315 315
             $category_weight = $item->get_weight();
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
 
336 336
                 if (!empty($score[1])) {
337 337
                     $completeScore = $scoredisplay->display_score($score, SCORE_DIV_PERCENT);
338
-                    $score = $score[0]/$score[1]*$item->get_weight();
338
+                    $score = $score[0] / $score[1] * $item->get_weight();
339 339
                     $score = $scoredisplay->display_score(array($score, null), SCORE_SIMPLE);
340 340
                     $scoreToDisplay = Display::tip($score, $completeScore);
341 341
                 } else {
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
                     $totalResultAverageValue = strip_tags($scoredisplay->display_score($totalResult, SCORE_AVERAGE));
372 372
                     $this->dataForGraph['my_result'][] = str_replace('%', '', $totalResultAverageValue);
373 373
                     $totalAverageValue = strip_tags($scoredisplay->display_score($totalAverage, SCORE_AVERAGE));
374
-                    $this->dataForGraph['average'][] =  str_replace('%', '', $totalAverageValue);
374
+                    $this->dataForGraph['average'][] = str_replace('%', '', $totalAverageValue);
375 375
                     // Ranking
376 376
                     $row[] = $ranking;
377 377
                     // Best
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
                         $row[] = $this->build_type_column($item, array('style' => 'padding-left:5px'));
454 454
 
455 455
                         // Name.
456
-                        $row[] = $invisibility_span_open."     ".$this->build_name_link($item, $type) . $invisibility_span_close;
456
+                        $row[] = $invisibility_span_open."     ".$this->build_name_link($item, $type).$invisibility_span_close;
457 457
 
458 458
                         // Description.
459 459
                         if ($this->exportToPdf == false) {
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
491 491
                             // Students get the results and certificates columns
492 492
                             $eval_n_links = array_merge($alleval, $alllink);
493 493
 
494
-                            if (count($eval_n_links)> 0) {
494
+                            if (count($eval_n_links) > 0) {
495 495
                                 $value_data = isset($data[4]) ? $data[4] : null;
496 496
 
497 497
                                 if (!is_null($value_data)) {
@@ -589,7 +589,7 @@  discard block
 block discarded – undo
589 589
                 $row = array(
590 590
                     null,
591 591
                     null,
592
-                    '<strong>' . get_lang('Total') . '</strong>',
592
+                    '<strong>'.get_lang('Total').'</strong>',
593 593
                     null,
594 594
                     $total
595 595
                 );
@@ -659,7 +659,7 @@  discard block
 block discarded – undo
659 659
                 if ($this->exportToPdf) {
660 660
                     $row = array(
661 661
                         null,
662
-                        '<h3>' . get_lang('Total') . '</h3>',
662
+                        '<h3>'.get_lang('Total').'</h3>',
663 663
                         $main_weight,
664 664
                         $totalResult,
665 665
                         $totalRanking,
@@ -669,7 +669,7 @@  discard block
 block discarded – undo
669 669
                 } else {
670 670
                     $row = array(
671 671
                         null,
672
-                        '<h3>' . get_lang('Total') . '</h3>',
672
+                        '<h3>'.get_lang('Total').'</h3>',
673 673
                         null,
674 674
                         $main_weight,
675 675
                         $totalResult,
@@ -684,7 +684,7 @@  discard block
 block discarded – undo
684 684
         }
685 685
 
686 686
         // Warning messages
687
-        $view = isset($_GET['view']) ? $_GET['view']: null;
687
+        $view = isset($_GET['view']) ? $_GET['view'] : null;
688 688
 
689 689
         if ($this->teacherView) {
690 690
             if (isset($_GET['selectcat']) &&
@@ -695,14 +695,14 @@  discard block
 block discarded – undo
695 695
                 $category = Category::load($id_cat);
696 696
                 $weight_category = intval($this->build_weight($category[0]));
697 697
                 $course_code = $this->build_course_code($category[0]);
698
-                $weight_total_links  = round($weight_total_links);
698
+                $weight_total_links = round($weight_total_links);
699 699
 
700 700
                 if ($weight_total_links > $weight_category ||
701 701
                     $weight_total_links < $weight_category ||
702 702
                     $weight_total_links > $weight_category
703 703
                 ) {
704 704
                     $warning_message = sprintf(get_lang('TotalWeightMustBeX'), $weight_category);
705
-                    $modify_icons  = '<a href="gradebook_edit_cat.php?editcat='.$id_cat.'&cidReq='.$course_code.'&id_session='.api_get_session_id().'">'.
705
+                    $modify_icons = '<a href="gradebook_edit_cat.php?editcat='.$id_cat.'&cidReq='.$course_code.'&id_session='.api_get_session_id().'">'.
706 706
                         Display::return_icon('edit.png', $warning_message, array(), ICON_SIZE_SMALL).'</a>';
707 707
                     $warning_message .= $modify_icons;
708 708
                     Display::display_warning_message($warning_message, false);
@@ -757,7 +757,7 @@  discard block
 block discarded – undo
757 757
                         if (empty($certificate_min_score) ||
758 758
                             ($certificate_min_score > $weight_category)
759 759
                         ) {
760
-                            $warning_message .= $course_code .'&nbsp;-&nbsp;'.get_lang('CertificateMinimunScoreIsRequiredAndMustNotBeMoreThan').'&nbsp;'.$weight_category.'<br />';
760
+                            $warning_message .= $course_code.'&nbsp;-&nbsp;'.get_lang('CertificateMinimunScoreIsRequiredAndMustNotBeMoreThan').'&nbsp;'.$weight_category.'<br />';
761 761
                         }
762 762
                     }
763 763
 
@@ -806,12 +806,12 @@  discard block
 block discarded – undo
806 806
             $pChart->Antialias = false;
807 807
 
808 808
             /* Add a border to the picture */
809
-            $pChart->drawRectangle(0,0,$xSize-10,$ySize-10,array("R"=>0,"G"=>0,"B"=>0));
810
-            $pChart->drawText(10,16,get_lang('Results'),array("FontSize"=>11,"Align"=> TEXT_ALIGN_BOTTOMMIDDLE));
811
-            $pChart->setGraphArea(50, 30, $xSize-50, $ySize-50);
809
+            $pChart->drawRectangle(0, 0, $xSize - 10, $ySize - 10, array("R"=>0, "G"=>0, "B"=>0));
810
+            $pChart->drawText(10, 16, get_lang('Results'), array("FontSize"=>11, "Align"=> TEXT_ALIGN_BOTTOMMIDDLE));
811
+            $pChart->setGraphArea(50, 30, $xSize - 50, $ySize - 50);
812 812
             $pChart->setFontProperties(
813 813
                 array(
814
-                    'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
814
+                    'FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
815 815
                     'FontSize' => 10,
816 816
                 )
817 817
             );
@@ -859,13 +859,13 @@  discard block
 block discarded – undo
859 859
             $chartHash = $myCache->getHash($dataSet);
860 860
 
861 861
             $myCache->writeToCache($chartHash, $pChart);
862
-            $imgSysPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
862
+            $imgSysPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
863 863
             $myCache->saveFromCache($chartHash, $imgSysPath);
864
-            $imgWebPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
864
+            $imgWebPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
865 865
 
866 866
             if (file_exists($imgSysPath)) {
867 867
                 $result = '<div id="contentArea" style="text-align: center;" >';
868
-                $result .= '<img src="' . $imgWebPath.'" >';
868
+                $result .= '<img src="'.$imgWebPath.'" >';
869 869
                 $result .= '</div>';
870 870
                 return $result;
871 871
             }
@@ -910,13 +910,13 @@  discard block
 block discarded – undo
910 910
         switch ($item->get_item_type()) {
911 911
             // category
912 912
             case 'C':
913
-                return 'CATE' . $item->get_id();
913
+                return 'CATE'.$item->get_id();
914 914
             // evaluation
915 915
             case 'E':
916
-                return 'EVAL' . $item->get_id();
916
+                return 'EVAL'.$item->get_id();
917 917
             // link
918 918
             case 'L':
919
-                return 'LINK' . $item->get_id();
919
+                return 'LINK'.$item->get_id();
920 920
         }
921 921
     }
922 922
 
@@ -944,11 +944,11 @@  discard block
 block discarded – undo
944 944
         switch ($item->get_item_type()) {
945 945
             // category
946 946
             case 'C':
947
-                $prms_uri='?selectcat=' . $item->get_id() . '&amp;view='.$view;
947
+                $prms_uri = '?selectcat='.$item->get_id().'&amp;view='.$view;
948 948
 
949 949
                 if (isset($_GET['isStudentView'])) {
950
-                    if ( isset($is_student) || (isset($_SESSION['studentview']) && $_SESSION['studentview']=='studentview') ) {
951
-                        $prms_uri=$prms_uri.'&amp;isStudentView='.Security::remove_XSS($_GET['isStudentView']);
950
+                    if (isset($is_student) || (isset($_SESSION['studentview']) && $_SESSION['studentview'] == 'studentview')) {
951
+                        $prms_uri = $prms_uri.'&amp;isStudentView='.Security::remove_XSS($_GET['isStudentView']);
952 952
                     }
953 953
                 }
954 954
 
@@ -957,7 +957,7 @@  discard block
 block discarded – undo
957 957
                 return '&nbsp;<a href="'.Security::remove_XSS($_SESSION['gradebook_dest']).$prms_uri.'">'
958 958
                 . $item->get_name()
959 959
                 . '</a>'
960
-                . ($item->is_course() ? ' &nbsp;[' . $item->get_course_code() . ']'.$show_message : '');
960
+                . ($item->is_course() ? ' &nbsp;['.$item->get_course_code().']'.$show_message : '');
961 961
                 // evaluation
962 962
             case 'E':
963 963
                 $cat = new Category();
@@ -965,10 +965,10 @@  discard block
 block discarded – undo
965 965
                 $show_message = $cat->show_message_resource_delete($course_id);
966 966
 
967 967
                 // course/platform admin can go to the view_results page
968
-                if (api_is_allowed_to_edit() && $show_message===false) {
968
+                if (api_is_allowed_to_edit() && $show_message === false) {
969 969
                     if ($item->get_type() == 'presence') {
970 970
                         return '&nbsp;'
971
-                        . '<a href="gradebook_view_result.php?cidReq='.$course_id.'&amp;selecteval=' . $item->get_id() . '">'
971
+                        . '<a href="gradebook_view_result.php?cidReq='.$course_id.'&amp;selecteval='.$item->get_id().'">'
972 972
                         . $item->get_name()
973 973
                         . '</a>';
974 974
                     } else {
@@ -977,20 +977,20 @@  discard block
 block discarded – undo
977 977
                             $extra = '';
978 978
                         }
979 979
                         return '&nbsp;'
980
-                        . '<a href="gradebook_view_result.php?' . api_get_cidreq() . '&selecteval=' . $item->get_id() . '">'
980
+                        . '<a href="gradebook_view_result.php?'.api_get_cidreq().'&selecteval='.$item->get_id().'">'
981 981
                         . $item->get_name()
982 982
                         . '</a>&nbsp;'.$extra;
983 983
                     }
984
-                } elseif (ScoreDisplay :: instance()->is_custom() && $show_message===false) {
984
+                } elseif (ScoreDisplay :: instance()->is_custom() && $show_message === false) {
985 985
                     // students can go to the statistics page (if custom display enabled)
986 986
                     return '&nbsp;'
987
-                    . '<a href="gradebook_statistics.php?' . api_get_cidreq() . '&selecteval=' . $item->get_id() . '">'
987
+                    . '<a href="gradebook_statistics.php?'.api_get_cidreq().'&selecteval='.$item->get_id().'">'
988 988
                     . $item->get_name()
989 989
                     . '</a>';
990 990
 
991 991
                 } elseif ($show_message === false && !api_is_allowed_to_edit() && !ScoreDisplay :: instance()->is_custom()) {
992 992
                     return '&nbsp;'
993
-                    . '<a href="gradebook_statistics.php?' . api_get_cidreq() . '&selecteval=' . $item->get_id() . '">'
993
+                    . '<a href="gradebook_statistics.php?'.api_get_cidreq().'&selecteval='.$item->get_id().'">'
994 994
                     . $item->get_name()
995 995
                     . '</a>';
996 996
                 } else {
@@ -1005,7 +1005,7 @@  discard block
 block discarded – undo
1005 1005
                 $url = $item->get_link();
1006 1006
 
1007 1007
                 if (isset($url) && $show_message === false) {
1008
-                    $text = '&nbsp;<a href="' . $item->get_link() . '">'
1008
+                    $text = '&nbsp;<a href="'.$item->get_link().'">'
1009 1009
                         . $item->get_name()
1010 1010
                         . '</a>';
1011 1011
                 } else {
Please login to merge, or discard this patch.
main/inc/lib/diagnoser.lib.php 4 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -351,6 +351,12 @@
 block discarded – undo
351 351
 
352 352
     /**
353 353
      * Additional functions needed for fast integration
354
+     * @param integer $status
355
+     * @param string $section
356
+     * @param string $title
357
+     * @param string $url
358
+     * @param string|null $formatter
359
+     * @param string $comment
354 360
      */
355 361
     public function build_setting($status, $section, $title, $url, $current_value, $expected_value, $formatter, $comment, $img_path = null) {
356 362
         switch ($status) {
Please login to merge, or discard this patch.
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -401,19 +401,19 @@
 block discarded – undo
401 401
 
402 402
     public function format_yes_no_optional($value)
403 403
     {
404
-    	$return = '';
405
-    	switch($value) {
406
-     		case 0:
407
-     			$return = get_lang('No');
408
-     			break;
409
-     		case 1:
410
-     			$return = get_lang('Yes');
411
-     			break;
412
-			case 2:
413
-				$return = get_lang('Optional');
414
-				break;
415
-    	}
416
-    	return $return;
404
+        $return = '';
405
+        switch($value) {
406
+                case 0:
407
+                 $return = get_lang('No');
408
+                    break;
409
+                case 1:
410
+                 $return = get_lang('Yes');
411
+                    break;
412
+            case 2:
413
+                $return = get_lang('Optional');
414
+                break;
415
+        }
416
+        return $return;
417 417
 
418 418
     }
419 419
 
Please login to merge, or discard this patch.
Braces   +13 added lines, -9 removed lines patch added patch discarded remove patch
@@ -158,8 +158,9 @@  discard block
 block discarded – undo
158 158
         $array[] = $this->build_setting($status, '[INI]', 'display_errors', 'http://www.php.net/manual/en/ini.core.php#ini.display_errors', $setting, $req_setting, 'on_off', get_lang('DisplayErrorsInfo'));
159 159
 
160 160
         $setting = ini_get('default_charset');
161
-        if ($setting == '')
162
-            $setting = null;
161
+        if ($setting == '') {
162
+                    $setting = null;
163
+        }
163 164
         $req_setting = null;
164 165
         $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_ERROR;
165 166
         $array[] = $this->build_setting($status, '[INI]', 'default_charset', 'http://www.php.net/manual/en/ini.core.php#ini.default-charset', $setting, $req_setting, null, get_lang('DefaultCharsetInfo'));
@@ -177,22 +178,25 @@  discard block
 block discarded – undo
177 178
         $setting = ini_get('memory_limit');
178 179
         $req_setting = '>= '.REQUIRED_MIN_MEMORY_LIMIT.'M';
179 180
         $status = self :: STATUS_ERROR;
180
-        if ((float)$setting >= REQUIRED_MIN_MEMORY_LIMIT)
181
-            $status = self :: STATUS_OK;
181
+        if ((float)$setting >= REQUIRED_MIN_MEMORY_LIMIT) {
182
+                    $status = self :: STATUS_OK;
183
+        }
182 184
         $array[] = $this->build_setting($status, '[INI]', 'memory_limit', 'http://www.php.net/manual/en/ini.core.php#ini.memory-limit', $setting, $req_setting, null, get_lang('MemoryLimitInfo'));
183 185
 
184 186
         $setting = ini_get('post_max_size');
185 187
         $req_setting = '>= '.REQUIRED_MIN_POST_MAX_SIZE.'M';
186 188
         $status = self :: STATUS_ERROR;
187
-        if ((float)$setting >= REQUIRED_MIN_POST_MAX_SIZE)
188
-            $status = self :: STATUS_OK;
189
+        if ((float)$setting >= REQUIRED_MIN_POST_MAX_SIZE) {
190
+                    $status = self :: STATUS_OK;
191
+        }
189 192
         $array[] = $this->build_setting($status, '[INI]', 'post_max_size', 'http://www.php.net/manual/en/ini.core.php#ini.post-max-size', $setting, $req_setting, null, get_lang('PostMaxSizeInfo'));
190 193
 
191 194
         $setting = ini_get('upload_max_filesize');
192 195
         $req_setting = '>= '.REQUIRED_MIN_UPLOAD_MAX_FILESIZE.'M';
193 196
         $status = self :: STATUS_ERROR;
194
-        if ((float)$setting >= REQUIRED_MIN_UPLOAD_MAX_FILESIZE)
195
-            $status = self :: STATUS_OK;
197
+        if ((float)$setting >= REQUIRED_MIN_UPLOAD_MAX_FILESIZE) {
198
+                    $status = self :: STATUS_OK;
199
+        }
196 200
         $array[] = $this->build_setting($status, '[INI]', 'upload_max_filesize', 'http://www.php.net/manual/en/ini.core.php#ini.upload_max_filesize', $setting, $req_setting, null, get_lang('UploadMaxFilesizeInfo'));
197 201
 
198 202
         $setting = ini_get('variables_order');
@@ -205,7 +209,7 @@  discard block
 block discarded – undo
205 209
         $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_WARNING;
206 210
         $array[] = $this->build_setting($status, '[SESSION]', 'session.gc_maxlifetime', 'http://www.php.net/manual/en/ini.core.php#session.gc-maxlifetime', $setting, $req_setting, null, get_lang('SessionGCMaxLifetimeInfo'));
207 211
 
208
-        if (api_check_browscap()){$setting = true;}else{$setting=false;}
212
+        if (api_check_browscap()){$setting = true;} else{$setting=false;}
209 213
         $req_setting = true;
210 214
         $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_WARNING;
211 215
         $array[] = $this->build_setting($status, '[INI]', 'browscap', 'http://www.php.net/manual/en/misc.configuration.php#ini.browscap', $setting, $req_setting, 'on_off', get_lang('BrowscapInfo'));
Please login to merge, or discard this patch.
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 {
16 16
     const STATUS_OK = 1;
17 17
     const STATUS_WARNING = 2;
18
-    const STATUS_ERROR 	= 3;
18
+    const STATUS_ERROR = 3;
19 19
     const STATUS_INFORMATION = 4;
20 20
 
21 21
     /**
@@ -42,12 +42,12 @@  discard block
 block discarded – undo
42 42
                 $html .= '<li>';
43 43
             }
44 44
             $params['section'] = $section;
45
-            $html .='<a href="system_status.php?section='.$section.'">'.get_lang($section).'</a></li>';
45
+            $html .= '<a href="system_status.php?section='.$section.'">'.get_lang($section).'</a></li>';
46 46
         }
47 47
 
48 48
         $html .= '</ul><div class="tab-pane">';
49 49
 
50
-        $data = call_user_func(array($this, 'get_' . $currentSection . '_data'));
50
+        $data = call_user_func(array($this, 'get_'.$currentSection.'_data'));
51 51
         echo $html;
52 52
 
53 53
         if ($currentSection != 'paths') {
@@ -114,11 +114,11 @@  discard block
 block discarded – undo
114 114
     {
115 115
         $array = array();
116 116
         $writable_folders = array(
117
-            api_get_path(SYS_APP_PATH) .'cache',
117
+            api_get_path(SYS_APP_PATH).'cache',
118 118
             api_get_path(SYS_COURSE_PATH),
119
-            api_get_path(SYS_APP_PATH) .'home',
120
-            api_get_path(SYS_APP_PATH) .'upload/users/',
121
-            api_get_path(SYS_PATH) .'main/default_course_document/images/',
119
+            api_get_path(SYS_APP_PATH).'home',
120
+            api_get_path(SYS_APP_PATH).'upload/users/',
121
+            api_get_path(SYS_PATH).'main/default_course_document/images/',
122 122
         );
123 123
         foreach ($writable_folders as $index => $folder) {
124 124
             $writable = is_writable($folder);
@@ -137,10 +137,10 @@  discard block
 block discarded – undo
137 137
 
138 138
         $exists = file_exists(api_get_path(SYS_CODE_PATH).'install');
139 139
         $status = $exists ? self :: STATUS_WARNING : self :: STATUS_OK;
140
-        $array[] = $this->build_setting($status, '[FILES]', get_lang('DirectoryExists') . ': /install', 'http://be2.php.net/file_exists', $exists, 0, 'yes_no', get_lang('DirectoryShouldBeRemoved'));
140
+        $array[] = $this->build_setting($status, '[FILES]', get_lang('DirectoryExists').': /install', 'http://be2.php.net/file_exists', $exists, 0, 'yes_no', get_lang('DirectoryShouldBeRemoved'));
141 141
 
142 142
         $app_version = api_get_setting('chamilo_database_version');
143
-        $array[] = $this->build_setting(self :: STATUS_INFORMATION, '[DB]', 'chamilo_database_version', '#', $app_version, 0, null,  'Chamilo DB version');
143
+        $array[] = $this->build_setting(self :: STATUS_INFORMATION, '[DB]', 'chamilo_database_version', '#', $app_version, 0, null, 'Chamilo DB version');
144 144
 
145 145
         $access_url_id = api_get_current_access_url_id();
146 146
 
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
                     $message2 .= get_lang('SpaceUsedOnSystemCannotBeMeasuredOnWindows');
153 153
                 } else {
154 154
                     $dir = api_get_path(SYS_PATH);
155
-                    $du = exec('du -sh ' . $dir, $err);
155
+                    $du = exec('du -sh '.$dir, $err);
156 156
                     list($size, $none) = explode("\t", $du);
157 157
                     $limit = $_configuration[$access_url_id]['hosting_limit_disk_space'];
158 158
                     $message2 .= sprintf(get_lang('TotalSpaceUsedByPortalXLimitIsYMB'), $size, $limit);
@@ -236,33 +236,33 @@  discard block
 block discarded – undo
236 236
         $array[] = $this->build_setting($status, '[INI]', 'default_charset', 'http://www.php.net/manual/en/ini.core.php#ini.default-charset', $setting, $req_setting, null, get_lang('DefaultCharsetInfo'));
237 237
 
238 238
         $setting = ini_get('max_execution_time');
239
-        $req_setting = '300 (' . get_lang('Minimum') . ')';
239
+        $req_setting = '300 ('.get_lang('Minimum').')';
240 240
         $status = $setting >= 300 ? self :: STATUS_OK : self :: STATUS_WARNING;
241 241
         $array[] = $this->build_setting($status, '[INI]', 'max_execution_time', 'http://www.php.net/manual/en/ini.core.php#ini.max-execution-time', $setting, $req_setting, null, get_lang('MaxExecutionTimeInfo'));
242 242
 
243 243
         $setting = ini_get('max_input_time');
244
-        $req_setting = '300 (' . get_lang('Minimum') . ')';
244
+        $req_setting = '300 ('.get_lang('Minimum').')';
245 245
         $status = $setting >= 300 ? self :: STATUS_OK : self :: STATUS_WARNING;
246 246
         $array[] = $this->build_setting($status, '[INI]', 'max_input_time', 'http://www.php.net/manual/en/ini.core.php#ini.max-input-time', $setting, $req_setting, null, get_lang('MaxInputTimeInfo'));
247 247
 
248 248
         $setting = ini_get('memory_limit');
249 249
         $req_setting = '>= '.REQUIRED_MIN_MEMORY_LIMIT.'M';
250 250
         $status = self :: STATUS_ERROR;
251
-        if ((float)$setting >= REQUIRED_MIN_MEMORY_LIMIT)
251
+        if ((float) $setting >= REQUIRED_MIN_MEMORY_LIMIT)
252 252
             $status = self :: STATUS_OK;
253 253
         $array[] = $this->build_setting($status, '[INI]', 'memory_limit', 'http://www.php.net/manual/en/ini.core.php#ini.memory-limit', $setting, $req_setting, null, get_lang('MemoryLimitInfo'));
254 254
 
255 255
         $setting = ini_get('post_max_size');
256 256
         $req_setting = '>= '.REQUIRED_MIN_POST_MAX_SIZE.'M';
257 257
         $status = self :: STATUS_ERROR;
258
-        if ((float)$setting >= REQUIRED_MIN_POST_MAX_SIZE)
258
+        if ((float) $setting >= REQUIRED_MIN_POST_MAX_SIZE)
259 259
             $status = self :: STATUS_OK;
260 260
         $array[] = $this->build_setting($status, '[INI]', 'post_max_size', 'http://www.php.net/manual/en/ini.core.php#ini.post-max-size', $setting, $req_setting, null, get_lang('PostMaxSizeInfo'));
261 261
 
262 262
         $setting = ini_get('upload_max_filesize');
263 263
         $req_setting = '>= '.REQUIRED_MIN_UPLOAD_MAX_FILESIZE.'M';
264 264
         $status = self :: STATUS_ERROR;
265
-        if ((float)$setting >= REQUIRED_MIN_UPLOAD_MAX_FILESIZE)
265
+        if ((float) $setting >= REQUIRED_MIN_UPLOAD_MAX_FILESIZE)
266 266
             $status = self :: STATUS_OK;
267 267
         $array[] = $this->build_setting($status, '[INI]', 'upload_max_filesize', 'http://www.php.net/manual/en/ini.core.php#ini.upload_max_filesize', $setting, $req_setting, null, get_lang('UploadMaxFilesizeInfo'));
268 268
 
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
         $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_WARNING;
277 277
         $array[] = $this->build_setting($status, '[SESSION]', 'session.gc_maxlifetime', 'http://www.php.net/manual/en/ini.core.php#session.gc-maxlifetime', $setting, $req_setting, null, get_lang('SessionGCMaxLifetimeInfo'));
278 278
 
279
-        if (api_check_browscap()){$setting = true;}else{$setting=false;}
279
+        if (api_check_browscap()) {$setting = true; } else {$setting = false; }
280 280
         $req_setting = true;
281 281
         $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_WARNING;
282 282
         $array[] = $this->build_setting($status, '[INI]', 'browscap', 'http://www.php.net/manual/en/misc.configuration.php#ini.browscap', $setting, $req_setting, 'on_off', get_lang('BrowscapInfo'));
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
 
333 333
             $loaded = extension_loaded($extension);
334 334
             $status = $loaded ? self :: STATUS_OK : self :: STATUS_ERROR;
335
-            $array[] = $this->build_setting($status, '[EXTENSION]', get_lang('LoadedExtension') . ': ' . $extension, $url, $loaded, $expected_value, 'yes_no_optional', $comment);
335
+            $array[] = $this->build_setting($status, '[EXTENSION]', get_lang('LoadedExtension').': '.$extension, $url, $loaded, $expected_value, 'yes_no_optional', $comment);
336 336
         }
337 337
 
338 338
         return $array;
@@ -455,9 +455,9 @@  discard block
 block discarded – undo
455 455
         $formatted_expected_value = $expected_value;
456 456
 
457 457
         if ($formatter) {
458
-            if (method_exists($this, 'format_' . $formatter)) {
459
-                $formatted_current_value = call_user_func(array($this, 'format_' . $formatter), $current_value);
460
-                $formatted_expected_value = call_user_func(array($this, 'format_' . $formatter), $expected_value);
458
+            if (method_exists($this, 'format_'.$formatter)) {
459
+                $formatted_current_value = call_user_func(array($this, 'format_'.$formatter), $current_value);
460
+                $formatted_expected_value = call_user_func(array($this, 'format_'.$formatter), $expected_value);
461 461
             }
462 462
         }
463 463
 
@@ -472,13 +472,13 @@  discard block
 block discarded – undo
472 472
      */
473 473
     public function get_link($title, $url)
474 474
     {
475
-        return '<a href="' . $url . '" target="about:bank">' . $title . '</a>';
475
+        return '<a href="'.$url.'" target="about:bank">'.$title.'</a>';
476 476
     }
477 477
 
478 478
     public function format_yes_no_optional($value)
479 479
     {
480 480
     	$return = '';
481
-    	switch($value) {
481
+    	switch ($value) {
482 482
      		case 0:
483 483
      			$return = get_lang('No');
484 484
      			break;
Please login to merge, or discard this patch.
main/inc/lib/exercise.lib.php 2 patches
Doc Comments   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1255,6 +1255,7 @@  discard block
 block discarded – undo
1255 1255
 
1256 1256
     /**
1257 1257
      * Validates the time control key
1258
+     * @param integer $exercise_id
1258 1259
      */
1259 1260
     public static function exercise_time_control_is_valid(
1260 1261
         $exercise_id,
@@ -1388,7 +1389,7 @@  discard block
 block discarded – undo
1388 1389
      * @param int $in_direction
1389 1390
      * @param string $in_hotpot_path
1390 1391
      * @param bool $in_get_count
1391
-     * @param null $where_condition
1392
+     * @param string $where_condition
1392 1393
      * @return array|int
1393 1394
      */
1394 1395
     public static function get_exam_results_hotpotatoes_data(
@@ -2179,7 +2180,7 @@  discard block
 block discarded – undo
2179 2180
     /**
2180 2181
      * Return true if pass_pourcentage activated (we use the pass pourcentage feature
2181 2182
      * return false if pass_percentage = 0 (we don't use the pass pourcentage feature
2182
-     * @param $in_pass_pourcentage
2183
+     * @param string $in_pass_pourcentage
2183 2184
      * @return boolean
2184 2185
      * In this version, pass_percentage and show_success_message are disabled if
2185 2186
      * pass_percentage is set to 0
@@ -2192,7 +2193,7 @@  discard block
 block discarded – undo
2192 2193
     /**
2193 2194
      * Converts a numeric value in a percentage example 0.66666 to 66.67 %
2194 2195
      * @param $value
2195
-     * @return float Converted number
2196
+     * @return string Converted number
2196 2197
      */
2197 2198
     public static function convert_to_percentage($value)
2198 2199
     {
@@ -2208,7 +2209,7 @@  discard block
 block discarded – undo
2208 2209
      * @param   float $score
2209 2210
      * @param   float $weight
2210 2211
      * @deprecated seem not to be used
2211
-     * @return  float   the score rounded converted to the new range
2212
+     * @return  string|null   the score rounded converted to the new range
2212 2213
      */
2213 2214
     public static function convert_score($score, $weight)
2214 2215
     {
@@ -2759,6 +2760,7 @@  discard block
 block discarded – undo
2759 2760
      * @param    int        exercise id
2760 2761
      * @param    int    $courseId
2761 2762
      * @param    int        session id
2763
+     * @param integer $user_count
2762 2764
      * @return    float    Best average score
2763 2765
      */
2764 2766
     public static function get_best_average_score_by_exercise(
@@ -3198,8 +3200,9 @@  discard block
 block discarded – undo
3198 3200
     }
3199 3201
 
3200 3202
     /**
3201
-     * @param array $answer
3203
+     * @param string|null $answer
3202 3204
      * @param string $user_answer
3205
+     * @param string|null $current_answer
3203 3206
      * @return array
3204 3207
      */
3205 3208
     public static function check_fill_in_blanks($answer, $user_answer, $current_answer)
@@ -3805,7 +3808,7 @@  discard block
 block discarded – undo
3805 3808
 
3806 3809
     /**
3807 3810
      * @param int $countLetter
3808
-     * @return mixed
3811
+     * @return string
3809 3812
      */
3810 3813
     public static function detectInputAppropriateClass($countLetter)
3811 3814
     {
Please login to merge, or discard this patch.
Spacing   +115 added lines, -115 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
                 if ($show_title) {
67 67
                     TestCategory::displayCategoryAndTitle($objQuestionTmp->id);
68 68
                     echo Display::div(
69
-                        $current_item . '. ' . $objQuestionTmp->selectTitle(),
69
+                        $current_item.'. '.$objQuestionTmp->selectTitle(),
70 70
                         array('class' => 'question_title')
71 71
                     );
72 72
                 }
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
                         <div class="clearfix">
111 111
                         <ul class="exercise-draggable-answer ui-helper-reset ui-helper-clearfix list-inline">';
112 112
                 } else {
113
-                    $s .= '<div id="drag' . $questionId . '_question" class="drag_question">
113
+                    $s .= '<div id="drag'.$questionId.'_question" class="drag_question">
114 114
                            <table class="data_table">';
115 115
                 }
116 116
 
@@ -157,12 +157,12 @@  discard block
 block discarded – undo
157 157
             } elseif ($answerType == FREE_ANSWER) {
158 158
                 $fck_content = isset($user_choice[0]) && !empty($user_choice[0]['answer']) ? $user_choice[0]['answer'] : null;
159 159
 
160
-                $form = new FormValidator('free_choice_' . $questionId);
160
+                $form = new FormValidator('free_choice_'.$questionId);
161 161
                 $config = array(
162 162
                     'ToolbarSet' => 'TestFreeAnswer'
163 163
                 );
164
-                $form->addHtmlEditor("choice[" . $questionId . "]", null, false, false, $config);
165
-                $form->setDefaults(array("choice[" . $questionId . "]" => $fck_content));
164
+                $form->addHtmlEditor("choice[".$questionId."]", null, false, false, $config);
165
+                $form->setDefaults(array("choice[".$questionId."]" => $fck_content));
166 166
                 $s .= $form->returnForm();
167 167
             } elseif ($answerType == ORAL_EXPRESSION) {
168 168
                 // Add nanog
@@ -189,11 +189,11 @@  discard block
 block discarded – undo
189 189
                     echo $objQuestionTmp->returnRecorder();
190 190
                 }
191 191
 
192
-                $form = new FormValidator('free_choice_' . $questionId);
192
+                $form = new FormValidator('free_choice_'.$questionId);
193 193
                 $config = array(
194 194
                     'ToolbarSet' => 'TestFreeAnswer'
195 195
                 );
196
-                $form->addHtmlEditor("choice[" . $questionId . "]", null, false, false, $config);
196
+                $form->addHtmlEditor("choice[".$questionId."]", null, false, false, $config);
197 197
                 //$form->setDefaults(array("choice[" . $questionId . "]" => $fck_content));
198 198
                 $s .= $form->returnForm();
199 199
             }
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
                     case UNIQUE_ANSWER_NO_OPTION:
279 279
                         //no break
280 280
                     case UNIQUE_ANSWER_IMAGE:
281
-                        $input_id = 'choice-' . $questionId . '-' . $answerId;
281
+                        $input_id = 'choice-'.$questionId.'-'.$answerId;
282 282
 
283 283
                         if (isset($user_choice[0]['answer']) && $user_choice[0]['answer'] == $numAnswer) {
284 284
                             $attributes = array(
@@ -304,14 +304,14 @@  discard block
 block discarded – undo
304 304
                         if ($answerType == UNIQUE_ANSWER_IMAGE) {
305 305
                             if ($show_comment) {
306 306
                                 if (empty($comment)) {
307
-                                    $s .= '<div id="answer' . $questionId . $numAnswer . '" '
307
+                                    $s .= '<div id="answer'.$questionId.$numAnswer.'" '
308 308
                                         . 'class="exercise-unique-answer-image" style="text-align: center">';
309 309
                                 } else {
310
-                                    $s .= '<div id="answer' . $questionId . $numAnswer . '" '
310
+                                    $s .= '<div id="answer'.$questionId.$numAnswer.'" '
311 311
                                         . 'class="exercise-unique-answer-image col-xs-6 col-sm-12" style="text-align: center">';
312 312
                                 }
313 313
                             } else {
314
-                                $s .= '<div id="answer' . $questionId . $numAnswer . '" '
314
+                                $s .= '<div id="answer'.$questionId.$numAnswer.'" '
315 315
                                     . 'class="exercise-unique-answer-image col-xs-6 col-md-3" style="text-align: center">';
316 316
                             }
317 317
                         }
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
 
321 321
                         $s .= Display::input(
322 322
                             'hidden',
323
-                            'choice2[' . $questionId . ']',
323
+                            'choice2['.$questionId.']',
324 324
                             '0'
325 325
                         );
326 326
 
@@ -328,13 +328,13 @@  discard block
 block discarded – undo
328 328
 
329 329
                         if ($answerType == UNIQUE_ANSWER_IMAGE) {
330 330
                             $attributes['style'] = 'display: none;';
331
-                            $answer = '<div class="thumbnail">' . $answer . '</div>';
331
+                            $answer = '<div class="thumbnail">'.$answer.'</div>';
332 332
                         }
333 333
 
334 334
                         $answer_input .= '<label class="radio">';
335 335
                         $answer_input .= Display::input(
336 336
                             'radio',
337
-                            'choice[' . $questionId . ']',
337
+                            'choice['.$questionId.']',
338 338
                             $numAnswer,
339 339
                             $attributes
340 340
                         );
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
                     case MULTIPLE_ANSWER_TRUE_FALSE:
362 362
                         //no break
363 363
                     case GLOBAL_MULTIPLE_ANSWER:
364
-                        $input_id = 'choice-' . $questionId . '-' . $answerId;
364
+                        $input_id = 'choice-'.$questionId.'-'.$answerId;
365 365
                         $answer = Security::remove_XSS($answer, STUDENT);
366 366
 
367 367
                         if (in_array($numAnswer, $user_choice_array)) {
@@ -382,12 +382,12 @@  discard block
 block discarded – undo
382 382
                         }
383 383
 
384 384
                         if ($answerType == MULTIPLE_ANSWER || $answerType == GLOBAL_MULTIPLE_ANSWER) {
385
-                            $s .= '<input type="hidden" name="choice2[' . $questionId . ']" value="0" />';
385
+                            $s .= '<input type="hidden" name="choice2['.$questionId.']" value="0" />';
386 386
 
387 387
                             $answer_input = '<label class="checkbox">';
388 388
                             $answer_input .= Display::input(
389 389
                                 'checkbox',
390
-                                'choice[' . $questionId . '][' . $numAnswer . ']',
390
+                                'choice['.$questionId.']['.$numAnswer.']',
391 391
                                 $numAnswer,
392 392
                                 $attributes
393 393
                             );
@@ -440,7 +440,7 @@  discard block
 block discarded – undo
440 440
                                         'td',
441 441
                                         Display::input(
442 442
                                             'radio',
443
-                                            'choice[' . $questionId . '][' . $numAnswer . ']',
443
+                                            'choice['.$questionId.']['.$numAnswer.']',
444 444
                                             $id,
445 445
                                             $attributes
446 446
                                         ),
@@ -459,7 +459,7 @@  discard block
 block discarded – undo
459 459
                         break;
460 460
                     case MULTIPLE_ANSWER_COMBINATION:
461 461
                         // multiple answers
462
-                        $input_id = 'choice-' . $questionId . '-' . $answerId;
462
+                        $input_id = 'choice-'.$questionId.'-'.$answerId;
463 463
 
464 464
                         if (in_array($numAnswer, $user_choice_array)) {
465 465
                             $attributes = array(
@@ -479,11 +479,11 @@  discard block
 block discarded – undo
479 479
                         }
480 480
 
481 481
                         $answer = Security::remove_XSS($answer, STUDENT);
482
-                        $answer_input = '<input type="hidden" name="choice2[' . $questionId . ']" value="0" />';
482
+                        $answer_input = '<input type="hidden" name="choice2['.$questionId.']" value="0" />';
483 483
                         $answer_input .= '<label class="checkbox">';
484 484
                         $answer_input .= Display::input(
485 485
                             'checkbox',
486
-                            'choice[' . $questionId . '][' . $numAnswer . ']',
486
+                            'choice['.$questionId.']['.$numAnswer.']',
487 487
                             1,
488 488
                             $attributes
489 489
                         );
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
                         }
505 505
                         break;
506 506
                     case MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE:
507
-                        $s .= '<input type="hidden" name="choice2[' . $questionId . ']" value="0" />';
507
+                        $s .= '<input type="hidden" name="choice2['.$questionId.']" value="0" />';
508 508
 
509 509
                         $my_choice = array();
510 510
                         if (!empty($user_choice_array)) {
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
539 539
                                 'td',
540 540
                                 Display::input(
541 541
                                     'radio',
542
-                                    'choice[' . $questionId . '][' . $numAnswer . ']',
542
+                                    'choice['.$questionId.']['.$numAnswer.']',
543 543
                                     $key,
544 544
                                     $attributes
545 545
                                 )
@@ -596,7 +596,7 @@  discard block
 block discarded – undo
596 596
                                     // may be "" if student viewed the question, but did not fill the blanks
597 597
                                     $correctItem = $studentAnswerList[$i];
598 598
                                 }
599
-                                $attributes["style"] = "width:" . $listAnswerInformations["tabinputsize"][$i] . "px";
599
+                                $attributes["style"] = "width:".$listAnswerInformations["tabinputsize"][$i]."px";
600 600
                                 $answer .= FillBlanks::getFillTheBlankHtml($separatorStartRegexp, $separatorEndRegexp, $correctItemRegexp, $questionId, $correctItem, $attributes, $answer, $listAnswerInformations, $displayForStudent, $i);
601 601
                             }
602 602
                             // display the last common word
@@ -610,7 +610,7 @@  discard block
 block discarded – undo
610 610
                                 // display the common words
611 611
                                 $answer .= $listAnswerInformations["commonwords"][$i];
612 612
                                 // display the blank word
613
-                                $attributes["style"] = "width:" . $listAnswerInformations["tabinputsize"][$i] . "px";
613
+                                $attributes["style"] = "width:".$listAnswerInformations["tabinputsize"][$i]."px";
614 614
                                 $correctItem = $listAnswerInformations["tabwords"][$i];
615 615
                                 $correctItemRegexp = $correctItem;
616 616
                                 // replace / with \/ to allow the preg_replace bellow and all the regexp char
@@ -634,8 +634,8 @@  discard block
 block discarded – undo
634 634
                         if ($origin !== null) {
635 635
                             global $exe_id;
636 636
                             $trackAttempts = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
637
-                            $sql = 'SELECT answer FROM ' . $trackAttempts . '
638
-                                    WHERE exe_id=' . $exe_id . ' AND question_id=' . $questionId;
637
+                            $sql = 'SELECT answer FROM '.$trackAttempts.'
638
+                                    WHERE exe_id=' . $exe_id.' AND question_id='.$questionId;
639 639
                             $rsLastAttempt = Database::query($sql);
640 640
                             $rowLastAttempt = Database::fetch_array($rsLastAttempt);
641 641
                             $answer = $rowLastAttempt['answer'];
@@ -692,7 +692,7 @@  discard block
 block discarded – undo
692 692
                                     '',
693 693
                                     $answerCorrected
694 694
                                 );
695
-                                $answerCorrected = '[' . $answerCorrected . ']';
695
+                                $answerCorrected = '['.$answerCorrected.']';
696 696
                                 $studentAnswerList[] = $answerCorrected;
697 697
                             }
698 698
                         }
@@ -713,7 +713,7 @@  discard block
 block discarded – undo
713 713
                         */
714 714
                         $tabComments = api_preg_split(
715 715
                             '/\[[^]]+\]/',
716
-                            ' ' . $answer . ' '
716
+                            ' '.$answer.' '
717 717
                         );
718 718
                         if (!empty($correctAnswerList) && !empty($studentAnswerList)) {
719 719
                             $answer = "";
@@ -730,7 +730,7 @@  discard block
 block discarded – undo
730 730
                                     $size
731 731
                                 );
732 732
 
733
-                                $answer .= $tabComments[$i] .
733
+                                $answer .= $tabComments[$i].
734 734
                                     Display::input(
735 735
                                         'text',
736 736
                                         "choice[$questionId][]",
@@ -777,12 +777,12 @@  discard block
 block discarded – undo
777 777
                             $s .= '<tr><td width="45%" valign="top">';
778 778
                             $parsed_answer = $answer;
779 779
                             //left part questions
780
-                            $s .= '<p class="indent">' . $lines_count . '.&nbsp;' . $parsed_answer . '</p></td>';
780
+                            $s .= '<p class="indent">'.$lines_count.'.&nbsp;'.$parsed_answer.'</p></td>';
781 781
                             //middle part (matches selects)
782 782
 
783 783
                             $s .= '<td width="10%" valign="top" align="center" >
784 784
                                 <div class="select-matching">
785
-                                <select name="choice[' . $questionId . '][' . $numAnswer . ']">';
785
+                                <select name="choice[' . $questionId.']['.$numAnswer.']">';
786 786
 
787 787
                             // fills the list-box
788 788
                             foreach ($select_items as $key => $val) {
@@ -798,14 +798,14 @@  discard block
 block discarded – undo
798 798
                                 if (isset($user_choice_array_position[$numAnswer]) && $val['id'] == $user_choice_array_position[$numAnswer]) {
799 799
                                     $selected = 'selected="selected"';
800 800
                                 }
801
-                                $s .= '<option value="' . $val['id'] . '" ' . $selected . '>' . $val['letter'] . '</option>';
801
+                                $s .= '<option value="'.$val['id'].'" '.$selected.'>'.$val['letter'].'</option>';
802 802
 
803 803
                             }  // end foreach()
804 804
 
805 805
                             $s .= '</select></div></td><td width="5%" class="separate">&nbsp;</td>';
806 806
                             $s .= '<td width="40%" valign="top" >';
807 807
                             if (isset($select_items[$lines_count])) {
808
-                                $s .= '<div class="text-right"><p class="indent">' . $select_items[$lines_count]['letter'] . '.&nbsp; ' . $select_items[$lines_count]['answer'] . '</p></div>';
808
+                                $s .= '<div class="text-right"><p class="indent">'.$select_items[$lines_count]['letter'].'.&nbsp; '.$select_items[$lines_count]['answer'].'</p></div>';
809 809
                             } else {
810 810
                                 $s .= '&nbsp;';
811 811
                             }
@@ -820,7 +820,7 @@  discard block
 block discarded – undo
820 820
                                     $s .= '<tr>
821 821
                                       <td colspan="2"></td>
822 822
                                       <td valign="top">';
823
-                                    $s .= '<b>' . $select_items[$lines_count]['letter'] . '.</b> ' . $select_items[$lines_count]['answer'];
823
+                                    $s .= '<b>'.$select_items[$lines_count]['letter'].'.</b> '.$select_items[$lines_count]['answer'];
824 824
                                     $s .= "</td>
825 825
                                 </tr>";
826 826
                                     $lines_count++;
@@ -837,9 +837,9 @@  discard block
 block discarded – undo
837 837
                             $data = $objAnswerTmp->getAnswerByAutoId($data['correct']);
838 838
                             $lines_count = $data['answer'];*/
839 839
 
840
-                            $windowId = $questionId . '_' . $lines_count;
840
+                            $windowId = $questionId.'_'.$lines_count;
841 841
 
842
-                            $s .= '<li class="touch-items" id="' . $windowId . '">';
842
+                            $s .= '<li class="touch-items" id="'.$windowId.'">';
843 843
                             $s .= Display::div(
844 844
                                 $parsed_answer,
845 845
                                 [
@@ -897,7 +897,7 @@  discard block
 block discarded – undo
897 897
                                     Display::tag(
898 898
                                         'b',
899 899
                                         $select_items[$lines_count]['letter']
900
-                                    ) . $select_items[$lines_count]['answer'],
900
+                                    ).$select_items[$lines_count]['answer'],
901 901
                                     [
902 902
                                         'id' => "window_{$windowId}_answer",
903 903
                                         'style' => 'display: none;'
@@ -1068,7 +1068,7 @@  discard block
 block discarded – undo
1068 1068
 
1069 1069
                 for ($answerId = 1; $answerId <= $nbrAnswers; $answerId++) {
1070 1070
                     $answerCorrect = $objAnswerTmp->isCorrect($answerId);
1071
-                    $windowId = $questionId . '_' . $counterAnswer;
1071
+                    $windowId = $questionId.'_'.$counterAnswer;
1072 1072
 
1073 1073
                     if ($answerCorrect) {
1074 1074
                         $s .= Display::div(
@@ -1117,7 +1117,7 @@  discard block
 block discarded – undo
1117 1117
                 $course = api_get_course_info();
1118 1118
                 $doc_id = DocumentManager::get_document_id(
1119 1119
                     $course,
1120
-                    '/images/' . $pictureName
1120
+                    '/images/'.$pictureName
1121 1121
                 );
1122 1122
                 if (is_numeric($doc_id)) {
1123 1123
                     $images_folder_visibility = api_get_item_visibility(
@@ -1142,7 +1142,7 @@  discard block
 block discarded – undo
1142 1142
                 echo "
1143 1143
                     <script>
1144 1144
                         $(document).on('ready', function () {
1145
-                            new " . ($answerType == HOT_SPOT ? "HotspotQuestion" : "DelineationQuestion") . "({
1145
+                            new " . ($answerType == HOT_SPOT ? "HotspotQuestion" : "DelineationQuestion")."({
1146 1146
                                 questionId: $questionId,
1147 1147
                                 exerciseId: $exerciseId,
1148 1148
                                 selector: '#hotspot-preview-$questionId',
@@ -1176,7 +1176,7 @@  discard block
 block discarded – undo
1176 1176
             if ($answerType != HOT_SPOT_DELINEATION) {
1177 1177
                 $answerList = '
1178 1178
                     <div class="well well-sm">
1179
-                        <h5 class="page-header">' . get_lang('HotspotZones') . '</h5>
1179
+                        <h5 class="page-header">' . get_lang('HotspotZones').'</h5>
1180 1180
                         <ol>
1181 1181
                 ';
1182 1182
 
@@ -1201,7 +1201,7 @@  discard block
 block discarded – undo
1201 1201
             if (!$only_questions) {
1202 1202
                 if ($show_title) {
1203 1203
                     TestCategory::displayCategoryAndTitle($objQuestionTmp->id);
1204
-                    echo '<div class="question_title">' . $current_item . '. ' . $questionName . '</div>';
1204
+                    echo '<div class="question_title">'.$current_item.'. '.$questionName.'</div>';
1205 1205
                 }
1206 1206
                 //@todo I need to the get the feedback type
1207 1207
                 echo <<<HOTSPOT
@@ -1218,7 +1218,7 @@  discard block
 block discarded – undo
1218 1218
                                 <div class=\"hotspot-image\"></div>
1219 1219
                                 <script>
1220 1220
                                     $(document).on('ready', function () {
1221
-                                        new " . ($answerType == HOT_SPOT_DELINEATION ? 'DelineationQuestion' : 'HotspotQuestion') . "({
1221
+                                        new " . ($answerType == HOT_SPOT_DELINEATION ? 'DelineationQuestion' : 'HotspotQuestion')."({
1222 1222
                                             questionId: $questionId,
1223 1223
                                             exerciseId: $exe_id,
1224 1224
                                             selector: '#question_div_' + $questionId + ' .hotspot-image',
@@ -1339,11 +1339,11 @@  discard block
 block discarded – undo
1339 1339
         $lp_id = intval($lp_id);
1340 1340
         $lp_item_id = intval($lp_item_id);
1341 1341
         return
1342
-            api_get_course_int_id() . '_' .
1343
-            api_get_session_id() . '_' .
1344
-            $exercise_id . '_' .
1345
-            api_get_user_id() . '_' .
1346
-            $lp_id . '_' .
1342
+            api_get_course_int_id().'_'.
1343
+            api_get_session_id().'_'.
1344
+            $exercise_id.'_'.
1345
+            api_get_user_id().'_'.
1346
+            $lp_id.'_'.
1347 1347
             $lp_item_id;
1348 1348
     }
1349 1349
 
@@ -1457,14 +1457,14 @@  discard block
 block discarded – undo
1457 1457
         $res = Database::query($sql);
1458 1458
         $result = array();
1459 1459
         $apiIsAllowedToEdit = api_is_allowed_to_edit();
1460
-        $urlBase = api_get_path(WEB_CODE_PATH) .
1461
-            'exercise/hotpotatoes_exercise_report.php?action=delete&' .
1462
-            api_get_cidreq() . '&id=';
1460
+        $urlBase = api_get_path(WEB_CODE_PATH).
1461
+            'exercise/hotpotatoes_exercise_report.php?action=delete&'.
1462
+            api_get_cidreq().'&id=';
1463 1463
         while ($data = Database::fetch_array($res)) {
1464 1464
             $actions = null;
1465 1465
 
1466 1466
             if ($apiIsAllowedToEdit) {
1467
-                $url = $urlBase . $data['id'] . '&path=' . $data['exe_name'];
1467
+                $url = $urlBase.$data['id'].'&path='.$data['exe_name'];
1468 1468
                 $actions = Display::url(
1469 1469
                     Display::return_icon('delete.png', get_lang('Delete')),
1470 1470
                     $url
@@ -1480,7 +1480,7 @@  discard block
 block discarded – undo
1480 1480
                     GroupManager::get_user_group_name($data['user_id'])
1481 1481
                 ),
1482 1482
                 'exe_date' => $data['exe_date'],
1483
-                'score' => $data['exe_result'] . ' / ' . $data['exe_weighting'],
1483
+                'score' => $data['exe_result'].' / '.$data['exe_weighting'],
1484 1484
                 'actions' => $actions,
1485 1485
             );
1486 1486
         }
@@ -1564,18 +1564,18 @@  discard block
 block discarded – undo
1564 1564
         $TBL_TRACK_HOTPOTATOES = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
1565 1565
         $TBL_TRACK_ATTEMPT_RECORDING = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT_RECORDING);
1566 1566
 
1567
-        $session_id_and = ' AND te.session_id = ' . $sessionId . ' ';
1567
+        $session_id_and = ' AND te.session_id = '.$sessionId.' ';
1568 1568
         $exercise_id = intval($exercise_id);
1569 1569
 
1570 1570
         $exercise_where = '';
1571 1571
         if (!empty($exercise_id)) {
1572
-            $exercise_where .= ' AND te.exe_exo_id = ' . $exercise_id . '  ';
1572
+            $exercise_where .= ' AND te.exe_exo_id = '.$exercise_id.'  ';
1573 1573
         }
1574 1574
 
1575 1575
         $hotpotatoe_where = '';
1576 1576
         if (!empty($_GET['path'])) {
1577 1577
             $hotpotatoe_path = Database::escape_string($_GET['path']);
1578
-            $hotpotatoe_where .= ' AND exe_name = "' . $hotpotatoe_path . '"  ';
1578
+            $hotpotatoe_where .= ' AND exe_name = "'.$hotpotatoe_path.'"  ';
1579 1579
         }
1580 1580
 
1581 1581
         // sql for chamilo-type tests for teacher / tutor view
@@ -1587,7 +1587,7 @@  discard block
 block discarded – undo
1587 1587
             WHERE
1588 1588
                 c_id = $course_id AND
1589 1589
                 exe_exo_id = $exercise_id AND
1590
-                ttte.session_id = " . $sessionId . "
1590
+                ttte.session_id = ".$sessionId."
1591 1591
         )";
1592 1592
 
1593 1593
         if ($is_allowedToEdit) {
@@ -1610,9 +1610,9 @@  discard block
 block discarded – undo
1610 1610
                         g.id as group_id
1611 1611
                     FROM $TBL_USER u
1612 1612
                     INNER JOIN $TBL_GROUP_REL_USER gru
1613
-                    ON (gru.user_id = u.user_id AND gru.c_id=" . $course_id . ")
1613
+                    ON (gru.user_id = u.user_id AND gru.c_id=".$course_id.")
1614 1614
                     INNER JOIN $TBL_GROUP g
1615
-                    ON (gru.group_id = g.id AND g.c_id=" . $course_id . ")
1615
+                    ON (gru.group_id = g.id AND g.c_id=".$course_id.")
1616 1616
                 )";
1617 1617
             }
1618 1618
 
@@ -1673,9 +1673,9 @@  discard block
 block discarded – undo
1673 1673
                     g.id as group_id
1674 1674
                 FROM $TBL_USER u
1675 1675
                 LEFT OUTER JOIN $TBL_GROUP_REL_USER gru
1676
-                ON ( gru.user_id = u.user_id AND gru.c_id=" . $course_id . " )
1676
+                ON ( gru.user_id = u.user_id AND gru.c_id=".$course_id." )
1677 1677
                 LEFT OUTER JOIN $TBL_GROUP g
1678
-                ON (gru.group_id = g.id AND g.c_id = " . $course_id . ")
1678
+                ON (gru.group_id = g.id AND g.c_id = ".$course_id.")
1679 1679
             )";
1680 1680
             }
1681 1681
 
@@ -1688,12 +1688,12 @@  discard block
 block discarded – undo
1688 1688
             (
1689 1689
                 SELECT u.user_id, firstname, lastname, email, username, ' ' as group_name, '' as group_id, official_code
1690 1690
                 FROM $TBL_USER u
1691
-                WHERE u.status NOT IN(" . api_get_users_status_ignored_in_reports('string') . ")
1691
+                WHERE u.status NOT IN(".api_get_users_status_ignored_in_reports('string').")
1692 1692
             )";
1693 1693
             }
1694 1694
 
1695 1695
             $sqlFromOption = " , $TBL_GROUP_REL_USER AS gru ";
1696
-            $sqlWhereOption = "  AND gru.c_id = " . $course_id . " AND gru.user_id = user.user_id ";
1696
+            $sqlWhereOption = "  AND gru.c_id = ".$course_id." AND gru.user_id = user.user_id ";
1697 1697
             $first_and_last_name = api_is_western_name_order() ? "firstname, lastname" : "lastname, firstname";
1698 1698
 
1699 1699
             if ($get_count) {
@@ -1730,9 +1730,9 @@  discard block
 block discarded – undo
1730 1730
                 ON (user.user_id = exe_user_id)
1731 1731
                 WHERE
1732 1732
                     te.status != 'incomplete' AND
1733
-                    te.c_id = " . $course_id . " $session_id_and AND
1733
+                    te.c_id = ".$course_id." $session_id_and AND
1734 1734
                     ce.active <>-1 AND 
1735
-                    ce.c_id = " . $course_id . "
1735
+                    ce.c_id = ".$course_id."
1736 1736
                     $exercise_where
1737 1737
                     $extra_where_conditions
1738 1738
                 ";
@@ -1759,10 +1759,10 @@  discard block
 block discarded – undo
1759 1759
                     $sqlFromOption
1760 1760
                 WHERE
1761 1761
                     user.user_id=tth.exe_user_id
1762
-                    AND tth.c_id = " . $course_id . "
1762
+                    AND tth.c_id = ".$course_id."
1763 1763
                     $hotpotatoe_where
1764 1764
                     $sqlWhereOption
1765
-                    AND user.status NOT IN(" . api_get_users_status_ignored_in_reports('string') . ")
1765
+                    AND user.status NOT IN(".api_get_users_status_ignored_in_reports('string').")
1766 1766
                 ORDER BY
1767 1767
                     tth.c_id ASC,
1768 1768
                     tth.exe_date DESC";
@@ -1835,12 +1835,12 @@  discard block
 block discarded – undo
1835 1835
 
1836 1836
                     if ($from_gradebook && ($is_allowedToEdit)) {
1837 1837
                         if (in_array(
1838
-                            $results[$i]['username'] . $results[$i]['firstname'] . $results[$i]['lastname'],
1838
+                            $results[$i]['username'].$results[$i]['firstname'].$results[$i]['lastname'],
1839 1839
                             $users_array_id
1840 1840
                         )) {
1841 1841
                             continue;
1842 1842
                         }
1843
-                        $users_array_id[] = $results[$i]['username'] . $results[$i]['firstname'] . $results[$i]['lastname'];
1843
+                        $users_array_id[] = $results[$i]['username'].$results[$i]['firstname'].$results[$i]['lastname'];
1844 1844
                     }
1845 1845
 
1846 1846
                     $lp_obj = isset($results[$i]['orig_lp_id']) && isset($lp_list[$results[$i]['orig_lp_id']]) ? $lp_list[$results[$i]['orig_lp_id']] : null;
@@ -1849,7 +1849,7 @@  discard block
 block discarded – undo
1849 1849
                     if ($lp_obj) {
1850 1850
                         $url = api_get_path(
1851 1851
                                 WEB_CODE_PATH
1852
-                            ) . 'lp/lp_controller.php?' . api_get_cidreq() . '&action=view&lp_id=' . $results[$i]['orig_lp_id'];
1852
+                            ).'lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$results[$i]['orig_lp_id'];
1853 1853
                         $lp_name = Display::url(
1854 1854
                             $lp_obj['lp_name'],
1855 1855
                             $url,
@@ -1867,7 +1867,7 @@  discard block
 block discarded – undo
1867 1867
                         );
1868 1868
 
1869 1869
                         foreach ($group_list as $id) {
1870
-                            $group_name_list .= $clean_group_list[$id] . '<br/>';
1870
+                            $group_name_list .= $clean_group_list[$id].'<br/>';
1871 1871
                         }
1872 1872
                         $results[$i]['group_name'] = $group_name_list;
1873 1873
                     }
@@ -1923,7 +1923,7 @@  discard block
 block discarded – undo
1923 1923
                                 }
1924 1924
                             }
1925 1925
                             if ($revised) {
1926
-                                $actions .= "<a href='exercise_show.php?" . api_get_cidreq() . "&action=edit&id=$id'>" .
1926
+                                $actions .= "<a href='exercise_show.php?".api_get_cidreq()."&action=edit&id=$id'>".
1927 1927
                                     Display:: return_icon(
1928 1928
                                         'edit.png',
1929 1929
                                         get_lang('Edit'),
@@ -1932,7 +1932,7 @@  discard block
 block discarded – undo
1932 1932
                                     );
1933 1933
                                 $actions .= '&nbsp;';
1934 1934
                             } else {
1935
-                                $actions .= "<a href='exercise_show.php?" . api_get_cidreq() . "&action=qualify&id=$id'>" .
1935
+                                $actions .= "<a href='exercise_show.php?".api_get_cidreq()."&action=qualify&id=$id'>".
1936 1936
                                     Display:: return_icon(
1937 1937
                                         'quiz.png',
1938 1938
                                         get_lang('Qualify')
@@ -1942,11 +1942,11 @@  discard block
 block discarded – undo
1942 1942
                             $actions .= "</a>";
1943 1943
 
1944 1944
                             if ($filter == 2) {
1945
-                                $actions .= ' <a href="exercise_history.php?' . api_get_cidreq() . '&exe_id=' . $id . '">' .
1945
+                                $actions .= ' <a href="exercise_history.php?'.api_get_cidreq().'&exe_id='.$id.'">'.
1946 1946
                                     Display:: return_icon(
1947 1947
                                         'history.png',
1948 1948
                                         get_lang('ViewHistoryChange')
1949
-                                    ) . '</a>';
1949
+                                    ).'</a>';
1950 1950
                             }
1951 1951
 
1952 1952
                             //Admin can always delete the attempt
@@ -1956,13 +1956,13 @@  discard block
 block discarded – undo
1956 1956
                                     date('Y-m-d h:i:s'),
1957 1957
                                     false
1958 1958
                                 );
1959
-                                $actions .= '<a href="http://www.whatsmyip.org/ip-geo-location/?ip=' . $ip . '" target="_blank">
1960
-                                ' . Display::return_icon('info.png', $ip) . '
1959
+                                $actions .= '<a href="http://www.whatsmyip.org/ip-geo-location/?ip='.$ip.'" target="_blank">
1960
+                                ' . Display::return_icon('info.png', $ip).'
1961 1961
                                 </a>';
1962 1962
 
1963 1963
 
1964
-                                $recalculateUrl = api_get_path(WEB_CODE_PATH) . 'exercise/recalculate.php?' .
1965
-                                    api_get_cidreq() . '&' .
1964
+                                $recalculateUrl = api_get_path(WEB_CODE_PATH).'exercise/recalculate.php?'.
1965
+                                    api_get_cidreq().'&'.
1966 1966
                                     http_build_query([
1967 1967
                                         'id' => $id,
1968 1968
                                         'exercise' => $exercise_id,
@@ -1979,27 +1979,27 @@  discard block
 block discarded – undo
1979 1979
                                     ]
1980 1980
                                 );
1981 1981
 
1982
-                                $delete_link = '<a href="exercise_report.php?' . api_get_cidreq() . '&filter_by_user=' . intval($_GET['filter_by_user']) . '&filter=' . $filter . '&exerciseId=' . $exercise_id . '&delete=delete&did=' . $id . '"
1982
+                                $delete_link = '<a href="exercise_report.php?'.api_get_cidreq().'&filter_by_user='.intval($_GET['filter_by_user']).'&filter='.$filter.'&exerciseId='.$exercise_id.'&delete=delete&did='.$id.'"
1983 1983
                                 onclick="javascript:if(!confirm(\'' . sprintf(
1984 1984
                                         get_lang('DeleteAttempt'),
1985 1985
                                         $results[$i]['username'],
1986 1986
                                         $dt
1987
-                                    ) . '\')) return false;">' . Display:: return_icon(
1987
+                                    ).'\')) return false;">'.Display:: return_icon(
1988 1988
                                         'delete.png',
1989 1989
                                         get_lang('Delete')
1990
-                                    ) . '</a>';
1990
+                                    ).'</a>';
1991 1991
                                 $delete_link = utf8_encode($delete_link);
1992 1992
 
1993 1993
                                 if (api_is_drh() && !api_is_platform_admin()) {
1994 1994
                                     $delete_link = null;
1995 1995
                                 }
1996
-                                $actions .= $delete_link . '&nbsp;';
1996
+                                $actions .= $delete_link.'&nbsp;';
1997 1997
                             }
1998 1998
 
1999 1999
                         } else {
2000 2000
                             $attempt_url = api_get_path(
2001 2001
                                     WEB_CODE_PATH
2002
-                                ) . 'exercise/result.php?' . api_get_cidreq() . '&id=' . $results[$i]['exe_id'] . '&id_session=' . $sessionId;
2002
+                                ).'exercise/result.php?'.api_get_cidreq().'&id='.$results[$i]['exe_id'].'&id_session='.$sessionId;
2003 2003
                             $attempt_link = Display::url(
2004 2004
                                 get_lang('Show'),
2005 2005
                                 $attempt_url,
@@ -2058,7 +2058,7 @@  discard block
 block discarded – undo
2058 2058
                     $hp_result = round(
2059 2059
                             ($hpresults[$i][4] / ($hpresults[$i][5] != 0 ? $hpresults[$i][5] : 1)) * 100,
2060 2060
                             2
2061
-                        ) . '% (' . $hpresults[$i][4] . ' / ' . $hpresults[$i][5] . ')';
2061
+                        ).'% ('.$hpresults[$i][4].' / '.$hpresults[$i][5].')';
2062 2062
                     if ($is_allowedToEdit) {
2063 2063
                         $list_info[] = array(
2064 2064
                             $hpresults[$i][0],
@@ -2132,13 +2132,13 @@  discard block
 block discarded – undo
2132 2132
 
2133 2133
         $html = null;
2134 2134
         if ($show_percentage) {
2135
-            $parent = '(' . $score . ' / ' . $weight . ')';
2136
-            $html = $percentage . "%  $parent";
2135
+            $parent = '('.$score.' / '.$weight.')';
2136
+            $html = $percentage."%  $parent";
2137 2137
             if ($show_only_percentage) {
2138
-                $html = $percentage . "% ";
2138
+                $html = $percentage."% ";
2139 2139
             }
2140 2140
         } else {
2141
-            $html = $score . ' / ' . $weight;
2141
+            $html = $score.' / '.$weight;
2142 2142
         }
2143 2143
         $html = Display::span($html, array('class' => 'score_exercise'));
2144 2144
 
@@ -2232,7 +2232,7 @@  discard block
 block discarded – undo
2232 2232
     {
2233 2233
         $return = '-';
2234 2234
         if ($value != '') {
2235
-            $return = float_format($value * 100, 1) . ' %';
2235
+            $return = float_format($value * 100, 1).' %';
2236 2236
         }
2237 2237
         return $return;
2238 2238
     }
@@ -2311,7 +2311,7 @@  discard block
 block discarded – undo
2311 2311
         }
2312 2312
 
2313 2313
         $needle_where = !empty($search) ? " AND title LIKE '?' " : '';
2314
-        $needle = !empty($search) ? "%" . $search . "%" : '';
2314
+        $needle = !empty($search) ? "%".$search."%" : '';
2315 2315
 
2316 2316
         // Show courses by active status
2317 2317
         $active_sql = '';
@@ -2326,7 +2326,7 @@  discard block
 block discarded – undo
2326 2326
         if ($search_all_sessions == true) {
2327 2327
             $conditions = array(
2328 2328
                 'where' => array(
2329
-                    $active_sql . ' c_id = ? ' . $needle_where . $time_conditions => array(
2329
+                    $active_sql.' c_id = ? '.$needle_where.$time_conditions => array(
2330 2330
                         $course_id,
2331 2331
                         $needle
2332 2332
                     )
@@ -2337,7 +2337,7 @@  discard block
 block discarded – undo
2337 2337
             if ($session_id == 0) {
2338 2338
                 $conditions = array(
2339 2339
                     'where' => array(
2340
-                        $active_sql . ' session_id = ? AND c_id = ? ' . $needle_where . $time_conditions => array(
2340
+                        $active_sql.' session_id = ? AND c_id = ? '.$needle_where.$time_conditions => array(
2341 2341
                             $session_id,
2342 2342
                             $course_id,
2343 2343
                             $needle
@@ -2348,7 +2348,7 @@  discard block
 block discarded – undo
2348 2348
             } else {
2349 2349
                 $conditions = array(
2350 2350
                     'where' => array(
2351
-                        $active_sql . ' (session_id = 0 OR session_id = ? ) AND c_id = ? ' . $needle_where . $time_conditions => array(
2351
+                        $active_sql.' (session_id = 0 OR session_id = ? ) AND c_id = ? '.$needle_where.$time_conditions => array(
2352 2352
                             $session_id,
2353 2353
                             $course_id,
2354 2354
                             $needle
@@ -2529,7 +2529,7 @@  discard block
 block discarded – undo
2529 2529
 
2530 2530
             if ($return_string) {
2531 2531
                 if (!empty($position) && !empty($my_ranking)) {
2532
-                    $return_value = $position . '/' . count($my_ranking);
2532
+                    $return_value = $position.'/'.count($my_ranking);
2533 2533
                 } else {
2534 2534
                     $return_value = '-';
2535 2535
                 }
@@ -2610,7 +2610,7 @@  discard block
 block discarded – undo
2610 2610
 
2611 2611
             if ($return_string) {
2612 2612
                 if (!empty($position) && !empty($my_ranking)) {
2613
-                    return $position . '/' . count($my_ranking);
2613
+                    return $position.'/'.count($my_ranking);
2614 2614
                 }
2615 2615
             }
2616 2616
             return $return_value;
@@ -3015,7 +3015,7 @@  discard block
 block discarded – undo
3015 3015
             $courseCondition = "
3016 3016
             INNER JOIN $courseUser cu
3017 3017
             ON cu.c_id = c.id AND cu.user_id  = exe_user_id";
3018
-            $courseConditionWhere = " AND relation_type <> 2 AND cu.status = " . STUDENT;
3018
+            $courseConditionWhere = " AND relation_type <> 2 AND cu.status = ".STUDENT;
3019 3019
         } else {
3020 3020
             $courseCondition = "
3021 3021
             INNER JOIN $courseUserSession cu
@@ -3091,7 +3091,7 @@  discard block
 block discarded – undo
3091 3091
             $courseCondition = "
3092 3092
             INNER JOIN $courseUser cu
3093 3093
             ON cu.c_id = c.id AND cu.user_id  = exe_user_id";
3094
-            $courseConditionWhere = " AND relation_type <> 2 AND cu.status = " . STUDENT;
3094
+            $courseConditionWhere = " AND relation_type <> 2 AND cu.status = ".STUDENT;
3095 3095
         } else {
3096 3096
             $courseCondition = "
3097 3097
             INNER JOIN $courseUserSession cu
@@ -3184,7 +3184,7 @@  discard block
 block discarded – undo
3184 3184
             $courseCondition = "
3185 3185
             INNER JOIN $courseUser cu
3186 3186
             ON cu.c_id = c.id AND cu.user_id  = exe_user_id";
3187
-            $courseConditionWhere = " AND relation_type <> 2 AND cu.status = " . STUDENT;
3187
+            $courseConditionWhere = " AND relation_type <> 2 AND cu.status = ".STUDENT;
3188 3188
         } else {
3189 3189
             $courseCondition = "
3190 3190
             INNER JOIN $courseUserSession cu
@@ -3366,7 +3366,7 @@  discard block
 block discarded – undo
3366 3366
                 }
3367 3367
             }
3368 3368
             // adds the correct word, followed by ] to close the blank
3369
-            $answer .= ' / <font color="green"><b>' . $real_correct_tags[$i] . '</b></font>]';
3369
+            $answer .= ' / <font color="green"><b>'.$real_correct_tags[$i].'</b></font>]';
3370 3370
             if (isset ($real_text[$i + 1])) {
3371 3371
                 $answer .= $real_text[$i + 1];
3372 3372
             }
@@ -3426,13 +3426,13 @@  discard block
 block discarded – undo
3426 3426
         // check the default value of option
3427 3427
         $tabSelected = array($in_default => " selected='selected' ");
3428 3428
         $res = "";
3429
-        $res .= "<select name='$in_name' id='$in_name' onchange='" . $in_onchange . "' >";
3430
-        $res .= "<option value='-1'" . $tabSelected["-1"] . ">-- " . get_lang(
3429
+        $res .= "<select name='$in_name' id='$in_name' onchange='".$in_onchange."' >";
3430
+        $res .= "<option value='-1'".$tabSelected["-1"].">-- ".get_lang(
3431 3431
                 'AllGroups'
3432
-            ) . " --</option>";
3433
-        $res .= "<option value='0'" . $tabSelected["0"] . ">- " . get_lang(
3432
+            )." --</option>";
3433
+        $res .= "<option value='0'".$tabSelected["0"].">- ".get_lang(
3434 3434
                 'NotInAGroup'
3435
-            ) . " -</option>";
3435
+            )." -</option>";
3436 3436
         $tabGroups = GroupManager::get_group_list();
3437 3437
         $currentCatId = 0;
3438 3438
         for ($i = 0; $i < count($tabGroups); $i++) {
@@ -3440,10 +3440,10 @@  discard block
 block discarded – undo
3440 3440
                 $tabGroups[$i]['iid']
3441 3441
             );
3442 3442
             if ($tabCategory["id"] != $currentCatId) {
3443
-                $res .= "<option value='-1' disabled='disabled'>" . $tabCategory["title"] . "</option>";
3443
+                $res .= "<option value='-1' disabled='disabled'>".$tabCategory["title"]."</option>";
3444 3444
                 $currentCatId = $tabCategory["id"];
3445 3445
             }
3446
-            $res .= "<option " . $tabSelected[$tabGroups[$i]["id"]] . "style='margin-left:40px' value='" . $tabGroups[$i]["id"] . "'>" . $tabGroups[$i]["name"] . "</option>";
3446
+            $res .= "<option ".$tabSelected[$tabGroups[$i]["id"]]."style='margin-left:40px' value='".$tabGroups[$i]["id"]."'>".$tabGroups[$i]["name"]."</option>";
3447 3447
         }
3448 3448
         $res .= "</select>";
3449 3449
         return $res;
@@ -3678,14 +3678,14 @@  discard block
 block discarded – undo
3678 3678
                 if ($show_results) {
3679 3679
                     $comnt = Event::get_comments($exe_id, $questionId);
3680 3680
                     if (!empty($comnt)) {
3681
-                        echo '<b>' . get_lang('Feedback') . '</b>';
3682
-                        echo '<div id="question_feedback">' . $comnt . '</div>';
3681
+                        echo '<b>'.get_lang('Feedback').'</b>';
3682
+                        echo '<div id="question_feedback">'.$comnt.'</div>';
3683 3683
                     }
3684 3684
                 }
3685 3685
 
3686 3686
                 if ($show_results) {
3687 3687
                     $score = array(
3688
-                        'result' => get_lang('Score') . " : " . self::show_score(
3688
+                        'result' => get_lang('Score')." : ".self::show_score(
3689 3689
                                 $my_total_score,
3690 3690
                                 $my_total_weight,
3691 3691
                                 false,
@@ -3753,9 +3753,9 @@  discard block
 block discarded – undo
3753 3753
         }
3754 3754
 
3755 3755
         if ($show_all_but_expected_answer) {
3756
-            $exercise_content .= "<div class='normal-message'>" . get_lang(
3756
+            $exercise_content .= "<div class='normal-message'>".get_lang(
3757 3757
                     "ExerciseWithFeedbackWithoutCorrectionComment"
3758
-                ) . "</div>";
3758
+                )."</div>";
3759 3759
         }
3760 3760
         // Remove audio auto play from questions on results page - refs BT#7939
3761 3761
         $exercise_content = preg_replace(
@@ -3855,11 +3855,11 @@  discard block
 block discarded – undo
3855 3855
                     $ribbon_total_success_or_error = ' ribbon-total-error';
3856 3856
                 }
3857 3857
             }
3858
-            $ribbon .= '<div class="total ' . $ribbon_total_success_or_error . '">';
3858
+            $ribbon .= '<div class="total '.$ribbon_total_success_or_error.'">';
3859 3859
         } else {
3860 3860
             $ribbon .= '<div class="total">';
3861 3861
         }
3862
-        $ribbon .= '<h3>' . get_lang('YourTotalScore') . ":&nbsp;";
3862
+        $ribbon .= '<h3>'.get_lang('YourTotalScore').":&nbsp;";
3863 3863
         $ribbon .= self::show_score($score, $weight, false, true);
3864 3864
         $ribbon .= '</h3>';
3865 3865
         $ribbon .= '</div>';
Please login to merge, or discard this patch.
main/inc/lib/formvalidator/Rule/MaxFileSize.php 2 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,6 @@
 block discarded – undo
9 9
 {
10 10
 	/**
11 11
 	 * @param $value array     Uploaded file info (from $_FILES)
12
-	 * @param null $options
13 12
 	 * @return bool
14 13
 	 */
15 14
 	public function validate($elementValue, $maxSize)
Please login to merge, or discard this patch.
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -7,22 +7,22 @@
 block discarded – undo
7 7
  */
8 8
 class HTML_QuickForm_Rule_MaxFileSize extends HTML_QuickForm_Rule
9 9
 {
10
-	/**
11
-	 * @param $value array     Uploaded file info (from $_FILES)
12
-	 * @param null $options
13
-	 * @return bool
14
-	 */
15
-	public function validate($elementValue, $maxSize)
16
-	{
17
-		if (!empty($elementValue['error']) &&
18
-			(UPLOAD_ERR_FORM_SIZE == $elementValue['error'] || UPLOAD_ERR_INI_SIZE == $elementValue['error'])
19
-		) {
20
-			return false;
21
-		}
22
-		if (!HTML_QuickForm_file::_ruleIsUploadedFile($elementValue)) {
23
-			return true;
24
-		}
10
+    /**
11
+     * @param $value array     Uploaded file info (from $_FILES)
12
+     * @param null $options
13
+     * @return bool
14
+     */
15
+    public function validate($elementValue, $maxSize)
16
+    {
17
+        if (!empty($elementValue['error']) &&
18
+            (UPLOAD_ERR_FORM_SIZE == $elementValue['error'] || UPLOAD_ERR_INI_SIZE == $elementValue['error'])
19
+        ) {
20
+            return false;
21
+        }
22
+        if (!HTML_QuickForm_file::_ruleIsUploadedFile($elementValue)) {
23
+            return true;
24
+        }
25 25
 
26
-		return ($maxSize >= @filesize($elementValue['tmp_name']));
27
-	}
26
+        return ($maxSize >= @filesize($elementValue['tmp_name']));
27
+    }
28 28
 }
Please login to merge, or discard this patch.
main/inc/lib/formvalidator/Rule/MobilePhoneNumber.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
      *
17 17
      * @param string Mobile phone number to be validated
18 18
      * @param string Not using it. Just to respect the declaration
19
-     * @return boolean Returns true if valid, false otherwise.
19
+     * @return integer Returns true if valid, false otherwise.
20 20
      */
21 21
     function validate($mobilePhoneNumber, $options = null)
22 22
     {
Please login to merge, or discard this patch.
main/inc/lib/hook/HookManagement.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@
 block discarded – undo
138 138
 
139 139
     /**
140 140
      * Return a list an associative array where keys are the active hook observer class name
141
-     * @param $eventName
141
+     * @param string $eventName
142 142
      *
143 143
      * @return array
144 144
      */
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -145,10 +145,10 @@  discard block
 block discarded – undo
145 145
     public function listHookObservers($eventName)
146 146
     {
147 147
         $array = array();
148
-        $joinTable = $this->tables[TABLE_HOOK_CALL] . ' hc' .
149
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_EVENT] . ' he' .
150
-            ' ON hc.hook_event_id = he.id ' .
151
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_OBSERVER] . ' ho ' .
148
+        $joinTable = $this->tables[TABLE_HOOK_CALL].' hc'.
149
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_EVENT].' he'.
150
+            ' ON hc.hook_event_id = he.id '.
151
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_OBSERVER].' ho '.
152 152
             ' ON hc.hook_observer_id = ho.id ';
153 153
         $columns = 'ho.class_name, ho.path, ho.plugin_name, hc.enabled';
154 154
         $where = array('where' => array('he.class_name = ? ' => $eventName, 'AND hc.enabled = ? ' => 1));
@@ -202,10 +202,10 @@  discard block
 block discarded – undo
202 202
     public function listAllHookCalls()
203 203
     {
204 204
         $array = array();
205
-        $joinTable = $this->tables[TABLE_HOOK_CALL] . ' hc' .
206
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_EVENT] . ' he' .
207
-            ' ON hc.hook_event_id = he.id ' .
208
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_OBSERVER] . ' ho ' .
205
+        $joinTable = $this->tables[TABLE_HOOK_CALL].' hc'.
206
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_EVENT].' he'.
207
+            ' ON hc.hook_event_id = he.id '.
208
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_OBSERVER].' ho '.
209 209
             ' ON hc.hook_observer_id = ho.id ';
210 210
         $columns = 'he.class_name AS event_class_name, ho.class_name AS observer_class_name, hc.id AS id, hc.type AS type';
211 211
         $rows = Database::select($columns, $joinTable);
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
         if (isset($eventName) && !isset($this->hookEvents[$eventName])) {
232 232
             $attributes = array(
233 233
                 'class_name' => $eventName,
234
-                'description' => get_lang('HookDescription' . $eventName),
234
+                'description' => get_lang('HookDescription'.$eventName),
235 235
             );
236 236
             $id = Database::insert($this->tables[TABLE_HOOK_EVENT], $attributes);
237 237
             $this->hookEvents[$eventName] = $id;
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
         // Check if exists hook observer
241 241
         if (isset($observerClassName) &&
242 242
             !isset($this->hookObservers[$observerClassName])
243
-        ){
243
+        ) {
244 244
             $object = $observerClassName::create();
245 245
             $attributes = array(
246 246
                 'class_name' => $observerClassName,
@@ -338,10 +338,10 @@  discard block
 block discarded – undo
338 338
         $eventName = Database::escape_string($eventName);
339 339
         $observerClassName($observerClassName);
340 340
         $type = Database::escape_string($type);
341
-        $joinTable = $this->tables[TABLE_HOOK_CALL] . ' hc' .
342
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_EVENT] . ' he' .
343
-            ' ON hc.hook_event_id = he.id ' .
344
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_OBSERVER] . ' ho ' .
341
+        $joinTable = $this->tables[TABLE_HOOK_CALL].' hc'.
342
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_EVENT].' he'.
343
+            ' ON hc.hook_event_id = he.id '.
344
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_OBSERVER].' ho '.
345 345
             ' ON hc.hook_observer_id = ho.id ';
346 346
         $row = Database::select(
347 347
             'id',
Please login to merge, or discard this patch.
main/inc/lib/login.lib.php 3 patches
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -266,6 +266,7 @@  discard block
 block discarded – undo
266 266
      * @global bool   $is_platformAdmin
267 267
      * @global bool   $is_allowedCreateCourse
268 268
      * @global object $_user
269
+     * @param boolean $reset
269 270
      */
270 271
     public static function init_user($user_id, $reset)
271 272
     {
@@ -355,7 +356,7 @@  discard block
 block discarded – undo
355 356
      * @global type $is_allowed_in_course
356 357
      *
357 358
      * @param type $course_id
358
-     * @param type $reset
359
+     * @param boolean $reset
359 360
      */
360 361
     static function init_course($course_id, $reset)
361 362
     {
Please login to merge, or discard this patch.
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -37,24 +37,24 @@  discard block
 block discarded – undo
37 37
             if ($by_username) {
38 38
                 $secret_word = self::get_secret_word($user['email']);
39 39
                 if ($reset) {
40
-                    $reset_link = $portal_url . "main/auth/lostPassword.php?reset=" . $secret_word . "&id=" . $user['uid'];
40
+                    $reset_link = $portal_url."main/auth/lostPassword.php?reset=".$secret_word."&id=".$user['uid'];
41 41
                 } else {
42
-                    $reset_link = get_lang('Pass') . " : $user[password]";
42
+                    $reset_link = get_lang('Pass')." : $user[password]";
43 43
                 }
44
-                $user_account_list = get_lang('YourRegistrationData') . " : \n" . get_lang('UserName') . ' : ' . $user['loginName'] . "\n" . get_lang('ResetLink') . ' : ' . $reset_link . '';
44
+                $user_account_list = get_lang('YourRegistrationData')." : \n".get_lang('UserName').' : '.$user['loginName']."\n".get_lang('ResetLink').' : '.$reset_link.'';
45 45
 
46 46
                 if ($user_account_list) {
47
-                    $user_account_list = "\n-----------------------------------------------\n" . $user_account_list;
47
+                    $user_account_list = "\n-----------------------------------------------\n".$user_account_list;
48 48
                 }
49 49
             } else {
50 50
                 foreach ($user as $this_user) {
51 51
                     $secret_word = self::get_secret_word($this_user['email']);
52 52
                     if ($reset) {
53
-                        $reset_link = $portal_url . "main/auth/lostPassword.php?reset=" . $secret_word . "&id=" . $this_user['uid'];
53
+                        $reset_link = $portal_url."main/auth/lostPassword.php?reset=".$secret_word."&id=".$this_user['uid'];
54 54
                     } else {
55
-                        $reset_link = get_lang('Pass') . " : $this_user[password]";
55
+                        $reset_link = get_lang('Pass')." : $this_user[password]";
56 56
                     }
57
-                    $user_account_list[] = get_lang('YourRegistrationData') . " : \n" . get_lang('UserName') . ' : ' . $this_user['loginName'] . "\n" . get_lang('ResetLink') . ' : ' . $reset_link . '';
57
+                    $user_account_list[] = get_lang('YourRegistrationData')." : \n".get_lang('UserName').' : '.$this_user['loginName']."\n".get_lang('ResetLink').' : '.$reset_link.'';
58 58
                 }
59 59
                 if ($user_account_list) {
60 60
                     $user_account_list = implode("\n-----------------------------------------------\n", $user_account_list);
@@ -64,8 +64,8 @@  discard block
 block discarded – undo
64 64
             if (!$by_username) {
65 65
                 $user = $user[0];
66 66
             }
67
-            $reset_link = get_lang('Pass') . " : $user[password]";
68
-            $user_account_list = get_lang('YourRegistrationData') . " : \n" . get_lang('UserName') . ' : ' . $user['loginName'] . "\n" . $reset_link . '';
67
+            $reset_link = get_lang('Pass')." : $user[password]";
68
+            $user_account_list = get_lang('YourRegistrationData')." : \n".get_lang('UserName').' : '.$user['loginName']."\n".$reset_link.'';
69 69
         }
70 70
         return $user_account_list;
71 71
     }
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
      */
79 79
     public static function send_password_to_user($user, $by_username = false)
80 80
     {
81
-        $email_subject = "[" . api_get_setting('siteName') . "] " . get_lang('LoginRequest'); // SUBJECT
81
+        $email_subject = "[".api_get_setting('siteName')."] ".get_lang('LoginRequest'); // SUBJECT
82 82
 
83 83
         if ($by_username) { // Show only for lost password
84 84
             $user_account_list = self::get_user_account_list($user, false, $by_username); // BODY
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
             }
98 98
         }
99 99
 
100
-        $email_body = get_lang('YourAccountParam') . " " . $portal_url . "\n\n$user_account_list";
100
+        $email_body = get_lang('YourAccountParam')." ".$portal_url."\n\n$user_account_list";
101 101
         // SEND MESSAGE
102 102
         $sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
103 103
         $email_admin = api_get_setting('emailAdministrator');
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
      */
132 132
     public static function handle_encrypted_password($user, $by_username = false)
133 133
     {
134
-        $email_subject = "[" . api_get_setting('siteName') . "] " . get_lang('LoginRequest'); // SUBJECT
134
+        $email_subject = "[".api_get_setting('siteName')."] ".get_lang('LoginRequest'); // SUBJECT
135 135
 
136 136
         if ($by_username) {
137 137
         // Show only for lost password
@@ -141,11 +141,11 @@  discard block
 block discarded – undo
141 141
             $user_account_list = self::get_user_account_list($user, true); // BODY
142 142
             $email_to = $user[0]['email'];
143 143
         }
144
-        $email_body = get_lang('DearUser') . " :\n" . get_lang('password_request') . "\n";
145
-        $email_body .= $user_account_list . "\n-----------------------------------------------\n\n";
144
+        $email_body = get_lang('DearUser')." :\n".get_lang('password_request')."\n";
145
+        $email_body .= $user_account_list."\n-----------------------------------------------\n\n";
146 146
         $email_body .= get_lang('PasswordEncryptedForSecurity');
147 147
 
148
-        $email_body .= "\n\n" . get_lang('SignatureFormula') . ",\n" . api_get_setting('administratorName') . " " . api_get_setting('administratorSurname') . "\n" . get_lang('PlataformAdmin') . " - " . api_get_setting('siteName');
148
+        $email_body .= "\n\n".get_lang('SignatureFormula').",\n".api_get_setting('administratorName')." ".api_get_setting('administratorSurname')."\n".get_lang('PlataformAdmin')." - ".api_get_setting('siteName');
149 149
 
150 150
         $sender_name = api_get_person_name(
151 151
             api_get_setting('administratorName'),
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
                     username AS loginName,
239 239
                     password,
240 240
                     email
241
-                FROM " . $tbl_user . "
241
+                FROM " . $tbl_user."
242 242
                 WHERE user_id = $id";
243 243
         $result = Database::query($sql);
244 244
         $num_rows = Database::num_rows($result);
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
                         ON user.user_id = a.user_id
292 292
                         LEFT JOIN $track_e_login login
293 293
                         ON user.user_id  = login.login_user_id
294
-                        WHERE user.user_id = '" . $_user['user_id'] . "'
294
+                        WHERE user.user_id = '".$_user['user_id']."'
295 295
                         ORDER BY login.login_date DESC LIMIT 1";
296 296
 
297 297
                 $result = Database::query($sql);
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
321 321
                     Session::write('is_platformAdmin', $is_platformAdmin);
322 322
                     Session::write('is_allowedCreateCourse', $is_allowedCreateCourse);
323 323
                 } else {
324
-                    header('location:' . api_get_path(WEB_PATH));
324
+                    header('location:'.api_get_path(WEB_PATH));
325 325
                     //exit("WARNING UNDEFINED UID !! ");
326 326
                 }
327 327
             } else { // no uid => logout or Anonymous
@@ -368,9 +368,9 @@  discard block
 block discarded – undo
368 368
         global $_course;
369 369
         global $_real_cid;
370 370
 
371
-        global $is_courseAdmin;  //course teacher
372
-        global $is_courseTutor;  //course teacher - some rights
373
-        global $is_courseCoach;  //course coach
371
+        global $is_courseAdmin; //course teacher
372
+        global $is_courseTutor; //course teacher - some rights
373
+        global $is_courseCoach; //course coach
374 374
         global $is_courseMember; //course student
375 375
         global $is_sessionAdmin;
376 376
         global $is_allowed_in_course;
@@ -427,7 +427,7 @@  discard block
 block discarded – undo
427 427
 
428 428
                     if (!empty($_GET['id_session'])) {
429 429
                         $_SESSION['id_session'] = intval($_GET['id_session']);
430
-                        $sql = 'SELECT name FROM ' . $tbl_session . ' WHERE id="' . intval($_SESSION['id_session']) . '"';
430
+                        $sql = 'SELECT name FROM '.$tbl_session.' WHERE id="'.intval($_SESSION['id_session']).'"';
431 431
                         $rs = Database::query($sql);
432 432
                         list($_SESSION['session_name']) = Database::fetch_array($rs);
433 433
                     } else {
@@ -443,7 +443,7 @@  discard block
 block discarded – undo
443 443
                     }
444 444
                 } else {
445 445
                     //exit("WARNING UNDEFINED CID !! ");
446
-                    header('location:' . api_get_path(WEB_PATH));
446
+                    header('location:'.api_get_path(WEB_PATH));
447 447
                 }
448 448
             } else {
449 449
                 Session::erase('_cid');
@@ -470,7 +470,7 @@  discard block
 block discarded – undo
470 470
         } else {
471 471
             // Continue with the previous values
472 472
             if (empty($_SESSION['_course']) OR empty($_SESSION['_cid'])) { //no previous values...
473
-                $_cid = -1;        //set default values that will be caracteristic of being unset
473
+                $_cid = -1; //set default values that will be caracteristic of being unset
474 474
                 $_course = -1;
475 475
             } else {
476 476
                 $_cid = $_SESSION['_cid'];
@@ -480,7 +480,7 @@  discard block
 block discarded – undo
480 480
                 // Moreover, if we want to track a course with another session it can be usefull
481 481
                 if (!empty($_GET['id_session'])) {
482 482
                     $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
483
-                    $sql = 'SELECT name FROM ' . $tbl_session . ' WHERE id="' . intval($_SESSION['id_session']) . '"';
483
+                    $sql = 'SELECT name FROM '.$tbl_session.' WHERE id="'.intval($_SESSION['id_session']).'"';
484 484
                     $rs = Database::query($sql);
485 485
                     list($_SESSION['session_name']) = Database::fetch_array($rs);
486 486
                     $_SESSION['id_session'] = intval($_GET['id_session']);
@@ -520,9 +520,9 @@  discard block
 block discarded – undo
520 520
                             //But only if the login date is < than now + max_life_time
521 521
                             $sql = "SELECT course_access_id FROM $course_tracking_table
522 522
                                     WHERE
523
-                                        user_id     = " . intval($_user ['user_id']) . " AND
523
+                                        user_id     = ".intval($_user ['user_id'])." AND
524 524
                                         c_id = '".api_get_course_int_id()."' AND
525
-                                        session_id  = " . api_get_session_id() . " AND
525
+                                        session_id  = " . api_get_session_id()." AND
526 526
                                         login_course_date > now() - INTERVAL $session_lifetime SECOND
527 527
                                     ORDER BY login_course_date DESC LIMIT 0,1";
528 528
                             $result = Database::query($sql);
@@ -532,11 +532,11 @@  discard block
 block discarded – undo
532 532
                                 //We update the course tracking table
533 533
                                 $sql = "UPDATE $course_tracking_table
534 534
                                         SET logout_course_date = '$time', counter = counter+1
535
-                                        WHERE course_access_id = " . intval($i_course_access_id) . " AND session_id = " . api_get_session_id();
535
+                                        WHERE course_access_id = ".intval($i_course_access_id)." AND session_id = ".api_get_session_id();
536 536
                                 Database::query($sql);
537 537
                             } else {
538
-                                $sql = "INSERT INTO $course_tracking_table (c_id, user_id, login_course_date, logout_course_date, counter, session_id)" .
539
-                                        "VALUES('" . api_get_course_int_id() . "', '" . $_user['user_id'] . "', '$time', '$time', '1','" . api_get_session_id() . "')";
538
+                                $sql = "INSERT INTO $course_tracking_table (c_id, user_id, login_course_date, logout_course_date, counter, session_id)".
539
+                                        "VALUES('".api_get_course_int_id()."', '".$_user['user_id']."', '$time', '$time', '1','".api_get_session_id()."')";
540 540
                                 Database::query($sql);
541 541
                             }
542 542
                         }
@@ -564,8 +564,8 @@  discard block
 block discarded – undo
564 564
                 $course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
565 565
                 $sql = "SELECT * FROM $course_user_table
566 566
                        WHERE
567
-                        user_id  = '" . $user_id . "' AND
568
-                        relation_type <> " . COURSE_RELATION_TYPE_RRHH . " AND
567
+                        user_id  = '".$user_id."' AND
568
+                        relation_type <> " . COURSE_RELATION_TYPE_RRHH." AND
569 569
                         course_code = '$course_id'";
570 570
                 $result = Database::query($sql);
571 571
 
@@ -585,8 +585,8 @@  discard block
 block discarded – undo
585 585
                             $session_id
586 586
                         );
587 587
                         if (!$user_is_subscribed) {
588
-                            $url = api_get_path(WEB_CODE_PATH) . 'course_info/legal.php?course_code=' . $_course['code'] . '&session_id=' . $session_id;
589
-                            header('Location: ' . $url);
588
+                            $url = api_get_path(WEB_CODE_PATH).'course_info/legal.php?course_code='.$_course['code'].'&session_id='.$session_id;
589
+                            header('Location: '.$url);
590 590
                             exit;
591 591
                         }
592 592
                     }
@@ -627,11 +627,11 @@  discard block
 block discarded – undo
627 627
                         } else {
628 628
                             //Im a coach or a student?
629 629
                             $sql = "SELECT user_id, status
630
-                                    FROM " . $tbl_session_course_user . "
630
+                                    FROM " . $tbl_session_course_user."
631 631
                                     WHERE
632 632
                                         c_id = '$_cid' AND
633
-                                        user_id = '" . $user_id . "' AND
634
-                                        session_id = '" . $session_id . "'
633
+                                        user_id = '".$user_id."' AND
634
+                                        session_id = '" . $session_id."'
635 635
                                     LIMIT 1";
636 636
                             $result = Database::query($sql);
637 637
 
@@ -777,7 +777,7 @@  discard block
 block discarded – undo
777 777
         if ($reset) { // session data refresh requested
778 778
             if ($group_id && $_cid && !empty($_course['real_id'])) { // have keys to search data
779 779
                 $group_table = Database::get_course_table(TABLE_GROUP);
780
-                $sql = "SELECT * FROM $group_table WHERE c_id = " . $_course['real_id'] . " AND id = '$group_id'";
780
+                $sql = "SELECT * FROM $group_table WHERE c_id = ".$_course['real_id']." AND id = '$group_id'";
781 781
                 $result = Database::query($sql);
782 782
                 if (Database::num_rows($result) > 0) { // This group has recorded status related to this course
783 783
                     $gpData = Database::fetch_array($result);
@@ -830,7 +830,7 @@  discard block
 block discarded – undo
830 830
      */
831 831
     public static function get_user_accounts_by_username($username)
832 832
     {
833
-        if (strpos($username,'@')){
833
+        if (strpos($username, '@')) {
834 834
             $username = api_strtolower($username);
835 835
             $email = true;
836 836
         } else {
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -852,14 +852,14 @@  discard block
 block discarded – undo
852 852
             $email = false;
853 853
         }
854 854
 
855
-		if ($email) {
856
-			$condition = "LOWER(email) = '".Database::escape_string($username)."' ";
857
-		} else {
855
+        if ($email) {
856
+            $condition = "LOWER(email) = '".Database::escape_string($username)."' ";
857
+        } else {
858 858
             $condition = "LOWER(username) = '".Database::escape_string($username)."'";
859 859
         }
860 860
 
861
-		$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
862
-		$query = "SELECT 
861
+        $tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
862
+        $query = "SELECT 
863 863
 		            user_id AS uid, 
864 864
 		            lastname AS lastName, 
865 865
 		            firstname AS firstName, 
@@ -874,7 +874,7 @@  discard block
 block discarded – undo
874 874
                     auth_source
875 875
 				 FROM $tbl_user
876 876
 				 WHERE ( $condition AND active = 1) ";
877
-		$result = Database::query($query);
877
+        $result = Database::query($query);
878 878
         $num_rows = Database::num_rows($result);
879 879
         if ($result && $num_rows > 0) {
880 880
             return Database::fetch_assoc($result);
Please login to merge, or discard this patch.
main/inc/lib/model.lib.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -25,6 +25,7 @@
 block discarded – undo
25 25
 
26 26
     /**
27 27
      * Useful finder - experimental akelos like only use in notification.lib.php send function
28
+     * @param string $type
28 29
      */
29 30
     public function find($type, $options = null)
30 31
     {
Please login to merge, or discard this patch.