Completed
Push — 1.10.x ( f2aaaf...ef00db )
by Yannick
241:15 queued 197:35
created
main/newscorm/scorm_api.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -458,8 +458,8 @@
 block discarded – undo
458 458
     } else if(param == 'cmi.core.student_name'){
459 459
         // ---- cmi.core.student_name
460 460
         <?php
461
-          $who = addslashes($user['complete_name']);
462
-          echo "result='$who';";
461
+            $who = addslashes($user['complete_name']);
462
+            echo "result='$who';";
463 463
         ?>
464 464
     } else if(param == 'cmi.core.lesson_location'){
465 465
         // ---- cmi.core.lesson_location
Please login to merge, or discard this patch.
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 
26 26
 require_once '../inc/global.inc.php';
27 27
 
28
-$file   = (empty($_SESSION['file'])?'':$_SESSION['file']);
28
+$file = (empty($_SESSION['file']) ? '' : $_SESSION['file']);
29 29
 /** @var learnpath $oLP */
30 30
 $oLP = unserialize($_SESSION['lpobject']);
31 31
 /** @var learnpathItem $oItem */
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 
42 42
 header('Content-type: text/javascript');
43 43
 
44
-?>var scorm_logs=<?php echo ((empty($oLP->scorm_debug) or (!api_is_course_admin() && !api_is_platform_admin()) )?'0':'3');?>; //debug log level for SCORM. 0 = none, 1=light, 2=a lot, 3=all - displays logs in log frame
44
+?>var scorm_logs=<?php echo ((empty($oLP->scorm_debug) or (!api_is_course_admin() && !api_is_platform_admin())) ? '0' : '3'); ?>; //debug log level for SCORM. 0 = none, 1=light, 2=a lot, 3=all - displays logs in log frame
45 45
 var lms_logs = 0; //debug log level for LMS actions. 0=none, 1=light, 2=a lot, 3=all
46 46
 
47 47
 // API Object initialization (eases access later on)
@@ -144,25 +144,25 @@  discard block
 block discarded – undo
144 144
 olms.statusSignalReceived = 0;
145 145
 
146 146
 // Strictly scorm variables
147
-olms.score=<?php echo $oItem->get_score();?>;
148
-olms.max='<?php echo $oItem->get_max();?>';
149
-olms.min='<?php echo $oItem->get_min();?>';
150
-olms.lesson_status='<?php echo $oItem->get_status();?>';
151
-olms.session_time='<?php echo $oItem->get_scorm_time('js');?>';
152
-olms.suspend_data = '<?php echo $oItem->get_suspend_data();?>';
153
-olms.lesson_location = '<?php echo $oItem->get_lesson_location();?>';
154
-olms.total_time = '<?php echo $oItem->get_scorm_time('js');?>';
155
-olms.mastery_score = '<?php echo $oItem->get_mastery_score();?>';
147
+olms.score=<?php echo $oItem->get_score(); ?>;
148
+olms.max='<?php echo $oItem->get_max(); ?>';
149
+olms.min='<?php echo $oItem->get_min(); ?>';
150
+olms.lesson_status='<?php echo $oItem->get_status(); ?>';
151
+olms.session_time='<?php echo $oItem->get_scorm_time('js'); ?>';
152
+olms.suspend_data = '<?php echo $oItem->get_suspend_data(); ?>';
153
+olms.lesson_location = '<?php echo $oItem->get_lesson_location(); ?>';
154
+olms.total_time = '<?php echo $oItem->get_scorm_time('js'); ?>';
155
+olms.mastery_score = '<?php echo $oItem->get_mastery_score(); ?>';
156 156
 olms.launch_data = '<?php echo $oItem->get_launch_data(); ?>';
157
-olms.max_time_allowed = '<?php echo $oItem->get_max_time_allowed();?>';
158
-olms.interactions = new Array(<?php echo $oItem->get_interactions_js_array();?>);
157
+olms.max_time_allowed = '<?php echo $oItem->get_max_time_allowed(); ?>';
158
+olms.interactions = new Array(<?php echo $oItem->get_interactions_js_array(); ?>);
159 159
 olms.item_objectives = new Array();
160 160
 olms.info_lms_item = new Array();
161 161
 
162 162
 // Chamilo internal variables (not SCORM)
163 163
 // olms.saved_lesson_status = 'not attempted';
164
-olms.lms_lp_id = <?php echo $oLP->get_id();?>;
165
-olms.lms_item_id = <?php echo $oItem->get_id();?>;
164
+olms.lms_lp_id = <?php echo $oLP->get_id(); ?>;
165
+olms.lms_item_id = <?php echo $oItem->get_id(); ?>;
166 166
 olms.lms_initialized = 0;
167 167
 // switch_finished indicates if the switch process is finished (if it has gone
168 168
 // through LMSInitialize() for the new item. Until then, all LMSSetValue()
@@ -171,26 +171,26 @@  discard block
 block discarded – undo
171 171
 olms.switch_finished = 0;
172 172
 
173 173
 //olms.lms_total_lessons = <?php echo $oLP->get_total_items_count(); ?>;
174
-//olms.lms_complete_lessons = <?php echo $oLP->get_complete_items_count();?>;
175
-//olms.lms_progress_bar_mode = '<?php echo $oLP->progress_bar_mode;?>';
174
+//olms.lms_complete_lessons = <?php echo $oLP->get_complete_items_count(); ?>;
175
+//olms.lms_progress_bar_mode = '<?php echo $oLP->progress_bar_mode; ?>';
176 176
 //if(lms_progress_bar_mode == ''){lms_progress_bar_mode='%';}
177 177
 
178
-olms.lms_view_id = '<?php echo $oLP->get_view();?>';
178
+olms.lms_view_id = '<?php echo $oLP->get_view(); ?>';
179 179
 if(olms.lms_view_id == ''){ olms.lms_view_id = 1;}
180
-olms.lms_user_id = '<?php echo $userId;?>';
181
-olms.lms_next_item = '<?php echo $oLP->get_next_item_id();?>';
182
-olms.lms_previous_item = '<?php echo $oLP->get_previous_item_id();?>';
183
-olms.lms_lp_type = '<?php echo $oLP->get_type();?>';
184
-olms.lms_item_type = '<?php echo $oItem->get_type();?>';
185
-olms.lms_item_credit = '<?php echo $oItem->get_credit();?>';
186
-olms.lms_item_lesson_mode = '<?php echo $oItem->get_lesson_mode();?>';
187
-olms.lms_item_launch_data = '<?php echo addslashes($oItem->get_launch_data());?>';
188
-olms.lms_item_core_exit = '<?php echo $oItem->get_core_exit();?>';
180
+olms.lms_user_id = '<?php echo $userId; ?>';
181
+olms.lms_next_item = '<?php echo $oLP->get_next_item_id(); ?>';
182
+olms.lms_previous_item = '<?php echo $oLP->get_previous_item_id(); ?>';
183
+olms.lms_lp_type = '<?php echo $oLP->get_type(); ?>';
184
+olms.lms_item_type = '<?php echo $oItem->get_type(); ?>';
185
+olms.lms_item_credit = '<?php echo $oItem->get_credit(); ?>';
186
+olms.lms_item_lesson_mode = '<?php echo $oItem->get_lesson_mode(); ?>';
187
+olms.lms_item_launch_data = '<?php echo addslashes($oItem->get_launch_data()); ?>';
188
+olms.lms_item_core_exit = '<?php echo $oItem->get_core_exit(); ?>';
189 189
 olms.lms_course_id = '<?php echo $oLP->get_course_int_id(); ?>';
190 190
 olms.lms_session_id = '<?php echo api_get_session_id(); ?>';
191 191
 olms.lms_course_code = '<?php echo $oLP->getCourseCode(); ?>';
192 192
 olms.lms_course_id =  '<?php echo $oLP->get_course_int_id(); ?>';
193
-<?php echo $oLP->get_items_details_as_js('olms.lms_item_types');?>
193
+<?php echo $oLP->get_items_details_as_js('olms.lms_item_types'); ?>
194 194
 
195 195
 // Following definition of cmi.core.score.raw in SCORM 1.2, "LMS should
196 196
 // initialize this to an empty string ("") upon initial launch of a SCO. The
@@ -227,8 +227,8 @@  discard block
 block discarded – undo
227 227
     logit_scorm('Other SCORM calls are shown in orange.', 1);
228 228
     logit_lms('To add new messages to these logs, use logit_lms() or logit_scorm().');
229 229
 
230
-    olms.info_lms_item[0] = '<?php echo $oItem->get_id();?>';
231
-    olms.info_lms_item[1] = '<?php echo $oItem->get_id();?>';
230
+    olms.info_lms_item[0] = '<?php echo $oItem->get_id(); ?>';
231
+    olms.info_lms_item[1] = '<?php echo $oItem->get_id(); ?>';
232 232
 
233 233
     $("#content_id").load(function() {
234 234
         logit_lms('#content_id load event starts');
@@ -499,7 +499,7 @@  discard block
 block discarded – undo
499 499
         result = 'id,score,status';
500 500
     } else if(param == 'cmi.objectives._count'){
501 501
     // ---- cmi.objectives._count
502
-        //result='<?php echo $oItem->get_view_count();?>';
502
+        //result='<?php echo $oItem->get_view_count(); ?>';
503 503
         result = olms.item_objectives.length;
504 504
     } else if(param.substring(0,15)== 'cmi.objectives.'){
505 505
         var myres = '';
Please login to merge, or discard this patch.
main/newscorm/lp_add_category.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@
 block discarded – undo
73 73
 
74 74
 echo '<div class="actions">';
75 75
 echo '<a href="lp_controller.php?'.api_get_cidreq().'">'.
76
-    Display::return_icon('back.png', get_lang('ReturnToLearningPaths'),'',ICON_SIZE_MEDIUM).'</a>';
76
+    Display::return_icon('back.png', get_lang('ReturnToLearningPaths'), '', ICON_SIZE_MEDIUM).'</a>';
77 77
 echo '</div>';
78 78
 
79 79
 $form->display();
Please login to merge, or discard this patch.
main/newscorm/lp_edit_item_prereq.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 }
40 40
 if ((!$is_allowed_to_edit) || ($isStudentView)) {
41 41
     error_log('New LP - User not authorized in lp_edit_item_prereq.php');
42
-    header('location:lp_controller.php?action=view&lp_id=' . $learnpath_id);
42
+    header('location:lp_controller.php?action=view&lp_id='.$learnpath_id);
43 43
 }
44 44
 $course_id = api_get_course_int_id();
45 45
 
@@ -55,14 +55,14 @@  discard block
 block discarded – undo
55 55
 
56 56
 if (!empty($gradebook) && $gradebook == 'view') {
57 57
     $interbreadcrumb[] = array(
58
-        'url' => '../gradebook/' . $_SESSION['gradebook_dest'],
58
+        'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
59 59
         'name' => get_lang('ToolGradebook')
60 60
     );
61 61
 }
62 62
 
63 63
 $interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('LearningPaths'));
64
-$interbreadcrumb[] = array('url' => api_get_self() . "?action=build&lp_id=$learnpath_id", 'name' => stripslashes("{$therow['name']}"));
65
-$interbreadcrumb[] = array('url' => api_get_self() . "?action=add_item&type=step&lp_id=$learnpath_id", 'name' => get_lang('NewStep'));
64
+$interbreadcrumb[] = array('url' => api_get_self()."?action=build&lp_id=$learnpath_id", 'name' => stripslashes("{$therow['name']}"));
65
+$interbreadcrumb[] = array('url' => api_get_self()."?action=add_item&type=step&lp_id=$learnpath_id", 'name' => get_lang('NewStep'));
66 66
 
67 67
 // Theme calls.
68 68
 $show_learn_path = true;
Please login to merge, or discard this patch.
main/newscorm/lp_nav.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -46,9 +46,9 @@
 block discarded – undo
46 46
         $lp_theme_css = $my_style;
47 47
     }
