chamilo / chamilo-lms

main/newscorm/blank.php

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * Script that displays a blank page (with later a message saying why)
- * @package chamilo.learnpath
- * @author Yannick Warnier <ywarnier@beeznest.org>
- */
+     * Script that displays a blank page (with later a message saying why)
+     * @package chamilo.learnpath
+     * @author Yannick Warnier <ywarnier@beeznest.org>
+     */
 // Flag to allow for anonymous user - needs to be set before global.inc.php.
 $use_anonymous = true;
 require_once '../inc/global.inc.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/newscorm/lp_move_item.php

Indentation +13 added lines, -13 removed lines

@@ -23,23 +23,23 @@
 $htmlHeadXtra[] = '<script type="text/javascript">'.
 $_SESSION['oLP']->get_js_dropdown_array() .
 'function load_cbo(id){' ."\n" .
-  'if (!id) {return false;}'.
-  'var cbo = document.getElementById(\'previous\');' .
-  'for(var i = cbo.length - 1; i > 0; i--) {' .
+    'if (!id) {return false;}'.
+    'var cbo = document.getElementById(\'previous\');' .
+    'for(var i = cbo.length - 1; i > 0; i--) {' .
     'cbo.options[i] = null;' .
- '}' ."\n" .
-  'var k=0;' .
-  'for(var i = 1; i <= child_name[id].length; i++){' ."\n" .
-  '  cbo.options[i] = new Option(child_name[id][i-1], child_value[id][i-1]);' ."\n" .
-  '  k=i;' ."\n" .
-  '}' ."\n" .
-  'cbo.options[k].selected = true;'."\n" .
+    '}' ."\n" .
+    'var k=0;' .
+    'for(var i = 1; i <= child_name[id].length; i++){' ."\n" .
+    '  cbo.options[i] = new Option(child_name[id][i-1], child_value[id][i-1]);' ."\n" .
+    '  k=i;' ."\n" .
+    '}' ."\n" .
+    'cbo.options[k].selected = true;'."\n" .
 '}'."\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 +20 added lines, -20 removed lines

@@ -21,26 +21,26 @@ 
 
 /* Header and action code */
 $htmlHeadXtra[] = '<script type="text/javascript">'.
-$_SESSION['oLP']->get_js_dropdown_array() .
-'function load_cbo(id){' ."\n" .
+$_SESSION['oLP']->get_js_dropdown_array().
+'function load_cbo(id){'."\n".
   'if (!id) {return false;}'.
-  'var cbo = document.getElementById(\'previous\');' .
-  'for(var i = cbo.length - 1; i > 0; i--) {' .
-    'cbo.options[i] = null;' .
- '}' ."\n" .
-  'var k=0;' .
-  'for(var i = 1; i <= child_name[id].length; i++){' ."\n" .
-  '  cbo.options[i] = new Option(child_name[id][i-1], child_value[id][i-1]);' ."\n" .
-  '  k=i;' ."\n" .
-  '}' ."\n" .
-  'cbo.options[k].selected = true;'."\n" .
-'}'."\n" .
-'$().ready(function() {'."\n" .
-  'if ($(\'#previous\')) {'."\n" .
+  'var cbo = document.getElementById(\'previous\');'.
+  'for(var i = cbo.length - 1; i > 0; i--) {'.
+    'cbo.options[i] = null;'.
+ '}'."\n".
+  'var k=0;'.
+  'for(var i = 1; i <= child_name[id].length; i++){'."\n".
+  '  cbo.options[i] = new Option(child_name[id][i-1], child_value[id][i-1]);'."\n".
+  '  k=i;'."\n".
+  '}'."\n".
+  'cbo.options[k].selected = true;'."\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 */
 
@@ -79,11 +79,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/newscorm/lp_impress.php

Indentation +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
     api_get_group_id()
 );
 if (!api_is_allowed_to_edit(null, true) && intval($visibility) == 0 ) {
-     api_not_allowed();
+        api_not_allowed();
 }
 
 if (empty($_SESSION['oLP'])) {

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
     null,
     api_get_group_id()
 );
