Completed
Push — 1.10.x ( fe0e5a...3a6f9c )
by Yannick
134:15 queued 86:39
created
app/Migrations/Schema/V110/Version20151221150100.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
             WHERE
27 27
                 a.answer = qa.id AND
28 28
                 q.c_id = a.c_id AND
29
-                q.type IN (" . MATCHING . ", " . DRAGGABLE . ", " . MATCHING_DRAGGABLE . ")
29
+                q.type IN (" . MATCHING.", ".DRAGGABLE.", ".MATCHING_DRAGGABLE.")
30 30
         ");
31 31
 
32 32
         $this->addSql("
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
             WHERE
40 40
                 a.correct = b.id AND
41 41
                 q.c_id = a.c_id AND
42
-                q.type IN (" . MATCHING . ", " . DRAGGABLE . ", " . MATCHING_DRAGGABLE . ")
42
+                q.type IN (" . MATCHING.", ".DRAGGABLE.", ".MATCHING_DRAGGABLE.")
43 43
         ");
44 44
     }
45 45
 
Please login to merge, or discard this patch.
app/Migrations/Schema/V110/Version20150522222222.php 1 patch
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
             '',
67 67
             'radio',
68 68
             'Course',
69
-            ($value?$value:'true'),
69
+            ($value ? $value : 'true'),
70 70
             'AllowLearningPathReturnLinkTitle',
71 71
             'AllowLearningPathReturnLinkComment',
72 72
             null,
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
             '',
85 85
             'radio',
86 86
             'Course',
87
-            ($value?$value:'false'),
87
+            ($value ? $value : 'false'),
88 88
             'HideScormExportLinkTitle',
89 89
             'HideScormExportLinkComment',
90 90
             null,
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
             '',
104 104
             'radio',
105 105
             'Course',
106
-            ($value?$value:'false'),
106
+            ($value ? $value : 'false'),
107 107
             'HideScormCopyLinkTitle',
108 108
             'HideScormCopyLinkComment',
109 109
             null,
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
             '',
123 123
             'radio',
124 124
             'Course',
125
-            ($value?$value:'false'),
125
+            ($value ? $value : 'false'),
126 126
             'HideScormPdfLinkTitle',
127 127
             'HideScormPdfLinkComment',
128 128
             null,
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
             '',
142 142
             'textfield',
143 143
             'Session',
144
-            ($value?$value:'0'),
144
+            ($value ? $value : '0'),
145 145
             'SessionDaysBeforeCoachAccessTitle',
146 146
             'SessionDaysBeforeCoachAccessComment',
147 147
             null,
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
             '',
161 161
             'textfield',
162 162
             'Session',
163
-            ($value?$value:'0'),
163
+            ($value ? $value : '0'),
164 164
             'SessionDaysAfterCoachAccessTitle',
165 165
             'SessionDaysAfterCoachAccessComment',
166 166
             null,
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
             '',
179 179
             'radio',
180 180
             'Course',
181
-            ($value?$value:'false'),
181
+            ($value ? $value : 'false'),
182 182
             'PdfLogoHeaderTitle',
183 183
             'PdfLogoHeaderComment',
184 184
             null,
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
             '',
198 198
             'radio',
199 199
             'Platform',
200
-            ($value?$value:'false'),
200
+            ($value ? $value : 'false'),
201 201
             'OrderUserListByOfficialCodeTitle',
202 202
             'OrderUserListByOfficialCodeComment',
203 203
             null,
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
             '',
217 217
             'radio',
218 218
             'Course',
219
-            ($value?$value:'true'),
219
+            ($value ? $value : 'true'),
220 220
             'AlertManagerOnNewQuizTitle',
221 221
             'AlertManagerOnNewQuizComment',
222 222
             null,
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
             '',
236 236
             'radio',
237 237
             'Tools',
238
-            ($value?$value:'false'),
238
+            ($value ? $value : 'false'),
239 239
             'ShowOfficialCodeInExerciseResultListTitle',
240 240
             'ShowOfficialCodeInExerciseResultListComment',
241 241
             null,
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
             '',
256 256
             'radio',
257 257
             'Platform',
258
-            ($value?$value:'false'),
258
+            ($value ? $value : 'false'),
259 259
             'HidePrivateCoursesFromCourseCatalogTitle',