48 48
 
49
-    $progress_bar 	= $_SESSION['oLP']->getProgressBar();
49
+    $progress_bar = $_SESSION['oLP']->getProgressBar();
50 50
     $navigation_bar = $_SESSION['oLP']->get_navigation_bar();
51
-    $mediaplayer 	= $_SESSION['oLP']->get_mediaplayer($autostart);
51
+    $mediaplayer = $_SESSION['oLP']->get_mediaplayer($autostart);
52 52
 }
53 53
 session_write_close();
54 54
 ?>
Please login to merge, or discard this patch.
main/newscorm/lp_report.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 
107 107
 // View
108 108
 $interbreadcrumb[] = [
109
-    'url' => api_get_path(WEB_CODE_PATH) . 'newscorm/lp_controller.php?'.api_get_cidreq(),
109
+    'url' => api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?'.api_get_cidreq(),
110 110
     'name' => get_lang('LearningPaths')
111 111
 ];
112 112
 
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
         array(),
118 118
         ICON_SIZE_MEDIUM
119 119
     ),
120
-    api_get_path(WEB_CODE_PATH) . 'newscorm/lp_controller.php?' . api_get_cidreq()
120
+    api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?'.api_get_cidreq()
121 121
 );
122 122
 
123 123
 $template = new Template(get_lang('StudentScore'));
