chamilo / chamilo-lms

main/dropbox/dropbox_submit.php

Braces +3 added lines, -1 removed lines

@@ -267,7 +267,9 @@
 			   break;
 			}
 		}
-		if (!$found) die(get_lang('GeneralError').' (code 415)');
+		if (!$found) {
+		    die(get_lang('GeneralError').' (code 415)');
+		}
 
         echo '<form method="post" action="index.php">', "\n",
             '<input type="hidden" name="feedbackid" value="',

main/course_progress/thematic_plan.php

Braces +6 added lines, -4 removed lines

@@ -9,17 +9,19 @@
 
 // actions menu
 $new_thematic_plan_data = array();
-if (!empty($thematic_plan_data))
-foreach($thematic_plan_data as $thematic_item) {
+if (!empty($thematic_plan_data)) {
+    foreach($thematic_plan_data as $thematic_item) {
     $thematic_simple_list[] = $thematic_item['description_type'];
+}
     $new_thematic_plan_data[$thematic_item['description_type']] = $thematic_item;
 }
 
 $new_id = ADD_THEMATIC_PLAN;
-if (!empty($thematic_simple_list))
-foreach($thematic_simple_list as $item) {
+if (!empty($thematic_simple_list)) {
+    foreach($thematic_simple_list as $item) {
     if ($item >= ADD_THEMATIC_PLAN) {
         $new_id = $item + 1;
+}
         $default_thematic_plan_title[$item] = $new_thematic_plan_data[$item]['title'];
     }
 }

main/newscorm/lp_impress.php

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/storageapi.php

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_controller.php

Braces +225 added lines, -121 removed lines

@@ -13,7 +13,9 @@ 
 $use_anonymous = true;
 
 $debug = 0;
-if ($debug > 0) error_log('New LP -+- Entered lp_controller.php -+- (action: '.$_REQUEST['action'].')', 0);
+if ($debug > 0) {
+    error_log('New LP -+- Entered lp_controller.php -+- (action: '.$_REQUEST['action'].')', 0);
+}
 
 // Language files that needs to be included.
 if (isset($_GET['action'])) {
@@ -231,10 +233,14 @@ 
     // If refresh is set, we regenerate the oLP object from the database (kind of flush).
     Session::erase('refresh');
     $myrefresh = 1;
-    if ($debug > 0) error_log('New LP - Refresh asked', 0);
-}
+    if ($debug > 0) {
+        error_log('New LP - Refresh asked', 0);
+    }
+    }
 
-if ($debug > 0) error_log('New LP - Passed refresh check', 0);
+if ($debug > 0) {
+    error_log('New LP - Passed refresh check', 0);
+}
 
 if (!empty($_REQUEST['dialog_box'])) {
     $dialog_box = stripslashes(urldecode($_REQUEST['dialog_box']));
@@ -244,17 +250,23 @@ 
 $lp_found = false;
 
 if (isset($_SESSION['lpobject'])) {
-    if ($debug > 0) error_log('New LP - SESSION[lpobject] is defined', 0);
+    if ($debug > 0) {
+        error_log('New LP - SESSION[lpobject] is defined', 0);
+    }
     $oLP = unserialize($_SESSION['lpobject']);
     if (isset($oLP) && is_object($oLP)) {
-        if ($debug > 0) error_log('New LP - oLP is object', 0);
+        if ($debug > 0) {
+            error_log('New LP - oLP is object', 0);
+        }
         if ($myrefresh == 1 OR
             empty($oLP->cc) OR
             $oLP->cc != api_get_course_id() OR
             $oLP->lp_view_session_id != $session_id OR
             $oLP->scorm_debug == '1'
         ) {
-            if ($debug > 0) error_log('New LP - Course has changed, discard lp object', 0);
+            if ($debug > 0) {
+                error_log('New LP - Course has changed, discard lp object', 0);
+            }
             if ($myrefresh == 1) { $myrefresh_id = $oLP->get_id(); }
             $oLP = null;
             Session::erase('oLP');
@@ -268,13 +280,19 @@ 
 
 $course_id = api_get_course_int_id();
 
-if ($debug>0) error_log('New LP - Passed data remains check', 0);
+if ($debug>0) {
+    error_log('New LP - Passed data remains check', 0);
+}
 
 if (!$lp_found || (!empty($_REQUEST['lp_id']) && $_SESSION['oLP']->get_id() != $_REQUEST['lp_id'])) {
-    if ($debug > 0) error_log('New LP - oLP is not object, has changed or refresh been asked, getting new', 0);
+    if ($debug > 0) {
+        error_log('New LP - oLP is not object, has changed or refresh been asked, getting new', 0);
+    }
     // Regenerate a new lp object? Not always as some pages don't need the object (like upload?)
     if (!empty($_REQUEST['lp_id']) || !empty($myrefresh_id)) {
-        if ($debug > 0) error_log('New LP - lp_id is defined', 0);
+        if ($debug > 0) {
+            error_log('New LP - lp_id is defined', 0);
+        }
         // Select the lp in the database and check which type it is (scorm/dokeos/aicc) to generate the
         // right object.
         if (!empty($_REQUEST['lp_id'])) {
@@ -286,49 +304,67 @@ 
         $lp_table = Database::get_course_table(TABLE_LP_MAIN);
         if (is_numeric($lp_id)) {
             $sel = "SELECT lp_type FROM $lp_table WHERE c_id = $course_id AND id = $lp_id";
-            if ($debug > 0) error_log('New LP - querying '.$sel, 0);
+            if ($debug > 0) {
+                error_log('New LP - querying '.$sel, 0);
+            }
             $res = Database::query($sel);
 
             if (Database::num_rows($res)) {
                 $row = Database::fetch_array($res);
                 $type = $row['lp_type'];
-                if ($debug > 0) error_log('New LP - found row - type '.$type. ' - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                if ($debug > 0) {
+                    error_log('New LP - found row - type '.$type. ' - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                }
                 switch ($type) {
                     case 1:
-                        if ($debug > 0) error_log('New LP - found row - type dokeos - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        if ($debug > 0) {
+                            error_log('New LP - found row - type dokeos - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        }
 
                         $oLP = new learnpath(api_get_course_id(), $lp_id, api_get_user_id());
                         if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); }
                         break;
                     case 2:
-                        if ($debug > 0) error_log('New LP - found row - type scorm - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        if ($debug > 0) {
+                            error_log('New LP - found row - type scorm - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        }
                         $oLP = new scorm(api_get_course_id(), $lp_id, api_get_user_id());
                         if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); }
                         break;
                     case 3:
-                        if ($debug > 0) error_log('New LP - found row - type aicc - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        if ($debug > 0) {
+                            error_log('New LP - found row - type aicc - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        }
                         $oLP = new aicc(api_get_course_id(), $lp_id, api_get_user_id());
                         if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); }
                         break;
                     default:
-                        if ($debug > 0) error_log('New LP - found row - type other - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        if ($debug > 0) {
+                            error_log('New LP - found row - type other - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        }
                         $oLP = new learnpath(api_get_course_id(), $lp_id, api_get_user_id());
                         if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); }
                         break;
                 }
             }
         } else {
-            if ($debug > 0) error_log('New LP - Request[lp_id] is not numeric', 0);
+            if ($debug > 0) {
+                error_log('New LP - Request[lp_id] is not numeric', 0);
+            }
         }
     } else {
-        if ($debug > 0) error_log('New LP - Request[lp_id] and refresh_id were empty', 0);
+        if ($debug > 0) {
+            error_log('New LP - Request[lp_id] and refresh_id were empty', 0);
+        }
     }
     if ($lp_found) {
         $_SESSION['oLP'] = $oLP;
     }
 }
 
-if ($debug > 0) error_log('New LP - Passed oLP creation check', 0);
+if ($debug > 0) {
+    error_log('New LP - Passed oLP creation check', 0);
+}
 
 $is_allowed_to_edit = api_is_allowed_to_edit(false, true, false, false);
 
@@ -369,11 +405,15 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - add item action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - add item action triggered', 0);
+        }
 
         if (!$lp_found) {
             //check if the learnpath ID was defined, otherwise send back to list
-            if ($debug > 0) error_log('New LP - No learnpath given for add item', 0);
+            if ($debug > 0) {
+                error_log('New LP - No learnpath given for add item', 0);
+            }
             require 'lp_list.php';
         } else {
             $_SESSION['refresh'] = 1;
@@ -447,11 +487,15 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - add audio action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - add audio action triggered', 0);
+        }
 
         if (!$lp_found) {
             //check if the learnpath ID was defined, otherwise send back to list
-            if ($debug > 0) error_log('New LP - No learnpath given for add audio', 0);
+            if ($debug > 0) {
+                error_log('New LP - No learnpath given for add audio', 0);
+            }
             require 'lp_list.php';
         } else {
             $_SESSION['refresh'] = 1;
@@ -525,7 +569,9 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - add_lp action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - add_lp action triggered', 0);
+        }
         if (isset($_REQUEST['lp_name']) && !empty($_REQUEST['lp_name'])) {
             $_REQUEST['lp_name'] = trim($_REQUEST['lp_name']);
             $_SESSION['refresh'] = 1;
@@ -584,9 +630,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - admin_view action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for admin_view', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - admin_view action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for admin_view', 0); require 'lp_list.php'; } else {
             $_SESSION['refresh'] = 1;
             require 'lp_admin_view.php';
         }
@@ -596,9 +643,10 @@ 
             if (!$is_allowed_to_edit) {
                 api_not_allowed(true);
             }
-            if ($debug > 0) error_log('New LP - auto_launch action triggered', 0);
-            if (!$lp_found) { error_log('New LP - No learnpath given for set_autolaunch', 0); require 'lp_list.php'; }
-            else {
+            if ($debug > 0) {
+                error_log('New LP - auto_launch action triggered', 0);
+            }
+            if (!$lp_found) { error_log('New LP - No learnpath given for set_autolaunch', 0); require 'lp_list.php'; } else {
                 $_SESSION['oLP']->set_autolaunch($_GET['lp_id'], $_GET['status']);
                 require 'lp_list.php';
                 exit;
@@ -609,10 +657,11 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - build action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - build action triggered', 0);
+        }
 
-        if (!$lp_found) { error_log('New LP - No learnpath given for build', 0); require 'lp_list.php'; }
-        else {
+        if (!$lp_found) { error_log('New LP - No learnpath given for build', 0); require 'lp_list.php'; } else {
             $_SESSION['refresh'] = 1;
             //require 'lp_build.php';
             $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id);
@@ -624,10 +673,11 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - edit item action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - edit item action triggered', 0);
+        }
 
-        if (!$lp_found) { error_log('New LP - No learnpath given for edit item', 0); require 'lp_list.php'; }
-        else {
+        if (!$lp_found) { error_log('New LP - No learnpath given for edit item', 0); require 'lp_list.php'; } else {
             $_SESSION['refresh'] = 1;
             if (isset($_POST['submit_button']) && !empty($post_title)) {
 
@@ -677,9 +727,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - edit item prereq action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - edit item prereq action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; } else {
             if (isset($_POST['submit_button'])) {
                 //Updating the lp.modified_on
                 $_SESSION['oLP']->set_modified_on();
@@ -707,9 +758,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - move item action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for move item', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - move item action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for move item', 0); require 'lp_list.php'; } else {
             $_SESSION['refresh'] = 1;
             if (isset($_POST['submit_button'])) {
                 //Updating the lp.modified_on
@@ -742,7 +794,9 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - view_item action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - view_item action triggered', 0);
+        }
         if (!$lp_found) {
             error_log('New LP - No learnpath given for view item', 0); require 'lp_list.php';
         } else {
@@ -754,7 +808,9 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - upload action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - upload action triggered', 0);
+        }
         $cwdir = getcwd();
         require 'lp_upload.php';
         // Reinit current working directory as many functions in upload change it.
@@ -771,9 +827,10 @@ 
             api_not_allowed(true);
         }
 
-        if ($debug > 0) error_log('New LP - export action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for copy', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - export action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for copy', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->copy();
         }
         require 'lp_list.php';
@@ -786,9 +843,10 @@ 
         if ($hideScormExportLink === 'true') {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - export action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for export', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - export action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for export', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->scorm_export();
             exit();
             //require 'lp_list.php';
@@ -803,7 +861,9 @@ 
             api_not_allowed(true);
         }
 
-        if ($debug > 0) error_log('New LP - export action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - export action triggered', 0);
+        }
         if (!$lp_found) { error_log('New LP - No learnpath given for export_to_pdf', 0); require 'lp_list.php';
         } else {
             $result = $_SESSION['oLP']->scorm_export_to_pdf($_GET['lp_id']);
@@ -817,9 +877,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - delete action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for delete', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - delete action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for delete', 0); require 'lp_list.php'; } else {
             $_SESSION['refresh'] = 1;
             $_SESSION['oLP']->delete(null, $_GET['lp_id'], 'remove');
             Session::erase('oLP');
@@ -831,9 +892,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - visibility action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for visibility', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - visibility action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for visibility', 0); require 'lp_list.php'; } else {
             learnpath::toggle_visibility($_REQUEST['lp_id'], $_REQUEST['new_status']);
             require 'lp_list.php';
         }
@@ -843,9 +905,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - publish action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for publish', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - publish action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for publish', 0); require 'lp_list.php'; } else {
             learnpath::toggle_publish($_REQUEST['lp_id'], $_REQUEST['new_status']);
             require 'lp_list.php';
         }
@@ -855,7 +918,9 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - publish action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - publish action triggered', 0);
+        }
         if (!$lp_found) {
             error_log('New LP - No learnpath given for publish', 0);
             require 'lp_list.php';
@@ -869,7 +934,9 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - publish action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - publish action triggered', 0);
+        }
         if (!$lp_found) {
             error_log('New LP - No learnpath given for publish', 0);
             require 'lp_list.php';
@@ -882,9 +949,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - edit action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for edit', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - edit action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for edit', 0); require 'lp_list.php'; } else {
             $_SESSION['refresh'] = 1;
             require 'lp_edit.php';
         }
@@ -893,9 +961,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - update_lp action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for edit', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - update_lp action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for edit', 0); require 'lp_list.php'; } else {
             $_SESSION['refresh'] = 1;
             $lp_name = Security::remove_XSS($_REQUEST['lp_name']);
             $_SESSION['oLP']->set_name($lp_name);
@@ -962,8 +1031,9 @@ 
             );
             $extraFieldValue->saveFieldValues($_REQUEST);
 
