chamilo / chamilo-lms

main/newscorm/learnpath.class.php

Braces +110 added lines, -76 removed lines

@@ -3939,8 +3939,9 @@ 
                 WHERE c_id = ".$course_id."
                 ORDER BY display_order";
         $res = Database::query($sql);
-        if ($res === false)
-            return false;
+        if ($res === false) {
+                    return false;
+        }
         $lps = array ();
         $lp_order = array ();
         $num = Database :: num_rows($res);
@@ -4540,8 +4541,9 @@ 
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::set_maker()', 0);
         }
-        if (empty ($name))
-            return false;
+        if (empty ($name)) {
+                    return false;
+        }
         $this->maker = $name;
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $course_id = api_get_course_int_id();
@@ -4606,8 +4608,9 @@ 
     public function set_terms_by_prefix($terms_string, $prefix)
     {
         $course_id = api_get_course_int_id();
-        if (api_get_setting('search_enabled') !== 'true')
-            return false;
+        if (api_get_setting('search_enabled') !== 'true') {
+                    return false;
+        }
 
         if (!extension_loaded('xapian')) {
             return false;
@@ -4620,8 +4623,9 @@ 
         $stored_terms = $this->get_common_index_terms_by_prefix($prefix);
 
         // Don't do anything if no change, verify only at DB, not the search engine.
-        if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0))
-            return false;
+        if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0)) {
+                    return false;
+        }
 
         require_once 'xapian.php'; // TODO: Try catch every xapian use or make wrappers on API.
         require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
@@ -4813,8 +4817,9 @@ 
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::set_proximity()', 0);
         }
-        if (empty ($name))
-            return false;
+        if (empty ($name)) {
+                    return false;
+        }
 
         $this->proximity = $name;
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
@@ -5156,8 +5161,9 @@ 
 
         $sql = "SELECT * FROM $lp_table WHERE c_id = ".$course_id." ORDER BY display_order";
         $res = Database::query($sql);
-        if ($res === false)
-            return false;
+        if ($res === false) {
+                    return false;
+        }
 
         $num = Database :: num_rows($res);
         // First check the order is correct, globally (might be wrong because
@@ -5468,8 +5474,9 @@ 
             $position[$key] = $row['display_order'];
         }
 
-        if (count($array) > 0)
-            array_multisort($parent, SORT_ASC, $position, SORT_ASC, $array);
+        if (count($array) > 0) {
+                    array_multisort($parent, SORT_ASC, $position, SORT_ASC, $array);
+        }
 
         return $array;
     }
@@ -6037,8 +6044,9 @@ 
         $tmp_filename = $filename;
 
         $i = 0;