-if (!api_is_allowed_to_edit(null, true) && intval($visibility) == 0 ) {
+if (!api_is_allowed_to_edit(null, true) && intval($visibility) == 0) {
      api_not_allowed();
 }
 
@@ -73,22 +73,22 @@ 
 $html = '';
 $step = 1;
 foreach ($list as $toc) {
-    $x = 1000*$step;
+    $x = 1000 * $step;
     $html .= '<div id="step-'.$step.'" class="step slide" data-x="'.$x.'" data-y="-1500"  >';
     $html .= '<div class="impress-content">';
     $src = $_SESSION['oLP']->get_link('http', $toc['id']);
     if ($toc['type'] !== 'dokeos_chapter') {
         //just showing the src in a iframe ...
         $html .= '<h2>'.$toc['title'].'</h2>';
-        $html .= '<iframe border="0" frameborder="0" style="width:100%;height:600px" src="' . $src . '"></iframe>';
-    }else{
+        $html .= '<iframe border="0" frameborder="0" style="width:100%;height:600px" src="'.$src.'"></iframe>';
+    } else {
         $html .= "<div class='impress-title'>";
         $html .= '<h1>'.$toc['title'].'</h1>';
         $html .= "</div>";
     }
     $html .= "</div>";
     $html .= "</div>";
-    $step ++;
+    $step++;
 }
 
 //Setting the template

Braces +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
         //just showing the src in a iframe ...
         $html .= '<h2>'.$toc['title'].'</h2>';
         $html .= '<iframe border="0" frameborder="0" style="width:100%;height:600px" src="' . $src . '"></iframe>';
-    }else{
+    } else{
         $html .= "<div class='impress-title'>";
         $html .= '<h1>'.$toc['title'].'</h1>';
         $html .= "</div>";

main/newscorm/scormOrganization.class.php

Indentation +15 added lines, -15 removed lines

@@ -38,14 +38,14 @@ 
                     //if ($first_item->type == XML_ELEMENT_NODE) this is already check prior to the call to this function.
                     $children = $element->childNodes;
                     foreach ($children as $child) {
-                         switch ($child->nodeType) {
+                            switch ($child->nodeType) {
                             case XML_ELEMENT_NODE:
                                 switch ($child->tagName) {
                                     case 'item':
                                          $oItem = new scormItem('manifest', $child);
-                                         if ($oItem->identifier != '') {
+                                            if ($oItem->identifier != '') {
                                             $this->items[$oItem->identifier] = $oItem;
-                                         }
+                                            }
                                         break;
                                     case 'metadata':
                                         $this->metadata = new scormMetadata('manifest', $child);
@@ -58,24 +58,24 @@ 
                                         break;
                                 }
                                 break;
-                             case XML_TEXT_NODE:
+                                case XML_TEXT_NODE:
                                  break;
-                         }
+                            }
                     }
 
                     if ($element->hasAttributes()) {
-                         $attributes = $element->attributes;
-                         //$keep_href = '';
-                         foreach ($attributes as $attrib) {
-                             switch ($attrib->name) {
-                                 case 'identifier':
+                            $attributes = $element->attributes;
+                            //$keep_href = '';
+                            foreach ($attributes as $attrib) {
+                                switch ($attrib->name) {
+                                    case 'identifier':
                                      $this->identifier = $attrib->value;
-                                     break;
-                                 case 'structure':
+                                        break;
+                                    case 'structure':
                                      $this->structure = $attrib->value;
-                                     break;
-                             }
-                         }
+                                        break;
+                                }
+                            }
                     }
 
                     return true;

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
         foreach ($this->items as $id => $dummy) {
             $abs_order = 0;
             // Passes the array as a pointer so it is modified in $list directly.
-            $this->items[$id]->get_flat_list($list,$abs_order, $i, 0);
+            $this->items[$id]->get_flat_list($list, $abs_order, $i, 0);
             $i++;
         }
 

main/newscorm/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/newscorm/lp_view_item.php

Indentation +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
 
 // Using the resource linker as a tool for adding resources to the learning path.
 if ($action == 'add' && $type == 'learnpathitem') {
-     $htmlHeadXtra[] = "<script> window.location=\"../resourcelinker/resourcelinker.php?source_id=5&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no\"; </script>";
+        $htmlHeadXtra[] = "<script> window.location=\"../resourcelinker/resourcelinker.php?source_id=5&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no\"; </script>";
 }
 if ((!$is_allowed_to_edit) || ($isStudentView)) {
     error_log('New LP - User not authorized in lp_view_item.php');
@@ -98,7 +98,7 @@ 
 // Theme calls
 $show_learn_path = true;
 if (isset($_SESSION['oLP']) && is_object($_SESSION['oLP'])) {
-	$lp_theme_css = $_SESSION['oLP']->get_theme();
+    $lp_theme_css = $_SESSION['oLP']->get_theme();
 }
 
 if ($mode == 'fullpage') {

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
 if (isset($_GET['lp_item_id'])) {
 
     // Get parameter only came from lp_view.php.
-    $lp_item_id  = intval($_GET['lp_item_id']);
+    $lp_item_id = intval($_GET['lp_item_id']);
     if (isset($_SESSION['lpobject'])) {
         $oLP = unserialize($_SESSION['lpobject']);
     }
@@ -56,8 +56,8 @@ 
 $tbl_lp_item = Database::get_course_table(TABLE_LP_ITEM);
 $tbl_lp_view = Database::get_course_table(TABLE_LP_VIEW);
 
-$isStudentView = (empty($_REQUEST['isStudentView']) ? 0 : (int)$_REQUEST['isStudentView']);
-$learnpath_id = (int)$_REQUEST['lp_id'];
+$isStudentView = (empty($_REQUEST['isStudentView']) ? 0 : (int) $_REQUEST['isStudentView']);
+$learnpath_id = (int) $_REQUEST['lp_id'];
 
 // Using the resource linker as a tool for adding resources to the learning path.
 if ($action == 'add' && $type == 'learnpathitem') {
@@ -78,7 +78,7 @@ 
 /* SHOWING THE ADMIN TOOLS	*/
 
 if (api_is_in_gradebook()) {
-    $interbreadcrumb[] = array (
+    $interbreadcrumb[] = array(
         'url' => api_get_path(WEB_CODE_PATH).'gradebook/index.php?'.api_get_cidreq(),
         'name' => get_lang('ToolGradebook')
     );

main/newscorm/scormMetadata.class.php

Indentation +47 added lines, -47 removed lines

@@ -39,60 +39,60 @@
                 case 'manifest': // Do the same as the default.
                      $children = $element->childNodes;
                     foreach ($children as $child) {
-                         switch ($child->nodeType) {
-                             case XML_ELEMENT_NODE:
+                            switch ($child->nodeType) {
+                                case XML_ELEMENT_NODE:
                                 // Could be 'lom', 'schema', 'schemaversion' or 'location'.
                                  switch ($child->tagName) {
-                                     case 'lom':
+                                        case 'lom':
                                          $childchildren = $child->childNodes;
-                                         foreach ($childchildren as $childchild) {
-                                             $this->lom = $childchild->nodeValue;
-                                         }
-                                         break;
-                                     case 'schema':
+                                            foreach ($childchildren as $childchild) {
+                                                $this->lom = $childchild->nodeValue;
+                                            }
+                                            break;
+                                        case 'schema':
                                          $childchildren = $child->childNodes;
-                                         foreach ($childchildren as $childchild) {
-                                             // There is generally only one child here.
-                                             $this->schema = $childchild->nodeValue;
-                                         }
-                                         break;
-                                     case 'schemaversion':
+                                            foreach ($childchildren as $childchild) {
+                                                // There is generally only one child here.
+                                                $this->schema = $childchild->nodeValue;
+                                            }
+                                            break;
+                                        case 'schemaversion':
                                          $childchildren = $child->childNodes;
-                                         foreach ($childchildren as $childchild) {
-                                             // There is generally only one child here.
-                                             $this->schemaversion = $childchild->nodeValue;
-                                         }
-                                         break;
-                                     case 'location':
+                                            foreach ($childchildren as $childchild) {
+                                                // There is generally only one child here.
+                                                $this->schemaversion = $childchild->nodeValue;
+                                            }
+                                            break;
+                                        case 'location':
                                          $childchildren = $child->childNodes;
-                                         foreach ($childchildren as $childchild) {
-                                             // There is generally only one child here.
-                                             $this->location = $childchild->nodeValue;
-                                         }
-                                         break;
-                                 }
-                                 break;
-                             case XML_TEXT_NODE:
+                                            foreach ($childchildren as $childchild) {
+                                                // There is generally only one child here.
+                                                $this->location = $childchild->nodeValue;
+                                            }
+                                            break;
+                                    }
+                                    break;
+                                case XML_TEXT_NODE:
                                  if (trim($child->textContent) != '') {
-                                     if (count($children == 1)) {
-                                         // If this is the only child at this level and it is a content... save differently.
-                                         $this->text = $child->textContent;
-                                     } else {
-                                         $this->text[$element->tagName] = $child->textContent;
-                                     }
-                                 }
-                                 break;
-                         }
-                     }
-                     $attributes = $element->attributes;
-                     //$keep_href = '';
-                     if (is_array($attributes)) {
-                         foreach ($attributes as $attrib) {
-                             if (trim($attrib->value) != ''){
-                                 $this->attribs[$attrib->name] = $attrib->value;
-                             }
-                         }
-                     }
+                                        if (count($children == 1)) {
+                                            // If this is the only child at this level and it is a content... save differently.
+                                            $this->text = $child->textContent;
+                                        } else {
+                                            $this->text[$element->tagName] = $child->textContent;
+                                        }
+                                    }
+                                    break;
+                            }
+                        }
+                        $attributes = $element->attributes;
+                        //$keep_href = '';
+                        if (is_array($attributes)) {
+                            foreach ($attributes as $attrib) {
+                                if (trim($attrib->value) != ''){
+                                    $this->attribs[$attrib->name] = $attrib->value;
+                                }
+                            }
+                        }
                     return true;
                     //break;
             }

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
                      //$keep_href = '';
                      if (is_array($attributes)) {
                          foreach ($attributes as $attrib) {
-                             if (trim($attrib->value) != ''){
+                             if (trim($attrib->value) != '') {
                                  $this->attribs[$attrib->name] = $attrib->value;
                              }
                          }

main/newscorm/scormItem.class.php

Spacing +5 added lines, -5 removed lines

@@ -100,7 +100,7 @@ 
                                         }
                                         break;
                                     case 'item':
-                                        $oItem = new scormItem('manifest',$child);
+                                        $oItem = new scormItem('manifest', $child);
                                         if ($oItem->identifier != '') {
                                             $this->sub_items[$oItem->identifier] = $oItem;
                                         }
@@ -119,7 +119,7 @@ 
                         $attributes = $element->attributes;
                         //$keep_href = '';
                         foreach ($attributes as $attrib) {
-                            switch($attrib->name){
+                            switch ($attrib->name) {
                                 case 'identifier':
                                     $this->identifier = $attrib->value;
                                     break;
@@ -172,8 +172,8 @@ 
         );
         $abs_order++;
         $i = 1;
-        foreach($this->sub_items as $id => $dummy) {
-            $oSubitem =& $this->sub_items[$id];
+        foreach ($this->sub_items as $id => $dummy) {
+            $oSubitem = & $this->sub_items[$id];
             $oSubitem->get_flat_list($list, $abs_order, $i, $level + 1);
             $i++;
         }
@@ -188,7 +188,7 @@ 
         parent::save($from_outside, $prereqs_complete);
         // Under certain conditions, the scorm_contact should not be set, because no scorm signal was sent.
         $this->scorm_contact = true;
-        if (!$this->scorm_contact){
+        if (!$this->scorm_contact) {
             //error_log('New LP - was expecting SCORM message but none received', 0);
         }
     }

main/newscorm/lp_controller.php

Indentation +12 added lines, -12 removed lines

@@ -538,17 +538,17 @@ 
                 if (isset($_REQUEST['activate_start_date_check']) &&
                     $_REQUEST['activate_start_date_check'] == 1
                 ) {
-                	$publicated_on = $_REQUEST['publicated_on'];
+                    $publicated_on = $_REQUEST['publicated_on'];
                 } else {
-                	$publicated_on = null;
+                    $publicated_on = null;
                 }
 
                 if (isset($_REQUEST['activate_end_date_check']) &&
                     $_REQUEST['activate_end_date_check'] == 1
                 ) {
-                	$expired_on = $_REQUEST['expired_on'];
+                    $expired_on = $_REQUEST['expired_on'];
                 } else {
-                	$expired_on = null;
+                    $expired_on = null;
                 }
 
                 $new_lp_id = learnpath::add_lp(
@@ -937,9 +937,9 @@ 
             $_SESSION['oLP']->setSubscribeUsers($_REQUEST['subscribe_users']);
 
             if (isset($_REQUEST['activate_start_date_check']) && $_REQUEST['activate_start_date_check'] == 1) {
-            	$publicated_on  = $_REQUEST['publicated_on'];
+                $publicated_on  = $_REQUEST['publicated_on'];
             } else {
-            	$publicated_on = null;
+                $publicated_on = null;
             }
 
             if (isset($_REQUEST['activate_end_date_check']) && $_REQUEST['activate_end_date_check'] == 1) {
@@ -1151,7 +1151,7 @@ 
         } elseif ($mode == 'embedded') {
             $_SESSION['oLP']->mode = 'embedded';
         } elseif ($mode == 'embedframe') {
-        	$_SESSION['oLP']->mode = 'embedframe';
+            $_SESSION['oLP']->mode = 'embedframe';
         } elseif ($mode == 'impress') {
             $_SESSION['oLP']->mode = 'impress';
         }
@@ -1189,11 +1189,11 @@ 
 		require 'lp_list.php';
 		break;
      */
-	case 'switch_attempt_mode':
-		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();
+    case 'switch_attempt_mode':
+        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':

Switch Indentation +886 added lines, -886 removed lines

@@ -365,815 +365,815 @@ 
 }
 
 switch ($action) {
-    case 'add_item':
-        if (!$is_allowed_to_edit) {
-            api_not_allowed(true);
-        }
-        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);
-            require 'lp_list.php';
-        } else {
-            $_SESSION['refresh'] = 1;
+        case 'add_item':
+            if (!$is_allowed_to_edit) {
+                api_not_allowed(true);
+            }
+            if ($debug > 0) error_log('New LP - add item action triggered', 0);
 
-            if (isset($_POST['submit_button']) && !empty($post_title)) {
-                // If a title was sumbitted:
+            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);
+                require 'lp_list.php';
+            } else {
+                $_SESSION['refresh'] = 1;
 
-                //Updating the lp.modified_on
-                $_SESSION['oLP']->set_modified_on();
+                if (isset($_POST['submit_button']) && !empty($post_title)) {
+                    // If a title was sumbitted:
 
-                if (isset($_SESSION['post_time']) && $_SESSION['post_time'] == $_POST['post_time']) {
-                    // Check post_time to ensure ??? (counter-hacking measure?)
-                    require 'lp_add_item.php';
-                } else {
+                    //Updating the lp.modified_on
+                    $_SESSION['oLP']->set_modified_on();
 
-                    $_SESSION['post_time'] = $_POST['post_time'];
+                    if (isset($_SESSION['post_time']) && $_SESSION['post_time'] == $_POST['post_time']) {
+                        // Check post_time to ensure ??? (counter-hacking measure?)
+                        require 'lp_add_item.php';
+                    } else {
 
-                    $parent = isset($_POST['parent']) ? $_POST['parent'] : '';
-                    $previous = isset($_POST['previous']) ? $_POST['previous'] : '';
-                    $type = isset($_POST['type']) ? $_POST['type'] : '';
-                    $path = isset($_POST['path']) ? $_POST['path'] : '';
-                    $description = isset($_POST['description']) ? $_POST['description'] : '';
-                    $prerequisites = isset($_POST['prerequisites']) ? $_POST['prerequisites'] : '';
-                    $maxTimeAllowed = isset($_POST['maxTimeAllowed']) ? $_POST['maxTimeAllowed'] : '';
+                        $_SESSION['post_time'] = $_POST['post_time'];
+
+                        $parent = isset($_POST['parent']) ? $_POST['parent'] : '';
+                        $previous = isset($_POST['previous']) ? $_POST['previous'] : '';
+                        $type = isset($_POST['type']) ? $_POST['type'] : '';
+                        $path = isset($_POST['path']) ? $_POST['path'] : '';
+                        $description = isset($_POST['description']) ? $_POST['description'] : '';
+                        $prerequisites = isset($_POST['prerequisites']) ? $_POST['prerequisites'] : '';
+                        $maxTimeAllowed = isset($_POST['maxTimeAllowed']) ? $_POST['maxTimeAllowed'] : '';
+
+                        if ($_POST['type'] == TOOL_DOCUMENT) {
+                            if (isset($_POST['path']) && $_GET['edit'] != 'true') {
+                                $document_id = $_POST['path'];
+                            } else {
+                                if ($_POST['content_lp']) {
+                                    $document_id = $_SESSION['oLP']->create_document(
+                                        $_course,
+                                        $_POST['content_lp'],
+                                        $_POST['title']
+                                    );
+                                }
+                            }
 
-                    if ($_POST['type'] == TOOL_DOCUMENT) {
-                        if (isset($_POST['path']) && $_GET['edit'] != 'true') {
-                            $document_id = $_POST['path'];
+                            $new_item_id = $_SESSION['oLP']->add_item(
+                                $parent,
+                                $previous,
+                                $type,
+                                $document_id,
+                                $post_title,
+                                $description,
+                                $prerequisites
+                            );
                         } else {
-                            if ($_POST['content_lp']) {
-                                $document_id = $_SESSION['oLP']->create_document(
-                                    $_course,
-                                    $_POST['content_lp'],
-                                    $_POST['title']
-                                );
-                            }
+                            // For all other item types than documents, load the item using the item type and path rather than its ID.
+                            $new_item_id = $_SESSION['oLP']->add_item(
+                                $parent,
+                                $previous,
+                                $type,
+                                $path,
+                                $post_title,
+                                $description,
+                                $prerequisites,
+                                $maxTimeAllowed
+                            );
                         }
-
-                        $new_item_id = $_SESSION['oLP']->add_item(
-                            $parent,
-                            $previous,
-                            $type,
-                            $document_id,
-                            $post_title,
-                            $description,
-                            $prerequisites
-                        );
-                    } else {
-                        // For all other item types than documents, load the item using the item type and path rather than its ID.
-                        $new_item_id = $_SESSION['oLP']->add_item(
-                            $parent,
-                            $previous,
-                            $type,
-                            $path,
-                            $post_title,
-                            $description,
-                            $prerequisites,
-                            $maxTimeAllowed
-                        );
+                        $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id);
+                        header('Location: '.$url);
+                        exit;
                     }
-                    $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id);
-                    header('Location: '.$url);
-                    exit;
+                } else {
+                    require 'lp_add_item.php';
                 }
-            } else {
-                require 'lp_add_item.php';
             }
-        }
-        break;
-    case 'add_audio':
-        if (!$is_allowed_to_edit) {
-            api_not_allowed(true);
-        }
-        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);
-            require 'lp_list.php';
-        } else {
-            $_SESSION['refresh'] = 1;
-
-            if (isset($_REQUEST['id'])) {
-                $lp_item_obj = new learnpathItem($_REQUEST['id']);
+            break;
+        case 'add_audio':
+            if (!$is_allowed_to_edit) {
+                api_not_allowed(true);
+            }
+            if ($debug > 0) error_log('New LP - add audio action triggered', 0);
 
-                // Remove audio
-                if (isset($_GET['delete_file']) && $_GET['delete_file'] == 1) {
-                    $lp_item_obj->remove_audio();
+            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);
+                require 'lp_list.php';
+            } else {
+                $_SESSION['refresh'] = 1;
 
-                    $url = api_get_self().'?action=add_audio&lp_id='.intval($_SESSION['oLP']->lp_id).'&id='.$lp_item_obj->get_id().'&'.api_get_cidreq();
-                    header('Location: '.$url);
-                    exit;
-                }
+                if (isset($_REQUEST['id'])) {
+                    $lp_item_obj = new learnpathItem($_REQUEST['id']);
 
-                // Upload audio
-                if (isset($_FILES['file']) && !empty($_FILES['file'])) {
-                    // Updating the lp.modified_on
-                    $_SESSION['oLP']->set_modified_on();
-                    $lp_item_obj->add_audio();
-                }
+                    // Remove audio
+                    if (isset($_GET['delete_file']) && $_GET['delete_file'] == 1) {
+                        $lp_item_obj->remove_audio();
 
-                //Add audio file from documents
-                if (isset($_REQUEST['document_id']) && !empty($_REQUEST['document_id'])) {
-                    $_SESSION['oLP']->set_modified_on();
-                    $lp_item_obj->add_audio_from_documents($_REQUEST['document_id']);
-                }
+                        $url = api_get_self().'?action=add_audio&lp_id='.intval($_SESSION['oLP']->lp_id).'&id='.$lp_item_obj->get_id().'&'.api_get_cidreq();
+                        header('Location: '.$url);
+                        exit;
+                    }
 
-                // Display.
-                require 'lp_add_audio.php';
-            } else {
-                require 'lp_add_audio.php';
-            }
-        }
-        break;
-    case 'add_lp_category':
-        if (!$is_allowed_to_edit) {
-            api_not_allowed(true);
-        }
-        require 'lp_add_category.php';
-        break;
-    case 'move_up_category':
-        if (!$is_allowed_to_edit) {
-            api_not_allowed(true);
-        }
-        if (isset($_REQUEST['id'])) {
-            learnpath::moveUpCategory($_REQUEST['id']);
-        }
-        require 'lp_list.php';
-        break;
-    case 'move_down_category':
-        if (!$is_allowed_to_edit) {
-            api_not_allowed(true);
-        }
-        if (isset($_REQUEST['id'])) {
-            learnpath::moveDownCategory($_REQUEST['id']);
-        }
-        require 'lp_list.php';
-        break;
-    case 'delete_lp_category':
-        if (!$is_allowed_to_edit) {
-            api_not_allowed(true);
-        }
-        if (isset($_REQUEST['id'])) {
-            learnpath::deleteCategory($_REQUEST['id']);
-        }
-        require 'lp_list.php';
-        break;
-    case 'add_lp':
-        if (!$is_allowed_to_edit) {
-            api_not_allowed(true);
-        }
-        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;
+                    // Upload audio
+                    if (isset($_FILES['file']) && !empty($_FILES['file'])) {
+                        // Updating the lp.modified_on
+                        $_SESSION['oLP']->set_modified_on();
+                        $lp_item_obj->add_audio();
+                    }
 
-            if (isset($_SESSION['post_time']) && $_SESSION['post_time'] == $_REQUEST['post_time']) {
-                require 'lp_add.php';
-            } else {
-                $_SESSION['post_time'] = $_REQUEST['post_time'];
+                    //Add audio file from documents
+                    if (isset($_REQUEST['document_id']) && !empty($_REQUEST['document_id'])) {
+                        $_SESSION['oLP']->set_modified_on();
+                        $lp_item_obj->add_audio_from_documents($_REQUEST['document_id']);
+                    }
 
-                if (isset($_REQUEST['activate_start_date_check']) &&
-                    $_REQUEST['activate_start_date_check'] == 1
-                ) {
-                	$publicated_on = $_REQUEST['publicated_on'];
+                    // Display.
+                    require 'lp_add_audio.php';
                 } else {
-                	$publicated_on = null;
+                    require 'lp_add_audio.php';
                 }
+            }
+            break;
+        case 'add_lp_category':
+            if (!$is_allowed_to_edit) {
+                api_not_allowed(true);
+            }
+            require 'lp_add_category.php';
+            break;
+        case 'move_up_category':
+            if (!$is_allowed_to_edit) {
+                api_not_allowed(true);
+            }
+            if (isset($_REQUEST['id'])) {
+                learnpath::moveUpCategory($_REQUEST['id']);
+            }
+            require 'lp_list.php';
+            break;
+        case 'move_down_category':
+            if (!$is_allowed_to_edit) {
+                api_not_allowed(true);
+            }
+            if (isset($_REQUEST['id'])) {
+                learnpath::moveDownCategory($_REQUEST['id']);
+            }
+            require 'lp_list.php';
+            break;
+        case 'delete_lp_category':
+            if (!$is_allowed_to_edit) {
+                api_not_allowed(true);
+            }
+            if (isset($_REQUEST['id'])) {
+                learnpath::deleteCategory($_REQUEST['id']);
+            }
+            require 'lp_list.php';
+            break;
+        case 'add_lp':
+            if (!$is_allowed_to_edit) {
+                api_not_allowed(true);
+            }
+            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;
 
-                if (isset($_REQUEST['activate_end_date_check']) &&
-                    $_REQUEST['activate_end_date_check'] == 1
-                ) {
-                	$expired_on = $_REQUEST['expired_on'];
+                if (isset($_SESSION['post_time']) && $_SESSION['post_time'] == $_REQUEST['post_time']) {
+                    require 'lp_add.php';
                 } else {
-                	$expired_on = null;
-                }
+                    $_SESSION['post_time'] = $_REQUEST['post_time'];
 
-                $new_lp_id = learnpath::add_lp(
-                    api_get_course_id(),
-                    Security::remove_XSS($_REQUEST['lp_name']),
-                    '',
-                    'chamilo',
-                    'manual',
-                    '',
-                    $publicated_on,
-                    $expired_on,
-                    $_REQUEST['category_id']
-                );
+                    if (isset($_REQUEST['activate_start_date_check']) &&
+                        $_REQUEST['activate_start_date_check'] == 1
+                    ) {
+                	    $publicated_on = $_REQUEST['publicated_on'];
+                    } else {
+                	    $publicated_on = null;
+                    }
 
-                if (is_numeric($new_lp_id)) {
-                    // TODO: Maybe create a first module directly to avoid bugging the user with useless queries
-                    $_SESSION['oLP'] = new learnpath(
+                    if (isset($_REQUEST['activate_end_date_check']) &&
+                        $_REQUEST['activate_end_date_check'] == 1
+                    ) {
+                	    $expired_on = $_REQUEST['expired_on'];
+                    } else {
+                	    $expired_on = null;
+                    }
+
+                    $new_lp_id = learnpath::add_lp(
                         api_get_course_id(),
-                        $new_lp_id,
-                        api_get_user_id()
+                        Security::remove_XSS($_REQUEST['lp_name']),
+                        '',
+                        'chamilo',
+                        'manual',
+                        '',
+                        $publicated_on,
+                        $expired_on,
+                        $_REQUEST['category_id']
                     );
-                    //require 'lp_build.php';
-                    $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($new_lp_id).'&'.api_get_cidreq();
-                    header("Location: $url&isStudentView=false");
+
+                    if (is_numeric($new_lp_id)) {
+                        // TODO: Maybe create a first module directly to avoid bugging the user with useless queries
+                        $_SESSION['oLP'] = new learnpath(
+                            api_get_course_id(),
+                            $new_lp_id,
+                            api_get_user_id()
+                        );
+                        //require 'lp_build.php';
+                        $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($new_lp_id).'&'.api_get_cidreq();
+                        header("Location: $url&isStudentView=false");
+                        exit;
+                    }
+                }
+            } else {
+                require 'lp_add.php';
+            }
+            break;
+        case 'admin_view':
+            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 {
+                $_SESSION['refresh'] = 1;
+                require 'lp_admin_view.php';
+            }
+            break;
+        case 'auto_launch':
+            if (api_get_course_setting('enable_lp_auto_launch') == 1) { //Redirect to a specific LP
+                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 {
+                    $_SESSION['oLP']->set_autolaunch($_GET['lp_id'], $_GET['status']);
+                    require 'lp_list.php';
                     exit;
                 }
             }
-        } else {
-            require 'lp_add.php';
-        }
-        break;
-    case 'admin_view':
-        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 {
-            $_SESSION['refresh'] = 1;
-            require 'lp_admin_view.php';
-        }
-        break;
-    case 'auto_launch':
-        if (api_get_course_setting('enable_lp_auto_launch') == 1) { //Redirect to a specific LP
+            break;
+        case 'build':
             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'; }
+            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 {
-                $_SESSION['oLP']->set_autolaunch($_GET['lp_id'], $_GET['status']);
-                require 'lp_list.php';
+                $_SESSION['refresh'] = 1;
+                //require 'lp_build.php';
+                $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id);
+                header('Location: '.$url);
                 exit;
             }
-        }
-        break;
-    case 'build':
-        if (!$is_allowed_to_edit) {
-            api_not_allowed(true);
-        }
-        if ($debug > 0) error_log('New LP - build action triggered', 0);
+            break;
+        case 'edit_item':
+            if (!$is_allowed_to_edit) {
+                api_not_allowed(true);
+            }
+            if ($debug > 0) error_log('New LP - edit item action triggered', 0);
 
-        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);
-            header('Location: '.$url);
-            exit;
-        }
-        break;
-    case 'edit_item':
-        if (!$is_allowed_to_edit) {
-            api_not_allowed(true);
-        }
-        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 {
+                $_SESSION['refresh'] = 1;
+                if (isset($_POST['submit_button']) && !empty($post_title)) {
 
-        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)) {
+                    //Updating the lp.modified_on
+                    $_SESSION['oLP']->set_modified_on();
 
-                //Updating the lp.modified_on
-                $_SESSION['oLP']->set_modified_on();
+                    // TODO: mp3 edit
+                    $audio = array();
+                    if (isset($_FILES['mp3'])) {
+                        $audio = $_FILES['mp3'];
+                    }
 
-                // TODO: mp3 edit
-                $audio = array();
-                if (isset($_FILES['mp3'])) {
-                    $audio = $_FILES['mp3'];
-                }
+                    $description = isset($_POST['description']) ? $_POST['description'] : '';
+                    $prerequisites = isset($_POST['prerequisites']) ? $_POST['prerequisites'] : '';
+                    $maxTimeAllowed = isset($_POST['maxTimeAllowed']) ? $_POST['maxTimeAllowed'] : '';
+                    $url = isset($_POST['url']) ? $_POST['url'] : '';
+
+                    $_SESSION['oLP']->edit_item(
+                        $_REQUEST['id'],
+                        $_POST['parent'],
+                        $_POST['previous'],
+                        $post_title,
+                        $description,
+                        $prerequisites,
+                        $audio,
+                        $maxTimeAllowed,
+                        $url
+                    );
 
-                $description = isset($_POST['description']) ? $_POST['description'] : '';
-                $prerequisites = isset($_POST['prerequisites']) ? $_POST['prerequisites'] : '';
-                $maxTimeAllowed = isset($_POST['maxTimeAllowed']) ? $_POST['maxTimeAllowed'] : '';
-                $url = isset($_POST['url']) ? $_POST['url'] : '';
-
-                $_SESSION['oLP']->edit_item(
-                    $_REQUEST['id'],
-                    $_POST['parent'],
-                    $_POST['previous'],
-                    $post_title,
-                    $description,
-                    $prerequisites,
-                    $audio,
-                    $maxTimeAllowed,
-                    $url
-                );
+                    if (isset($_POST['content_lp'])) {
+                        $_SESSION['oLP']->edit_document($_course);
+                    }
+                    $is_success = true;
 
-                if (isset($_POST['content_lp'])) {
-                    $_SESSION['oLP']->edit_document($_course);
+                    $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id);
+                    header('Location: '.$url);
+                    exit;
                 }
-                $is_success = true;
+                if (isset($_GET['view']) && $_GET['view'] == 'build') {
+                    require 'lp_edit_item.php';
+                } else {
+                    require 'lp_admin_view.php';
+                }
+            }
+            break;
+        case 'edit_item_prereq':
+            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 (isset($_POST['submit_button'])) {
+                    //Updating the lp.modified_on
+                    $_SESSION['oLP']->set_modified_on();
+                    $_SESSION['refresh'] = 1;
+                    $editPrerequisite = $_SESSION['oLP']->edit_item_prereq(
+                        $_GET['id'],
+                        $_POST['prerequisites'],
+                        $_POST['min_' . $_POST['prerequisites']],
+                        $_POST['max_' . $_POST['prerequisites']]
+                    );
 
-                $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id);
-                header('Location: '.$url);
-                exit;
+                    if ($editPrerequisite) {
+                        $is_success = true;
+                    }
+
+                    $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id).'&'.api_get_cidreq();
+                    header('Location: '.$url);
+                    exit;
+                } else {
+                    require 'lp_edit_item_prereq.php';
+                }
             }