-            if ($_FILES['lp_preview_image']['size'] > 0)
-                $_SESSION['oLP']->upload_image($_FILES['lp_preview_image']);
+            if ($_FILES['lp_preview_image']['size'] > 0) {
+                            $_SESSION['oLP']->upload_image($_FILES['lp_preview_image']);
+            }
 
             if (api_get_setting('search_enabled') === 'true') {
                 require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
@@ -1003,9 +1073,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - add sub item action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for add sub item', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - add sub item action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for add sub item', 0); require 'lp_list.php'; } else {
             $_SESSION['refresh'] = 1;
             if (!empty($_REQUEST['parent_item_id'])) {
                 $_SESSION['from_learnpath']='yes';
@@ -1021,9 +1092,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - delete item action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for delete item', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - delete item action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for delete item', 0); require 'lp_list.php'; } else {
             //$_SESSION['refresh'] = 1;
             if (!empty($_REQUEST['id'])) {
                 $_SESSION['oLP']->delete_item($_REQUEST['id']);
@@ -1038,9 +1110,10 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if ($debug > 0) error_log('New LP - edit item prereq action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - edit item prereq action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; } else {
             if (!empty($_REQUEST['id']) && !empty($_REQUEST['submit_item'])) {
                 $_SESSION['refresh'] = 1;
                 $_SESSION['oLP']->edit_item_prereq($_REQUEST['id'], $_REQUEST['prereq']);
@@ -1049,53 +1122,61 @@ 
         }
         break;
     case 'restart':
-        if ($debug > 0) error_log('New LP - restart action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for restart', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - restart action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for restart', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->restart();
             require 'lp_view.php';
         }
         break;
     case 'last':
-        if ($debug > 0) error_log('New LP - last action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for last', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - last action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for last', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->last();
             require 'lp_view.php';
         }
         break;
     case 'first':
-        if ($debug > 0) error_log('New LP - first action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for first', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - first action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for first', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->first();
             require 'lp_view.php';
         }
         break;
     case 'next':
-        if ($debug > 0) error_log('New LP - next action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for next', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - next action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for next', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->next();
             require 'lp_view.php';
         }
         break;
     case 'previous':
-        if ($debug > 0) error_log('New LP - previous action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for previous', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - previous action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for previous', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->previous();
             require 'lp_view.php';
         }
         break;
     case 'content':
-        if ($debug > 0) error_log('New LP - content action triggered', 0);
-        if ($debug > 0) error_log('New LP - Item id is '.intval($_GET['item_id']), 0);
+        if ($debug > 0) {
+            error_log('New LP - content action triggered', 0);
+        }
+        if ($debug > 0) {
+            error_log('New LP - Item id is '.intval($_GET['item_id']), 0);
+        }
         if (!$lp_found) {
             error_log('New LP - No learnpath given for content', 0);
             require 'lp_list.php';
-        }
-        else {
+        } else {
             $_SESSION['oLP']->save_last();
             $_SESSION['oLP']->set_current_item($_GET['item_id']);
             $_SESSION['oLP']->start_current_item();
@@ -1103,8 +1184,9 @@ 
         }
         break;
     case 'view':
-        if ($debug > 0)
-            error_log('New LP - view action triggered', 0);
+        if ($debug > 0) {
+                    error_log('New LP - view action triggered', 0);
+        }
         if (!$lp_found) {
             error_log('New LP - No learnpath given for view', 0);
             require 'lp_list.php';
@@ -1117,17 +1199,19 @@ 
         }
         break;
     case 'save':
-        if ($debug > 0) error_log('New LP - save action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for save', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - save action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for save', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->save_item();
             require 'lp_save.php';
         }
         break;
     case 'stats':
-        if ($debug > 0) error_log('New LP - stats action triggered', 0);
-        if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; }
-        else {
+        if ($debug > 0) {
+            error_log('New LP - stats action triggered', 0);
+        }
+        if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->save_current();
             $_SESSION['oLP']->save_last();
             $output = require 'lp_stats.php';
@@ -1135,7 +1219,9 @@ 
         }
         break;
     case 'list':
-        if ($debug > 0) error_log('New LP - list action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - list action triggered', 0);
+        }
         if ($lp_found) {
             $_SESSION['refresh'] = 1;
             $_SESSION['oLP']->save_last();
@@ -1144,7 +1230,9 @@ 
         break;
     case 'mode':
         // Switch between fullscreen and embedded mode.
-        if ($debug > 0) error_log('New LP - mode change triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - mode change triggered', 0);
+        }
         $mode = $_REQUEST['mode'];
         if ($mode == 'fullscreen') {
             $_SESSION['oLP']->mode = 'fullscreen';
@@ -1158,7 +1246,9 @@ 
         require 'lp_view.php';
         break;
     case 'switch_view_mode':
-        if ($debug > 0) error_log('New LP - switch_view_mode action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - switch_view_mode action triggered', 0);
+        }
         if (!$lp_found) { error_log('New LP - No learnpath given for switch', 0); require 'lp_list.php'; }
         if (Security::check_token('get')) {
             $_SESSION['refresh'] = 1;
@@ -1167,7 +1257,9 @@ 
         require 'lp_list.php';
         break;
     case 'switch_force_commit':
-        if ($debug > 0) error_log('New LP - switch_force_commit action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - switch_force_commit action triggered', 0);
+        }
         if (!$lp_found) { error_log('New LP - No learnpath given for switch', 0); require 'lp_list.php'; }
         $_SESSION['refresh'] = 1;
         $_SESSION['oLP']->update_default_scorm_commit();
@@ -1190,25 +1282,33 @@ 
 		break;
      */
 	case 'switch_attempt_mode':
-		if($debug>0) error_log('New LP - switch_reinit action triggered',0);
+		if($debug>0) {
+		    error_log('New LP - switch_reinit action triggered',0);
+		}
 		if(!$lp_found){ error_log('New LP - No learnpath given for switch',0); require 'lp_list.php'; }
 		$_SESSION['refresh'] = 1;
 		$_SESSION['oLP']->switch_attempt_mode();
         require 'lp_list.php';
         break;
     case 'switch_scorm_debug':
-        if ($debug > 0) error_log('New LP - switch_scorm_debug action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - switch_scorm_debug action triggered', 0);
+        }
         if (!$lp_found) { error_log('New LP - No learnpath given for switch', 0); require 'lp_list.php'; }
         $_SESSION['refresh'] = 1;
         $_SESSION['oLP']->update_scorm_debug();
         require 'lp_list.php';
         break;
     case 'intro_cmdAdd':