-        while (file_exists($filepath . $tmp_filename . '.'.$extension))
-            $tmp_filename = $filename . '_' . ++ $i;
+        while (file_exists($filepath . $tmp_filename . '.'.$extension)) {
+                    $tmp_filename = $filename . '_' . ++ $i;
+        }
 
         $filename = $tmp_filename . '.'.$extension;
         if ($extension == 'html') {
@@ -6117,10 +6125,12 @@ 
                     if ($new_comment || $new_title) {
                         $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
                         $ct = '';
-                        if ($new_comment)
-                            $ct .= ", comment='" . Database::escape_string($new_comment). "'";
-                        if ($new_title)
-                            $ct .= ", title='" . Database::escape_string(htmlspecialchars($new_title, ENT_QUOTES, $charset))."' ";
+                        if ($new_comment) {
+                                                    $ct .= ", comment='" . Database::escape_string($new_comment). "'";
+                        }
+                        if ($new_title) {
+                                                    $ct .= ", title='" . Database::escape_string(htmlspecialchars($new_title, ENT_QUOTES, $charset))."' ";
+                        }
 
                         $sql = "UPDATE " . $tbl_doc ." SET " . substr($ct, 1)."
                                WHERE c_id = ".$course_id." AND id = " . $document_id;
@@ -6144,17 +6154,21 @@ 
         // Please, do not modify this dirname formatting.
         $dir = isset($_GET['dir']) ? $_GET['dir'] : $_POST['dir'];
 
-        if (strstr($dir, '..'))
-            $dir = '/';
+        if (strstr($dir, '..')) {
+                    $dir = '/';
+        }
 
-        if ($dir[0] == '.')
-            $dir = substr($dir, 1);
+        if ($dir[0] == '.') {
+                    $dir = substr($dir, 1);
+        }
 
-        if ($dir[0] != '/')
-            $dir = '/' . $dir;
+        if ($dir[0] != '/') {
+                    $dir = '/' . $dir;
+        }
 
-        if ($dir[strlen($dir) - 1] != '/')
-            $dir .= '/';
+        if ($dir[strlen($dir) - 1] != '/') {
+                    $dir .= '/';
+        }
 
         $filepath = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document' . $dir;
 
@@ -6219,8 +6233,9 @@ 
                 }
                 $return .= '<div style="padding:10px;">';
 
-                if ($msg != '')
-                    $return .= $msg;
+                if ($msg != '') {
+                                    $return .= $msg;
+                }
 
                 $return .= '<h3>'.$row['title'].'</h3>';
                 switch ($row['item_type']) {
@@ -6484,10 +6499,11 @@ 
         $item_title			= Security::remove_XSS($item_title);
         $item_description 	= Security::remove_XSS($item_description);
 
-        if ($id != 0 && is_array($extra_info))
-            $parent = $extra_info['parent_item_id'];
-        else
-            $parent = 0;
+        if ($id != 0 && is_array($extra_info)) {
+                    $parent = $extra_info['parent_item_id'];
+        } else {
+                    $parent = 0;
+        }
 
         $sql = "SELECT * FROM " . $tbl_lp_item . "
                 WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
@@ -6760,11 +6776,13 @@ 
         }
 
         $legend = '<legend>';
-        if ($action == 'add')
-            $legend .= get_lang('CreateTheExercise');
-        elseif ($action == 'move') $legend .= get_lang('MoveTheCurrentExercise');
-        else
-            $legend .= get_lang('EditCurrentExecice');
+        if ($action == 'add') {
+                    $legend .= get_lang('CreateTheExercise');
+        } elseif ($action == 'move') {
+            $legend .= get_lang('MoveTheCurrentExercise');
+        } else {
+                    $legend .= get_lang('EditCurrentExecice');
+        }
         if (isset ($_GET['edit']) && $_GET['edit'] == 'true') {
             $legend .= Display :: return_warning_message(get_lang('Warning') . ' ! ' . get_lang('WarningEditingDocument'));
         }
@@ -6791,8 +6809,9 @@ 
                         $arrHide[] = $arrLP[$i]['id'];
                     }
                 } else {
-                    if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir')
-                        $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') {
+                                            $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    }
                 }
             }
 
@@ -6810,11 +6829,13 @@ 
 
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
-                if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
+                if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                    $selected = 'selected="selected" ';
+                } elseif ($action == 'add') {
                     $selected = 'selected="selected" ';
-                elseif ($action == 'add') $selected = 'selected="selected" ';
-                else
-                    $selected = '';
+                } else {
+                                    $selected = '';
+                }
 
                 $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' . get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
             }
@@ -6841,9 +6862,11 @@ 
                 $arrHide = array ();
                 for ($i = 0; $i < count($arrLP); $i++) {
                     if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
-                        if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                            $s_selected_position = $arrLP[$i]['id'];
-                        elseif ($action == 'add') $s_selected_position = 0;
+                        if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                                    $s_selected_position = $arrLP[$i]['id'];
+                        } elseif ($action == 'add') {
+                            $s_selected_position = 0;
+                        }
                         $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                     }
@@ -7040,9 +7063,11 @@ 
             $arrHide = array();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
-                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
                 }
             }
@@ -7245,9 +7270,11 @@ 
 
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                 }
@@ -7281,8 +7308,7 @@ 
 
         if (is_numeric($extra_info)) {
             $form->addHidden('path', $extra_info);
-        }
-        elseif (is_array($extra_info)) {
+        } elseif (is_array($extra_info)) {
             $form->addHidden('path', $extra_info['path']);
         }
 
@@ -7335,8 +7361,9 @@ 
                     lp_id = " . $this->lp_id . " AND
                     id != $id";
 
-        if ($item_type == 'module')
-            $sql .= " AND parent_item_id = 0";
+        if ($item_type == 'module') {
+                    $sql .= " AND parent_item_id = 0";
+        }
 
         $result = Database::query($sql);
         $arrLP = array ();
@@ -7722,9 +7749,11 @@ 
 
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter' && $arrLP[$i]['item_type'] !== TOOL_LP_FINAL_ITEM) {
-                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id'])
+                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
                         $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = $arrLP[$i]['id'];
