Completed
Push — 1.10.x ( 3d9ba2...d7355d )
by
unknown
52:02
created
main/inc/lib/formvalidator/Element/receivers.php 1 patch
Indentation   +66 added lines, -66 removed lines patch added patch discarded remove patch
@@ -10,65 +10,65 @@  discard block
 block discarded – undo
10 10
  */
11 11
 class HTML_QuickForm_receivers extends HTML_QuickForm_group
12 12
 {
13
-	/**
14
-	 * Array of all receivers
15
-	 */
16
-	var $receivers;
17
-	/**
18
-	 * Array of selected receivers
19
-	 */
20
-	var $receivers_selected;
21
-	/**
22
-	 * Constructor
23
-	 * @param string $elementName
24
-	 * @param string $elementLabel
25
-	 * @param array $attributes This should contain the keys 'receivers' and
26
-	 * 'receivers_selected'
27
-	 */
28
-	public function __construct($elementName = null, $elementLabel = null, $attributes = null)
29
-	{
30
-		$this->receivers = $attributes['receivers'];
31
-		$this->receivers_selected = $attributes['receivers_selected'];
32
-		unset($attributes['receivers']);
33
-		unset($attributes['receivers_selected']);
34
-		parent::__construct($elementName, $elementLabel, $attributes);
35
-		$this->_persistantFreeze = true;
36
-		$this->_appendName = true;
37
-		$this->_type = 'receivers';
38
-	}
39
-	/**
40
-	 * Create the form elements to build this element group
41
-	 */
42
-	function _createElements()
43
-	{
44
-		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
45
-		$this->_elements[0]->setChecked(true);
46
-		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
47
-		$this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers);
48
-		$this->_elements[2]->setSelected($this->receivers_selected);
49
-	}
50
-	/**
51
-	 * HTML representation
52
-	 */
53
-	public function toHtml()
54
-	{
55
-		include_once ('HTML/QuickForm/Renderer/Default.php');
56
-		$this->_separator = '<br/>';
57
-		$renderer = & new HTML_QuickForm_Renderer_Default();
58
-		$renderer->setElementTemplate('{element}');
59
-		$select_boxes = $this->_elements[2];
60
-		$select_boxes->setElementTemplate('<div style="margin-left:20px;display:block;" id="receivers_'.$select_boxes->getName().'">'.$select_boxes->_elementTemplate.'</div>');
61
-		parent :: accept($renderer);
62
-		$js = $this->getElementJS();
63
-		return $renderer->toHtml().$js;
64
-	}
13
+    /**
14
+     * Array of all receivers
15
+     */
16
+    var $receivers;
17
+    /**
18
+     * Array of selected receivers
19
+     */
20
+    var $receivers_selected;
21
+    /**
22
+     * Constructor
23
+     * @param string $elementName
24
+     * @param string $elementLabel
25
+     * @param array $attributes This should contain the keys 'receivers' and
26
+     * 'receivers_selected'
27
+     */
28
+    public function __construct($elementName = null, $elementLabel = null, $attributes = null)
29
+    {
30
+        $this->receivers = $attributes['receivers'];
31
+        $this->receivers_selected = $attributes['receivers_selected'];
32
+        unset($attributes['receivers']);
33
+        unset($attributes['receivers_selected']);
34
+        parent::__construct($elementName, $elementLabel, $attributes);
35
+        $this->_persistantFreeze = true;
36
+        $this->_appendName = true;
37
+        $this->_type = 'receivers';
38
+    }
39
+    /**
40
+     * Create the form elements to build this element group
41
+     */
42
+    function _createElements()
43
+    {
44
+        $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
45
+        $this->_elements[0]->setChecked(true);
46
+        $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
47
+        $this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers);
48
+        $this->_elements[2]->setSelected($this->receivers_selected);
49
+    }
50
+    /**
51
+     * HTML representation
52
+     */
53
+    public function toHtml()
54
+    {
55
+        include_once ('HTML/QuickForm/Renderer/Default.php');
56
+        $this->_separator = '<br/>';
57
+        $renderer = & new HTML_QuickForm_Renderer_Default();
58
+        $renderer->setElementTemplate('{element}');
59
+        $select_boxes = $this->_elements[2];
60
+        $select_boxes->setElementTemplate('<div style="margin-left:20px;display:block;" id="receivers_'.$select_boxes->getName().'">'.$select_boxes->_elementTemplate.'</div>');
61
+        parent :: accept($renderer);
62
+        $js = $this->getElementJS();
63
+        return $renderer->toHtml().$js;
64
+    }
65 65
 
66
-	/**
67
-	 * Get the necessary javascript
68
-	 */
66
+    /**
67
+     * Get the necessary javascript
68
+     */
69 69
     public function getElementJS()
70
-	{
71
-		$js = "<script type=\"text/javascript\">
70
+    {
71
+        $js = "<script type=\"text/javascript\">
72 72
 					/* <![CDATA[ */
73 73
 					receivers_hide('receivers_to');
74 74
 					function receivers_show(item) {
@@ -81,14 +81,14 @@  discard block
 block discarded – undo
81 81
 					}
82 82
 					/* ]]> */
83 83
 					</script>\n";
84
-		return $js;
85
-	}
86
-	/**
87
-	 * accept renderer
88
-	 */
89
-	function accept(& $renderer, $required = false, $error = null)
90
-	{
91
-		$renderer->renderElement($this, $required, $error);
92
-	}
84
+        return $js;
85
+    }
86
+    /**
87
+     * accept renderer
88
+     */
89
+    function accept(& $renderer, $required = false, $error = null)
90
+    {
91
+        $renderer->renderElement($this, $required, $error);
92
+    }
93 93
 }
94 94
 ?>
Please login to merge, or discard this patch.
main/upload/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,9 +38,9 @@
 block discarded – undo
38 38
 	api_not_allowed(true);
39 39
 }
40 40
 
41
-$courseDir = $_course['path'] . "/document";
41
+$courseDir = $_course['path']."/document";
42 42
 $sys_course_path = api_get_path(SYS_COURSE_PATH);
43
-$base_work_dir = $sys_course_path . $courseDir;
43
+$base_work_dir = $sys_course_path.$courseDir;
44 44
 $noPHP_SELF = true;
45 45
 $max_filled_space = DocumentManager::get_course_quota();
46 46
 
Please login to merge, or discard this patch.
main/newscorm/scorm.class.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
                 $path = '';
394 394
                 $type = 'dir';
