Completed
Push — 1.11.x ( 7ffd51...902ebd )
by José
50:21 queued 21:28
created
main/install/index.php 1 patch
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -445,7 +445,10 @@
 block discarded – undo
445 445
     }
446 446
 }
447 447
     ?>
448
-    <input type="hidden" name="updatePath"         value="<?php if (!$badUpdatePath) echo api_htmlentities($proposedUpdatePath, ENT_QUOTES); ?>" />
448
+    <input type="hidden" name="updatePath"         value="<?php if (!$badUpdatePath) {
449
+    echo api_htmlentities($proposedUpdatePath, ENT_QUOTES);
450
+}
451
+?>" />
449 452
     <input type="hidden" name="urlAppendPath"      value="<?php echo api_htmlentities($urlAppendPath, ENT_QUOTES); ?>" />
450 453
     <input type="hidden" name="pathForm"           value="<?php echo api_htmlentities($pathForm, ENT_QUOTES); ?>" />
451 454
     <input type="hidden" name="urlForm"            value="<?php echo api_htmlentities($urlForm, ENT_QUOTES); ?>" />
Please login to merge, or discard this patch.
main/lp/storageapi.php 2 patches
Switch Indentation   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -15,52 +15,52 @@
 block discarded – undo
15 15
 }
16 16
 