260 260
             'HidePrivateCoursesFromCourseCatalogComment',
261 261
             null,
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
             '',
276 276
             'radio',
277 277
             'Platform',
278
-            ($value?$value:'0'),
278
+            ($value ? $value : '0'),
279 279
             'CoursesCatalogueShowSessionsTitle',
280 280
             'CoursesCatalogueShowSessionsComment',
281 281
             null,
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
             '',
295 295
             'radio',
296 296
             'Platform',
297
-            ($value?$value:'true'),
297
+            ($value ? $value : 'true'),
298 298
             'AutoDetectLanguageCustomPagesTitle',
299 299
             'AutoDetectLanguageCustomPagesComment',
300 300
             null,
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
             '',
314 314
             'radio',
315 315
             'Tools',
316
-            ($value?$value:'false'),
316
+            ($value ? $value : 'false'),
317 317
             'LearningPathShowReducedReportTitle',
318 318
             'LearningPathShowReducedReportComment',
319 319
             null,
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
             '',
333 333
             'radio',
334 334
             'Session',
335
-            ($value?$value:'false'),
335
+            ($value ? $value : 'false'),
336 336
             'AllowSessionCourseCopyForTeachersTitle',
337 337
             'AllowSessionCourseCopyForTeachersComment',
338 338
             null,
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
             '',
352 352
             'radio',
353 353
             'Security',
354
-            ($value?$value:'false'),
354
+            ($value ? $value : 'false'),
355 355
             'HideLogoutButtonTitle',
356 356
             'HideLogoutButtonComment',
357 357
             null,
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
             '',
371 371
             'radio',
372 372
             'Platform',
373
-            ($value?$value:'false'),
373
+            ($value ? $value : 'false'),
374 374
             'RedirectAdminToCoursesListTitle',
375 375
             'RedirectAdminToCoursesListComment',
376 376
             null,
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
389 389
             '',
390 390
             'radio',
391 391
             'Course',
392
-            ($value?$value:'false'),
392
+            ($value ? $value : 'false'),
393 393
             'CourseImagesInCoursesListTitle',
394 394
             'CourseImagesInCoursesListComment',
395 395
             null,
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
             '',
409 409
             'radio',
410 410
             'Gradebook',
411
-            ($value?$value:'first'),
411
+            ($value ? $value : 'first'),
412 412
             'StudentPublicationSelectionForGradebookTitle',
413 413
             'StudentPublicationSelectionForGradebookComment',
414 414
             null,
@@ -427,7 +427,7 @@  discard block
 block discarded – undo
427 427
             '',
428 428
             'radio',
429 429
             'Gradebook',
430
-            ($value?$value:'false'),
430
+            ($value ? $value : 'false'),
431 431
             'FilterCertificateByOfficialCodeTitle',
432 432
             'FilterCertificateByOfficialCodeComment',
433 433
             null,
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
             '',
448 448
             'textfield',
449 449
             'Tools',
450
-            ($value?$value:'0'),
450
+            ($value ? $value : '0'),
451 451
             'MaxCKeditorsOnExerciseResultsPageTitle',
452 452
             'MaxCKeditorsOnExerciseResultsPageComment',
453 453
             null,
@@ -466,7 +466,7 @@  discard block
 block discarded – undo
466 466
             '',
467 467
             'radio',
468 468
             'Tools',
469
-            ($value?$value:'rename'),
469
+            ($value ? $value : 'rename'),
470 470
             'DocumentDefaultOptionIfFileExistsTitle',
471 471
             'DocumentDefaultOptionIfFileExistsComment',
472 472
             null,
@@ -484,7 +484,7 @@  discard block
 block discarded – undo
484 484
             '',
485 485
             'radio',
486 486
             'Tools',
487
-            ($value?$value:'false'),
487
+            ($value ? $value : 'false'),
488 488
             'GradebookCronTaskGenerationTitle',
489 489
             'GradebookCronTaskGenerationComment',
490 490
             null,
@@ -503,7 +503,7 @@  discard block
 block discarded – undo
503 503
             '',
504 504
             'textfield',
505 505
             'Gradebook',
506
-            ($value?$value:'https://backpack.openbadges.org/'),
506
+            ($value ? $value : 'https://backpack.openbadges.org/'),
507 507
             'OpenBadgesBackpackUrlTitle',