+                    }
 
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
@@ -7735,17 +7764,18 @@ 
                 $item_type = isset($extra_info['item_type']) ? $extra_info['item_type'] : null;
                 $edit = isset($_GET['edit']) ? $_GET['edit'] : null;
                 if (($extra_info == 'new' || $item_type == TOOL_DOCUMENT || $item_type == TOOL_LP_FINAL_ITEM || $edit == 'true')) {
-                    if (isset ($_POST['content']))
-                        $content = stripslashes($_POST['content']);
-                    elseif (is_array($extra_info)) {
+                    if (isset ($_POST['content'])) {
+                                            $content = stripslashes($_POST['content']);
+                    } elseif (is_array($extra_info)) {
                         //If it's an html document or a text file
                         if (!$no_display_edit_textarea) {
                             $content = $this->display_document($extra_info['path'], false, false);
                         }
-                    } elseif (is_numeric($extra_info))
-                        $content = $this->display_document($extra_info, false, false);
-                    else
-                        $content = '';
+                    } elseif (is_numeric($extra_info)) {
+                                            $content = $this->display_document($extra_info, false, false);
+                    } else {
+                                            $content = '';
+                    }
 
                     if (!$no_display_edit_textarea) {
                         // We need to calculate here some specific settings for the online editor.
@@ -8013,9 +8043,11 @@ 
             $arrHide = array();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                 }
@@ -8218,9 +8250,11 @@ 
             $arrHide = array ();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                 }