-            if (isset($_GET['view']) && $_GET['view'] == 'build') {
-                require 'lp_edit_item.php';
-            } else {
-                require 'lp_admin_view.php';
+            break;
+        case 'move_item':
+            if (!$is_allowed_to_edit) {
+                api_not_allowed(true);
             }
-        }
-        break;
-    case 'edit_item_prereq':
-        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 (isset($_POST['submit_button'])) {
-                //Updating the lp.modified_on
-                $_SESSION['oLP']->set_modified_on();
+            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;
-                $editPrerequisite = $_SESSION['oLP']->edit_item_prereq(
-                    $_GET['id'],
-                    $_POST['prerequisites'],
-                    $_POST['min_' . $_POST['prerequisites']],
-                    $_POST['max_' . $_POST['prerequisites']]
-                );
-
-                if ($editPrerequisite) {
+                if (isset($_POST['submit_button'])) {
+                    //Updating the lp.modified_on
+                    $_SESSION['oLP']->set_modified_on();
+                    $_SESSION['oLP']->edit_item(
+                        $_GET['id'],
+                        $_POST['parent'],
+                        $_POST['previous'],
+                        $post_title,
+                        $_POST['description']
+                    );
                     $is_success = true;
+                    $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id).'&'.api_get_cidreq();
+                    header('Location: '.$url);
+                }
+                if (isset($_GET['view']) && $_GET['view'] == 'build') {
+                    require 'lp_move_item.php';
+                } else {
+                    // Avoids weird behaviours see CT#967.
+                    $check = Security::check_token('get');
+                    if ($check) {
+                        $_SESSION['oLP']->move_item($_GET['id'], $_GET['direction']);
+                    }
+                    Security::clear_token();
+                    require 'lp_admin_view.php';
                 }
-
-                $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id).'&'.api_get_cidreq();
-                header('Location: '.$url);
-                exit;
-            } else {
-                require 'lp_edit_item_prereq.php';
             }