395 395
                 if (isset($this->resources[$item['identifierref']])) {
396
-                    $oRes =& $this->resources[$item['identifierref']];
396
+                    $oRes = & $this->resources[$item['identifierref']];
397 397
                     $path = @$oRes->get_path();
398 398
                     if (!empty($path)) {
399 399
                         $temptype = $oRes->get_scorm_type();
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
                 $item['parameters'] = Database::escape_string($item['parameters']);
445 445
 
446 446
                 $sql = "INSERT INTO $new_lp_item (c_id, lp_id,item_type,ref,title, path,min_score,max_score, $field_add parent_item_id,previous_item_id,next_item_id, prerequisite,display_order,launch_data, parameters)
447
-                        VALUES ($courseId, $lp_id, '$type', '$identifier', '$title', '$path' , 0, $max_score, $value_add $parent, $previous, 0, '$prereq', ".$item['rel_order'] .", '".$item['datafromlms']."', '".$item['parameters']."' )";
447
+                        VALUES ($courseId, $lp_id, '$type', '$identifier', '$title', '$path' , 0, $max_score, $value_add $parent, $previous, 0, '$prereq', ".$item['rel_order'].", '".$item['datafromlms']."', '".$item['parameters']."' )";
448 448
 
449 449
                 Database::query($sql);
450 450
                 if ($this->debug > 1) { error_log('New LP - In import_manifest(), inserting item : '.$sql, 0); }
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
                     foreach ($specific_fields as $specific_field) {
479 479
                         if (isset($_REQUEST[$specific_field['code']])) {
480 480
                             $sterms = trim($_REQUEST[$specific_field['code']]);
481
-                            $all_specific_terms .= ' '. $sterms;
481
+                            $all_specific_terms .= ' '.$sterms;
482 482
                             if (!empty($sterms)) {
483 483
                                 $sterms = explode(',', $sterms);
484 484
                                 foreach ($sterms as $sterm) {
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
487 487
                             }
488 488
                         }
489 489
                     }
490
-                    $body_to_index = $all_specific_terms .' '. $title;
490
+                    $body_to_index = $all_specific_terms.' '.$title;
491 491
                     $ic_slide->addValue("content", $body_to_index);
492 492
                     // TODO: Add a comment to say terms separated by commas.
493 493
                     $courseid = api_get_course_id();
@@ -497,7 +497,7 @@  discard block
 block discarded – undo
497 497
                         SE_COURSE_ID => $courseid,
498 498
                         SE_TOOL_ID => TOOL_LEARNPATH,
499 499
                         SE_DATA => array('lp_id' => $lp_id, 'lp_item'=> $previous, 'document_id' => ''), // TODO: Unify with other lp types.
500
-                        SE_USER => (int)api_get_user_id(),
500
+                        SE_USER => (int) api_get_user_id(),
501 501
                     );
502 502
                     $ic_slide->xapian_data = serialize($xapian_data);
503 503
                     $di->addChunk($ic_slide);
@@ -543,7 +543,7 @@  discard block
 block discarded – undo
543 543
     public function import_package($zip_file_info, $current_dir = '', $courseInfo = array())
544 544
     {
545 545
         if ($this->debug > 0) {
546
-            error_log('In scorm::import_package('.print_r($zip_file_info,true).',"'.$current_dir.'") method', 0);
546
+            error_log('In scorm::import_package('.print_r($zip_file_info, true).',"'.$current_dir.'") method', 0);
547 547
         }
548 548
 
549 549
         $courseInfo = empty($courseInfo) ? api_get_course_info() : $courseInfo;
@@ -554,7 +554,7 @@  discard block
 block discarded – undo
554 554
         $zip_file_name = $zip_file_info['name'];
555 555
 
556 556
         if ($this->debug > 1) {
557
-            error_log('New LP - import_package() - zip file path = ' . $zip_file_path . ', zip file name = ' . $zip_file_name, 0);
557
+            error_log('New LP - import_package() - zip file path = '.$zip_file_path.', zip file name = '.$zip_file_name, 0);
558 558
         }
559 559
 
560 560
         $course_rel_dir = api_get_course_path($courseInfo['code']).'/scorm'; // scorm dir web path starting from /courses
@@ -562,7 +562,7 @@  discard block
 block discarded – undo
562 562
         $current_dir = api_replace_dangerous_char(trim($current_dir)); // Current dir we are in, inside scorm/
563 563
 
564 564
         if ($this->debug > 1) {
565
-            error_log( 'New LP - import_package() - current_dir = ' . $current_dir, 0);
565
+            error_log('New LP - import_package() - current_dir = '.$current_dir, 0);
566 566
         }
567 567
 
568 568
         // Get name of the zip file without the extension.
@@ -570,7 +570,7 @@  discard block
 block discarded – undo
570 570
         $file_info = pathinfo($zip_file_name);
571 571
         $filename = $file_info['basename'];
572 572
         $extension = $file_info['extension'];
573
-        $file_base_name = str_replace('.'.$extension,'',$filename); // Filename without its extension.
573
+        $file_base_name = str_replace('.'.$extension, '', $filename); // Filename without its extension.
574 574
         $this->zipname = $file_base_name; // Save for later in case we don't have a title.
575 575
 
576 576
         if ($this->debug > 1) { error_log("New LP - base file name is : ".$file_base_name, 0); }
@@ -616,7 +616,7 @@  discard block
 block discarded – undo
616 616
         $slash_count = substr_count($shortest_path, '/');
617 617
         foreach ($manifest_list as $manifest_path) {
618 618
             $tmp_slash_count = substr_count($manifest_path, '/');
619
-            if ($tmp_slash_count<$slash_count) {
619
+            if ($tmp_slash_count < $slash_count) {
620 620
                 $shortest_path = $manifest_path;
621 621
                 $slash_count = $tmp_slash_count;
622 622
             }
@@ -625,7 +625,7 @@  discard block
 block discarded – undo
625 625
         $this->subdir .= '/'.dirname($shortest_path); // Do not concatenate because already done above.
626 626
         $manifest = $shortest_path;
627 627
         if ($this->debug > 1) { error_log('New LP - Package type is now '.$package_type, 0); }
628
-        if ($package_type== '') {
628
+        if ($package_type == '') {
629 629
             // && defined('CHECK_FOR_SCORM') && CHECK_FOR_SCORM)
630 630
             if ($this->debug > 1) { error_log('New LP - Package type is empty', 0); }
631 631
             return api_failure::set_failure('not_scorm_content');
@@ -641,8 +641,8 @@  discard block
 block discarded – undo
641 641
             $new_dir = '/'.$new_dir;
642 642
         }
643 643
 
644
-        if ($new_dir[strlen($new_dir)-1] == '/') {
645
-            $new_dir = substr($new_dir,0,-1);
644
+        if ($new_dir[strlen($new_dir) - 1] == '/') {
645
+            $new_dir = substr($new_dir, 0, -1);
646 646
         }
647 647
 
648 648
         /* Uncompressing phase */
@@ -683,7 +683,7 @@  discard block
 block discarded – undo
683 683
                     if ($file != '.' && $file != '..') {
684 684
                         $filetype = 'file';
685 685
 
686
-                        if (is_dir($course_sys_dir . $new_dir . $file)) {
686
+                        if (is_dir($course_sys_dir.$new_dir.$file)) {
687 687
                             $filetype = 'folder';
688 688
                         }
689 689
 
@@ -712,7 +712,7 @@  discard block
 block discarded – undo
712 712
                                     }
713 713
                                 }
714 714
                             }
715
-                            @rename($course_sys_dir.$new_dir.$file,$course_sys_dir.$new_dir.$safe_file);
715
+                            @rename($course_sys_dir.$new_dir.$file, $course_sys_dir.$new_dir.$safe_file);
716 716
                             if ($this->debug >= 1) { error_log('New LP - Renaming '.$course_sys_dir.$new_dir.$file.' to '.$course_sys_dir.$new_dir.$safe_file, 0); }
717 717
                         }
718 718
                     }
@@ -901,7 +901,7 @@  discard block
 block discarded – undo
901 901
         if ($this->debug > 0) { error_log('In scorm::get_res_path('.$id.') method', 0); }
902 902
         $path = '';
903 903
         if (isset($this->resources[$id])) {
904
-            $oRes =& $this->resources[$id];
904
+            $oRes = & $this->resources[$id];
905 905
             $path = @$oRes->get_path();
906 906
         }
907 907
         return $path;
@@ -917,7 +917,7 @@  discard block
 block discarded – undo
917 917
         if ($this->debug > 0) { error_log('In scorm::get_res_type('.$id.') method', 0); }
918 918
         $type = '';
919 919
         if (isset($this->resources[$id])) {
920
-            $oRes =& $this->resources[$id];
920
+            $oRes = & $this->resources[$id];
921 921
             $temptype = $oRes->get_scorm_type();
922 922
             if (!empty($temptype)) {
923 923
                 $type = $temptype;
@@ -936,9 +936,9 @@  discard block
 block discarded – undo
936 936
         $title = '';
937 937
         if (isset($this->manifest['organizations']['default'])) {
938 938
             $title = $this->organizations[$this->manifest['organizations']['default']]->get_name();
939
-        } elseif (count($this->organizations)==1) {
939
+        } elseif (count($this->organizations) == 1) {
940 940
             // This will only get one title but so we don't need to know the index.
941
-            foreach($this->organizations as $id => $value) {
941
+            foreach ($this->organizations as $id => $value) {
942 942
                 $title = $this->organizations[$id]->get_name();
943 943
                 break;
944 944
             }
Please login to merge, or discard this patch.
main/newscorm/lp_controller.php 1 patch
Braces   +233 added lines, -122 removed lines patch added patch discarded remove patch
@@ -13,7 +13,9 @@  discard block
 block discarded – undo
13 13
 $use_anonymous = true;
14 14
 
15 15
 $debug = 0;
16
-if ($debug > 0) error_log('New LP -+- Entered lp_controller.php -+- (action: '.$_REQUEST['action'].')', 0);
16
+if ($debug > 0) {
17
+    error_log('New LP -+- Entered lp_controller.php -+- (action: '.$_REQUEST['action'].')', 0);
18
+}
17 19
 
18 20
 // Language files that needs to be included.
19 21
 if (isset($_GET['action'])) {
@@ -231,10 +233,14 @@  discard block
 block discarded – undo
231 233
     // If refresh is set, we regenerate the oLP object from the database (kind of flush).
232 234
     Session::erase('refresh');
233 235
     $myrefresh = 1;
234
-    if ($debug > 0) error_log('New LP - Refresh asked', 0);
235
-}
236
+    if ($debug > 0) {
237
+        error_log('New LP - Refresh asked', 0);
238
+    }
239
+    }
236 240
 
237
-if ($debug > 0) error_log('New LP - Passed refresh check', 0);
241
+if ($debug > 0) {
242
+    error_log('New LP - Passed refresh check', 0);
243
+}
238 244
 
239 245
 if (!empty($_REQUEST['dialog_box'])) {
240 246
     $dialog_box = stripslashes(urldecode($_REQUEST['dialog_box']));
@@ -244,17 +250,23 @@  discard block
 block discarded – undo
244 250
 $lp_found = false;
245 251
 
246 252
 if (isset($_SESSION['lpobject'])) {
247
-    if ($debug > 0) error_log('New LP - SESSION[lpobject] is defined', 0);
253
+    if ($debug > 0) {
254
+        error_log('New LP - SESSION[lpobject] is defined', 0);
255
+    }
248 256
     $oLP = unserialize($_SESSION['lpobject']);
249 257
     if (isset($oLP) && is_object($oLP)) {
250
-        if ($debug > 0) error_log('New LP - oLP is object', 0);
258
+        if ($debug > 0) {
259
+            error_log('New LP - oLP is object', 0);
260
+        }
251 261
         if ($myrefresh == 1 OR
252 262
             empty($oLP->cc) OR
253 263
             $oLP->cc != api_get_course_id() OR
254 264
             $oLP->lp_view_session_id != $session_id OR
255 265
             $oLP->scorm_debug == '1'
256 266
         ) {
257
-            if ($debug > 0) error_log('New LP - Course has changed, discard lp object', 0);
267
+            if ($debug > 0) {
268
+                error_log('New LP - Course has changed, discard lp object', 0);
269
+            }
258 270
             if ($myrefresh == 1) { $myrefresh_id = $oLP->get_id(); }
259 271
             $oLP = null;
260 272
             Session::erase('oLP');
@@ -268,13 +280,19 @@  discard block
 block discarded – undo
268 280
 
269 281
 $course_id = api_get_course_int_id();
270 282
 
271
-if ($debug>0) error_log('New LP - Passed data remains check', 0);
283
+if ($debug>0) {
284
+    error_log('New LP - Passed data remains check', 0);
285
+}
272 286
 
273 287
 if (!$lp_found || (!empty($_REQUEST['lp_id']) && $_SESSION['oLP']->get_id() != $_REQUEST['lp_id'])) {
274
-    if ($debug > 0) error_log('New LP - oLP is not object, has changed or refresh been asked, getting new', 0);
288
+    if ($debug > 0) {
289
+        error_log('New LP - oLP is not object, has changed or refresh been asked, getting new', 0);
290
+    }
275 291
     // Regenerate a new lp object? Not always as some pages don't need the object (like upload?)
276 292
     if (!empty($_REQUEST['lp_id']) || !empty($myrefresh_id)) {
277
-        if ($debug > 0) error_log('New LP - lp_id is defined', 0);
293
+        if ($debug > 0) {
294
+            error_log('New LP - lp_id is defined', 0);
295
+        }
278 296
         // Select the lp in the database and check which type it is (scorm/dokeos/aicc) to generate the
279 297
         // right object.
280 298
         if (!empty($_REQUEST['lp_id'])) {
@@ -286,49 +304,67 @@  discard block
 block discarded – undo
286 304
         $lp_table = Database::get_course_table(TABLE_LP_MAIN);
287 305
         if (is_numeric($lp_id)) {
288 306
             $sel = "SELECT lp_type FROM $lp_table WHERE c_id = $course_id AND id = $lp_id";
289
-            if ($debug > 0) error_log('New LP - querying '.$sel, 0);
307
+            if ($debug > 0) {
308
+                error_log('New LP - querying '.$sel, 0);
309
+            }
290 310
             $res = Database::query($sel);
291 311
 
292 312
             if (Database::num_rows($res)) {
293 313
                 $row = Database::fetch_array($res);
294 314
                 $type = $row['lp_type'];
295
-                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);
315
+                if ($debug > 0) {
316
+                    error_log('New LP - found row - type '.$type. ' - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
317
+                }
296 318
                 switch ($type) {
297 319
                     case 1:
298
-                        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);
320
+                        if ($debug > 0) {
321
+                            error_log('New LP - found row - type dokeos - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
322
+                        }
299 323
 
300 324
                         $oLP = new learnpath(api_get_course_id(), $lp_id, api_get_user_id());
301 325
                         if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); }
302 326
                         break;
303 327
                     case 2:
304
-                        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);
328
+                        if ($debug > 0) {
329
+                            error_log('New LP - found row - type scorm - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
330
+                        }
305 331
                         $oLP = new scorm(api_get_course_id(), $lp_id, api_get_user_id());
306 332
                         if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); }
307 333
                         break;
308 334
                     case 3:
309
-                        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);
335
+                        if ($debug > 0) {
336
+                            error_log('New LP - found row - type aicc - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
337
+                        }
310 338
                         $oLP = new aicc(api_get_course_id(), $lp_id, api_get_user_id());
311 339
                         if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); }
312 340
                         break;
313 341
                     default:
314
-                        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);
342
+                        if ($debug > 0) {
343
+                            error_log('New LP - found row - type other - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
344
+                        }
315 345
                         $oLP = new learnpath(api_get_course_id(), $lp_id, api_get_user_id());
316 346
                         if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); }
317 347
                         break;
318 348
                 }
319 349
             }
320 350
         } else {
321
-            if ($debug > 0) error_log('New LP - Request[lp_id] is not numeric', 0);
351
+            if ($debug > 0) {
352
+                error_log('New LP - Request[lp_id] is not numeric', 0);
353
+            }
322 354
         }
323 355
     } else {
324
-        if ($debug > 0) error_log('New LP - Request[lp_id] and refresh_id were empty', 0);
356
+        if ($debug > 0) {
357
+            error_log('New LP - Request[lp_id] and refresh_id were empty', 0);
358
+        }
325 359
     }
326 360
     if ($lp_found) {
327 361
         $_SESSION['oLP'] = $oLP;
328 362
     }
329 363
 }
330 364
 
331
-if ($debug > 0) error_log('New LP - Passed oLP creation check', 0);
365
+if ($debug > 0) {
366
+    error_log('New LP - Passed oLP creation check', 0);
367
+}
332 368
 
333 369
 $is_allowed_to_edit = api_is_allowed_to_edit(false, true, false, false);
334 370
 
@@ -372,11 +408,15 @@  discard block
 block discarded – undo
372 408
         if (!$is_allowed_to_edit) {
373 409
             api_not_allowed(true);
374 410
         }
375
-        if ($debug > 0) error_log('New LP - add item action triggered', 0);
411
+        if ($debug > 0) {
412
+            error_log('New LP - add item action triggered', 0);
413
+        }
376 414
 
377 415
         if (!$lp_found) {
378 416
             //check if the learnpath ID was defined, otherwise send back to list
379
-            if ($debug > 0) error_log('New LP - No learnpath given for add item', 0);
417
+            if ($debug > 0) {
418
+                error_log('New LP - No learnpath given for add item', 0);
419
+            }
380 420
             require 'lp_list.php';
381 421
         } else {
382 422
             $_SESSION['refresh'] = 1;
@@ -450,11 +490,15 @@  discard block
 block discarded – undo
450 490
         if (!$is_allowed_to_edit) {
451 491
             api_not_allowed(true);
452 492
         }
453
-        if ($debug > 0) error_log('New LP - add audio action triggered', 0);
493
+        if ($debug > 0) {
494
+            error_log('New LP - add audio action triggered', 0);
495
+        }
454 496
 
455 497
         if (!$lp_found) {
456 498
             //check if the learnpath ID was defined, otherwise send back to list
457
-            if ($debug > 0) error_log('New LP - No learnpath given for add audio', 0);
499
+            if ($debug > 0) {
500
+                error_log('New LP - No learnpath given for add audio', 0);
501
+            }
458 502
             require 'lp_list.php';
459 503
         } else {
460 504
             $_SESSION['refresh'] = 1;
@@ -528,7 +572,9 @@  discard block
 block discarded – undo
528 572
         if (!$is_allowed_to_edit) {
529 573
             api_not_allowed(true);
530 574
         }
531
-        if ($debug > 0) error_log('New LP - add_lp action triggered', 0);
575
+        if ($debug > 0) {
576
+            error_log('New LP - add_lp action triggered', 0);
577
+        }
532 578
         if (isset($_REQUEST['lp_name']) && !empty($_REQUEST['lp_name'])) {
533 579
             $_REQUEST['lp_name'] = trim($_REQUEST['lp_name']);
534 580
             $_SESSION['refresh'] = 1;
@@ -587,9 +633,10 @@  discard block
 block discarded – undo
587 633
         if (!$is_allowed_to_edit) {
588 634
             api_not_allowed(true);
589 635
         }
590
-        if ($debug > 0) error_log('New LP - admin_view action triggered', 0);
591
-        if (!$lp_found) { error_log('New LP - No learnpath given for admin_view', 0); require 'lp_list.php'; }
592
-        else {
636
+        if ($debug > 0) {
637
+            error_log('New LP - admin_view action triggered', 0);
638
+        }
639
+        if (!$lp_found) { error_log('New LP - No learnpath given for admin_view', 0); require 'lp_list.php'; } else {
593 640
             $_SESSION['refresh'] = 1;
594 641
             require 'lp_admin_view.php';
595 642
         }
@@ -599,9 +646,10 @@  discard block
 block discarded – undo
599 646
             if (!$is_allowed_to_edit) {
600 647
                 api_not_allowed(true);
601 648
             }
602
-            if ($debug > 0) error_log('New LP - auto_launch action triggered', 0);
603
-            if (!$lp_found) { error_log('New LP - No learnpath given for set_autolaunch', 0); require 'lp_list.php'; }
604
-            else {
649
+            if ($debug > 0) {
650
+                error_log('New LP - auto_launch action triggered', 0);
651
+            }
652
+            if (!$lp_found) { error_log('New LP - No learnpath given for set_autolaunch', 0); require 'lp_list.php'; } else {
605 653
                 $_SESSION['oLP']->set_autolaunch($_GET['lp_id'], $_GET['status']);
606 654
                 require 'lp_list.php';
607 655
                 exit;
@@ -612,10 +660,11 @@  discard block
 block discarded – undo
612 660
         if (!$is_allowed_to_edit) {
613 661
             api_not_allowed(true);
614 662
         }
615
-        if ($debug > 0) error_log('New LP - build action triggered', 0);
663
+        if ($debug > 0) {
664
+            error_log('New LP - build action triggered', 0);
665
+        }
616 666
 
617
-        if (!$lp_found) { error_log('New LP - No learnpath given for build', 0); require 'lp_list.php'; }
618
-        else {
667
+        if (!$lp_found) { error_log('New LP - No learnpath given for build', 0); require 'lp_list.php'; } else {
619 668
             $_SESSION['refresh'] = 1;
620 669
             //require 'lp_build.php';
621 670
             $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id);
@@ -627,10 +676,11 @@  discard block
 block discarded – undo
627 676
         if (!$is_allowed_to_edit) {
628 677
             api_not_allowed(true);
629 678
         }
630
-        if ($debug > 0) error_log('New LP - edit item action triggered', 0);
679
+        if ($debug > 0) {
680
+            error_log('New LP - edit item action triggered', 0);
681
+        }
631 682
 
632
-        if (!$lp_found) { error_log('New LP - No learnpath given for edit item', 0); require 'lp_list.php'; }
633
-        else {
683
+        if (!$lp_found) { error_log('New LP - No learnpath given for edit item', 0); require 'lp_list.php'; } else {
634 684
             $_SESSION['refresh'] = 1;
635 685
             if (isset($_POST['submit_button']) && !empty($post_title)) {
636 686
 
@@ -680,9 +730,10 @@  discard block
 block discarded – undo
680 730
         if (!$is_allowed_to_edit) {
681 731
             api_not_allowed(true);
682 732
         }
683
-        if ($debug > 0) error_log('New LP - edit item prereq action triggered', 0);
684
-        if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; }
685
-        else {
733
+        if ($debug > 0) {
734
+            error_log('New LP - edit item prereq action triggered', 0);
735
+        }
736
+        if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; } else {
686 737
             if (isset($_POST['submit_button'])) {
687 738
                 //Updating the lp.modified_on
688 739
                 $_SESSION['oLP']->set_modified_on();
@@ -710,9 +761,10 @@  discard block
 block discarded – undo
710 761
         if (!$is_allowed_to_edit) {
711 762
             api_not_allowed(true);
712 763
         }
713
-        if ($debug > 0) error_log('New LP - move item action triggered', 0);
714
-        if (!$lp_found) { error_log('New LP - No learnpath given for move item', 0); require 'lp_list.php'; }
715
-        else {
764
+        if ($debug > 0) {
765
+            error_log('New LP - move item action triggered', 0);
766
+        }
767
+        if (!$lp_found) { error_log('New LP - No learnpath given for move item', 0); require 'lp_list.php'; } else {
716 768
             $_SESSION['refresh'] = 1;
717 769
             if (isset($_POST['submit_button'])) {
718 770
                 //Updating the lp.modified_on
@@ -745,7 +797,9 @@  discard block
 block discarded – undo
745 797
         if (!$is_allowed_to_edit) {
746 798
             api_not_allowed(true);
747 799
         }
748
-        if ($debug > 0) error_log('New LP - view_item action triggered', 0);
800
+        if ($debug > 0) {
801
+            error_log('New LP - view_item action triggered', 0);
802
+        }
749 803
         if (!$lp_found) {
750 804
             error_log('New LP - No learnpath given for view item', 0); require 'lp_list.php';
751 805
         } else {
@@ -757,7 +811,9 @@  discard block
 block discarded – undo
757 811
         if (!$is_allowed_to_edit) {
758 812
             api_not_allowed(true);
759 813
         }
760
-        if ($debug > 0) error_log('New LP - upload action triggered', 0);
814
+        if ($debug > 0) {
815
+            error_log('New LP - upload action triggered', 0);
816
+        }
761 817
         $cwdir = getcwd();
762 818
         require 'lp_upload.php';
763 819
         // Reinit current working directory as many functions in upload change it.
@@ -774,9 +830,10 @@  discard block
 block discarded – undo
774 830
             api_not_allowed(true);
775 831
         }
776 832
 
777
-        if ($debug > 0) error_log('New LP - export action triggered', 0);
778
-        if (!$lp_found) { error_log('New LP - No learnpath given for copy', 0); require 'lp_list.php'; }
779
-        else {
833
+        if ($debug > 0) {
834
+            error_log('New LP - export action triggered', 0);
835
+        }
836
+        if (!$lp_found) { error_log('New LP - No learnpath given for copy', 0); require 'lp_list.php'; } else {
780 837
             $_SESSION['oLP']->copy();
781 838
         }
782 839
         require 'lp_list.php';
@@ -789,9 +846,10 @@  discard block
 block discarded – undo
789 846
         if ($hideScormExportLink === 'true') {
790 847
             api_not_allowed(true);
791 848
         }
792
-        if ($debug > 0) error_log('New LP - export action triggered', 0);
793
-        if (!$lp_found) { error_log('New LP - No learnpath given for export', 0); require 'lp_list.php'; }
794
-        else {
849
+        if ($debug > 0) {
850
+            error_log('New LP - export action triggered', 0);
851
+        }
852
+        if (!$lp_found) { error_log('New LP - No learnpath given for export', 0); require 'lp_list.php'; } else {
795 853
             $_SESSION['oLP']->scorm_export();
796 854
             exit();
797 855
             //require 'lp_list.php';
@@ -806,7 +864,9 @@  discard block
 block discarded – undo
806 864
             api_not_allowed(true);
807 865
         }
808 866
 
809
-        if ($debug > 0) error_log('New LP - export action triggered', 0);
867
+        if ($debug > 0) {
868
+            error_log('New LP - export action triggered', 0);
869
+        }
810 870
         if (!$lp_found) { error_log('New LP - No learnpath given for export_to_pdf', 0); require 'lp_list.php';
811 871
         } else {
812 872
             $result = $_SESSION['oLP']->scorm_export_to_pdf($_GET['lp_id']);
@@ -820,9 +880,10 @@  discard block
 block discarded – undo
820 880
         if (!$is_allowed_to_edit) {
821 881
             api_not_allowed(true);
822 882
         }
823
-        if ($debug > 0) error_log('New LP - delete action triggered', 0);
824
-        if (!$lp_found) { error_log('New LP - No learnpath given for delete', 0); require 'lp_list.php'; }
825
-        else {
883
+        if ($debug > 0) {
884
+            error_log('New LP - delete action triggered', 0);
885
+        }
886
+        if (!$lp_found) { error_log('New LP - No learnpath given for delete', 0); require 'lp_list.php'; } else {
826 887
             $_SESSION['refresh'] = 1;
827 888
             $_SESSION['oLP']->delete(null, $_GET['lp_id'], 'remove');
828 889
             Session::erase('oLP');
@@ -834,9 +895,10 @@  discard block
 block discarded – undo
834 895
         if (!$is_allowed_to_edit) {
835 896
             api_not_allowed(true);
836 897
         }
837
-        if ($debug > 0) error_log('New LP - visibility action triggered', 0);
838
-        if (!$lp_found) { error_log('New LP - No learnpath given for visibility', 0); require 'lp_list.php'; }
839
-        else {
898
+        if ($debug > 0) {
899
+            error_log('New LP - visibility action triggered', 0);
900
+        }
901
+        if (!$lp_found) { error_log('New LP - No learnpath given for visibility', 0); require 'lp_list.php'; } else {
840 902
             learnpath::toggle_visibility($_REQUEST['lp_id'], $_REQUEST['new_status']);
841 903
             require 'lp_list.php';
842 904
         }
@@ -846,9 +908,10 @@  discard block
 block discarded – undo
846 908
         if (!$is_allowed_to_edit) {
847 909
             api_not_allowed(true);
848 910
         }
849
-        if ($debug > 0) error_log('New LP - publish action triggered', 0);
850
-        if (!$lp_found) { error_log('New LP - No learnpath given for publish', 0); require 'lp_list.php'; }
851
-        else {
911
+        if ($debug > 0) {
912
+            error_log('New LP - publish action triggered', 0);
913
+        }
914
+        if (!$lp_found) { error_log('New LP - No learnpath given for publish', 0); require 'lp_list.php'; } else {
852 915
             learnpath::toggle_publish($_REQUEST['lp_id'], $_REQUEST['new_status']);
853 916
             require 'lp_list.php';
854 917
         }
@@ -858,7 +921,9 @@  discard block
 block discarded – undo
858 921
         if (!$is_allowed_to_edit) {
859 922
             api_not_allowed(true);
860 923
         }
861
-        if ($debug > 0) error_log('New LP - publish action triggered', 0);
924
+        if ($debug > 0) {
925
+            error_log('New LP - publish action triggered', 0);
926
+        }
862 927
         if (!$lp_found) {
863 928
             error_log('New LP - No learnpath given for publish', 0);
864 929
             require 'lp_list.php';
@@ -872,7 +937,9 @@  discard block
 block discarded – undo
872 937
         if (!$is_allowed_to_edit) {
873 938
             api_not_allowed(true);
874 939
         }
875
-        if ($debug > 0) error_log('New LP - publish action triggered', 0);
940
+        if ($debug > 0) {
941
+            error_log('New LP - publish action triggered', 0);
942
+        }
876 943
         if (!$lp_found) {
877 944
             error_log('New LP - No learnpath given for publish', 0);
878 945
             require 'lp_list.php';
@@ -885,9 +952,10 @@  discard block
 block discarded – undo
885 952
         if (!$is_allowed_to_edit) {
886 953
             api_not_allowed(true);
887 954
         }
888
-        if ($debug > 0) error_log('New LP - edit action triggered', 0);
889
-        if (!$lp_found) { error_log('New LP - No learnpath given for edit', 0); require 'lp_list.php'; }
890
-        else {
955
+        if ($debug > 0) {
956
+            error_log('New LP - edit action triggered', 0);
957
+        }
958
+        if (!$lp_found) { error_log('New LP - No learnpath given for edit', 0); require 'lp_list.php'; } else {
891 959
             $_SESSION['refresh'] = 1;
892 960
             require 'lp_edit.php';
893 961
         }
@@ -896,9 +964,10 @@  discard block
 block discarded – undo
896 964
         if (!$is_allowed_to_edit) {
897 965
             api_not_allowed(true);
898 966
         }
899
-        if ($debug > 0) error_log('New LP - update_lp action triggered', 0);
900
-        if (!$lp_found) { error_log('New LP - No learnpath given for edit', 0); require 'lp_list.php'; }
901
-        else {
967
+        if ($debug > 0) {
968
+            error_log('New LP - update_lp action triggered', 0);
969
+        }
970
+        if (!$lp_found) { error_log('New LP - No learnpath given for edit', 0); require 'lp_list.php'; } else {
902 971
             $_SESSION['refresh'] = 1;
903 972
             $lp_name = Security::remove_XSS($_REQUEST['lp_name']);
904 973
             $_SESSION['oLP']->set_name($lp_name);
@@ -965,8 +1034,9 @@  discard block
 block discarded – undo
965 1034
             );
966 1035
             $extraFieldValue->saveFieldValues($_REQUEST);
967 1036
 
968
-            if ($_FILES['lp_preview_image']['size'] > 0)
969
-                $_SESSION['oLP']->upload_image($_FILES['lp_preview_image']);
1037
+            if ($_FILES['lp_preview_image']['size'] > 0) {
1038
+                            $_SESSION['oLP']->upload_image($_FILES['lp_preview_image']);
1039
+            }
970 1040
 
971 1041
             if (api_get_setting('search_enabled') === 'true') {
972 1042
                 require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
@@ -1006,9 +1076,10 @@  discard block
 block discarded – undo
1006 1076
         if (!$is_allowed_to_edit) {
1007 1077
             api_not_allowed(true);
1008 1078
         }
1009
-        if ($debug > 0) error_log('New LP - add sub item action triggered', 0);
1010
-        if (!$lp_found) { error_log('New LP - No learnpath given for add sub item', 0); require 'lp_list.php'; }
1011
-        else {
1079
+        if ($debug > 0) {
1080
+            error_log('New LP - add sub item action triggered', 0);
1081
+        }
1082
+        if (!$lp_found) { error_log('New LP - No learnpath given for add sub item', 0); require 'lp_list.php'; } else {
1012 1083
             $_SESSION['refresh'] = 1;
1013 1084
             if (!empty($_REQUEST['parent_item_id'])) {
1014 1085
                 $_SESSION['from_learnpath']='yes';
@@ -1024,9 +1095,10 @@  discard block
 block discarded – undo
1024 1095
         if (!$is_allowed_to_edit) {
1025 1096
             api_not_allowed(true);
1026 1097
         }
1027
-        if ($debug > 0) error_log('New LP - delete item action triggered', 0);
1028
-        if (!$lp_found) { error_log('New LP - No learnpath given for delete item', 0); require 'lp_list.php'; }
1029
-        else {
1098
+        if ($debug > 0) {
1099
+            error_log('New LP - delete item action triggered', 0);
1100
+        }
1101
+        if (!$lp_found) { error_log('New LP - No learnpath given for delete item', 0); require 'lp_list.php'; } else {
1030 1102
             //$_SESSION['refresh'] = 1;
1031 1103
             if (!empty($_REQUEST['id'])) {
1032 1104
                 $_SESSION['oLP']->delete_item($_REQUEST['id']);
@@ -1041,9 +1113,10 @@  discard block
 block discarded – undo
1041 1113
         if (!$is_allowed_to_edit) {
1042 1114
             api_not_allowed(true);
1043 1115
         }
1044
-        if ($debug > 0) error_log('New LP - edit item prereq action triggered', 0);
1045
-        if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; }
1046
-        else {
1116
+        if ($debug > 0) {
1117
+            error_log('New LP - edit item prereq action triggered', 0);
1118
+        }
1119
+        if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; } else {
1047 1120
             if (!empty($_REQUEST['id']) && !empty($_REQUEST['submit_item'])) {
1048 1121
                 $_SESSION['refresh'] = 1;
1049 1122
                 $_SESSION['oLP']->edit_item_prereq($_REQUEST['id'], $_REQUEST['prereq']);
@@ -1052,64 +1125,80 @@  discard block
 block discarded – undo
1052 1125
         }
1053 1126
         break;
1054 1127
     case 'restart':
1055
-        if ($debug > 0) error_log('New LP - restart action triggered', 0);
1056
-        if (!$lp_found) { error_log('New LP - No learnpath given for restart', 0); require 'lp_list.php'; }
1057
-        else {
1128
+        if ($debug > 0) {
1129
+            error_log('New LP - restart action triggered', 0);
1130
+        }
1131
+        if (!$lp_found) { error_log('New LP - No learnpath given for restart', 0); require 'lp_list.php'; } else {
1058 1132
             $_SESSION['oLP']->restart();
1059 1133
             require 'lp_view.php';
1060 1134
         }
1061 1135
         break;
1062 1136
     case 'last':
1063
-        if ($debug > 0) error_log('New LP - last action triggered', 0);
1064
-        if (!$lp_found) { error_log('New LP - No learnpath given for last', 0); require 'lp_list.php'; }
1065
-        else {
1137
+        if ($debug > 0) {
1138
+            error_log('New LP - last action triggered', 0);
1139
+        }
1140
+        if (!$lp_found) { error_log('New LP - No learnpath given for last', 0); require 'lp_list.php'; } else {
1066 1141
             $_SESSION['oLP']->last();
1067 1142
             require 'lp_view.php';
1068 1143
         }
1069 1144
         break;
1070 1145
     case 'first':
1071
-        if ($debug > 0) error_log('New LP - first action triggered', 0);
1072
-        if (!$lp_found) { error_log('New LP - No learnpath given for first', 0); require 'lp_list.php'; }
1073
-        else {
1146
+        if ($debug > 0) {
1147
+            error_log('New LP - first action triggered', 0);
1148
+        }
1149
+        if (!$lp_found) { error_log('New LP - No learnpath given for first', 0); require 'lp_list.php'; } else {
1074 1150
             $_SESSION['oLP']->first();
1075 1151
             require 'lp_view.php';
1076 1152
         }
1077 1153
         break;
1078 1154
     case 'next':
1079
-        if ($debug > 0) error_log('New LP - next action triggered', 0);
1080
-        if (!$lp_found) { error_log('New LP - No learnpath given for next', 0); require 'lp_list.php'; }
1081
-        else {
1155
+        if ($debug > 0) {
1156
+            error_log('New LP - next action triggered', 0);
1157
+        }
1158
+        if (!$lp_found) { error_log('New LP - No learnpath given for next', 0); require 'lp_list.php'; } else {
1082 1159
             $_SESSION['oLP']->next();
1083 1160
             require 'lp_view.php';
1084 1161
         }
1085 1162
         break;
1086 1163
     case 'previous':
1087
-        if ($debug > 0) error_log('New LP - previous action triggered', 0);
1088
-        if (!$lp_found) { error_log('New LP - No learnpath given for previous', 0); require 'lp_list.php'; }
1089
-        else {
1164
+        if ($debug > 0) {
1165
+            error_log('New LP - previous action triggered', 0);
1166
+        }
1167
+        if (!$lp_found) { error_log('New LP - No learnpath given for previous', 0); require 'lp_list.php'; } else {
1090 1168
             $_SESSION['oLP']->previous();
1091 1169
             require 'lp_view.php';
1092 1170
         }
1093 1171
         break;
1094 1172
     case 'content':
1095
-        if ($debug > 0) error_log('New LP - content action triggered', 0);
1096
-        if ($debug > 0) error_log('New LP - Item id is '.intval($_GET['item_id']), 0);
1173
+        if ($debug > 0) {
1174
+            error_log('New LP - content action triggered', 0);
1175
+        }
1176
+        if ($debug > 0) {
1177
+            error_log('New LP - Item id is '.intval($_GET['item_id']), 0);
1178
+        }
1097 1179
         if (!$lp_found) {
1098 1180
             error_log('New LP - No learnpath given for content', 0);
1099 1181
             require 'lp_list.php';
1100 1182
         } else {
1101
-            if ($debug > 0) error_log('New LP - save_last()', 0);
1183
+            if ($debug > 0) {
1184
+                error_log('New LP - save_last()', 0);
1185
+            }
1102 1186
             $_SESSION['oLP']->save_last();
1103
-            if ($debug > 0) error_log('New LP - set_current_item()', 0);
1187
+            if ($debug > 0) {
1188
+                error_log('New LP - set_current_item()', 0);
1189
+            }
1104 1190
             $_SESSION['oLP']->set_current_item($_GET['item_id']);
1105
-            if ($debug > 0) error_log('New LP - start_current_item()', 0);
1191
+            if ($debug > 0) {
1192
+                error_log('New LP - start_current_item()', 0);
1193
+            }
1106 1194
             $_SESSION['oLP']->start_current_item();
1107 1195
             require 'lp_content.php';
1108 1196
         }
1109 1197
         break;
1110 1198
     case 'view':
1111
-        if ($debug > 0)
1112
-            error_log('New LP - view action triggered', 0);
1199
+        if ($debug > 0) {
1200
+                    error_log('New LP - view action triggered', 0);
1201
+        }
1113 1202
         if (!$lp_found) {
1114 1203
             error_log('New LP - No learnpath given for view', 0);
1115 1204
             require 'lp_list.php';
@@ -1122,17 +1211,19 @@  discard block
 block discarded – undo
1122 1211
         }
1123 1212
         break;
1124 1213
     case 'save':
1125
-        if ($debug > 0) error_log('New LP - save action triggered', 0);
1126
-        if (!$lp_found) { error_log('New LP - No learnpath given for save', 0); require 'lp_list.php'; }
1127
-        else {
1214
+        if ($debug > 0) {
1215
+            error_log('New LP - save action triggered', 0);
1216
+        }
1217
+        if (!$lp_found) { error_log('New LP - No learnpath given for save', 0); require 'lp_list.php'; } else {
1128 1218
             $_SESSION['oLP']->save_item();
1129 1219
             require 'lp_save.php';
1130 1220
         }
1131 1221
         break;
1132 1222
     case 'stats':
1133
-        if ($debug > 0) error_log('New LP - stats action triggered', 0);
1134
-        if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; }
1135
-        else {
1223
+        if ($debug > 0) {
1224
+            error_log('New LP - stats action triggered', 0);
1225
+        }
1226
+        if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; } else {
1136 1227
             $_SESSION['oLP']->save_current();
1137 1228
             $_SESSION['oLP']->save_last();
1138 1229
             $output = require 'lp_stats.php';
@@ -1140,7 +1231,9 @@  discard block
 block discarded – undo
1140 1231
         }
1141 1232
         break;
1142 1233
     case 'list':
1143
-        if ($debug > 0) error_log('New LP - list action triggered', 0);
1234
+        if ($debug > 0) {
1235
+            error_log('New LP - list action triggered', 0);
1236
+        }
1144 1237
         if ($lp_found) {
1145 1238
             $_SESSION['refresh'] = 1;
1146 1239
             $_SESSION['oLP']->save_last();
@@ -1149,7 +1242,9 @@  discard block
 block discarded – undo
1149 1242
         break;
1150 1243
     case 'mode':
1151 1244
         // Switch between fullscreen and embedded mode.
1152
-        if ($debug > 0) error_log('New LP - mode change triggered', 0);
1245
+        if ($debug > 0) {
1246
+            error_log('New LP - mode change triggered', 0);
1247
+        }
1153 1248
         $mode = $_REQUEST['mode'];
1154 1249
         if ($mode == 'fullscreen') {
1155 1250
             $_SESSION['oLP']->mode = 'fullscreen';
@@ -1163,7 +1258,9 @@  discard block
 block discarded – undo
1163 1258
         require 'lp_view.php';
1164 1259
         break;
1165 1260
     case 'switch_view_mode':
1166
-        if ($debug > 0) error_log('New LP - switch_view_mode action triggered', 0);
1261
+        if ($debug > 0) {
1262
+            error_log('New LP - switch_view_mode action triggered', 0);
1263
+        }
1167 1264
         if (!$lp_found) { error_log('New LP - No learnpath given for switch', 0); require 'lp_list.php'; }
1168 1265
         if (Security::check_token('get')) {
1169 1266
             $_SESSION['refresh'] = 1;
@@ -1172,7 +1269,9 @@  discard block
 block discarded – undo
1172 1269
         require 'lp_list.php';
1173 1270
         break;
1174 1271
     case 'switch_force_commit':
1175
-        if ($debug > 0) error_log('New LP - switch_force_commit action triggered', 0);
1272
+        if ($debug > 0) {
1273
+            error_log('New LP - switch_force_commit action triggered', 0);
1274
+        }
1176 1275
         if (!$lp_found) { error_log('New LP - No learnpath given for switch', 0); require 'lp_list.php'; }
1177 1276
         $_SESSION['refresh'] = 1;
1178 1277
         $_SESSION['oLP']->update_default_scorm_commit();
@@ -1195,25 +1294,33 @@  discard block
 block discarded – undo
1195 1294
 		break;
1196 1295
      */
1197 1296
 	case 'switch_attempt_mode':
1198
-		if($debug>0) error_log('New LP - switch_reinit action triggered',0);
1297
+		if($debug>0) {
1298
+		    error_log('New LP - switch_reinit action triggered',0);
1299
+		}
1199 1300
 		if(!$lp_found){ error_log('New LP - No learnpath given for switch',0); require 'lp_list.php'; }
1200 1301
 		$_SESSION['refresh'] = 1;
1201 1302
 		$_SESSION['oLP']->switch_attempt_mode();
1202 1303
         require 'lp_list.php';
1203 1304
         break;
1204 1305
     case 'switch_scorm_debug':
1205
-        if ($debug > 0) error_log('New LP - switch_scorm_debug action triggered', 0);
1306
+        if ($debug > 0) {
1307
+            error_log('New LP - switch_scorm_debug action triggered', 0);
1308
+        }
1206 1309
         if (!$lp_found) { error_log('New LP - No learnpath given for switch', 0); require 'lp_list.php'; }
1207 1310
         $_SESSION['refresh'] = 1;
1208 1311
         $_SESSION['oLP']->update_scorm_debug();
1209 1312
         require 'lp_list.php';
1210 1313
         break;
1211 1314
     case 'intro_cmdAdd':
1212
-        if ($debug > 0) error_log('New LP - intro_cmdAdd action triggered', 0);
1315
+        if ($debug > 0) {
1316
+            error_log('New LP - intro_cmdAdd action triggered', 0);
1317
+        }
1213 1318
         // Add introduction section page.
1214 1319
         break;
1215 1320
     case 'js_api_refresh':
1216
-        if ($debug > 0) error_log('New LP - js_api_refresh action triggered', 0);
1321
+        if ($debug > 0) {
1322
+            error_log('New LP - js_api_refresh action triggered', 0);
1323
+        }
1217 1324
         if (!$lp_found) { error_log('New LP - No learnpath given for js_api_refresh', 0); require 'lp_message.php'; }
1218 1325
         if (isset($_REQUEST['item_id'])) {
1219 1326
             $htmlHeadXtra[] = $_SESSION['oLP']->get_js_info($_REQUEST['item_id']);
@@ -1221,8 +1328,7 @@  discard block
 block discarded – undo
1221 1328
         require 'lp_message.php';
1222 1329
         break;
1223 1330
     case 'return_to_course_homepage':
1224
-        if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; }
1225
-        else {
1331
+        if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; } else {
1226 1332
             $_SESSION['oLP']->save_current();
1227 1333
             $_SESSION['oLP']->save_last();
1228 1334
             $url = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/index.php?id_session='.api_get_session_id();
@@ -1240,8 +1346,9 @@  discard block
 block discarded – undo
1240 1346
         require 'lp_list_search.php';
1241 1347
         break;
1242 1348
     case 'impress':
1243
-        if ($debug > 0)
1244
-            error_log('New LP - view action triggered', 0);
1349
+        if ($debug > 0) {
1350
+                    error_log('New LP - view action triggered', 0);
1351
+        }
1245 1352
         if (!$lp_found) {
1246 1353
             error_log('New LP - No learnpath given for view', 0);
1247 1354
             require 'lp_list.php';
@@ -1413,15 +1520,19 @@  discard block
 block discarded – undo
1413 1520
         ]);
1414 1521
         break;
1415 1522
     default:
1416
-        if ($debug > 0) error_log('New LP - default action triggered', 0);
1523
+        if ($debug > 0) {
1524
+            error_log('New LP - default action triggered', 0);
1525
+        }
1417 1526
         require 'lp_list.php';
1418 1527
         break;
1419 1528
 }
1420 1529
 
1421 1530
 if (!empty($_SESSION['oLP'])) {
1422 1531
     $_SESSION['lpobject'] = serialize($_SESSION['oLP']);
1423
-    if ($debug > 0) error_log('New LP - lpobject is serialized in session', 0);
1424
-}
1532
+    if ($debug > 0) {
1533
+        error_log('New LP - lpobject is serialized in session', 0);
1534
+    }
1535
+    }
1425 1536
 
1426 1537
 if (!empty($redirectTo)) {
1427 1538
     header("Location: $redirectTo");
Please login to merge, or discard this patch.
main/document/download_scorm.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
 $doc_url = str_replace(' ', '+', $doc_url);
40 40
 $doc_url = str_replace(array('../', '\\..', '\\0', '..\\'), array('', '', '', ''), $doc_url); //echo $doc_url;
41 41
 
42
-if (strpos($doc_url,'../') || strpos($doc_url,'/..')) {
42
+if (strpos($doc_url, '../') || strpos($doc_url, '/..')) {
43 43
     $doc_url = '';
44 44
 }
45 45
 
Please login to merge, or discard this patch.