chamilo / chamilo-lms

main/newscorm/learnpath.class.php

Doc Comments +29 added lines, -25 removed lines

@@ -84,7 +84,7 @@ 
      * @param	string	$course Course code
      * @param	integer	$lp_id
      * @param	integer	$user_id
-     * @return mixed True on success, false on error
+     * @return boolean True on success, false on error
      */
     public function __construct($course, $lp_id, $user_id)
     {
@@ -485,7 +485,7 @@ 
      * @param int $max_time_allowed
      * @param int $userId
      *
-     * @return int
+     * @return false|string
      */
     public function add_item(
         $parent,
@@ -1036,7 +1036,7 @@ 
      * @param	array $courseInfo
      * @param	integer	Learnpath ID
      * @param	string	Whether to delete data or keep it (default: 'keep', others: 'remove')
-     * @return	boolean	True on success, false on failure (might change that to return number of elements deleted)
+     * @return	false|null	True on success, false on failure (might change that to return number of elements deleted)
      */
     public function delete($courseInfo = null, $id = null, $delete = 'keep')
     {
@@ -1170,7 +1170,7 @@ 
      * @param	integer	$id Elem ID (0 if first)
      * @param	integer	$remove Whether to remove the resource/data from the
      * system or leave it (default: 'keep', others 'remove')
-     * @return	integer	Number of elements moved
+     * @return	false|null	Number of elements moved
      * @todo implement resource removal
      */
     public function delete_item($id, $remove = 'keep')
@@ -1252,7 +1252,7 @@ 
      * @param   array   $audio The array resulting of the $_FILES[mp3] element
      * @param   int     $max_time_allowed
      * @param   string  $url
-     * @return  boolean True on success, false on error
+     * @return  false|null True on success, false on error
      */
     public function edit_item(
         $id,
@@ -1775,7 +1775,7 @@ 
 
     /**
      * Gets the first element URL.
-     * @return	string	URL to load into the viewer
+     * @return	false|null	URL to load into the viewer
      */
     public function first()
     {
@@ -2291,6 +2291,7 @@ 
      * @param int $student_id
      * @param string Course code (optional)
      * @param int $sessionId
+     * @param string $courseCode
      * @return	bool
      */
     public static function is_lp_visible_for_student(
@@ -2590,7 +2591,7 @@ 
 
     /**
      * Gets the learnpath session id
-     * @return	string	Learnpath theme
+     * @return	integer	Learnpath theme
      */
     public function get_lp_session_id()
     {
@@ -2623,7 +2624,7 @@ 
     /**
      * @param string $size
      * @param string $path_type
-     * @return bool|string
+     * @return string|false
      */
     public function get_preview_image_path($size = null, $path_type = 'web')
     {
@@ -2769,6 +2770,8 @@ 
      * Returns the XML DOM document's node
      * @param	resource	Reference to a list of objects to search for the given ITEM_*
      * @param	string		The identifier to look for
+     * @param DOMNodeList $children
+     * @param string $id
      * @return	mixed		The reference to the element found with that identifier. False if not found
      */
     public function get_scorm_xml_node(& $children, $id)
@@ -3016,7 +3019,7 @@ 
     /**
      * Generate and return the table of contents for this learnpath. The (flat) table returned can be
      * used by get_html_toc() to be ready to display
-     * @return	array	TOC as a table with 4 elements per row: title, link, status and level
+     * @return	boolean	TOC as a table with 4 elements per row: title, link, status and level
      */
     public function get_toc()
     {
@@ -3152,7 +3155,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public static function getChapterTypes()
     {
@@ -4054,7 +4057,7 @@ 
      * Open a resource = initialise all local variables relative to this resource. Depending on the child
      * class, this might be redefined to allow several behaviours depending on the document type.
      * @param integer Resource ID
-     * @return boolean True on success, false otherwise
+     * @return boolean|null True on success, false otherwise
      */
     public function open($id)
     {
@@ -4183,7 +4186,7 @@ 
      * Can be used as abstract
      * @param	integer	$lp_id Learnpath id
      * @param	string	$set_visibility New visibility (v/i - visible/invisible)
-     * @return bool
+     * @return false|null
      */
     public static function toggle_publish($lp_id, $set_visibility = 'v')
     {
@@ -4268,7 +4271,7 @@ 
      * Make sure the results are saved with anoter method. This method should probably be
      * redefined in children classes.
      * To use a similar method  statically, use the create_new_attempt() method
-     * @return string URL to load in the viewer
+     * @return boolean URL to load in the viewer
      */
     public function restart()
     {
@@ -4346,6 +4349,7 @@ 
      * Saves the given item
      * @param	integer	$item_id. Optional (will take from $_REQUEST if null)
      * @param	boolean	$from_outside Save from url params (true) or from current attributes (false). Optional. Defaults to true
+     * @param integer $item_id
      * @return	boolean
      */
     public function save_item($item_id = null, $from_outside = true)
@@ -4843,7 +4847,7 @@ 
 
     /**
      * Sets use_max_score
-     * @param   string  $use_max_score Optional string giving the new location of this learnpath
+     * @param   integer  $use_max_score Optional string giving the new location of this learnpath
      * @return  boolean True on success / False on error
      */
     public function set_use_max_score($use_max_score = 1)
@@ -5244,6 +5248,7 @@ 
      * Register the attempt mode into db thanks to flags prevent_reinit and seriousgame_mode flags
      *
      * @param string 'seriousgame', 'single' or 'multiple'
+     * @param string $mode
      * @return boolean
      * @author ndiechburg <noel@cblue.be>
      **/
@@ -5286,7 +5291,7 @@ 
     /**
      * Switch between multiple attempt, single attempt or serious_game mode (only for scorm)
      *
-     * @return boolean
+     * @return boolean|null
      * @author ndiechburg <noel@cblue.be>
      **/
     public function switch_attempt_mode()
@@ -5477,7 +5482,6 @@ 
     /**
      * Function that creates a html list of learning path items so that we can add audio files to them
      * @author Kevin Van Den Haute
-     * @param int $lp_id
      * @return string
      */
     public function overview()
@@ -5842,7 +5846,7 @@ 
     /**
      * This function builds the action menu
      * @param bool $returnContent
-     * @return void
+     * @return string|null
      */
     public function build_action_menu($returnContent = false)
     {
@@ -6348,7 +6352,7 @@ 
     /**
      * Function that displays a list with al the resources that
      * could be added to the learning path
-     * @return string
+     * @return boolean
      */
     public function display_resources()
     {
@@ -8795,7 +8799,7 @@ 
 
     /**
      * Creates a list with all the student publications in it
-     * @return unknown
+     * @return string
      */
     public function get_student_publications()
     {
@@ -9747,7 +9751,7 @@ 
 
     /**
      * @param int $lp_id
-     * @return bool
+     * @return false|null
      */
     public function scorm_export_to_pdf($lp_id)
     {
@@ -10264,6 +10268,7 @@ 
     }
 
     /**
+     * @param string $courseCode
      * @return \learnpath
      */
     public static function getLpFromSession($courseCode, $lp_id, $user_id)
@@ -10283,7 +10288,7 @@ 
 
     /**
      * @param int $itemId
-     * @return learnpathItem|false
+     * @return string
      */
     public function getItem($itemId)
     {
@@ -10333,7 +10338,6 @@ 
     /**
      * Set whether this is a learning path with the possibility to subscribe
      * users or not
-     * @param int $subscribeUsers (0 = false, 1 = true)
      */
     public function setSubscribeUsers($value)
     {
@@ -10458,7 +10462,7 @@ 
 
     /**
      * Get the item of exercise type (evaluation type)
-     * @return array The final evaluation. Otherwise return false
+     * @return integer The final evaluation. Otherwise return false
      */
     public function getFinalEvaluationItem()
     {
@@ -10682,7 +10686,7 @@ 
     /**
      * Create a forum for this learning path
      * @param type $forumCategoryId
-     * @return int The forum ID if was created. Otherwise return false
+     * @return false|string The forum ID if was created. Otherwise return false
      */
     public function createForum($forumCategoryId)
     {
@@ -10737,7 +10741,7 @@ 
 
     /**
      * 
-     * @return html
+     * @return string
      */
     public function getFinalItemForm()
     {

Spacing +689 added lines, -689 removed lines

@@ -53,7 +53,7 @@ 
     // Percentage progress as saved in the db.
     public $progress_db = '0';
     public $proximity; // Wether the content is distant or local or unknown.
-    public $refs_list = array (); //list of items by ref => db_id. Used only for prerequisites match.
+    public $refs_list = array(); //list of items by ref => db_id. Used only for prerequisites match.
     // !!!This array (refs_list) is built differently depending on the nature of the LP.
     // If SCORM, uses ref, if Chamilo, uses id to keep a unique value.
     public $type; //type of learnpath. Could be 'dokeos', 'scorm', 'scorm2004', 'aicc', ...
@@ -154,7 +154,7 @@ 
                 }
 
                 if ($row['expired_on'] != '0000-00-00 00:00:00') {
-                    $this->expired_on  = $row['expired_on'];
+                    $this->expired_on = $row['expired_on'];
                 }
                 if ($this->type == 2) {
                     if ($row['force_commit'] == 1) {
@@ -198,12 +198,12 @@ 
                 ORDER BY view_count DESC";
         $res = Database::query($sql);
         if ($this->debug > 2) {
-            error_log('New LP - learnpath::__construct() ' . __LINE__ . ' - querying lp_view: ' . $sql, 0);
+            error_log('New LP - learnpath::__construct() '.__LINE__.' - querying lp_view: '.$sql, 0);
         }
 
         if (Database :: num_rows($res) > 0) {
             if ($this->debug > 2) {
-                error_log('New LP - learnpath::__construct() ' . __LINE__ . ' - Found previous view', 0);
+                error_log('New LP - learnpath::__construct() '.__LINE__.' - Found previous view', 0);
             }
             $row = Database :: fetch_array($res);
             $this->attempt = $row['view_count'];
@@ -213,7 +213,7 @@ 
             $this->lp_view_session_id = $row['session_id'];
         } else if (!api_is_invitee()) {
             if ($this->debug > 2) {
-                error_log('New LP - learnpath::__construct() ' . __LINE__ . ' - NOT Found previous view', 0);
+                error_log('New LP - learnpath::__construct() '.__LINE__.' - NOT Found previous view', 0);
             }
             $this->attempt = 1;
             $params = [
@@ -228,7 +228,7 @@ 
             $this->lp_view_id = Database::insert_id();
 
             if ($this->debug > 2) {
-                error_log('New LP - learnpath::__construct() ' . __LINE__ . ' - inserting new lp_view: ' . $sql, 0);
+                error_log('New LP - learnpath::__construct() '.__LINE__.' - inserting new lp_view: '.$sql, 0);
             }
 
             $sql = "UPDATE $lp_table SET id = iid WHERE iid = ".$this->lp_view_id;
@@ -243,7 +243,7 @@ 
         $res = Database::query($sql);
 
         if ($this->debug > 2) {
-            error_log('New LP - learnpath::__construct() ' . __LINE__ . ' - query lp items: ' . $sql, 0);
+            error_log('New LP - learnpath::__construct() '.__LINE__.' - query lp items: '.$sql, 0);
             error_log('-- Start while--', 0);
         }
 
@@ -263,8 +263,8 @@ 
                         $this->refs_list[$oItem->ref] = $my_item_id;
                         if ($this->debug > 2) {
                             error_log(
-                                'New LP - learnpath::__construct() - ' .
-                                'aicc object with id ' . $my_item_id .
+                                'New LP - learnpath::__construct() - '.
+                                'aicc object with id '.$my_item_id.
                                 ' set in items[]',
                                 0
                             );
@@ -283,19 +283,19 @@ 
 
                         $this->refs_list[$oItem->ref] = $my_item_id;
                         if ($this->debug > 2) {
-                            error_log('New LP - object with id ' . $my_item_id . ' set in items[]', 0);
+                            error_log('New LP - object with id '.$my_item_id.' set in items[]', 0);
                         }
                     }
                     break;
                 case 1:
                 default:
                     if ($this->debug > 2) {
-                        error_log('New LP - learnpath::__construct() ' . __LINE__ . ' - calling learnpathItem', 0);
+                        error_log('New LP - learnpath::__construct() '.__LINE__.' - calling learnpathItem', 0);
                     }
                     $oItem = new learnpathItem($row['id'], $user_id, $course_id, $row);
 
                     if ($this->debug > 2) {
-                        error_log('New LP - learnpath::__construct() ' . __LINE__ . ' - end calling learnpathItem', 0);
+                        error_log('New LP - learnpath::__construct() '.__LINE__.' - end calling learnpathItem', 0);
                     }
                     if (is_object($oItem)) {
                         $my_item_id = $oItem->get_id();
@@ -306,8 +306,8 @@ 
                         $this->refs_list[$my_item_id] = $my_item_id;
                         if ($this->debug > 2) {
                             error_log(
-                                'New LP - learnpath::__construct() ' . __LINE__ .
-                                ' - object with id ' . $my_item_id . ' set in items[]',
+                                'New LP - learnpath::__construct() '.__LINE__.
+                                ' - object with id '.$my_item_id.' set in items[]',
                                 0);
                         }
                     }
@@ -325,13 +325,13 @@ 
                 $this->items[$row['id']]->set_lp_view($this->lp_view_id, $course_id);
                 if ($this->items[$row['id']]->get_type() == TOOL_HOTPOTATOES) {
                     $this->items[$row['id']]->current_start_time = 0;
-                    $this->items[$row['id']]->current_stop_time	= 0;
+                    $this->items[$row['id']]->current_stop_time = 0;
                 }
             }
         }
 
         if ($this->debug > 2) {
-            error_log('New LP - learnpath::__construct() ' . __LINE__ . ' ----- end while ----', 0);
+            error_log('New LP - learnpath::__construct() '.__LINE__.' ----- end while ----', 0);
         }
 
         if (!empty($lp_item_id_list)) {
@@ -423,7 +423,7 @@ 
         // TODO: Define the current item better.
         $this->first();
         if ($this->debug > 2) {
-            error_log('New LP - learnpath::__construct() ' . __LINE__ . ' - End of learnpath constructor for learnpath ' . $this->get_id(), 0);
+            error_log('New LP - learnpath::__construct() '.__LINE__.' - End of learnpath constructor for learnpath '.$this->get_id(), 0);
         }
         return true;
     }
@@ -500,7 +500,7 @@ 
     ) {
         $course_id = $this->course_info['real_id'];
         if ($this->debug > 0) {
-            error_log('New LP - In learnpath::add_item(' . $parent . ',' . $previous . ',' . $type . ',' . $id . ',' . $title . ')', 0);
+            error_log('New LP - In learnpath::add_item('.$parent.','.$previous.','.$type.','.$id.','.$title.')', 0);
         }
         if (empty($course_id)) {
             // Sometimes Oogie doesn't catch the course info but sets $this->cc
@@ -522,7 +522,7 @@ 
                 FROM $tbl_lp_item
                 WHERE
                     c_id = $course_id AND
-                    lp_id = " . $this->get_id() . " AND
+                    lp_id = ".$this->get_id()." AND
                     parent_item_id = " . $parent;
 
         $res_count = Database::query($sql);
@@ -532,11 +532,11 @@ 
         if ($num > 0) {
             if ($previous == 0) {
                 $sql = "SELECT id, next_item_id, display_order
-                        FROM " . $tbl_lp_item . "
+                        FROM " . $tbl_lp_item."
                         WHERE
                             c_id = $course_id AND
-                            lp_id = " . $this->get_id() . " AND
-                            parent_item_id = " . $parent . " AND
+                            lp_id = ".$this->get_id()." AND
+                            parent_item_id = " . $parent." AND
                             previous_item_id = 0 OR
                             previous_item_id=" . $parent;
                 $result = Database::query($sql);
@@ -551,7 +551,7 @@ 
 						FROM $tbl_lp_item
                         WHERE
                             c_id = $course_id AND
-                            lp_id = " . $this->get_id() . " AND
+                            lp_id = ".$this->get_id()." AND
                             id = " . $previous;
 
                 $result = Database::query($sql);
@@ -571,8 +571,8 @@ 
         $typeCleaned = Database::escape_string($type);
         if ($type == 'quiz') {
             $sql = 'SELECT SUM(ponderation)
-                    FROM ' . Database :: get_course_table(TABLE_QUIZ_QUESTION) . ' as quiz_question
-                    INNER JOIN  ' . Database :: get_course_table(TABLE_QUIZ_TEST_QUESTION) . ' as quiz_rel_question
+                    FROM ' . Database :: get_course_table(TABLE_QUIZ_QUESTION).' as quiz_question
+                    INNER JOIN  ' . Database :: get_course_table(TABLE_QUIZ_TEST_QUESTION).' as quiz_rel_question
                     ON
                         quiz_question.id = quiz_rel_question.question_id AND
                         quiz_question.c_id = quiz_rel_question.c_id
@@ -618,7 +618,7 @@ 
         $new_item_id = Database::insert($tbl_lp_item, $params);
 
         if ($this->debug > 2) {
-            error_log('New LP - Inserting chapter: ' . $new_item_id, 0);
+            error_log('New LP - Inserting chapter: '.$new_item_id, 0);
         }
 
         if ($new_item_id) {
@@ -635,28 +635,28 @@ 
             Database::query($sql);
 
             // Update all the items after the new item.
-            $sql = "UPDATE " . $tbl_lp_item . "
+            $sql = "UPDATE ".$tbl_lp_item."
                         SET display_order = display_order + 1
                     WHERE
                         c_id = $course_id AND
-                        lp_id = " . $this->get_id() . " AND
-                        id <> " . $new_item_id . " AND
-                        parent_item_id = " . $parent . " AND
+                        lp_id = ".$this->get_id()." AND
+                        id <> " . $new_item_id." AND
+                        parent_item_id = " . $parent." AND
                         display_order > " . $display_order;
             Database::query($sql);
 
             // Update the item that should come after the new item.
-            $sql = "UPDATE " . $tbl_lp_item . "
-                    SET ref = " . $new_item_id . "
-                    WHERE c_id = $course_id AND id = " . $new_item_id;
+            $sql = "UPDATE ".$tbl_lp_item."
+                    SET ref = " . $new_item_id."
+                    WHERE c_id = $course_id AND id = ".$new_item_id;
             Database::query($sql);
 
             // Upload audio.
             if (!empty($_FILES['mp3']['name'])) {
                 // Create the audio folder if it does not exist yet.
-                $filepath = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document/';
-                if (!is_dir($filepath . 'audio')) {
-                    mkdir($filepath . 'audio', api_get_permissions_for_new_directories());
+                $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+                if (!is_dir($filepath.'audio')) {
+                    mkdir($filepath.'audio', api_get_permissions_for_new_directories());
                     $audio_id = add_document(
                         $_course,
                         '/audio',
@@ -699,7 +699,7 @@ 
                 $file_path = handle_uploaded_document(
                     $_course,
                     $_FILES['mp3'],
-                    api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document',
+                    api_get_path(SYS_COURSE_PATH).$_course['path'].'/document',
                     '/audio',
                     $userId,
                     '',
@@ -715,8 +715,8 @@ 
 
                 // Store the mp3 file in the lp_item table.
                 $sql = "UPDATE $tbl_lp_item SET
-                            audio = '" . Database::escape_string($file) . "'
-                        WHERE id = '" . intval($new_item_id) . "'";
+                            audio = '".Database::escape_string($file)."'
+                        WHERE id = '" . intval($new_item_id)."'";
                 Database::query($sql);
             }
         }
@@ -795,7 +795,7 @@ 
         while (Database :: num_rows($res_name)) {
             // There is already one such name, update the current one a bit.
             $i++;
-            $name = $name . ' - ' . $i;
+            $name = $name.' - '.$i;
             $check_name = "SELECT * FROM $tbl_lp WHERE c_id = $course_id AND name = '$name'";
             $res_name = Database::query($check_name);
         }
@@ -907,7 +907,7 @@ 
                 // if $item points to an object and there is a parent.
                 if ($debug) {
                     error_log(
-                        'Autocompleting parent of item ' . $item . ' "'.$currentItem->get_title().'" (item ' . $parent_id . ' "'.$parent->get_title().'") ',
+                        'Autocompleting parent of item '.$item.' "'.$currentItem->get_title().'" (item '.$parent_id.' "'.$parent->get_title().'") ',
                         0
                     );
                 }
@@ -935,7 +935,7 @@ 
                         if ($childItemId != $item) {
                             if ($debug) {
                                 error_log(
-                                    'Looking at brother #'.$childItemId . ' "' . $childItem->get_title() . '", status is ' . $childItem->get_status(),
+                                    'Looking at brother #'.$childItemId.' "'.$childItem->get_title().'", status is '.$childItem->get_status(),
                                     0
                                 );
                             }
@@ -955,7 +955,7 @@ 
                             } else {
                                 if ($debug > 2) {
                                     error_log(
-                                        'Found one incomplete child of parent #' . $parent_id . ': child #'.$childItemId . ' "' . $childItem->get_title() . '", is ' . $childItem->get_status().' db_item_view_id:#'.$childItem->db_item_view_id,
+                                        'Found one incomplete child of parent #'.$parent_id.': child #'.$childItemId.' "'.$childItem->get_title().'", is '.$childItem->get_status().' db_item_view_id:#'.$childItem->db_item_view_id,
                                         0
                                     );
                                 }
@@ -1060,15 +1060,15 @@ 
         // Delete lp item id.
         foreach ($this->items as $id => $dummy) {
             $sql = "DELETE FROM $lp_item_view
-                    WHERE c_id = $course_id AND lp_item_id = '" . $id . "'";
+                    WHERE c_id = $course_id AND lp_item_id = '".$id."'";
             Database::query($sql);
         }
 
         // Proposed by Christophe (nickname: clefevre)
-        $sql = "DELETE FROM $lp_item WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
+        $sql = "DELETE FROM $lp_item WHERE c_id = ".$course_id." AND lp_id = ".$this->lp_id;
         Database::query($sql);
 
-        $sql = "DELETE FROM $lp_view WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
+        $sql = "DELETE FROM $lp_view WHERE c_id = ".$course_id." AND lp_id = ".$this->lp_id;
         Database::query($sql);
 
         self::toggle_publish($this->lp_id, 'i');
@@ -1076,32 +1076,32 @@ 
         if ($this->type == 2 || $this->type == 3) {
             // This is a scorm learning path, delete the files as well.
             $sql = "SELECT path FROM $lp
-                    WHERE c_id = ".$course_id." AND id = " . $this->lp_id;
+                    WHERE c_id = ".$course_id." AND id = ".$this->lp_id;
             $res = Database::query($sql);
             if (Database :: num_rows($res) > 0) {
                 $row = Database :: fetch_array($res);
                 $path = $row['path'];
                 $sql = "SELECT id FROM $lp
-                        WHERE c_id = ".$course_id." AND path = '$path' AND id != " . $this->lp_id;
+                        WHERE c_id = ".$course_id." AND path = '$path' AND id != ".$this->lp_id;
                 $res = Database::query($sql);
                 if (Database :: num_rows($res) > 0) { // Another learning path uses this directory, so don't delete it.
                     if ($this->debug > 2) {
-                        error_log('New LP - In learnpath::delete(), found other LP using path ' . $path . ', keeping directory', 0);
+                        error_log('New LP - In learnpath::delete(), found other LP using path '.$path.', keeping directory', 0);
                     }
                 } else {
                     // No other LP uses that directory, delete it.
-                    $course_rel_dir = api_get_course_path() . '/scorm/'; // scorm dir web path starting from /courses
-                    $course_scorm_dir = api_get_path(SYS_COURSE_PATH) . $course_rel_dir; // The absolute system path for this course.
-                    if ($delete == 'remove' && is_dir($course_scorm_dir . $path) and !empty ($course_scorm_dir)) {
+                    $course_rel_dir = api_get_course_path().'/scorm/'; // scorm dir web path starting from /courses
+                    $course_scorm_dir = api_get_path(SYS_COURSE_PATH).$course_rel_dir; // The absolute system path for this course.
+                    if ($delete == 'remove' && is_dir($course_scorm_dir.$path) and !empty ($course_scorm_dir)) {
                         if ($this->debug > 2) {
-                            error_log('New LP - In learnpath::delete(), found SCORM, deleting directory: ' . $course_scorm_dir . $path, 0);
+                            error_log('New LP - In learnpath::delete(), found SCORM, deleting directory: '.$course_scorm_dir.$path, 0);
                         }
                         // Proposed by Christophe (clefevre).
                         if (strcmp(substr($path, -2), "/.") == 0) {
                             $path = substr($path, 0, -1); // Remove "." at the end.
                         }
                         //exec('rm -rf ' . $course_scorm_dir . $path); // See Bug #5208, this is not OS-portable way.
-                        rmdirr($course_scorm_dir . $path);
+                        rmdirr($course_scorm_dir.$path);
                     }
                 }
             }
@@ -1114,7 +1114,7 @@ 
                 WHERE c_id = ".$course_id." AND (link LIKE '$link%' AND image='scormbuilder.gif')";
         Database::query($sql);
 
-        $sql = "DELETE FROM $lp WHERE c_id = ".$course_id." AND id = " . $this->lp_id;
+        $sql = "DELETE FROM $lp WHERE c_id = ".$course_id." AND id = ".$this->lp_id;
         Database::query($sql);
         // Updates the display order of all lps.
         $this->update_display_order();
@@ -1127,7 +1127,7 @@ 
             api_get_user_id()
         );
 
-        $link_info = GradebookUtils::is_resource_in_course_gradebook(api_get_course_id(), 4 , $id, api_get_session_id());
+        $link_info = GradebookUtils::is_resource_in_course_gradebook(api_get_course_id(), 4, $id, api_get_session_id());
         if ($link_info !== false) {
             GradebookUtils::remove_resource_from_course_gradebook($link_info['id']);
         }
@@ -1147,7 +1147,7 @@ 
     {
         $course_id = $this->course_info['real_id'];
         if ($this->debug > 0) {
-            error_log('New LP - In learnpath::delete_children_items(' . $id . ')', 0);
+            error_log('New LP - In learnpath::delete_children_items('.$id.')', 0);
         }
         $num = 0;
         if (empty ($id) || $id != strval(intval($id))) {
@@ -1158,7 +1158,7 @@ 
         $res = Database::query($sql);
         while ($row = Database :: fetch_array($res)) {
             $num += $this->delete_children_items($row['id']);
-            $sql_del = "DELETE FROM $lp_item WHERE c_id = ".$course_id." AND id = " . $row['id'];
+            $sql_del = "DELETE FROM $lp_item WHERE c_id = ".$course_id." AND id = ".$row['id'];
             Database::query($sql_del);
             $num++;
         }
@@ -1199,12 +1199,12 @@ 
         // Delete children items.
         $num = $this->delete_children_items($id);
         if ($this->debug > 2) {
-            error_log('New LP - learnpath::delete_item() - deleted ' . $num . ' children of element ' . $id, 0);
+            error_log('New LP - learnpath::delete_item() - deleted '.$num.' children of element '.$id, 0);
         }
         // Now delete the item.
         $sql_del = "DELETE FROM $lp_item WHERE c_id = $course_id AND id = $id";
         if ($this->debug > 2) {
-            error_log('New LP - Deleting item: ' . $sql_del, 0);
+            error_log('New LP - Deleting item: '.$sql_del, 0);
         }
         Database::query($sql_del);
         // Now update surrounding items.
@@ -1279,15 +1279,15 @@ 
         }
 
         $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
-        $sql_select = "SELECT * FROM " . $tbl_lp_item . " WHERE c_id = ".$course_id." AND id = " . $id;
+        $sql_select = "SELECT * FROM ".$tbl_lp_item." WHERE c_id = ".$course_id." AND id = ".$id;
         $res_select = Database::query($sql_select);
         $row_select = Database :: fetch_array($res_select);
         $audio_update_sql = '';
         if (is_array($audio) && !empty ($audio['tmp_name']) && $audio['error'] === 0) {
             // Create the audio folder if it does not exist yet.
-            $filepath = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document/';
-            if (!is_dir($filepath . 'audio')) {
-                mkdir($filepath . 'audio', api_get_permissions_for_new_directories());
+            $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+            if (!is_dir($filepath.'audio')) {
+                mkdir($filepath.'audio', api_get_permissions_for_new_directories());
                 $audio_id = add_document(
                     $_course,
                     '/audio',
@@ -1325,11 +1325,11 @@ 
             $pi = pathinfo($audio['name']);
             if ($pi['extension'] == 'mp3') {
                 $c_det = api_get_course_info($this->cc);
-                $bp = api_get_path(SYS_COURSE_PATH) . $c_det['path'] . '/document';
+                $bp = api_get_path(SYS_COURSE_PATH).$c_det['path'].'/document';
                 $path = handle_uploaded_document($c_det, $audio, $bp, '/audio', api_get_user_id(), 0, null, 0, 'rename', false, 0);
                 $path = substr($path, 7);
                 // Update reference in lp_item - audio path is the path from inside de document/audio/ dir.
-                $audio_update_sql = ", audio = '" . Database::escape_string($path) . "' ";
+                $audio_update_sql = ", audio = '".Database::escape_string($path)."' ";
             }
         }
 
@@ -1339,13 +1339,13 @@ 
         // TODO: htmlspecialchars to be checked for encoding related problems.
         if ($same_parent && $same_previous) {
             // Only update title and description.
-            $sql = "UPDATE " . $tbl_lp_item . "
-                    SET title = '" . Database::escape_string($title) . "',
-                        prerequisite = '" . $prerequisites . "',
-                        description = '" . Database::escape_string($description) . "'
-                        " . $audio_update_sql . ",
-                        max_time_allowed = '" . Database::escape_string($max_time_allowed) . "'
-                    WHERE c_id = ".$course_id." AND id = " . $id;
+            $sql = "UPDATE ".$tbl_lp_item."
+                    SET title = '" . Database::escape_string($title)."',
+                        prerequisite = '" . $prerequisites."',
+                        description = '" . Database::escape_string($description)."'
+                        " . $audio_update_sql.",
+                        max_time_allowed = '" . Database::escape_string($max_time_allowed)."'
+                    WHERE c_id = ".$course_id." AND id = ".$id;
             Database::query($sql);
         } else {
             $old_parent = $row_select['parent_item_id'];
@@ -1360,27 +1360,27 @@ 
 
             if ($old_previous != 0) {
                 // Next
-                $sql = "UPDATE " . $tbl_lp_item . "
-                        SET next_item_id = " . $old_next . "
-                        WHERE c_id = ".$course_id." AND id = " . $old_previous;
+                $sql = "UPDATE ".$tbl_lp_item."
+                        SET next_item_id = " . $old_next."
+                        WHERE c_id = ".$course_id." AND id = ".$old_previous;
                 Database::query($sql);
             }
 
             if ($old_next != 0) {
                 // Previous
-                $sql = "UPDATE " . $tbl_lp_item . "
-                        SET previous_item_id = " . $old_previous . "
-                        WHERE c_id = ".$course_id." AND id = " . $old_next;
+                $sql = "UPDATE ".$tbl_lp_item."
+                        SET previous_item_id = " . $old_previous."
+                        WHERE c_id = ".$course_id." AND id = ".$old_next;
                 Database::query($sql);
             }
 
             // display_order - 1 for every item with a display_order bigger then the display_order of the current item.
-            $sql = "UPDATE " . $tbl_lp_item . "
+            $sql = "UPDATE ".$tbl_lp_item."
                     SET display_order = display_order - 1
                     WHERE
                         c_id = ".$course_id." AND
-                        display_order > " . $old_order . " AND
-                        lp_id = " . $this->lp_id . " AND
+                        display_order > " . $old_order." AND
+                        lp_id = " . $this->lp_id." AND
                         parent_item_id = " . $old_parent;
             Database::query($sql);
             /* END -- virtually remove the current item id */
@@ -1390,11 +1390,11 @@ 
             if ($previous == 0) {
                 // Select the data of the item that should come after the current item.
                 $sql = "SELECT id, display_order
-                        FROM " . $tbl_lp_item . "
+                        FROM " . $tbl_lp_item."
                         WHERE
                             c_id = ".$course_id." AND
-                            lp_id = " . $this->lp_id . " AND
-                            parent_item_id = " . $parent . " AND
+                            lp_id = " . $this->lp_id." AND
+                            parent_item_id = " . $parent." AND
                             previous_item_id = " . $previous;
                 $res_select_old = Database::query($sql);
                 $row_select_old = Database::fetch_array($res_select_old);
@@ -1410,8 +1410,8 @@ 
             } else {
                 // Select the data of the item that should come before the current item.
                 $sql = "SELECT next_item_id, display_order
-                        FROM " . $tbl_lp_item . "
-                        WHERE c_id = ".$course_id." AND id = " . $previous;
+                        FROM " . $tbl_lp_item."
+                        WHERE c_id = ".$course_id." AND id = ".$previous;
                 $res_select_old = Database::query($sql);
                 $row_select_old = Database :: fetch_array($res_select_old);
                 $new_next = $row_select_old['next_item_id'];
@@ -1420,57 +1420,57 @@ 
 
             // TODO: htmlspecialchars to be checked for encoding related problems.
             // Update the current item with the new data.
-            $sql = "UPDATE " . $tbl_lp_item . "
+            $sql = "UPDATE ".$tbl_lp_item."
                     SET
-                        title = '" . Database::escape_string($title) . "',
-                        description = '" . Database::escape_string($description) . "',
-                        parent_item_id = " . $parent . ",
-                        previous_item_id = " . $previous . ",
-                        next_item_id = " . $new_next . ",
-                        display_order = " . $new_order . "
-                        " . $audio_update_sql . "
-                    WHERE c_id = ".$course_id." AND id = " . $id;
+                        title = '" . Database::escape_string($title)."',
+                        description = '" . Database::escape_string($description)."',
+                        parent_item_id = " . $parent.",
+                        previous_item_id = " . $previous.",
+                        next_item_id = " . $new_next.",
+                        display_order = " . $new_order."
+                        " . $audio_update_sql."
+                    WHERE c_id = ".$course_id." AND id = ".$id;
             Database::query($sql);
 
             if ($previous != 0) {
                 // Update the previous item's next_item_id.
-                $sql = "UPDATE " . $tbl_lp_item . "
-                        SET next_item_id = " . $id . "
-                        WHERE c_id = ".$course_id." AND id = " . $previous;
+                $sql = "UPDATE ".$tbl_lp_item."
+                        SET next_item_id = " . $id."
+                        WHERE c_id = ".$course_id." AND id = ".$previous;
                 Database::query($sql);
             }
 
             if ($new_next != 0) {
                 // Update the next item's previous_item_id.
-                $sql = "UPDATE " . $tbl_lp_item . "
-                        SET previous_item_id = " . $id . "
-                        WHERE c_id = ".$course_id." AND id = " . $new_next;
+                $sql = "UPDATE ".$tbl_lp_item."
+                        SET previous_item_id = " . $id."
+                        WHERE c_id = ".$course_id." AND id = ".$new_next;
                 Database::query($sql);
             }
 
             if ($old_prerequisite != $prerequisites) {
-                $sql = "UPDATE " . $tbl_lp_item . "
-                        SET prerequisite = '" . $prerequisites . "'
-                        WHERE c_id = ".$course_id." AND id = " . $id;
+                $sql = "UPDATE ".$tbl_lp_item."
+                        SET prerequisite = '" . $prerequisites."'
+                        WHERE c_id = ".$course_id." AND id = ".$id;
                 Database::query($sql);
             }
 
             if ($old_max_time_allowed != $max_time_allowed) {
                 // update max time allowed
-                $sql = "UPDATE " . $tbl_lp_item . "
-                        SET max_time_allowed = " . $max_time_allowed . "
-                        WHERE c_id = ".$course_id." AND id = " . $id;
+                $sql = "UPDATE ".$tbl_lp_item."
+                        SET max_time_allowed = " . $max_time_allowed."
+                        WHERE c_id = ".$course_id." AND id = ".$id;
                 Database::query($sql);
             }
 
             // Update all the items with the same or a bigger display_order than the current item.
-            $sql = "UPDATE " . $tbl_lp_item . "
+            $sql = "UPDATE ".$tbl_lp_item."
                     SET display_order = display_order + 1
                     WHERE
                        c_id = ".$course_id." AND
-                       lp_id = " . $this->get_id() . " AND
-                       id <> " . $id . " AND
-                       parent_item_id = " . $parent . " AND
+                       lp_id = " . $this->get_id()." AND
+                       id <> " . $id." AND
+                       parent_item_id = " . $parent." AND
                        display_order >= " . $new_order;
 
             Database::query($sql);
@@ -1496,7 +1496,7 @@ 
     {
         $course_id = api_get_course_int_id();
         if ($this->debug > 0) {
-            error_log('New LP - In learnpath::edit_item_prereq(' . $id . ',' . $prerequisite_id . ',' . $mastery_score . ',' . $max_score . ')', 0);
+            error_log('New LP - In learnpath::edit_item_prereq('.$id.','.$prerequisite_id.','.$mastery_score.','.$max_score.')', 0);
         }
 
         if (empty($id) || ($id != strval(intval($id))) || empty ($prerequisite_id)) {
@@ -1594,8 +1594,8 @@ 
             error_log('New LP - In learnpath::get_brother_chapters()', 0);
         }
 
-        if (empty($id)|| $id != strval(intval($id))) {
-            return array ();
+        if (empty($id) || $id != strval(intval($id))) {
+            return array();
         }
 
         $lp_item = Database :: get_course_table(TABLE_LP_ITEM);
@@ -1613,13 +1613,13 @@ 
                             item_type='dokeos_chapter'
                         ORDER BY display_order";
             $res_bros = Database::query($sql_bros);
-            $list = array ();
+            $list = array();
             while ($row_bro = Database :: fetch_array($res_bros)) {
                 $list[] = $row_bro;
             }
             return $list;
         }
-        return array ();
+        return array();
     }
 
     /**
@@ -1632,11 +1632,11 @@ 
     {
         $course_id = api_get_course_int_id();
         if ($this->debug > 0) {
-            error_log('New LP - In learnpath::get_brother_items(' . $id . ')', 0);
+            error_log('New LP - In learnpath::get_brother_items('.$id.')', 0);
         }
 
         if (empty ($id) || $id != strval(intval($id))) {
-            return array ();
+            return array();
         }
 
         $lp_item = Database :: get_course_table(TABLE_LP_ITEM);
@@ -1648,13 +1648,13 @@ 
             $sql_bros = "SELECT * FROM $lp_item WHERE c_id = ".$course_id." AND parent_item_id = $parent
                          ORDER BY display_order";
             $res_bros = Database::query($sql_bros);
-            $list = array ();
+            $list = array();
             while ($row_bro = Database :: fetch_array($res_bros)) {
                 $list[] = $row_bro;
             }
             return $list;
         }
-        return array ();
+        return array();
     }
 
     /**
@@ -1724,7 +1724,7 @@ 
             $current = $this->current;
         }
         if ($this->debug > 2) {
-            error_log('New LP - In learnpath::get_current_item_id() - Returning ' . $current, 0);
+            error_log('New LP - In learnpath::get_current_item_id() - Returning '.$current, 0);
         }
         return $current;
     }
@@ -1805,7 +1805,7 @@ 
         ) {
 
             if ($this->debug > 2) {
-                error_log('New LP - In learnpath::first() - Last item seen is ' . $this->last_item_seen.' of type '.$this->items[$this->last_item_seen]->get_type(), 0);
+                error_log('New LP - In learnpath::first() - Last item seen is '.$this->last_item_seen.' of type '.$this->items[$this->last_item_seen]->get_type(), 0);
             }
             $index = -1;
             foreach ($this->ordered_items as $myindex => $item_id) {
@@ -1817,7 +1817,7 @@ 
             if ($index == -1) {
                 // Index hasn't changed, so item not found - panic (this shouldn't happen).
                 if ($this->debug > 2) {
-                    error_log('New LP - Last item (' . $this->last_item_seen . ') was found in items but not in ordered_items, panic!', 0);
+                    error_log('New LP - Last item ('.$this->last_item_seen.') was found in items but not in ordered_items, panic!', 0);
                 }
                 return false;
             } else {
@@ -1832,7 +1832,7 @@ 
             $index = 0;
             // Loop through all ordered items and stop at the first item that is
             // not a directory *and* that has not been completed yet.
-            while ( !empty($this->ordered_items[$index]) AND
+            while (!empty($this->ordered_items[$index]) AND
                 is_a($this->items[$this->ordered_items[$index]], 'learnpathItem') AND
                 (
                     $this->items[$this->ordered_items[$index]]->get_type() == 'dir' OR
@@ -1846,14 +1846,14 @@ 
             $this->current  = isset($this->ordered_items[$index]) ? $this->ordered_items[$index] : null;
             $this->index    = $index;
             if ($this->debug > 2) {
-                error_log('$index ' . $index);
+                error_log('$index '.$index);
             }
             if ($this->debug > 2) {
-                error_log('New LP - In learnpath::first() - No last item seen. New last = ' . $this->last . '(' . $this->ordered_items[$index] . ')', 0);
+                error_log('New LP - In learnpath::first() - No last item seen. New last = '.$this->last.'('.$this->ordered_items[$index].')', 0);
             }
         }
         if ($this->debug > 2) {
-            error_log('New LP - In learnpath::first() - First item is ' . $this->get_current_item_id());
+            error_log('New LP - In learnpath::first() - First item is '.$this->get_current_item_id());
         }
     }
 
@@ -1866,7 +1866,7 @@ 
     public function get_js_info($item_id = '')
     {
         if ($this->debug > 0) {
-            error_log('New LP - In learnpath::get_js_info(' . $item_id . ')', 0);
+            error_log('New LP - In learnpath::get_js_info('.$item_id.')', 0);
         }
 
         $info = '';
@@ -1876,17 +1876,17 @@ 
             //if item is defined, return values from DB
             $oItem = $this->items[$item_id];
             $info .= '<script language="javascript">';
-            $info .= "top.set_score(" . $oItem->get_score() . ");\n";
-            $info .= "top.set_max(" . $oItem->get_max() . ");\n";
-            $info .= "top.set_min(" . $oItem->get_min() . ");\n";
-            $info .= "top.set_lesson_status('" . $oItem->get_status() . "');";
-            $info .= "top.set_session_time('" . $oItem->get_scorm_time('js') . "');";
-            $info .= "top.set_suspend_data('" . $oItem->get_suspend_data() . "');";
-            $info .= "top.set_saved_lesson_status('" . $oItem->get_status() . "');";
+            $info .= "top.set_score(".$oItem->get_score().");\n";
+            $info .= "top.set_max(".$oItem->get_max().");\n";
+            $info .= "top.set_min(".$oItem->get_min().");\n";
+            $info .= "top.set_lesson_status('".$oItem->get_status()."');";
+            $info .= "top.set_session_time('".$oItem->get_scorm_time('js')."');";
+            $info .= "top.set_suspend_data('".$oItem->get_suspend_data()."');";
+            $info .= "top.set_saved_lesson_status('".$oItem->get_status()."');";
             $info .= "top.set_flag_synchronized();";
             $info .= '</script>';
             if ($this->debug > 2) {
-                error_log('New LP - in learnpath::get_js_info(' . $item_id . ') - returning: ' . $info, 0);
+                error_log('New LP - in learnpath::get_js_info('.$item_id.') - returning: '.$info, 0);
             }
             return $info;
 
@@ -1894,17 +1894,17 @@ 
 
             // If item_id is empty, just update to default SCORM data.
             $info .= '<script language="javascript">';
-            $info .= "top.set_score(" . learnpathItem :: get_score() . ");\n";
-            $info .= "top.set_max(" . learnpathItem :: get_max() . ");\n";
-            $info .= "top.set_min(" . learnpathItem :: get_min() . ");\n";
-            $info .= "top.set_lesson_status('" . learnpathItem :: get_status() . "');";
-            $info .= "top.set_session_time('" . learnpathItem :: getScormTimeFromParameter('js') . "');";
-            $info .= "top.set_suspend_data('" . learnpathItem :: get_suspend_data() . "');";
-            $info .= "top.set_saved_lesson_status('" . learnpathItem :: get_status() . "');";
+            $info .= "top.set_score(".learnpathItem :: get_score().");\n";
+            $info .= "top.set_max(".learnpathItem :: get_max().");\n";
+            $info .= "top.set_min(".learnpathItem :: get_min().");\n";
+            $info .= "top.set_lesson_status('".learnpathItem :: get_status()."');";
+            $info .= "top.set_session_time('".learnpathItem :: getScormTimeFromParameter('js')."');";
+            $info .= "top.set_suspend_data('".learnpathItem :: get_suspend_data()."');";
+            $info .= "top.set_saved_lesson_status('".learnpathItem :: get_status()."');";
             $info .= "top.set_flag_synchronized();";
             $info .= '</script>';
             if ($this->debug > 2) {
-                error_log('New LP - in learnpath::get_js_info(' . $item_id . ') - returning: ' . $info, 0);
+                error_log('New LP - in learnpath::get_js_info('.$item_id.') - returning: '.$info, 0);
             }
             return $info;
         }
@@ -1958,12 +1958,12 @@ 
      * Gets the navigation bar for the learnpath display screen
      * @return	string	The HTML string to use as a navigation bar
      */
-    public function get_navigation_bar($idBar = null, $display=null) {
+    public function get_navigation_bar($idBar = null, $display = null) {
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::get_navigation_bar()', 0);
         }
-        if(empty($idBar)){
-            $idBar='control-top';
+        if (empty($idBar)) {
+            $idBar = 'control-top';
         }
         /* if(empty($display)){
             $display='display:block';
@@ -1976,16 +1976,16 @@ 
             $navbar = '
                   <span id="'.$idBar.'" class="buttons">
                     <a class="icon-toolbar" href="lp_controller.php?action=stats&'.api_get_cidreq(true).'&lp_id='.$lp_id.'" onclick="window.parent.API.save_asset();return true;" target="content_name" title="stats" id="stats_link">
-                        <span class="fa fa-info"></span><span class="sr-only">' . get_lang('Reporting') . '</span>
+                        <span class="fa fa-info"></span><span class="sr-only">' . get_lang('Reporting').'</span>
                     </a>
-                    <a class="icon-toolbar" id="scorm-previous" href="#" onclick="switch_item(' . $mycurrentitemid . ',\'previous\');return false;" title="previous">
-                        <span class="fa fa-chevron-left"></span><span class="sr-only">' . get_lang('ScormPrevious') . '</span>
+                    <a class="icon-toolbar" id="scorm-previous" href="#" onclick="switch_item(' . $mycurrentitemid.',\'previous\');return false;" title="previous">
+                        <span class="fa fa-chevron-left"></span><span class="sr-only">' . get_lang('ScormPrevious').'</span>
                     </a>
-                    <a class="icon-toolbar" id="scorm-next" href="#" onclick="switch_item(' . $mycurrentitemid . ',\'next\');return false;" title="next">
-                        <span class="fa fa-chevron-right"></span><span class="sr-only">' . get_lang('ScormNext') . '</span>
+                    <a class="icon-toolbar" id="scorm-next" href="#" onclick="switch_item(' . $mycurrentitemid.',\'next\');return false;" title="next">
+                        <span class="fa fa-chevron-right"></span><span class="sr-only">' . get_lang('ScormNext').'</span>
                     </a>
                     <a class="icon-toolbar" id="view-embedded" href="lp_controller.php?action=mode&mode=embedded" target="_top" title="embedded mode">
-                        <span class="fa fa-columns"></span><span class="sr-only">' . get_lang('ScormExitFullScreen') . '</span>
+                        <span class="fa fa-columns"></span><span class="sr-only">' . get_lang('ScormExitFullScreen').'</span>
                     </a>
                   </span>';
 
@@ -1993,13 +1993,13 @@ 
             $navbar = '
                 <span id="'.$idBar.'" class="buttons text-right">
                     <a class="icon-toolbar" href="lp_controller.php?action=stats&'.api_get_cidreq(true).'&lp_id='.$lp_id.'" onclick="window.parent.API.save_asset();return true;" target="content_name" title="stats" id="stats_link">
-                        <span class="fa fa-info"></span><span class="sr-only">' . get_lang('Reporting') . '</span>
+                        <span class="fa fa-info"></span><span class="sr-only">' . get_lang('Reporting').'</span>
                     </a>
-                    <a class="icon-toolbar" id="scorm-previous" href="#" onclick="switch_item(' . $mycurrentitemid . ',\'previous\');return false;" title="previous">
-                        <span class="fa fa-chevron-left"></span><span class="sr-only">' . get_lang('ScormPrevious') . '</span>
+                    <a class="icon-toolbar" id="scorm-previous" href="#" onclick="switch_item(' . $mycurrentitemid.',\'previous\');return false;" title="previous">
+                        <span class="fa fa-chevron-left"></span><span class="sr-only">' . get_lang('ScormPrevious').'</span>
                     </a>
-                    <a class="icon-toolbar" id="scorm-next" href="#" onclick="switch_item(' . $mycurrentitemid . ',\'next\');return false;" title="next">
-                        <span class="fa fa-chevron-right"></span><span class="sr-only">' . get_lang('ScormNext') . '</span>
+                    <a class="icon-toolbar" id="scorm-next" href="#" onclick="switch_item(' . $mycurrentitemid.',\'next\');return false;" title="next">
+                        <span class="fa fa-chevron-right"></span><span class="sr-only">' . get_lang('ScormNext').'</span>
                     </a>
                 </span>';
         }
@@ -2020,11 +2020,11 @@ 
         $index = $this->index;
         $index++;
         if ($this->debug > 2) {
-            error_log('New LP - Now looking at ordered_items[' . ($index) . '] - type is ' . $this->items[$this->ordered_items[$index]]->type, 0);
+            error_log('New LP - Now looking at ordered_items['.($index).'] - type is '.$this->items[$this->ordered_items[$index]]->type, 0);
         }
         while (!empty ($this->ordered_items[$index]) AND ($this->items[$this->ordered_items[$index]]->get_type() == 'dir' || $this->items[$this->ordered_items[$index]]->get_type() == 'dokeos_chapter') AND $index < $this->max_ordered_items) {
             $index++;
-            if ($index == $this->max_ordered_items){
+            if ($index == $this->max_ordered_items) {
                 if ($this->items[$this->ordered_items[$index]]->get_type() == 'dir' || $this->items[$this->ordered_items[$index]]->get_type() == 'dokeos_chapter') {
                     return $this->index;
                 } else {
@@ -2036,7 +2036,7 @@ 
             return $this->index;
         }
         if ($this->debug > 2) {
-            error_log('New LP - index is now ' . $index, 0);
+            error_log('New LP - index is now '.$index, 0);
         }
         return $index;
     }
@@ -2054,7 +2054,7 @@ 
         if (!empty ($new_index)) {
             if (isset ($this->ordered_items[$new_index])) {
                 if ($this->debug > 2) {
-                    error_log('New LP - In learnpath::get_next_index() - Returning ' . $this->ordered_items[$new_index], 0);
+                    error_log('New LP - In learnpath::get_next_index() - Returning '.$this->ordered_items[$new_index], 0);
                 }
                 return $this->ordered_items[$new_index];
             }
@@ -2096,7 +2096,7 @@ 
         }
 
         // Filename without its extension.
-        $file_base_name = str_replace('.' . $extension, '', $filename);
+        $file_base_name = str_replace('.'.$extension, '', $filename);
 
         $zipFile = new PclZip($file_path);
         // Check the zip content (real size and file extension).
@@ -2120,7 +2120,7 @@ 
                     break; // Exit the foreach loop.
                 } elseif (
                     preg_match('/aicc\//i', $thisContent['filename']) ||
-                    in_array(strtolower(pathinfo($thisContent['filename'], PATHINFO_EXTENSION)), array( 'crs','au','des','cst'))
+                    in_array(strtolower(pathinfo($thisContent['filename'], PATHINFO_EXTENSION)), array('crs', 'au', 'des', 'cst'))
                 ) {
                     $ext = strtolower(pathinfo($thisContent['filename'], PATHINFO_EXTENSION));
                     switch ($ext) {
@@ -2162,7 +2162,7 @@ 
             error_log('New LP - In learnpath::get_previous_index()', 0);
         }
         $index = $this->index;
-        if (isset ($this->ordered_items[$index -1])) {
+        if (isset ($this->ordered_items[$index - 1])) {
             $index--;
             while (isset($this->ordered_items[$index]) && ($this->items[$this->ordered_items[$index]]->get_type() == 'dir' || $this->items[$this->ordered_items[$index]]->get_type() == 'dokeos_chapter')) {
                 $index--;
@@ -2172,7 +2172,7 @@ 
             }
         } else {
             if ($this->debug > 2) {
-                error_log('New LP - get_previous_index() - there was no previous index available, reusing ' . $index, 0);
+                error_log('New LP - get_previous_index() - there was no previous index available, reusing '.$index, 0);
             }
             // There is no previous item.
         }
@@ -2215,8 +2215,8 @@ 
     {
         $course_id = api_get_course_int_id();
         $_course = api_get_course_info();
-        $tbl_lp_item 		= Database :: get_course_table(TABLE_LP_ITEM);
-        $tbl_lp_item_view 	= Database :: get_course_table(TABLE_LP_ITEM_VIEW);
+        $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
+        $tbl_lp_item_view = Database :: get_course_table(TABLE_LP_ITEM_VIEW);
 
         // Getting all the information about the item.
         $sql = "SELECT * FROM ".$tbl_lp_item." as lp
@@ -2227,7 +2227,7 @@ 
                     lp.c_id = $course_id AND
                     lp_view.c_id = $course_id";
         $result = Database::query($sql);
-        $row 	= Database::fetch_assoc($result);
+        $row = Database::fetch_assoc($result);
         $output = '';
 
         if (!empty ($row['audio'])) {
@@ -2235,8 +2235,8 @@ 
             $list = $_SESSION['oLP']->get_toc();
             $type_quiz = false;
 
-            foreach($list as $toc) {
-                if ($toc['id'] == $_SESSION['oLP']->current && ($toc['type']=='quiz') ) {
+            foreach ($list as $toc) {
+                if ($toc['id'] == $_SESSION['oLP']->current && ($toc['type'] == 'quiz')) {
                     $type_quiz = true;
                 }
             }
@@ -2299,7 +2299,7 @@ 
         $courseCode = null,
         $sessionId = null
     ) {
-        $lp_id = (int)$lp_id;
+        $lp_id = (int) $lp_id;
         $courseInfo = api_get_course_info($courseCode);
         $sessionId = intval($sessionId);
 
@@ -2465,10 +2465,10 @@ 
      */
     public static function get_progress_bar($percentage = -1, $text_add = '')
     {
-        $text = $percentage . $text_add;
+        $text = $percentage.$text_add;
         $output = '<div class="progress">
-                        <div id="progress_bar_value" class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="' .$percentage. '" aria-valuemin="0" aria-valuemax="100" style="width: '.$text.';">
-                        '. $text .'
+                        <div id="progress_bar_value" class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="' .$percentage.'" aria-valuemin="0" aria-valuemax="100" style="width: '.$text.';">
+                        '. $text.'
                         </div>
                     </div>';
 
@@ -2504,16 +2504,16 @@ 
         }
         $total_items = $this->get_total_items_count_without_chapters();
         if ($this->debug > 2) {
-            error_log('New LP - Total items available in this learnpath: ' . $total_items, 0);
+            error_log('New LP - Total items available in this learnpath: '.$total_items, 0);
         }
         $completeItems = $this->get_complete_items_count();
         if ($this->debug > 2) {
-            error_log('New LP - Items completed so far: ' . $completeItems, 0);
+            error_log('New LP - Items completed so far: '.$completeItems, 0);
         }
         if ($add != 0) {
             $completeItems += $add;
             if ($this->debug > 2) {
-                error_log('New LP - Items completed so far (+modifier): ' . $completeItems, 0);
+                error_log('New LP - Items completed so far (+modifier): '.$completeItems, 0);
             }
         }
         $text = '';
@@ -2531,7 +2531,7 @@ 
             $text = '%';
         } elseif ($mode == 'abs') {
             $percentage = $completeItems;
-            $text = '/' . $total_items;
+            $text = '/'.$total_items;
         }
 
         return array(
@@ -2727,7 +2727,7 @@ 
                 // and replace them, one by one, by the internal IDs (chamilo db)
                 // TODO: Modify the '*' replacement to replace the multiplier in front of it
                 // by a space as well.
-                $find = array (
+                $find = array(
                     '&',
                     '|',
                     '~',
@@ -2739,7 +2739,7 @@ 
                     '(',
                     ')'
                 );
-                $replace = array (
+                $replace = array(
                     ' ',
                     ' ',
                     ' ',
@@ -2756,7 +2756,7 @@ 
                 foreach ($ids as $id) {
                     $id = trim($id);
                     if (isset ($this->refs_list[$id])) {
-                        $prereq = preg_replace('/[^a-zA-Z_0-9](' . $id . ')[^a-zA-Z_0-9]/', 'ITEM_' . $this->refs_list[$id], $prereq);
+                        $prereq = preg_replace('/[^a-zA-Z_0-9]('.$id.')[^a-zA-Z_0-9]/', 'ITEM_'.$this->refs_list[$id], $prereq);
                     }
                 }
 
@@ -2864,9 +2864,9 @@ 
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::get_items_status_list()', 0);
         }
-        $list = array ();
+        $list = array();
         foreach ($this->ordered_items as $item_id) {
-            $list[] = array (
+            $list[] = array(
                 $item_id => $this->items[$item_id]->get_status()
             );
         }
@@ -2920,7 +2920,7 @@ 
         $res = Database::query($sql);
         $num = Database :: num_rows($res);
         if ($num > 0) {
-            $list[] = array (
+            $list[] = array(
                 'order_id' => api_htmlentities(get_lang('Order'), ENT_QUOTES),
                 'id' => api_htmlentities(get_lang('InteractionID'), ENT_QUOTES),
                 'type' => api_htmlentities(get_lang('Type'), ENT_QUOTES),
@@ -2931,7 +2931,7 @@ 
                 'latency' => api_htmlentities(get_lang('LatencyTimeSpent'), ENT_QUOTES)
             );
             while ($row = Database :: fetch_array($res)) {
-                $list[] = array (
+                $list[] = array(
                     'order_id' => ($row['order_id'] + 1),
                     'id' => urldecode($row['interaction_id']), //urldecode because they often have %2F or stuff like that
                     'type' => $row['interaction_type'],
@@ -2999,7 +2999,7 @@ 
                 'status' => api_htmlentities(get_lang('ObjectiveStatus'), ENT_QUOTES)
             );
             while ($row = Database :: fetch_array($res)) {
-                $list[] = array (
+                $list[] = array(
                     'order_id' => ($row['order_id'] + 1),
                     'objective_id' => urldecode($row['objective_id']), // urldecode() because they often have %2F or stuff like that.
                     'score_raw' => $row['score_raw'],
@@ -3026,10 +3026,10 @@ 
         $toc = array();
         foreach ($this->ordered_items as $item_id) {
             if ($this->debug > 2) {
-                error_log('learnpath::get_toc(): getting info for item ' . $item_id, 0);
+                error_log('learnpath::get_toc(): getting info for item '.$item_id, 0);
             }
             // TODO: Change this link generation and use new function instead.
-            $toc[] = array (
+            $toc[] = array(
                 'id'            => $item_id,
                 'title'         => $this->items[$item_id]->get_title(),
                 'status'        => $this->items[$item_id]->get_status(),
@@ -3040,7 +3040,7 @@ 
             );
         }
         if ($this->debug > 2) {
-            error_log('New LP - In learnpath::get_toc() - TOC array: ' . print_r($toc, true), 0);
+            error_log('New LP - In learnpath::get_toc() - TOC array: '.print_r($toc, true), 0);
         }
         return $toc;
     }
@@ -3057,10 +3057,10 @@ 
         }
         $toc = $varname.' = new Array();';
         foreach ($this->ordered_items as $item_id) {
-            $toc.= $varname."['i$item_id'] = '".$this->items[$item_id]->get_type()."';";
+            $toc .= $varname."['i$item_id'] = '".$this->items[$item_id]->get_type()."';";
         }
         if ($this->debug > 2) {
-            error_log('New LP - In learnpath::get_items_details_as_js() - TOC array: ' . print_r($toc, true), 0);
+            error_log('New LP - In learnpath::get_items_details_as_js() - TOC array: '.print_r($toc, true), 0);
         }
         return $toc;
     }
@@ -3084,7 +3084,7 @@ 
             }
         }
         if ($this->debug > 2) {
-            error_log('New LP - In learnpath::get_type() - Returning ' . ($res ? $res : 'false'), 0);
+            error_log('New LP - In learnpath::get_type() - Returning '.($res ? $res : 'false'), 0);
         }
         return $res;
     }
@@ -3100,7 +3100,7 @@ 
         $tbl_lp = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = intval($lp_id);
         $sql = "SELECT lp_type FROM $tbl_lp
-                WHERE c_id = $course_id AND id = '" . $lp_id . "'";
+                WHERE c_id = $course_id AND id = '".$lp_id."'";
         $res = Database::query($sql);
         if ($res === false) {
             return null;
@@ -3213,7 +3213,7 @@ 
             $dirTypes = self::getChapterTypes();
 
             if (in_array($item['type'], $dirTypes)) {
-                $scorm_color_background ='scorm_item_section ';
+                $scorm_color_background = 'scorm_item_section ';
                 $style_item = '';
             }
             if ($item['id'] == $this->current) {
@@ -3222,7 +3222,7 @@ 
                 $scorm_color_background = 'scorm_item_normal '.$scorm_color_background.' ';
             }
 
-            $html .= '<div id="toc_' . $item['id'] . '" class="' . $scorm_color_background . ' '.$class_name[$item['status']].' ">';
+            $html .= '<div id="toc_'.$item['id'].'" class="'.$scorm_color_background.' '.$class_name[$item['status']].' ">';
 
             // Learning path title
             $title = $item['title'];
@@ -3252,7 +3252,7 @@ 
                 $html .= stripslashes($title);
             } else {
                 $this->get_link('http', $item['id'], $toc_list);
-                $html .= '<a class="items-list" href="#" onclick="switch_item(' .$mycurrentitemid . ',' .$item['id'] . ');' .'return false;" >' . stripslashes($title) . '</a>';
+                $html .= '<a class="items-list" href="#" onclick="switch_item('.$mycurrentitemid.','.$item['id'].');'.'return false;" >'.stripslashes($title).'</a>';
             }
             $html .= "</div>";
 
@@ -3286,12 +3286,12 @@ 
             if ($this->get_lp_session_id() == api_get_session_id()) {
                 $html .= '<div id="actions_lp" class="actions_lp"><hr>';
                 $html .= '<div class="btn-group">';
-                $html .= "<a class='btn btn-sm btn-default' href='lp_controller.php?" . api_get_cidreq()."&gradebook=$gradebook&action=build&lp_id=" . $this->lp_id . "&isStudentView=false' target='_parent'>" .
-                    Display::returnFontAwesomeIcon('street-view') . get_lang('Overview') . "</a>";
-                $html .= "<a class='btn btn-sm btn-default' href='lp_controller.php?" . api_get_cidreq()."&action=add_item&type=step&lp_id=" . $this->lp_id . "&isStudentView=false' target='_parent'>" .
-                    Display::returnFontAwesomeIcon('pencil') . get_lang('Edit') . "</a>";
-                $html .= '<a class="btn btn-sm btn-default" href="lp_controller.php?'.api_get_cidreq()."&gradebook=$gradebook&action=edit&lp_id=" . $this->lp_id.'&isStudentView=false">' .
-                    Display::returnFontAwesomeIcon('cog') . get_lang('Settings').'</a>';
+                $html .= "<a class='btn btn-sm btn-default' href='lp_controller.php?".api_get_cidreq()."&gradebook=$gradebook&action=build&lp_id=".$this->lp_id."&isStudentView=false' target='_parent'>".
+                    Display::returnFontAwesomeIcon('street-view').get_lang('Overview')."</a>";
+                $html .= "<a class='btn btn-sm btn-default' href='lp_controller.php?".api_get_cidreq()."&action=add_item&type=step&lp_id=".$this->lp_id."&isStudentView=false' target='_parent'>".
+                    Display::returnFontAwesomeIcon('pencil').get_lang('Edit')."</a>";
+                $html .= '<a class="btn btn-sm btn-default" href="lp_controller.php?'.api_get_cidreq()."&gradebook=$gradebook&action=edit&lp_id=".$this->lp_id.'&isStudentView=false">'.
+                    Display::returnFontAwesomeIcon('cog').get_lang('Settings').'</a>';
                 $html .= '</div>';
                 $html .= '</div>';
             }
@@ -3342,11 +3342,11 @@ 
         $course_id = $this->get_course_int_id();
 
         if ($this->debug > 0) {
-            error_log('New LP - In learnpath::get_link(' . $type . ',' . $item_id . ')', 0);
+            error_log('New LP - In learnpath::get_link('.$type.','.$item_id.')', 0);
         }
         if (empty($item_id)) {
             if ($this->debug > 2) {
-                error_log('New LP - In learnpath::get_link() - no item id given in learnpath::get_link(), using current: ' . $this->get_current_item_id(), 0);
+                error_log('New LP - In learnpath::get_link() - no item id given in learnpath::get_link(), using current: '.$this->get_current_item_id(), 0);
             }
             $item_id = $this->get_current_item_id();
         }
@@ -3378,7 +3378,7 @@ 
                     ON (li.lp_id = l.id AND l.c_id = $course_id AND li.c_id = $course_id )
         		WHERE li.id = $item_id ";
         if ($this->debug > 2) {
-            error_log('New LP - In learnpath::get_link() - selecting item ' . $sql, 0);
+            error_log('New LP - In learnpath::get_link() - selecting item '.$sql, 0);
         }
         $res = Database::query($sql);
         if (Database :: num_rows($res) > 0) {
@@ -3392,9 +3392,9 @@ 
             if (empty($lp_item_params) && strpos($lp_item_path, '?') !== false) {
                 list($lp_item_path, $lp_item_params) = explode('?', $lp_item_path);
             }
-            $sys_course_path = api_get_path(SYS_COURSE_PATH) . api_get_course_path();
+            $sys_course_path = api_get_path(SYS_COURSE_PATH).api_get_course_path();
             if ($type == 'http') {
-                $course_path = api_get_path(WEB_COURSE_PATH) . api_get_course_path(); //web path
+                $course_path = api_get_path(WEB_COURSE_PATH).api_get_course_path(); //web path
             } else {
                 $course_path = $sys_course_path; //system path
             }
@@ -3405,8 +3405,8 @@ 
             }
 
             if ($this->debug > 2) {
-                error_log('New LP - In learnpath::get_link() - $lp_type ' . $lp_type, 0);
-                error_log('New LP - In learnpath::get_link() - $lp_item_type ' . $lp_item_type, 0);
+                error_log('New LP - In learnpath::get_link() - $lp_type '.$lp_type, 0);
+                error_log('New LP - In learnpath::get_link() - $lp_item_type '.$lp_item_type, 0);
             }
 
             // Now go through the specific cases to get the end of the path
@@ -3425,7 +3425,7 @@ 
                         );
 
                         if ($this->debug > 0) {
-                            error_log('rl_get_resource_link_for_learnpath - file: ' . $file, 0);
+                            error_log('rl_get_resource_link_for_learnpath - file: '.$file, 0);
                         }
 
                         if ($lp_item_type == 'link') {
@@ -3445,7 +3445,7 @@ 
                                     $linkProtocol = substr($file, 0, 5);
                                     if ($linkProtocol === 'http:') {
                                         //this is the special intervention case
-                                        $file = api_get_path(WEB_CODE_PATH).'newscorm/embed.php?type=nonhttps&source=' .  urlencode($file);
+                                        $file = api_get_path(WEB_CODE_PATH).'newscorm/embed.php?type=nonhttps&source='.urlencode($file);
                                     }
                                 }
                             }
@@ -3485,8 +3485,8 @@ 
                                 $sql = "SELECT count(*) FROM $lp_item_view_table
                                         WHERE
                                             c_id = $course_id AND
-                                            lp_item_id='" . $lp_item_id . "' AND
-                                            lp_view_id ='" . $lp_view_id . "' AND
+                                            lp_item_id='".$lp_item_id."' AND
+                                            lp_view_id ='" . $lp_view_id."' AND
                                             status='completed'";
                                 $result = Database::query($sql);
                                 $row_count = Database :: fetch_row($result);
@@ -3495,7 +3495,7 @@ 
                                 if ($prevent_reinit === 1 && $count_item_view > 0) {
                                     $not_multiple_attempt = 1;
                                 }
-                                $file .= '&not_multiple_attempt=' . $not_multiple_attempt;
+                                $file .= '&not_multiple_attempt='.$not_multiple_attempt;
                             }
 
                             $tmp_array = explode('/', $file);
@@ -3508,7 +3508,7 @@ 
                     break;
                 case 2 :
                     if ($this->debug > 2) {
-                        error_log('New LP - In learnpath::get_link() ' . __LINE__ . ' - Item type: ' . $lp_item_type, 0);
+                        error_log('New LP - In learnpath::get_link() '.__LINE__.' - Item type: '.$lp_item_type, 0);
                     }
 
                     if ($lp_item_type != 'dir') {
@@ -3522,19 +3522,19 @@ 
                         //if ($this->prerequisites_match($item_id)) {
                         if (preg_match('#^[a-zA-Z]{2,5}://#', $lp_item_path) != 0) {
                             if ($this->debug > 2) {
-                                error_log('New LP - In learnpath::get_link() ' . __LINE__ . ' - Found match for protocol in ' . $lp_item_path, 0);
+                                error_log('New LP - In learnpath::get_link() '.__LINE__.' - Found match for protocol in '.$lp_item_path, 0);
                             }
                             // Distant url, return as is.
                             $file = $lp_item_path;
                         } else {
                             if ($this->debug > 2) {
-                                error_log('New LP - In learnpath::get_link() ' . __LINE__ . ' - No starting protocol in ' . $lp_item_path, 0);
+                                error_log('New LP - In learnpath::get_link() '.__LINE__.' - No starting protocol in '.$lp_item_path, 0);
                             }
                             // Prevent getting untranslatable urls.
                             $lp_item_path = preg_replace('/%2F/', '/', $lp_item_path);
                             $lp_item_path = preg_replace('/%3A/', ':', $lp_item_path);
                             // Prepare the path.
-                            $file = $course_path . '/scorm/' . $lp_path . '/' . $lp_item_path;
+                            $file = $course_path.'/scorm/'.$lp_path.'/'.$lp_item_path;
                             // TODO: Fix this for urls with protocol header.
                             $file = str_replace('//', '/', $file);
                             $file = str_replace(':/', '://', $file);
@@ -3542,11 +3542,11 @@ 
                                 $lp_path = substr($lp_path, 0, -1);
                             }
 
-                            if (!is_file(realpath($sys_course_path . '/scorm/' . $lp_path . '/' . $lp_item_path))) {
+                            if (!is_file(realpath($sys_course_path.'/scorm/'.$lp_path.'/'.$lp_item_path))) {
                                 // if file not found.
                                 $decoded = html_entity_decode($lp_item_path);
                                 list ($decoded) = explode('?', $decoded);
-                                if (!is_file(realpath($sys_course_path . '/scorm/' . $lp_path . '/' . $decoded))) {
+                                if (!is_file(realpath($sys_course_path.'/scorm/'.$lp_path.'/'.$decoded))) {
                                     require_once 'resourcelinker.inc.php';
                                     $file = rl_get_resource_link_for_learnpath(
                                         $course_id,
@@ -3566,14 +3566,14 @@ 
                                         }
                                     }
                                 } else {
-                                    $file = $course_path . '/scorm/' . $lp_path . '/' . $decoded;
+                                    $file = $course_path.'/scorm/'.$lp_path.'/'.$decoded;
                                 }
                             }
                         }
 
                         // We want to use parameters if they were defined in the imsmanifest
                         if (strpos($file, 'blank.php') === false) {
-                            $file .= (strstr($file, '?') === false ? '?' : '') . $lp_item_params;
+                            $file .= (strstr($file, '?') === false ? '?' : '').$lp_item_params;
                         }
                     } else {
                         $file = 'lp_content.php?type=dir';
@@ -3581,12 +3581,12 @@ 
                     break;
                 case 3 :
                     if ($this->debug > 2) {
-                        error_log('New LP - In learnpath::get_link() ' . __LINE__ . ' - Item type: ' . $lp_item_type, 0);
+                        error_log('New LP - In learnpath::get_link() '.__LINE__.' - Item type: '.$lp_item_type, 0);
                     }
                     // Formatting AICC HACP append URL.
-                    $aicc_append = '?aicc_sid=' . urlencode(session_id()) . '&aicc_url=' . urlencode(api_get_path(WEB_CODE_PATH) . 'newscorm/aicc_hacp.php') . '&';
+                    $aicc_append = '?aicc_sid='.urlencode(session_id()).'&aicc_url='.urlencode(api_get_path(WEB_CODE_PATH).'newscorm/aicc_hacp.php').'&';
                     if (!empty($lp_item_params)) {
-                        $aicc_append .= $lp_item_params . '&';
+                        $aicc_append .= $lp_item_params.'&';
                     }
                     if ($lp_item_type != 'dir') {
                         // Quite complex here:
@@ -3598,7 +3598,7 @@ 
 
                         if (preg_match('#^[a-zA-Z]{2,5}://#', $lp_item_path) != 0) {
                             if ($this->debug > 2) {
-                                error_log('New LP - In learnpath::get_link() ' . __LINE__ . ' - Found match for protocol in ' . $lp_item_path, 0);
+                                error_log('New LP - In learnpath::get_link() '.__LINE__.' - Found match for protocol in '.$lp_item_path, 0);
                             }
                             // Distant url, return as is.
                             $file = $lp_item_path;
@@ -3611,19 +3611,19 @@ 
                             if (stripos($file, '<servername>') !== false) {
                                 //$file = str_replace('<servername>',$course_path.'/scorm/'.$lp_path.'/',$lp_item_path);
                                 $web_course_path = str_replace('https://', '', str_replace('http://', '', $course_path));
-                                $file = str_replace('<servername>', $web_course_path . '/scorm/' . $lp_path, $lp_item_path);
+                                $file = str_replace('<servername>', $web_course_path.'/scorm/'.$lp_path, $lp_item_path);
                             }
                             //
                             $file .= $aicc_append;
                         } else {
                             if ($this->debug > 2) {
-                                error_log('New LP - In learnpath::get_link() ' . __LINE__ . ' - No starting protocol in ' . $lp_item_path, 0);
+                                error_log('New LP - In learnpath::get_link() '.__LINE__.' - No starting protocol in '.$lp_item_path, 0);
                             }
                             // Prevent getting untranslatable urls.
                             $lp_item_path = preg_replace('/%2F/', '/', $lp_item_path);
                             $lp_item_path = preg_replace('/%3A/', ':', $lp_item_path);
                             // Prepare the path - lp_path might be unusable because it includes the "aicc" subdir name.
-                            $file = $course_path . '/scorm/' . $lp_path . '/' . $lp_item_path;
+                            $file = $course_path.'/scorm/'.$lp_path.'/'.$lp_item_path;
                             // TODO: Fix this for urls with protocol header.
                             $file = str_replace('//', '/', $file);
                             $file = str_replace(':/', '://', $file);
@@ -3642,7 +3642,7 @@ 
             $file = !empty($file) ? str_replace('&amp;', '&', $file) : '';
         }
         if ($this->debug > 2) {
-            error_log('New LP - In learnpath::get_link() - returning "' . $file . '" from get_link', 0);
+            error_log('New LP - In learnpath::get_link() - returning "'.$file.'" from get_link', 0);
         }
         return $file;
     }
@@ -3660,7 +3660,7 @@ 
         $search = '';
         // Use $attempt_num to enable multi-views management (disabled so far).
         if ($attempt_num != 0 AND intval(strval($attempt_num)) == $attempt_num) {
-            $search = 'AND view_count = ' . $attempt_num;
+            $search = 'AND view_count = '.$attempt_num;
         }
         // When missing $attempt_num, search for a unique lp_view record for this lp and user.
         $lp_view_table = Database :: get_course_table(TABLE_LP_VIEW);
@@ -3670,9 +3670,9 @@ 
 
         $sql = "SELECT id, view_count FROM $lp_view_table
         		WHERE
-        		    c_id = " . $course_id . " AND
-        		    lp_id = " . $this->get_id() . " AND
-        		    user_id = " . $this->get_user_id() . " AND
+        		    c_id = ".$course_id." AND
+        		    lp_id = " . $this->get_id()." AND
+        		    user_id = " . $this->get_user_id()." AND
         		    session_id = $sessionId
         		    $search
                 ORDER BY view_count DESC";
@@ -3683,7 +3683,7 @@ 
         } else if (!api_is_invitee()) {
             // There is no database record, create one.
             $sql = "INSERT INTO $lp_view_table (c_id, lp_id,user_id, view_count, session_id) VALUES
-            		($course_id, " . $this->get_id() . "," . $this->get_user_id() . ", 1, $sessionId)";
+            		($course_id, ".$this->get_id().",".$this->get_user_id().", 1, $sessionId)";
             Database::query($sql);
             $id = Database :: insert_id();
             $this->lp_view_id = $id;
@@ -3783,15 +3783,15 @@ 
     {
         $course_id = api_get_course_int_id();
         if ($this->debug > 0) {
-            error_log('New LP - In learnpath::move_item(' . $id . ',' . $direction . ')', 0);
+            error_log('New LP - In learnpath::move_item('.$id.','.$direction.')', 0);
         }
         if (empty($id) || empty($direction)) {
             return false;
         }
         $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
         $sql_sel = "SELECT *
-                    FROM " . $tbl_lp_item . "
-                    WHERE c_id = ".$course_id." AND id = " . $id;
+                    FROM " . $tbl_lp_item."
+                    WHERE c_id = ".$course_id." AND id = ".$id;
         $res_sel = Database::query($sql_sel);
         // Check if elem exists.
         if (Database :: num_rows($res_sel) < 1) {
@@ -3816,7 +3816,7 @@ 
                                  WHERE c_id = ".$course_id." AND id = $previous";
 
                     if ($this->debug > 2) {
-                        error_log('Selecting previous: ' . $sql_sel2, 0);
+                        error_log('Selecting previous: '.$sql_sel2, 0);
                     }
                     $res_sel2 = Database::query($sql_sel2);
                     if (Database :: num_rows($res_sel2) < 1) {
@@ -3869,7 +3869,7 @@ 
                         }
                         Database::query($sql_upd2);
                     }
-                    $display = $display -1;
+                    $display = $display - 1;
                 }
                 break;
             case 'down':
@@ -3880,7 +3880,7 @@ 
                 } else {
                     $sql_sel2 = "SELECT * FROM $tbl_lp_item WHERE c_id = ".$course_id." AND id = $next";
                     if ($this->debug > 2) {
-                        error_log('Selecting next: ' . $sql_sel2, 0);
+                        error_log('Selecting next: '.$sql_sel2, 0);
                     }
                     $res_sel2 = Database::query($sql_sel2);
                     if (Database :: num_rows($res_sel2) < 1) {
@@ -3918,7 +3918,7 @@ 
                                      WHERE c_id = ".$course_id." AND id = $next_next";
                         Database::query($sql_upd2);
                     }
-                    $display = $display +1;
+                    $display = $display + 1;
                 }
                 break;
             default :
@@ -3941,8 +3941,8 @@ 
         $res = Database::query($sql);
         if ($res === false)
             return false;
-        $lps = array ();
-        $lp_order = array ();
+        $lps = array();
+        $lp_order = array();
         $num = Database :: num_rows($res);
         // First check the order is correct, globally (might be wrong because
         // of versions < 1.8.4)
@@ -3952,7 +3952,7 @@ 
                 if ($row['display_order'] != $i) { // If we find a gap in the order, we need to fix it.
                     $need_fix = true;
                     $sql_u = "UPDATE $lp_table SET display_order = $i
-                              WHERE c_id = ".$course_id." AND id = " . $row['id'];
+                              WHERE c_id = ".$course_id." AND id = ".$row['id'];
                     Database::query($sql_u);
                 }
                 $row['display_order'] = $i;
@@ -3965,10 +3965,10 @@ 
             $order = $lps[$lp_id]['display_order'];
             if ($order > 1) { // If it's the first element, no need to move up.
                 $sql_u1 = "UPDATE $lp_table SET display_order = $order
-                           WHERE c_id = ".$course_id." AND id = " . $lp_order[$order - 1];
+                           WHERE c_id = ".$course_id." AND id = ".$lp_order[$order - 1];
                 Database::query($sql_u1);
-                $sql_u2 = "UPDATE $lp_table SET display_order = " . ($order - 1) . "
-                           WHERE c_id = ".$course_id." AND id = " . $lp_id;
+                $sql_u2 = "UPDATE $lp_table SET display_order = ".($order - 1)."
+                           WHERE c_id = ".$course_id." AND id = ".$lp_id;
                 Database::query($sql_u2);
             }
         }
@@ -3989,8 +3989,8 @@ 
         if ($res === false) {
             return false;
         }
-        $lps = array ();
-        $lp_order = array ();
+        $lps = array();
+        $lp_order = array();
         $num = Database :: num_rows($res);
         $max = 0;
         // First check the order is correct, globally (might be wrong because
@@ -4002,7 +4002,7 @@ 
                 if ($row['display_order'] != $i) { // If we find a gap in the order, we need to fix it.
                     $need_fix = true;
                     $sql_u = "UPDATE $lp_table SET display_order = $i
-                              WHERE c_id = ".$course_id." AND id = " . $row['id'];
+                              WHERE c_id = ".$course_id." AND id = ".$row['id'];
                     Database::query($sql_u);
                 }
                 $row['display_order'] = $i;
@@ -4015,10 +4015,10 @@ 
             $order = $lps[$lp_id]['display_order'];
             if ($order < $max) { // If it's the first element, no need to move up.
                 $sql_u1 = "UPDATE $lp_table SET display_order = $order
-                           WHERE c_id = ".$course_id." AND id = " . $lp_order[$order + 1];
+                           WHERE c_id = ".$course_id." AND id = ".$lp_order[$order + 1];
                 Database::query($sql_u1);
-                $sql_u2 = "UPDATE $lp_table SET display_order = " . ($order + 1) . "
-                           WHERE c_id = ".$course_id." AND id = " . $lp_id;
+                $sql_u2 = "UPDATE $lp_table SET display_order = ".($order + 1)."
+                           WHERE c_id = ".$course_id." AND id = ".$lp_id;
                 Database::query($sql_u2);
             }
         }
@@ -4038,15 +4038,15 @@ 
         $this->autocomplete_parents($this->last);
         $new_index = $this->get_next_index();
         if ($this->debug > 2) {
-            error_log('New LP - New index: ' . $new_index, 0);
+            error_log('New LP - New index: '.$new_index, 0);
         }
         $this->index = $new_index;
         if ($this->debug > 2) {
-            error_log('New LP - Now having orderedlist[' . $new_index . '] = ' . $this->ordered_items[$new_index], 0);
+            error_log('New LP - Now having orderedlist['.$new_index.'] = '.$this->ordered_items[$new_index], 0);
         }
         $this->current = $this->ordered_items[$new_index];
         if ($this->debug > 2) {
-            error_log('New LP - new item id is ' . $this->current . '-' . $this->get_current_item_id(), 0);
+            error_log('New LP - new item id is '.$this->current.'-'.$this->get_current_item_id(), 0);
         }
     }
 
@@ -4110,7 +4110,7 @@ 
             // Clean spaces.
             $prereq_string = str_replace(' ', '', $prereq_string);
             if ($debug > 0) {
-                error_log('Found prereq_string: ' . $prereq_string, 0);
+                error_log('Found prereq_string: '.$prereq_string, 0);
             }
             // Now send to the parse_prereq() function that will check this component's prerequisites.
             $result = $currentItem->parse_prereq(
@@ -4126,12 +4126,12 @@ 
         } else {
             $result = true;
             if ($debug > 1) {
-                error_log('$this->items[' . $itemId . '] was not an object', 0);
+                error_log('$this->items['.$itemId.'] was not an object', 0);
             }
         }
 
         if ($debug > 1) {
-            error_log('End of prerequisites_match(). Error message is now ' . $this->error, 0);
+            error_log('End of prerequisites_match(). Error message is now '.$this->error, 0);
         }
         return $result;
     }
@@ -4197,12 +4197,12 @@ 
             $row = Database :: fetch_array($result);
             $name = domesticate($row['name']);
             if ($set_visibility == 'i') {
-                $s = $name . " " . get_lang('LearnpathNotPublished');
+                $s = $name." ".get_lang('LearnpathNotPublished');
                 $dialogBox = $s;
                 $v = 0;
             }
             if ($set_visibility == 'v') {
-                $s = $name . " " . get_lang('LearnpathPublished');
+                $s = $name." ".get_lang('LearnpathPublished');
                 $dialogBox = $s;
                 $v = 1;
             }
@@ -4285,9 +4285,9 @@ 
         $course_id = api_get_course_int_id();
         $lp_view_table = Database :: get_course_table(TABLE_LP_VIEW);
         $sql = "INSERT INTO $lp_view_table (c_id, lp_id, user_id, view_count, session_id)
-                VALUES ($course_id, " . $this->lp_id . "," . $this->get_user_id() . "," . ($this->attempt + 1) . ", $session_id)";
+                VALUES ($course_id, ".$this->lp_id.",".$this->get_user_id().",".($this->attempt + 1).", $session_id)";
         if ($this->debug > 2) {
-            error_log('New LP - Inserting new lp_view for restart: ' . $sql, 0);
+            error_log('New LP - Inserting new lp_view for restart: '.$sql, 0);
         }
         $res = Database::query($sql);
         $view_id = Database::insert_id();
@@ -4325,10 +4325,10 @@ 
         // TODO: Do a better check on the index pointing to the right item (it is supposed to be working
         // on $ordered_items[] but not sure it's always safe to use with $items[]).
         if ($this->debug > 2) {
-            error_log('New LP - save_current() saving item ' . $this->current, 0);
+            error_log('New LP - save_current() saving item '.$this->current, 0);
         }
         if ($this->debug > 2) {
-            error_log('' . print_r($this->items, true), 0);
+            error_log(''.print_r($this->items, true), 0);
         }
         if (isset($this->items[$this->current]) &&
             is_object($this->items[$this->current])
@@ -4352,7 +4352,7 @@ 
     {
         $debug = $this->debug;
         if ($debug) {
-            error_log('In learnpath::save_item(' . $item_id . ',' . intval($from_outside). ')', 0);
+            error_log('In learnpath::save_item('.$item_id.','.intval($from_outside).')', 0);
         }
         // TODO: Do a better check on the index pointing to the right item (it is supposed to be working
         // on $ordered_items[] but not sure it's always safe to use with $items[]).
@@ -4375,7 +4375,7 @@ 
 
             if ($debug) {
                 error_log('update_queue before:');
-                error_log(print_r($this->update_queue,1));
+                error_log(print_r($this->update_queue, 1));
             }
             $this->autocomplete_parents($item_id);
 
@@ -4383,9 +4383,9 @@ 
             $this->update_queue[$item_id] = $status;
 
             if ($debug) {
-                error_log('get_status(): ' . $status);
+                error_log('get_status(): '.$status);
                 error_log('update_queue after:');
-                error_log(print_r($this->update_queue,1));
+                error_log(print_r($this->update_queue, 1));
             }
             return $res;
         }
@@ -4406,17 +4406,17 @@ 
 
         if (isset($this->current) && !api_is_invitee()) {
             if ($this->debug > 2) {
-                error_log('New LP - Saving current item (' . $this->current . ') for later review', 0);
+                error_log('New LP - Saving current item ('.$this->current.') for later review', 0);
             }
             $sql = "UPDATE $table SET
-                        last_item = " . intval($this->get_current_item_id()). "
+                        last_item = ".intval($this->get_current_item_id())."
                     WHERE
                         c_id = $course_id AND
-                        lp_id = " . $this->get_id() . " AND
+                        lp_id = ".$this->get_id()." AND
                         user_id = " . $this->get_user_id()." ".$session_condition;
 
             if ($this->debug > 2) {
-                error_log('New LP - Saving last item seen : ' . $sql, 0);
+                error_log('New LP - Saving last item seen : '.$sql, 0);
             }
             Database::query($sql);
         }
@@ -4430,7 +4430,7 @@ 
                             progress = $progress
                         WHERE
                             c_id = ".$course_id." AND
-                            lp_id = " . $this->get_id() . " AND
+                            lp_id = " . $this->get_id()." AND
                             user_id = " . $this->get_user_id()." ".$session_condition;
                 // Ignore errors as some tables might not have the progress field just yet.
                 Database::query($sql);
@@ -4446,7 +4446,7 @@ 
     public function set_current_item($item_id = null)
     {
         if ($this->debug > 0) {
-            error_log('New LP - In learnpath::set_current_item(' . $item_id . ')', 0);
+            error_log('New LP - In learnpath::set_current_item('.$item_id.')', 0);
         }
         if (empty ($item_id)) {
             if ($this->debug > 2) {
@@ -4455,7 +4455,7 @@ 
             // Do nothing.
         } else {
             if ($this->debug > 2) {
-                error_log('New LP - New current item given is ' . $item_id . '...', 0);
+                error_log('New LP - New current item given is '.$item_id.'...', 0);
             }
             if (is_numeric($item_id)) {
                 $item_id = intval($item_id);
@@ -4470,10 +4470,10 @@ 
                     }
                 }
                 if ($this->debug > 2) {
-                    error_log('New LP - set_current_item(' . $item_id . ') done. Index is now : ' . $this->index, 0);
+                    error_log('New LP - set_current_item('.$item_id.') done. Index is now : '.$this->index, 0);
                 }
             } else {
-                error_log('New LP - set_current_item(' . $item_id . ') failed. Not a numeric value: ', 0);
+                error_log('New LP - set_current_item('.$item_id.') failed. Not a numeric value: ', 0);
             }
         }
     }
@@ -4498,7 +4498,7 @@ 
             $lp = $this->get_id();
             if ($lp != 0) {
                 $tbl_lp = Database :: get_course_table(TABLE_LP_MAIN);
-                $sql = "UPDATE $tbl_lp SET default_encoding = '$enc' WHERE c_id = ".$course_id." AND id = " . $lp;
+                $sql = "UPDATE $tbl_lp SET default_encoding = '$enc' WHERE c_id = ".$course_id." AND id = ".$lp;
                 $res = Database::query($sql);
                 return $res;
             }
@@ -4522,7 +4522,7 @@ 
 
         if ($lp != 0) {
             $tbl_lp = Database :: get_course_table(TABLE_LP_MAIN);
-            $sql = "UPDATE $tbl_lp SET js_lib = '$lib' WHERE c_id = ".$course_id." AND id = " . $lp;
+            $sql = "UPDATE $tbl_lp SET js_lib = '$lib' WHERE c_id = ".$course_id." AND id = ".$lp;
             $res = Database::query($sql);
             return $res;
         } else {
@@ -4547,10 +4547,10 @@ 
         $course_id = api_get_course_int_id();
         $lp_id = $this->get_id();
         $sql = "UPDATE $lp_table SET
-                content_maker = '" . Database::escape_string($this->maker) . "'
+                content_maker = '".Database::escape_string($this->maker)."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new content_maker : ' . $this->maker, 0);
+            error_log('New LP - lp updated with new content_maker : '.$this->maker, 0);
         }
         Database::query($sql);
         return true;
@@ -4574,10 +4574,10 @@ 
         $lp_id = $this->get_id();
         $course_id = $this->course_info['real_id'];
         $sql = "UPDATE $lp_table SET
-                name = '" . Database::escape_string($this->name). "'
+                name = '".Database::escape_string($this->name)."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new name : ' . $this->name, 0);
+            error_log('New LP - lp updated with new name : '.$this->name, 0);
         }
         $result = Database::query($sql);
         // If the lp is visible on the homepage, change his name there.
@@ -4585,7 +4585,7 @@ 
             $session_id = api_get_session_id();
             $session_condition = api_get_session_condition($session_id);
             $tbl_tool = Database :: get_course_table(TABLE_TOOL_LIST);
-            $link = 'newscorm/lp_controller.php?action=view&lp_id=' . $lp_id.'&id_session='.$session_id;
+            $link = 'newscorm/lp_controller.php?action=view&lp_id='.$lp_id.'&id_session='.$session_id;
             $sql = "UPDATE $tbl_tool SET name = '$this->name'
             	    WHERE
             	        c_id = $course_id AND
@@ -4663,10 +4663,10 @@ 
 
                 // Save it to search engine.
                 foreach ($missing_terms as $term) {
-                    $doc->add_term($prefix . $term, 1);
+                    $doc->add_term($prefix.$term, 1);
                 }
                 foreach ($deprecated_terms as $term) {
-                    $doc->remove_term($prefix . $term);
+                    $doc->remove_term($prefix.$term);
                 }
                 $di->getDb()->replace_document((int) $se_ref['search_did'], $doc);
                 $di->getDb()->flush();
@@ -4691,10 +4691,10 @@ 
         $this->theme = $name;
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = $this->get_id();
-        $sql = "UPDATE $lp_table SET theme = '" . Database::escape_string($this->theme). "'
+        $sql = "UPDATE $lp_table SET theme = '".Database::escape_string($this->theme)."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new theme : ' . $this->theme, 0);
+            error_log('New LP - lp updated with new theme : '.$this->theme, 0);
         }
         Database::query($sql);
 
@@ -4717,10 +4717,10 @@ 
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = $this->get_id();
         $sql = "UPDATE $lp_table SET
-                preview_image = '" . Database::escape_string($this->preview_image). "'
+                preview_image = '".Database::escape_string($this->preview_image)."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new preview image : ' . $this->preview_image, 0);
+            error_log('New LP - lp updated with new preview image : '.$this->preview_image, 0);
         }
         Database::query($sql);
         return true;
@@ -4740,10 +4740,10 @@ 
         $this->author = $name;
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = $this->get_id();
-        $sql = "UPDATE $lp_table SET author = '" . Database::escape_string($name). "'
+        $sql = "UPDATE $lp_table SET author = '".Database::escape_string($name)."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new preview author : ' . $this->author, 0);
+            error_log('New LP - lp updated with new preview author : '.$this->author, 0);
         }
         Database::query($sql);
 
@@ -4761,15 +4761,15 @@ 
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::set_hide_toc_frame()', 0);
         }
-        if (intval($hide) == $hide){
+        if (intval($hide) == $hide) {
             $this->hide_toc_frame = $hide;
             $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
             $lp_id = $this->get_id();
             $sql = "UPDATE $lp_table SET
-                    hide_toc_frame = '" . $this->hide_toc_frame . "'
+                    hide_toc_frame = '".$this->hide_toc_frame."'
                     WHERE c_id = ".$course_id." AND id = '$lp_id'";
             if ($this->debug > 2) {
-                error_log('New LP - lp updated with new preview hide_toc_frame : ' . $this->author, 0);
+                error_log('New LP - lp updated with new preview hide_toc_frame : '.$this->author, 0);
             }
             Database::query($sql);
 
@@ -4796,7 +4796,7 @@ 
         $sql = "UPDATE $lp_table SET prerequisite = '".$this->prerequisite."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new preview requisite : ' . $this->requisite, 0);
+            error_log('New LP - lp updated with new preview requisite : '.$this->requisite, 0);
         }
         Database::query($sql);
         return true;
@@ -4820,10 +4820,10 @@ 
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = $this->get_id();
         $sql = "UPDATE $lp_table SET
-                    content_local = '" . Database::escape_string($name) . "'
+                    content_local = '".Database::escape_string($name)."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new proximity : ' . $this->proximity, 0);
+            error_log('New LP - lp updated with new proximity : '.$this->proximity, 0);
         }
         Database::query($sql);
         return true;
@@ -4857,11 +4857,11 @@ 
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = $this->get_id();
         $sql = "UPDATE $lp_table SET
-                    use_max_score = '" . $this->use_max_score . "'
+                    use_max_score = '".$this->use_max_score."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
 
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new use_max_score : ' . $this->use_max_score, 0);
+            error_log('New LP - lp updated with new use_max_score : '.$this->use_max_score, 0);
         }
         Database::query($sql);
 
@@ -4888,10 +4888,10 @@ 
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = $this->get_id();
         $sql = "UPDATE $lp_table SET
-                expired_on = '" . Database::escape_string($this->expired_on) . "'
+                expired_on = '".Database::escape_string($this->expired_on)."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new expired_on : ' . $this->expired_on, 0);
+            error_log('New LP - lp updated with new expired_on : '.$this->expired_on, 0);
         }
         Database::query($sql);
 
@@ -4917,10 +4917,10 @@ 
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = $this->get_id();
         $sql = "UPDATE $lp_table SET
-                publicated_on = '" . Database::escape_string($this->publicated_on) . "'
+                publicated_on = '".Database::escape_string($this->publicated_on)."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new publicated_on : ' . $this->publicated_on, 0);
+            error_log('New LP - lp updated with new publicated_on : '.$this->publicated_on, 0);
         }
         Database::query($sql);
 
@@ -4940,10 +4940,10 @@ 
         $this->modified_on = api_get_utc_datetime();
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = $this->get_id();
-        $sql = "UPDATE $lp_table SET modified_on = '" . $this->modified_on . "'
+        $sql = "UPDATE $lp_table SET modified_on = '".$this->modified_on."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new expired_on : ' . $this->modified_on, 0);
+            error_log('New LP - lp updated with new expired_on : '.$this->modified_on, 0);
         }
         Database::query($sql);
         return true;
@@ -5014,13 +5014,13 @@ 
 
         if ($this->last != 0 && $this->last != $this->current && is_object($this->items[$this->last])) {
             if ($this->debug > 2) {
-                error_log('New LP - In learnpath::stop_previous_item() - ' . $this->last . ' is object', 0);
+                error_log('New LP - In learnpath::stop_previous_item() - '.$this->last.' is object', 0);
             }
             switch ($this->get_type()) {
                 case '3' :
                     if ($this->items[$this->last]->get_type() != 'au') {
                         if ($this->debug > 2) {
-                            error_log('New LP - In learnpath::stop_previous_item() - ' . $this->last . ' in lp_type 3 is <> au', 0);
+                            error_log('New LP - In learnpath::stop_previous_item() - '.$this->last.' in lp_type 3 is <> au', 0);
                         }
                         $this->items[$this->last]->close();
                         //$this->autocomplete_parents($this->last);
@@ -5033,7 +5033,7 @@ 
                 case '2' :
                     if ($this->items[$this->last]->get_type() != 'sco') {
                         if ($this->debug > 2) {
-                            error_log('New LP - In learnpath::stop_previous_item() - ' . $this->last . ' in lp_type 2 is <> sco', 0);
+                            error_log('New LP - In learnpath::stop_previous_item() - '.$this->last.' in lp_type 2 is <> sco', 0);
                         }
                         $this->items[$this->last]->close();
                         //$this->autocomplete_parents($this->last);
@@ -5047,7 +5047,7 @@ 
                 case '1' :
                 default :
                     if ($this->debug > 2) {
-                        error_log('New LP - In learnpath::stop_previous_item() - ' . $this->last . ' in lp_type 1 is asset', 0);
+                        error_log('New LP - In learnpath::stop_previous_item() - '.$this->last.' in lp_type 1 is asset', 0);
                     }
                     $this->items[$this->last]->close();
                     break;
@@ -5073,7 +5073,7 @@ 
         }
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $sql = "SELECT * FROM $lp_table
-                WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+                WHERE c_id = ".$course_id." AND id = ".$this->get_id();
         $res = Database::query($sql);
         if (Database :: num_rows($res) > 0) {
             $row = Database :: fetch_array($res);
@@ -5094,14 +5094,14 @@ 
                     break;
             }
             $sql = "UPDATE $lp_table SET default_view_mod = '$view_mode'
-                    WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+                    WHERE c_id = ".$course_id." AND id = ".$this->get_id();
             Database::query($sql);
             $this->mode = $view_mode;
 
             return $view_mode;
         } else {
             if ($this->debug > 2) {
-                error_log('New LP - Problem in update_default_view() - could not find LP ' . $this->get_id() . ' in DB', 0);
+                error_log('New LP - Problem in update_default_view() - could not find LP '.$this->get_id().' in DB', 0);
             }
         }
         return -1;
@@ -5119,7 +5119,7 @@ 
         }
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $sql = "SELECT * FROM $lp_table
-                WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+                WHERE c_id = ".$course_id." AND id = ".$this->get_id();
         $res = Database::query($sql);
         if (Database :: num_rows($res) > 0) {
             $row = Database :: fetch_array($res);
@@ -5132,14 +5132,14 @@ 
                 $force_return = true;
             }
             $sql = "UPDATE $lp_table SET force_commit = $force
-                    WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+                    WHERE c_id = ".$course_id." AND id = ".$this->get_id();
             Database::query($sql);
             $this->force_commit = $force_return;
 
             return $force_return;
         } else {
             if ($this->debug > 2) {
-                error_log('New LP - Problem in update_default_scorm_commit() - could not find LP ' . $this->get_id() . ' in DB', 0);
+                error_log('New LP - Problem in update_default_scorm_commit() - could not find LP '.$this->get_id().' in DB', 0);
             }
         }
         return -1;
@@ -5168,7 +5168,7 @@ 
                 if ($row['display_order'] != $i) { // If we find a gap in the order, we need to fix it.
                     $need_fix = true;
                     $sql = "UPDATE $lp_table SET display_order = $i
-                            WHERE c_id = ".$course_id." AND id = " . $row['id'];
+                            WHERE c_id = ".$course_id." AND id = ".$row['id'];
                     Database::query($sql);
                 }
                 $i++;
@@ -5189,7 +5189,7 @@ 
         }
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $sql = "SELECT * FROM $lp_table
-                WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+                WHERE c_id = ".$course_id." AND id = ".$this->get_id();
         $res = Database::query($sql);
         if (Database :: num_rows($res) > 0) {
             $row = Database :: fetch_array($res);
@@ -5200,13 +5200,13 @@ 
                 $force = 1;
             }
             $sql = "UPDATE $lp_table SET prevent_reinit = $force
-                    WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+                    WHERE c_id = ".$course_id." AND id = ".$this->get_id();
             Database::query($sql);
             $this->prevent_reinit = $force;
             return $force;
         } else {
             if ($this->debug > 2) {
-                error_log('New LP - Problem in update_reinit() - could not find LP ' . $this->get_id() . ' in DB', 0);
+                error_log('New LP - Problem in update_reinit() - could not find LP '.$this->get_id().' in DB', 0);
             }
         }
         return -1;
@@ -5222,11 +5222,11 @@ 
     {
         //Set default value for seriousgame_mode
         if (!isset($this->seriousgame_mode)) {
-            $this->seriousgame_mode=0;
+            $this->seriousgame_mode = 0;
         }
         // Set default value for prevent_reinit
         if (!isset($this->prevent_reinit)) {
-            $this->prevent_reinit =1;
+            $this->prevent_reinit = 1;
         }
         if ($this->seriousgame_mode == 1 && $this->prevent_reinit == 1) {
             return 'seriousgame';
@@ -5274,7 +5274,7 @@ 
         $sql = "UPDATE $lp_table SET
                 prevent_reinit = $prevent_reinit ,
                 seriousgame_mode = $sg_mode
-                WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+                WHERE c_id = ".$course_id." AND id = ".$this->get_id();
         $res = Database::query($sql);
         if ($res) {
             return true;
@@ -5326,7 +5326,7 @@ 
             error_log('New LP - In learnpath::set_seriousgame_mode()', 0);
         }
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
-        $sql = "SELECT * FROM $lp_table WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+        $sql = "SELECT * FROM $lp_table WHERE c_id = ".$course_id." AND id = ".$this->get_id();
         $res = Database::query($sql);
         if (Database :: num_rows($res) > 0) {
             $row = Database :: fetch_array($res);
@@ -5337,13 +5337,13 @@ 
                 $force = 1;
             }
             $sql = "UPDATE $lp_table SET seriousgame_mode = $force
-			        WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+			        WHERE c_id = ".$course_id." AND id = ".$this->get_id();
             Database::query($sql);
             $this->seriousgame_mode = $force;
             return $force;
         } else {
             if ($this->debug > 2) {
-                error_log('New LP - Problem in set_seriousgame_mode() - could not find LP ' . $this->get_id() . ' in DB', 0);
+                error_log('New LP - Problem in set_seriousgame_mode() - could not find LP '.$this->get_id().' in DB', 0);
             }
         }
         return -1;
@@ -5361,7 +5361,7 @@ 
         }
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $sql = "SELECT * FROM $lp_table
-                WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+                WHERE c_id = ".$course_id." AND id = ".$this->get_id();
         $res = Database::query($sql);
         if (Database :: num_rows($res) > 0) {
             $row = Database :: fetch_array($res);
@@ -5372,13 +5372,13 @@ 
                 $force = 1;
             }
             $sql = "UPDATE $lp_table SET debug = $force
-                    WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+                    WHERE c_id = ".$course_id." AND id = ".$this->get_id();
             $res = Database::query($sql);
             $this->scorm_debug = $force;
             return $force;
         } else {
             if ($this->debug > 2) {
-                error_log('New LP - Problem in update_scorm_debug() - could not find LP ' . $this->get_id() . ' in DB', 0);
+                error_log('New LP - Problem in update_scorm_debug() - could not find LP '.$this->get_id().' in DB', 0);
             }
         }
         return -1;
@@ -5407,7 +5407,7 @@ 
      * @param int $depth
      * @param array $tmp
      */
-    public function create_tree_array($array, $parent = 0, $depth = -1, $tmp = array ())
+    public function create_tree_array($array, $parent = 0, $depth = -1, $tmp = array())
     {
         if ($this->debug > 1) {
             error_log('New LP - In learnpath::create_tree_array())', 0);
@@ -5493,7 +5493,7 @@ 
 
         // we need to start a form when we want to update all the mp3 files
         if ($update_audio == 'true') {
-            $return .= '<form action="' . api_get_self() . '?cidReq=' . Security :: remove_XSS($_GET['cidReq']) . '&updateaudio=' . Security :: remove_XSS($_GET['updateaudio']) .'&action=' . Security :: remove_XSS($_GET['action']) . '&lp_id=' . $_SESSION['oLP']->lp_id . '" method="post" enctype="multipart/form-data" name="updatemp3" id="updatemp3">';
+            $return .= '<form action="'.api_get_self().'?cidReq='.Security :: remove_XSS($_GET['cidReq']).'&updateaudio='.Security :: remove_XSS($_GET['updateaudio']).'&action='.Security :: remove_XSS($_GET['action']).'&lp_id='.$_SESSION['oLP']->lp_id.'" method="post" enctype="multipart/form-data" name="updatemp3" id="updatemp3">';
         }
         $return .= '<div id="message"></div>';
         if (count($this->items) == 0) {
@@ -5501,14 +5501,14 @@ 
         } else {
             $return_audio = '<table class="data_table">';
             $return_audio .= '<tr>';
-            $return_audio .= '<th width="40%">' . get_lang('Title') . '</th>';
-            $return_audio .= '<th>' . get_lang('Audio') . '</th>';
+            $return_audio .= '<th width="40%">'.get_lang('Title').'</th>';
+            $return_audio .= '<th>'.get_lang('Audio').'</th>';
             $return_audio .= '</tr>';
 
             if ($update_audio != 'true') {
                 $return .= '<div class="col-md-12">';
                 $return .= self::return_new_tree($update_audio);
-                $return .='</div>';
+                $return .= '</div>';
                 $return .= Display::div(Display::url(get_lang('Save'), '#', array('id'=>'listSubmit', 'class'=>'btn btn-primary')), array('style'=>'float:left; margin-top:15px;width:100%'));
             } else {
                 $return_audio .= self::return_new_tree($update_audio);
@@ -5518,7 +5518,7 @@ 
             // We need to close the form when we are updating the mp3 files.
             if ($update_audio == 'true') {
                 $return .= '<div class="footer-audio">';
-                $return .= Display::button('save_audio','<em class="fa fa-file-audio-o"></em> '. get_lang('SaveAudioAndOrganization'),array('class'=>'btn btn-primary','type'=>'submit'));
+                $return .= Display::button('save_audio', '<em class="fa fa-file-audio-o"></em> '.get_lang('SaveAudioAndOrganization'), array('class'=>'btn btn-primary', 'type'=>'submit'));
                 $return .= '</div>';
                 //$return .= '<div><button class="btn btn-primary" type="submit" name="save_audio" id="save_audio">' . get_lang('SaveAudioAndOrganization') . '</button></div>'; // TODO: What kind of language variable is this?
             }
@@ -5539,7 +5539,7 @@ 
     public function return_new_tree($update_audio = 'false', $drop_element_here = false)
     {
         $return = '';
-        $is_allowed_to_edit = api_is_allowed_to_edit(null,true);
+        $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
 
         $course_id = api_get_course_int_id();
         $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
@@ -5587,7 +5587,7 @@ 
 
             // Link for the documents
             if ($arrLP[$i]['item_type'] == 'document') {
-                $url = api_get_self() . '?'.api_get_cidreq().'&action=view_item&mode=preview_document&id=' . $arrLP[$i]['id'] . '&lp_id=' . $this->lp_id;
+                $url = api_get_self().'?'.api_get_cidreq().'&action=view_item&mode=preview_document&id='.$arrLP[$i]['id'].'&lp_id='.$this->lp_id;
                 $title_cut = Display::url(
                     $title_cut,
                     $url,
@@ -5611,14 +5611,14 @@ 
             } else {
                 $oddClass = 'row_even';
             }
-            $return_audio .= '<tr id ="lp_item_'.$arrLP[$i]['id'] .'" class="' . $oddClass . '">';
+            $return_audio .= '<tr id ="lp_item_'.$arrLP[$i]['id'].'" class="'.$oddClass.'">';
 
             $icon_name = str_replace(' ', '', $arrLP[$i]['item_type']);
 
-            if (file_exists('../img/lp_' . $icon_name . '.png')) {
+            if (file_exists('../img/lp_'.$icon_name.'.png')) {
                 $icon = Display::return_icon('lp_'.$icon_name.'.png');
             } else {
-                if (file_exists('../img/lp_' . $icon_name . '.gif')) {
+                if (file_exists('../img/lp_'.$icon_name.'.gif')) {
                     $icon = Display::return_icon('lp_'.$icon_name.'.gif');
                 } else {
                     if ($arrLP[$i]['item_type'] === TOOL_FINAL_ITEM) {
@@ -5630,7 +5630,7 @@ 
             }
 
             // The audio column.
-            $return_audio  .= '<td align="left" style="padding-left:10px;">';
+            $return_audio .= '<td align="left" style="padding-left:10px;">';
             $audio = '';
 
             if (!$update_audio || $update_audio <> 'true') {
@@ -5641,10 +5641,10 @@ 
             } else {
                 $types = self::getChapterTypes();
                 if (!in_array($arrLP[$i]['item_type'], $types)) {
-                    $audio .= '<input type="file" name="mp3file' . $arrLP[$i]['id'] . '" id="mp3file" />';
+                    $audio .= '<input type="file" name="mp3file'.$arrLP[$i]['id'].'" id="mp3file" />';
                     if (!empty ($arrLP[$i]['audio'])) {
                         $audio .= '<br />'.Security::remove_XSS($arrLP[$i]['audio']).'<br />
-                        <input type="checkbox" name="removemp3' . $arrLP[$i]['id'] . '" id="checkbox' . $arrLP[$i]['id'] . '" />' . get_lang('RemoveAudio');
+                        <input type="checkbox" name="removemp3' . $arrLP[$i]['id'].'" id="checkbox'.$arrLP[$i]['id'].'" />'.get_lang('RemoveAudio');
                     }
                 }
             }
@@ -5670,7 +5670,7 @@ 
                 // No edit for this item types
                 if (!in_array($arrLP[$i]['item_type'], array('sco', 'asset', 'final_item'))) {
                     if (!in_array($arrLP[$i]['item_type'], array('dokeos_chapter', 'dokeos_module'))) {
-                        $edit_icon .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=edit_item&view=build&id=' . $arrLP[$i]['id'] . '&lp_id=' . $this->lp_id . '&path_item=' . $arrLP[$i]['path'] . '" class="btn btn-default">';
+                        $edit_icon .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=edit_item&view=build&id='.$arrLP[$i]['id'].'&lp_id='.$this->lp_id.'&path_item='.$arrLP[$i]['path'].'" class="btn btn-default">';
                         $edit_icon .= Display::return_icon('edit.png', get_lang('LearnpathEditModule'), array(), ICON_SIZE_TINY);
                         $edit_icon .= '</a>';
 
@@ -5683,7 +5683,7 @@ 
                                 $this->lp_session_id
                             )
                             ) {
-                                $forumIconUrl = api_get_self() . '?' . api_get_cidreq() . '&' . http_build_query([
+                                $forumIconUrl = api_get_self().'?'.api_get_cidreq().'&'.http_build_query([
                                     'action' => 'dissociate_forum',
                                     'id' => $arrLP[$i]['id'],
                                     'lp_id' => $this->lp_id
@@ -5694,7 +5694,7 @@ 
                                     ['class' => 'btn btn-default lp-btn-dissociate-forum']
                                 );
                             } else {
-                                $forumIconUrl = api_get_self() . '?' . api_get_cidreq() . '&' . http_build_query([
+                                $forumIconUrl = api_get_self().'?'.api_get_cidreq().'&'.http_build_query([
                                     'action' => 'create_forum',
                                     'id' => $arrLP[$i]['id'],
                                     'lp_id' => $this->lp_id
@@ -5707,17 +5707,17 @@ 
                             }
                         }
                     } else {
-                        $edit_icon .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=edit_item&id=' . $arrLP[$i]['id'] . '&lp_id=' . $this->lp_id . '&path_item=' . $arrLP[$i]['path'] . '" class="btn btn-default">';
+                        $edit_icon .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=edit_item&id='.$arrLP[$i]['id'].'&lp_id='.$this->lp_id.'&path_item='.$arrLP[$i]['path'].'" class="btn btn-default">';
                         $edit_icon .= Display::return_icon('edit.png', get_lang('LearnpathEditModule'), array(), ICON_SIZE_TINY);
                         $edit_icon .= '</a>';
                     }
                 }
 
-                $delete_icon .= ' <a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete_item&id=' . $arrLP[$i]['id'] . '&lp_id=' . $this->lp_id . '" onclick="return confirmation(\'' . addslashes($title) . '\');" class="btn btn-default">';
+                $delete_icon .= ' <a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete_item&id='.$arrLP[$i]['id'].'&lp_id='.$this->lp_id.'" onclick="return confirmation(\''.addslashes($title).'\');" class="btn btn-default">';
                 $delete_icon .= Display::return_icon('delete.png', get_lang('LearnpathDeleteModule'), array(), ICON_SIZE_TINY);
                 $delete_icon .= '</a>';
 
-                $url = api_get_self() . '?'.api_get_cidreq().'&view=build&id='.$arrLP[$i]['id'] .'&lp_id='.$this->lp_id;
+                $url = api_get_self().'?'.api_get_cidreq().'&view=build&id='.$arrLP[$i]['id'].'&lp_id='.$this->lp_id;
 
                 if (!in_array($arrLP[$i]['item_type'], array('dokeos_chapter', 'dokeos_module', 'dir'))) {
                     $prerequisities_icon = Display::url(Display::return_icon('accept.png', get_lang('LearnpathPrerequisites'), array(), ICON_SIZE_TINY), $url.'&action=edit_item_prereq', ['class' => 'btn btn-default']);
@@ -5726,8 +5726,8 @@ 
                 }
             }
             if ($update_audio != 'true') {
-                $row = $move_icon . ' ' . $icon .
-                    Display::span($title_cut) .
+                $row = $move_icon.' '.$icon.
+                    Display::span($title_cut).
                     Display::tag(
                         'div',
                         "<div class=\"btn-group btn-group-xs\">$audio $edit_icon $forumIcon $prerequisities_icon $move_item_icon $audio_icon $delete_icon</div>",
@@ -5748,8 +5748,8 @@ 
                 $parent_arrays = array();
                 if ($arrLP[$i]['depth'] > 1) {
                     //Getting list of parents
-                    for($j = 0; $j < $arrLP[$i]['depth']; $j++) {
-                        foreach($arrLP as $item) {
+                    for ($j = 0; $j < $arrLP[$i]['depth']; $j++) {
+                        foreach ($arrLP as $item) {
                             if ($item['id'] == $parent_id) {
                                 if ($item['parent_item_id'] == 0) {
                                     $parent_id = $item['id'];
@@ -5771,8 +5771,8 @@ 
                     $parent_arrays = array_reverse($parent_arrays);
                     $val = '$elements';
                     $x = 0;
-                    foreach($parent_arrays as $item) {
-                        if ($x != count($parent_arrays) -1) {
+                    foreach ($parent_arrays as $item) {
+                        if ($x != count($parent_arrays) - 1) {
                             $val .= '["'.$item.'"]["children"]';
                         } else {
                             $val .= '["'.$item.'"]["children"]';
@@ -5835,7 +5835,7 @@ 
                 if (isset($_REQUEST['id']) && $key == $_REQUEST['id']) {
                     $active = 'active';
                 }
-                $return  .= Display::tag('li', Display::div($item['data'], array('class'=>"item_data $active")).$sub_list, array('id'=>$key, 'class'=>'record li_container'));
+                $return .= Display::tag('li', Display::div($item['data'], array('class'=>"item_data $active")).$sub_list, array('id'=>$key, 'class'=>'record li_container'));
             } else {
                 //sections
                 if (isset($item['children'])) {
@@ -5858,17 +5858,17 @@ 
     {
         $gradebook = isset($_GET['gradebook']) ? Security :: remove_XSS($_GET['gradebook']) : null;
         $return = '<div class="actions">';
-        $return .=  '<a href="lp_controller.php?'.api_get_cidreq().'&gradebook=' . $gradebook . '&action=view&lp_id=' . $_SESSION['oLP']->lp_id . '&isStudentView=true">' . Display :: return_icon('preview_view.png', get_lang('Display'),'',ICON_SIZE_MEDIUM).'</a> ';
-        $return .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=admin_view&lp_id=' . $_SESSION['oLP']->lp_id . '&updateaudio=true">' . Display :: return_icon('upload_audio.png', get_lang('UpdateAllAudioFragments'),'',ICON_SIZE_MEDIUM).'</a>';
-        $return .= '<a href="lp_controller.php?'.api_get_cidreq().'&action=edit&lp_id=' . $_SESSION['oLP']->lp_id . '">' . Display :: return_icon('settings.png', get_lang('CourseSettings'),'',ICON_SIZE_MEDIUM).'</a>';
+        $return .= '<a href="lp_controller.php?'.api_get_cidreq().'&gradebook='.$gradebook.'&action=view&lp_id='.$_SESSION['oLP']->lp_id.'&isStudentView=true">'.Display :: return_icon('preview_view.png', get_lang('Display'), '', ICON_SIZE_MEDIUM).'</a> ';
+        $return .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=admin_view&lp_id='.$_SESSION['oLP']->lp_id.'&updateaudio=true">'.Display :: return_icon('upload_audio.png', get_lang('UpdateAllAudioFragments'), '', ICON_SIZE_MEDIUM).'</a>';
+        $return .= '<a href="lp_controller.php?'.api_get_cidreq().'&action=edit&lp_id='.$_SESSION['oLP']->lp_id.'">'.Display :: return_icon('settings.png', get_lang('CourseSettings'), '', ICON_SIZE_MEDIUM).'</a>';
         $buttons = array(
             array(
                 'title' => get_lang('SetPrerequisiteForEachItem'),
-                'href' => 'lp_controller.php?'.api_get_cidreq().'&action=set_previous_step_as_prerequisite&lp_id=' . $_SESSION['oLP']->lp_id,
+                'href' => 'lp_controller.php?'.api_get_cidreq().'&action=set_previous_step_as_prerequisite&lp_id='.$_SESSION['oLP']->lp_id,
             ),
             array(
                 'title' => get_lang('ClearAllPrerequisites'),
-                'href' => 'lp_controller.php?'.api_get_cidreq().'&action=clear_prerequisites&lp_id=' . $_SESSION['oLP']->lp_id,
+                'href' => 'lp_controller.php?'.api_get_cidreq().'&action=clear_prerequisites&lp_id='.$_SESSION['oLP']->lp_id,
             ),
         );
         $return .= Display::group_button(get_lang('PrerequisitesOptions'), $buttons);
@@ -5891,7 +5891,7 @@ 
     {
         // Creating learning_path folder
         $dir = '/learning_path';
-        $filepath = api_get_path(SYS_COURSE_PATH).$course['path'] . '/document';
+        $filepath = api_get_path(SYS_COURSE_PATH).$course['path'].'/document';
         $creatorId = empty($creatorId) ? api_get_user_id() : $creatorId;
 
         $folder = false;
@@ -5938,9 +5938,9 @@ 
         // Creating LP folder
         if ($folder) {
             //Limits title size
-            $title = api_substr(api_replace_dangerous_char($lp_name), 0 , 80);
+            $title = api_substr(api_replace_dangerous_char($lp_name), 0, 80);
             $dir   = $dir.$title;
-            $filepath = api_get_path(SYS_COURSE_PATH) . $course['path'] . '/document';
+            $filepath = api_get_path(SYS_COURSE_PATH).$course['path'].'/document';
             if (!is_dir($filepath.'/'.$dir)) {
                 $folderData = create_unexisting_directory(
                     $course,
@@ -5960,7 +5960,7 @@ 
             }
             $dir = $dir.'/';
             if ($folder) {
-                $filepath = api_get_path(SYS_COURSE_PATH) . $course['path'] . '/document'.$dir;
+                $filepath = api_get_path(SYS_COURSE_PATH).$course['path'].'/document'.$dir;
             }
         }
         $array = array(
@@ -6002,12 +6002,12 @@ 
             $dir = substr($dir, 1);
         }
         if (!empty($dir[0]) && $dir[0] != '/') {
-            $dir = '/' . $dir;
+            $dir = '/'.$dir;
         }
         if (isset($dir[strlen($dir) - 1]) && $dir[strlen($dir) - 1] != '/') {
             $dir .= '/';
         }
-        $filepath = api_get_path(SYS_COURSE_PATH) . $courseInfo['path'] . '/document' . $dir;
+        $filepath = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document'.$dir;
 
         if (empty($_POST['dir']) && empty($_GET['dir'])) {
             //Generates folder
@@ -6017,7 +6017,7 @@ 
         }
 
         if (!is_dir($filepath)) {
-            $filepath = api_get_path(SYS_COURSE_PATH) . $courseInfo['path'] . '/document/';
+            $filepath = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document/';
             $dir = '/';
         }
 
@@ -6037,10 +6037,10 @@ 
         $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;
+        $filename = $tmp_filename.'.'.$extension;
         if ($extension == 'html') {
             $content = stripslashes($content);
             $content = str_replace(
@@ -6075,12 +6075,12 @@ 
             );
         }
 
-        if (!file_exists($filepath . $filename)) {
-            if ($fp = @ fopen($filepath . $filename, 'w')) {
+        if (!file_exists($filepath.$filename)) {
+            if ($fp = @ fopen($filepath.$filename, 'w')) {
                 fputs($fp, $content);
                 fclose($fp);
 
-                $file_size = filesize($filepath . $filename);
+                $file_size = filesize($filepath.$filename);
                 $save_file_path = $dir.$filename;
 
                 $document_id = add_document(
@@ -6118,12 +6118,12 @@ 
                         $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
                         $ct = '';
                         if ($new_comment)
-                            $ct .= ", comment='" . Database::escape_string($new_comment). "'";
+                            $ct .= ", comment='".Database::escape_string($new_comment)."'";
                         if ($new_title)
-                            $ct .= ", title='" . Database::escape_string(htmlspecialchars($new_title, ENT_QUOTES, $charset))."' ";
+                            $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;
+                        $sql = "UPDATE ".$tbl_doc." SET ".substr($ct, 1)."
+                               WHERE c_id = ".$course_id." AND id = ".$document_id;
                         Database::query($sql);
                     }
                 }
@@ -6151,41 +6151,41 @@ 
             $dir = substr($dir, 1);
 
         if ($dir[0] != '/')
-            $dir = '/' . $dir;
+            $dir = '/'.$dir;
 
         if ($dir[strlen($dir) - 1] != '/')
             $dir .= '/';
 
-        $filepath = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document' . $dir;
+        $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
         if (!is_dir($filepath)) {
-            $filepath = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document/';
+            $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
         }
 
         $table_doc = Database :: get_course_table(TABLE_DOCUMENT);
         if (isset($_POST['path']) && !empty($_POST['path'])) {
             $document_id = intval($_POST['path']);
-            $sql = "SELECT path FROM " . $table_doc . "
-                    WHERE c_id = $course_id AND id = " . $document_id;
+            $sql = "SELECT path FROM ".$table_doc."
+                    WHERE c_id = $course_id AND id = ".$document_id;
             $res = Database::query($sql);
             $row = Database :: fetch_array($res);
             $content = stripslashes($_POST['content_lp']);
-            $file = $filepath . $row['path'];
+            $file = $filepath.$row['path'];
 
             if ($fp = @ fopen($file, 'w')) {
-                $content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'] . '/courses/', $content);
+                $content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].'/courses/', $content);
 
                 // Change the path of mp3 to absolute.
                 // The first regexp deals with :// urls.
-                $content = preg_replace("|(flashvars=\"file=)([^:/]+)/|", "$1" . api_get_path(REL_COURSE_PATH) . $_course['path'] . '/document/', $content);
+                $content = preg_replace("|(flashvars=\"file=)([^:/]+)/|", "$1".api_get_path(REL_COURSE_PATH).$_course['path'].'/document/', $content);
                 // The second regexp deals with audio/ urls.
-                $content = preg_replace("|(flashvars=\"file=)([^:/]+)/|", "$1" . api_get_path(REL_COURSE_PATH) . $_course['path'] . '/document/$2/', $content);
+                $content = preg_replace("|(flashvars=\"file=)([^:/]+)/|", "$1".api_get_path(REL_COURSE_PATH).$_course['path'].'/document/$2/', $content);
                 fputs($fp, $content);
                 fclose($fp);
 
-                $sql = "UPDATE " . $table_doc ." SET
+                $sql = "UPDATE ".$table_doc." SET
                             title='".Database::escape_string($_POST['title'])."'
-                        WHERE c_id = ".$course_id." AND id = " . $document_id;
+                        WHERE c_id = ".$course_id." AND id = ".$document_id;
                 Database::query($sql);
             }
         }
@@ -6203,10 +6203,10 @@ 
         $return = '';
         if (is_numeric($item_id)) {
             $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
-            $sql = "SELECT lp.* FROM " . $tbl_lp_item . " as lp
-                    WHERE c_id = ".$course_id." AND lp.id = " . intval($item_id);
+            $sql = "SELECT lp.* FROM ".$tbl_lp_item." as lp
+                    WHERE c_id = ".$course_id." AND lp.id = ".intval($item_id);
             $result = Database::query($sql);
-            while ($row = Database :: fetch_array($result,'ASSOC')) {
+            while ($row = Database :: fetch_array($result, 'ASSOC')) {
                 $_SESSION['parent_item_id'] = ($row['item_type'] == 'dokeos_chapter' || $row['item_type'] == 'dokeos_module' || $row['item_type'] == 'dir') ? $item_id : 0;
 
                 // Prevents wrong parent selection for document, see Bug#1251.
@@ -6233,8 +6233,8 @@ 
                         break;
                     case TOOL_DOCUMENT:
                         $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
-                        $sql_doc = "SELECT path FROM " . $tbl_doc . "
-                                    WHERE c_id = ".$course_id." AND id = " . intval($row['path']);
+                        $sql_doc = "SELECT path FROM ".$tbl_doc."
+                                    WHERE c_id = ".$course_id." AND id = ".intval($row['path']);
                         $result = Database::query($sql_doc);
                         $path_file = Database::result($result, 0, 0);
                         $path_parts = pathinfo($path_file);
@@ -6273,7 +6273,7 @@ 
         if (is_numeric($item_id)) {
             $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
             $sql = "SELECT * FROM $tbl_lp_item
-                    WHERE c_id = ".$course_id." AND id = " . intval($item_id);
+                    WHERE c_id = ".$course_id." AND id = ".intval($item_id);
             $res = Database::query($sql);
             $row = Database::fetch_array($res);
             switch ($row['item_type']) {
@@ -6283,21 +6283,21 @@ 
                 case 'sco' :
                     if (isset ($_GET['view']) && $_GET['view'] == 'build') {
                         $return .= $this->display_manipulate($item_id, $row['item_type']);
-                        $return .= $this->display_item_form($row['item_type'], get_lang('EditCurrentChapter') . ' :', 'edit', $item_id, $row);
+                        $return .= $this->display_item_form($row['item_type'], get_lang('EditCurrentChapter').' :', 'edit', $item_id, $row);
                     } else {
-                        $return .= $this->display_item_small_form($row['item_type'], get_lang('EditCurrentChapter') . ' :', $row);
+                        $return .= $this->display_item_small_form($row['item_type'], get_lang('EditCurrentChapter').' :', $row);
                     }
                     break;
                 case TOOL_DOCUMENT :
                     $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
                     $sql = "SELECT lp.*, doc.path as dir
-                            FROM " . $tbl_lp_item . " as lp
-                            LEFT JOIN " . $tbl_doc . " as doc
+                            FROM " . $tbl_lp_item." as lp
+                            LEFT JOIN " . $tbl_doc." as doc
                             ON doc.id = lp.path
                             WHERE
                                 lp.c_id = $course_id AND
                                 doc.c_id = $course_id AND
-                                lp.id = " . intval($item_id);
+                                lp.id = ".intval($item_id);
                     $res_step = Database::query($sql);
                     $row_step = Database :: fetch_array($res_step, 'ASSOC');
                     $return .= $this->display_manipulate($item_id, $row['item_type']);
@@ -6307,8 +6307,8 @@ 
                     $link_id = (string) $row['path'];
                     if (ctype_digit($link_id)) {
                         $tbl_link = Database :: get_course_table(TABLE_LINK);
-                        $sql_select = 'SELECT url FROM ' . $tbl_link . '
-                                       WHERE c_id = '.$course_id.' AND id = ' . intval($link_id);
+                        $sql_select = 'SELECT url FROM '.$tbl_link.'
+                                       WHERE c_id = '.$course_id.' AND id = '.intval($link_id);
                         $res_link = Database::query($sql_select);
                         $row_link = Database :: fetch_array($res_link);
                         if (is_array($row_link)) {
@@ -6322,13 +6322,13 @@ 
                     $_SESSION['finalItem'] = true;
                     $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
                     $sql = "SELECT lp.*, doc.path as dir
-                            FROM " . $tbl_lp_item . " as lp
-                            LEFT JOIN " . $tbl_doc . " as doc
+                            FROM " . $tbl_lp_item." as lp
+                            LEFT JOIN " . $tbl_doc." as doc
                             ON doc.id = lp.path
                             WHERE
                                 lp.c_id = $course_id AND
                                 doc.c_id = $course_id AND
-                                lp.id = " . intval($item_id);
+                                lp.id = ".intval($item_id);
                     $res_step = Database::query($sql);
                     $row_step = Database :: fetch_array($res_step, 'ASSOC');
                     $return .= $this->display_manipulate($item_id, $row['item_type']);
@@ -6337,9 +6337,9 @@ 
                 case 'dokeos_module' :
                     if (isset ($_GET['view']) && $_GET['view'] == 'build') {
                         $return .= $this->display_manipulate($item_id, $row['item_type']);
-                        $return .= $this->display_item_form($row['item_type'], get_lang('EditCurrentModule') . ' :', 'edit', $item_id, $row);
+                        $return .= $this->display_item_form($row['item_type'], get_lang('EditCurrentModule').' :', 'edit', $item_id, $row);
                     } else {
-                        $return .= $this->display_item_small_form($row['item_type'], get_lang('EditCurrentModule') . ' :', $row);
+                        $return .= $this->display_item_small_form($row['item_type'], get_lang('EditCurrentModule').' :', $row);
                     }
                     break;
                 case TOOL_QUIZ :
@@ -6396,7 +6396,7 @@ 
 
         $headers = array(
             Display::return_icon('folder_document.png', get_lang('Documents'), array(), ICON_SIZE_BIG),
-            Display::return_icon('quiz.png',  get_lang('Quiz'), array(), ICON_SIZE_BIG),
+            Display::return_icon('quiz.png', get_lang('Quiz'), array(), ICON_SIZE_BIG),
             Display::return_icon('links.png', get_lang('Links'), array(), ICON_SIZE_BIG),
             Display::return_icon('works.png', get_lang('Works'), array(), ICON_SIZE_BIG),
             Display::return_icon('forum.png', get_lang('Forums'), array(), ICON_SIZE_BIG),
@@ -6437,16 +6437,16 @@ 
         $course_id = api_get_course_int_id();
         $return = '';
         $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
-        $sql_doc = "SELECT * FROM " . $tbl_doc . "
-                    WHERE c_id = ".$course_id." AND id = " . $id;
+        $sql_doc = "SELECT * FROM ".$tbl_doc."
+                    WHERE c_id = ".$course_id." AND id = ".$id;
         $res_doc = Database::query($sql_doc);
         $row_doc = Database :: fetch_array($res_doc);
 
         // TODO: Add a path filter.
         if ($iframe) {
-            $return .= '<iframe id="learnpath_preview_frame" frameborder="0" height="400" width="100%" scrolling="auto" src="' . api_get_path(WEB_COURSE_PATH) . $_course['path'] . '/document' . str_replace('%2F', '/', urlencode($row_doc['path'])) . '?' . api_get_cidreq() . '"></iframe>';
+            $return .= '<iframe id="learnpath_preview_frame" frameborder="0" height="400" width="100%" scrolling="auto" src="'.api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.str_replace('%2F', '/', urlencode($row_doc['path'])).'?'.api_get_cidreq().'"></iframe>';
         } else {
-            $return .= file_get_contents(api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document' . $row_doc['path']);
+            $return .= file_get_contents(api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$row_doc['path']);
         }
 
         return $return;
@@ -6470,8 +6470,8 @@ 
             $item_description = $extra_info['description'];
         } elseif (is_numeric($extra_info)) {
             $sql = "SELECT title, description
-                    FROM " . $tbl_quiz . "
-                    WHERE c_id = ".$course_id." AND id = " . $extra_info;
+                    FROM " . $tbl_quiz."
+                    WHERE c_id = ".$course_id." AND id = ".$extra_info;
 
             $result = Database::query($sql);
             $row = Database::fetch_array($result);
@@ -6481,8 +6481,8 @@ 
             $item_title = '';
             $item_description = '';
         }
-        $item_title			= Security::remove_XSS($item_title);
-        $item_description 	= Security::remove_XSS($item_description);
+        $item_title = Security::remove_XSS($item_title);
+        $item_description = Security::remove_XSS($item_description);
 
         $legend = '<legend>';
         if ($id != 0 && is_array($extra_info))
@@ -6490,13 +6490,13 @@ 
         else
             $parent = 0;
 
-        $sql = "SELECT * FROM " . $tbl_lp_item . "
-                WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
+        $sql = "SELECT * FROM ".$tbl_lp_item."
+                WHERE c_id = ".$course_id." AND lp_id = ".$this->lp_id;
 
         $result = Database::query($sql);
-        $arrLP = array ();
+        $arrLP = array();
         while ($row = Database :: fetch_array($result)) {
-            $arrLP[] = array (
+            $arrLP[] = array(
                 'id' => $row['id'],
                 'item_type' => $row['item_type'],
                 'title' => $row['title'],
@@ -6519,15 +6519,15 @@ 
         unset ($this->arrMenu);
 
         if ($action == 'add') {
-            $legend .= get_lang('CreateTheExercise') . '&nbsp;:';
+            $legend .= get_lang('CreateTheExercise').'&nbsp;:';
         } elseif ($action == 'move') {
-            $legend .= get_lang('MoveTheCurrentExercise') . '&nbsp;:';
+            $legend .= get_lang('MoveTheCurrentExercise').'&nbsp;:';
         } else {
-            $legend .= get_lang('EditCurrentExecice') . '&nbsp;:';
+            $legend .= get_lang('EditCurrentExecice').'&nbsp;:';
         }
 
         if (isset ($_GET['edit']) && $_GET['edit'] == 'true') {
-            $legend .= Display :: return_warning_message(get_lang('Warning') . ' ! ' . get_lang('WarningEditingDocument'));
+            $legend .= Display :: return_warning_message(get_lang('Warning').' ! '.get_lang('WarningEditingDocument'));
         }
 
         $legend .= '</legend>';
@@ -6540,34 +6540,34 @@ 
 
         if ($action != 'move') {
             $return .= '<tr>';
-            $return .= '<td class="label"><label for="idTitle">' . get_lang('Title') . '</label></td>';
-            $return .= '<td class="input"><input id="idTitle" name="title" size="44" type="text" value="' . $item_title . '" /></td>';
+            $return .= '<td class="label"><label for="idTitle">'.get_lang('Title').'</label></td>';
+            $return .= '<td class="input"><input id="idTitle" name="title" size="44" type="text" value="'.$item_title.'" /></td>';
             $return .= '</tr>';
         }
 
         $return .= '<tr>';
 
-        $return .= '<td class="label"><label for="idParent">' . get_lang('Parent') . '</label></td>';
+        $return .= '<td class="label"><label for="idParent">'.get_lang('Parent').'</label></td>';
         $return .= '<td class="input">';
 
         // Select for Parent item, root or chapter
         $return .= '<select id="idParent" style="width:100%;" name="parent" onChange="javascript: load_cbo(this.value);" size="1">';
 
-        $return .= '<option class="top" value="0">' . $this->name . '</option>';
+        $return .= '<option class="top" value="0">'.$this->name.'</option>';
 
-        $arrHide = array (
+        $arrHide = array(
             $id
         );
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($action != 'add') {
                 if (($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') && !in_array($arrLP[$i]['id'], $arrHide) && !in_array($arrLP[$i]['parent_item_id'], $arrHide)) {
-                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    $return .= '<option '.(($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '').'style="padding-left:'.($arrLP[$i]['depth'] * 10).'px;" value="'.$arrLP[$i]['id'].'">'.$arrLP[$i]['title'].'</option>';
                 } else {
                     $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>';
+                    $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)) {
@@ -6579,11 +6579,11 @@ 
         $return .= '</tr>';
         $return .= '<tr>';
 
-        $return .= '<td class="label"><label for="previous">' . get_lang('Position') . '</label></td>';
+        $return .= '<td class="label"><label for="previous">'.get_lang('Position').'</label></td>';
         $return .= '<td class="input">';
 
         $return .= '<select class="learnpath_item_form" style="width:100%;" id="previous" name="previous" size="1">';
-        $return .= '<option class="top" value="0">' . get_lang('FirstPosition') . '</option>';
+        $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 (is_array($extra_info)) {
@@ -6595,7 +6595,7 @@ 
                 } else {
                     $selected = '';
                 }
-                $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' . get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
+                $return .= '<option '.$selected.'value="'.$arrLP[$i]['id'].'">'.get_lang('After').' "'.$arrLP[$i]['title'].'"</option>';
             }
         }
         $return .= '</select>';
@@ -6612,7 +6612,7 @@ 
                     }
                 }
             }
-            $arrHide = array ();
+            $arrHide = array();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
                     if (is_array($extra_info)) {
@@ -6658,27 +6658,27 @@ 
 
         $return .= '<tr>';
         if ($action == 'add') {
-            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit">' . get_lang('AddExercise') . '</button></td>';
+            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit">'.get_lang('AddExercise').'</button></td>';
         } else {
-            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit">' . get_lang('EditCurrentExecice') . '</button></td>';
+            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit">'.get_lang('EditCurrentExecice').'</button></td>';
         }
 
         $return .= '</tr>';
         $return .= '</table>';
 
         if ($action == 'move') {
-            $return .= '<input name="title" type="hidden" value="' . $item_title . '" />';
-            $return .= '<input name="description" type="hidden" value="' . $item_description . '" />';
+            $return .= '<input name="title" type="hidden" value="'.$item_title.'" />';
+            $return .= '<input name="description" type="hidden" value="'.$item_description.'" />';
         }
 
         if (is_numeric($extra_info)) {
-            $return .= '<input name="path" type="hidden" value="' . $extra_info . '" />';
+            $return .= '<input name="path" type="hidden" value="'.$extra_info.'" />';
         } elseif (is_array($extra_info)) {
-            $return .= '<input name="path" type="hidden" value="' . $extra_info['path'] . '" />';
+            $return .= '<input name="path" type="hidden" value="'.$extra_info['path'].'" />';
         }
 
-        $return .= '<input name="type" type="hidden" value="' . TOOL_QUIZ . '" />';
-        $return .= '<input name="post_time" type="hidden" value="' . time() . '" />';
+        $return .= '<input name="type" type="hidden" value="'.TOOL_QUIZ.'" />';
+        $return .= '<input name="post_time" type="hidden" value="'.time().'" />';
 
         $return .= '</form>';
         $return .= '</div>';
@@ -6705,11 +6705,11 @@ 
         } elseif (is_numeric($extra_info)) {
             $TBL_DOCUMENT = Database :: get_course_table(TABLE_DOCUMENT);
 
-            $sql = "SELECT * FROM " . $TBL_DOCUMENT . "
+            $sql = "SELECT * FROM ".$TBL_DOCUMENT."
                     WHERE
                         c_id = ".$course_id." AND
-                        path LIKE '" . $uploadPath . "/%/%htm%' AND
-                        id = " . (int) $extra_info . "
+                        path LIKE '" . $uploadPath."/%/%htm%' AND
+                        id = " . (int) $extra_info."
                     ORDER BY id ASC";
 
             $res_hot = Database::query($sql);
@@ -6733,11 +6733,11 @@ 
         }
 
         $sql = "SELECT * FROM $tbl_lp_item
-                WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
+                WHERE c_id = ".$course_id." AND lp_id = ".$this->lp_id;
         $result = Database::query($sql);
-        $arrLP = array ();
+        $arrLP = array();
         while ($row = Database :: fetch_array($result)) {
-            $arrLP[] = array (
+            $arrLP[] = array(
                 'id' => $row['id'],
                 'item_type' => $row['item_type'],
                 'title' => $row['title'],
@@ -6762,7 +6762,7 @@ 
         else
             $legend .= get_lang('EditCurrentExecice');
         if (isset ($_GET['edit']) && $_GET['edit'] == 'true') {
-            $legend .= Display :: return_warning_message(get_lang('Warning') . ' ! ' . get_lang('WarningEditingDocument'));
+            $legend .= Display :: return_warning_message(get_lang('Warning').' ! '.get_lang('WarningEditingDocument'));
         }
         $legend .= '</legend>';
 
@@ -6770,11 +6770,11 @@ 
         $return .= $legend;
         $return .= '<table cellpadding="0" cellspacing="0" class="lp_form">';
         $return .= '<tr>';
-        $return .= '<td class="label"><label for="idParent">' . get_lang('Parent') . ' :</label></td>';
+        $return .= '<td class="label"><label for="idParent">'.get_lang('Parent').' :</label></td>';
         $return .= '<td class="input">';
         $return .= '<select id="idParent" name="parent" onChange="javascript: load_cbo(this.value);" size="1">';
-        $return .= '<option class="top" value="0">' . $this->name . '</option>';
-        $arrHide = array (
+        $return .= '<option class="top" value="0">'.$this->name.'</option>';
+        $arrHide = array(
             $id
         );
 
@@ -6782,13 +6782,13 @@ 
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($action != 'add') {
                     if (($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') && !in_array($arrLP[$i]['id'], $arrHide) && !in_array($arrLP[$i]['parent_item_id'], $arrHide)) {
-                        $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                        $return .= '<option '.(($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '').'style="padding-left:'.($arrLP[$i]['depth'] * 10).'px;" value="'.$arrLP[$i]['id'].'">'.$arrLP[$i]['title'].'</option>';
                     } else {
                         $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>';
+                        $return .= '<option '.(($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '').'style="padding-left:'.($arrLP[$i]['depth'] * 10).'px;" value="'.$arrLP[$i]['id'].'">'.$arrLP[$i]['title'].'</option>';
                 }
             }
 
@@ -6799,10 +6799,10 @@ 
         $return .= '</td>';
         $return .= '</tr>';
         $return .= '<tr>';
-        $return .= '<td class="label"><label for="previous">' . get_lang('Position') . ' :</label></td>';
+        $return .= '<td class="label"><label for="previous">'.get_lang('Position').' :</label></td>';
         $return .= '<td class="input">';
         $return .= '<select id="previous" name="previous" size="1">';
-        $return .= '<option class="top" value="0">' . get_lang('FirstPosition') . '</option>';
+        $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) {
@@ -6812,7 +6812,7 @@ 
                 else
                     $selected = '';
 
-                $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' . get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
+                $return .= '<option '.$selected.'value="'.$arrLP[$i]['id'].'">'.get_lang('After').' "'.$arrLP[$i]['title'].'"</option>';
             }
         }
 
@@ -6822,8 +6822,8 @@ 
 
         if ($action != 'move') {
             $return .= '<tr>';
-            $return .= '<td class="label"><label for="idTitle">' . get_lang('Title') . ' :</label></td>';
-            $return .= '<td class="input"><input id="idTitle" name="title" type="text" value="' . $item_title . '" /></td>';
+            $return .= '<td class="label"><label for="idTitle">'.get_lang('Title').' :</label></td>';
+            $return .= '<td class="input"><input id="idTitle" name="title" type="text" value="'.$item_title.'" /></td>';
             $return .= '</tr>';
             $id_prerequisite = 0;
             if (is_array($arrLP) && count($arrLP) > 0) {
@@ -6834,7 +6834,7 @@ 
                     }
                 }
 
-                $arrHide = array ();
+                $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'])
@@ -6848,22 +6848,22 @@ 
         }
 
         $return .= '<tr>';
-        $return .= '<td>&nbsp; </td><td><button class="save" name="submit_button" action="edit" type="submit">' . get_lang('SaveHotpotatoes') . '</button></td>';
+        $return .= '<td>&nbsp; </td><td><button class="save" name="submit_button" action="edit" type="submit">'.get_lang('SaveHotpotatoes').'</button></td>';
         $return .= '</tr>';
         $return .= '</table>';
 
         if ($action == 'move') {
-            $return .= '<input name="title" type="hidden" value="' . $item_title . '" />';
-            $return .= '<input name="description" type="hidden" value="' . $item_description . '" />';
+            $return .= '<input name="title" type="hidden" value="'.$item_title.'" />';
+            $return .= '<input name="description" type="hidden" value="'.$item_description.'" />';
         }
 
         if (is_numeric($extra_info)) {
-            $return .= '<input name="path" type="hidden" value="' . $extra_info . '" />';
+            $return .= '<input name="path" type="hidden" value="'.$extra_info.'" />';
         } elseif (is_array($extra_info)) {
-            $return .= '<input name="path" type="hidden" value="' . $extra_info['path'] . '" />';
+            $return .= '<input name="path" type="hidden" value="'.$extra_info['path'].'" />';
         }
-        $return .= '<input name="type" type="hidden" value="' . TOOL_HOTPOTATOES . '" />';
-        $return .= '<input name="post_time" type="hidden" value="' . time() . '" />';
+        $return .= '<input name="type" type="hidden" value="'.TOOL_HOTPOTATOES.'" />';
+        $return .= '<input name="post_time" type="hidden" value="'.time().'" />';
         $return .= '</form>';
 
         return $return;
@@ -6886,8 +6886,8 @@ 
             $item_title = stripslashes($extra_info['title']);
         } elseif (is_numeric($extra_info)) {
             $sql = "SELECT forum_title as title, forum_comment as comment
-                    FROM " . $tbl_forum . "
-                    WHERE c_id = ".$course_id." AND forum_id = " . $extra_info;
+                    FROM " . $tbl_forum."
+                    WHERE c_id = ".$course_id." AND forum_id = ".$extra_info;
 
             $result = Database::query($sql);
             $row = Database :: fetch_array($result);
@@ -6907,7 +6907,7 @@ 
             $parent = 0;
         }
 
-        $sql = "SELECT * FROM " . $tbl_lp_item . "
+        $sql = "SELECT * FROM ".$tbl_lp_item."
                 WHERE
                     c_id = ".$course_id." AND
                     lp_id = " . $this->lp_id;
@@ -6915,7 +6915,7 @@ 
         $arrLP = array();
 
         while ($row = Database :: fetch_array($result)) {
-            $arrLP[] = array (
+            $arrLP[] = array(
                 'id' => $row['id'],
                 'item_type' => $row['item_type'],
                 'title' => $row['title'],
@@ -6937,10 +6937,10 @@ 
         unset($this->arrMenu);
 
         if ($action == 'add')
-            $legend .= get_lang('CreateTheForum') . '&nbsp;:';
-        elseif ($action == 'move') $legend .= get_lang('MoveTheCurrentForum') . '&nbsp;:';
+            $legend .= get_lang('CreateTheForum').'&nbsp;:';
+        elseif ($action == 'move') $legend .= get_lang('MoveTheCurrentForum').'&nbsp;:';
         else
-            $legend .= get_lang('EditCurrentForum') . '&nbsp;:';
+            $legend .= get_lang('EditCurrentForum').'&nbsp;:';
 
         $legend .= '</legend>';
         $return = '<div class="sectioncomment">';
@@ -6950,16 +6950,16 @@ 
 
         if ($action != 'move') {
             $return .= '<tr>';
-            $return .= '<td class="label"><label for="idTitle">' . get_lang('Title') . '</label></td>';
-            $return .= '<td class="input"><input id="idTitle" size="44" name="title" type="text" value="' . $item_title . '" class="learnpath_item_form" /></td>';
+            $return .= '<td class="label"><label for="idTitle">'.get_lang('Title').'</label></td>';
+            $return .= '<td class="input"><input id="idTitle" size="44" name="title" type="text" value="'.$item_title.'" class="learnpath_item_form" /></td>';
             $return .= '</tr>';
         }
 
         $return .= '<tr>';
-        $return .= '<td class="label"><label for="idParent">' . get_lang('Parent') . '</label></td>';
+        $return .= '<td class="label"><label for="idParent">'.get_lang('Parent').'</label></td>';
         $return .= '<td class="input">';
         $return .= '<select id="idParent" style="width:100%;" name="parent" onChange="javascript: load_cbo(this.value);" class="learnpath_item_form" size="1">';
-        $return .= '<option class="top" value="0">' . $this->name . '</option>';
+        $return .= '<option class="top" value="0">'.$this->name.'</option>';
         $arrHide = array(
             $id
         );
@@ -6968,13 +6968,13 @@ 
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($action != 'add') {
                 if (($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') && !in_array($arrLP[$i]['id'], $arrHide) && !in_array($arrLP[$i]['parent_item_id'], $arrHide)) {
-                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    $return .= '<option '.(($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '').'style="padding-left:'.($arrLP[$i]['depth'] * 10).'px;" value="'.$arrLP[$i]['id'].'">'.$arrLP[$i]['title'].'</option>';
                 } else {
                     $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>';
+                    $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)) {
@@ -6985,10 +6985,10 @@ 
         $return .= '</td>';
         $return .= '</tr>';
         $return .= '<tr>';
-        $return .= '<td class="label"><label for="previous">' . get_lang('Position') . '</label></td>';
+        $return .= '<td class="label"><label for="previous">'.get_lang('Position').'</label></td>';
         $return .= '<td class="input">';
         $return .= '<select id="previous" name="previous" style="width:100%;" size="1" class="learnpath_item_form">';
-        $return .= '<option class="top" value="0">' . get_lang('FirstPosition') . '</option>';
+        $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) {
@@ -6998,8 +6998,8 @@ 
                 else
                     $selected = '';
 
-                $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' .
-                    get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
+                $return .= '<option '.$selected.'value="'.$arrLP[$i]['id'].'">'.
+                    get_lang('After').' "'.$arrLP[$i]['title'].'"</option>';
             }
         }
 
@@ -7033,25 +7033,25 @@ 
         $return .= '<tr>';
 
         if ($action == 'add') {
-            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit"> ' . get_lang('AddForumToCourse') . ' </button></td>';
+            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit"> '.get_lang('AddForumToCourse').' </button></td>';
         } else {
-            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit"> ' . get_lang('EditCurrentForum') . ' </button></td>';
+            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit"> '.get_lang('EditCurrentForum').' </button></td>';
         }
         $return .= '</tr>';
         $return .= '</table>';
 
         if ($action == 'move') {
-            $return .= '<input name="title" type="hidden" value="' . $item_title . '" />';
-            $return .= '<input name="description" type="hidden" value="' . $item_description . '" />';
+            $return .= '<input name="title" type="hidden" value="'.$item_title.'" />';
+            $return .= '<input name="description" type="hidden" value="'.$item_description.'" />';
         }
 
         if (is_numeric($extra_info)) {
-            $return .= '<input name="path" type="hidden" value="' . $extra_info . '" />';
+            $return .= '<input name="path" type="hidden" value="'.$extra_info.'" />';
         } elseif (is_array($extra_info)) {
-            $return .= '<input name="path" type="hidden" value="' . $extra_info['path'] . '" />';
+            $return .= '<input name="path" type="hidden" value="'.$extra_info['path'].'" />';
         }
-        $return .= '<input name="type" type="hidden" value="' . TOOL_FORUM . '" />';
-        $return .= '<input name="post_time" type="hidden" value="' . time() . '" />';
+        $return .= '<input name="type" type="hidden" value="'.TOOL_FORUM.'" />';
+        $return .= '<input name="post_time" type="hidden" value="'.time().'" />';
         $return .= '</form>';
         $return .= '</div>';
 
@@ -7078,7 +7078,7 @@ 
             $item_title = stripslashes($extra_info['title']);
         } elseif (is_numeric($extra_info)) {
             $sql = "SELECT thread_title as title FROM $tbl_forum
-                    WHERE c_id = $course_id AND thread_id = " . $extra_info;
+                    WHERE c_id = $course_id AND thread_id = ".$extra_info;
 
             $result = Database::query($sql);
             $row = Database :: fetch_array($result);
@@ -7098,15 +7098,15 @@ 
             $parent = 0;
         }
 
-        $sql = "SELECT * FROM " . $tbl_lp_item . "
-                WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
+        $sql = "SELECT * FROM ".$tbl_lp_item."
+                WHERE c_id = ".$course_id." AND lp_id = ".$this->lp_id;
 
         $result = Database::query($sql);
 
-        $arrLP = array ();
+        $arrLP = array();
 
         while ($row = Database :: fetch_array($result)) {
-            $arrLP[] = array (
+            $arrLP[] = array(
                 'id' => $row['id'],
                 'item_type' => $row['item_type'],
                 'title' => $row['title'],
@@ -7129,31 +7129,31 @@ 
 
         $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>';
+            $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 .= '<legend>'.get_lang('EditCurrentForum').'</legend>';
 
         $return .= '<table cellpadding="0" cellspacing="0" class="lp_form">';
         $return .= '<tr>';
-        $return .= '<td class="label"><label for="idParent">' . get_lang('Parent') . '</label></td>';
+        $return .= '<td class="label"><label for="idParent">'.get_lang('Parent').'</label></td>';
         $return .= '<td class="input">';
         $return .= '<select id="idParent" name="parent" onChange="javascript: load_cbo(this.value);" size="1">';
-        $return .= '<option class="top" value="0">' . $this->name . '</option>';
-        $arrHide = array (
+        $return .= '<option class="top" value="0">'.$this->name.'</option>';
+        $arrHide = array(
             $id
         );
 
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($action != 'add') {
                 if (($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') && !in_array($arrLP[$i]['id'], $arrHide) && !in_array($arrLP[$i]['parent_item_id'], $arrHide)) {
-                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    $return .= '<option '.(($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '').'style="padding-left:'.($arrLP[$i]['depth'] * 10).'px;" value="'.$arrLP[$i]['id'].'">'.$arrLP[$i]['title'].'</option>';
                 } else {
                     $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>';
+                    $return .= '<option '.(($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '').'style="padding-left:'.($arrLP[$i]['depth'] * 10).'px;" value="'.$arrLP[$i]['id'].'">'.$arrLP[$i]['title'].'</option>';
             }
         }
 
@@ -7165,10 +7165,10 @@ 
         $return .= '</td>';
         $return .= '</tr>';
         $return .= '<tr>';
-        $return .= '<td class="label"><label for="previous">' . get_lang('Position') . '</label></td>';
+        $return .= '<td class="label"><label for="previous">'.get_lang('Position').'</label></td>';
         $return .= '<td class="input">';
         $return .= '<select id="previous" name="previous" size="1">';
-        $return .= '<option class="top" value="0">' . get_lang('FirstPosition') . '</option>';
+        $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'])
@@ -7177,7 +7177,7 @@ 
                 else
                     $selected = '';
 
-                $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' . get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
+                $return .= '<option '.$selected.'value="'.$arrLP[$i]['id'].'">'.get_lang('After').' "'.$arrLP[$i]['title'].'"</option>';
             }
         }
         $return .= '</select>';
@@ -7185,8 +7185,8 @@ 
         $return .= '</tr>';
         if ($action != 'move') {
             $return .= '<tr>';
-            $return .= '<td class="label"><label for="idTitle">' . get_lang('Title') . '</label></td>';
-            $return .= '<td class="input"><input id="idTitle" name="title" type="text" value="' . $item_title . '" /></td>';
+            $return .= '<td class="label"><label for="idTitle">'.get_lang('Title').'</label></td>';
+            $return .= '<td class="input"><input id="idTitle" name="title" type="text" value="'.$item_title.'" /></td>';
             $return .= '</tr>';
             $return .= '<tr>';
             $return .= '</tr>';
@@ -7213,17 +7213,17 @@ 
             }
 
             $return .= '<tr>';
-            $return .= '<td class="label"><label for="idPrerequisites">' . get_lang('LearnpathPrerequisites') . '</label></td>';
-            $return .= '<td class="input"><select name="prerequisites" id="prerequisites"><option value="0">' . get_lang('NoPrerequisites') . '</option>';
+            $return .= '<td class="label"><label for="idPrerequisites">'.get_lang('LearnpathPrerequisites').'</label></td>';
+            $return .= '<td class="input"><select name="prerequisites" id="prerequisites"><option value="0">'.get_lang('NoPrerequisites').'</option>';
 
             foreach ($arrHide as $key => $value) {
                 if ($key == $s_selected_position && $action == 'add') {
-                    $return .= '<option value="' . $key . '" selected="selected">' . $value['value'] . '</option>';
+                    $return .= '<option value="'.$key.'" selected="selected">'.$value['value'].'</option>';
                 }
                 elseif ($key == $id_prerequisite && $action == 'edit') {
-                    $return .= '<option value="' . $key . '" selected="selected">' . $value['value'] . '</option>';
+                    $return .= '<option value="'.$key.'" selected="selected">'.$value['value'].'</option>';
                 } else {
-                    $return .= '<option value="' . $key . '">' . $value['value'] . '</option>';
+                    $return .= '<option value="'.$key.'">'.$value['value'].'</option>';
                 }
             }
             $return .= "</select></td>";
@@ -7237,19 +7237,19 @@ 
         $return .= '</table>';
 
         if ($action == 'move') {
-            $return .= '<input name="title" type="hidden" value="' . $item_title . '" />';
-            $return .= '<input name="description" type="hidden" value="' . $item_description . '" />';
+            $return .= '<input name="title" type="hidden" value="'.$item_title.'" />';
+            $return .= '<input name="description" type="hidden" value="'.$item_description.'" />';
         }
 
         if (is_numeric($extra_info)) {
-            $return .= '<input name="path" type="hidden" value="' . $extra_info . '" />';
+            $return .= '<input name="path" type="hidden" value="'.$extra_info.'" />';
         }
         elseif (is_array($extra_info)) {
-            $return .= '<input name="path" type="hidden" value="' . $extra_info['path'] . '" />';
+            $return .= '<input name="path" type="hidden" value="'.$extra_info['path'].'" />';
         }
 
-        $return .= '<input name="type" type="hidden" value="' . TOOL_THREAD . '" />';
-        $return .= '<input name="post_time" type="hidden" value="' . time() . '" />';
+        $return .= '<input name="type" type="hidden" value="'.TOOL_THREAD.'" />';
+        $return .= '<input name="post_time" type="hidden" value="'.time().'" />';
         $return .= '</form>';
         $return .= '</div>';
 
@@ -7275,10 +7275,10 @@ 
         $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
 
         if ($id != 0 && is_array($extra_info)) {
-            $item_title 		= $extra_info['title'];
-            $item_description 	= $extra_info['description'];
-            $item_path = api_get_path(WEB_COURSE_PATH) . $_course['path'] . '/scorm/' . $this->path . '/' . stripslashes($extra_info['path']);
-            $item_path_fck = '/scorm/' . $this->path . '/' . stripslashes($extra_info['path']);
+            $item_title = $extra_info['title'];
+            $item_description = $extra_info['description'];
+            $item_path = api_get_path(WEB_COURSE_PATH).$_course['path'].'/scorm/'.$this->path.'/'.stripslashes($extra_info['path']);
+            $item_path_fck = '/scorm/'.$this->path.'/'.stripslashes($extra_info['path']);
         } else {
             $item_title = '';
             $item_description = '';
@@ -7292,17 +7292,17 @@ 
         }
 
         $id  = intval($id);
-        $sql = "SELECT * FROM " . $tbl_lp_item . "
+        $sql = "SELECT * FROM ".$tbl_lp_item."
                 WHERE
                     c_id = ".$course_id." AND
-                    lp_id = " . $this->lp_id . " AND
+                    lp_id = " . $this->lp_id." AND
                     id != $id";
 
         if ($item_type == 'module')
             $sql .= " AND parent_item_id = 0";
 
         $result = Database::query($sql);
-        $arrLP = array ();
+        $arrLP = array();
 
         while ($row = Database :: fetch_array($result)) {
             $arrLP[] = array(
@@ -7330,9 +7330,9 @@ 
 
         $gradebook = isset($_GET['gradebook']) ? Security :: remove_XSS($_GET['gradebook']) : null;
 
-        $url = api_get_self() . '?' .api_get_cidreq().'&gradeboook='.$gradebook.'&action='.$action.'&type='.$item_type.'&lp_id='.$this->lp_id;
+        $url = api_get_self().'?'.api_get_cidreq().'&gradeboook='.$gradebook.'&action='.$action.'&type='.$item_type.'&lp_id='.$this->lp_id;
 
-        $form = new FormValidator('form', 'POST',  $url);
+        $form = new FormValidator('form', 'POST', $url);
 
         $defaults['title'] = api_html_entity_decode($item_title, ENT_QUOTES, $charset);
         $defaults['description'] = $item_description;
@@ -7376,7 +7376,7 @@ 
             $parent_select = $form->addElement('select', 'parent', get_lang('Parent'), '', array('id' => 'idParent', 'onchange' => "javascript: load_cbo(this.value);"));
 
             foreach ($arrHide as $key => $value) {
-                $parent_select->addOption($value['value'], $key, 'style="padding-left:' . $value['padding'] . 'px;"');
+                $parent_select->addOption($value['value'], $key, 'style="padding-left:'.$value['padding'].'px;"');
             }
             if (!empty($s_selected_parent)) {
                 $parent_select->setSelected($s_selected_parent);
@@ -7398,16 +7398,16 @@ 
                     $s_selected_position = $arrLP[$i]['id'];
                 }
 
-                $arrHide[$arrLP[$i]['id']]['value'] = get_lang('After') . ' "' . $arrLP[$i]['title'] . '"';
+                $arrHide[$arrLP[$i]['id']]['value'] = get_lang('After').' "'.$arrLP[$i]['title'].'"';
             }
         }
 
         $position = $form->addElement('select', 'previous', get_lang('Position'), '', array('id' => 'previous'));
         $padding = isset($value['padding']) ? $value['padding'] : 0;
-        $position->addOption(get_lang('FirstPosition'), 0, 'style="padding-left:' . $padding . 'px;"');
+        $position->addOption(get_lang('FirstPosition'), 0, 'style="padding-left:'.$padding.'px;"');
 
         foreach ($arrHide as $key => $value) {
-            $position->addOption($value['value'] . '"', $key, 'style="padding-left:' . $padding . 'px;"');
+            $position->addOption($value['value'].'"', $key, 'style="padding-left:'.$padding.'px;"');
         }
 
         if (!empty ($s_selected_position)) {
@@ -7436,23 +7436,23 @@ 
         //assets can't be modified
 
         //$item_type == 'asset' ||
-        if (( $item_type == 'sco') && ($extension == 'html' || $extension == 'htm')) {
+        if (($item_type == 'sco') && ($extension == 'html' || $extension == 'htm')) {
 
             if ($item_type == 'sco') {
-                $form->addElement('html', '<script type="text/javascript">alert("' . get_lang('WarningWhenEditingScorm') . '")</script>');
+                $form->addElement('html', '<script type="text/javascript">alert("'.get_lang('WarningWhenEditingScorm').'")</script>');
             }
             $renderer = $form->defaultRenderer();
             $renderer->setElementTemplate('<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{label}<br />{element}', 'content_lp');
 
             $relative_prefix = '';
 
-            $editor_config = array( 'ToolbarSet' 			=> 'LearningPathDocuments',
+            $editor_config = array('ToolbarSet' 			=> 'LearningPathDocuments',
                 'Width' 				=> '100%',
                 'Height' 				=> '500',
                 'FullPage' 				=> true,
                 'CreateDocumentDir' 	=> $relative_prefix,
-                'CreateDocumentWebDir' 	=> api_get_path(WEB_COURSE_PATH) . api_get_course_path().'/scorm/',
-                'BaseHref' 				=> api_get_path(WEB_COURSE_PATH) . api_get_course_path().$item_path_fck
+                'CreateDocumentWebDir' 	=> api_get_path(WEB_COURSE_PATH).api_get_course_path().'/scorm/',
+                'BaseHref' 				=> api_get_path(WEB_COURSE_PATH).api_get_course_path().$item_path_fck
             );
 
             $form->addElement('html_editor', 'content_lp', '', null, $editor_config);
@@ -7461,7 +7461,7 @@ 
             $defaults['content_lp'] = file_get_contents($content_path);
         }
 
-        $form->addElement('hidden', 'type', 'dokeos_' . $item_type);
+        $form->addElement('hidden', 'type', 'dokeos_'.$item_type);
         $form->addElement('hidden', 'post_time', time());
         $form->setDefaults($defaults);
         return $form->return_form();
@@ -7499,8 +7499,8 @@ 
         // We don't display the document form if it's not an editable document (html or txt file).
         if ($action == "add") {
             if (is_numeric($extra_info)) {
-                $sql_doc = "SELECT path FROM " . $tbl_doc . "
-                            WHERE c_id = ".$course_id." AND id = " . intval($extra_info);
+                $sql_doc = "SELECT path FROM ".$tbl_doc."
+                            WHERE c_id = ".$course_id." AND id = ".intval($extra_info);
                 $result = Database::query($sql_doc);
                 $path_file = Database :: result($result, 0, 0);
                 $path_parts = pathinfo($path_file);
@@ -7518,13 +7518,13 @@ 
                 $item_title = stripslashes($path_parts['filename']);
             }
         } elseif (is_numeric($extra_info)) {
-            $sql_doc = "SELECT path, title FROM " . $tbl_doc . "
+            $sql_doc = "SELECT path, title FROM ".$tbl_doc."
                         WHERE
                             c_id = ".$course_id." AND
                             id = " . intval($extra_info);
 
             $result = Database::query($sql_doc);
-            $row 	= Database::fetch_array($result);
+            $row = Database::fetch_array($result);
             $item_title = $row['title'];
             $item_title = str_replace('_', ' ', $item_title);
             if (empty ($item_title)) {
@@ -7543,11 +7543,11 @@ 
             $parent = 0;
         }
 
-        $sql = "SELECT * FROM " . $tbl_lp_item . "
-                WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
+        $sql = "SELECT * FROM ".$tbl_lp_item."
+                WHERE c_id = ".$course_id." AND lp_id = ".$this->lp_id;
 
         $result = Database::query($sql);
-        $arrLP = array ();
+        $arrLP = array();
         while ($row = Database :: fetch_array($result)) {
             $arrLP[] = array(
                 'id' => $row['id'],
@@ -7581,9 +7581,9 @@ 
         $return .= '</legend>';
 
         if (isset ($_GET['edit']) && $_GET['edit'] == 'true') {
-            $return .= Display :: return_warning_message('<strong>' . get_lang('Warning') . ' !</strong><br />' . get_lang('WarningEditingDocument'), false);
+            $return .= Display :: return_warning_message('<strong>'.get_lang('Warning').' !</strong><br />'.get_lang('WarningEditingDocument'), false);
         }
-        $form = new FormValidator('form', 'POST', api_get_self() . '?' .$_SERVER['QUERY_STRING'], '', array('enctype'=> "multipart/form-data"));
+        $form = new FormValidator('form', 'POST', api_get_self().'?'.$_SERVER['QUERY_STRING'], '', array('enctype'=> "multipart/form-data"));
         $defaults['title'] = Security :: remove_XSS($item_title);
         if (empty($item_title)) {
             $defaults['title'] = Security::remove_XSS($item_title);
@@ -7619,15 +7619,15 @@ 
         }
 
         $parent_select = $form->addElement('select', 'parent', get_lang('Parent'), '', 'class="form-control" id="idParent" " onchange="javascript: load_cbo(this.value);"');
-        $my_count=0;
+        $my_count = 0;
         foreach ($arrHide as $key => $value) {
-            if ($my_count!=0) {
+            if ($my_count != 0) {
                 // The LP name is also the first section and is not in the same charset like the other sections.
                 $value['value'] = Security :: remove_XSS($value['value']);
-                $parent_select->addOption($value['value'], $key, 'style="padding-left:' . $value['padding'] . 'px;"');
+                $parent_select->addOption($value['value'], $key, 'style="padding-left:'.$value['padding'].'px;"');
             } else {
                 $value['value'] = Security :: remove_XSS($value['value']);
-                $parent_select->addOption($value['value'], $key, 'style="padding-left:' . $value['padding'] . 'px;"');
+                $parent_select->addOption($value['value'], $key, 'style="padding-left:'.$value['padding'].'px;"');
             }
             $my_count++;
         }
@@ -7635,7 +7635,7 @@ 
         if (!empty($id)) {
             $parent_select->setSelected($parent);
         } else {
-            $parent_item_id = isset($_SESSION['parent_item_id']) ? $_SESSION['parent_item_id'] : 0 ;
+            $parent_item_id = isset($_SESSION['parent_item_id']) ? $_SESSION['parent_item_id'] : 0;
             $parent_select->setSelected($parent_item_id);
         }
 
@@ -7652,7 +7652,7 @@ 
                 if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id'] || $action == 'add') {
                     $s_selected_position = $arrLP[$i]['id'];
                 }
-                $arrHide[$arrLP[$i]['id']]['value'] = get_lang('After') . ' "' . $arrLP[$i]['title'] . '"';
+                $arrHide[$arrLP[$i]['id']]['value'] = get_lang('After').' "'.$arrLP[$i]['title'].'"';
             }
         }
 
@@ -7660,8 +7660,8 @@ 
         $position->addOption(get_lang('FirstPosition'), 0);
 
         foreach ($arrHide as $key => $value) {
-            $padding = isset($value['padding']) ? $value['padding']: 0;
-            $position->addOption($value['value'], $key, 'style="padding-left:' . $padding . 'px;"');
+            $padding = isset($value['padding']) ? $value['padding'] : 0;
+            $position->addOption($value['value'], $key, 'style="padding-left:'.$padding.'px;"');
         }
 
         $position->setSelected($s_selected_position);
@@ -7732,7 +7732,7 @@ 
                             $relative_path 	 = array_slice($relative_path, 1, $cnt);
                             $relative_path 	 = implode('/', $relative_path);
                             if (strlen($relative_path) > 0) {
-                                $relative_path = $relative_path . '/';
+                                $relative_path = $relative_path.'/';
                             }
                         } else {
                             $result = $this->generate_lp_folder($_course);
@@ -7746,8 +7746,8 @@ 
                             'Height' 				=> '500',
                             'FullPage' 				=> true,
                             'CreateDocumentDir' 	=> $relative_prefix,
-                            'CreateDocumentWebDir' 	=> api_get_path(WEB_COURSE_PATH) . api_get_course_path().'/document/',
-                            'BaseHref' 				=> api_get_path(WEB_COURSE_PATH) . api_get_course_path().'/document/'.$relative_path
+                            'CreateDocumentWebDir' 	=> api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/',
+                            'BaseHref' 				=> api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/'.$relative_path
                         );
 
                         if ($_GET['action'] == 'add_item') {
@@ -7814,8 +7814,8 @@ 
             $item_url = stripslashes($extra_info['url']);
         } elseif (is_numeric($extra_info)) {
             $extra_info = intval($extra_info);
-            $sql = "SELECT title, description, url FROM " . $tbl_link . "
-                    WHERE c_id = ".$course_id." AND id = " . $extra_info;
+            $sql = "SELECT title, description, url FROM ".$tbl_link."
+                    WHERE c_id = ".$course_id." AND id = ".$extra_info;
             $result = Database::query($sql);
             $row = Database :: fetch_array($result);
             $item_title       = $row['title'];
@@ -7835,8 +7835,8 @@ 
             $parent = 0;
         }
 
-        $sql = "SELECT * FROM " . $tbl_lp_item . "
-                WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
+        $sql = "SELECT * FROM ".$tbl_lp_item."
+                WHERE c_id = ".$course_id." AND lp_id = ".$this->lp_id;
         $result = Database::query($sql);
         $arrLP = array();
 
@@ -7863,10 +7863,10 @@ 
         unset ($this->arrMenu);
 
         if ($action == 'add')
-            $legend .= get_lang('CreateTheLink') . '&nbsp;:';
-        elseif ($action == 'move') $legend .= get_lang('MoveCurrentLink') . '&nbsp;:';
+            $legend .= get_lang('CreateTheLink').'&nbsp;:';
+        elseif ($action == 'move') $legend .= get_lang('MoveCurrentLink').'&nbsp;:';
         else
-            $legend .= get_lang('EditCurrentLink') . '&nbsp;:';
+            $legend .= get_lang('EditCurrentLink').'&nbsp;:';
 
         $legend .= '</legend>';
 
@@ -7877,16 +7877,16 @@ 
 
         if ($action != 'move') {
             $return .= '<tr>';
-            $return .= '<td class="label"><label for="idTitle">' . get_lang('Title') . '</label></td>';
-            $return .= '<td class="input"><input id="idTitle" name="title" size="44" type="text" value="' . $item_title . '" class="learnpath_item_form"/></td>';
+            $return .= '<td class="label"><label for="idTitle">'.get_lang('Title').'</label></td>';
+            $return .= '<td class="input"><input id="idTitle" name="title" size="44" type="text" value="'.$item_title.'" class="learnpath_item_form"/></td>';
             $return .= '</tr>';
         }
 
         $return .= '<tr>';
-        $return .= '<td class="label"><label for="idParent">' . get_lang('Parent') . '</label></td>';
+        $return .= '<td class="label"><label for="idParent">'.get_lang('Parent').'</label></td>';
         $return .= '<td class="input">';
         $return .= '<select id="idParent" style="width:100%;" name="parent" onChange="javascript: load_cbo(this.value);" class="learnpath_item_form" size="1">';
-        $return .= '<option class="top" value="0">' . $this->name . '</option>';
+        $return .= '<option class="top" value="0">'.$this->name.'</option>';
         $arrHide = array(
             $id
         );
@@ -7896,13 +7896,13 @@ 
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($action != 'add') {
                 if (($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') && !in_array($arrLP[$i]['id'], $arrHide) && !in_array($arrLP[$i]['parent_item_id'], $arrHide)) {
-                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    $return .= '<option '.(($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '').'style="padding-left:'.($arrLP[$i]['depth'] * 10).'px;" value="'.$arrLP[$i]['id'].'">'.$arrLP[$i]['title'].'</option>';
                 } else {
                     $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>';
+                    $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>';
             }
         }
 
@@ -7914,11 +7914,11 @@ 
         $return .= '</td>';
         $return .= '</tr>';
         $return .= '<tr>';
-        $return .= '<td class="label"><label for="previous">' . get_lang('Position') . '</label></td>';
+        $return .= '<td class="label"><label for="previous">'.get_lang('Position').'</label></td>';
         $return .= '<td class="input">';
 
         $return .= '<select id="previous" name="previous" style="width:100%;" size="1" class="learnpath_item_form">';
-        $return .= '<option class="top" value="0">' . get_lang('FirstPosition') . '</option>';
+        $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'])
@@ -7928,7 +7928,7 @@ 
                 else
                     $selected = '';
 
-                $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' . get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
+                $return .= '<option '.$selected.'value="'.$arrLP[$i]['id'].'">'.get_lang('After').' "'.$arrLP[$i]['title'].'"</option>';
             }
         }
         $return .= '</select>';
@@ -7937,8 +7937,8 @@ 
 
         if ($action != 'move') {
             $return .= '<tr>';
-            $return .= '<td class="label"><label for="idURL">' . get_lang('Url') . '</label></td>';
-            $return .= '<td class="input"><input' . (is_numeric($extra_info) ? ' disabled="disabled"' : '') . ' id="idURL" name="url" style="width:99%;" type="text" value="' . $item_url . '" class="learnpath_item_form" /></td>';
+            $return .= '<td class="label"><label for="idURL">'.get_lang('Url').'</label></td>';
+            $return .= '<td class="input"><input'.(is_numeric($extra_info) ? ' disabled="disabled"' : '').' id="idURL" name="url" style="width:99%;" type="text" value="'.$item_url.'" class="learnpath_item_form" /></td>';
             $return .= '</tr>';
             $id_prerequisite = 0;
             if (is_array($arrLP)) {
@@ -7965,25 +7965,25 @@ 
 
         $return .= '<tr>';
         if ($action == 'add') {
-            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit">' . get_lang('AddLinkToCourse') . '</button></td>';
+            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit">'.get_lang('AddLinkToCourse').'</button></td>';
         } else {
-            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit">' . get_lang('EditCurrentLink') . '</button></td>';
+            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit">'.get_lang('EditCurrentLink').'</button></td>';
         }
         $return .= '</tr>';
         $return .= '</table>';
 
         if ($action == 'move') {
-            $return .= '<input name="title" type="hidden" value="' . $item_title . '" />';
-            $return .= '<input name="description" type="hidden" value="' . $item_description . '" />';
+            $return .= '<input name="title" type="hidden" value="'.$item_title.'" />';
+            $return .= '<input name="description" type="hidden" value="'.$item_description.'" />';
         }
 
         if (is_numeric($extra_info)) {
-            $return .= '<input name="path" type="hidden" value="' . $extra_info . '" />';
+            $return .= '<input name="path" type="hidden" value="'.$extra_info.'" />';
         } elseif (is_array($extra_info)) {
-            $return .= '<input name="path" type="hidden" value="' . $extra_info['path'] . '" />';
+            $return .= '<input name="path" type="hidden" value="'.$extra_info['path'].'" />';
         }
-        $return .= '<input name="type" type="hidden" value="' . TOOL_LINK . '" />';
-        $return .= '<input name="post_time" type="hidden" value="' . time() . '" />';
+        $return .= '<input name="type" type="hidden" value="'.TOOL_LINK.'" />';
+        $return .= '<input name="post_time" type="hidden" value="'.time().'" />';
         $return .= '</form>';
         $return .= '</div>';
 
@@ -8009,8 +8009,8 @@ 
         } elseif (is_numeric($extra_info)) {
             $extra_info = intval($extra_info);
             $sql = "SELECT title, description
-                    FROM " . $tbl_publication . "
-                    WHERE c_id = ".$course_id." AND id = " . $extra_info;
+                    FROM " . $tbl_publication."
+                    WHERE c_id = ".$course_id." AND id = ".$extra_info;
 
             $result = Database::query($sql);
             $row = Database :: fetch_array($result);
@@ -8026,13 +8026,13 @@ 
             $parent = 0;
         }
 
-        $sql = "SELECT * FROM " . $tbl_lp_item . "
-                WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
+        $sql = "SELECT * FROM ".$tbl_lp_item."
+                WHERE c_id = ".$course_id." AND lp_id = ".$this->lp_id;
 
         $result = Database::query($sql);
         $arrLP = array();
         while ($row = Database :: fetch_array($result)) {
-            $arrLP[] = array (
+            $arrLP[] = array(
                 'id' => $row['id'],
                 'item_type' => $row['item_type'],
                 'title' => $row['title'],
@@ -8078,7 +8078,7 @@ 
             ]
         );
 
-        $arrHide = array (
+        $arrHide = array(
             $id
         );
 
@@ -8096,7 +8096,7 @@ 
                     $parentSelect->addOption(
                         $arrLP[$i]['title'],
                         $arrLP[$i]['id'],
-                        ['style' => 'padding-left: ' . (($arrLP[$i]['depth'] * 10) + 20) . 'px;']
+                        ['style' => 'padding-left: '.(($arrLP[$i]['depth'] * 10) + 20).'px;']
                     );
 
                     if ($parent == $arrLP[$i]['id']) {
@@ -8113,7 +8113,7 @@ 
                     $parentSelect->addOption(
                         $arrLP[$i]['title'],
                         $arrLP[$i]['id'],
-                        ['style' => 'padding-left: ' . (($arrLP[$i]['depth'] * 10) + 20) . 'px;']
+                        ['style' => 'padding-left: '.(($arrLP[$i]['depth'] * 10) + 20).'px;']
                     );
 
                     if ($parent == $arrLP[$i]['id']) {
@@ -8137,7 +8137,7 @@ 
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
                 $previousSelect->addOption(
-                    get_lang('After') . ' "' . $arrLP[$i]['title'] . '"',
+                    get_lang('After').' "'.$arrLP[$i]['title'].'"',
                     $arrLP[$i]['id']
                 );
 
@@ -8159,7 +8159,7 @@ 
                     }
                 }
             }
-            $arrHide = array ();
+            $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'])
@@ -8251,8 +8251,8 @@ 
 
         $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
         $item_id = intval($item_id);
-        $sql = "SELECT * FROM " . $tbl_lp_item . " as lp
-                WHERE lp.c_id = ".$course_id." AND lp.id = " . $item_id;
+        $sql = "SELECT * FROM ".$tbl_lp_item." as lp
+                WHERE lp.c_id = ".$course_id." AND lp.id = ".$item_id;
         $result = Database::query($sql);
         $row = Database::fetch_assoc($result);
 
@@ -8266,16 +8266,16 @@ 
             $audio_player .= '<script>
                                 var s1 = new SWFObject("../inc/lib/mediaplayer/player.swf","ply","250","20","9","#FFFFFF");
                                 s1.addParam("allowscriptaccess","always");
-                                s1.addParam("flashvars","file=../../courses/' . $_course['path'] . '/document/audio/' . $row['audio'] . '&autostart=true");
+                                s1.addParam("flashvars","file=../../courses/' . $_course['path'].'/document/audio/'.$row['audio'].'&autostart=true");
                                 s1.write("container");
                             </script>';
         }
 
-        $url = api_get_self().'?cidReq='.Security::remove_XSS($_GET['cidReq']).'&view=build&id='.$item_id .'&lp_id='.$this->lp_id;
+        $url = api_get_self().'?cidReq='.Security::remove_XSS($_GET['cidReq']).'&view=build&id='.$item_id.'&lp_id='.$this->lp_id;
 
         $return .= Display::url(
             Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL),
-            $url.'&action=edit_item&path_item=' . $row['path']
+            $url.'&action=edit_item&path_item='.$row['path']
         );
 
         $return .= Display::url(
@@ -8295,7 +8295,7 @@ 
             $url.'&action=delete_item'
         );
 
-        if ($item_type == TOOL_HOTPOTATOES ) {
+        if ($item_type == TOOL_HOTPOTATOES) {
             $document_data = DocumentManager::get_document_data_by_id($row['path'], $course_code);
             $return .= get_lang('File').': '.$document_data['absolute_path_from_document'];
         }
@@ -8321,13 +8321,13 @@ 
     public function get_js_dropdown_array()
     {
         $course_id = api_get_course_int_id();
-        $return = 'var child_name = new Array();' . "\n";
-        $return .= 'var child_value = new Array();' . "\n\n";
-        $return .= 'child_name[0] = new Array();' . "\n";
-        $return .= 'child_value[0] = new Array();' . "\n\n";
+        $return = 'var child_name = new Array();'."\n";
+        $return .= 'var child_value = new Array();'."\n\n";
+        $return .= 'child_name[0] = new Array();'."\n";
+        $return .= 'child_value[0] = new Array();'."\n\n";
         $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
-        $sql_zero = "SELECT * FROM " . $tbl_lp_item . "
-                    WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id . " AND parent_item_id = 0
+        $sql_zero = "SELECT * FROM ".$tbl_lp_item."
+                    WHERE c_id = ".$course_id." AND lp_id = ".$this->lp_id." AND parent_item_id = 0
                     ORDER BY display_order ASC";
         $res_zero = Database::query($sql_zero);
         $i = 0;
@@ -8337,28 +8337,28 @@ 
                 $row_zero['title'] = Exercise::get_formated_title_variable($row_zero['title']);
             }
             $js_var = json_encode(get_lang('After').' '.$row_zero['title']);
-            $return .= 'child_name[0][' . $i . '] = '.$js_var.' ;' . "\n";
-            $return .= 'child_value[0][' . $i++ . '] = "' . $row_zero['id'] . '";' . "\n";
+            $return .= 'child_name[0]['.$i.'] = '.$js_var.' ;'."\n";
+            $return .= 'child_value[0]['.$i++.'] = "'.$row_zero['id'].'";'."\n";
         }
         $return .= "\n";
-        $sql = "SELECT * FROM " . $tbl_lp_item . "
-                WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
+        $sql = "SELECT * FROM ".$tbl_lp_item."
+                WHERE c_id = ".$course_id." AND lp_id = ".$this->lp_id;
         $res = Database::query($sql);
         while ($row = Database :: fetch_array($res)) {
-            $sql_parent = "SELECT * FROM " . $tbl_lp_item . "
+            $sql_parent = "SELECT * FROM ".$tbl_lp_item."
                            WHERE
                                 c_id = ".$course_id." AND
-                                parent_item_id = " . $row['id'] . "
+                                parent_item_id = " . $row['id']."
                            ORDER BY display_order ASC";
             $res_parent = Database::query($sql_parent);
             $i = 0;
-            $return .= 'child_name[' . $row['id'] . '] = new Array();' . "\n";
-            $return .= 'child_value[' . $row['id'] . '] = new Array();' . "\n\n";
+            $return .= 'child_name['.$row['id'].'] = new Array();'."\n";
+            $return .= 'child_value['.$row['id'].'] = new Array();'."\n\n";
 
             while ($row_parent = Database :: fetch_array($res_parent)) {
                 $js_var = json_encode(get_lang('After').' '.$row_parent['title']);
-                $return .= 'child_name[' . $row['id'] . '][' . $i . '] =   '.$js_var.' ;' . "\n";
-                $return .= 'child_value[' . $row['id'] . '][' . $i++ . '] = "' . $row_parent['id'] . '";' . "\n";
+                $return .= 'child_name['.$row['id'].']['.$i.'] =   '.$js_var.' ;'."\n";
+                $return .= 'child_value['.$row['id'].']['.$i++.'] = "'.$row_parent['id'].'";'."\n";
             }
             $return .= "\n";
         }
@@ -8379,8 +8379,8 @@ 
         if (is_numeric($item_id)) {
             $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
 
-            $sql = "SELECT * FROM " . $tbl_lp_item . "
-                    WHERE c_id = ".$course_id." AND id = " . $item_id;
+            $sql = "SELECT * FROM ".$tbl_lp_item."
+                    WHERE c_id = ".$course_id." AND id = ".$item_id;
 
             $res = Database::query($sql);
             $row = Database :: fetch_array($res);
@@ -8439,7 +8439,7 @@ 
      */
     public function display_item_small_form($item_type, $title = '', $data = array())
     {
-        $url = api_get_self() . '?' .api_get_cidreq().'&action=edit_item&lp_id='.$this->lp_id;
+        $url = api_get_self().'?'.api_get_cidreq().'&action=edit_item&lp_id='.$this->lp_id;
         $form = new FormValidator('small_form', 'post', $url);
         $form->addElement('header', $title);
         $form->addElement('text', 'title', get_lang('Title'));
@@ -8465,7 +8465,7 @@ 
         $item_id = intval($item_id);
         /* Current prerequisite */
         $sql = "SELECT * FROM $tbl_lp_item
-                WHERE c_id = $course_id AND id = " . $item_id;
+                WHERE c_id = $course_id AND id = ".$item_id;
         $result = Database::query($sql);
         $row    = Database::fetch_array($result);
         $prerequisiteId = $row['prerequisite'];
@@ -8475,20 +8475,20 @@ 
         $return .= '<form method="POST">';
         $return .= '<table class="data_table">';
         $return .= '<tr>';
-        $return .= '<th height="24">' . get_lang('LearnpathPrerequisites') . '</th>';
-        $return .= '<th width="70" >' . get_lang('Minimum') . '</th>';
-        $return .= '<th width="70">' . get_lang('Maximum') . '</th>';
+        $return .= '<th height="24">'.get_lang('LearnpathPrerequisites').'</th>';
+        $return .= '<th width="70" >'.get_lang('Minimum').'</th>';
+        $return .= '<th width="70">'.get_lang('Maximum').'</th>';
         $return .= '</tr>';
 
         // Adding the none option to the prerequisites see http://www.chamilo.org/es/node/146
         $return .= '<tr >';
         $return .= '<td colspan="3" class="radio">';
         $return .= '<input checked="checked" id="idNone" name="prerequisites"  style="margin-left:0px; margin-right:10px;" type="radio" />';
-        $return .= '<label for="idNone">' . get_lang('None') . '</label>';
+        $return .= '<label for="idNone">'.get_lang('None').'</label>';
         $return .= '</tr>';
 
         $sql = "SELECT * FROM $tbl_lp_item
-                WHERE c_id = $course_id AND lp_id = " . $this->lp_id;
+                WHERE c_id = $course_id AND lp_id = ".$this->lp_id;
         $result = Database::query($sql);
         $arrLP = array();
 
@@ -8531,25 +8531,25 @@ 
             }
 
             $selectedMaxScoreValue = isset($selectedMaxScore[$item['id']]) ? $selectedMaxScore[$item['id']] : $item['max_score'];
-            $selectedMinScoreValue = isset($selectedMinScore[$item['id']]) ? $selectedMinScore[$item['id']]: 0;
+            $selectedMinScoreValue = isset($selectedMinScore[$item['id']]) ? $selectedMinScore[$item['id']] : 0;
 
             $return .= '<tr>';
-            $return .= '<td class="radio"' . (($item['item_type'] != TOOL_QUIZ && $item['item_type'] != TOOL_HOTPOTATOES) ? ' colspan="3"' : '') . '>';
-            $return .= '<label for="id' . $item['id'] . '">';
-            $return .= '<input' . (in_array($prerequisiteId, array($item['id'], $item['ref'])) ? ' checked="checked" ' : '') . (($item['item_type'] == 'dokeos_module' || $item['item_type'] == 'dokeos_chapter') ? ' disabled="disabled" ' : ' ') . 'id="id' . $item['id'] . '" name="prerequisites" style="margin-left:' . $item['depth'] * 10 . 'px; margin-right:10px;" type="radio" value="' . $item['id'] . '" />';
+            $return .= '<td class="radio"'.(($item['item_type'] != TOOL_QUIZ && $item['item_type'] != TOOL_HOTPOTATOES) ? ' colspan="3"' : '').'>';
+            $return .= '<label for="id'.$item['id'].'">';
+            $return .= '<input'.(in_array($prerequisiteId, array($item['id'], $item['ref'])) ? ' checked="checked" ' : '').(($item['item_type'] == 'dokeos_module' || $item['item_type'] == 'dokeos_chapter') ? ' disabled="disabled" ' : ' ').'id="id'.$item['id'].'" name="prerequisites" style="margin-left:'.$item['depth'] * 10.'px; margin-right:10px;" type="radio" value="'.$item['id'].'" />';
             $icon_name = str_replace(' ', '', $item['item_type']);
 
-            if (file_exists('../img/lp_' . $icon_name . '.png')) {
-                $return .= Display::return_icon('lp_' . $icon_name . '.png');
+            if (file_exists('../img/lp_'.$icon_name.'.png')) {
+                $return .= Display::return_icon('lp_'.$icon_name.'.png');
             } else {
-                if (file_exists('../img/lp_' . $icon_name . '.gif')) {
-                    $return .= Display::return_icon('lp_' . $icon_name . '.gif');
+                if (file_exists('../img/lp_'.$icon_name.'.gif')) {
+                    $return .= Display::return_icon('lp_'.$icon_name.'.gif');
                 } else {
                     $return .= Display::return_icon('folder_document.gif', '', array('style'=>'margin-right:5px;'));
                 }
             }
 
-            $return .=  $item['title'] . '</label>';
+            $return .= $item['title'].'</label>';
             $return .= '</td>';
 
             if ($item['item_type'] == TOOL_QUIZ) {
@@ -8563,19 +8563,19 @@ 
                 $item['max_score'] = $tmp_obj_lp_item->max_score;
 
                 $return .= '<td class="exercise">';
-                $return .= '<input size="4" maxlength="3" name="min_' . $item['id'] . '" type="number" min="0" step="any" max="'.$item['max_score'].'" value="' . $selectedMinScoreValue. '" />';
+                $return .= '<input size="4" maxlength="3" name="min_'.$item['id'].'" type="number" min="0" step="any" max="'.$item['max_score'].'" value="'.$selectedMinScoreValue.'" />';
                 $return .= '</td>';
                 $return .= '<td class="exercise">';
-                $return .= '<input size="4" maxlength="3" name="max_' . $item['id'] . '" type="number" min="0" step="any" max="'.$item['max_score'].'" value="' . $selectedMaxScoreValue . '" />';
+                $return .= '<input size="4" maxlength="3" name="max_'.$item['id'].'" type="number" min="0" step="any" max="'.$item['max_score'].'" value="'.$selectedMaxScoreValue.'" />';
                 $return .= '</td>';
             }
 
             if ($item['item_type'] == TOOL_HOTPOTATOES) {
                 $return .= '<td class="exercise">';
-                $return .= '<center><input size="4" maxlength="3" name="min_' . $item['id'] . '" type="number" min="0" step="any" max="'.$item['max_score'].'" value="' . $selectedMinScoreValue . '" /></center>';
+                $return .= '<center><input size="4" maxlength="3" name="min_'.$item['id'].'" type="number" min="0" step="any" max="'.$item['max_score'].'" value="'.$selectedMinScoreValue.'" /></center>';
                 $return .= '</td>';
                 $return .= '<td class="exercise"">';
-                $return .= '<center><input size="4" maxlength="3" name="max_' . $item['id'] . '" type="number" min="0" step="any" max="'.$item['max_score'].'"  value="'.$selectedMaxScoreValue . '" /></center>';
+                $return .= '<center><input size="4" maxlength="3" name="max_'.$item['id'].'" type="number" min="0" step="any" max="'.$item['max_score'].'"  value="'.$selectedMaxScoreValue.'" /></center>';
                 $return .= '</td>';
             }
             $return .= '</tr>';
@@ -8584,7 +8584,7 @@ 
         $return .= '</tr>';
         $return .= '</table>';
         $return .= '<div style="padding-top:3px;">';
-        $return .= '<button class="btn btn-primary" name="submit_button" type="submit">' . get_lang('ModifyPrerequisites') . '</button>';
+        $return .= '<button class="btn btn-primary" name="submit_button" type="submit">'.get_lang('ModifyPrerequisites').'</button>';
         $return .= '</form>';
 
         return $return;
@@ -8620,7 +8620,7 @@ 
                 if ($row['id'] == $lp_id) {
                     continue;
                 }
-                $return .= '<option value="'.$row['id'].'" '.(($row['id']==$prerequisiteId)?' selected ' : '').'>'.$row['name'].'</option>';
+                $return .= '<option value="'.$row['id'].'" '.(($row['id'] == $prerequisiteId) ? ' selected ' : '').'>'.$row['name'].'</option>';
             }
         }
         $return .= '</select>';
@@ -8680,8 +8680,8 @@ 
                      WHERE c_id = $course_id AND $activeCondition $condition_session
                      ORDER BY title ASC";
 
-        $sql_hot  = "SELECT * FROM $tbl_doc
-                     WHERE c_id = $course_id AND path LIKE '" . $uploadPath . "/%/%htm%'  $condition_session
+        $sql_hot = "SELECT * FROM $tbl_doc
+                     WHERE c_id = $course_id AND path LIKE '".$uploadPath."/%/%htm%'  $condition_session
                      ORDER BY id ASC";
 
         $res_quiz = Database::query($sql_quiz);
@@ -8690,8 +8690,8 @@ 
         $return = '<ul class="lp_resource">';
         $return .= '<li class="lp_resource_element">';
         $return .= Display::return_icon('new_test_small.gif');
-        $return .= '<a href="' . api_get_path(WEB_CODE_PATH) . 'exercice/exercise_admin.php?'.api_get_cidreq().'&lp_id=' . $this->lp_id . '">' .
-            get_lang('NewExercise') . '</a>';
+        $return .= '<a href="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_admin.php?'.api_get_cidreq().'&lp_id='.$this->lp_id.'">'.
+            get_lang('NewExercise').'</a>';
         $return .= '</li>';
 
         // Display hotpotatoes
@@ -8703,8 +8703,8 @@ 
             $return .= '</a> ';
 
             $return .= Display::return_icon('hotpotatoes_s.png');
-            $return .= '<a href="' . api_get_self() . '?' . api_get_cidreq().'&action=add_item&type=' . TOOL_HOTPOTATOES . '&file=' . $row_hot['id'] . '&lp_id=' . $this->lp_id . '">'.
-                ((!empty ($row_hot['comment'])) ? $row_hot['comment'] : Security :: remove_XSS($row_hot['title'])) . '</a>';
+            $return .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=add_item&type='.TOOL_HOTPOTATOES.'&file='.$row_hot['id'].'&lp_id='.$this->lp_id.'">'.
+                ((!empty ($row_hot['comment'])) ? $row_hot['comment'] : Security :: remove_XSS($row_hot['title'])).'</a>';
             $return .= '</li>';
         }
 
@@ -8714,7 +8714,7 @@ 
             $return .= Display::return_icon('move_everywhere.png', get_lang('Move'), array(), ICON_SIZE_TINY);
             $return .= '</a> ';
             $return .= Display::return_icon('quizz_small.gif', '', array(), ICON_SIZE_TINY);
-            $return .= '<a href="' . api_get_self() . '?'.api_get_cidreq().'&action=add_item&type=' . TOOL_QUIZ . '&file=' . $row_quiz['id'] . '&lp_id=' . $this->lp_id . '">' .
+            $return .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=add_item&type='.TOOL_QUIZ.'&file='.$row_quiz['id'].'&lp_id='.$this->lp_id.'">'.
                 Security :: remove_XSS(cut($row_quiz['title'], 80)).
                 '</a>';
             $return .= '</li>';
@@ -8788,7 +8788,7 @@ 
         foreach ($categorizedLinks as $categoryId => $links) {
             $linkNodes = null;
             foreach ($links as $key => $title) {
-                if (api_get_item_visibility($course, TOOL_LINK, $key, $session_id) != 2)  {
+                if (api_get_item_visibility($course, TOOL_LINK, $key, $session_id) != 2) {
                     $linkNodes .=
                         '<li class="lp_resource_element" data_id="'.$key.'" data_type="'.TOOL_LINK.'" title="'.$title.'" >
                         <a class="moved" href="#">'.
@@ -8826,7 +8826,7 @@ 
         $return = '<div class="lp_resource" >';
         $return .= '<div class="lp_resource_element">';
         $return .= Display::return_icon('works_small.gif', '', array(), ICON_SIZE_TINY);
-        $return .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&action=add_item&type=' . TOOL_STUDENTPUBLICATION . '&lp_id=' . $this->lp_id . '">' . get_lang('AddAssignmentPage') . '</a>';
+        $return .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=add_item&type='.TOOL_STUDENTPUBLICATION.'&lp_id='.$this->lp_id.'">'.get_lang('AddAssignmentPage').'</a>';
         $return .= '</div>';
         $return .= '</div>';
         return $return;
@@ -8849,7 +8849,7 @@ 
         $return .= Display::return_icon('forum_new_small.gif');
         $return .= Display::url(
             get_lang('CreateANewForum'),
-            api_get_path(WEB_CODE_PATH) . 'forum/index.php?' . api_get_cidreq() . '&' . http_build_query([
+            api_get_path(WEB_CODE_PATH).'forum/index.php?'.api_get_cidreq().'&'.http_build_query([
                 'action' => 'add',
                 'content' => 'forum',
                 'lp_id' => $this->lp_id
@@ -8877,15 +8877,15 @@ 
                 $return .= Display::return_icon('move_everywhere.png', get_lang('Move'), array(), ICON_SIZE_TINY);
                 $return .= ' </a>';
                 $return .= Display::return_icon('lp_forum.png', '', array(), ICON_SIZE_TINY);
-                $return .= '<a style="cursor:hand" onclick="javascript: toggle_forum(' . $forum['forum_id'] . ')" style="vertical-align:middle">
-                                <img src="' . Display::returnIconPath('add.gif').'" id="forum_' . $forum['forum_id'] . '_opener" align="absbottom" />
+                $return .= '<a style="cursor:hand" onclick="javascript: toggle_forum('.$forum['forum_id'].')" style="vertical-align:middle">
+                                <img src="' . Display::returnIconPath('add.gif').'" id="forum_'.$forum['forum_id'].'_opener" align="absbottom" />
                             </a>
-                            <a href="' . api_get_self() . '?'.api_get_cidreq().'&action=add_item&type=' . TOOL_FORUM . '&forum_id=' . $forum['forum_id'] . '&lp_id=' . $this->lp_id . '" style="vertical-align:middle">' .
-                    Security :: remove_XSS($forum['forum_title']) . '</a>';
+                            <a href="' . api_get_self().'?'.api_get_cidreq().'&action=add_item&type='.TOOL_FORUM.'&forum_id='.$forum['forum_id'].'&lp_id='.$this->lp_id.'" style="vertical-align:middle">'.
+                    Security :: remove_XSS($forum['forum_title']).'</a>';
 
                 $return .= '</li>';
 
-                $return .= '<div style="display:none" id="forum_' . $forum['forum_id'] . '_content">';
+                $return .= '<div style="display:none" id="forum_'.$forum['forum_id'].'_content">';
                 $a_threads = get_threads($forum['forum_id']);
                 if (is_array($a_threads)) {
                     foreach ($a_threads as $thread) {
@@ -8894,8 +8894,8 @@ 
                         $return .= Display::return_icon('move_everywhere.png', get_lang('Move'), array(), ICON_SIZE_TINY);
                         $return .= ' </a>';
                         $return .= Display::return_icon('forumthread.png', get_lang('Thread'), array(), ICON_SIZE_TINY);
-                        $return .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=add_item&type=' . TOOL_THREAD . '&thread_id=' . $thread['thread_id'] . '&lp_id=' . $this->lp_id . '">' .
-                            Security :: remove_XSS($thread['thread_title']) . '</a>';
+                        $return .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=add_item&type='.TOOL_THREAD.'&thread_id='.$thread['thread_id'].'&lp_id='.$this->lp_id.'">'.
+                            Security :: remove_XSS($thread['thread_title']).'</a>';
                         $return .= '</li>';
                     }
                 }
@@ -8966,7 +8966,7 @@ 
         if (is_dir($current_course_path.'/scorm/'.$this->path) && is_file($current_course_path.'/scorm/'.$this->path.'/imsmanifest.xml')) {
             // Remove the possible . at the end of the path.
             $dest_path_to_lp = substr($this->path, -1) == '.' ? substr($this->path, 0, -1) : $this->path;
-            $dest_path_to_scorm_folder = str_replace('//','/',$temp_zip_dir.'/scorm/'.$dest_path_to_lp);
+            $dest_path_to_scorm_folder = str_replace('//', '/', $temp_zip_dir.'/scorm/'.$dest_path_to_lp);
             mkdir($dest_path_to_scorm_folder, api_get_permissions_for_new_directories(), true);
             $zip_files_dist = copyr($current_course_path.'/scorm/'.$this->path, $dest_path_to_scorm_folder, array('imsmanifest'), $zip_files);
         }
@@ -9034,7 +9034,7 @@ 
                 if ($item->type == 'sco') {
                     $inc_docs = $item->get_resources_from_source(
                         null,
-                        api_get_path(SYS_COURSE_PATH) . api_get_course_path() . '/' . 'scorm/' . $this->path . '/' . $item->get_path()
+                        api_get_path(SYS_COURSE_PATH).api_get_course_path().'/'.'scorm/'.$this->path.'/'.$item->get_path()
                     );
                 } else {
                     $inc_docs = $item->get_resources_from_source();
@@ -9250,7 +9250,7 @@ 
                                         $file_path = substr($file_path, strlen($current_dir)); // We get the relative path.
                                         $zip_files[] = $my_sub_dir.'/'.$file_path;
                                         $link_updates[$my_file_path][] = array('orig' => $doc_info[0], 'dest' => $file_path);
-                                        $my_dep_file->setAttribute('href','document/'.$file_path);
+                                        $my_dep_file->setAttribute('href', 'document/'.$file_path);
                                         $my_dep->setAttribute('xml:base', '');
                                     }
                                 }
@@ -9381,7 +9381,7 @@ 
                         //$my_item->appendChild($my_max_score);
                         // Give a child element <adlcp:prerequisites> to the <item> element.
                         $my_prereqs = $xmldoc->createElement('adlcp:prerequisites', $item->get_prereq_string());
-                        $my_prereqs->setAttribute('type','aicc_script');
+                        $my_prereqs->setAttribute('type', 'aicc_script');
                         $my_item->appendChild($my_prereqs);
                         // Give a child element <adlcp:masteryscore> to the <item> element.
                         $my_masteryscore = $xmldoc->createElement('adlcp:masteryscore', $item->get_mastery_score());
@@ -9434,7 +9434,7 @@ 
                         $my_resource->appendChild($my_file);
 
                         // Get included docs.
-                        $inc_docs = $item->get_resources_from_source(null,$tmp_file_path);
+                        $inc_docs = $item->get_resources_from_source(null, $tmp_file_path);
                         // Dependency to other files - not yet supported.
                         $i = 1;
                         foreach ($inc_docs as $doc_info) {
@@ -9495,7 +9495,7 @@ 
                                         $my_dep_file->setAttribute('href', $file_path);
                                         $my_dep->setAttribute('xml:base', '');
 
-                                        if (strstr($file_path,$main_path) !== false) {
+                                        if (strstr($file_path, $main_path) !== false) {
                                             // The calculated real path is really inside the chamilo root path.
                                             // Reduce file path to what's under the DocumentRoot.
                                             $file_path = substr($file_path, strlen($root_path));
@@ -9513,7 +9513,7 @@ 
                                             $file_path = $_SERVER['DOCUMENT_ROOT'].$doc_info[0];
                                             $file_path = str_replace('//', '/', $file_path);
                                             if (file_exists($file_path)) {
-                                                $file_path = substr($file_path,strlen($current_dir)); // We get the relative path.
+                                                $file_path = substr($file_path, strlen($current_dir)); // We get the relative path.
                                                 $zip_files[] = $my_sub_dir.'/'.$file_path;
                                                 $link_updates[$my_file_path][] = array('orig' => $doc_info[0], 'dest' => $file_path);
                                                 $my_dep_file->setAttribute('href', 'document/'.$file_path);
@@ -9742,7 +9742,7 @@ 
             if (strpos($extra_file, '.') === 0)
                 continue;
             else {
-                $dest_file = $archive_path . $temp_dir_short . '/' . $extra_file;
+                $dest_file = $archive_path.$temp_dir_short.'/'.$extra_file;
                 $this->create_path($dest_file);
                 copy($main_code_path.$extra_file, $dest_file);
             }
@@ -9795,7 +9795,7 @@ 
                             }
                             $file_path = api_get_path(SYS_COURSE_PATH).$course_data['path'].'/document'.$file_data['path'];
                             if (file_exists($file_path)) {
-                                $files_to_export[] = array('title'=>$item->get_title(),'path'=>$file_path);
+                                $files_to_export[] = array('title'=>$item->get_title(), 'path'=>$file_path);
                             }
                             break;
                         case 'asset': //commes from a scorm package generated by chamilo
@@ -9835,12 +9835,12 @@ 
 
         foreach ($path_bits as $bit) {
             if (!empty ($bit)) {
-                $new_path = $path_built . $bit;
+                $new_path = $path_built.$bit;
                 if (is_dir($new_path)) {
-                    $path_built = $new_path . '/';
+                    $path_built = $new_path.'/';
                 } else {
                     mkdir($new_path, api_get_permissions_for_new_directories());
-                    $path_built = $new_path . '/';
+                    $path_built = $new_path.'/';
                 }
             }
         }
@@ -9884,9 +9884,9 @@ 
 
         if ($upload_ok) {
             if ($has_attachment) {
-                $courseDir = api_get_course_path() . '/upload/learning_path/images';
+                $courseDir = api_get_course_path().'/upload/learning_path/images';
                 $sys_course_path = api_get_path(SYS_COURSE_PATH);
-                $updir = $sys_course_path . $courseDir;
+                $updir = $sys_course_path.$courseDir;
                 // Try to add an extension to the file if it hasn't one.
                 $new_file_name = add_ext_on_mime(stripslashes($image_array['name']), $image_array['type']);
 
@@ -9941,7 +9941,7 @@ 
             //Setting my lp_id to autolaunch = 1
             $attributes['autolaunch'] = 1;
             $where = array('id = ? AND session_id = ? AND c_id = ?'=> array($lp_id, api_get_session_id(), $course_id));
-            Database::update($lp_table, $attributes, $where );
+            Database::update($lp_table, $attributes, $where);
         }
     }
 
@@ -9960,13 +9960,13 @@ 
 
         // Get the max order of the items
         $sql_max_order = "SELECT max(display_order) AS display_order FROM $table_lp_item
-    	                  WHERE c_id = $course_id AND lp_id = '" . $this->lp_id . "'";
+    	                  WHERE c_id = $course_id AND lp_id = '".$this->lp_id."'";
         $rs_max_order = Database::query($sql_max_order);
         $row_max_order = Database::fetch_object($rs_max_order);
         $max_order = $row_max_order->display_order;
         // Get the previous item ID
         $sql = "SELECT id as previous FROM $table_lp_item
-                WHERE c_id = $course_id AND lp_id = '" . $this->lp_id . "' AND display_order = '".$max_order."' ";
+                WHERE c_id = $course_id AND lp_id = '".$this->lp_id."' AND display_order = '".$max_order."' ";
         $rs_max = Database::query($sql);
         $row_max = Database::fetch_object($rs_max);
 
@@ -10022,9 +10022,9 @@ 
         $documents_total_space = DocumentManager::documents_total_space();
         $course_max_space = DocumentManager::get_course_quota();
         $total_size = filesize($s) + $documents_total_space;
-        if (filesize($s)>$post_max || filesize($s)>$upl_max  || $total_size>$course_max_space ){
+        if (filesize($s) > $post_max || filesize($s) > $upl_max || $total_size > $course_max_space) {
             return true;
-        } else{
+        } else {
             return false;
         }
     }
@@ -10364,7 +10364,7 @@ 
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::set_subscribe_users()', 0);
         }
-        $this->subscribeUsers = intval($value);;
+        $this->subscribeUsers = intval($value); ;
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = $this->get_id();
         $sql = "UPDATE $lp_table SET subscribe_users = ".$this->subscribeUsers."
@@ -10710,7 +10710,7 @@ 
      */
     public function createForum($forumCategoryId)
     {
-        require_once api_get_path(SYS_CODE_PATH) . '/forum/forumfunction.inc.php';
+        require_once api_get_path(SYS_CODE_PATH).'/forum/forumfunction.inc.php';
 
         $forumId = store_forum(
             [
@@ -10749,7 +10749,7 @@ 
 
     private function getFinalItemTemplate()
     {
-        return file_get_contents(api_get_path(SYS_CODE_PATH) . 'newscorm/final_item_template/template.html');
+        return file_get_contents(api_get_path(SYS_CODE_PATH).'newscorm/final_item_template/template.html');
     }
 
     private function getSavedFinalItem()
@@ -10790,11 +10790,11 @@ 
             'Height' => '500',
             'FullPage' => true,
             'CreateDocumentDir' => $relative_prefix,
-            'CreateDocumentWebDir' => api_get_path(WEB_COURSE_PATH) . api_get_course_path() . '/document/',
-            'BaseHref' => api_get_path(WEB_COURSE_PATH) . api_get_course_path() . '/document/' . $relative_path
+            'CreateDocumentWebDir' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/',
+            'BaseHref' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/'.$relative_path
         ];
 
-        $url = api_get_self() . '?' . api_get_cidreq() . '&' . http_build_query([
+        $url = api_get_self().'?'.api_get_cidreq().'&'.http_build_query([
             'type' => 'document',
             'lp_id' => $this->lp_id
         ]);

Braces +163 added lines, -115 removed lines

@@ -3939,8 +3939,9 @@ 
                 WHERE c_id = ".$course_id."
                 ORDER BY display_order";
         $res = Database::query($sql);
-        if ($res === false)
-            return false;
+        if ($res === false) {
+                    return false;
+        }
         $lps = array ();
         $lp_order = array ();
         $num = Database :: num_rows($res);
@@ -4540,8 +4541,9 @@ 
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::set_maker()', 0);
         }
-        if (empty ($name))
-            return false;
+        if (empty ($name)) {
+                    return false;
+        }
         $this->maker = $name;
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $course_id = api_get_course_int_id();
@@ -4606,8 +4608,9 @@ 
     public function set_terms_by_prefix($terms_string, $prefix)
     {
         $course_id = api_get_course_int_id();
-        if (api_get_setting('search_enabled') !== 'true')
-            return false;
+        if (api_get_setting('search_enabled') !== 'true') {
+                    return false;
+        }
 
         if (!extension_loaded('xapian')) {
             return false;
@@ -4620,8 +4623,9 @@ 
         $stored_terms = $this->get_common_index_terms_by_prefix($prefix);
 
         // Don't do anything if no change, verify only at DB, not the search engine.
-        if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0))
-            return false;
+        if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0)) {
+                    return false;
+        }
 
         require_once 'xapian.php'; // TODO: Try catch every xapian use or make wrappers on API.
         require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
@@ -4813,8 +4817,9 @@ 
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::set_proximity()', 0);
         }
-        if (empty ($name))
-            return false;
+        if (empty ($name)) {
+                    return false;
+        }
 
         $this->proximity = $name;
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
@@ -5156,8 +5161,9 @@ 
 
         $sql = "SELECT * FROM $lp_table WHERE c_id = ".$course_id." ORDER BY display_order";
         $res = Database::query($sql);
-        if ($res === false)
-            return false;
+        if ($res === false) {
+                    return false;
+        }
 
         $num = Database :: num_rows($res);
         // First check the order is correct, globally (might be wrong because
@@ -5468,8 +5474,9 @@ 
             $position[$key] = $row['display_order'];
         }
 
-        if (count($array) > 0)
-            array_multisort($parent, SORT_ASC, $position, SORT_ASC, $array);
+        if (count($array) > 0) {
+                    array_multisort($parent, SORT_ASC, $position, SORT_ASC, $array);
+        }
 
         return $array;
     }
@@ -6037,8 +6044,9 @@ 
         $tmp_filename = $filename;
 
         $i = 0;
-        while (file_exists($filepath . $tmp_filename . '.'.$extension))
-            $tmp_filename = $filename . '_' . ++ $i;
+        while (file_exists($filepath . $tmp_filename . '.'.$extension)) {
+                    $tmp_filename = $filename . '_' . ++ $i;
+        }
 
         $filename = $tmp_filename . '.'.$extension;
         if ($extension == 'html') {
@@ -6117,10 +6125,12 @@ 
                     if ($new_comment || $new_title) {
                         $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
                         $ct = '';
-                        if ($new_comment)
-                            $ct .= ", comment='" . Database::escape_string($new_comment). "'";
-                        if ($new_title)
-                            $ct .= ", title='" . Database::escape_string(htmlspecialchars($new_title, ENT_QUOTES, $charset))."' ";
+                        if ($new_comment) {
+                                                    $ct .= ", comment='" . Database::escape_string($new_comment). "'";
+                        }
+                        if ($new_title) {
+                                                    $ct .= ", title='" . Database::escape_string(htmlspecialchars($new_title, ENT_QUOTES, $charset))."' ";
+                        }
 
                         $sql = "UPDATE " . $tbl_doc ." SET " . substr($ct, 1)."
                                WHERE c_id = ".$course_id." AND id = " . $document_id;
@@ -6144,17 +6154,21 @@ 
         // Please, do not modify this dirname formatting.
         $dir = isset($_GET['dir']) ? $_GET['dir'] : $_POST['dir'];
 
-        if (strstr($dir, '..'))
-            $dir = '/';
+        if (strstr($dir, '..')) {
+                    $dir = '/';
+        }
 
-        if ($dir[0] == '.')
-            $dir = substr($dir, 1);
+        if ($dir[0] == '.') {
+                    $dir = substr($dir, 1);
+        }
 
-        if ($dir[0] != '/')
-            $dir = '/' . $dir;
+        if ($dir[0] != '/') {
+                    $dir = '/' . $dir;
+        }
 
-        if ($dir[strlen($dir) - 1] != '/')
-            $dir .= '/';
+        if ($dir[strlen($dir) - 1] != '/') {
+                    $dir .= '/';
+        }
 
         $filepath = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document' . $dir;
 
@@ -6219,8 +6233,9 @@ 
                 }
                 $return .= '<div style="padding:10px;">';
 
-                if ($msg != '')
-                    $return .= $msg;
+                if ($msg != '') {
+                                    $return .= $msg;
+                }
 
                 $return .= '<h3>'.$row['title'].'</h3>';
                 switch ($row['item_type']) {
@@ -6485,10 +6500,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;
@@ -6566,8 +6582,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)) {
@@ -6756,11 +6773,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'));
         }
@@ -6787,8 +6806,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>';
+                    }
                 }
             }
 
@@ -6806,11 +6826,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>';
             }
@@ -6837,9 +6859,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'];
 
                     }
@@ -6936,11 +6960,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">';
@@ -6973,8 +6999,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)) {
@@ -6992,11 +7019,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>';
@@ -7022,9 +7051,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'];
                 }
             }
@@ -7128,11 +7159,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>';
@@ -7152,8 +7185,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>';
+                }
             }
         }
 
@@ -7171,11 +7205,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>';
             }
@@ -7204,9 +7240,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'];
 
                 }
@@ -7219,8 +7257,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>';
@@ -7243,8 +7280,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'] . '" />';
         }
 
@@ -7298,8 +7334,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 ();
@@ -7685,9 +7722,11 @@ 
 
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter' && $arrLP[$i]['item_type'] !== TOOL_FINAL_ITEM) {
-                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id'])
+                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
                         $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = $arrLP[$i]['id'];
+                    }
 
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
@@ -7698,17 +7737,18 @@ 
                 $item_type = isset($extra_info['item_type']) ? $extra_info['item_type'] : null;
                 $edit = isset($_GET['edit']) ? $_GET['edit'] : null;
                 if (($extra_info == 'new' || $item_type == TOOL_DOCUMENT || $item_type == TOOL_FINAL_ITEM || $edit == 'true')) {
-                    if (isset ($_POST['content']))
-                        $content = stripslashes($_POST['content']);
-                    elseif (is_array($extra_info)) {
+                    if (isset ($_POST['content'])) {
+                                            $content = stripslashes($_POST['content']);
+                    } elseif (is_array($extra_info)) {
                         //If it's an html document or a text file
                         if (!$no_display_edit_textarea) {
                             $content = $this->display_document($extra_info['path'], false, false);
                         }
-                    } elseif (is_numeric($extra_info))
-                        $content = $this->display_document($extra_info, false, false);
-                    else
-                        $content = '';
+                    } elseif (is_numeric($extra_info)) {
+                                            $content = $this->display_document($extra_info, false, false);
+                    } else {
+                                            $content = '';
+                    }
 
                     if (!$no_display_edit_textarea) {
                         // We need to calculate here some specific settings for the online editor.
@@ -7862,11 +7902,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>';
 
@@ -7901,8 +7943,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>';
+                }
             }
         }
 
@@ -7921,12 +7964,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>';
             }
@@ -7953,9 +7997,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'];
 
                 }
@@ -8162,9 +8208,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'];
 
                 }
@@ -9739,9 +9787,9 @@ 
         $main_code_path = api_get_path(SYS_CODE_PATH).'newscorm/packaging/';
         $extra_files = scandir($main_code_path);
         foreach ($extra_files as $extra_file) {
-            if (strpos($extra_file, '.') === 0)
-                continue;
-            else {
+            if (strpos($extra_file, '.') === 0) {
+                            continue;
+            } else {
                 $dest_file = $archive_path . $temp_dir_short . '/' . $extra_file;
                 $this->create_path($dest_file);
                 copy($main_code_path.$extra_file, $dest_file);

main/newscorm/lp_controller.php

Spacing +20 added lines, -20 removed lines

@@ -25,7 +25,7 @@ 
 
 // Including the global initialization file.
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_LEARNPATH;
+$current_course_tool = TOOL_LEARNPATH;
 $_course = api_get_course_info();
 
 $glossaryExtraTools = api_get_setting('show_glossary_in_extra_tools');
@@ -37,11 +37,11 @@ 
     ) {
         $htmlHeadXtra[] = '<script>
     <!--
-        var jQueryFrameReadyConfigPath = \'' . api_get_jquery_web_path() . '\';
+        var jQueryFrameReadyConfigPath = \'' . api_get_jquery_web_path().'\';
     -->
     </script>';
-    $htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_PATH) . 'javascript/jquery.frameready.js" type="text/javascript" language="javascript"></script>';
-    $htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_PATH) . 'javascript/jquery.highlight.js" type="text/javascript" language="javascript"></script>';
+    $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.frameready.js" type="text/javascript" language="javascript"></script>';
+    $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.highlight.js" type="text/javascript" language="javascript"></script>';
     }
 }
 
@@ -268,7 +268,7 @@ 
 
 $course_id = api_get_course_int_id();
 
-if ($debug>0) error_log('New LP - Passed data remains check', 0);
+if ($debug > 0) error_log('New LP - Passed data remains check', 0);
 
 if (!$lp_found || (!empty($_REQUEST['lp_id']) && $_SESSION['oLP']->get_id() != $_REQUEST['lp_id'])) {
     if ($debug > 0) error_log('New LP - oLP is not object, has changed or refresh been asked, getting new', 0);
@@ -292,7 +292,7 @@ 
             if (Database::num_rows($res)) {
                 $row = Database::fetch_array($res);
                 $type = $row['lp_type'];
-                if ($debug > 0) error_log('New LP - found row - type '.$type. ' - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                if ($debug > 0) error_log('New LP - found row - type '.$type.' - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
                 switch ($type) {
                     case 1:
                         if ($debug > 0) error_log('New LP - found row - type dokeos - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
@@ -689,8 +689,8 @@ 
                 $editPrerequisite = $_SESSION['oLP']->edit_item_prereq(
                     $_GET['id'],
                     $_POST['prerequisites'],
-                    $_POST['min_' . $_POST['prerequisites']],
-                    $_POST['max_' . $_POST['prerequisites']]
+                    $_POST['min_'.$_POST['prerequisites']],
+                    $_POST['max_'.$_POST['prerequisites']]
                 );
 
                 if ($editPrerequisite) {
@@ -939,7 +939,7 @@ 
             $_SESSION['oLP']->setSubscribeUsers($_REQUEST['subscribe_users']);
 
             if (isset($_REQUEST['activate_start_date_check']) && $_REQUEST['activate_start_date_check'] == 1) {
-            	$publicated_on  = $_REQUEST['publicated_on'];
+            	$publicated_on = $_REQUEST['publicated_on'];
             } else {
             	$publicated_on = null;
             }
@@ -1010,7 +1010,7 @@ 
         else {
             $_SESSION['refresh'] = 1;
             if (!empty($_REQUEST['parent_item_id'])) {
-                $_SESSION['from_learnpath']='yes';
+                $_SESSION['from_learnpath'] = 'yes';
                 $_SESSION['origintoolurl'] = 'lp_controller.php?action=admin_view&lp_id='.Security::remove_XSS($_REQUEST['lp_id']);
                 require 'resourcelinker.php';
             } else {
@@ -1111,8 +1111,8 @@ 
             error_log('New LP - No learnpath given for view', 0);
             require 'lp_list.php';
         } else {
-            if ($debug > 0) {error_log('New LP - Trying to set current item to ' . $_REQUEST['item_id'], 0); }
-            if ( !empty($_REQUEST['item_id']) ) {
+            if ($debug > 0) {error_log('New LP - Trying to set current item to '.$_REQUEST['item_id'], 0); }
+            if (!empty($_REQUEST['item_id'])) {
                 $_SESSION['oLP']->set_current_item($_REQUEST['item_id']);
             }
             require 'lp_view.php';
@@ -1192,8 +1192,8 @@ 
 		break;
      */
 	case 'switch_attempt_mode':
-		if($debug>0) error_log('New LP - switch_reinit action triggered',0);
-		if(!$lp_found){ error_log('New LP - No learnpath given for switch',0); require 'lp_list.php'; }
+		if ($debug > 0) error_log('New LP - switch_reinit action triggered', 0);
+		if (!$lp_found) { error_log('New LP - No learnpath given for switch', 0); require 'lp_list.php'; }
 		$_SESSION['refresh'] = 1;
 		$_SESSION['oLP']->switch_attempt_mode();
         require 'lp_list.php';
@@ -1243,8 +1243,8 @@ 
             error_log('New LP - No learnpath given for view', 0);
             require 'lp_list.php';
         } else {
-            if ($debug > 0) {error_log('New LP - Trying to impress this LP item to ' . $_REQUEST['item_id'], 0); }
-            if (!empty($_REQUEST['item_id']) ) {
+            if ($debug > 0) {error_log('New LP - Trying to impress this LP item to '.$_REQUEST['item_id'], 0); }
+            if (!empty($_REQUEST['item_id'])) {
                 $_SESSION['oLP']->set_current_item($_REQUEST['item_id']);
             }
             require 'lp_impress.php';
@@ -1307,7 +1307,7 @@ 
                     $_SESSION['oLP']->lp_session_id
                 );
 
-                $forumCategoryId = !empty($forumCategory) ? $forumCategory['cat_id']: 0;
+                $forumCategoryId = !empty($forumCategory) ? $forumCategory['cat_id'] : 0;
 
                 if (empty($forumCategoryId)) {
                     $forumCategoryId = store_forumcategory(
@@ -1339,7 +1339,7 @@ 
             }
         }
 
-        header('Location:' . api_get_self() . '?' . http_build_query([
+        header('Location:'.api_get_self().'?'.http_build_query([
             'action' => 'add_item',
             'type' => 'step',
             'lp_id' => $_SESSION['oLP']->lp_id
@@ -1381,7 +1381,7 @@ 
             }
         }
 
-        header('Location:' . api_get_self() . '?' . http_build_query([
+        header('Location:'.api_get_self().'?'.http_build_query([
             'action' => 'add_item',
             'type' => 'step',
             'lp_id' => $_SESSION['oLP']->lp_id
@@ -1404,7 +1404,7 @@ 
 
         $_SESSION['oLP']->getFinalItemForm();
 
-        $redirectTo = api_get_self() . '?' . http_build_query([
+        $redirectTo = api_get_self().'?'.http_build_query([
             'action' => 'add_item',
             'type' => 'step',
             'lp_id' => intval($_SESSION['oLP']->lp_id)

main/newscorm/lp_final_item.php

Spacing +4 added lines, -4 removed lines

@@ -2,7 +2,7 @@ 
 
 $_in_course = true;
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_GRADEBOOK;
+$current_course_tool = TOOL_GRADEBOOK;
 
 api_protect_course_script(true);
 
@@ -32,8 +32,8 @@ 
 
 if ($link) {
     $cat = new Category();
-    $catCourseCode     = CourseManager::get_course_by_category($categoryId);
-    $show_message  = $cat->show_message_resource_delete($catCourseCode);
+    $catCourseCode = CourseManager::get_course_by_category($categoryId);
+    $show_message = $cat->show_message_resource_delete($catCourseCode);
 
     if ($show_message == '') {
         if (!api_is_allowed_to_edit() && !api_is_excluded_user_type()) {
@@ -42,7 +42,7 @@ 
                 $userId
             );
             if (isset($certificate['pdf_url']) && isset($certificate['certificate_link'])) {
-                $downloadCertificateLink .= Display::url(Display::returnFontAwesomeIcon('file-pdf-o') .
+                $downloadCertificateLink .= Display::url(Display::returnFontAwesomeIcon('file-pdf-o').
                     get_lang('DownloadCertificatePdf'),
                     $certificate['pdf_url'],
                     ['class' => 'btn btn-default']