-        if ($debug > 0) error_log('New LP - intro_cmdAdd action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - intro_cmdAdd action triggered', 0);
+        }
         // Add introduction section page.
         break;
     case 'js_api_refresh':
-        if ($debug > 0) error_log('New LP - js_api_refresh action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - js_api_refresh action triggered', 0);
+        }
         if (!$lp_found) { error_log('New LP - No learnpath given for js_api_refresh', 0); require 'lp_message.php'; }
         if (isset($_REQUEST['item_id'])) {
             $htmlHeadXtra[] = $_SESSION['oLP']->get_js_info($_REQUEST['item_id']);
@@ -1216,8 +1316,7 @@ 
         require 'lp_message.php';
         break;
     case 'return_to_course_homepage':
-        if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; }
-        else {
+        if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->save_current();
             $_SESSION['oLP']->save_last();
             $url = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/index.php?id_session='.api_get_session_id();
@@ -1235,8 +1334,9 @@ 
         require 'lp_list_search.php';
         break;
     case 'impress':
-        if ($debug > 0)
-            error_log('New LP - view action triggered', 0);
+        if ($debug > 0) {
+                    error_log('New LP - view action triggered', 0);
+        }
         if (!$lp_found) {
             error_log('New LP - No learnpath given for view', 0);
             require 'lp_list.php';
@@ -1386,12 +1486,16 @@ 
         ]));
         break;
     default:
