Completed
Push — master ( f173a6...4a27fe )
by Angel Fernando Quiroz
37:49 queued 04:39
created
main/course_home/course_home.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -176,7 +176,8 @@
 block discarded – undo
176 176
 $auto_launch = api_get_course_setting('enable_lp_auto_launch');
177 177
 $session_id = api_get_session_id();
178 178
 if (!empty($auto_launch)) {
179
-    if ($auto_launch == 2) { //LP list
179
+    if ($auto_launch == 2) {
180
+//LP list
180 181
         if (api_is_platform_admin() || api_is_allowed_to_edit()) {
181 182
             $show_autolaunch_lp_warning = true;
182 183
         } else {
Please login to merge, or discard this patch.
main/auth/external_login/updateUser.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,8 @@
 block discarded – undo
25 25
 $user['country_bu'] = $new_user['country_bu'];
26 26
 $user['extra'] = $new_user['extra'];
27 27
 
28
-if ($new_user !== false) { //User can login
28
+if ($new_user !== false) {
29
+//User can login
29 30
     external_update_user($user);
30 31
     $loginFailed = false;
31 32
     $_user['user_id'] = $user['user_id'];
Please login to merge, or discard this patch.
main/auth/sso/sso_server_test.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -84,15 +84,18 @@
 block discarded – undo
84 84
     //echo do something to logout
85 85
 }
86 86
 
87
-function validate_user($user, $pass) {
87
+function validate_user($user, $pass)
88
+{
88 89
     return true;
89 90
 }
90
-function filter_xss($val) {
91
+function filter_xss($val)
92
+{
91 93
     //do some cleaning
92 94
     return $val;
93 95
 }
94 96
 
95
-function chamilo_sso_protocol() {
97
+function chamilo_sso_protocol()
98
+{
96 99
     //get the sso_protocol from chamilo using webservices
97 100
     return 'http://';
98 101
 }
Please login to merge, or discard this patch.
main/lp/storageapi.php 1 patch
Braces   +30 added lines, -20 removed lines patch added patch discarded remove patch
@@ -45,8 +45,9 @@  discard block
 block discarded – undo
45 45
         }
46 46
         break;
47 47
     case "stackgetall":
48
-        if (storage_can_set($_REQUEST['svuser']))
49
-            print storage_stack_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
48
+        if (storage_can_set($_REQUEST['svuser'])) {
49
+                    print storage_stack_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
50
+        }
50 51
         break;
51 52
     case "getposition":
52 53
         print storage_get_position($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc']);
@@ -63,7 +64,8 @@  discard block
 block discarded – undo
63 64
         // Do nothing
64 65
 }
65 66
 
66
-function storage_can_set($sv_user) {
67
+function storage_can_set($sv_user)
68
+{
67 69
     // platform admin can change any user's stored values, other users can only change their own values
68 70
     $allowed = ((api_is_platform_admin()) || ($sv_user == api_get_user_id()));
69 71
     if (!$allowed) {
@@ -72,7 +74,8 @@  discard block
 block discarded – undo
72 74
     return $allowed;
73 75
 }
74 76
 
75
-function storage_get($sv_user, $sv_course, $sv_sco, $sv_key) {
77
+function storage_get($sv_user, $sv_course, $sv_sco, $sv_key)
78
+{
76 79
     $sql = "select sv_value
77 80
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)."
78 81
         where user_id= '$sv_user'
@@ -87,13 +90,13 @@  discard block
 block discarded – undo
87 90
         } else {
88 91
             return $row['sv_value'];
89 92
         }
90
-    }
91
-    else {
93
+    } else {
92 94
         return null;
93 95
     }
94 96
 }
95 97
 
96
-function storage_get_leaders($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $sv_length) {
98
+function storage_get_leaders($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $sv_length)
99
+{
97 100
 
98 101
     // get leaders
99 102
     $sql_leaders = "select u.user_id, firstname, lastname, email, username, sv_value as value
@@ -127,7 +130,8 @@  discard block
 block discarded – undo
127 130
     return json_encode($result);
128 131
 }
129 132
 
130
-function storage_get_position($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $sv_length) {
133
+function storage_get_position($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $sv_length)
134
+{
131 135
     $sql = "select count(list.user_id) as position
132 136
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)." search,
133 137
             ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)." list
@@ -144,13 +148,13 @@  discard block
 block discarded – undo
144 148
     if (Database::num_rows($res) > 0) {
145 149
         $row = Database::fetch_assoc($res);
146 150
         return $row['position'];
147
-    }
148
-    else {
151
+    } else {
149 152
         return null;
150 153
     }
151 154
 }
152 155
 
153
-function storage_set($sv_user, $sv_course, $sv_sco, $sv_key, $sv_value) {
156
+function storage_set($sv_user, $sv_course, $sv_sco, $sv_key, $sv_value)
157
+{
154 158
     $sv_value = Database::escape_string($sv_value);
155 159
     $sql = "replace into ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)."
156 160
         (user_id, sco_id, course_id, sv_key, sv_value)
@@ -160,7 +164,8 @@  discard block
 block discarded – undo
160 164
     return Database::affected_rows($res);
161 165
 }
162 166
 
163
-function storage_getall($sv_user, $sv_course, $sv_sco) {
167
+function storage_getall($sv_user, $sv_course, $sv_sco)
168
+{
164 169
     $sql = "select sv_key, sv_value
165 170
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)."
166 171
         where user_id= '$sv_user'
@@ -177,7 +182,8 @@  discard block
 block discarded – undo
177 182
     return json_encode($data);
178 183
 }
179 184
 
180
-function storage_stack_push($sv_user, $sv_course, $sv_sco, $sv_key, $sv_value) {
185
+function storage_stack_push($sv_user, $sv_course, $sv_sco, $sv_key, $sv_value)
186
+{
181 187
     $sv_value = Database::escape_string($sv_value);
182 188
     Database::query("start transaction");
183 189
     $sqlorder = "select ifnull((select max(stack_order)
@@ -198,14 +204,14 @@  discard block
 block discarded – undo
198 204
     if ($resorder && $resinsert) {
199 205
         Database::query("commit");
200 206
         return 1;
201
-    }
202
-    else {
207
+    } else {
203 208
         Database::query("rollback");
204 209
         return 0;
205 210
     }
206 211
 }
207 212
 
208
-function storage_stack_pop($sv_user, $sv_course, $sv_sco, $sv_key) {
213
+function storage_stack_pop($sv_user, $sv_course, $sv_sco, $sv_key)
214
+{
209 215
     Database::query("start transaction");
210 216
     $sqlselect = "select sv_value, stack_order
211 217
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK)."
@@ -239,7 +245,8 @@  discard block
 block discarded – undo
239 245
     }
240 246
 }
241 247
 
242
-function storage_stack_length($sv_user, $sv_course, $sv_sco, $sv_key) {
248
+function storage_stack_length($sv_user, $sv_course, $sv_sco, $sv_key)
249
+{
243 250
     $sql = "select count(*) as length
244 251
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK)."
245 252
         where user_id= '$sv_user'
@@ -251,7 +258,8 @@  discard block
 block discarded – undo
251 258
     return $row['length'];
252 259
 }
253 260
 
254
-function storage_stack_clear($sv_user, $sv_course, $sv_sco, $sv_key) {
261
+function storage_stack_clear($sv_user, $sv_course, $sv_sco, $sv_key)
262
+{
255 263
     $sql = "delete
256 264
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK)."
257 265
         where user_id= '$sv_user'
@@ -262,7 +270,8 @@  discard block
 block discarded – undo
262 270
     return Database::num_rows($res);
263 271
 }
264 272
 
265
-function storage_stack_getall($sv_user, $sv_course, $sv_sco, $sv_key) {
273
+function storage_stack_getall($sv_user, $sv_course, $sv_sco, $sv_key)
274
+{
266 275
     $sql = "select stack_order as stack_order, sv_value as value
267 276
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK)."
268 277
         where user_id= '$sv_user'
@@ -280,7 +289,8 @@  discard block
 block discarded – undo
280 289
     return json_encode($results);
281 290
 }
282 291
 
283
-function storage_get_all_users() {
292
+function storage_get_all_users()
293
+{
284 294
     $sql = "select user_id, username, firstname, lastname
285 295
         from ".Database::get_main_table(TABLE_MAIN_USER)."
286 296
         order by user_id asc";
Please login to merge, or discard this patch.
main/lp/learnpathItem.class.php 1 patch
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -752,7 +752,8 @@  discard block
 block discarded – undo
752 752
     public function get_lesson_mode()
753 753
     {
754 754
         $mode = 'normal';
755
-        if ($this->get_prevent_reinit() != 0) { // If prevent_reinit == 0
755
+        if ($this->get_prevent_reinit() != 0) {
756
+// If prevent_reinit == 0
756 757
             $my_status = $this->get_status();
757 758
             if ($my_status != $this->possible_status[0]
758 759
                     && $my_status != $this->possible_status[1]) {
@@ -2044,11 +2045,13 @@  discard block
 block discarded – undo
2044 2045
         $restart = 1;
2045 2046
         $mystatus = $this->get_status(true);
2046 2047
         if ($this->get_prevent_reinit() > 0
2047
-        ) { // If prevent_reinit == 1 (or more)
2048
+        ) {
2049
+// If prevent_reinit == 1 (or more)
2048 2050
             // If status is not attempted or incomplete, authorize retaking (of the same) anyway. Otherwise:
2049 2051
             if ($mystatus != $this->possible_status[0] && $mystatus != $this->possible_status[1]) {
2050 2052
                 $restart = -1;
2051
-            } else { //status incompleted or not attempted
2053
+            } else {
2054
+//status incompleted or not attempted
2052 2055
                 $restart = 0;
2053 2056
             }
2054 2057
         } else {
@@ -2989,7 +2992,8 @@  discard block
 block discarded – undo
2989 2992
                     // Do nothing, just let the local attributes be used.
2990 2993
                 }
2991 2994
             }
2992
-        } else { // If not SCO, such messages should not be expected.
2995
+        } else {
2996
+// If not SCO, such messages should not be expected.
2993 2997
             $type = strtolower($this->type);
2994 2998
             switch ($type) {
2995 2999
                 case 'asset':
@@ -3429,8 +3433,7 @@  discard block
 block discarded – undo
3429 3433
         }
3430 3434
         if ($scorm_time == '0'
3431 3435
                 and ($this->type != 'sco')
3432
-                and $this->current_start_time != 0)
3433
-        {
3436
+                and $this->current_start_time != 0) {
3434 3437
             $my_time = time() - $this->current_start_time;
3435 3438
             if ($my_time > 0) {
3436 3439
                 $this->update_time($my_time);
Please login to merge, or discard this patch.
main/lp/lp_ajax_save_item.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -55,7 +55,8 @@  discard block
 block discarded – undo
55 55
     $lmsFinish = 0,
56 56
     $userNavigatesAway = 0,
57 57
     $statusSignalReceived = 0
58
-) {
58
+)
59
+{
59 60
     //global $debug;
60 61
     $debug = 0;
61 62
     $return = null;
@@ -477,7 +478,8 @@  discard block
 block discarded – undo
477 478
     if (is_array($_REQUEST['interact'])) {
478 479
         foreach ($_REQUEST['interact'] as $idx => $interac) {
479 480
             $interactions[$idx] = preg_split('/,/', substr($interac, 1, -1));
480
-            if (!isset($interactions[$idx][7])) { // Make sure there are 7 elements.
481
+            if (!isset($interactions[$idx][7])) {
482
+// Make sure there are 7 elements.
481 483
                 $interactions[$idx][7] = '';
482 484
             }
483 485
         }
Please login to merge, or discard this patch.
main/tracking/exams.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -380,7 +380,8 @@
 block discarded – undo
380 380
  * @param $b
381 381
  * @return int
382 382
  */
383
-function sort_user($a, $b) {
383
+function sort_user($a, $b)
384
+{
384 385
     if (is_numeric($a['score']) && is_numeric($b['score'])) {
385 386
         if ($a['score'] < $b['score']) {
386 387
             return 1;
Please login to merge, or discard this patch.
main/tracking/userlogCSV.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -163,7 +163,8 @@  discard block
 block discarded – undo
163 163
             // just sum $i up
164 164
         }
165 165
 
166
-    } else { // if uInfo is set
166
+    } else {
167
+// if uInfo is set
167 168
         /*
168 169
          * Informations about student uInfo
169 170
          */
@@ -333,6 +334,7 @@  discard block
 block discarded – undo
333 334
     echo api_html_entity_decode($title_line, ENT_QUOTES, $charset);
334 335
     echo api_html_entity_decode($line, ENT_QUOTES, $charset);
335 336
     exit;
336
-} else { // not allowed
337
+} else {
338
+// not allowed
337 339
     api_not_allowed();
338 340
 }
Please login to merge, or discard this patch.
main/gradebook/lib/be/exerciselink.class.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -419,7 +419,8 @@
 block discarded – undo
419 419
         return false;
420 420
     }
421 421
 
422
-    public function is_allowed_to_change_name() {
422
+    public function is_allowed_to_change_name()
423
+    {
423 424
         return false;
424 425
     }
425 426
 
Please login to merge, or discard this patch.