508 508
             'OpenBadgesBackpackUrlComment',
509 509
             null,
@@ -522,7 +522,7 @@  discard block
 block discarded – undo
522 522
             '',
523 523
             'radio',
524 524
             'Tools',
525
-            ($value?$value:'false'),
525
+            ($value ? $value : 'false'),
526 526
             'CookieWarningTitle',
527 527
             'CookieWarningComment',
528 528
             null,
@@ -541,7 +541,7 @@  discard block
 block discarded – undo
541 541
             '',
542 542
             'radio',
543 543
             'Tools',
544
-            ($value?$value:'false'),
544
+            ($value ? $value : 'false'),
545 545
             'HideCourseGroupIfNoToolAvailableTitle',
546 546
             'HideCourseGroupIfNoToolAvailableComment',
547 547
             null,
@@ -560,7 +560,7 @@  discard block
 block discarded – undo
560 560
             '',
561 561
             'radio',
562 562
             'Session',
563
-            ($value?$value:'false'),
563
+            ($value ? $value : 'false'),
564 564
             'CatalogueAllowSessionAutoSubscriptionTitle',
565 565
             'CatalogueAllowSessionAutoSubscriptionComment',
566 566
             null,
@@ -579,7 +579,7 @@  discard block
 block discarded – undo
579 579
             '',
580 580
             'radio',
581 581
             'Platform',
582
-            ($value?$value:'false'),
582
+            ($value ? $value : 'false'),
583 583
             'SoapRegistrationDecodeUtf8Title',
584 584
             'SoapRegistrationDecodeUtf8Comment',
585 585
             null,
@@ -598,7 +598,7 @@  discard block
 block discarded – undo
598 598
             '',
599 599
             'radio',
600 600
             'Tools',
601
-            ($value?$value:'false'),
601
+            ($value ? $value : 'false'),
602 602
             'AttendanceDeletionEnableTitle',
603 603
             'AttendanceDeletionEnableComment',
604 604
             null,
@@ -617,7 +617,7 @@  discard block
 block discarded – undo
617 617
             '',
618 618
             'radio',
619 619
             'Platform',
620
-            ($value?$value:'false'),
620
+            ($value ? $value : 'false'),
621 621
             'GravatarPicturesTitle',
622 622
             'GravatarPicturesComment',
623 623
             null,
@@ -637,7 +637,7 @@  discard block
 block discarded – undo
637 637
             '',
638 638
             'radio',
639 639
             'Platform',
640
-            ($value?$value:'mm'),
640
+            ($value ? $value : 'mm'),
641 641
             'GravatarPicturesTypeTitle',
642 642
             'GravatarPicturesTypeComment',
643 643
             null,
@@ -663,7 +663,7 @@  discard block
 block discarded – undo
663 663
             '',
664 664
             'radio',
665 665
             'Session',
666
-            ($value?$value:'false'),
666
+            ($value ? $value : 'false'),
667 667
             'SessionAdminPermissionsLimitTitle',
668 668
             'SessionAdminPermissionsLimitComment',
669 669
             null,
@@ -682,7 +682,7 @@  discard block
 block discarded – undo
682 682
             '',
683 683
             'radio',
684 684
             'Session',
685
-            ($value?$value:'false'),
685
+            ($value ? $value : 'false'),
686 686
             'ShowSessionDescriptionTitle',
687 687
             'ShowSessionDescriptionComment',
688 688
             null,
@@ -701,7 +701,7 @@  discard block
 block discarded – undo
701 701
             '',
702 702
             'radio',
703 703
             'Gradebook',
704
-            ($value?$value:'false'),
704
+            ($value ? $value : 'false'),
705 705
             'CertificateHideExportLinkStudentTitle',
706 706
             'CertificateHideExportLinkStudentComment',
707 707
             null,
@@ -720,7 +720,7 @@  discard block
 block discarded – undo
720 720
             '',
721 721
             'radio',
722 722
             'Gradebook',
723
-            ($value?$value:'false'),
723
+            ($value ? $value : 'false'),
724 724
             'CertificateHideExportLinkTitle',
725 725
             'CertificateHideExportLinkComment',
726 726
             null,
@@ -775,7 +775,7 @@  discard block
 block discarded – undo
775 775
             '',
776 776
             'radio',