@@ -9795,9 +9829,9 @@ 
         $main_code_path = api_get_path(SYS_CODE_PATH).'newscorm/packaging/';
         $extra_files = scandir($main_code_path);
         foreach ($extra_files as $extra_file) {
-            if (strpos($extra_file, '.') === 0)
-                continue;
-            else {
+            if (strpos($extra_file, '.') === 0) {
+                            continue;
+            } else {
                 $dest_file = $archive_path . $temp_dir_short . '/' . $extra_file;
                 $this->create_path($dest_file);
                 copy($main_code_path.$extra_file, $dest_file);

main/newscorm/lp_controller.php

Braces +233 added lines, -122 removed lines

@@ -13,7 +13,9 @@ 
 $use_anonymous = true;
 
 $debug = 0;
-if ($debug > 0) error_log('New LP -+- Entered lp_controller.php -+- (action: '.$_REQUEST['action'].')', 0);
+if ($debug > 0) {
+    error_log('New LP -+- Entered lp_controller.php -+- (action: '.$_REQUEST['action'].')', 0);
+}
 
 // Language files that needs to be included.
 if (isset($_GET['action'])) {
@@ -231,10 +233,14 @@ 
     // If refresh is set, we regenerate the oLP object from the database (kind of flush).
     Session::erase('refresh');
     $myrefresh = 1;
-    if ($debug > 0) error_log('New LP - Refresh asked', 0);
-}
+    if ($debug > 0) {
+        error_log('New LP - Refresh asked', 0);
+    }
+    }
 
-if ($debug > 0) error_log('New LP - Passed refresh check', 0);
+if ($debug > 0) {
+    error_log('New LP - Passed refresh check', 0);
+}
 
 if (!empty($_REQUEST['dialog_box'])) {
     $dialog_box = stripslashes(urldecode($_REQUEST['dialog_box']));
@@ -244,17 +250,23 @@ 
 $lp_found = false;
 
 if (isset($_SESSION['lpobject'])) {
-    if ($debug > 0) error_log('New LP - SESSION[lpobject] is defined', 0);
+    if ($debug > 0) {
+        error_log('New LP - SESSION[lpobject] is defined', 0);
+    }
     $oLP = unserialize($_SESSION['lpobject']);
     if (isset($oLP) && is_object($oLP)) {
-        if ($debug > 0) error_log('New LP - oLP is object', 0);
+        if ($debug > 0) {
+            error_log('New LP - oLP is object', 0);
+        }
         if ($myrefresh == 1 OR
             empty($oLP->cc) OR
             $oLP->cc != api_get_course_id() OR
             $oLP->lp_view_session_id != $session_id OR
             $oLP->scorm_debug == '1'
         ) {
-            if ($debug > 0) error_log('New LP - Course has changed, discard lp object', 0);
+            if ($debug > 0) {
+                error_log('New LP - Course has changed, discard lp object', 0);
+            }
             if ($myrefresh == 1) { $myrefresh_id = $oLP->get_id(); }
             $oLP = null;
             Session::erase('oLP');
@@ -268,13 +280,19 @@ 
 
 $course_id = api_get_course_int_id();
 
-if ($debug>0) error_log('New LP - Passed data remains check', 0);
+if ($debug>0) {
+    error_log('New LP - Passed data remains check', 0);
+}
 
 if (!$lp_found || (!empty($_REQUEST['lp_id']) && $_SESSION['oLP']->get_id() != $_REQUEST['lp_id'])) {
-    if ($debug > 0) error_log('New LP - oLP is not object, has changed or refresh been asked, getting new', 0);
+    if ($debug > 0) {
+        error_log('New LP - oLP is not object, has changed or refresh been asked, getting new', 0);
+    }
     // Regenerate a new lp object? Not always as some pages don't need the object (like upload?)
     if (!empty($_REQUEST['lp_id']) || !empty($myrefresh_id)) {
-        if ($debug > 0) error_log('New LP - lp_id is defined', 0);
+        if ($debug > 0) {
+            error_log('New LP - lp_id is defined', 0);
+        }
         // Select the lp in the database and check which type it is (scorm/dokeos/aicc) to generate the
         // right object.
         if (!empty($_REQUEST['lp_id'])) {
@@ -286,49 +304,67 @@ 
         $lp_table = Database::get_course_table(TABLE_LP_MAIN);
         if (is_numeric($lp_id)) {
             $sel = "SELECT lp_type FROM $lp_table WHERE c_id = $course_id AND id = $lp_id";
-            if ($debug > 0) error_log('New LP - querying '.$sel, 0);
+            if ($debug > 0) {
+                error_log('New LP - querying '.$sel, 0);
+            }
             $res = Database::query($sel);
 
             if (Database::num_rows($res)) {
                 $row = Database::fetch_array($res);
                 $type = $row['lp_type'];
-                if ($debug > 0) error_log('New LP - found row - type '.$type. ' - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                if ($debug > 0) {
+                    error_log('New LP - found row - type '.$type. ' - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                }
                 switch ($type) {
                     case 1:
-                        if ($debug > 0) error_log('New LP - found row - type dokeos - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        if ($debug > 0) {
+                            error_log('New LP - found row - type dokeos - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        }
 
                         $oLP = new learnpath(api_get_course_id(), $lp_id, api_get_user_id());
                         if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); }
                         break;
                     case 2:
-                        if ($debug > 0) error_log('New LP - found row - type scorm - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        if ($debug > 0) {
+                            error_log('New LP - found row - type scorm - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        }
                         $oLP = new scorm(api_get_course_id(), $lp_id, api_get_user_id());
                         if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); }
                         break;
                     case 3:
-                        if ($debug > 0) error_log('New LP - found row - type aicc - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        if ($debug > 0) {
+                            error_log('New LP - found row - type aicc - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        }
                         $oLP = new aicc(api_get_course_id(), $lp_id, api_get_user_id());
                         if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); }
                         break;
                     default:
-                        if ($debug > 0) error_log('New LP - found row - type other - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        if ($debug > 0) {
+                            error_log('New LP - found row - type other - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        }
                         $oLP = new learnpath(api_get_course_id(), $lp_id, api_get_user_id());
                         if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); }
                         break;
                 }
             }
         } else {
-            if ($debug > 0) error_log('New LP - Request[lp_id] is not numeric', 0);
+            if ($debug > 0) {
+                error_log('New LP - Request[lp_id] is not numeric', 0);
+            }
         }
     } else {
-        if ($debug > 0) error_log('New LP - Request[lp_id] and refresh_id were empty', 0);
+        if ($debug > 0) {
+            error_log('New LP - Request[lp_id] and refresh_id were empty', 0);
+        }
     }
     if ($lp_found) {
         $_SESSION['oLP'] = $oLP;
     }
 }
 
-if ($debug > 0) error_log('New LP - Passed oLP creation check', 0);
+if ($debug > 0) {
+    error_log('New LP - Passed oLP creation check', 0);
+}
 
 $is_allowed_to_edit = api_is_allowed_to_edit(false, true, false, false);
 
@@ -372,11 +408,15 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - add item action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - add item action triggered', 0);
+        }
 
         if (!$lp_found) {
             //check if the learnpath ID was defined, otherwise send back to list
-            if ($debug > 0) error_log('New LP - No learnpath given for add item', 0);
+            if ($debug > 0) {
+                error_log('New LP - No learnpath given for add item', 0);
+            }
             require 'lp_list.php';
         } else {
             $_SESSION['refresh'] = 1;
@@ -450,11 +490,15 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - add audio action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - add audio action triggered', 0);
+        }
 
         if (!$lp_found) {
             //check if the learnpath ID was defined, otherwise send back to list
-            if ($debug > 0) error_log('New LP - No learnpath given for add audio', 0);
+            if ($debug > 0) {
+                error_log('New LP - No learnpath given for add audio', 0);
+            }
             require 'lp_list.php';
         } else {
             $_SESSION['refresh'] = 1;
@@ -528,7 +572,9 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - add_lp action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - add_lp action triggered', 0);
+        }
         if (isset($_REQUEST['lp_name']) && !empty($_REQUEST['lp_name'])) {
             $_REQUEST['lp_name'] = trim($_REQUEST['lp_name']);
             $_SESSION['refresh'] = 1;
@@ -587,9 +633,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - admin_view action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for admin_view', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - admin_view action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for admin_view', 0); require 'lp_list.php'; } else {
             $_SESSION['refresh'] = 1;
             require 'lp_admin_view.php';
         }
@@ -599,9 +646,10 @@ 
             if (!$is_allowed_to_edit) {
                 api_not_allowed(true);
             }
-            if ($debug > 0) error_log('New LP - auto_launch action triggered', 0);
-            if (!$lp_found) { error_log('New LP - No learnpath given for set_autolaunch', 0); require 'lp_list.php'; }
-            else {
+            if ($debug > 0) {
+                error_log('New LP - auto_launch action triggered', 0);
+            }
+            if (!$lp_found) { error_log('New LP - No learnpath given for set_autolaunch', 0); require 'lp_list.php'; } else {
                 $_SESSION['oLP']->set_autolaunch($_GET['lp_id'], $_GET['status']);
                 require 'lp_list.php';
                 exit;
@@ -612,10 +660,11 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - build action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - build action triggered', 0);
+        }
 
-        if (!$lp_found) { error_log('New LP - No learnpath given for build', 0); require 'lp_list.php'; }
-        else {
+        if (!$lp_found) { error_log('New LP - No learnpath given for build', 0); require 'lp_list.php'; } else {
             $_SESSION['refresh'] = 1;
             //require 'lp_build.php';
             $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id);
@@ -627,10 +676,11 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - edit item action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - edit item action triggered', 0);
+        }
 
-        if (!$lp_found) { error_log('New LP - No learnpath given for edit item', 0); require 'lp_list.php'; }
-        else {
+        if (!$lp_found) { error_log('New LP - No learnpath given for edit item', 0); require 'lp_list.php'; } else {
             $_SESSION['refresh'] = 1;
             if (isset($_POST['submit_button']) && !empty($post_title)) {
 
@@ -680,9 +730,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - edit item prereq action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - edit item prereq action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; } else {
             if (isset($_POST['submit_button'])) {
                 //Updating the lp.modified_on
                 $_SESSION['oLP']->set_modified_on();
@@ -710,9 +761,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - move item action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for move item', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - move item action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for move item', 0); require 'lp_list.php'; } else {
             $_SESSION['refresh'] = 1;
             if (isset($_POST['submit_button'])) {
                 //Updating the lp.modified_on
@@ -745,7 +797,9 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - view_item action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - view_item action triggered', 0);
+        }
         if (!$lp_found) {
             error_log('New LP - No learnpath given for view item', 0); require 'lp_list.php';
         } else {
@@ -757,7 +811,9 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - upload action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - upload action triggered', 0);
+        }
         $cwdir = getcwd();
         require 'lp_upload.php';
         // Reinit current working directory as many functions in upload change it.
@@ -774,9 +830,10 @@ 
             api_not_allowed(true);
         }
 
-        if ($debug > 0) error_log('New LP - export action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for copy', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - export action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for copy', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->copy();
         }
         require 'lp_list.php';
@@ -789,9 +846,10 @@ 
         if ($hideScormExportLink === 'true') {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - export action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for export', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - export action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for export', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->scorm_export();
             exit();
             //require 'lp_list.php';
@@ -806,7 +864,9 @@ 
             api_not_allowed(true);
         }
 
-        if ($debug > 0) error_log('New LP - export action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - export action triggered', 0);
+        }
         if (!$lp_found) { error_log('New LP - No learnpath given for export_to_pdf', 0); require 'lp_list.php';
         } else {
             $result = $_SESSION['oLP']->scorm_export_to_pdf($_GET['lp_id']);
@@ -820,9 +880,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - delete action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for delete', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - delete action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for delete', 0); require 'lp_list.php'; } else {
             $_SESSION['refresh'] = 1;
             $_SESSION['oLP']->delete(null, $_GET['lp_id'], 'remove');
             Session::erase('oLP');
@@ -834,9 +895,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - visibility action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for visibility', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - visibility action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for visibility', 0); require 'lp_list.php'; } else {
             learnpath::toggle_visibility($_REQUEST['lp_id'], $_REQUEST['new_status']);
             require 'lp_list.php';
         }
@@ -846,9 +908,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - publish action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for publish', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - publish action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for publish', 0); require 'lp_list.php'; } else {
             learnpath::toggle_publish($_REQUEST['lp_id'], $_REQUEST['new_status']);
             require 'lp_list.php';
         }
@@ -858,7 +921,9 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - publish action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - publish action triggered', 0);
+        }
         if (!$lp_found) {
             error_log('New LP - No learnpath given for publish', 0);
             require 'lp_list.php';
@@ -872,7 +937,9 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - publish action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - publish action triggered', 0);
+        }
         if (!$lp_found) {
             error_log('New LP - No learnpath given for publish', 0);
             require 'lp_list.php';
@@ -885,9 +952,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - edit action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for edit', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - edit action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for edit', 0); require 'lp_list.php'; } else {
             $_SESSION['refresh'] = 1;
             require 'lp_edit.php';
         }
@@ -896,9 +964,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - update_lp action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for edit', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - update_lp action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for edit', 0); require 'lp_list.php'; } else {
             $_SESSION['refresh'] = 1;
             $lp_name = Security::remove_XSS($_REQUEST['lp_name']);
             $_SESSION['oLP']->set_name($lp_name);
@@ -965,8 +1034,9 @@ 
             );
             $extraFieldValue->saveFieldValues($_REQUEST);
 
-            if ($_FILES['lp_preview_image']['size'] > 0)
-                $_SESSION['oLP']->upload_image($_FILES['lp_preview_image']);
+            if ($_FILES['lp_preview_image']['size'] > 0) {
+                            $_SESSION['oLP']->upload_image($_FILES['lp_preview_image']);
+            }
 
             if (api_get_setting('search_enabled') === 'true') {
                 require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
@@ -1006,9 +1076,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - add sub item action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for add sub item', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - add sub item action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for add sub item', 0); require 'lp_list.php'; } else {
             $_SESSION['refresh'] = 1;
             if (!empty($_REQUEST['parent_item_id'])) {
                 $_SESSION['from_learnpath']='yes';
@@ -1024,9 +1095,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - delete item action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for delete item', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - delete item action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for delete item', 0); require 'lp_list.php'; } else {
             //$_SESSION['refresh'] = 1;
             if (!empty($_REQUEST['id'])) {
                 $_SESSION['oLP']->delete_item($_REQUEST['id']);
@@ -1041,9 +1113,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - edit item prereq action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - edit item prereq action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; } else {
             if (!empty($_REQUEST['id']) && !empty($_REQUEST['submit_item'])) {
                 $_SESSION['refresh'] = 1;
                 $_SESSION['oLP']->edit_item_prereq($_REQUEST['id'], $_REQUEST['prereq']);
@@ -1052,64 +1125,80 @@ 
         }
         break;
     case 'restart':
-        if ($debug > 0) error_log('New LP - restart action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for restart', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - restart action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for restart', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->restart();
             require 'lp_view.php';
         }
         break;
     case 'last':
-        if ($debug > 0) error_log('New LP - last action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for last', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - last action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for last', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->last();
             require 'lp_view.php';
         }
         break;
     case 'first':
-        if ($debug > 0) error_log('New LP - first action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for first', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - first action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for first', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->first();
             require 'lp_view.php';
         }
         break;
     case 'next':
-        if ($debug > 0) error_log('New LP - next action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for next', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - next action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for next', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->next();
             require 'lp_view.php';
         }
         break;
     case 'previous':
-        if ($debug > 0) error_log('New LP - previous action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for previous', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - previous action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for previous', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->previous();
             require 'lp_view.php';
         }
         break;
     case 'content':
-        if ($debug > 0) error_log('New LP - content action triggered', 0);
-        if ($debug > 0) error_log('New LP - Item id is '.intval($_GET['item_id']), 0);
+        if ($debug > 0) {
+            error_log('New LP - content action triggered', 0);
+        }
+        if ($debug > 0) {
+            error_log('New LP - Item id is '.intval($_GET['item_id']), 0);
+        }
         if (!$lp_found) {
             error_log('New LP - No learnpath given for content', 0);
             require 'lp_list.php';
         } else {
-            if ($debug > 0) error_log('New LP - save_last()', 0);
+            if ($debug > 0) {
+                error_log('New LP - save_last()', 0);
+            }
             $_SESSION['oLP']->save_last();
-            if ($debug > 0) error_log('New LP - set_current_item()', 0);
+            if ($debug > 0) {
+                error_log('New LP - set_current_item()', 0);
+            }
             $_SESSION['oLP']->set_current_item($_GET['item_id']);
-            if ($debug > 0) error_log('New LP - start_current_item()', 0);
+            if ($debug > 0) {
+                error_log('New LP - start_current_item()', 0);
+            }
             $_SESSION['oLP']->start_current_item();
             require 'lp_content.php';
         }
         break;
     case 'view':
-        if ($debug > 0)
-            error_log('New LP - view action triggered', 0);
+        if ($debug > 0) {
+                    error_log('New LP - view action triggered', 0);
+        }
         if (!$lp_found) {
             error_log('New LP - No learnpath given for view', 0);
             require 'lp_list.php';
@@ -1122,17 +1211,19 @@ 
         }
         break;
     case 'save':
-        if ($debug > 0) error_log('New LP - save action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for save', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - save action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for save', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->save_item();
             require 'lp_save.php';
         }
         break;
     case 'stats':
-        if ($debug > 0) error_log('New LP - stats action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - stats action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->save_current();
             $_SESSION['oLP']->save_last();
             $output = require 'lp_stats.php';
@@ -1140,7 +1231,9 @@ 
         }
         break;
     case 'list':
-        if ($debug > 0) error_log('New LP - list action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - list action triggered', 0);
+        }
         if ($lp_found) {
             $_SESSION['refresh'] = 1;
             $_SESSION['oLP']->save_last();
@@ -1149,7 +1242,9 @@ 
         break;
     case 'mode':
         // Switch between fullscreen and embedded mode.
-        if ($debug > 0) error_log('New LP - mode change triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - mode change triggered', 0);
+        }
         $mode = $_REQUEST['mode'];
         if ($mode == 'fullscreen') {
             $_SESSION['oLP']->mode = 'fullscreen';
@@ -1163,7 +1258,9 @@ 
         require 'lp_view.php';
         break;
     case 'switch_view_mode':
-        if ($debug > 0) error_log('New LP - switch_view_mode action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - switch_view_mode action triggered', 0);
+        }
         if (!$lp_found) { error_log('New LP - No learnpath given for switch', 0); require 'lp_list.php'; }
         if (Security::check_token('get')) {
             $_SESSION['refresh'] = 1;
@@ -1172,7 +1269,9 @@ 
         require 'lp_list.php';
         break;
     case 'switch_force_commit':
-        if ($debug > 0) error_log('New LP - switch_force_commit action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - switch_force_commit action triggered', 0);
+        }
         if (!$lp_found) { error_log('New LP - No learnpath given for switch', 0); require 'lp_list.php'; }
         $_SESSION['refresh'] = 1;
         $_SESSION['oLP']->update_default_scorm_commit();
@@ -1195,25 +1294,33 @@ 
 		break;
      */
 	case 'switch_attempt_mode':
-		if($debug>0) error_log('New LP - switch_reinit action triggered',0);
+		if($debug>0) {
+		    error_log('New LP - switch_reinit action triggered',0);
+		}
 		if(!$lp_found){ error_log('New LP - No learnpath given for switch',0); require 'lp_list.php'; }
 		$_SESSION['refresh'] = 1;
 		$_SESSION['oLP']->switch_attempt_mode();
         require 'lp_list.php';
         break;
     case 'switch_scorm_debug':
-        if ($debug > 0) error_log('New LP - switch_scorm_debug action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - switch_scorm_debug action triggered', 0);
+        }
         if (!$lp_found) { error_log('New LP - No learnpath given for switch', 0); require 'lp_list.php'; }
         $_SESSION['refresh'] = 1;
         $_SESSION['oLP']->update_scorm_debug();
         require 'lp_list.php';
         break;
     case 'intro_cmdAdd':