-        }
-        break;
-    case 'move_item':
-        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 {
-            $_SESSION['refresh'] = 1;
-            if (isset($_POST['submit_button'])) {
-                //Updating the lp.modified_on
-                $_SESSION['oLP']->set_modified_on();
-                $_SESSION['oLP']->edit_item(
-                    $_GET['id'],
-                    $_POST['parent'],
-                    $_POST['previous'],
-                    $post_title,
-                    $_POST['description']
-                );
-                $is_success = true;
-                $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id).'&'.api_get_cidreq();
-                header('Location: '.$url);
+            break;
+        case 'view_item':
+            if (!$is_allowed_to_edit) {
+                api_not_allowed(true);
             }
-            if (isset($_GET['view']) && $_GET['view'] == 'build') {
-                require 'lp_move_item.php';
+            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 {
-                // Avoids weird behaviours see CT#967.
-                $check = Security::check_token('get');
-                if ($check) {
-                    $_SESSION['oLP']->move_item($_GET['id'], $_GET['direction']);
-                }
-                Security::clear_token();
-                require 'lp_admin_view.php';
+                $_SESSION['refresh'] = 1;
+                require 'lp_view_item.php';
+            }
+            break;
+        case 'upload':
+            if (!$is_allowed_to_edit) {
+                api_not_allowed(true);
+            }
+            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.
+            chdir($cwdir);
+            require 'lp_list.php';
+            break;
+        case 'copy':
+            if (!$is_allowed_to_edit) {
+                api_not_allowed(true);
             }
-        }
-        break;
-    case 'view_item':
-        if (!$is_allowed_to_edit) {
-            api_not_allowed(true);
-        }
-        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 {
-            $_SESSION['refresh'] = 1;
-            require 'lp_view_item.php';
-        }
-        break;
-    case 'upload':
-        if (!$is_allowed_to_edit) {
-            api_not_allowed(true);
-        }
-        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.
-        chdir($cwdir);
-        require 'lp_list.php';
-        break;
-    case 'copy':
-        if (!$is_allowed_to_edit) {
-            api_not_allowed(true);
-        }
 
-        $hideScormCopyLink = api_get_setting('hide_scorm_copy_link');
-        if ($hideScormCopyLink === 'true') {
-            api_not_allowed(true);
-        }
+            $hideScormCopyLink = api_get_setting('hide_scorm_copy_link');
+            if ($hideScormCopyLink === '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 copy', 0); require 'lp_list.php'; }
-        else {
-            $_SESSION['oLP']->copy();
-        }
-        require 'lp_list.php';
-        break;
-    case 'export':
-        if (!$is_allowed_to_edit) {
-            api_not_allowed(true);
-        }
-        $hideScormExportLink = api_get_setting('hide_scorm_export_link');
-        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 {
-            $_SESSION['oLP']->scorm_export();
-            exit();
-            //require 'lp_list.php';
-        }
-        break;
-    case 'export_to_pdf':
-        if (!learnpath::is_lp_visible_for_student($_SESSION['oLP']->lp_id, api_get_user_id())) {
-            api_not_allowed();
-        }
-        $hideScormPdfLink = api_get_setting('hide_scorm_pdf_link');
-        if ($hideScormPdfLink === '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 copy', 0); require 'lp_list.php'; }
+            else {
+                $_SESSION['oLP']->copy();
+            }
+            require 'lp_list.php';
+            break;
+        case 'export':
+            if (!$is_allowed_to_edit) {
+                api_not_allowed(true);
+            }
+            $hideScormExportLink = api_get_setting('hide_scorm_export_link');
+            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 {
+                $_SESSION['oLP']->scorm_export();
+                exit();
+                //require 'lp_list.php';
+            }
+            break;
+        case 'export_to_pdf':
+            if (!learnpath::is_lp_visible_for_student($_SESSION['oLP']->lp_id, api_get_user_id())) {
+                api_not_allowed();
+            }
+            $hideScormPdfLink = api_get_setting('hide_scorm_pdf_link');
+            if ($hideScormPdfLink === '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_to_pdf', 0); require 'lp_list.php';
-        } else {
-            $result = $_SESSION['oLP']->scorm_export_to_pdf($_GET['lp_id']);
-            if (!$result) {
+            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']);
+                if (!$result) {
+                    require 'lp_list.php';
+                }
+                exit;
+            }
+            break;
+        case 'delete':
+            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 {
+                $_SESSION['refresh'] = 1;
+                $_SESSION['oLP']->delete(null, $_GET['lp_id'], 'remove');
+                Session::erase('oLP');
                 require 'lp_list.php';
             }
-            exit;
-        }
-        break;
-    case 'delete':
-        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 {
-            $_SESSION['refresh'] = 1;
-            $_SESSION['oLP']->delete(null, $_GET['lp_id'], 'remove');
-            Session::erase('oLP');
-            require 'lp_list.php';
-        }
-        break;
-    case 'toggle_visible':
-        // Change lp visibility (inside lp tool).
-        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 {
-            learnpath::toggle_visibility($_REQUEST['lp_id'], $_REQUEST['new_status']);
-            require 'lp_list.php';
-        }
-        break;
-    case 'toggle_publish':
-        // Change lp published status (visibility on homepage).
-        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 {
-            learnpath::toggle_publish($_REQUEST['lp_id'], $_REQUEST['new_status']);
-            require 'lp_list.php';
-        }
-        break;
-    case 'move_lp_up':
-        // Change lp published status (visibility on homepage)
-        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 {
-            learnpath::move_up($_REQUEST['lp_id']);
-            require 'lp_list.php';
-        }
-        break;
-    case 'move_lp_down':
-        // Change lp published status (visibility on homepage)
-        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 {
-            learnpath::move_down($_REQUEST['lp_id']);
-            require 'lp_list.php';
-        }
-        break;
-    case 'edit':
-        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 {
-            $_SESSION['refresh'] = 1;
-            require 'lp_edit.php';
-        }
-        break;
-    case 'update_lp':
-        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 {
-            $_SESSION['refresh'] = 1;
-            $lp_name = Security::remove_XSS($_REQUEST['lp_name']);
-            $_SESSION['oLP']->set_name($lp_name);
-            $author = $_REQUEST['lp_author'];
-            // Fixing the author name (no body or html tags).
-            $auth_init = stripos($author, '<p>');
-            if ($auth_init === false) {
-                $auth_init = stripos($author, '<body>');
-                $auth_end = $auth_init + stripos(substr($author, $auth_init + 6), '</body>') + 7;
-                $len = $auth_end - $auth_init + 6;
+            break;
+        case 'toggle_visible':
+            // Change lp visibility (inside lp tool).
+            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 {
+                learnpath::toggle_visibility($_REQUEST['lp_id'], $_REQUEST['new_status']);
+                require 'lp_list.php';
+            }
+            break;
+        case 'toggle_publish':
+            // Change lp published status (visibility on homepage).
+            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 {
+                learnpath::toggle_publish($_REQUEST['lp_id'], $_REQUEST['new_status']);
+                require 'lp_list.php';
+            }
+            break;
+        case 'move_lp_up':
+            // Change lp published status (visibility on homepage)
+            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 {
+                learnpath::move_up($_REQUEST['lp_id']);
+                require 'lp_list.php';
+            }
+            break;
+        case 'move_lp_down':
+            // Change lp published status (visibility on homepage)
+            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 {
-                $auth_end = strripos($author, '</p>');
-                $len = $auth_end - $auth_init + 4;
+                learnpath::move_down($_REQUEST['lp_id']);
+                require 'lp_list.php';
+            }
+            break;
+        case 'edit':
+            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 {
+                $_SESSION['refresh'] = 1;
+                require 'lp_edit.php';
+            }
+            break;
+        case 'update_lp':
+            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 {
+                $_SESSION['refresh'] = 1;
+                $lp_name = Security::remove_XSS($_REQUEST['lp_name']);
+                $_SESSION['oLP']->set_name($lp_name);
+                $author = $_REQUEST['lp_author'];
+                // Fixing the author name (no body or html tags).
+                $auth_init = stripos($author, '<p>');
+                if ($auth_init === false) {
+                    $auth_init = stripos($author, '<body>');
+                    $auth_end = $auth_init + stripos(substr($author, $auth_init + 6), '</body>') + 7;
+                    $len = $auth_end - $auth_init + 6;
+                } else {
+                    $auth_end = strripos($author, '</p>');
+                    $len = $auth_end - $auth_init + 4;
+                }
 
-            $author_fixed = substr($author, $auth_init, $len);
-            //$author_fixed = $author;
+                $author_fixed = substr($author, $auth_init, $len);
+                //$author_fixed = $author;
 
-            $_SESSION['oLP']->set_author($author_fixed);
-            // TODO (as of Chamilo 1.8.8): Check in the future whether this field is needed.
-            $_SESSION['oLP']->set_encoding($_REQUEST['lp_encoding']);
+                $_SESSION['oLP']->set_author($author_fixed);
+                // TODO (as of Chamilo 1.8.8): Check in the future whether this field is needed.
+                $_SESSION['oLP']->set_encoding($_REQUEST['lp_encoding']);
 
-            if (isset($_REQUEST['lp_maker'])) {
-                $_SESSION['oLP']->set_maker($_REQUEST['lp_maker']);
-            }
-            if (isset($_REQUEST['lp_proximity'])) {
-                $_SESSION['oLP']->set_proximity($_REQUEST['lp_proximity']);
-            }
-            $_SESSION['oLP']->set_theme($_REQUEST['lp_theme']);
+                if (isset($_REQUEST['lp_maker'])) {
+                    $_SESSION['oLP']->set_maker($_REQUEST['lp_maker']);
+                }
+                if (isset($_REQUEST['lp_proximity'])) {
+                    $_SESSION['oLP']->set_proximity($_REQUEST['lp_proximity']);
+                }
+                $_SESSION['oLP']->set_theme($_REQUEST['lp_theme']);
 
-            if (isset($_REQUEST['hide_toc_frame']) && $_REQUEST['hide_toc_frame'] == 1) {
-                $hide_toc_frame = $_REQUEST['hide_toc_frame'];
-            } else {
-                $hide_toc_frame = null;
-            }
-            $_SESSION['oLP']->set_hide_toc_frame($hide_toc_frame);
-            $_SESSION['oLP']->set_prerequisite($_REQUEST['prerequisites']);
-            $_SESSION['oLP']->set_use_max_score($_REQUEST['use_max_score']);
-            $_SESSION['oLP']->setSubscribeUsers($_REQUEST['subscribe_users']);
+                if (isset($_REQUEST['hide_toc_frame']) && $_REQUEST['hide_toc_frame'] == 1) {
+                    $hide_toc_frame = $_REQUEST['hide_toc_frame'];
+                } else {
+                    $hide_toc_frame = null;
+                }
+                $_SESSION['oLP']->set_hide_toc_frame($hide_toc_frame);
+                $_SESSION['oLP']->set_prerequisite($_REQUEST['prerequisites']);
+                $_SESSION['oLP']->set_use_max_score($_REQUEST['use_max_score']);
+                $_SESSION['oLP']->setSubscribeUsers($_REQUEST['subscribe_users']);
 
-            if (isset($_REQUEST['activate_start_date_check']) && $_REQUEST['activate_start_date_check'] == 1) {
-            	$publicated_on  = $_REQUEST['publicated_on'];
-            } else {
-            	$publicated_on = null;
-            }
+                if (isset($_REQUEST['activate_start_date_check']) && $_REQUEST['activate_start_date_check'] == 1) {
+            	    $publicated_on  = $_REQUEST['publicated_on'];
+                } else {
+            	    $publicated_on = null;
+                }
 
-            if (isset($_REQUEST['activate_end_date_check']) && $_REQUEST['activate_end_date_check'] == 1) {
-                $expired_on = $_REQUEST['expired_on'];
-            } else {
-                $expired_on = null;
-            }
-            $_SESSION['oLP']->setCategoryId($_REQUEST['category_id']);
-            $_SESSION['oLP']->set_modified_on();
-            $_SESSION['oLP']->set_publicated_on($publicated_on);
-            $_SESSION['oLP']->set_expired_on($expired_on);
-
-            if (isset($_REQUEST['remove_picture']) && $_REQUEST['remove_picture']) {
-                $_SESSION['oLP']->delete_lp_image();
-            }
-
-            $extraFieldValue = new ExtraFieldValue('lp');
-            $params = array(
-                'lp_id' => $_SESSION['oLP']->id
-            );
-            $extraFieldValue->saveFieldValues($_REQUEST);
-
-            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';
-                $specific_fields = get_specific_field_list();
-                foreach ($specific_fields as $specific_field) {
-                    $_SESSION['oLP']->set_terms_by_prefix($_REQUEST[$specific_field['code']], $specific_field['code']);
-                    $new_values = explode(',', trim($_REQUEST[$specific_field['code']]));
-                    if (!empty($new_values)) {
-                        array_walk($new_values, 'trim');
-                        delete_all_specific_field_value(
-                            api_get_course_id(),
-                            $specific_field['id'],
-                            TOOL_LEARNPATH,
-                            $_SESSION['oLP']->lp_id
-                        );
+                if (isset($_REQUEST['activate_end_date_check']) && $_REQUEST['activate_end_date_check'] == 1) {
+                    $expired_on = $_REQUEST['expired_on'];
+                } else {
+                    $expired_on = null;
+                }
+                $_SESSION['oLP']->setCategoryId($_REQUEST['category_id']);
+                $_SESSION['oLP']->set_modified_on();
+                $_SESSION['oLP']->set_publicated_on($publicated_on);
+                $_SESSION['oLP']->set_expired_on($expired_on);
+
+                if (isset($_REQUEST['remove_picture']) && $_REQUEST['remove_picture']) {
+                    $_SESSION['oLP']->delete_lp_image();
+                }
 
-                        foreach ($new_values as $value) {
-                            if (!empty($value)) {
-                                add_specific_field_value(
-                                    $specific_field['id'],
-                                    api_get_course_id(),
-                                    TOOL_LEARNPATH,
-                                    $_SESSION['oLP']->lp_id,
-                                    $value
-                                );
+                $extraFieldValue = new ExtraFieldValue('lp');
+                $params = array(
+                    'lp_id' => $_SESSION['oLP']->id
+                );
+                $extraFieldValue->saveFieldValues($_REQUEST);
+
+                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';
+                    $specific_fields = get_specific_field_list();
+                    foreach ($specific_fields as $specific_field) {
+                        $_SESSION['oLP']->set_terms_by_prefix($_REQUEST[$specific_field['code']], $specific_field['code']);
+                        $new_values = explode(',', trim($_REQUEST[$specific_field['code']]));
+                        if (!empty($new_values)) {
+                            array_walk($new_values, 'trim');
+                            delete_all_specific_field_value(
+                                api_get_course_id(),
+                                $specific_field['id'],
+                                TOOL_LEARNPATH,
+                                $_SESSION['oLP']->lp_id
+                            );
+
+                            foreach ($new_values as $value) {
+                                if (!empty($value)) {
+                                    add_specific_field_value(
+                                        $specific_field['id'],
+                                        api_get_course_id(),
+                                        TOOL_LEARNPATH,
+                                        $_SESSION['oLP']->lp_id,
+                                        $value
+                                    );
+                                }
                             }
                         }
                     }
                 }
+                $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id).'&'.api_get_cidreq();
+                header('Location: '.$url);
+                exit;
             }
-            $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id).'&'.api_get_cidreq();
-            header('Location: '.$url);
-            exit;
-        }
-        break;
-    case 'add_sub_item': // Add an item inside a chapter.
-        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 {
-            $_SESSION['refresh'] = 1;
-            if (!empty($_REQUEST['parent_item_id'])) {
-                $_SESSION['from_learnpath']='yes';
-                $_SESSION['origintoolurl'] = 'lp_controller.php?action=admin_view&lp_id='.Security::remove_XSS($_REQUEST['lp_id']);
-                require 'resourcelinker.php';
-            } else {
+            break;
+        case 'add_sub_item': // Add an item inside a chapter.
+            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 {
+                $_SESSION['refresh'] = 1;
+                if (!empty($_REQUEST['parent_item_id'])) {
+                    $_SESSION['from_learnpath']='yes';
+                    $_SESSION['origintoolurl'] = 'lp_controller.php?action=admin_view&lp_id='.Security::remove_XSS($_REQUEST['lp_id']);
+                    require 'resourcelinker.php';
+                } else {
+                    require 'lp_admin_view.php';
+                }
+            }
+            break;
+        case 'deleteitem':
+        case 'delete_item':
+            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 {
+                //$_SESSION['refresh'] = 1;
+                if (!empty($_REQUEST['id'])) {
+                    $_SESSION['oLP']->delete_item($_REQUEST['id']);
+                }
+                $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_REQUEST['lp_id']).api_get_cidreq();
+                header('Location: '.$url);
+                exit;
+            }
+            break;
+        case 'edititemprereq':
+        case 'edit_item_prereq':
+            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 (!empty($_REQUEST['id']) && !empty($_REQUEST['submit_item'])) {
+                    $_SESSION['refresh'] = 1;
+                    $_SESSION['oLP']->edit_item_prereq($_REQUEST['id'], $_REQUEST['prereq']);
+                }
                 require 'lp_admin_view.php';
             }
-        }
-        break;
-    case 'deleteitem':
-    case 'delete_item':
-        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 {
-            //$_SESSION['refresh'] = 1;
-            if (!empty($_REQUEST['id'])) {
-                $_SESSION['oLP']->delete_item($_REQUEST['id']);
-            }
-            $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_REQUEST['lp_id']).api_get_cidreq();
-            header('Location: '.$url);
-            exit;
-        }
-        break;
-    case 'edititemprereq':
-    case 'edit_item_prereq':
-        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 (!empty($_REQUEST['id']) && !empty($_REQUEST['submit_item'])) {
+            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 {
+                $_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 {
+                $_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 {
+                $_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 {
+                $_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 {
+                $_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 (!$lp_found) {
+                error_log('New LP - No learnpath given for content', 0);
+                require 'lp_list.php';
+            }
+            else {
+                $_SESSION['oLP']->save_last();
+                $_SESSION['oLP']->set_current_item($_GET['item_id']);
+                $_SESSION['oLP']->start_current_item();
+                require 'lp_content.php';
+            }
+            break;
+        case 'view':
+            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';
+            } else {
+                if ($debug > 0) {error_log('New LP - Trying to set current item to ' . $_REQUEST['item_id'], 0); }
+                if ( !empty($_REQUEST['item_id']) ) {
+                    $_SESSION['oLP']->set_current_item($_REQUEST['item_id']);
+                }
+                require 'lp_view.php';
+            }
+            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 {
+                $_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 {
+                $_SESSION['oLP']->save_current();
+                $_SESSION['oLP']->save_last();
+                $output = require 'lp_stats.php';
+                echo $output;
+            }
+            break;
+        case 'list':
+            if ($debug > 0) error_log('New LP - list action triggered', 0);
+            if ($lp_found) {
                 $_SESSION['refresh'] = 1;
-                $_SESSION['oLP']->edit_item_prereq($_REQUEST['id'], $_REQUEST['prereq']);
+                $_SESSION['oLP']->save_last();
             }
-            require 'lp_admin_view.php';
-        }
-        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 {
-            $_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 {
-            $_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 {
-            $_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 {
-            $_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 {
-            $_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 (!$lp_found) {
-            error_log('New LP - No learnpath given for content', 0);
-            require 'lp_list.php';
-        }
-        else {
-            $_SESSION['oLP']->save_last();
-            $_SESSION['oLP']->set_current_item($_GET['item_id']);
-            $_SESSION['oLP']->start_current_item();
-            require 'lp_content.php';
-        }
-        break;
-    case 'view':
-        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';
-        } else {
-            if ($debug > 0) {error_log('New LP - Trying to set current item to ' . $_REQUEST['item_id'], 0); }
-            if ( !empty($_REQUEST['item_id']) ) {
-                $_SESSION['oLP']->set_current_item($_REQUEST['item_id']);
+            break;
+        case 'mode':
+            // Switch between fullscreen and embedded mode.
+            if ($debug > 0) error_log('New LP - mode change triggered', 0);
+            $mode = $_REQUEST['mode'];
+            if ($mode == 'fullscreen') {
+                $_SESSION['oLP']->mode = 'fullscreen';
+            } elseif ($mode == 'embedded') {
+                $_SESSION['oLP']->mode = 'embedded';
+            } elseif ($mode == 'embedframe') {
+        	    $_SESSION['oLP']->mode = 'embedframe';
+            } elseif ($mode == 'impress') {
+                $_SESSION['oLP']->mode = 'impress';
             }
             require 'lp_view.php';
-        }
-        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 {
-            $_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 {
-            $_SESSION['oLP']->save_current();
-            $_SESSION['oLP']->save_last();
-            $output = require 'lp_stats.php';
-            echo $output;
-        }
-        break;
-    case 'list':
-        if ($debug > 0) error_log('New LP - list action triggered', 0);
-        if ($lp_found) {
-            $_SESSION['refresh'] = 1;
-            $_SESSION['oLP']->save_last();
-        }
-        require 'lp_list.php';
-        break;
-    case 'mode':
-        // Switch between fullscreen and embedded mode.
-        if ($debug > 0) error_log('New LP - mode change triggered', 0);
-        $mode = $_REQUEST['mode'];
-        if ($mode == 'fullscreen') {
-            $_SESSION['oLP']->mode = 'fullscreen';
-        } elseif ($mode == 'embedded') {
-            $_SESSION['oLP']->mode = 'embedded';
-        } elseif ($mode == 'embedframe') {
-        	$_SESSION['oLP']->mode = 'embedframe';
-        } elseif ($mode == 'impress') {
-            $_SESSION['oLP']->mode = 'impress';
-        }
-        require 'lp_view.php';
-        break;
-    case 'switch_view_mode':
-        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')) {
+            break;
+        case 'switch_view_mode':
+            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;
+                $_SESSION['oLP']->update_default_view_mode();
+            }
+            require 'lp_list.php';
+            break;
+        case 'switch_force_commit':
+            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_view_mode();
-        }
-        require 'lp_list.php';
-        break;
-    case 'switch_force_commit':
-        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();
-        require 'lp_list.php';
-        break;
-    /* Those 2 switches have been replaced by switc_attempt_mode switch
+            $_SESSION['oLP']->update_default_scorm_commit();
+            require 'lp_list.php';
+            break;
+        /* Those 2 switches have been replaced by switc_attempt_mode switch
     case 'switch_reinit':
         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'; }
@@ -1196,199 +1196,199 @@ 
 		$_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 (!$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);
-        // Add introduction section page.
-        break;
-    case 'js_api_refresh':
-        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']);
-        }
-        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 {
-            $_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();
-            if (isset($_GET['redirectTo']) && $_GET['redirectTo'] == 'lp_list') {
-                $url = 'lp_controller.php?'.api_get_cidreq();
-            }
-            header('location: '.$url);
-            exit;
-        }
-        break;
-    case 'search':
-        /* Include the search script, it's smart enough to know when we are
+        case 'switch_scorm_debug':
+            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);
+            // Add introduction section page.
+            break;
+        case 'js_api_refresh':
+            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']);
+            }
+            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 {
+                $_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();
+                if (isset($_GET['redirectTo']) && $_GET['redirectTo'] == 'lp_list') {
+                    $url = 'lp_controller.php?'.api_get_cidreq();
+                }
+                header('location: '.$url);
+                exit;
+            }
+            break;
+        case 'search':
+            /* Include the search script, it's smart enough to know when we are
          * searching or not.
          */
-        require 'lp_list_search.php';
-        break;
-    case 'impress':
-        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';
-        } else {
-            if ($debug > 0) {error_log('New LP - Trying to impress this LP item to ' . $_REQUEST['item_id'], 0); }
-            if (!empty($_REQUEST['item_id']) ) {
-                $_SESSION['oLP']->set_current_item($_REQUEST['item_id']);
+            require 'lp_list_search.php';
+            break;
+        case 'impress':
+            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';
+            } else {
+                if ($debug > 0) {error_log('New LP - Trying to impress this LP item to ' . $_REQUEST['item_id'], 0); }
+                if (!empty($_REQUEST['item_id']) ) {
+                    $_SESSION['oLP']->set_current_item($_REQUEST['item_id']);
+                }
+                require 'lp_impress.php';
+            }
+            break;
+        case 'set_previous_step_as_prerequisite':
+            $_SESSION['oLP']->set_previous_step_as_prerequisite_for_all_items();
+            $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id)."&message=ItemUpdated";
+            header('Location: '.$url);
+            break;
+        case 'clear_prerequisites':
+            $_SESSION['oLP']->clear_prerequisites();
+            $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id)."&message=ItemUpdated";
+            header('Location: '.$url);
+            break;
+        case 'toggle_seriousgame': //activate/deactive seriousgame_mode
+            if (!$is_allowed_to_edit) {
+                api_not_allowed(true);
             }
-            require 'lp_impress.php';
-        }
-        break;
-    case 'set_previous_step_as_prerequisite':
-        $_SESSION['oLP']->set_previous_step_as_prerequisite_for_all_items();
-        $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id)."&message=ItemUpdated";
-        header('Location: '.$url);
-        break;
-    case 'clear_prerequisites':
-        $_SESSION['oLP']->clear_prerequisites();
-        $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id)."&message=ItemUpdated";
-        header('Location: '.$url);
-        break;
-    case 'toggle_seriousgame': //activate/deactive seriousgame_mode
-        if (!$is_allowed_to_edit) {
-            api_not_allowed(true);
-        }
 
-        if ($debug > 0) {
-            error_log('New LP - seriousgame_mode action triggered');
-        }
+            if ($debug > 0) {
+                error_log('New LP - seriousgame_mode action triggered');
+            }
 
-        if (!$lp_found) {
-            error_log('New LP - No learnpath given for visibility');
+            if (!$lp_found) {
+                error_log('New LP - No learnpath given for visibility');
 
-            require 'lp_list.php';
-        }
+                require 'lp_list.php';
+            }
 
-        $_SESSION['refresh'] = 1;
-        $_SESSION['oLP']->set_seriousgame_mode();
-        require 'lp_list.php';
-        break;
-    case 'create_forum':
-        if (!isset($_GET['id'])) {
+            $_SESSION['refresh'] = 1;
+            $_SESSION['oLP']->set_seriousgame_mode();
+            require 'lp_list.php';
             break;
-        }
-
-        $selectedItem = null;
-
-        foreach ($_SESSION['oLP']->items as $item) {
-            if ($item->db_id == $_GET['id']) {
-                $selectedItem = $item;
+        case 'create_forum':
+            if (!isset($_GET['id'])) {
+                break;
             }
-        }
 
-        if (!empty($selectedItem)) {
-            $forumThread = $selectedItem->getForumThread(
-                $_SESSION['oLP']->course_int_id,
-                $_SESSION['oLP']->lp_session_id
-            );
+            $selectedItem = null;
 
-            if (empty($forumThread)) {
-                require '../forum/forumfunction.inc.php';
+            foreach ($_SESSION['oLP']->items as $item) {
+                if ($item->db_id == $_GET['id']) {
+                    $selectedItem = $item;
+                }
+            }
 
-                $forumCategory = getForumCategoryByTitle(
-                    get_lang('LearningPaths'),
+            if (!empty($selectedItem)) {
+                $forumThread = $selectedItem->getForumThread(
                     $_SESSION['oLP']->course_int_id,
                     $_SESSION['oLP']->lp_session_id
                 );
 
-                $forumCategoryId = !empty($forumCategory) ? $forumCategory['cat_id']: 0;
-
-                if (empty($forumCategoryId)) {
-                    $forumCategoryId = store_forumcategory(
-                        [
-                            'lp_id' => 0,
-                            'forum_category_title' => get_lang('LearningPaths'),
-                            'forum_category_comment' => null
-                        ],
-                        [],
-                        false
-                    );
-                }
+                if (empty($forumThread)) {
+                    require '../forum/forumfunction.inc.php';
 
-                if (!empty($forumCategoryId)) {
-                    $forum = $_SESSION['oLP']->getForum(
+                    $forumCategory = getForumCategoryByTitle(
+                        get_lang('LearningPaths'),
+                        $_SESSION['oLP']->course_int_id,
                         $_SESSION['oLP']->lp_session_id
                     );
 
-                    $forumId = !empty($forum) ? $forum['forum_id'] : 0;
-
-                    if (empty($forumId)) {
-                        $forumId = $_SESSION['oLP']->createForum($forumCategoryId);
+                    $forumCategoryId = !empty($forumCategory) ? $forumCategory['cat_id']: 0;
+
+                    if (empty($forumCategoryId)) {
+                        $forumCategoryId = store_forumcategory(
+                            [
+                                'lp_id' => 0,
+                                'forum_category_title' => get_lang('LearningPaths'),
+                                'forum_category_comment' => null
+                            ],
+                            [],
+                            false
+                        );
                     }
 
-                    if (!empty($forumId)) {
-                        $selectedItem->createForumThread($forumId);
+                    if (!empty($forumCategoryId)) {
+                        $forum = $_SESSION['oLP']->getForum(
+                            $_SESSION['oLP']->lp_session_id
+                        );
+
+                        $forumId = !empty($forum) ? $forum['forum_id'] : 0;
+
+                        if (empty($forumId)) {
+                            $forumId = $_SESSION['oLP']->createForum($forumCategoryId);
+                        }
+
+                        if (!empty($forumId)) {
+                            $selectedItem->createForumThread($forumId);
+                        }
                     }
                 }
             }
-        }
 
-        header('Location:' . api_get_self() . '?' . http_build_query([
-            'action' => 'add_item',
-            'type' => 'step',
-            'lp_id' => $_SESSION['oLP']->lp_id
-        ]));
+            header('Location:' . api_get_self() . '?' . http_build_query([
+                'action' => 'add_item',
+                'type' => 'step',
+                'lp_id' => $_SESSION['oLP']->lp_id
+            ]));
 
-        break;
-    case 'report':
-        require 'lp_report.php';
-        break;
-    case 'dissociate_forum':
-        if (!isset($_GET['id'])) {
             break;
-        }
+        case 'report':
+            require 'lp_report.php';
+            break;
+        case 'dissociate_forum':
+            if (!isset($_GET['id'])) {
+                break;
+            }
 
-        $selectedItem = null;
+            $selectedItem = null;
 
-        foreach ($_SESSION['oLP']->items as $item) {
-            if ($item->db_id != $_GET['id']) {
-                continue;
-            }
+            foreach ($_SESSION['oLP']->items as $item) {
+                if ($item->db_id != $_GET['id']) {
+                    continue;
+                }
 
-            $selectedItem = $item;
-        }
+                $selectedItem = $item;
+            }
 
-        if (!empty($selectedItem)) {
-            $forumThread = $selectedItem->getForumThread(
-                $_SESSION['oLP']->course_int_id,
-                $_SESSION['oLP']->lp_session_id
-            );
+            if (!empty($selectedItem)) {
+                $forumThread = $selectedItem->getForumThread(
+                    $_SESSION['oLP']->course_int_id,
+                    $_SESSION['oLP']->lp_session_id
+                );
 
-            if (!empty($forumThread)) {
-                $dissoaciated = $selectedItem->dissociateForumThread($forumThread['iid']);
+                if (!empty($forumThread)) {
+                    $dissoaciated = $selectedItem->dissociateForumThread($forumThread['iid']);
 
-                if ($dissoaciated) {
-                    Display::addFlash(
-                        Display::return_message(get_lang('ForumDissociate'), 'success')
-                    );
+                    if ($dissoaciated) {
+                        Display::addFlash(
+                            Display::return_message(get_lang('ForumDissociate'), 'success')
+                        );
+                    }
                 }
             }
-        }
 
-        header('Location:' . api_get_self() . '?' . http_build_query([
-            'action' => 'add_item',
-            'type' => 'step',
-            'lp_id' => $_SESSION['oLP']->lp_id
-        ]));
-        break;
-    default:
-        if ($debug > 0) error_log('New LP - default action triggered', 0);
-        require 'lp_list.php';
-        break;
+            header('Location:' . api_get_self() . '?' . http_build_query([
+                'action' => 'add_item',
+                'type' => 'step',
+                'lp_id' => $_SESSION['oLP']->lp_id
+            ]));
+            break;
+        default:
+            if ($debug > 0) error_log('New LP - default action triggered', 0);
+            require 'lp_list.php';
+            break;
 }
 
 if (!empty($_SESSION['oLP'])) {

Spacing +19 added lines, -19 removed lines

@@ -25,7 +25,7 @@ 
 
 // Including the global initialization file.
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_LEARNPATH;
+$current_course_tool = TOOL_LEARNPATH;
 $_course = api_get_course_info();
 
 $glossaryExtraTools = api_get_setting('show_glossary_in_extra_tools');
@@ -37,11 +37,11 @@ 
     ) {
         $htmlHeadXtra[] = '<script>
     <!--
-        var jQueryFrameReadyConfigPath = \'' . api_get_jquery_web_path() . '\';
+        var jQueryFrameReadyConfigPath = \'' . api_get_jquery_web_path().'\';
     -->
     </script>';
-    $htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_PATH) . 'javascript/jquery.frameready.js" type="text/javascript" language="javascript"></script>';
-    $htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_PATH) . 'javascript/jquery.highlight.js" type="text/javascript" language="javascript"></script>';
+    $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.frameready.js" type="text/javascript" language="javascript"></script>';
+    $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.highlight.js" type="text/javascript" language="javascript"></script>';
     }
 }
 
@@ -268,7 +268,7 @@ 
 
 $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);
@@ -292,7 +292,7 @@ 
             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);
@@ -687,8 +687,8 @@ 
                 $editPrerequisite = $_SESSION['oLP']->edit_item_prereq(
                     $_GET['id'],
                     $_POST['prerequisites'],
-                    $_POST['min_' . $_POST['prerequisites']],
-                    $_POST['max_' . $_POST['prerequisites']]
+                    $_POST['min_'.$_POST['prerequisites']],
+                    $_POST['max_'.$_POST['prerequisites']]
                 );
 
                 if ($editPrerequisite) {
@@ -937,7 +937,7 @@ 
             $_SESSION['oLP']->setSubscribeUsers($_REQUEST['subscribe_users']);
 
             if (isset($_REQUEST['activate_start_date_check']) && $_REQUEST['activate_start_date_check'] == 1) {
-            	$publicated_on  = $_REQUEST['publicated_on'];
+            	$publicated_on = $_REQUEST['publicated_on'];
             } else {
             	$publicated_on = null;
             }
@@ -1008,7 +1008,7 @@ 
         else {
             $_SESSION['refresh'] = 1;
             if (!empty($_REQUEST['parent_item_id'])) {
-                $_SESSION['from_learnpath']='yes';
+                $_SESSION['from_learnpath'] = 'yes';
                 $_SESSION['origintoolurl'] = 'lp_controller.php?action=admin_view&lp_id='.Security::remove_XSS($_REQUEST['lp_id']);
                 require 'resourcelinker.php';
             } else {
@@ -1109,8 +1109,8 @@ 
             error_log('New LP - No learnpath given for view', 0);
             require 'lp_list.php';
         } else {
-            if ($debug > 0) {error_log('New LP - Trying to set current item to ' . $_REQUEST['item_id'], 0); }
-            if ( !empty($_REQUEST['item_id']) ) {
+            if ($debug > 0) {error_log('New LP - Trying to set current item to '.$_REQUEST['item_id'], 0); }
+            if (!empty($_REQUEST['item_id'])) {
                 $_SESSION['oLP']->set_current_item($_REQUEST['item_id']);
             }
             require 'lp_view.php';
@@ -1190,8 +1190,8 @@ 
 		break;
      */
 	case 'switch_attempt_mode':
-		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'; }
+		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';
@@ -1241,8 +1241,8 @@ 
             error_log('New LP - No learnpath given for view', 0);
             require 'lp_list.php';
         } else {
-            if ($debug > 0) {error_log('New LP - Trying to impress this LP item to ' . $_REQUEST['item_id'], 0); }
-            if (!empty($_REQUEST['item_id']) ) {
+            if ($debug > 0) {error_log('New LP - Trying to impress this LP item to '.$_REQUEST['item_id'], 0); }
+            if (!empty($_REQUEST['item_id'])) {
                 $_SESSION['oLP']->set_current_item($_REQUEST['item_id']);
             }
             require 'lp_impress.php';
@@ -1305,7 +1305,7 @@ 
                     $_SESSION['oLP']->lp_session_id
                 );
 
-                $forumCategoryId = !empty($forumCategory) ? $forumCategory['cat_id']: 0;
+                $forumCategoryId = !empty($forumCategory) ? $forumCategory['cat_id'] : 0;
 
                 if (empty($forumCategoryId)) {
                     $forumCategoryId = store_forumcategory(
@@ -1337,7 +1337,7 @@ 
             }
         }
 
-        header('Location:' . api_get_self() . '?' . http_build_query([
+        header('Location:'.api_get_self().'?'.http_build_query([
             'action' => 'add_item',
             'type' => 'step',
             'lp_id' => $_SESSION['oLP']->lp_id
@@ -1379,7 +1379,7 @@ 
             }
         }
 
-        header('Location:' . api_get_self() . '?' . http_build_query([
+        header('Location:'.api_get_self().'?'.http_build_query([
             'action' => 'add_item',
             'type' => 'step',
             'lp_id' => $_SESSION['oLP']->lp_id

Braces +225 added lines, -121 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);
 
@@ -369,11 +405,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;
@@ -447,11 +487,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;
@@ -525,7 +569,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;
@@ -584,9 +630,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';
         }
@@ -596,9 +643,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;
@@ -609,10 +657,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);
@@ -624,10 +673,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)) {
 
@@ -677,9 +727,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();
@@ -707,9 +758,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
@@ -742,7 +794,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 {
@@ -754,7 +808,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.
@@ -771,9 +827,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';
@@ -786,9 +843,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';
@@ -803,7 +861,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']);
@@ -817,9 +877,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');
@@ -831,9 +892,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';
         }
@@ -843,9 +905,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';
         }
@@ -855,7 +918,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';
@@ -869,7 +934,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';
@@ -882,9 +949,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';
         }
@@ -893,9 +961,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);
@@ -962,8 +1031,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';
@@ -1003,9 +1073,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';
@@ -1021,9 +1092,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']);
@@ -1038,9 +1110,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']);
@@ -1049,53 +1122,61 @@ 
         }
         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 {
+        } else {
             $_SESSION['oLP']->save_last();
             $_SESSION['oLP']->set_current_item($_GET['item_id']);
             $_SESSION['oLP']->start_current_item();
@@ -1103,8 +1184,9 @@ 
         }
         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';
@@ -1117,17 +1199,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';
@@ -1135,7 +1219,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();
@@ -1144,7 +1230,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';
@@ -1158,7 +1246,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;
@@ -1167,7 +1257,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();
@@ -1190,25 +1282,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']);
@@ -1216,8 +1316,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();
@@ -1235,8 +1334,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';
@@ -1386,12 +1486,16 @@ 
         ]));
         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);
+    }
+    }