chamilo / chamilo-lms

main/lp/scorm.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -271,7 +271,7 @@ 
      * @param int $userMaxScore
      * @param int $sessionId
      *
-     * @return bool	Returns -1 on error
+     * @return boolean|null	Returns -1 on error
      */
     public function import_manifest($courseCode, $userMaxScore = 1, $sessionId = 0, $userId = 0)
     {
@@ -925,7 +925,7 @@ 
      * @param	string	course Code
      * @param string	LP ID (in database)
      * @param string	Manifest file path (optional if lp_id defined)
-     * @return	integer	New LP ID or false on failure
+     * @return	boolean	New LP ID or false on failure
      * TODO @TODO Implement imsmanifest_path parameter
      */
     public function reimport_manifest($courseCode, $lp_id = null, $imsmanifest_path = '')

Spacing +19 added lines, -19 removed lines

@@ -393,7 +393,7 @@ 
                 $path = '';
                 $type = 'dir';
                 if (isset($this->resources[$item['identifierref']])) {
-                    $oRes =& $this->resources[$item['identifierref']];
+                    $oRes = & $this->resources[$item['identifierref']];
                     $path = @$oRes->get_path();
                     if (!empty($path)) {
                         $temptype = $oRes->get_scorm_type();
@@ -444,7 +444,7 @@ 
                 $item['parameters'] = Database::escape_string($item['parameters']);
 
                 $sql = "INSERT INTO $new_lp_item (c_id, lp_id,item_type,ref,title, path,min_score,max_score, $field_add parent_item_id,previous_item_id,next_item_id, prerequisite,display_order,launch_data, parameters)
-                        VALUES ($courseId, $lp_id, '$type', '$identifier', '$title', '$path' , 0, $max_score, $value_add $parent, $previous, 0, '$prereq', ".$item['rel_order'] .", '".$item['datafromlms']."', '".$item['parameters']."' )";
+                        VALUES ($courseId, $lp_id, '$type', '$identifier', '$title', '$path' , 0, $max_score, $value_add $parent, $previous, 0, '$prereq', ".$item['rel_order'].", '".$item['datafromlms']."', '".$item['parameters']."' )";
 
                 Database::query($sql);
                 if ($this->debug > 1) { error_log('New LP - In import_manifest(), inserting item : '.$sql, 0); }
@@ -478,7 +478,7 @@ 
                     foreach ($specific_fields as $specific_field) {
                         if (isset($_REQUEST[$specific_field['code']])) {
                             $sterms = trim($_REQUEST[$specific_field['code']]);
-                            $all_specific_terms .= ' '. $sterms;
+                            $all_specific_terms .= ' '.$sterms;
                             if (!empty($sterms)) {
                                 $sterms = explode(',', $sterms);
                                 foreach ($sterms as $sterm) {
@@ -487,7 +487,7 @@ 
                             }
                         }
                     }
-                    $body_to_index = $all_specific_terms .' '. $title;
+                    $body_to_index = $all_specific_terms.' '.$title;
                     $ic_slide->addValue("content", $body_to_index);
                     // TODO: Add a comment to say terms separated by commas.
                     $courseid = api_get_course_id();
@@ -497,7 +497,7 @@ 
                         SE_COURSE_ID => $courseid,
                         SE_TOOL_ID => TOOL_LEARNPATH,
                         SE_DATA => array('lp_id' => $lp_id, 'lp_item'=> $previous, 'document_id' => ''), // TODO: Unify with other lp types.
-                        SE_USER => (int)api_get_user_id(),
+                        SE_USER => (int) api_get_user_id(),
                     );
                     $ic_slide->xapian_data = serialize($xapian_data);
                     $di->addChunk($ic_slide);
@@ -543,7 +543,7 @@ 
     public function import_package($zip_file_info, $current_dir = '', $courseInfo = array())
     {
         if ($this->debug > 0) {
-            error_log('In scorm::import_package('.print_r($zip_file_info,true).',"'.$current_dir.'") method', 0);
+            error_log('In scorm::import_package('.print_r($zip_file_info, true).',"'.$current_dir.'") method', 0);
         }
 
         $courseInfo = empty($courseInfo) ? api_get_course_info() : $courseInfo;
@@ -554,7 +554,7 @@ 
         $zip_file_name = $zip_file_info['name'];
 
         if ($this->debug > 1) {
-            error_log('New LP - import_package() - zip file path = ' . $zip_file_path . ', zip file name = ' . $zip_file_name, 0);
+            error_log('New LP - import_package() - zip file path = '.$zip_file_path.', zip file name = '.$zip_file_name, 0);
         }
 
         $course_rel_dir = api_get_course_path($courseInfo['code']).'/scorm'; // scorm dir web path starting from /courses
@@ -562,7 +562,7 @@ 
         $current_dir = api_replace_dangerous_char(trim($current_dir)); // Current dir we are in, inside scorm/
 
         if ($this->debug > 1) {
-            error_log( 'New LP - import_package() - current_dir = ' . $current_dir, 0);
+            error_log('New LP - import_package() - current_dir = '.$current_dir, 0);
         }
 
         // Get name of the zip file without the extension.
@@ -570,7 +570,7 @@ 
         $file_info = pathinfo($zip_file_name);
         $filename = $file_info['basename'];
         $extension = $file_info['extension'];
-        $file_base_name = str_replace('.'.$extension,'',$filename); // Filename without its extension.
+        $file_base_name = str_replace('.'.$extension, '', $filename); // Filename without its extension.
         $this->zipname = $file_base_name; // Save for later in case we don't have a title.
 
         if ($this->debug > 1) { error_log("New LP - base file name is : ".$file_base_name, 0); }
@@ -616,7 +616,7 @@ 
         $slash_count = substr_count($shortest_path, '/');
         foreach ($manifest_list as $manifest_path) {
             $tmp_slash_count = substr_count($manifest_path, '/');
-            if ($tmp_slash_count<$slash_count) {
+            if ($tmp_slash_count < $slash_count) {
                 $shortest_path = $manifest_path;
                 $slash_count = $tmp_slash_count;
             }
@@ -625,7 +625,7 @@ 
         $this->subdir .= '/'.dirname($shortest_path); // Do not concatenate because already done above.
         $manifest = $shortest_path;
         if ($this->debug > 1) { error_log('New LP - Package type is now '.$package_type, 0); }
-        if ($package_type== '') {
+        if ($package_type == '') {
             // && defined('CHECK_FOR_SCORM') && CHECK_FOR_SCORM)
             if ($this->debug > 1) { error_log('New LP - Package type is empty', 0); }
             return api_failure::set_failure('not_scorm_content');
@@ -641,8 +641,8 @@ 
             $new_dir = '/'.$new_dir;
         }
 
-        if ($new_dir[strlen($new_dir)-1] == '/') {
-            $new_dir = substr($new_dir,0,-1);
+        if ($new_dir[strlen($new_dir) - 1] == '/') {
+            $new_dir = substr($new_dir, 0, -1);
         }
 
         /* Uncompressing phase */
@@ -683,7 +683,7 @@ 
                     if ($file != '.' && $file != '..') {
                         $filetype = 'file';
 
-                        if (is_dir($course_sys_dir . $new_dir . $file)) {
+                        if (is_dir($course_sys_dir.$new_dir.$file)) {
                             $filetype = 'folder';
                         }
 
@@ -712,7 +712,7 @@ 
                                     }
                                 }
                             }
-                            @rename($course_sys_dir.$new_dir.$file,$course_sys_dir.$new_dir.$safe_file);
+                            @rename($course_sys_dir.$new_dir.$file, $course_sys_dir.$new_dir.$safe_file);
                             if ($this->debug >= 1) { error_log('New LP - Renaming '.$course_sys_dir.$new_dir.$file.' to '.$course_sys_dir.$new_dir.$safe_file, 0); }
                         }
                     }
@@ -901,7 +901,7 @@ 
         if ($this->debug > 0) { error_log('In scorm::get_res_path('.$id.') method', 0); }
         $path = '';
         if (isset($this->resources[$id])) {
-            $oRes =& $this->resources[$id];
+            $oRes = & $this->resources[$id];
             $path = @$oRes->get_path();
         }
         return $path;
@@ -917,7 +917,7 @@ 
         if ($this->debug > 0) { error_log('In scorm::get_res_type('.$id.') method', 0); }
         $type = '';
         if (isset($this->resources[$id])) {
-            $oRes =& $this->resources[$id];
+            $oRes = & $this->resources[$id];
             $temptype = $oRes->get_scorm_type();
             if (!empty($temptype)) {
                 $type = $temptype;
@@ -936,9 +936,9 @@ 
         $title = '';
         if (isset($this->manifest['organizations']['default'])) {
             $title = $this->organizations[$this->manifest['organizations']['default']]->get_name();
-        } elseif (count($this->organizations)==1) {
+        } elseif (count($this->organizations) == 1) {
             // This will only get one title but so we don't need to know the index.
-            foreach($this->organizations as $id => $value) {
+            foreach ($this->organizations as $id => $value) {
                 $title = $this->organizations[$id]->get_name();
                 break;
             }

main/lp/lp_move_item.php

Indentation +3 added lines, -3 removed lines

@@ -47,10 +47,10 @@
 " .
 "\n" .
 '$().ready(function() {'."\n" .
-  'if ($(\'#previous\')) {'."\n" .
+    'if ($(\'#previous\')) {'."\n" .
     'if(\'parent is\'+$(\'#idParent\').val()) {'.
-      'load_cbo($(\'#idParent\').val());'."\n" .
-  '}}'."\n" .
+        'load_cbo($(\'#idParent\').val());'."\n" .
+    '}}'."\n" .
 '});</script>'."\n" ;
 
 /* Constants and variables */

Spacing +9 added lines, -9 removed lines

@@ -21,7 +21,7 @@ 
 
 /* Header and action code */
 $htmlHeadXtra[] = '<script type="text/javascript">'.
-$_SESSION['oLP']->get_js_dropdown_array() .
+$_SESSION['oLP']->get_js_dropdown_array().
 "
     function load_cbo(id) {
         if (!id) {
@@ -45,13 +45,13 @@ 
         $('#previous').selectpicker('refresh');
     }
 " .
-"\n" .
-'$().ready(function() {'."\n" .
-  'if ($(\'#previous\')) {'."\n" .
+"\n".
+'$().ready(function() {'."\n".
+  'if ($(\'#previous\')) {'."\n".
     'if(\'parent is\'+$(\'#idParent\').val()) {'.
-      'load_cbo($(\'#idParent\').val());'."\n" .
-  '}}'."\n" .
-'});</script>'."\n" ;
+      'load_cbo($(\'#idParent\').val());'."\n".
+  '}}'."\n".
+'});</script>'."\n";
 
 /* Constants and variables */
 
@@ -90,11 +90,11 @@ 
 /* SHOWING THE ADMIN TOOLS */
 
 if (isset($_SESSION['gradebook'])) {
-    $gradebook=	$_SESSION['gradebook'];
+    $gradebook = $_SESSION['gradebook'];
 }
 
 if (!empty($gradebook) && $gradebook == 'view') {
-    $interbreadcrumb[] = array (
+    $interbreadcrumb[] = array(
         'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
         'name' => get_lang('ToolGradebook')
     );

main/lp/scormResource.class.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
                         }
                     }
                     //$keep_href = '';
-                    if ($element->hasAttributes()){ //in some cases we get here with an empty attributes array
+                    if ($element->hasAttributes()) { //in some cases we get here with an empty attributes array
                         // TODO: Find when and why we get such a case (empty array).
                         $attributes = $element->attributes;
                         foreach ($attributes as $attrib) {

main/lp/blank.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 Display::display_reduced_header();
 
 if (isset($_GET['error'])) {
-    switch ($_GET['error']){
+    switch ($_GET['error']) {
         case 'document_deleted':
             echo '<br /><br />';
             Display::display_error_message(get_lang('DocumentHasBeenDeleted'));

main/lp/scorm_api.php

Indentation +2 added lines, -2 removed lines

@@ -458,8 +458,8 @@
     } else if(param == 'cmi.core.student_name'){
         // ---- cmi.core.student_name
         <?php
-          $who = addslashes($user['complete_name']);
-          echo "result='$who';";
+            $who = addslashes($user['complete_name']);
+            echo "result='$who';";
         ?>
     } else if(param == 'cmi.core.lesson_location'){
         // ---- cmi.core.lesson_location

Spacing +31 added lines, -31 removed lines

@@ -25,7 +25,7 @@ 
 
 require_once '../inc/global.inc.php';
 
-$file   = (empty($_SESSION['file'])?'':$_SESSION['file']);
+$file = (empty($_SESSION['file']) ? '' : $_SESSION['file']);
 /** @var learnpath $oLP */
 $oLP = unserialize($_SESSION['lpobject']);
 /** @var learnpathItem $oItem */
@@ -41,7 +41,7 @@ 
 
 header('Content-type: text/javascript');
 
-?>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
+?>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
 var lms_logs = 0; //debug log level for LMS actions. 0=none, 1=light, 2=a lot, 3=all
 
 // API Object initialization (eases access later on)
@@ -144,25 +144,25 @@ 
 olms.statusSignalReceived = 0;
 
 // Strictly scorm variables
-olms.score=<?php echo $oItem->get_score();?>;
-olms.max='<?php echo $oItem->get_max();?>';
-olms.min='<?php echo $oItem->get_min();?>';
-olms.lesson_status='<?php echo $oItem->get_status();?>';
-olms.session_time='<?php echo $oItem->get_scorm_time('js');?>';
-olms.suspend_data = '<?php echo $oItem->get_suspend_data();?>';
-olms.lesson_location = '<?php echo $oItem->get_lesson_location();?>';
-olms.total_time = '<?php echo $oItem->get_scorm_time('js');?>';
-olms.mastery_score = '<?php echo $oItem->get_mastery_score();?>';
+olms.score=<?php echo $oItem->get_score(); ?>;
+olms.max='<?php echo $oItem->get_max(); ?>';
+olms.min='<?php echo $oItem->get_min(); ?>';
+olms.lesson_status='<?php echo $oItem->get_status(); ?>';
+olms.session_time='<?php echo $oItem->get_scorm_time('js'); ?>';
+olms.suspend_data = '<?php echo $oItem->get_suspend_data(); ?>';
+olms.lesson_location = '<?php echo $oItem->get_lesson_location(); ?>';
+olms.total_time = '<?php echo $oItem->get_scorm_time('js'); ?>';
+olms.mastery_score = '<?php echo $oItem->get_mastery_score(); ?>';
 olms.launch_data = '<?php echo $oItem->get_launch_data(); ?>';
-olms.max_time_allowed = '<?php echo $oItem->get_max_time_allowed();?>';
-olms.interactions = new Array(<?php echo $oItem->get_interactions_js_array();?>);
+olms.max_time_allowed = '<?php echo $oItem->get_max_time_allowed(); ?>';
+olms.interactions = new Array(<?php echo $oItem->get_interactions_js_array(); ?>);
 olms.item_objectives = new Array();
 olms.info_lms_item = new Array();
 
 // Chamilo internal variables (not SCORM)
 // olms.saved_lesson_status = 'not attempted';
-olms.lms_lp_id = <?php echo $oLP->get_id();?>;
-olms.lms_item_id = <?php echo $oItem->get_id();?>;
+olms.lms_lp_id = <?php echo $oLP->get_id(); ?>;
+olms.lms_item_id = <?php echo $oItem->get_id(); ?>;
 olms.lms_initialized = 0;
 // switch_finished indicates if the switch process is finished (if it has gone
 // through LMSInitialize() for the new item. Until then, all LMSSetValue()
@@ -171,26 +171,26 @@ 
 olms.switch_finished = 0;
 
 //olms.lms_total_lessons = <?php echo $oLP->get_total_items_count(); ?>;
-//olms.lms_complete_lessons = <?php echo $oLP->get_complete_items_count();?>;
-//olms.lms_progress_bar_mode = '<?php echo $oLP->progress_bar_mode;?>';
+//olms.lms_complete_lessons = <?php echo $oLP->get_complete_items_count(); ?>;
+//olms.lms_progress_bar_mode = '<?php echo $oLP->progress_bar_mode; ?>';
 //if(lms_progress_bar_mode == ''){lms_progress_bar_mode='%';}
 
-olms.lms_view_id = '<?php echo $oLP->get_view();?>';
+olms.lms_view_id = '<?php echo $oLP->get_view(); ?>';
 if(olms.lms_view_id == ''){ olms.lms_view_id = 1;}
-olms.lms_user_id = '<?php echo $userId;?>';
-olms.lms_next_item = '<?php echo $oLP->get_next_item_id();?>';
-olms.lms_previous_item = '<?php echo $oLP->get_previous_item_id();?>';
-olms.lms_lp_type = '<?php echo $oLP->get_type();?>';
-olms.lms_item_type = '<?php echo $oItem->get_type();?>';
-olms.lms_item_credit = '<?php echo $oItem->get_credit();?>';
-olms.lms_item_lesson_mode = '<?php echo $oItem->get_lesson_mode();?>';
-olms.lms_item_launch_data = '<?php echo addslashes($oItem->get_launch_data());?>';
-olms.lms_item_core_exit = '<?php echo $oItem->get_core_exit();?>';
+olms.lms_user_id = '<?php echo $userId; ?>';
+olms.lms_next_item = '<?php echo $oLP->get_next_item_id(); ?>';
+olms.lms_previous_item = '<?php echo $oLP->get_previous_item_id(); ?>';
+olms.lms_lp_type = '<?php echo $oLP->get_type(); ?>';
+olms.lms_item_type = '<?php echo $oItem->get_type(); ?>';
+olms.lms_item_credit = '<?php echo $oItem->get_credit(); ?>';
+olms.lms_item_lesson_mode = '<?php echo $oItem->get_lesson_mode(); ?>';
+olms.lms_item_launch_data = '<?php echo addslashes($oItem->get_launch_data()); ?>';
+olms.lms_item_core_exit = '<?php echo $oItem->get_core_exit(); ?>';
 olms.lms_course_id = '<?php echo $oLP->get_course_int_id(); ?>';
 olms.lms_session_id = '<?php echo api_get_session_id(); ?>';
 olms.lms_course_code = '<?php echo $oLP->getCourseCode(); ?>';
 olms.lms_course_id =  '<?php echo $oLP->get_course_int_id(); ?>';
-<?php echo $oLP->get_items_details_as_js('olms.lms_item_types');?>
+<?php echo $oLP->get_items_details_as_js('olms.lms_item_types'); ?>
 
 // Following definition of cmi.core.score.raw in SCORM 1.2, "LMS should
 // initialize this to an empty string ("") upon initial launch of a SCO. The
@@ -227,8 +227,8 @@ 
     logit_scorm('Other SCORM calls are shown in orange.', 1);
     logit_lms('To add new messages to these logs, use logit_lms() or logit_scorm().');
 
-    olms.info_lms_item[0] = '<?php echo $oItem->get_id();?>';
-    olms.info_lms_item[1] = '<?php echo $oItem->get_id();?>';
+    olms.info_lms_item[0] = '<?php echo $oItem->get_id(); ?>';
+    olms.info_lms_item[1] = '<?php echo $oItem->get_id(); ?>';
 
     $("#content_id").load(function() {
         logit_lms('#content_id load event starts');
@@ -499,7 +499,7 @@ 
         result = 'id,score,status';
     } else if(param == 'cmi.objectives._count'){
     // ---- cmi.objectives._count
-        //result='<?php echo $oItem->get_view_count();?>';
+        //result='<?php echo $oItem->get_view_count(); ?>';
         result = olms.item_objectives.length;
     } else if(param.substring(0,15)== 'cmi.objectives.'){
         var myres = '';

main/lp/content_makers.inc.php

Indentation +5 added lines, -5 removed lines

@@ -13,11 +13,11 @@
     'Accent',
     'Accenture',
     'ADLNet',
-      'Articulate',
-      'ATutor',
-      'Blackboard',
-      'Calfat',
-      'Captivate',
+        'Articulate',
+        'ATutor',
+        'Blackboard',
+        'Calfat',
+        'Captivate',
     'Chamilo',
     'Chamilo 2',
     'Claroline',

main/lp/lp_ajax_initialize.php

Indentation +4 added lines, -4 removed lines

@@ -84,10 +84,10 @@ 
         $myistring = substr($myistring, 1);
     }
 
-	// Obtention des donnees d'objectifs
-	$mycoursedb = Database::get_course_table(TABLE_LP_IV_OBJECTIVE);
+    // Obtention des donnees d'objectifs
+    $mycoursedb = Database::get_course_table(TABLE_LP_IV_OBJECTIVE);
     $course_id = api_get_course_int_id();
-	$mylp_iv_id = $mylpi->db_item_view_id;
+    $mylp_iv_id = $mylpi->db_item_view_id;
 
     $phpobjectives = array();
 
@@ -101,7 +101,7 @@ 
             $phpobjectives[] = $row;
         }
     }
-	$myobjectives = json_encode($phpobjectives);
+    $myobjectives = json_encode($phpobjectives);
 
     $return .=
             "olms.score=".$myscore.";" .

Spacing +30 added lines, -30 removed lines

@@ -101,21 +101,21 @@ 
 	$myobjectives = json_encode($phpobjectives);
 
     $return .=
-            "olms.score=".$myscore.";" .
-            "olms.max=".$mymax.";" .
-            "olms.min=".$mymin.";" .
-            "olms.lesson_status='".$mylesson_status."';" .
-            "olms.lesson_location='".$mylesson_location."';" .
-            "olms.session_time='".$mysession_time."';" .
-            "olms.suspend_data='".$mysuspend_data."';" .
-            "olms.total_time = '".$mytotal_time."';" .
-            "olms.mastery_score = '".$mymastery_score."';" .
-            "olms.max_time_allowed = '".$mymax_time_allowed."';" .
-            "olms.launch_data = '".$mylaunch_data."';" .
-            "olms.interactions = new Array(".$myistring.");" .
+            "olms.score=".$myscore.";".
+            "olms.max=".$mymax.";".
+            "olms.min=".$mymin.";".
+            "olms.lesson_status='".$mylesson_status."';".
+            "olms.lesson_location='".$mylesson_location."';".
+            "olms.session_time='".$mysession_time."';".
+            "olms.suspend_data='".$mysuspend_data."';".
+            "olms.total_time = '".$mytotal_time."';".
+            "olms.mastery_score = '".$mymastery_score."';".
+            "olms.max_time_allowed = '".$mymax_time_allowed."';".
+            "olms.launch_data = '".$mylaunch_data."';".
+            "olms.interactions = new Array(".$myistring.");".
             //"olms.item_objectives = new Array();" .
-            "olms.item_objectives = ".$myobjectives.";" .
-            "olms.G_lastError = 0;" .
+            "olms.item_objectives = ".$myobjectives.";".
+            "olms.G_lastError = 0;".
             "olms.G_LastErrorMessage = 'No error';".
             "olms.finishSignalReceived = 0;";
     /*
@@ -144,22 +144,22 @@ 
     $mycore_exit = $mylpi->get_core_exit();
 
     $return .=
-            "olms.lms_lp_id=".$lp_id.";" .
-            "olms.lms_item_id=".$next_item.";" .
-            "olms.lms_old_item_id=0;" .
-            "olms.lms_initialized=0;" .
-            "olms.lms_view_id=".$view_id.";" .
-            "olms.lms_user_id=".$user_id.";" .
-            "olms.next_item=".$next_item.";" . // This one is very important to replace possible literal strings.
-            "olms.lms_next_item=".$mynext.";" .
-            "olms.lms_previous_item=".$myprevious.";" .
-            "olms.lms_item_type = '".$myitemtype."';" .
-            "olms.lms_item_credit = '".$mycredit."';" .
-            "olms.lms_item_lesson_mode = '".$mylesson_mode."';" .
-            "olms.lms_item_launch_data = '".$mylaunch_data."';" .
-            "olms.lms_item_interactions_count = '".$myinteractions_count."';" .
-            "olms.lms_item_objectives_count = '".$myinteractions_count."';" .
-            "olms.lms_item_core_exit = '".$mycore_exit."';" .
+            "olms.lms_lp_id=".$lp_id.";".
+            "olms.lms_item_id=".$next_item.";".
+            "olms.lms_old_item_id=0;".
+            "olms.lms_initialized=0;".
+            "olms.lms_view_id=".$view_id.";".
+            "olms.lms_user_id=".$user_id.";".
+            "olms.next_item=".$next_item.";".// This one is very important to replace possible literal strings.
+            "olms.lms_next_item=".$mynext.";".
+            "olms.lms_previous_item=".$myprevious.";".
+            "olms.lms_item_type = '".$myitemtype."';".
+            "olms.lms_item_credit = '".$mycredit."';".
+            "olms.lms_item_lesson_mode = '".$mylesson_mode."';".
+            "olms.lms_item_launch_data = '".$mylaunch_data."';".
+            "olms.lms_item_interactions_count = '".$myinteractions_count."';".
+            "olms.lms_item_objectives_count = '".$myinteractions_count."';".
+            "olms.lms_item_core_exit = '".$mycore_exit."';".
             "olms.asset_timer = 0;";
 
     $mylp->set_error_msg('');

main/lp/storageapi.php

Switch Indentation +46 added lines, -46 removed lines

@@ -15,52 +15,52 @@
 }
 
 switch ($_REQUEST['action']) {
-    case "get":
-        print storage_get($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
-        break;
-    case "set":
-        if (storage_can_set($_REQUEST['svuser'])) {
-            print storage_set($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svvalue']);
-        }
-        break;
-    case "getall":
-        print storage_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco']);
-        break;
-    case "stackpush":
-        if (storage_can_set($_REQUEST['svuser'])) {
-            print storage_stack_push($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svvalue']);
-        }
-        break;
-    case "stackpop":
-        if (storage_can_set($_REQUEST['svuser'])) {
-            print storage_stack_pop($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
-        }
-        break;
-    case "stacklength":
-        print storage_stack_length($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
-        break;
-    case "stackclear":
-        if (storage_can_set($_REQUEST['svuser'])) {
-            print storage_stack_clear($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
-        }
-        break;
-    case "stackgetall":
-        if (storage_can_set($_REQUEST['svuser']))
-            print storage_stack_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
-        break;
-    case "getposition":
-        print storage_get_position($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc']);
-        break;
-    case "getleaders":
-        print storage_get_leaders($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc'], $_REQUEST['svlength']);
-        break;
-    case "usersgetall":
-// security issue
-        print "NOT allowed, security issue, see sources";
-//		print storage_get_all_users();
-        break;
-    default:
-        // Do nothing
+        case "get":
+            print storage_get($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
+            break;
+        case "set":
+            if (storage_can_set($_REQUEST['svuser'])) {
+                print storage_set($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svvalue']);
+            }
+            break;
+        case "getall":
+            print storage_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco']);
+            break;
+        case "stackpush":
+            if (storage_can_set($_REQUEST['svuser'])) {
+                print storage_stack_push($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svvalue']);
+            }
+            break;
+        case "stackpop":
+            if (storage_can_set($_REQUEST['svuser'])) {
+                print storage_stack_pop($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
+            }
+            break;
+        case "stacklength":
+            print storage_stack_length($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
+            break;
+        case "stackclear":
+            if (storage_can_set($_REQUEST['svuser'])) {
+                print storage_stack_clear($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
+            }
+            break;
+        case "stackgetall":
+            if (storage_can_set($_REQUEST['svuser']))
+                print storage_stack_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
+            break;
+        case "getposition":
+            print storage_get_position($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc']);
+            break;
+        case "getleaders":
+            print storage_get_leaders($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc'], $_REQUEST['svlength']);
+            break;
+        case "usersgetall":
+    // security issue
+            print "NOT allowed, security issue, see sources";
+    //		print storage_get_all_users();
+            break;
+        default:
+            // Do nothing
 }
 
 function storage_can_set($sv_user) {

Spacing +2 added lines, -2 removed lines

@@ -103,7 +103,7 @@ 
         and sco_id = '$sv_sco'
         and course_id = '$sv_course'
         and sv_key = '$sv_key'
-        order by sv_value ".($sv_asc ? "ASC": "DESC")." limit $sv_length";
+        order by sv_value ".($sv_asc ? "ASC" : "DESC")." limit $sv_length";
 //	$sql_data = "select sv.user_id as user_id, sv_key as variable, sv_value as value
 //		from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)." sv
 //		where sv.user_id in (select u2.user_id from ($sql_leaders) u2)
@@ -135,7 +135,7 @@ 
         and search.sco_id = '$sv_sco'
         and search.course_id = '$sv_course'
         and search.sv_key = '$sv_key'
-        and list.sv_value ".($sv_asc ? "<=": ">=")." search.sv_value
+        and list.sv_value ".($sv_asc ? "<=" : ">=")." search.sv_value
         and list.sco_id = search.sco_id
         and list.course_id = search.course_id
         and list.sv_key = search.sv_key

Braces +6 added lines, -8 removed lines

@@ -45,8 +45,9 @@ 
         }
         break;
     case "stackgetall":
-        if (storage_can_set($_REQUEST['svuser']))
-            print storage_stack_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
+        if (storage_can_set($_REQUEST['svuser'])) {
+                    print storage_stack_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
+        }
         break;
     case "getposition":
         print storage_get_position($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc']);
@@ -87,8 +88,7 @@ 
         } else {
             return $row['sv_value'];
         }
-    }
-    else {
+    } else {
         return null;
     }
 }
@@ -144,8 +144,7 @@ 
     if (Database::num_rows($res) > 0) {
         $row = Database::fetch_assoc($res);
         return $row['position'];
-    }
-    else {
+    } else {
         return null;
     }
 }
@@ -198,8 +197,7 @@ 
     if ($resorder && $resinsert) {
         Database::query("commit");
         return 1;
-    }
-    else {
+    } else {
         Database::query("rollback");
         return 0;
     }

main/lp/lp_content.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
 // Define the 'doc.inc.php' as language file.
 $nameTools = $_SESSION['oLP']->get_name();
 $interbreadcrumb[] = array(
-    'url' => api_get_path(WEB_CODE_PATH) . 'lp/lp_list.php?'.api_get_cidreq(),
+    'url' => api_get_path(WEB_CODE_PATH).'lp/lp_list.php?'.api_get_cidreq(),
     'name' => get_lang('Doc'),
 );
 // Update global setting to avoid displaying right menu.