Please login to merge, or discard this patch.
main/newscorm/lp_ajax_save_objectives.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -28,10 +28,10 @@
 block discarded – undo
28 28
         error_log('In xajax_save_objectives('.$lp_id.','.$user_id.','.$view_id.','.$item_id.',"'.(count($objectives) > 0 ? count($objectives) : '').'")', 0);
29 29
     }
30 30
     $mylp = learnpath::getLpFromSession(api_get_course_id(), $lp_id, $user_id);
31
-    $mylpi =& $mylp->items[$item_id];
32
-    if (is_array($objectives) && count($objectives)>0){
33
-        foreach ($objectives as $index=>$objective){
34
-            $mylpi->add_objective($index,$objectives[$index]);
31
+    $mylpi = & $mylp->items[$item_id];
32
+    if (is_array($objectives) && count($objectives) > 0) {
33
+        foreach ($objectives as $index=>$objective) {
34
+            $mylpi->add_objective($index, $objectives[$index]);
35 35
         }
36 36
         $mylpi->write_objectives_to_db();
37 37
     }
Please login to merge, or discard this patch.
main/cron/cleanup.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -15,9 +15,9 @@  discard block
 block discarded – undo
15 15
 $a_dir = realpath($dir.'/../../archive/');
16 16
 $list = scandir($a_dir);
17 17
 // calculate 7 days
18
-$t = time()-(86400*7);
18
+$t = time() - (86400 * 7);
19 19
 foreach ($list as $item) {
20
-    if (substr($item,0,1) == '.') {
20
+    if (substr($item, 0, 1) == '.') {
21 21
         continue;
22 22
     }
23 23
     $stat = @stat($a_dir.'/'.$item);
@@ -34,11 +34,11 @@  discard block
 block discarded – undo
34 34
  * Delete a file or recursively delete a directory
35 35
  * @param string $str Path to file or directory
36 36
  */
37
-function recursive_delete($str){
37
+function recursive_delete($str) {
38 38
     if (is_file($str)) {
39 39
         return @unlink($str);
40 40
     } elseif (is_dir($str)) {
41
-        $scan = glob(rtrim($str,'/').'/*');
41
+        $scan = glob(rtrim($str, '/').'/*');
42 42
         foreach ($scan as $index=>$path) {
43 43
             recursive_delete($path);
44 44
         }
Please login to merge, or discard this patch.
main/cron/remind_course_expiration.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
  * @package chamilo.cron
6 6
  * @author Imanol Losada <[email protected]>
7 7
  */
8
-require_once __DIR__ . '/../inc/global.inc.php';
8
+require_once __DIR__.'/../inc/global.inc.php';
9 9
 
10 10
 /**
11 11
  * Initialization
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
 foreach ($sessions as $sessionId => $userIds) {
66 66
     $userId = 0;
67
-    $userIds = $userIds ? " AND sessionUser.user_id NOT IN (" . implode(", ", $userIds) . ")" : null;
67
+    $userIds = $userIds ? " AND sessionUser.user_id NOT IN (".implode(", ", $userIds).")" : null;
68 68
     $query = "
69 69
         SELECT sessionUser.session_id, sessionUser.user_id, session.name, session.access_end_date 
70 70
         FROM $sessionUserTable AS sessionUser
@@ -156,10 +156,10 @@  discard block
 block discarded – undo
156 156
                 $administrator['completeName'],
157 157
                 $administrator['email']
158 158
             );
159
-            echo "Email sent to $userCompleteName (" . $user['email'] . ")\n";
160
-            echo "Session: " . $session['name'] . "\n";
161
-            echo "Date end: " . $session['access_end_date'] . "\n";
162
-            echo "Days remaining: " . $daysRemaining->format("%d") . "\n\n";
159
+            echo "Email sent to $userCompleteName (".$user['email'].")\n";
160
+            echo "Session: ".$session['name']."\n";
161
+            echo "Date end: ".$session['access_end_date']."\n";
162
+            echo "Days remaining: ".$daysRemaining->format("%d")."\n\n";
163 163
         }
164 164
         echo "======================================================================\n\n";
165 165
     }
Please login to merge, or discard this patch.
main/cron/course_finished.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  * @author Angel Fernando Quiroz Campos <[email protected]>
7 7
  * @package chamilo.cron
8 8
  */
9
-require_once __DIR__ . '/../inc/global.inc.php';
9
+require_once __DIR__.'/../inc/global.inc.php';
10 10
 
11 11
 if (php_sapi_name() != 'cli') {
12 12
     exit; //do not run from browser
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
     ->getResult();
33 33
 
34 34
 if (empty($sessions)) {
35
-    echo "No sessions finishing today $endDate" . PHP_EOL;
35
+    echo "No sessions finishing today $endDate".PHP_EOL;
36 36
     exit;
37 37
 }
38 38
 
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
     $sessionUsers = $session->getUsers();
51 51
 
52 52
     if (empty($sessionUsers)) {
53
-        echo 'No users to send mail' . PHP_EOL;
53
+        echo 'No users to send mail'.PHP_EOL;
54 54
         exit;
55 55
     }
56 56
 
@@ -81,9 +81,9 @@  discard block
 block discarded – undo
81 81
             $administrator['email']
82 82
         );
83 83
 
84
-        echo '============' . PHP_EOL;
85
-        echo "Email sent to: {$user->getCompleteName()} ({$user->getEmail()})" . PHP_EOL;
86
-        echo "Session: {$session->getName()}" . PHP_EOL;
87
-        echo "End date: {$session->getAccessEndDate()->format('Y-m-d h:i')}" . PHP_EOL;
84
+        echo '============'.PHP_EOL;
85
+        echo "Email sent to: {$user->getCompleteName()} ({$user->getEmail()})".PHP_EOL;
86
+        echo "Session: {$session->getName()}".PHP_EOL;
87
+        echo "End date: {$session->getAccessEndDate()->format('Y-m-d h:i')}".PHP_EOL;
88 88
     }
89 89
 }
Please login to merge, or discard this patch.