-        if ($debug > 0) error_log('New LP - intro_cmdAdd action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - intro_cmdAdd action triggered', 0);
+        }
         // Add introduction section page.
         break;
     case 'js_api_refresh':
-        if ($debug > 0) error_log('New LP - js_api_refresh action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - js_api_refresh action triggered', 0);
+        }
         if (!$lp_found) { error_log('New LP - No learnpath given for js_api_refresh', 0); require 'lp_message.php'; }
         if (isset($_REQUEST['item_id'])) {
             $htmlHeadXtra[] = $_SESSION['oLP']->get_js_info($_REQUEST['item_id']);
@@ -1221,8 +1328,7 @@ 
         require 'lp_message.php';
         break;
     case 'return_to_course_homepage':
-        if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; }
-        else {
+        if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->save_current();
             $_SESSION['oLP']->save_last();
             $url = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/index.php?id_session='.api_get_session_id();
@@ -1240,8 +1346,9 @@ 
         require 'lp_list_search.php';
         break;
     case 'impress':
-        if ($debug > 0)
-            error_log('New LP - view action triggered', 0);
+        if ($debug > 0) {
+                    error_log('New LP - view action triggered', 0);
+        }
         if (!$lp_found) {
             error_log('New LP - No learnpath given for view', 0);
             require 'lp_list.php';
@@ -1413,15 +1520,19 @@ 
         ]);
         break;
     default:
