chamilo / chamilo-lms

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':

Spacing +20 added lines, -20 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);
@@ -689,8 +689,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) {
@@ -939,7 +939,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;
             }
@@ -1010,7 +1010,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 {
@@ -1111,8 +1111,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';
@@ -1192,8 +1192,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';
@@ -1243,8 +1243,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';
@@ -1307,7 +1307,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(
@@ -1339,7 +1339,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
@@ -1381,7 +1381,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
@@ -1404,7 +1404,7 @@ 
 
         $_SESSION['oLP']->getFinalItemForm();
 
-        $redirectTo = api_get_self() . '?' . http_build_query([
+        $redirectTo = api_get_self().'?'.http_build_query([
             'action' => 'add_item',
             'type' => 'step',
             'lp_id' => intval($_SESSION['oLP']->lp_id)

Braces +233 added lines, -122 removed lines

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

main/newscorm/lp_add.php

Spacing +11 added lines, -11 removed lines

@@ -68,12 +68,12 @@ 
     Course admin section
     - all the functions not available for students - always available in this case (page only shown to admin)
 */
-if (isset($_SESSION['gradebook'])){
+if (isset($_SESSION['gradebook'])) {
     $gradebook = $_SESSION['gradebook'];
 }
 
-if (!empty($gradebook) && $gradebook=='view') {
-    $interbreadcrumb[]= array (
+if (!empty($gradebook) && $gradebook == 'view') {
+    $interbreadcrumb[] = array(
         'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
         'name' => get_lang('ToolGradebook')
     );
@@ -85,7 +85,7 @@ 
 
 echo '<div class="actions">';
 echo '<a href="lp_controller.php?cidReq='.$_course['sysCode'].'">'.
-        Display::return_icon('back.png', get_lang('ReturnToLearningPaths'),'',ICON_SIZE_MEDIUM).'</a>';
+        Display::return_icon('back.png', get_lang('ReturnToLearningPaths'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 
 Display::display_normal_message(get_lang('AddLpIntro'), false);
@@ -119,22 +119,22 @@ 
 
 // Start date
 $form->addElement('checkbox', 'activate_start_date_check', null, get_lang('EnableStartTime'), array('onclick' => 'activate_start_date()'));
-$form->addElement('html','<div id="start_date_div" style="display:block;">');
+$form->addElement('html', '<div id="start_date_div" style="display:block;">');
 $form->addElement('DatePicker', 'publicated_on', get_lang('PublicationDate'));
-$form->addElement('html','</div>');
+$form->addElement('html', '</div>');
 
 //End date
 $form->addElement('checkbox', 'activate_end_date_check', null, get_lang('EnableEndTime'), array('onclick' => 'activate_end_date()'));
-$form->addElement('html','<div id="end_date_div" style="display:none;">');
+$form->addElement('html', '<div id="end_date_div" style="display:none;">');
 $form->addElement('DatePicker', 'expired_on', get_lang('ExpirationDate'));
-$form->addElement('html','</div>');
+$form->addElement('html', '</div>');
 
-$form->addElement('html','</div>');
+$form->addElement('html', '</div>');
 
-$defaults['activate_start_date_check']  = 1;
+$defaults['activate_start_date_check'] = 1;
 
 $defaults['publicated_on'] = date('Y-m-d 08:00:00');
-$defaults['expired_on'] = date('Y-m-d 08:00:00',time()+86400);
+$defaults['expired_on'] = date('Y-m-d 08:00:00', time() + 86400);
 
 $form->setDefaults($defaults);
 $form->addButtonCreate(get_lang('CreateLearningPath'));

main/newscorm/audiorecorder.inc.php

Indentation +5 added lines, -5 removed lines

@@ -58,11 +58,11 @@
 if (!empty($path_to_lzx)) {
     $recorder_content = sprintf("<object type=\"application/x-shockwave-flash\" data=\"%s\" ".
             "width='$width' height='$height'>".
-             "<param name=\"movie\" value=\"%s\">".
-         "<param name=\"quality\" value=\"high\">".
-         "<param name=\"scale\" value=\"noscale\">".
-         "<param name=\"salign\" value=\"LT\">".
-         "<param name=\"menu\" value=\"false\"></object>", $path_to_lzx, $path_to_lzx);
+                "<param name=\"movie\" value=\"%s\">".
+            "<param name=\"quality\" value=\"high\">".
+            "<param name=\"scale\" value=\"noscale\">".
+            "<param name=\"salign\" value=\"LT\">".
+            "<param name=\"menu\" value=\"false\"></object>", $path_to_lzx, $path_to_lzx);
     if ($audio_recorder_studentview == 'false') {
         echo '<script type="text/javascript">
         function show_audiorecorder() {

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
 
 if ($audio_recorder_studentview == 'false') {
     $width = 295;
-    $height= 90;
+    $height = 90;
     $player = 'recorder2.swf';
     $server = (api_get_setting('service_visio', 'visio_use_rtmpt') == 'true' ? 'rtmpt://' : 'rtmp://').api_get_setting('service_visio', 'visio_host').':'.(api_get_setting('service_visio', 'visio_use_rtmpt') == 'true' ? '80' : api_get_setting('service_visio', 'visio_port')).'/recorder';
     $post_uri = urlencode($web_path.'conference/audiopost.php?course_code='.api_get_course_id().'&user_id='.api_get_user_id().'&checker='.md5(api_get_course_id().api_get_user_id().gmdate('Ymd').$_configuration['security_key']));
@@ -42,8 +42,8 @@ 
     $player = 'player2.swf';
     $cp = api_get_course_path();
     $docs = Database::get_course_table(TABLE_DOCUMENT);
-    $select = "SELECT * FROM $docs " .
-            " WHERE c_id = $course_id AND path like BINARY '/audio/lpi".intval($audio_recorder_item_id)."-%' AND filetype='file' " .
+    $select = "SELECT * FROM $docs ".
+            " WHERE c_id = $course_id AND path like BINARY '/audio/lpi".intval($audio_recorder_item_id)."-%' AND filetype='file' ".
             " ORDER BY path DESC";
     $res = Database::query($select);
     if (Database::num_rows($res) > 0) {