-        if ($debug > 0) error_log('New LP - default action triggered', 0);
+        if ($debug > 0) {
+            error_log('New LP - default action triggered', 0);
+        }
         require 'lp_list.php';
         break;
 }
 
 if (!empty($_SESSION['oLP'])) {
     $_SESSION['lpobject'] = serialize($_SESSION['oLP']);
-    if ($debug > 0) error_log('New LP - lpobject is serialized in session', 0);
-}
+    if ($debug > 0) {
+        error_log('New LP - lpobject is serialized in session', 0);
+    }
+    }

main/newscorm/resourcelinker.inc.php

Braces +34 added lines, -34 removed lines

@@ -334,9 +334,14 @@ 
 
     $length = ((($builder == 'builder') && ($icon == 'nolink')) ? 65 : 32);
 
-    if ($builder != 'builder') $origin = 'learnpath';	//origin = learnpath in student view
+    if ($builder != 'builder') {
+        $origin = 'learnpath';
+    }
+    //origin = learnpath in student view
     $linktype = $type;
-    if (($type == 'Link _self') or ($type == 'Link _blank')) $type = 'Link';
+    if (($type == 'Link _self') or ($type == 'Link _blank')) {
+        $type = 'Link';
+    }
 
     // YW switched litteral tool names to use of constants declared in main_api.lib.php
     switch ($type) {
@@ -356,7 +361,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -407,7 +412,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -454,7 +459,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -468,8 +473,7 @@ 
 
             if ($icon == 'nolink') { return(shorten($myrow['title'], $length)); }
             if ($icon == 'icon') {
-                if ($linktype == 'Link _self') { echo "<img src='../img/links.gif' align=\"absmiddle\" alt='links'>"; }
-                   else { echo "<img src='../img/link_blank.gif' align=\"absmiddle\" alt='blank links'>"; }
+                if ($linktype == 'Link _self') { echo "<img src='../img/links.gif' align=\"absmiddle\" alt='links'>"; } else { echo "<img src='../img/link_blank.gif' align=\"absmiddle\" alt='blank links'>"; }
             }
             $thelink = $myrow['url'];
             if ($builder != 'builder') {
@@ -558,7 +562,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -603,7 +607,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -647,7 +651,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -698,7 +702,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -801,7 +805,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -842,7 +846,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -858,8 +862,7 @@ 
                 echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
-                    else {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; } else {
                         echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
                 }
             } else {
@@ -897,8 +900,7 @@ 
                 $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
-                    else {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; } else {
                         echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
                 }
             } else {
@@ -920,7 +922,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -936,8 +938,7 @@ 
                 echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
-                    else {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; } else {
                         echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
                 }
             } else {
@@ -976,8 +977,7 @@ 
                 echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
-                    else {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; } else {
                         echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
                 }
             } else {
@@ -1015,8 +1015,7 @@ 
                 echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
-                    else {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; } else {
                         echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
                 }
             } else {
@@ -1346,11 +1345,12 @@ 
             WHERE c_id = $course_id AND source_type='$type' and source_id='$id'";
     $result = Database::query($sql);
     $number_added = Database::num_rows($result);
-    if ($number_added != 0)
-        return true;
-    else
-        return false;
-}
+    if ($number_added != 0) {
+            return true;
+    } else {
+            return false;
+    }
+    }
 
 /**
  * this function is to load the resources that were added to a specific item
@@ -1459,8 +1459,7 @@ 
             next($addedresource);
         }
         echo '</table>';
-    }
-    else { // it is a string
+    } else { // it is a string
         echo '';
     }
 } // end of the display_resources function
@@ -1492,8 +1491,7 @@ 
                 echo "<a href='".api_get_self()."?content=".$type."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&lp_id=$learnpath_id&parent_item_id=$chapter_id&originalresource=no&target=$target'>".$lang_add_it_or_resource."</a>";
             }
         }
-    }
-    else { // if it is not an array, it is a string
+    } else { // if it is not an array, it is a string
         if ($_SESSION['addedresource'] !== $type || $_SESSION['addedresourceid'] !== $id) {
             if ($from_learnpath) { $lang_add_it_or_resource = get_lang('AddIt'); } else { $lang_add_it_or_resource = get_lang('AddResource'); }
             echo "<a href='".api_get_self()."?content=".$type."&folder=".$folder."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&lp_id=$learnpath_id&parent_item_id=$chapter_id&originalresource=no&target=$target'>".$lang_add_it_or_resource."</a>";
@@ -1519,7 +1517,9 @@ 
     $course_id = api_get_course_int_id();
 
     // Styling the link of the added resource
-    if ($style != '') $styling = ' class="'.$style.'"';
+    if ($style != '') {
+        $styling = ' class="'.$style.'"';
+    }
     if ($new_window) { $target = ' target = "_blank" '; } else { $target = ' target = "_self" '; }
 
     $output = '';

main/newscorm/learnpath.class.php

Braces +167 added lines, -117 removed lines

@@ -3935,8 +3935,9 @@ 
                 WHERE c_id = ".$course_id."
                 ORDER BY display_order";
         $res = Database::query($sql);
-        if ($res === false)
-            return false;
+        if ($res === false) {
+                    return false;
+        }
         $lps = array ();
         $lp_order = array ();
         $num = Database :: num_rows($res);
@@ -4536,8 +4537,9 @@ 
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::set_maker()', 0);
         }
-        if (empty ($name))
-            return false;
+        if (empty ($name)) {
+                    return false;
+        }
         $this->maker = $name;
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $course_id = api_get_course_int_id();
@@ -4602,8 +4604,9 @@ 
     public function set_terms_by_prefix($terms_string, $prefix)
     {
         $course_id = api_get_course_int_id();
-        if (api_get_setting('search_enabled') !== 'true')
-            return false;
+        if (api_get_setting('search_enabled') !== 'true') {
+                    return false;
+        }
 
         if (!extension_loaded('xapian')) {
             return false;
@@ -4616,8 +4619,9 @@ 
         $stored_terms = $this->get_common_index_terms_by_prefix($prefix);
 
         // Don't do anything if no change, verify only at DB, not the search engine.
-        if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0))
-            return false;
+        if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0)) {
+                    return false;
+        }
 
         require_once 'xapian.php'; // TODO: Try catch every xapian use or make wrappers on API.
         require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
@@ -4809,8 +4813,9 @@ 
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::set_proximity()', 0);
         }
-        if (empty ($name))
-            return false;
+        if (empty ($name)) {
+                    return false;
+        }
 
         $this->proximity = $name;
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
@@ -5152,8 +5157,9 @@ 
 
         $sql = "SELECT * FROM $lp_table WHERE c_id = ".$course_id." ORDER BY display_order";
         $res = Database::query($sql);
-        if ($res === false)
-            return false;
+        if ($res === false) {
+                    return false;
+        }
 
         $num = Database :: num_rows($res);
         // First check the order is correct, globally (might be wrong because
@@ -5464,8 +5470,9 @@ 
             $position[$key] = $row['display_order'];
         }
 
-        if (count($array) > 0)
-            array_multisort($parent, SORT_ASC, $position, SORT_ASC, $array);
+        if (count($array) > 0) {
+                    array_multisort($parent, SORT_ASC, $position, SORT_ASC, $array);
+        }
 
         return $array;
     }
@@ -6021,8 +6028,9 @@ 
         $tmp_filename = $filename;
 
         $i = 0;
-        while (file_exists($filepath . $tmp_filename . '.'.$extension))
-            $tmp_filename = $filename . '_' . ++ $i;
+        while (file_exists($filepath . $tmp_filename . '.'.$extension)) {
+                    $tmp_filename = $filename . '_' . ++ $i;
+        }
 
         $filename = $tmp_filename . '.'.$extension;
         if ($extension == 'html') {
@@ -6095,10 +6103,12 @@ 
                     if ($new_comment || $new_title) {
                         $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
                         $ct = '';
-                        if ($new_comment)
-                            $ct .= ", comment='" . Database::escape_string($new_comment). "'";
-                        if ($new_title)
-                            $ct .= ", title='" . Database::escape_string(htmlspecialchars($new_title, ENT_QUOTES, $charset))."' ";
+                        if ($new_comment) {
+                                                    $ct .= ", comment='" . Database::escape_string($new_comment). "'";
+                        }
+                        if ($new_title) {
+                                                    $ct .= ", title='" . Database::escape_string(htmlspecialchars($new_title, ENT_QUOTES, $charset))."' ";
+                        }
 
                         $sql = "UPDATE " . $tbl_doc ." SET " . substr($ct, 1)."
                                WHERE c_id = ".$course_id." AND id = " . $document_id;
@@ -6122,17 +6132,21 @@ 
         // Please, do not modify this dirname formatting.
         $dir = isset($_GET['dir']) ? $_GET['dir'] : $_POST['dir'];
 
-        if (strstr($dir, '..'))
-            $dir = '/';
+        if (strstr($dir, '..')) {
+                    $dir = '/';
+        }
 
-        if ($dir[0] == '.')
-            $dir = substr($dir, 1);
+        if ($dir[0] == '.') {
+                    $dir = substr($dir, 1);
+        }
 
-        if ($dir[0] != '/')
-            $dir = '/' . $dir;
+        if ($dir[0] != '/') {
+                    $dir = '/' . $dir;
+        }
 
-        if ($dir[strlen($dir) - 1] != '/')
-            $dir .= '/';
+        if ($dir[strlen($dir) - 1] != '/') {
+                    $dir .= '/';
+        }
 
         $filepath = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document' . $dir;
 
@@ -6198,8 +6212,9 @@ 
                 }
                 $return .= '<div style="padding:10px;">';
 
-                if ($msg != '')
-                    $return .= $msg;
+                if ($msg != '') {
+                                    $return .= $msg;
+                }
 
                 $return .= '<h3>'.$row['title'].'</h3>';
                 switch ($row['item_type']) {
@@ -6446,10 +6461,11 @@ 
         $item_description 	= Security::remove_XSS($item_description);
 
         $legend = '<legend>';
-        if ($id != 0 && is_array($extra_info))
-            $parent = $extra_info['parent_item_id'];
-        else
-            $parent = 0;
+        if ($id != 0 && is_array($extra_info)) {
+                    $parent = $extra_info['parent_item_id'];
+        } else {
+                    $parent = 0;
+        }
 
         $sql = "SELECT * FROM " . $tbl_lp_item . "
                 WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
@@ -6527,8 +6543,9 @@ 
                     $arrHide[] = $arrLP[$i]['id'];
                 }
             } else {
-                if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir')
-                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') {
+                                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                }
             }
         }
         if (is_array($arrLP)) {
@@ -6717,11 +6734,13 @@ 
         }
 
         $legend = '<legend>';
-        if ($action == 'add')
-            $legend .= get_lang('CreateTheExercise');
-        elseif ($action == 'move') $legend .= get_lang('MoveTheCurrentExercise');
-        else
-            $legend .= get_lang('EditCurrentExecice');
+        if ($action == 'add') {
+                    $legend .= get_lang('CreateTheExercise');
+        } elseif ($action == 'move') {
+            $legend .= get_lang('MoveTheCurrentExercise');
+        } else {
+                    $legend .= get_lang('EditCurrentExecice');
+        }
         if (isset ($_GET['edit']) && $_GET['edit'] == 'true') {
             $legend .= Display :: return_warning_message(get_lang('Warning') . ' ! ' . get_lang('WarningEditingDocument'));
         }
@@ -6748,8 +6767,9 @@ 
                         $arrHide[] = $arrLP[$i]['id'];
                     }
                 } else {
-                    if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir')
-                        $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') {
+                                            $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    }
                 }
             }
 
@@ -6767,11 +6787,13 @@ 
 
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
-                if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
+                if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                    $selected = 'selected="selected" ';
+                } elseif ($action == 'add') {
                     $selected = 'selected="selected" ';
-                elseif ($action == 'add') $selected = 'selected="selected" ';
-                else
-                    $selected = '';
+                } else {
+                                    $selected = '';
+                }
 
                 $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' . get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
             }
@@ -6798,9 +6820,11 @@ 
                 $arrHide = array ();
                 for ($i = 0; $i < count($arrLP); $i++) {
                     if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
-                        if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                            $s_selected_position = $arrLP[$i]['id'];
-                        elseif ($action == 'add') $s_selected_position = 0;
+                        if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                                    $s_selected_position = $arrLP[$i]['id'];
+                        } elseif ($action == 'add') {
+                            $s_selected_position = 0;
+                        }
                         $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                     }
@@ -6897,11 +6921,13 @@ 
         $arrLP = isset($this->arrMenu) ? $this->arrMenu : null;
         unset($this->arrMenu);
 
-        if ($action == 'add')
-            $legend .= get_lang('CreateTheForum') . '&nbsp;:';
-        elseif ($action == 'move') $legend .= get_lang('MoveTheCurrentForum') . '&nbsp;:';
-        else
-            $legend .= get_lang('EditCurrentForum') . '&nbsp;:';
+        if ($action == 'add') {
+                    $legend .= get_lang('CreateTheForum') . '&nbsp;:';
+        } elseif ($action == 'move') {
+            $legend .= get_lang('MoveTheCurrentForum') . '&nbsp;:';
+        } else {
+                    $legend .= get_lang('EditCurrentForum') . '&nbsp;:';
+        }
 
         $legend .= '</legend>';
         $return = '<div class="sectioncomment">';
@@ -6934,8 +6960,9 @@ 
                     $arrHide[] = $arrLP[$i]['id'];
                 }
             } else {
-                if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir')
-                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') {
+                                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                }
             }
         }
         if (is_array($arrLP)) {
@@ -6953,11 +6980,13 @@ 
 
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
-                if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
+                if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                    $selected = 'selected="selected" ';
+                } elseif ($action == 'add') {
                     $selected = 'selected="selected" ';
-                elseif ($action == 'add') $selected = 'selected="selected" ';
-                else
-                    $selected = '';
+                } else {
+                                    $selected = '';
+                }
 
                 $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' .
                     get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
@@ -6983,9 +7012,11 @@ 
             $arrHide = array();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
                 }
             }
@@ -7089,11 +7120,13 @@ 
         unset ($this->arrMenu);
 
         $return .= '<form method="POST">';
-        if ($action == 'add')
-            $return .= '<legend>' . get_lang('CreateTheForum') . '</legend>';
-        elseif ($action == 'move') $return .= '<p class="lp_title">' . get_lang('MoveTheCurrentForum') . '&nbsp;:</p>';
-        else
-            $return .= '<legend>' . get_lang('EditCurrentForum') . '</legend>';
+        if ($action == 'add') {
+                    $return .= '<legend>' . get_lang('CreateTheForum') . '</legend>';
+        } elseif ($action == 'move') {
+            $return .= '<p class="lp_title">' . get_lang('MoveTheCurrentForum') . '&nbsp;:</p>';
+        } else {
+                    $return .= '<legend>' . get_lang('EditCurrentForum') . '</legend>';
+        }
 
         $return .= '<table cellpadding="0" cellspacing="0" class="lp_form">';
         $return .= '<tr>';
@@ -7113,8 +7146,9 @@ 
                     $arrHide[] = $arrLP[$i]['id'];
                 }
             } else {
-                if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir')
-                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') {
+                                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                }
             }
         }
 
@@ -7132,11 +7166,13 @@ 
         $return .= '<option class="top" value="0">' . get_lang('FirstPosition') . '</option>';
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
-                if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
+                if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                    $selected = 'selected="selected" ';
+                } elseif ($action == 'add') {
                     $selected = 'selected="selected" ';
-                elseif ($action == 'add') $selected = 'selected="selected" ';
-                else
-                    $selected = '';
+                } else {
+                                    $selected = '';
+                }
 
                 $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' . get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
             }
@@ -7165,9 +7201,11 @@ 
             $arrHide = array();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                 }
@@ -7180,8 +7218,7 @@ 
             foreach ($arrHide as $key => $value) {
                 if ($key == $s_selected_position && $action == 'add') {
                     $return .= '<option value="' . $key . '" selected="selected">' . $value['value'] . '</option>';
-                }
-                elseif ($key == $id_prerequisite && $action == 'edit') {
+                } elseif ($key == $id_prerequisite && $action == 'edit') {
                     $return .= '<option value="' . $key . '" selected="selected">' . $value['value'] . '</option>';
                 } else {
                     $return .= '<option value="' . $key . '">' . $value['value'] . '</option>';
@@ -7204,8 +7241,7 @@ 
 
         if (is_numeric($extra_info)) {
             $return .= '<input name="path" type="hidden" value="' . $extra_info . '" />';
-        }
-        elseif (is_array($extra_info)) {
+        } elseif (is_array($extra_info)) {
             $return .= '<input name="path" type="hidden" value="' . $extra_info['path'] . '" />';
         }
 
@@ -7259,8 +7295,9 @@ 
                     lp_id = " . $this->lp_id . " AND
                     id != $id";
 
-        if ($item_type == 'module')
-            $sql .= " AND parent_item_id = 0";
+        if ($item_type == 'module') {
+                    $sql .= " AND parent_item_id = 0";
+        }
 
         $result = Database::query($sql);
         $arrLP = array ();
@@ -7610,9 +7647,11 @@ 
         //POSITION
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
-                if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id'])
+                if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                    $s_selected_position = $arrLP[$i]['id'];
+                } elseif ($action == 'add') {
                     $s_selected_position = $arrLP[$i]['id'];
-                elseif ($action == 'add') $s_selected_position = $arrLP[$i]['id'];
+                }
                 $arrHide[$arrLP[$i]['id']]['value'] = get_lang('After') . ' "' . $arrLP[$i]['title'] . '"';
             }
         }
@@ -7645,9 +7684,11 @@ 
 
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
-                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id'])
+                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
                         $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = $arrLP[$i]['id'];
+                    }
 
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
@@ -7658,17 +7699,18 @@ 
                 $item_type = isset($extra_info['item_type']) ? $extra_info['item_type'] : null;
                 $edit = isset($_GET['edit']) ? $_GET['edit'] : null;
                 if (($extra_info == 'new' || $item_type == TOOL_DOCUMENT || $edit == 'true')) {
-                    if (isset ($_POST['content']))
-                        $content = stripslashes($_POST['content']);
-                    elseif (is_array($extra_info)) {
+                    if (isset ($_POST['content'])) {
+                                            $content = stripslashes($_POST['content']);
+                    } elseif (is_array($extra_info)) {
                         //If it's an html document or a text file
                         if (!$no_display_edit_textarea) {
                             $content = $this->display_document($extra_info['path'], false, false);
                         }
-                    } elseif (is_numeric($extra_info))
-                        $content = $this->display_document($extra_info, false, false);
-                    else
-                        $content = '';
+                    } elseif (is_numeric($extra_info)) {
+                                            $content = $this->display_document($extra_info, false, false);
+                    } else {
+                                            $content = '';
+                    }
 
                     if (!$no_display_edit_textarea) {
                         // We need to calculate here some specific settings for the online editor.
@@ -7822,11 +7864,13 @@ 
         $arrLP = isset($this->arrMenu) ? $this->arrMenu : null;
         unset ($this->arrMenu);
 
-        if ($action == 'add')
-            $legend .= get_lang('CreateTheLink') . '&nbsp;:';
-        elseif ($action == 'move') $legend .= get_lang('MoveCurrentLink') . '&nbsp;:';
-        else
-            $legend .= get_lang('EditCurrentLink') . '&nbsp;:';
+        if ($action == 'add') {
+                    $legend .= get_lang('CreateTheLink') . '&nbsp;:';
+        } elseif ($action == 'move') {
+            $legend .= get_lang('MoveCurrentLink') . '&nbsp;:';
+        } else {
+                    $legend .= get_lang('EditCurrentLink') . '&nbsp;:';
+        }
 
         $legend .= '</legend>';
 
@@ -7861,8 +7905,9 @@ 
                     $arrHide[] = $arrLP[$i]['id'];
                 }
             } else {
-                if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir')
-                    $return .= '<option ' . (($parent_item_id == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') {
+                                    $return .= '<option ' . (($parent_item_id == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                }
             }
         }
 
@@ -7881,12 +7926,13 @@ 
         $return .= '<option class="top" value="0">' . get_lang('FirstPosition') . '</option>';
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
-                if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                    $selected = 'selected="selected" ';
-                elseif ($action == 'add')
-                    $selected = 'selected="selected" ';
-                else
-                    $selected = '';
+                if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                    $selected = 'selected="selected" ';
+                } elseif ($action == 'add') {
+                                    $selected = 'selected="selected" ';
+                } else {
+                                    $selected = '';
+                }
 
                 $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' . get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
             }
@@ -7913,9 +7959,11 @@ 
             $arrHide = array();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                 }
@@ -8122,9 +8170,11 @@ 
             $arrHide = array ();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                 }
@@ -9683,9 +9733,9 @@ 
         $main_code_path = api_get_path(SYS_CODE_PATH).'newscorm/packaging/';
         $extra_files = scandir($main_code_path);
         foreach ($extra_files as $extra_file) {
-            if (strpos($extra_file, '.') === 0)
-                continue;
-            else {
+            if (strpos($extra_file, '.') === 0) {
+                            continue;
+            } else {
                 $dest_file = $archive_path . $temp_dir_short . '/' . $extra_file;
                 $this->create_path($dest_file);
                 copy($main_code_path.$extra_file, $dest_file);

main/newscorm/openoffice_text_document.class.php

Braces +3 added lines, -2 removed lines

@@ -119,8 +119,9 @@
 
         for ($i = 0; $i<count($matches[0]); $i++) {
 
-            if (empty($matches[1][$i]))
-                continue;
+            if (empty($matches[1][$i])) {
+                            continue;
+            }
 
             $content = api_strstr($content, $matches[0][$i]);
             if ($i + 1 !== count($matches[0])) {

main/newscorm/resourcelinker.php

Braces +1 added lines, -2 removed lines

@@ -341,8 +341,7 @@
         case '1': // coming from Agenda
             if ($action == 'edit') {
                 $url = "../calendar/agenda.php?action=edit&id=49&originalresource=$originalresource";
-            }
-            elseif ($action == 'add') {
+            } elseif ($action == 'add') {
                 $url = "../calendar/agenda.php?action=add&originalresource=$originalresource";
             } else {
                 $url = "../calendar/agenda.php?action=add";