-        if ($debug > 0) error_log('New LP - default action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - default action triggered', 0);
+        }
         require 'lp_list.php';
         break;
 }
 
 if (!empty($_SESSION['oLP'])) {
     $_SESSION['lpobject'] = serialize($_SESSION['oLP']);
-    if ($debug > 0) error_log('New LP - lpobject is serialized in session', 0);
-}
+    if ($debug > 0) {
+        error_log('New LP - lpobject is serialized in session', 0);
+    }
+    }
 
 if (!empty($redirectTo)) {
     header("Location: $redirectTo");

main/exercice/admin.php

Braces +3 added lines, -2 removed lines

@@ -362,9 +362,10 @@
 
 if ($inATest) {
     echo '<div class="actions">';
-    if (isset($_GET['hotspotadmin']) || isset($_GET['newQuestion']) || isset($_GET['myid']))
-        echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercice/admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'">'.
+    if (isset($_GET['hotspotadmin']) || isset($_GET['newQuestion']) || isset($_GET['myid'])) {
+            echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercice/admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'">'.
             Display::return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>';
+    }
 
     if (!isset($_GET['hotspotadmin']) && !isset($_GET['newQuestion']) && !isset($_GET['myid']) &&  !isset($_GET['editQuestion'])) {
         echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercice/exercise.php?'.api_get_cidreq().'">'.

main/exercice/exercise_submit.php

Braces +32 added lines, -12 removed lines

@@ -269,7 +269,9 @@ 
 $clock_expired_time = null;
 
 if (empty($exercise_stat_info)) {
-    if ($debug)  error_log('5  $exercise_stat_info is empty ');
+    if ($debug) {
+        error_log('5  $exercise_stat_info is empty ');
+    }
 	$total_weight = 0;
 	$questionList = $objExercise->get_validated_question_list();
 	foreach ($questionListUncompressed as $question_id) {
@@ -280,11 +282,17 @@ 
 	if ($time_control) {
 		$expected_time = $current_timestamp + $total_seconds;
 
-		if ($debug)  error_log('5.1. $current_timestamp '.$current_timestamp);
-		if ($debug)  error_log('5.2. $expected_time '.$expected_time);
+		if ($debug) {
+		    error_log('5.1. $current_timestamp '.$current_timestamp);
+		}
+		if ($debug) {
+		    error_log('5.2. $expected_time '.$expected_time);
+		}
 
 		$clock_expired_time 	= api_get_utc_datetime($expected_time);
-		if ($debug) error_log('5.3. $expected_time '.$clock_expired_time);
+		if ($debug) {
+		    error_log('5.3. $expected_time '.$clock_expired_time);
+		}
 
 		//Sessions  that contain the expired time
 		$_SESSION['expired_time'][$current_expired_time_key] 	 = $clock_expired_time;
@@ -304,8 +312,10 @@ 
         $learnpath_item_id,
         $learnpath_item_view_id
     );
-    if ($debug)  error_log("5.5  exercise_stat_info[] exists getting exe_id $exe_id");
-} else {
+    if ($debug) {
+        error_log("5.5  exercise_stat_info[] exists getting exe_id $exe_id");
+    }
+    } else {
 	$exe_id = $exercise_stat_info['exe_id'];
     // Remember last question id position.
     $isFirstTime = Session::read('firstTime');
@@ -327,8 +337,10 @@ 
         }
     }
 
-    if ($debug)  error_log("5  exercise_stat_info[] exists getting exe_id $exe_id ");
-}
+    if ($debug) {
+        error_log("5  exercise_stat_info[] exists getting exe_id $exe_id ");
+    }
+    }
 
 $questionListInSession = Session::read('questionList');
 
@@ -384,9 +396,15 @@ 
  * If the expired time is major that zero(0) then the expired time is compute on this time.
  */
 if ($time_control) {
-	if ($debug) error_log('7.1. Time control is enabled');
-	if ($debug) error_log('7.2. $current_expired_time_key  '.$current_expired_time_key);
-	if ($debug) error_log('7.3. $_SESSION[expired_time][$current_expired_time_key]  '.$_SESSION['expired_time'][$current_expired_time_key]);
+	if ($debug) {
+	    error_log('7.1. Time control is enabled');
+	}
+	if ($debug) {
+	    error_log('7.2. $current_expired_time_key  '.$current_expired_time_key);
+	}
+	if ($debug) {
+	    error_log('7.3. $_SESSION[expired_time][$current_expired_time_key]  '.$_SESSION['expired_time'][$current_expired_time_key]);
+	}
 
     if (!isset($_SESSION['expired_time'][$current_expired_time_key])) {
         //Timer - Get expired_time for a student
@@ -473,7 +491,9 @@ 
 	}
 }
 
-if ($debug) error_log('8. Question list loaded '.print_r($questionList, 1));
+if ($debug) {
+    error_log('8. Question list loaded '.print_r($questionList, 1));
+}
 
 //Real question count
 $question_count = 0;