17 17
 switch ($_REQUEST['action']) {
18
-    case "get":
19
-        print storage_get($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
20
-        break;
21
-    case "set":
22
-        if (storage_can_set($_REQUEST['svuser'])) {
23
-            print storage_set($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svvalue']);
24
-        }
25
-        break;
26
-    case "getall":
27
-        print storage_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco']);
28
-        break;
29
-    case "stackpush":
30
-        if (storage_can_set($_REQUEST['svuser'])) {
31
-            print storage_stack_push($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svvalue']);
32
-        }
33
-        break;
34
-    case "stackpop":
35
-        if (storage_can_set($_REQUEST['svuser'])) {
36
-            print storage_stack_pop($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
37
-        }
38
-        break;
39
-    case "stacklength":
40
-        print storage_stack_length($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
41
-        break;
42
-    case "stackclear":
43
-        if (storage_can_set($_REQUEST['svuser'])) {
44
-            print storage_stack_clear($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
45
-        }
46
-        break;
47
-    case "stackgetall":
48
-        if (storage_can_set($_REQUEST['svuser']))
49
-            print storage_stack_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
50
-        break;
51
-    case "getposition":
52
-        print storage_get_position($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc']);
53
-        break;
54
-    case "getleaders":
55
-        print storage_get_leaders($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc'], $_REQUEST['svlength']);
56
-        break;
57
-    case "usersgetall":
58
-// security issue
59
-        print "NOT allowed, security issue, see sources";
60
-//		print storage_get_all_users();
61
-        break;
62
-    default:
63
-        // Do nothing
18
+        case "get":
19
+            print storage_get($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
20
+            break;
21
+        case "set":
22
+            if (storage_can_set($_REQUEST['svuser'])) {
23
+                print storage_set($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svvalue']);
24
+            }
25
+            break;
26
+        case "getall":
27
+            print storage_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco']);
28
+            break;
29
+        case "stackpush":
30
+            if (storage_can_set($_REQUEST['svuser'])) {
31
+                print storage_stack_push($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svvalue']);
32
+            }
33
+            break;
34
+        case "stackpop":
35
+            if (storage_can_set($_REQUEST['svuser'])) {
36
+                print storage_stack_pop($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
37
+            }
38
+            break;
39
+        case "stacklength":
40
+            print storage_stack_length($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
41
+            break;
42
+        case "stackclear":
43
+            if (storage_can_set($_REQUEST['svuser'])) {
44
+                print storage_stack_clear($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
45
+            }
46
+            break;
47
+        case "stackgetall":
48
+            if (storage_can_set($_REQUEST['svuser']))
49
+                print storage_stack_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
50
+            break;
51
+        case "getposition":
52
+            print storage_get_position($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc']);
53
+            break;
54
+        case "getleaders":
55
+            print storage_get_leaders($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc'], $_REQUEST['svlength']);
56
+            break;
57
+        case "usersgetall":
58
+    // security issue
59
+            print "NOT allowed, security issue, see sources";
60
+    //		print storage_get_all_users();
61
+            break;
62
+        default:
63
+            // Do nothing
64 64
 }
65 65
 
66 66
 function storage_can_set($sv_user) {
Please login to merge, or discard this 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/upload/upload.php 1 patch
Switch Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -31,14 +31,14 @@
 block discarded – undo
31 31
  * Redirect to the correct script to handle this type of upload
32 32
  */
33 33
 switch ($toolFromSession) {
34
-    case TOOL_LEARNPATH:
35
-        require 'upload.scorm.php';
36
-        break;
37
-    //the following cases need to be distinguished later on
38
-    case TOOL_DROPBOX:
39
-    case TOOL_STUDENTPUBLICATION:
40
-    case TOOL_DOCUMENT:
41
-    default:
42
-        require 'upload.document.php';
43
-        break;
34
+        case TOOL_LEARNPATH:
35
+            require 'upload.scorm.php';
36
+            break;
37
+        //the following cases need to be distinguished later on
38
+        case TOOL_DROPBOX:
39
+        case TOOL_STUDENTPUBLICATION:
40
+        case TOOL_DOCUMENT:
41
+        default:
42
+            require 'upload.document.php';
43
+            break;
44 44
 }
Please login to merge, or discard this patch.
main/user/user_export.php 1 patch
Switch Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -149,15 +149,15 @@
 block discarded – undo
149 149
 }
150 150
 
151 151
 switch ($file_type) {
152
-    case 'xml':
153
-        Export::arrayToXml($data, $filename, 'Contact', 'Contacts');
154
-        exit;
155
-        break;
156
-    case 'csv':
157
-        Export::arrayToCsv($data, $filename);
158
-        exit;
159
-    case 'xls':
160
-        Export::arrayToXls($data, $filename);
161
-        exit;
162
-        break;
152
+        case 'xml':
153
+            Export::arrayToXml($data, $filename, 'Contact', 'Contacts');
154
+            exit;
155
+            break;
156
+        case 'csv':
157
+            Export::arrayToCsv($data, $filename);
158
+            exit;
159
+        case 'xls':
160
+            Export::arrayToXls($data, $filename);
161
+            exit;
162
+            break;
163 163
 }
164 164
\ No newline at end of file
Please login to merge, or discard this patch.
main/admin/user_update_import.php 1 patch
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -464,7 +464,10 @@
 block discarded – undo
464 464
 <blockquote>
465 465
     <pre>
466 466
         <b>UserName</b>;LastName;FirstName;Email;NewUserName;Password;AuthSource;OfficialCode;PhoneNumber;Status;ExpiryDate;Active;Language;Courses;ClassId;
467
-        xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;user/teacher/drh;YYYY-MM-DD 00:00:00;0/1;xxx;<span style="color:red;"><?php if (count($list_reponse) > 0) echo implode(';', $list_reponse).';'; ?></span>xxx1|xxx2|xxx3;1;<br />
467
+        xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;user/teacher/drh;YYYY-MM-DD 00:00:00;0/1;xxx;<span style="color:red;"><?php if (count($list_reponse) > 0) {
468
+    echo implode(';', $list_reponse).';';
469
+}
470
+?></span>xxx1|xxx2|xxx3;1;<br />
468 471
     </pre>
469 472
 </blockquote>
470 473
 <p><?php
Please login to merge, or discard this patch.
plugin/buycourses/src/configuration.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,12 +40,12 @@
 block discarded – undo
40 40
 $tpl->assign('sessions_are_included', $includeSession);
41 41
 $tpl->assign('services_are_included', $includeServices);
42 42
 
43
-if ($includeSession) {
43
+if ($includeSession) {
44 44
     $sessions = $plugin->getSessionsForConfiguration();
45 45
     $tpl->assign('sessions', $sessions);
46 46
 }
47 47
 
48
-if ($includeServices) {
48
+if ($includeServices) {
49 49
     $services = $plugin->getServices();
50 50
     $tpl->assign('services', $services);
51 51
 }
Please login to merge, or discard this patch.
plugin/buycourses/src/course_catalog.php 1 patch
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
     FormValidator::LAYOUT_INLINE
28 28
 );
29 29
 
30
-if ($form->validate()) {
30
+if ($form->validate()) {
31 31
     $formValues = $form->getSubmitValues();
32 32
     $nameFilter = isset($formValues['name']) ? $formValues['name'] : null;
33 33
     $minFilter = isset($formValues['min']) ? $formValues['min'] : 0;
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 $courseList = $plugin->getCatalogCourseList($nameFilter, $minFilter, $maxFilter);
55 55
 
56 56
 //View
57
-if (api_is_platform_admin()) {
57
+if (api_is_platform_admin()) {
58 58
     $interbreadcrumb[] = [
59 59
         'url' => 'configuration.php',
60 60
         'name' => $plugin->get_lang('AvailableCoursesConfiguration')
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
         'url' => 'paymentsetup.php',
64 64
         'name' => $plugin->get_lang('PaymentsConfiguration')
65 65
     ];
66
-} else {
66
+} else {
67 67
     $interbreadcrumb[] = [
68 68
         'url' => 'course_panel.php',
69 69
         'name' => get_lang('TabsDashboard')
Please login to merge, or discard this patch.
plugin/buycourses/src/index.buycourses.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@
 block discarded – undo
9 9
 $plugin = BuyCoursesPlugin::create();
10 10
 $guess_enable = $plugin->get('unregistered_users_enable');
11 11
 
12
-if ($guess_enable == "true" || isset($_SESSION['_user'])) {
12
+if ($guess_enable == "true" || isset($_SESSION['_user'])) {
13 13
     // If the user is NOT an administrator, redirect it to course/session buy list
14
-    if (!api_is_platform_admin()) {
14
+    if (!api_is_platform_admin()) {
15 15
         header('Location: src/course_panel.php');
16 16
         exit;
17 17
     }
Please login to merge, or discard this patch.
plugin/buycourses/src/paymentsetup.php 1 patch
Braces   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -18,8 +18,8 @@  discard block
 block discarded – undo
18 18
 $commissionsEnable = $plugin->get('commissions_enable');
19 19
 $culqiEnable = $plugin->get('culqi_enable');
20 20
 
21
-if (isset($_GET['action'], $_GET['id'])) {
22
-    if ($_GET['action'] == 'delete_taccount') {
21
+if (isset($_GET['action'], $_GET['id'])) {
22
+    if ($_GET['action'] == 'delete_taccount') {
23 23
         $plugin->deleteTransferAccount($_GET['id']);
24 24
 
25 25
         Display::addFlash(
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 
34 34
 $currencyForm = new FormValidator('currency');
35 35
 
36
-if ($currencyForm->validate()) {
36
+if ($currencyForm->validate()) {
37 37
     $currencyFormValues = $currencyForm->getSubmitValues();
38 38
 
39 39
     $plugin->selectCurrency($currencyFormValues['currency']);
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
     [get_lang('Select')]
60 60
 );
61 61
 
62
-foreach ($currencies as $currency) {
62
+foreach ($currencies as $currency) {
63 63
     $currencyText = implode(
64 64
         ' => ',
65 65
         [
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 
72 72
     $currencySelect->addOption($currencyText, $currencyValue);
73 73
 
74
-    if ($currency['status']) {
74
+    if ($currency['status']) {
75 75
         $currencySelect->setSelected($currencyValue);
76 76
     }
77 77
 }
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 
85 85
 $paypalForm = new FormValidator('paypal');
86 86
 
87
-if ($paypalForm->validate()) {
87
+if ($paypalForm->validate()) {
88 88
     $paypalFormValues = $paypalForm->getSubmitValues();
89 89
 
90 90
     $plugin->savePaypalParams($paypalFormValues);
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 
124 124
 $commissionForm = new FormValidator('commissions');
125 125
 
126
-if ($commissionForm->validate()) {
126
+if ($commissionForm->validate()) {
127 127
     $commissionFormValues = $commissionForm->getSubmitValues();
128 128
 
129 129
     $plugin->updateCommission($commissionFormValues);
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 
150 150
 $transferForm = new FormValidator('transfer_account');
151 151
 
152
-if ($transferForm->validate()) {
152
+if ($transferForm->validate()) {
153 153
     $transferFormValues = $transferForm->getSubmitValues();
154 154
 
155 155
     $plugin->saveTransferAccount($transferFormValues);
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 
189 189
 $culqiForm = new FormValidator('culqi_config');
190 190
 
191
-if ($culqiForm->validate()) {
191
+if ($culqiForm->validate()) {
192 192
     $culqiFormValues = $culqiForm->getSubmitValues();
193 193
 
194 194
     $plugin->saveCulqiParameters($culqiFormValues);
Please login to merge, or discard this patch.