777 777
             'Security',
778
-            ($value?$value:'false'),
778
+            ($value ? $value : 'false'),
779 779
             'SSOForceRedirectTitle',
780 780
             'SSOForceRedirectComment',
781 781
             null,
@@ -796,7 +796,7 @@  discard block
 block discarded – undo
796 796
             '',
797 797
             'radio',
798 798
             'Session',
799
-            ($value?$value:'false'),
799
+            ($value ? $value : 'false'),
800 800
             'SessionCourseOrderingTitle',
801 801
             'SessionCourseOrderingComment',
802 802
             null,
Please login to merge, or discard this patch.
app/Migrations/Schema/V110/Version20151214170800.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
 
40 40
         foreach ($answers as $answer) {
41 41
             // Recover the real image size to recalculate coordinates
42
-            $imagePath = api_get_path(SYS_PATH) . "courses/{$answer['directory']}/document/images/{$answer['picture']}";
42
+            $imagePath = api_get_path(SYS_PATH)."courses/{$answer['directory']}/document/images/{$answer['picture']}";
43 43
             $imageSize = getimagesize($imagePath);
44 44
             $widthRatio = $imageSize[0] / 360;
45 45
             $heightRatio = $imageSize[1] / 360;
Please login to merge, or discard this patch.
app/config/events.conf.dist.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
         'self_sent' => false, // this key states that we can't add user to this event through the admin panel
24 24
         'name_lang_var' => get_lang('PortalHomepageEdited'),
25 25
         'desc_lang_var' => get_lang('PortalHomepageEdited'),
26
-        'available_keyvars' => array (// keys used for the mail template
26
+        'available_keyvars' => array(// keys used for the mail template
27 27
             'url'           => 'portal',
28 28
             'sitename'      => 'sitename',
29 29
             'firstname'     => 'firstname',
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
         'self_sent' => true, // this key states that we can't add user to this event through the admin panel
46 46
         'name_lang_var' => get_lang('UserRegistrationTitle'),
47 47
         'desc_lang_var' => get_lang('UserRegistrationComment'),
48
-        'available_keyvars' => array (// keys used for the mail template
48
+        'available_keyvars' => array(// keys used for the mail template
49 49
             'url'           => 'portal',
50 50
             'sitename'      => 'sitename',
51 51
             'firstname'     => 'firstname',
Please login to merge, or discard this patch.
app/config/auth.conf.dist.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
   //String used to search the user in ldap. %username will ber replaced by the username.
58 58
   //See extldap_get_user_search_string() function below
59 59
 //  'user_search' => 'sAMAccountName=%username%',  // no () arround the string
60
-  'user_search' => 'uid=%username%',  // no () arround the string
60
+  'user_search' => 'uid=%username%', // no () arround the string
61 61
   //encoding used in ldap (most common are UTF-8 and ISO-8859-1
62 62
   'encoding' => 'UTF-8',
63 63
   //Set to true if user info have to be update at each login
Please login to merge, or discard this patch.
user_portal.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
     $folder_icon = api_get_path(WEB_IMG_PATH).'icons/22/folder.png';
49 49
     $close_icon = api_get_path(WEB_IMG_PATH).'loading1.gif';
50 50
 
51
-    $htmlHeadXtra[] =  '<script type="text/javascript">
51
+    $htmlHeadXtra[] = '<script type="text/javascript">
52 52
 	$(document).ready(function() {
53 53
 		$(".document_preview_container").hide();
54 54
 		$(".document_preview").click(function() {
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 if ($displayMyCourseViewBySessionLink) {
82 82
     $htmlHeadXtra[] = '
83 83
     <script type="text/javascript">
84
-        userId = ' . $userId . '
84
+        userId = ' . $userId.'
85 85
         $(document).ready(function() {
86 86
             changeMyCoursesView($.cookie("defaultMyCourseView"+userId));
87 87
         });
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
         function changeMyCoursesView(inView)
94 94
         {
95 95
             $.cookie("defaultMyCourseView"+userId, inView, { expires: 365 });
96
-            if (inView == ' . IndexManager::VIEW_BY_SESSION . ') {
96
+            if (inView == ' . IndexManager::VIEW_BY_SESSION.') {
97 97
                 $("#viewBySession").addClass("btn-primary");
98 98
                 $("#viewByDefault").removeClass("btn-primary");
99 99
             } else {
@@ -153,16 +153,16 @@  discard block
 block discarded – undo
153 153
             if (isset($sessionInfo['courses']) && count($sessionInfo['courses']) == 1) {
154 154
                 $courseCode = $sessionInfo['courses'][0]['code'];
155 155
                 $courseInfo = api_get_course_info_by_id($sessionInfo['courses'][0]['real_id']);
156
-                $courseUrl = $courseInfo['course_public_url'] . '?id_session=' . $sessionInfo['session_id'];
157
-                header('Location:' . $courseUrl);
156
+                $courseUrl = $courseInfo['course_public_url'].'?id_session='.$sessionInfo['session_id'];
157
+                header('Location:'.$courseUrl);
158 158
                 exit;
159 159
             }
160 160
 
161 161
             // Session has many courses.
162 162
             if (isset($sessionInfo['session_id'])) {
163
-                $url = api_get_path(WEB_CODE_PATH) . 'session/?session_id=' . $sessionInfo['session_id'];
163
+                $url = api_get_path(WEB_CODE_PATH).'session/?session_id='.$sessionInfo['session_id'];
164 164
 
165
-                header('Location:' . $url);
165
+                header('Location:'.$url);
166 166
                 exit;
167 167
             }
168 168
         }
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
             $courseInfo = api_get_course_info_by_id($courses[0]['real_id']);
179 179
             if (!empty($courseInfo)) {
180 180
                 $courseUrl = $courseInfo['course_public_url'];
181
-                header('Location:' . $courseUrl);
181
+                header('Location:'.$courseUrl);
182 182
                 exit;
183 183
             }
184 184
         }
Please login to merge, or discard this patch.
news_list.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
 }
19 19
 
20 20
 if (!isset($_GET['id']) || empty($_GET['id'])) {
21
-    $content =  SystemAnnouncementManager::display_announcements_slider($visibility, $_GET['id']);
21
+    $content = SystemAnnouncementManager::display_announcements_slider($visibility, $_GET['id']);
22 22
 } else {
23 23
     $content = SystemAnnouncementManager::displayAnnouncement($_GET['id'], $visibility);
24 24
 }
Please login to merge, or discard this patch.
main/gamification/my_progress.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
     $UserIsSubscribedToSession = SessionManager::isUserSubscribedAsStudent($lastSessionId, $user->getId());
43 43
 
44 44
     if (!empty($lastSessionId) && $UserIsSubscribedToSession) {
45
-        $urlWithSession = api_get_self() . '?' . http_build_query([
45
+        $urlWithSession = api_get_self().'?'.http_build_query([
46 46
             'session_id' => $lastCourseAccess->getSessionId()
47 47
         ]);
48 48
 
@@ -116,13 +116,13 @@  discard block
 block discarded – undo
116 116
         foreach ($learningPathList->list as $learningPathId => $learningPath) {
117 117
             $courseData['stats'][] = [
118 118
                 $learningPath['lp_name'],
119
-                'newscorm/lp_controller.php?' . http_build_query([
119
+                'newscorm/lp_controller.php?'.http_build_query([
120 120
                     'action' => 'stats',
121 121
                     'cidReq' => $course->getCode(),
122 122
                     'id_session' => $currentSession->getId(),
123 123
                     'gidReq' => 0,
124 124
                     'lp_id' => $learningPathId
125
-                ]) . api_get_cidreq()
125
+                ]).api_get_cidreq()
126 126
             ];
127 127
         }
128 128
 
Please login to merge, or discard this patch.
main/auth/openid/xrds.lib.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@
 block discarded – undo
42 42
 
43 43
   $name = _xrds_strip_namespace($name);
44 44
   if ($name == 'SERVICE') {
45
-    if (in_array(OPENID_NS_2_0 .'/signon', $xrds_current_service['types']) ||
46
-        in_array(OPENID_NS_2_0 .'/server', $xrds_current_service['types'])) {
45
+    if (in_array(OPENID_NS_2_0.'/signon', $xrds_current_service['types']) ||
46
+        in_array(OPENID_NS_2_0.'/server', $xrds_current_service['types'])) {
47 47
       $xrds_current_service['version'] = 2;
48 48
     }
49 49
     elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) ||
Please login to merge, or discard this patch.