chamilo / chamilo-lms

main/social/search.php

Spacing +14 added lines, -14 removed lines

@@ -20,13 +20,13 @@ 
 $tool_name = get_lang('Search');
 $interbreadcrumb[] = array('url' => 'profile.php', 'name' => get_lang('SocialNetwork'));
 
-$query = isset($_GET['q']) ? Security::remove_XSS($_GET['q']): null;
-$query_search_type = isset($_GET['search_type']) && in_array($_GET['search_type'], array('0','1','2')) ? $_GET['search_type'] : null;
+$query = isset($_GET['q']) ? Security::remove_XSS($_GET['q']) : null;
+$query_search_type = isset($_GET['search_type']) && in_array($_GET['search_type'], array('0', '1', '2')) ? $_GET['search_type'] : null;
 $extra_fields = UserManager::get_extra_filtrable_fields();
 $query_vars = array('q' => $query, 'search_type' => $query_search_type);
 if (!empty($extra_fields)) {
     foreach ($extra_fields as $extra_field) {
-        $field_name = 'field_' . $extra_field['variable'];
+        $field_name = 'field_'.$extra_field['variable'];
         if (isset($_GET[$field_name]) && $_GET[$field_name] != '0') {
             $query_vars[$field_name] = $_GET[$field_name];
         }
@@ -46,10 +46,10 @@ 
 $usergroup = new UserGroup();
 
 // I'm searching something
-if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) ) {
+if ($query != '' || ($query_vars['search_type'] == '1' && count($query_vars) > 2)) {
     $itemPerPage = 8;
 
-    if ($_GET['search_type']=='0' || $_GET['search_type']=='1') {
+    if ($_GET['search_type'] == '0' || $_GET['search_type'] == '1') {
         $page = isset($_GET['users_page_nr']) ? intval($_GET['users_page_nr']) : 1;
         $totalUsers = UserManager::get_all_user_tags($_GET['q'], 0, 0, $itemPerPage, true);
 
@@ -58,7 +58,7 @@ 
         $users = UserManager::get_all_user_tags($_GET['q'], 0, $from, $itemPerPage);
     }
 
-    if ($_GET['search_type']=='0' || $_GET['search_type']=='2') {
+    if ($_GET['search_type'] == '0' || $_GET['search_type'] == '2') {
         $pageGroup = isset($_GET['groups_page_nr']) ? intval($_GET['groups_page_nr']) : 1;
         // Groups
         $fromGroups = intval(($pageGroup - 1) * $itemPerPage);
@@ -84,7 +84,7 @@ 
 
             // Show send invitation icon if they are not friends yet
             if ($relation_type != 3 && $relation_type != 4 && $user_info['user_id'] != api_get_user_id()) {
-                $send_inv = '<a href="#" class="'.$buttonClass.' btn-to-send-invitation" data-send-to="' . $user_info['user_id'] . '">
+                $send_inv = '<a href="#" class="'.$buttonClass.' btn-to-send-invitation" data-send-to="'.$user_info['user_id'].'">
                              <em class="fa fa-user"></em> '.get_lang('SendInvitation').'</a>';
             }
 
@@ -130,7 +130,7 @@ 
                                 </div>
                                 <div class="user-info">
                                    <p>'.$user_info['complete_name'].'</p>
-                                   <div class="items-user-status">' . $status_icon . $user_icon . '</div>
+                                   <div class="items-user-status">' . $status_icon.$user_icon.'</div>
                                    <div class="toolbar">
                                     '.$invitations.'
                                    </div>
@@ -187,7 +187,7 @@ 
             $tags = null;
             $group['picture'] = '<img class="img-responsive img-circle" src="'.$picture['file'].'" />';
 
-            $members = Display::returnFontAwesomeIcon('user') . '( ' .$count_users_group . ' )';
+            $members = Display::returnFontAwesomeIcon('user').'( '.$count_users_group.' )';
             $item_1  = Display::tag('p', $url_open.$name.$url_close);
 
             $block_groups .= '
@@ -198,10 +198,10 @@ 
                         </div>
                         <div class="user-info">
                             '.$item_1.'
-                            <p>' . $members . '</p>    
-                            <p>' . $group['description'] . '</p>
-                            <p>' . $tags . '</p>
-                            <p>' . $url_open.get_lang('SeeMore') . $url_close . '</p>
+                            <p>' . $members.'</p>    
+                            <p>' . $group['description'].'</p>
+                            <p>' . $tags.'</p>
+                            <p>' . $url_open.get_lang('SeeMore').$url_close.'</p>
                         </div>
                     </div>
                 </div>';
@@ -241,7 +241,7 @@ 
 $tpl->assign('social_search', $block_search);
 $tpl->assign('search_form', $searchForm);
 
-$formModalTpl =  new Template();
+$formModalTpl = new Template();
 $formModalTpl->assign('invitation_form', MessageManager::generate_invitation_form('send_invitation'));
 $formModals = $formModalTpl->fetch('default/social/form_modals.tpl');
 

main/newscorm/lp_list_search.php

Spacing +16 added lines, -16 removed lines

@@ -15,15 +15,15 @@ 
 require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
 require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
 
-$htmlHeadXtra[] = '<link rel="stylesheet" type="text/css" href="'. api_get_path(WEB_PATH) .'main/newscorm/lp_list_search.css" />';
+$htmlHeadXtra[] = '<link rel="stylesheet" type="text/css" href="'.api_get_path(WEB_PATH).'main/newscorm/lp_list_search.css" />';
 Event::event_access_tool(TOOL_SEARCH);
 
-if (isset($_SESSION['gradebook'])){
+if (isset($_SESSION['gradebook'])) {
     $gradebook = $_SESSION['gradebook'];
 }
 
 if (!empty($gradebook) && $gradebook == 'view') {
-    $interbreadcrumb[]= array (
+    $interbreadcrumb[] = array(
         'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
         'name' => get_lang('ToolGradebook')
     );
@@ -59,8 +59,8 @@ 
 $term_array = array();
 $specific_fields = get_specific_field_list();
 foreach ($specific_fields as $specific_field) {
-    if (!empty($_REQUEST[ 'sf_'. $specific_field['code'] ])) {
-        $values = $_REQUEST[ 'sf_'. $specific_field['code'] ];
+    if (!empty($_REQUEST['sf_'.$specific_field['code']])) {
+        $values = $_REQUEST['sf_'.$specific_field['code']];
         if (in_array('__all__', $values)) {
             $sf_terms_for_code = xapian_get_all_terms(1000, $specific_field['code']);
             foreach ($sf_terms_for_code as $term) {
@@ -72,7 +72,7 @@ 
             foreach ($values as $term) {
                 if (!empty($term)) {
                     $prefix = $specific_field['code'];
-                    $term_array[] = chamilo_get_boolean_query($prefix . $term);
+                    $term_array[] = chamilo_get_boolean_query($prefix.$term);
                 }
             }
         }
@@ -90,9 +90,9 @@ 
 // Get right group of terms to show on multiple select.
 $fixed_queries = array();
 $course_filter = null;
-if ( ($cid=api_get_course_id()) != -1 ) {
+if (($cid = api_get_course_id()) != -1) {
     // Results only from actual course.
-    $course_filter = chamilo_get_boolean_query(XAPIAN_PREFIX_COURSEID . $cid);
+    $course_filter = chamilo_get_boolean_query(XAPIAN_PREFIX_COURSEID.$cid);
 }
 
 if (count($term_array)) {
@@ -137,12 +137,12 @@ 
         }
 
         if ($mode == 'gallery') {
-            $title = $a_prefix.str_replace('_',' ',$result['title']). $a_sufix;
+            $title = $a_prefix.str_replace('_', ' ', $result['title']).$a_sufix;
             $blocks[] = array(
-                $a_prefix .'<img src="'.$result['thumbnail'].'" />'. $a_sufix .'<br />'.$title.'<br />'.$result['author'],
+                $a_prefix.'<img src="'.$result['thumbnail'].'" />'.$a_sufix.'<br />'.$title.'<br />'.$result['author'],
             );
         } else {
-            $title = '<div style="text-align:left;">'. $a_prefix . $result['title']. $a_sufix .(!empty($result['author']) ? ' '.$result['author'] : '').'<div>';
+            $title = '<div style="text-align:left;">'.$a_prefix.$result['title'].$a_sufix.(!empty($result['author']) ? ' '.$result['author'] : '').'<div>';
             $blocks[] = array($title);
         }
     }
@@ -154,19 +154,19 @@ 
     $s->display_mode = $mode; // default
     $s->display_mode_params = 3;
     $s->per_page = 9;
-    $additional_parameters = array (
+    $additional_parameters = array(
         'mode' => $mode,
         'action' => 'search',
         'query' => Security::remove_XSS($_REQUEST['query']),
     );
     $get_params = '';
     foreach ($specific_fields as $specific_field) {
-        if (isset($_REQUEST[ 'sf_'. $specific_field['code'] ])) {
-            $values = $_REQUEST[ 'sf_'. $specific_field['code'] ];
+        if (isset($_REQUEST['sf_'.$specific_field['code']])) {
+            $values = $_REQUEST['sf_'.$specific_field['code']];
             //Sortable additional_parameters doesn't accept multi dimensional arrays
             //$additional_parameters[ 'sf_'. $specific_field['code'] ] = $values;
-            foreach ( $values as $value ) {
-                $get_params .= '&sf_' . $specific_field['code'] .'[]='. $value;
+            foreach ($values as $value) {
+                $get_params .= '&sf_'.$specific_field['code'].'[]='.$value;
             }
             $get_params .= '&';
         }

main/newscorm/learnpath.class.php

Spacing +683 added lines, -683 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;
@@ -244,7 +244,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);
         }
 
@@ -264,8 +264,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
                             );
@@ -284,19 +284,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();
@@ -307,8 +307,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);
                         }
                     }
@@ -326,13 +326,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)) {
@@ -424,7 +424,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;
     }
@@ -498,7 +498,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
@@ -518,7 +518,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);
@@ -528,11 +528,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);
@@ -547,7 +547,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);
@@ -567,8 +567,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
@@ -614,7 +614,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) {
@@ -631,28 +631,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',
@@ -689,7 +689,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',
                     api_get_user_id(),
                     '',
@@ -705,8 +705,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);
             }
         }
@@ -782,7 +782,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);
         }
@@ -894,7 +894,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
                     );
                 }
@@ -922,7 +922,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
                                 );
                             }
@@ -942,7 +942,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
                                     );
                                 }
@@ -1047,15 +1047,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');
@@ -1063,32 +1063,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);
                     }
                 }
             }
@@ -1101,7 +1101,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();
@@ -1114,7 +1114,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']);
         }
@@ -1134,7 +1134,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))) {
@@ -1145,7 +1145,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++;
         }
@@ -1186,12 +1186,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.
@@ -1266,15 +1266,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',
@@ -1312,11 +1312,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)."' ";
             }
         }
 
@@ -1326,13 +1326,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'];
@@ -1347,27 +1347,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 */
@@ -1377,11 +1377,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);
@@ -1397,8 +1397,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'];
@@ -1407,57 +1407,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);
@@ -1483,7 +1483,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)) {
@@ -1581,8 +1581,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);
@@ -1600,13 +1600,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();
     }
 
     /**
@@ -1619,11 +1619,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);
@@ -1635,13 +1635,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();
     }
 
     /**
@@ -1711,7 +1711,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;
     }
@@ -1792,7 +1792,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) {
@@ -1804,7 +1804,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 {
@@ -1819,7 +1819,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
@@ -1833,14 +1833,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());
         }
     }
 
@@ -1853,7 +1853,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 = '';
@@ -1863,17 +1863,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;
 
@@ -1881,17 +1881,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;
         }
@@ -1945,12 +1945,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';
@@ -1963,16 +1963,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>';
 
@@ -1980,13 +1980,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>';
         }
@@ -2007,11 +2007,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 {
@@ -2023,7 +2023,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;
     }
@@ -2041,7 +2041,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];
             }
@@ -2083,7 +2083,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).
@@ -2107,7 +2107,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) {
@@ -2149,7 +2149,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--;
@@ -2159,7 +2159,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.
         }
@@ -2202,8 +2202,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
@@ -2214,7 +2214,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'])) {
@@ -2222,8 +2222,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;
                 }
             }
@@ -2286,7 +2286,7 @@ 
         $courseCode = null,
         $sessionId = null
     ) {
-        $lp_id = (int)$lp_id;
+        $lp_id = (int) $lp_id;
         $courseInfo = api_get_course_info($courseCode);
         $sessionId = intval($sessionId);
 
@@ -2452,10 +2452,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>';
 
@@ -2491,16 +2491,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 = '';
@@ -2518,7 +2518,7 @@ 
             $text = '%';
         } elseif ($mode == 'abs') {
             $percentage = $completeItems;
-            $text = '/' . $total_items;
+            $text = '/'.$total_items;
         }
 
         return array(
@@ -2714,7 +2714,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(
                     '&',
                     '|',
                     '~',
@@ -2726,7 +2726,7 @@ 
                     '(',
                     ')'
                 );
-                $replace = array (
+                $replace = array(
                     ' ',
                     ' ',
                     ' ',
@@ -2743,7 +2743,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);
                     }
                 }
 
@@ -2851,9 +2851,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()
             );
         }
@@ -2907,7 +2907,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),
@@ -2918,7 +2918,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'],
@@ -2986,7 +2986,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'],
@@ -3013,10 +3013,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(),
@@ -3027,7 +3027,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;
     }
@@ -3044,10 +3044,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;
     }
@@ -3071,7 +3071,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;
     }
@@ -3087,7 +3087,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;
@@ -3200,7 +3200,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) {
@@ -3209,7 +3209,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'];
@@ -3239,7 +3239,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>";
 
@@ -3273,12 +3273,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>';
             }
@@ -3329,11 +3329,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();
         }
@@ -3365,7 +3365,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) {
@@ -3379,9 +3379,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
             }
@@ -3392,8 +3392,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
@@ -3412,7 +3412,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') {
@@ -3432,7 +3432,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);
                                     }
                                 }
                             }
@@ -3472,8 +3472,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);
@@ -3482,7 +3482,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);
@@ -3495,7 +3495,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') {
@@ -3509,19 +3509,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);
@@ -3529,11 +3529,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,
@@ -3553,14 +3553,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';
@@ -3568,12 +3568,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:
@@ -3585,7 +3585,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;
@@ -3598,19 +3598,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);
@@ -3629,7 +3629,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;
     }
@@ -3647,7 +3647,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);
@@ -3657,9 +3657,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";
@@ -3670,7 +3670,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;
@@ -3770,15 +3770,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) {
@@ -3803,7 +3803,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) {
@@ -3856,7 +3856,7 @@ 
                         }
                         Database::query($sql_upd2);
                     }
-                    $display = $display -1;
+                    $display = $display - 1;
                 }
                 break;
             case 'down':
@@ -3867,7 +3867,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) {
@@ -3905,7 +3905,7 @@ 
                                      WHERE c_id = ".$course_id." AND id = $next_next";
                         Database::query($sql_upd2);
                     }
-                    $display = $display +1;
+                    $display = $display + 1;
                 }
                 break;
             default :
@@ -3928,8 +3928,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)
@@ -3939,7 +3939,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;
@@ -3952,10 +3952,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);
             }
         }
@@ -3976,8 +3976,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
@@ -3989,7 +3989,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;
@@ -4002,10 +4002,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);
             }
         }
@@ -4025,15 +4025,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);
         }
     }
 
@@ -4097,7 +4097,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(
@@ -4113,12 +4113,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;
     }
@@ -4184,12 +4184,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;
             }
@@ -4272,9 +4272,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();
@@ -4312,10 +4312,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])
@@ -4339,7 +4339,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[]).
@@ -4362,7 +4362,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);
 
@@ -4370,9 +4370,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;
         }
@@ -4393,17 +4393,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);
         }
@@ -4417,7 +4417,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);
@@ -4433,7 +4433,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) {
@@ -4442,7 +4442,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);
@@ -4457,10 +4457,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);
             }
         }
     }
@@ -4485,7 +4485,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;
             }
@@ -4509,7 +4509,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 {
@@ -4534,10 +4534,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;
@@ -4561,10 +4561,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.
@@ -4572,7 +4572,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
@@ -4650,10 +4650,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();
@@ -4678,10 +4678,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);
 
@@ -4704,10 +4704,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;
@@ -4727,10 +4727,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);
 
@@ -4748,15 +4748,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);
 
@@ -4783,7 +4783,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;
@@ -4807,10 +4807,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;
@@ -4844,11 +4844,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);
 
@@ -4875,10 +4875,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);
 
@@ -4904,10 +4904,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);
 
@@ -4927,10 +4927,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;
@@ -5001,13 +5001,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);
@@ -5020,7 +5020,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);
@@ -5034,7 +5034,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;
@@ -5060,7 +5060,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);
@@ -5081,14 +5081,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;
@@ -5106,7 +5106,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);
@@ -5119,14 +5119,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;
@@ -5155,7 +5155,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++;
@@ -5176,7 +5176,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);
@@ -5187,13 +5187,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;
@@ -5209,11 +5209,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';
@@ -5261,7 +5261,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;
@@ -5313,7 +5313,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);
@@ -5324,13 +5324,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;
@@ -5348,7 +5348,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);
@@ -5359,13 +5359,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;
@@ -5394,7 +5394,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);
@@ -5480,7 +5480,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) {
@@ -5488,14 +5488,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);
@@ -5505,7 +5505,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?
             }
@@ -5526,7 +5526,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);
@@ -5574,7 +5574,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,
@@ -5590,14 +5590,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 {
                     $icon = Display::return_icon('folder_document.gif');
@@ -5605,7 +5605,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') {
@@ -5616,10 +5616,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');
                     }
                 }
             }
@@ -5643,7 +5643,7 @@ 
                 // No edit for this item types
                 if (!in_array($arrLP[$i]['item_type'], array('sco', 'asset'))) {
                     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>';
 
@@ -5656,7 +5656,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
@@ -5667,7 +5667,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
@@ -5680,17 +5680,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']);
@@ -5699,8 +5699,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>",
@@ -5721,8 +5721,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'];
@@ -5744,8 +5744,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"]';
@@ -5808,7 +5808,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'])) {
@@ -5831,17 +5831,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);
@@ -5862,7 +5862,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';
         $folder = false;
         if (!is_dir($filepath.'/'.$dir)) {
             $folderData = create_unexisting_directory(
@@ -5903,9 +5903,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,
@@ -5925,7 +5925,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(
@@ -5964,12 +5964,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
@@ -5979,7 +5979,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 = '/';
         }
 
@@ -6002,10 +6002,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(
@@ -6040,12 +6040,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(
@@ -6077,12 +6077,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);
                     }
                 }
@@ -6110,42 +6110,42 @@ 
             $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/';
             $dir = '/';
         }
 
         $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);
             }
         }
@@ -6163,10 +6163,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.
@@ -6193,8 +6193,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);
@@ -6233,7 +6233,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);
 
@@ -6244,21 +6244,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);
                     $return .= $this->display_manipulate($item_id, $row['item_type']);
@@ -6268,8 +6268,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)) {
@@ -6282,9 +6282,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 :
@@ -6339,7 +6339,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),
@@ -6379,16 +6379,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;
@@ -6412,8 +6412,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);
@@ -6423,8 +6423,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))
@@ -6432,13 +6432,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'],
@@ -6461,15 +6461,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>';
@@ -6482,34 +6482,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)) {
@@ -6521,11 +6521,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)) {
@@ -6537,7 +6537,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>';
@@ -6554,7 +6554,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)) {
@@ -6600,27 +6600,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>';
@@ -6647,11 +6647,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);
@@ -6675,11 +6675,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'],
@@ -6704,7 +6704,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>';
 
@@ -6712,11 +6712,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
         );
 
@@ -6724,13 +6724,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>';
                 }
             }
 
@@ -6741,10 +6741,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) {
@@ -6754,7 +6754,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>';
             }
         }
 
@@ -6764,8 +6764,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) {
@@ -6776,7 +6776,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'])
@@ -6790,22 +6790,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;
@@ -6828,8 +6828,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);
@@ -6849,7 +6849,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;
@@ -6857,7 +6857,7 @@ 
         $arrLP = array();
 
         while ($row = Database :: fetch_array($result)) {
-            $arrLP[] = array (
+            $arrLP[] = array(
                 'id' => $row['id'],
                 'item_type' => $row['item_type'],
                 'title' => $row['title'],
@@ -6879,10 +6879,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">';
@@ -6892,16 +6892,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
         );
@@ -6910,13 +6910,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)) {
@@ -6927,10 +6927,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) {
@@ -6940,8 +6940,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>';
             }
         }
 
@@ -6975,25 +6975,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>';
 
@@ -7020,7 +7020,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);
@@ -7040,15 +7040,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'],
@@ -7071,31 +7071,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>';
             }
         }
 
@@ -7107,10 +7107,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'])
@@ -7119,7 +7119,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>';
@@ -7127,8 +7127,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>';
@@ -7155,17 +7155,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>";
@@ -7179,19 +7179,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>';
 
@@ -7217,10 +7217,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 = '';
@@ -7234,17 +7234,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(
@@ -7272,9 +7272,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;
@@ -7318,7 +7318,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);
@@ -7340,16 +7340,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)) {
@@ -7378,23 +7378,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);
@@ -7403,7 +7403,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();
@@ -7441,8 +7441,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);
@@ -7460,13 +7460,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)) {
@@ -7485,11 +7485,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'],
@@ -7523,9 +7523,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);
@@ -7561,15 +7561,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++;
         }
@@ -7577,7 +7577,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);
         }
 
@@ -7594,7 +7594,7 @@ 
                 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'];
-                $arrHide[$arrLP[$i]['id']]['value'] = get_lang('After') . ' "' . $arrLP[$i]['title'] . '"';
+                $arrHide[$arrLP[$i]['id']]['value'] = get_lang('After').' "'.$arrLP[$i]['title'].'"';
             }
         }
 
@@ -7602,8 +7602,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);
 
@@ -7673,7 +7673,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);
@@ -7687,8 +7687,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') {
@@ -7755,8 +7755,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'];
@@ -7776,8 +7776,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();
 
@@ -7804,10 +7804,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>';
 
@@ -7818,16 +7818,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
         );
@@ -7837,13 +7837,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>';
             }
         }
 
@@ -7855,11 +7855,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'])
@@ -7869,7 +7869,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>';
@@ -7878,8 +7878,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)) {
@@ -7906,25 +7906,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>';
 
@@ -7950,8 +7950,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);
@@ -7967,13 +7967,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'],
@@ -8019,7 +8019,7 @@ 
             ]
         );
 
-        $arrHide = array (
+        $arrHide = array(
             $id
         );
 
@@ -8037,7 +8037,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']) {
@@ -8054,7 +8054,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']) {
@@ -8078,7 +8078,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']
                 );
 
@@ -8100,7 +8100,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'])
@@ -8192,8 +8192,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);
 
@@ -8207,16 +8207,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(
@@ -8236,12 +8236,12 @@ 
             $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'];
         }
 
-        if ($item_type == TOOL_DOCUMENT ) {
+        if ($item_type == TOOL_DOCUMENT) {
             $document_data = DocumentManager::get_document_data_by_id($row['path'], $course_code);
             $return .= get_lang('File').': '.$document_data['absolute_path_from_document'];
         }
@@ -8262,13 +8262,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;
@@ -8278,28 +8278,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";
         }
@@ -8320,8 +8320,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);
@@ -8380,7 +8380,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'));
@@ -8406,7 +8406,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'];
@@ -8416,20 +8416,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();
 
@@ -8472,25 +8472,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) {
@@ -8504,19 +8504,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>';
@@ -8525,7 +8525,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;
@@ -8561,7 +8561,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>';
@@ -8621,8 +8621,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);
@@ -8631,8 +8631,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
@@ -8644,8 +8644,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>';
         }
 
@@ -8655,7 +8655,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>';
@@ -8729,7 +8729,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="#">'.
@@ -8767,7 +8767,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;
@@ -8788,7 +8788,7 @@ 
         //First add link
         $return .= '<li class="lp_resource_element">';
         $return .= Display::return_icon('forum_new_small.gif');
-        $return .= '<a href="' . api_get_path(WEB_CODE_PATH) . 'forum/index.php?' . api_get_cidreq() . '&action=add&content=forum&origin=learnpath&lp_id=' . $this->lp_id . '" title="' . get_lang('CreateANewForum') . '">' . get_lang('CreateANewForum') . '</a>';
+        $return .= '<a href="'.api_get_path(WEB_CODE_PATH).'forum/index.php?'.api_get_cidreq().'&action=add&content=forum&origin=learnpath&lp_id='.$this->lp_id.'" title="'.get_lang('CreateANewForum').'">'.get_lang('CreateANewForum').'</a>';
         $return .= '</li>';
 
         $return .= '<script>
@@ -8810,15 +8810,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) {
@@ -8827,8 +8827,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>';
                     }
                 }
@@ -8899,7 +8899,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);
         }
@@ -8967,7 +8967,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();
@@ -9183,7 +9183,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', '');
                                     }
                                 }
@@ -9314,7 +9314,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());
@@ -9367,7 +9367,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) {
@@ -9428,7 +9428,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));
@@ -9446,7 +9446,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);
@@ -9675,7 +9675,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);
             }
@@ -9728,7 +9728,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
@@ -9768,12 +9768,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.'/';
                 }
             }
         }
@@ -9817,9 +9817,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']);
 
@@ -9874,7 +9874,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);
         }
     }
 
@@ -9893,13 +9893,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);
 
@@ -9955,9 +9955,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;
         }
     }
@@ -10297,7 +10297,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."
@@ -10643,7 +10643,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(
             [

main/inc/lib/search/tool_processors/link_processor.class.php

Spacing +4 added lines, -4 removed lines

@@ -8,8 +8,8 @@ 
 /**
  * Code
  */
-include_once dirname(__FILE__) . '/../../../global.inc.php';
-require_once dirname(__FILE__) . '/search_processor.class.php';
+include_once dirname(__FILE__).'/../../../global.inc.php';
+require_once dirname(__FILE__).'/search_processor.class.php';
 
 /**
  * Process links before pass it to search listing scripts
@@ -104,11 +104,11 @@ 
 
             $link_id = intval($link_id);
             $sql = "SELECT insert_user_id FROM $item_property_table
-              		WHERE ref = $link_id AND tool = '" . TOOL_LINK . "' AND c_id = $course_id
+              		WHERE ref = $link_id AND tool = '".TOOL_LINK."' AND c_id = $course_id
               		LIMIT 1";
 
             $name = get_lang('Links');
-            $url = api_get_path(WEB_PATH) . 'main/link/link.php?cidReq=%s';
+            $url = api_get_path(WEB_PATH).'main/link/link.php?cidReq=%s';
             $url = sprintf($url, $course_id_alpha);
             // Get the image path
             $thumbnail = Display::returnIconPath('link.png');

main/inc/lib/search/tool_processors/document_processor.class.php

Spacing +3 added lines, -3 removed lines

@@ -8,8 +8,8 @@ 
 /**
  * Code
  */
-include_once dirname(__FILE__) . '/../../../global.inc.php';
-require_once dirname(__FILE__) . '/search_processor.class.php';
+include_once dirname(__FILE__).'/../../../global.inc.php';
+require_once dirname(__FILE__).'/search_processor.class.php';
 
 /**
  * Process documents before pass it to search listing scripts
@@ -82,7 +82,7 @@ 
             $dk_result = Database::query($sql);
 
             $sql = "SELECT insert_user_id FROM       $item_property_table
-                    WHERE   ref = $doc_id AND tool = '" . TOOL_DOCUMENT . "' AND c_id = $course_id
+                    WHERE   ref = $doc_id AND tool = '".TOOL_DOCUMENT."' AND c_id = $course_id
                     LIMIT 1";
             $name = '';
             if ($row = Database::fetch_array($dk_result)) {

main/inc/lib/blog.lib.php

Indentation +1836 added lines, -1837 removed lines

@@ -6,115 +6,114 @@ 
  *
  * Contains several functions dealing with displaying,
  * editing,... of a blog
-
  * @package chamilo.blogs
  * @author Toon Keppens <toon@vi-host.net>
  * @author Julio Montoya - Cleaning code
  */
 class Blog
 {
-	/**
-	 * Get the title of a blog
-	 * @author Toon Keppens
-	 *
-	 * @param int $blog_id
-	 *
-	 * @return String Blog Title
-	 */
-	public static function get_blog_title ($blog_id)
-	{
-	    $course_id = api_get_course_int_id();
-
-		if (is_numeric($blog_id)) {
-			// init
-			$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
-
-			$sql = "SELECT blog_name
+    /**
+     * Get the title of a blog
+     * @author Toon Keppens
+     *
+     * @param int $blog_id
+     *
+     * @return String Blog Title
+     */
+    public static function get_blog_title ($blog_id)
+    {
+        $course_id = api_get_course_int_id();
+
+        if (is_numeric($blog_id)) {
+            // init
+            $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
+
+            $sql = "SELECT blog_name
 					FROM " . $tbl_blogs . "
 					WHERE c_id = $course_id AND blog_id = " . intval($blog_id);
 
-			$result = Database::query($sql);
-			$blog = Database::fetch_array($result);
-			return stripslashes($blog['blog_name']);
-		}
-	}
-
-
-	/**
-	 * Get the description of a blog
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 *
-	 * @return String Blog description
-	 */
-	public static function get_blog_subtitle($blog_id)
-	{
-		$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
-	  	$course_id = api_get_course_int_id();
-		$sql = "SELECT blog_subtitle FROM $tbl_blogs
+            $result = Database::query($sql);
+            $blog = Database::fetch_array($result);
+            return stripslashes($blog['blog_name']);
+        }
+    }
+
+
+    /**
+     * Get the description of a blog
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     *
+     * @return String Blog description
+     */
+    public static function get_blog_subtitle($blog_id)
+    {
+        $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
+            $course_id = api_get_course_int_id();
+        $sql = "SELECT blog_subtitle FROM $tbl_blogs
 				WHERE c_id = $course_id AND blog_id ='".intval($blog_id)."'";
-		$result = Database::query($sql);
-		$blog = Database::fetch_array($result);
-
-		return stripslashes($blog['blog_subtitle']);
-	}
-
-	/**
-	 * Get the users of a blog
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 *
-	 * @return Array Returns an array with [userid]=>[username]
-	 */
-	public static function get_blog_users($blog_id)
-	{
-		// Database table definitions
-		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
-		$tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
-
-		$course_id = api_get_course_int_id();
-
-		// Get blog members
-		$sql = "SELECT user.user_id, user.firstname, user.lastname
+        $result = Database::query($sql);
+        $blog = Database::fetch_array($result);
+
+        return stripslashes($blog['blog_subtitle']);
+    }
+
+    /**
+     * Get the users of a blog
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     *
+     * @return Array Returns an array with [userid]=>[username]
+     */
+    public static function get_blog_users($blog_id)
+    {
+        // Database table definitions
+        $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+        $tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
+
+        $course_id = api_get_course_int_id();
+
+        // Get blog members
+        $sql = "SELECT user.user_id, user.firstname, user.lastname
 				FROM " . $tbl_blogs_rel_user . " blogs_rel_user
 				INNER JOIN " . $tbl_users . " user
 				ON blogs_rel_user.user_id = user.user_id
 				WHERE
 				    blogs_rel_user.c_id = $course_id AND
 					blogs_rel_user.blog_id = '" . (int)$blog_id."'";
-		$result = Database::query($sql);
-		$blog_members = array ();
-		while($user = Database::fetch_array($result)) {
-			$blog_members[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
-		}
-
-		return $blog_members;
-	}
-
-	/**
-	 * Creates a new blog in the given course
-	 * @author Toon Keppens
-	 * @param Integer $course_id Id
-	 * @param String $title
-	 * @param Text $description
-	 */
-	public static function create_blog($title, $subtitle)
-	{
-		$_user = api_get_user_info();
+        $result = Database::query($sql);
+        $blog_members = array ();
+        while($user = Database::fetch_array($result)) {
+            $blog_members[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
+        }
+
+        return $blog_members;
+    }
+
+    /**
+     * Creates a new blog in the given course
+     * @author Toon Keppens
+     * @param Integer $course_id Id
+     * @param String $title
+     * @param Text $description
+     */
+    public static function create_blog($title, $subtitle)
+    {
+        $_user = api_get_user_info();
         $course_id = api_get_course_int_id();
 
-		$current_date=date('Y-m-d H:i:s',time());
-		$session_id = api_get_session_id();
-		// Tabel definitions
+        $current_date=date('Y-m-d H:i:s',time());
+        $session_id = api_get_session_id();
+        // Tabel definitions
         $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
         $tbl_tool = Database::get_course_table(TABLE_TOOL_LIST);
         $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
         $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
 
-		//verified if exist blog
-		$sql = 'SELECT COUNT(*) as count FROM '.$tbl_blogs.'
+        //verified if exist blog
+        $sql = 'SELECT COUNT(*) as count FROM '.$tbl_blogs.'
 			  	WHERE
 			  	    c_id = '.$course_id.' AND
 			  	    blog_name="'.Database::escape_string($title).'" AND
@@ -123,9 +122,9 @@ 
         $info_count = Database::result($res, 0, 0);
 
         if ($info_count == 0) {
-			// Create the blog
+            // Create the blog
             $params = [
-				'blog_id' => 0,
+                'blog_id' => 0,
                 'c_id' => $course_id,
                 'blog_name' => $title,
                 'blog_subtitle' =>  $subtitle,
@@ -133,14 +132,14 @@ 
                 'visibility' => 1 ,
                 'session_id' => $session_id,
             ];
-			$this_blog_id = Database::insert($tbl_blogs, $params);
+            $this_blog_id = Database::insert($tbl_blogs, $params);
 
-			if ($this_blog_id > 0) {
+            if ($this_blog_id > 0) {
 
                 $sql = "UPDATE $tbl_blogs SET blog_id = iid WHERE iid = $this_blog_id";
                 Database::query($sql);
 
-				// insert into item_property
+                // insert into item_property
                 api_item_property_update(
                     api_get_course_info(),
                     TOOL_BLOGS,
@@ -148,12 +147,12 @@ 
                     'BlogAdded',
                     api_get_user_id()
                 );
-			}
+            }
 
-			// Make first post. :)
+            // Make first post. :)
 
             $params = [
-				'post_id' => 0,
+                'post_id' => 0,
                 'c_id' => $course_id,
                 'title' => get_lang("Welcome"),
                 'full_text' => get_lang('FirstPostText'),
@@ -167,10 +166,10 @@ 
                 Database::query($sql);
             }
 
-			// Put it on course homepage
-			$sql = "INSERT INTO $tbl_tool (c_id, name, link, image, visibility, admin, address, added_tool, session_id)
+            // Put it on course homepage
+            $sql = "INSERT INTO $tbl_tool (c_id, name, link, image, visibility, admin, address, added_tool, session_id)
 					VALUES ($course_id, '".Database::escape_string($title)."','blog/blog.php?blog_id=".(int)$this_blog_id."','blog.gif','1','0','pastillegris.gif',0,'$session_id')";
-			Database::query($sql);
+            Database::query($sql);
 
             $toolId = Database::insert_id();
             if ($toolId) {
@@ -178,37 +177,37 @@ 
                 Database::query($sql);
             }
 
-			// Subscribe the teacher to this blog
-			Blog::set_user_subscribed($this_blog_id, $_user['user_id']);
-		}
-	}
-
-	/**
-	 * Update title and subtitle of a blog in the given course
-	 * @author Toon Keppens
-	 * @param Integer $course_id Id
-	 * @param String $title
-	 * @param Text $description
-	 */
-	public static function edit_blog($blog_id, $title, $subtitle)
-	{
-		// Table definitions
-		$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
-		$tbl_tool = Database::get_course_table(TABLE_TOOL_LIST);
+            // Subscribe the teacher to this blog
+            Blog::set_user_subscribed($this_blog_id, $_user['user_id']);
+        }
+    }
+
+    /**
+     * Update title and subtitle of a blog in the given course
+     * @author Toon Keppens
+     * @param Integer $course_id Id
+     * @param String $title
+     * @param Text $description
+     */
+    public static function edit_blog($blog_id, $title, $subtitle)
+    {
+        // Table definitions
+        $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
+        $tbl_tool = Database::get_course_table(TABLE_TOOL_LIST);
 
         $course_id = api_get_course_int_id();
 
-		// Update the blog
-		$sql = "UPDATE $tbl_blogs SET
+        // Update the blog
+        $sql = "UPDATE $tbl_blogs SET
 		        blog_name = '".Database::escape_string($title)."',
 		        blog_subtitle = '".Database::escape_string($subtitle)."'
 		        WHERE
 		            c_id = $course_id AND
 		            blog_id ='".Database::escape_string((int)$blog_id)."'
                 LIMIT 1";
-		Database::query($sql);
+        Database::query($sql);
 
-		//update item_property (update)
+        //update item_property (update)
         api_item_property_update(
             api_get_course_info(),
             TOOL_BLOGS,
@@ -217,60 +216,60 @@ 
             api_get_user_id()
         );
 
-		// Update course homepage link
-		$sql = "UPDATE $tbl_tool SET
+        // Update course homepage link
+        $sql = "UPDATE $tbl_tool SET
 		        name = '".Database::escape_string($title)."'
 		        WHERE c_id = $course_id AND link = 'blog/blog.php?blog_id=".(int)$blog_id."' LIMIT 1";
-		Database::query($sql);
-	}
-
-	/**
-	 * Deletes a blog and it's posts from the course database
-	 * @author Toon Keppens
-	 * @param Integer $blog_id
-	 */
-	public static function delete_blog($blog_id)
-	{
-		// Init
+        Database::query($sql);
+    }
+
+    /**
+     * Deletes a blog and it's posts from the course database
+     * @author Toon Keppens
+     * @param Integer $blog_id
+     */
+    public static function delete_blog($blog_id)
+    {
+        // Init
         $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
         $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
         $tbl_blogs_comment = Database::get_course_table(TABLE_BLOGS_COMMENTS);
         $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
         $tbl_tool = Database::get_course_table(TABLE_TOOL_LIST);
         $tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
-		$tbl_blogs_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+        $tbl_blogs_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
 
         $course_id = api_get_course_int_id();
         $blog_id = intval($blog_id);
 
-		// Delete posts from DB and the attachments
-		delete_all_blog_attachment($blog_id);
+        // Delete posts from DB and the attachments
+        delete_all_blog_attachment($blog_id);
 
-		//Delete comments
-		$sql = "DELETE FROM $tbl_blogs_comment WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
-   		Database::query($sql);
+        //Delete comments
+        $sql = "DELETE FROM $tbl_blogs_comment WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
+            Database::query($sql);
 
-		// Delete posts
-   		$sql = "DELETE FROM $tbl_blogs_posts WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
-   		Database::query($sql);
+        // Delete posts
+            $sql = "DELETE FROM $tbl_blogs_posts WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
+            Database::query($sql);
 
-		// Delete tasks
-		$sql = "DELETE FROM $tbl_blogs_tasks WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
-		Database::query($sql);
+        // Delete tasks
+        $sql = "DELETE FROM $tbl_blogs_tasks WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
+        Database::query($sql);
 
-		// Delete ratings
-		$sql = "DELETE FROM $tbl_blogs_rating WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
-		Database::query($sql);
+        // Delete ratings
+        $sql = "DELETE FROM $tbl_blogs_rating WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
+        Database::query($sql);
 
-		// Delete blog
-		$sql ="DELETE FROM $tbl_blogs WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
-		Database::query($sql);
+        // Delete blog
+        $sql ="DELETE FROM $tbl_blogs WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
+        Database::query($sql);
 
-		// Delete from course homepage
-		$sql = "DELETE FROM $tbl_tool WHERE c_id = $course_id AND link = 'blog/blog.php?blog_id=".$blog_id."'";
-		Database::query($sql);
+        // Delete from course homepage
+        $sql = "DELETE FROM $tbl_tool WHERE c_id = $course_id AND link = 'blog/blog.php?blog_id=".$blog_id."'";
+        Database::query($sql);
 
-		//update item_property (delete)
+        //update item_property (delete)
         api_item_property_update(
             api_get_course_info(),
             TOOL_BLOGS,
@@ -278,152 +277,152 @@ 
             'delete',
             api_get_user_id()
         );
-	}
-
-	/**
-	 * Creates a new post in a given blog
-	 * @author Toon Keppens
-	 * @param String $title
-	 * @param String $full_text
-	 * @param Integer $blog_id
-	 */
-	public static function create_post($title, $full_text, $file_comment, $blog_id)
-	{
-		$_user = api_get_user_info();
-		$_course = api_get_course_info();
-		$course_id = $_course['real_id'];
-
-		$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
-		$upload_ok=true;
-		$has_attachment=false;
-		$current_date = api_get_utc_datetime();
-
-		if (!empty($_FILES['user_upload']['name'])) {
-			$upload_ok = process_uploaded_file($_FILES['user_upload']);
-			$has_attachment=true;
-		}
-
-		if ($upload_ok) {
-			// Table Definitions
-			$tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
-
-			// Create the post
-			$sql = "INSERT INTO $tbl_blogs_posts (c_id, title, full_text, date_creation, blog_id, author_id )
+    }
+
+    /**
+     * Creates a new post in a given blog
+     * @author Toon Keppens
+     * @param String $title
+     * @param String $full_text
+     * @param Integer $blog_id
+     */
+    public static function create_post($title, $full_text, $file_comment, $blog_id)
+    {
+        $_user = api_get_user_info();
+        $_course = api_get_course_info();
+        $course_id = $_course['real_id'];
+
+        $blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+        $upload_ok=true;
+        $has_attachment=false;
+        $current_date = api_get_utc_datetime();
+
+        if (!empty($_FILES['user_upload']['name'])) {
+            $upload_ok = process_uploaded_file($_FILES['user_upload']);
+            $has_attachment=true;
+        }
+
+        if ($upload_ok) {
+            // Table Definitions
+            $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
+
+            // Create the post
+            $sql = "INSERT INTO $tbl_blogs_posts (c_id, title, full_text, date_creation, blog_id, author_id )
 					VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($full_text)."','".$current_date."', '".(int)$blog_id."', '".(int)$_user['user_id']."');";
 
-			Database::query($sql);
-			$last_post_id = Database::insert_id();
+            Database::query($sql);
+            $last_post_id = Database::insert_id();
 
             if ($last_post_id) {
                 $sql = "UPDATE $tbl_blogs_posts SET post_id = iid WHERE iid = $last_post_id";
                 Database::query($sql);
             }
 
-			if ($has_attachment) {
-				$courseDir   = $_course['path'].'/upload/blog';
-				$sys_course_path = api_get_path(SYS_COURSE_PATH);
-				$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($_FILES['user_upload']['name']), $_FILES['user_upload']['type']);
-
-				// user's file name
-				$file_name = $_FILES['user_upload']['name'];
-
-				if (!filter_extension($new_file_name)) {
-					Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
-				} else {
-					$new_file_name = uniqid('');
-					$new_path = $updir.'/'.$new_file_name;
-					$result = @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
-					$comment = Database::escape_string($file_comment);
-
-					// Storing the attachments if any
-					if ($result) {
-						$sql = 'INSERT INTO '.$blog_table_attachment.'(c_id, filename,comment, path, post_id,size, blog_id,comment_id) '.
-							   "VALUES ($course_id, '".Database::escape_string($file_name)."', '".$comment."', '".Database::escape_string($new_file_name)."' , '".$last_post_id."', '".intval($_FILES['user_upload']['size'])."',  '".$blog_id."', '0' )";
-						Database::query($sql);
+            if ($has_attachment) {
+                $courseDir   = $_course['path'].'/upload/blog';
+                $sys_course_path = api_get_path(SYS_COURSE_PATH);
+                $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($_FILES['user_upload']['name']), $_FILES['user_upload']['type']);
+
+                // user's file name
+                $file_name = $_FILES['user_upload']['name'];
+
+                if (!filter_extension($new_file_name)) {
+                    Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
+                } else {
+                    $new_file_name = uniqid('');
+                    $new_path = $updir.'/'.$new_file_name;
+                    $result = @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
+                    $comment = Database::escape_string($file_comment);
+
+                    // Storing the attachments if any
+                    if ($result) {
+                        $sql = 'INSERT INTO '.$blog_table_attachment.'(c_id, filename,comment, path, post_id,size, blog_id,comment_id) '.
+                                "VALUES ($course_id, '".Database::escape_string($file_name)."', '".$comment."', '".Database::escape_string($new_file_name)."' , '".$last_post_id."', '".intval($_FILES['user_upload']['size'])."',  '".$blog_id."', '0' )";
+                        Database::query($sql);
                         $id = Database::insert_id();
                         if ($id) {
                             $sql = "UPDATE $blog_table_attachment SET id = iid WHERE iid = $id";
                             Database::query($sql);
                         }
-					}
-				}
-			}
-		} else {
-			Display::display_error_message(get_lang('UplNoFileUploaded'));
-		}
-	}
-
-	/**
-	 * Edits a post in a given blog
-	 * @author Toon Keppens
-	 * @param Integer $blog_id
-	 * @param String $title
-	 * @param String $full_text
-	 * @param Integer $blog_id
-	 */
-	public static function edit_post($post_id, $title, $full_text, $blog_id)
-	{
-		$tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
+                    }
+                }
+            }
+        } else {
+            Display::display_error_message(get_lang('UplNoFileUploaded'));
+        }
+    }
+
+    /**
+     * Edits a post in a given blog
+     * @author Toon Keppens
+     * @param Integer $blog_id
+     * @param String $title
+     * @param String $full_text
+     * @param Integer $blog_id
+     */
+    public static function edit_post($post_id, $title, $full_text, $blog_id)
+    {
+        $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
         $course_id = api_get_course_int_id();
 
-		// Create the post
-		$sql = "UPDATE $tbl_blogs_posts SET
+        // Create the post
+        $sql = "UPDATE $tbl_blogs_posts SET
 		        title = '" . Database::escape_string($title)."',
 		        full_text = '" . Database::escape_string($full_text)."'
 		        WHERE c_id = $course_id AND post_id ='".(int)$post_id."' AND blog_id ='".(int)$blog_id."'
 		        LIMIT 1 ";
-		Database::query($sql);
-	}
-
-	/**
-	 * Deletes an article and it's comments
-	 * @author Toon Keppens
-	 * @param int $blog_id
-	 * @param int $post_id
-	 */
-	public static function delete_post($blog_id, $post_id)
-	{
-		$tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
-		$tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
-		$tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
+        Database::query($sql);
+    }
+
+    /**
+     * Deletes an article and it's comments
+     * @author Toon Keppens
+     * @param int $blog_id
+     * @param int $post_id
+     */
+    public static function delete_post($blog_id, $post_id)
+    {
+        $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
+        $tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
+        $tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
 
         $course_id = api_get_course_int_id();
 
-		// Delete ratings on this comment
-		$sql = "DELETE FROM $tbl_blogs_rating
+        // Delete ratings on this comment
+        $sql = "DELETE FROM $tbl_blogs_rating
 				WHERE c_id = $course_id AND blog_id = '".(int)$blog_id."' AND item_id = '".(int)$post_id."' AND rating_type = 'post'";
-		Database::query($sql);
+        Database::query($sql);
 
-		// Delete the post
-		$sql = "DELETE FROM $tbl_blogs_posts
+        // Delete the post
+        $sql = "DELETE FROM $tbl_blogs_posts
 				WHERE c_id = $course_id AND post_id = '".(int)$post_id."'";
-		Database::query($sql);
+        Database::query($sql);
 
-		// Delete the comments
-		$sql = "DELETE FROM $tbl_blogs_comments
+        // Delete the comments
+        $sql = "DELETE FROM $tbl_blogs_comments
 				WHERE c_id = $course_id AND post_id = '".(int)$post_id."' AND blog_id = '".(int)$blog_id."'";
-		Database::query($sql);
-
-		// Delete posts and attachments
-		delete_all_blog_attachment($blog_id,$post_id);
-	}
-
-	/**
-	 * Creates a comment on a post in a given blog
-	 * @author Toon Keppens
-	 * @param String $title
-	 * @param String $full_text
-	 * @param Integer $blog_id
-	 * @param Integer $post_id
-	 * @param Integer $parent_id
-	 */
-	public static function create_comment($title, $full_text, $file_comment, $blog_id, $post_id, $parent_id, $task_id = 'NULL')
-	{
-		$_user = api_get_user_info();
-		$_course = api_get_course_info();
+        Database::query($sql);
+
+        // Delete posts and attachments
+        delete_all_blog_attachment($blog_id,$post_id);
+    }
+
+    /**
+     * Creates a comment on a post in a given blog
+     * @author Toon Keppens
+     * @param String $title
+     * @param String $full_text
+     * @param Integer $blog_id
+     * @param Integer $post_id
+     * @param Integer $parent_id
+     */
+    public static function create_comment($title, $full_text, $file_comment, $blog_id, $post_id, $parent_id, $task_id = 'NULL')
+    {
+        $_user = api_get_user_info();
+        $_course = api_get_course_info();
         $blog_table_attachment 	= Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
 
         $upload_ok = true;
@@ -431,55 +430,55 @@ 
         $current_date = api_get_utc_datetime();
         $course_id = api_get_course_int_id();
 
-		if (!empty($_FILES['user_upload']['name'])) {
-			$upload_ok = process_uploaded_file($_FILES['user_upload']);
-			$has_attachment=true;
-		}
+        if (!empty($_FILES['user_upload']['name'])) {
+            $upload_ok = process_uploaded_file($_FILES['user_upload']);
+            $has_attachment=true;
+        }
 
-		if ($upload_ok) {
-			// Table Definition
-			$tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
+        if ($upload_ok) {
+            // Table Definition
+            $tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
 
-			// Create the comment
-			$sql = "INSERT INTO $tbl_blogs_comments (c_id, title, comment, author_id, date_creation, blog_id, post_id, parent_comment_id, task_id )
+            // Create the comment
+            $sql = "INSERT INTO $tbl_blogs_comments (c_id, title, comment, author_id, date_creation, blog_id, post_id, parent_comment_id, task_id )
 					VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($full_text)."', '".(int)$_user['user_id']."','".$current_date."', '".(int)$blog_id."', '".(int)$post_id."', '".(int)$parent_id."', '".(int)$task_id."')";
-			Database::query($sql);
+            Database::query($sql);
 
-			// Empty post values, or they are shown on the page again
-			$last_id = Database::insert_id();
+            // Empty post values, or they are shown on the page again
+            $last_id = Database::insert_id();
 
             if ($last_id) {
                 $sql = "UPDATE $tbl_blogs_comments SET comment_id = iid WHERE iid = $last_id";
                 Database::query($sql);
             }
 
-			if ($has_attachment) {
-				$courseDir   = $_course['path'].'/upload/blog';
-				$sys_course_path = api_get_path(SYS_COURSE_PATH);
-				$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($_FILES['user_upload']['name']),
-					$_FILES['user_upload']['type']
-				);
-
-				// user's file name
-				$file_name =$_FILES['user_upload']['name'];
-
-				if (!filter_extension($new_file_name)) {
-					Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
-				} else {
-					$new_file_name = uniqid('');
-					$new_path=$updir.'/'.$new_file_name;
-					$result= @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
-					$comment = Database::escape_string($file_comment);
-
-					// Storing the attachments if any
-					if ($result) {
-						$sql='INSERT INTO '.$blog_table_attachment.'(c_id, filename,comment, path, post_id,size,blog_id,comment_id) '.
-							 "VALUES ($course_id, '".Database::escape_string($file_name)."', '".$comment."', '".Database::escape_string($new_file_name)."' , '".$post_id."', '".$_FILES['user_upload']['size']."',  '".$blog_id."', '".$last_id."'  )";
-						Database::query($sql);
+            if ($has_attachment) {
+                $courseDir   = $_course['path'].'/upload/blog';
+                $sys_course_path = api_get_path(SYS_COURSE_PATH);
+                $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($_FILES['user_upload']['name']),
+                    $_FILES['user_upload']['type']
+                );
+
+                // user's file name
+                $file_name =$_FILES['user_upload']['name'];
+
+                if (!filter_extension($new_file_name)) {
+                    Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
+                } else {
+                    $new_file_name = uniqid('');
+                    $new_path=$updir.'/'.$new_file_name;
+                    $result= @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
+                    $comment = Database::escape_string($file_comment);
+
+                    // Storing the attachments if any
+                    if ($result) {
+                        $sql='INSERT INTO '.$blog_table_attachment.'(c_id, filename,comment, path, post_id,size,blog_id,comment_id) '.
+                                "VALUES ($course_id, '".Database::escape_string($file_name)."', '".$comment."', '".Database::escape_string($new_file_name)."' , '".$post_id."', '".$_FILES['user_upload']['size']."',  '".$blog_id."', '".$last_id."'  )";
+                        Database::query($sql);
 
                         $id = Database::insert_id();
 
@@ -487,92 +486,92 @@ 
                             $sql = "UPDATE $blog_table_attachment SET id = iid WHERE iid = $id";
                             Database::query($sql);
                         }
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Deletes a comment from a blogpost
-	 * @author Toon Keppens
-	 * @param int $blog_id
-	 * @param int $comment_id
-	 */
-	public static function delete_comment($blog_id, $post_id, $comment_id)
-	{
-		$tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
-		$tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
-		$blog_id = intval($blog_id);
-		$post_id = intval($post_id);
-		$comment_id = intval($comment_id);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Deletes a comment from a blogpost
+     * @author Toon Keppens
+     * @param int $blog_id
+     * @param int $comment_id
+     */
+    public static function delete_comment($blog_id, $post_id, $comment_id)
+    {
+        $tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
+        $tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
+        $blog_id = intval($blog_id);
+        $post_id = intval($post_id);
+        $comment_id = intval($comment_id);
         $course_id = api_get_course_int_id();
 
-		delete_all_blog_attachment($blog_id, $post_id, $comment_id);
+        delete_all_blog_attachment($blog_id, $post_id, $comment_id);
 
-		// Delete ratings on this comment
-		$sql = "DELETE FROM $tbl_blogs_rating
+        // Delete ratings on this comment
+        $sql = "DELETE FROM $tbl_blogs_rating
 				WHERE
 				    c_id = $course_id AND
 				    blog_id = '".$blog_id."' AND
 				    item_id = '".$comment_id."' AND
 				    rating_type = 'comment'";
-		Database::query($sql);
+        Database::query($sql);
 
-		// select comments that have the selected comment as their parent
-		$sql = "SELECT comment_id FROM $tbl_blogs_comments
+        // select comments that have the selected comment as their parent
+        $sql = "SELECT comment_id FROM $tbl_blogs_comments
 				WHERE c_id = $course_id AND parent_comment_id = '".$comment_id."'";
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
-		// Delete them recursively
-		while ($comment = Database::fetch_array($result)) {
-			Blog::delete_comment($blog_id,$post_id,$comment['comment_id']);
-		}
+        // Delete them recursively
+        while ($comment = Database::fetch_array($result)) {
+            Blog::delete_comment($blog_id,$post_id,$comment['comment_id']);
+        }
 
-		// Finally, delete the selected comment to
-		$sql = "DELETE FROM $tbl_blogs_comments
+        // Finally, delete the selected comment to
+        $sql = "DELETE FROM $tbl_blogs_comments
 				WHERE c_id = $course_id AND comment_id = '".$comment_id."'";
-		Database::query($sql);
-	}
-
-	/**
-	 * Creates a new task in a blog
-	 * @author Toon Keppens
-	 * @param Integer $blog_id
-	 * @param String $title
-	 * @param String $description
-	 * @param String $color
-	 */
-	public static function create_task($blog_id, $title, $description, $articleDelete, $articleEdit, $commentsDelete, $color)
-	{
-		// Init
-		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
-		$tbl_tasks_permissions = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
-
-		$course_id = api_get_course_int_id();
-
-		// Create the task
-		$sql = "INSERT INTO $tbl_blogs_tasks (c_id, blog_id, title, description, color, system_task)
+        Database::query($sql);
+    }
+
+    /**
+     * Creates a new task in a blog
+     * @author Toon Keppens
+     * @param Integer $blog_id
+     * @param String $title
+     * @param String $description
+     * @param String $color
+     */
+    public static function create_task($blog_id, $title, $description, $articleDelete, $articleEdit, $commentsDelete, $color)
+    {
+        // Init
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+        $tbl_tasks_permissions = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
+
+        $course_id = api_get_course_int_id();
+
+        // Create the task
+        $sql = "INSERT INTO $tbl_blogs_tasks (c_id, blog_id, title, description, color, system_task)
 				VALUES ($course_id , '".(int)$blog_id."', '" . Database::escape_string($title)."', '" . Database::escape_string($description)."', '" . Database::escape_string($color)."', '0');";
-		Database::query($sql);
+        Database::query($sql);
 
-		$task_id = Database::insert_id();
+        $task_id = Database::insert_id();
 
         if ($task_id) {
             $sql = "UPDATE $tbl_blogs_tasks SET task_id = iid WHERE iid = $task_id";
             Database::query($sql);
         }
 
-		$tool = 'BLOG_' . $blog_id;
+        $tool = 'BLOG_' . $blog_id;
 
-		if ($articleDelete == 'on') {
-			$sql = " INSERT INTO " . $tbl_tasks_permissions . " ( c_id,  task_id, tool, action) VALUES (
+        if ($articleDelete == 'on') {
+            $sql = " INSERT INTO " . $tbl_tasks_permissions . " ( c_id,  task_id, tool, action) VALUES (
 					'" . (int)$course_id . "',
 					'" . (int)$task_id . "',
 					'" . Database::escape_string($tool) . "',
 					'article_delete'
 				)";
-			Database::query($sql);
+            Database::query($sql);
 
             $id = Database::insert_id();
 
@@ -582,172 +581,172 @@ 
             }
         }
 
-		if ($articleEdit == 'on') {
-			$sql = "
+        if ($articleEdit == 'on') {
+            $sql = "
 				INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action ) VALUES (
 					'" . (int)$course_id . "',
 					'" . (int)$task_id . "',
 					'" . Database::escape_string($tool) . "',
 					'article_edit'
 				)";
-			Database::query($sql);
+            Database::query($sql);
             $id = Database::insert_id();
 
             if ($id) {
                 $sql = "UPDATE $tbl_tasks_permissions SET id = iid WHERE iid = $id";
                 Database::query($sql);
             }
-		}
+        }
 
-		if ($commentsDelete == 'on') {
-			$sql = "
+        if ($commentsDelete == 'on') {
+            $sql = "
 				INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action ) VALUES (
 					'" . (int)$course_id . "',
 					'" . (int)$task_id . "',
 					'" . Database::escape_string($tool) . "',
 					'article_comments_delete'
 				)";
-			Database::query($sql);
+            Database::query($sql);
             $id = Database::insert_id();
 
             if ($id) {
                 $sql = "UPDATE $tbl_tasks_permissions SET id = iid WHERE iid = $id";
                 Database::query($sql);
             }
-		}
-	}
-
-	/**
-	 * Edit a task in a blog
-	 * @author Toon Keppens
-	 * @param Integer $task_id
-	 * @param String $title
-	 * @param String $description
-	 * @param String $color
-	 */
-	public static function edit_task($blog_id, $task_id, $title, $description, $articleDelete, $articleEdit, $commentsDelete, $color)
-	{
-		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
-		$tbl_tasks_permissions = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
+        }
+    }
+
+    /**
+     * Edit a task in a blog
+     * @author Toon Keppens
+     * @param Integer $task_id
+     * @param String $title
+     * @param String $description
+     * @param String $color
+     */
+    public static function edit_task($blog_id, $task_id, $title, $description, $articleDelete, $articleEdit, $commentsDelete, $color)
+    {
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+        $tbl_tasks_permissions = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
 
         $course_id = api_get_course_int_id();
 
-		// Create the task
-		$sql = "UPDATE $tbl_blogs_tasks SET
+        // Create the task
+        $sql = "UPDATE $tbl_blogs_tasks SET
 					title = '".Database::escape_string($title)."',
 					description = '".Database::escape_string($description)."',
 					color = '".Database::escape_string($color)."'
 				WHERE c_id = $course_id AND task_id ='".(int)$task_id."' LIMIT 1";
-		Database::query($sql);
+        Database::query($sql);
 
-		$tool = 'BLOG_' . $blog_id;
+        $tool = 'BLOG_' . $blog_id;
 
-		$sql = "DELETE FROM " . $tbl_tasks_permissions . "
+        $sql = "DELETE FROM " . $tbl_tasks_permissions . "
 				WHERE c_id = $course_id AND task_id = '" . (int)$task_id."'";
-		Database::query($sql);
+        Database::query($sql);
 
-		if ($articleDelete == 'on') {
-			$sql = "INSERT INTO " . $tbl_tasks_permissions . " ( c_id, task_id, tool, action) VALUES (
+        if ($articleDelete == 'on') {
+            $sql = "INSERT INTO " . $tbl_tasks_permissions . " ( c_id, task_id, tool, action) VALUES (
 					'" . (int)$course_id . "',
 					'" . (int)$task_id . "',
 					'" . Database::escape_string($tool) . "',
 					'article_delete'
 				)";
-			Database::query($sql);
+            Database::query($sql);
             $id = Database::insert_id();
 
             if ($id) {
                 $sql = "UPDATE $tbl_tasks_permissions SET id = iid WHERE iid = $id";
                 Database::query($sql);
             }
-		}
+        }
 
-		if ($articleEdit == 'on') {
-			$sql = "INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action) VALUES (
+        if ($articleEdit == 'on') {
+            $sql = "INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action) VALUES (
 					'" . (int)$course_id . "',
 					'" . (int)$task_id . "',
 					'" . Database::escape_string($tool) . "',
 					'article_edit'
 				)";
-			Database::query($sql);
+            Database::query($sql);
             $id = Database::insert_id();
 
             if ($id) {
                 $sql = "UPDATE $tbl_tasks_permissions SET id = iid WHERE iid = $id";
                 Database::query($sql);
             }
-		}
+        }
 
-		if ($commentsDelete == 'on') {
-			$sql = " INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action) VALUES (
+        if ($commentsDelete == 'on') {
+            $sql = " INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action) VALUES (
 					'" . (int)$course_id . "',
 					'" . (int)$task_id . "',
 					'" . Database::escape_string($tool) . "',
 					'article_comments_delete'
 				)";
-			Database::query($sql);
+            Database::query($sql);
             $id = Database::insert_id();
 
             if ($id) {
                 $sql = "UPDATE $tbl_tasks_permissions SET id = iid WHERE iid = $id";
                 Database::query($sql);
             }
-		}
-	}
-
-	/**
-	 * Deletes a task from a blog
-	 * @param Integer $blog_id
-	 * @param Integer $task_id
-	 */
-	public static function delete_task($blog_id, $task_id)
-	{
-		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
-		$course_id = api_get_course_int_id();
-
-		// Delete posts
-		$sql = "DELETE FROM $tbl_blogs_tasks
+        }
+    }
+
+    /**
+     * Deletes a task from a blog
+     * @param Integer $blog_id
+     * @param Integer $task_id
+     */
+    public static function delete_task($blog_id, $task_id)
+    {
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+        $course_id = api_get_course_int_id();
+
+        // Delete posts
+        $sql = "DELETE FROM $tbl_blogs_tasks
 				WHERE c_id = $course_id AND blog_id = '".(int)$blog_id."' AND task_id = '".(int)$task_id."'";
-		Database::query($sql);
-	}
-
-	/**
-	 * Deletes an assigned task from a blog
-	 * @param Integer $blog_id
-	 * @param Integer $assignment_id
-	 */
-	public static function delete_assigned_task($blog_id, $task_id, $user_id)
-	{
-		$tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+        Database::query($sql);
+    }
+
+    /**
+     * Deletes an assigned task from a blog
+     * @param Integer $blog_id
+     * @param Integer $assignment_id
+     */
+    public static function delete_assigned_task($blog_id, $task_id, $user_id)
+    {
+        $tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
         $course_id = api_get_course_int_id();
 
-		// Delete posts
-		$sql = "DELETE FROM $tbl_blogs_tasks_rel_user
+        // Delete posts
+        $sql = "DELETE FROM $tbl_blogs_tasks_rel_user
 				WHERE
 				    c_id = $course_id AND
 				    blog_id = '".(int)$blog_id."' AND
 				    task_id = '".(int)$task_id."' AND
 				    user_id = '".(int)$user_id."'";
-		Database::query($sql);
-	}
-
-	/**
-	 * Get personal task list
-	 * @author Toon Keppens
-	 * @return Returns an unsorted list (<ul></ul>) with the users' tasks
-	 */
-	public static function get_personal_task_list()
-	{
-		$_user = api_get_user_info();
-
-		$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
-		$tbl_blogs_tasks_rel_user 	= Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
-		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
-
-		$course_id = api_get_course_int_id();
-
-		if ($_user['user_id']) {
-			$sql = "SELECT task_rel_user.*, task.title, blog.blog_name
+        Database::query($sql);
+    }
+
+    /**
+     * Get personal task list
+     * @author Toon Keppens
+     * @return Returns an unsorted list (<ul></ul>) with the users' tasks
+     */
+    public static function get_personal_task_list()
+    {
+        $_user = api_get_user_info();
+
+        $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
+        $tbl_blogs_tasks_rel_user 	= Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+
+        $course_id = api_get_course_int_id();
+
+        if ($_user['user_id']) {
+            $sql = "SELECT task_rel_user.*, task.title, blog.blog_name
                     FROM $tbl_blogs_tasks_rel_user task_rel_user
                     INNER JOIN $tbl_blogs_tasks task
                     ON task_rel_user.task_id = task.task_id
@@ -761,85 +760,85 @@ 
                         task_rel_user.user_id = ".(int)$_user['user_id']."
                     ORDER BY target_date ASC";
 
-			$result = Database::query($sql);
-
-			if (Database::num_rows($result) > 0) {
-				echo '<ul>';
-				while ($mytask = Database::fetch_array($result)) {
-					echo '<li><a href="blog.php?action=execute_task&blog_id=' . $mytask['blog_id'] . '&task_id='.stripslashes($mytask['task_id']) . '" title="[Blog: '.stripslashes($mytask['blog_name']) . '] ' . get_lang('ExecuteThisTask') . '">'.stripslashes($mytask['title']) . '</a></li>';
-				}
-				echo '<ul>';
-			} else {
-				echo get_lang('NoTasks');
-			}
-		} else {
-			echo get_lang('NoTasks');
-		}
-	}
-
-	/**
-	 * Changes the visibility of a blog
-	 * @author Toon Keppens
-	 * @param Integer $blog_id
-	 */
-	public static function change_blog_visibility($blog_id)
-	{
-		$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
-		$tbl_tool = Database::get_course_table(TABLE_TOOL_LIST);
-		$course_id = api_get_course_int_id();
-
-		// Get blog properties
-		$sql = "SELECT blog_name, visibility FROM $tbl_blogs
+            $result = Database::query($sql);
+
+            if (Database::num_rows($result) > 0) {
+                echo '<ul>';
+                while ($mytask = Database::fetch_array($result)) {
+                    echo '<li><a href="blog.php?action=execute_task&blog_id=' . $mytask['blog_id'] . '&task_id='.stripslashes($mytask['task_id']) . '" title="[Blog: '.stripslashes($mytask['blog_name']) . '] ' . get_lang('ExecuteThisTask') . '">'.stripslashes($mytask['title']) . '</a></li>';
+                }
+                echo '<ul>';
+            } else {
+                echo get_lang('NoTasks');
+            }
+        } else {
+            echo get_lang('NoTasks');
+        }
+    }
+
+    /**
+     * Changes the visibility of a blog
+     * @author Toon Keppens
+     * @param Integer $blog_id
+     */
+    public static function change_blog_visibility($blog_id)
+    {
+        $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
+        $tbl_tool = Database::get_course_table(TABLE_TOOL_LIST);
+        $course_id = api_get_course_int_id();
+
+        // Get blog properties
+        $sql = "SELECT blog_name, visibility FROM $tbl_blogs
 				WHERE c_id = $course_id AND blog_id='".(int)$blog_id."'";
-		$result = Database::query($sql);
-		$blog = Database::fetch_array($result);
-		$visibility = $blog['visibility'];
-		$title = $blog['blog_name'];
-
-		if ($visibility == 1) {
-			// Change visibility state, remove from course home.
-			$sql = "UPDATE $tbl_blogs SET visibility = '0'
+        $result = Database::query($sql);
+        $blog = Database::fetch_array($result);
+        $visibility = $blog['visibility'];
+        $title = $blog['blog_name'];
+
+        if ($visibility == 1) {
+            // Change visibility state, remove from course home.
+            $sql = "UPDATE $tbl_blogs SET visibility = '0'
 					WHERE c_id = $course_id AND blog_id ='".(int)$blog_id."' LIMIT 1";
-			Database::query($sql);
+            Database::query($sql);
 
-			$sql = "DELETE FROM $tbl_tool
+            $sql = "DELETE FROM $tbl_tool
 					WHERE c_id = $course_id AND name = '".Database::escape_string($title)."' LIMIT 1";
-			Database::query($sql);
-		} else {
-			// Change visibility state, add to course home.
-			$sql = "UPDATE $tbl_blogs SET visibility = '1'
+            Database::query($sql);
+        } else {
+            // Change visibility state, add to course home.
+            $sql = "UPDATE $tbl_blogs SET visibility = '1'
 					WHERE c_id = $course_id AND blog_id ='".(int)$blog_id."' LIMIT 1";
-			Database::query($sql);
+            Database::query($sql);
 
-			$sql = "INSERT INTO $tbl_tool (c_id, name, link, image, visibility, admin, address, added_tool, target )
+            $sql = "INSERT INTO $tbl_tool (c_id, name, link, image, visibility, admin, address, added_tool, target )
 					VALUES ($course_id, '".Database::escape_string($title)."', 'blog/blog.php?blog_id=".(int)$blog_id."', 'blog.gif', '1', '0', 'pastillegris.gif', '0', '_self')";
-			Database::query($sql);
+            Database::query($sql);
             $id = Database::insert_id();
 
             if ($id) {
                 $sql = "UPDATE $tbl_tool SET id = iid WHERE iid = $id";
                 Database::query($sql);
             }
-		}
-	}
-
-	/**
-	 * Shows the posts of a blog
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 */
-	public static function display_blog_posts($blog_id, $filter = '1=1', $max_number_of_posts = 20)
+        }
+    }
+
+    /**
+     * Shows the posts of a blog
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     */
+    public static function display_blog_posts($blog_id, $filter = '1=1', $max_number_of_posts = 20)
     {
-		// Init
-		$tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
-		$tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
-		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+        // Init
+        $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
+        $tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
+        $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
 
-		$course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
 
-		// Get posts and authors
-		$sql = "SELECT post.*, user.lastname, user.firstname, user.username
+        // Get posts and authors
+        $sql = "SELECT post.*, user.lastname, user.firstname, user.username
 		        FROM $tbl_blogs_posts post
                 INNER JOIN $tbl_users user
                 ON post.author_id = user.user_id
@@ -847,131 +846,131 @@ 
 						post.c_id = $course_id AND
 						$filter
 				ORDER BY post_id DESC LIMIT 0,".(int)$max_number_of_posts;
-		$result = Database::query($sql);
-
-		// Display
-		if(Database::num_rows($result) > 0) {
-		    $limit = 200;
-			while ($blog_post = Database::fetch_array($result)) {
-				// Get number of comments
-				$sql = "SELECT COUNT(1) as number_of_comments
+        $result = Database::query($sql);
+
+        // Display
+        if(Database::num_rows($result) > 0) {
+            $limit = 200;
+            while ($blog_post = Database::fetch_array($result)) {
+                // Get number of comments
+                $sql = "SELECT COUNT(1) as number_of_comments
 						FROM $tbl_blogs_comments
 						WHERE
 						    c_id = $course_id AND
 						    blog_id = '".(int)$blog_id."' AND
 						    post_id = '" . (int)$blog_post['post_id']."'";
-				$tmp = Database::query($sql);
-				$blog_post_comments = Database::fetch_array($tmp);
-
-				// Prepare data
-				$blog_post_id = $blog_post['post_id'];
-				$blog_post_text = make_clickable(stripslashes($blog_post['full_text']));
-				$blog_post_date = api_convert_and_format_date($blog_post['date_creation'], null, date_default_timezone_get());
-
-				// Create an introduction text (but keep FULL sentences)
-				$words = 0;
-				$blog_post_text_cut = cut($blog_post_text, $limit) ;
-				$words = strlen($blog_post_text);
-
-				if ($words >= $limit) {
-					$readMoreLink = ' <div class="link" onclick="document.getElementById(\'blogpost_text_' . $blog_post_id . '\').style.display=\'block\'; document.getElementById(\'blogpost_introduction_' . $blog_post_id . '\').style.display=\'none\'">' . get_lang('ReadMore') . '</div>';
-					$introduction_text = $blog_post_text_cut;
-				} else {
-				    $introduction_text = $blog_post_text;
-					$readMoreLink = '';
-				}
-
-				$introduction_text = stripslashes($introduction_text);
-
-				echo '<div class="blogpost">';
-				echo '<span class="blogpost_title"><a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >'.stripslashes($blog_post['title']) . '</a></span>';
-				echo '<span class="blogpost_date"><a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >' . $blog_post_date . '</a></span>';
-				echo '<div class="blogpost_introduction" id="blogpost_introduction_'.$blog_post_id.'">' . $introduction_text.$readMoreLink.'</div>';
-				echo '<div class="blogpost_text" id="blogpost_text_' . $blog_post_id . '" style="display: none">' . $blog_post_text . '</div>';
-
-				$file_name_array = get_blog_attachment($blog_id,$blog_post_id,0);
-
-				if (!empty($file_name_array)) {
-					echo '<br /><br />';
-					echo Display::return_icon('attachment.gif',get_lang('Attachment'));
-					echo '<a href="download.php?file=';
-					echo $file_name_array['path'];
-					echo ' "> '.$file_name_array['filename'].' </a><br />';
-					echo '</span>';
-				}
-				$username = api_htmlentities(sprintf(get_lang('LoginX'), $blog_post['username']), ENT_QUOTES);
-				echo '<span class="blogpost_info">' . get_lang('Author') . ': ' . Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username)) .' - <a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >' . get_lang('Comments') . ': ' . $blog_post_comments['number_of_comments'] . '</a></span>';
-				echo '</div>';
-			}
-		} else {
-			if($filter == '1=1') {
-				echo get_lang('NoArticles');
-			} else {
-				echo get_lang('NoArticleMatches');
-			}
-		}
+                $tmp = Database::query($sql);
+                $blog_post_comments = Database::fetch_array($tmp);
+
+                // Prepare data
+                $blog_post_id = $blog_post['post_id'];
+                $blog_post_text = make_clickable(stripslashes($blog_post['full_text']));
+                $blog_post_date = api_convert_and_format_date($blog_post['date_creation'], null, date_default_timezone_get());
+
+                // Create an introduction text (but keep FULL sentences)
+                $words = 0;
+                $blog_post_text_cut = cut($blog_post_text, $limit) ;
+                $words = strlen($blog_post_text);
+
+                if ($words >= $limit) {
+                    $readMoreLink = ' <div class="link" onclick="document.getElementById(\'blogpost_text_' . $blog_post_id . '\').style.display=\'block\'; document.getElementById(\'blogpost_introduction_' . $blog_post_id . '\').style.display=\'none\'">' . get_lang('ReadMore') . '</div>';
+                    $introduction_text = $blog_post_text_cut;
+                } else {
+                    $introduction_text = $blog_post_text;
+                    $readMoreLink = '';
+                }
+
+                $introduction_text = stripslashes($introduction_text);
+
+                echo '<div class="blogpost">';
+                echo '<span class="blogpost_title"><a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >'.stripslashes($blog_post['title']) . '</a></span>';
+                echo '<span class="blogpost_date"><a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >' . $blog_post_date . '</a></span>';
+                echo '<div class="blogpost_introduction" id="blogpost_introduction_'.$blog_post_id.'">' . $introduction_text.$readMoreLink.'</div>';
+                echo '<div class="blogpost_text" id="blogpost_text_' . $blog_post_id . '" style="display: none">' . $blog_post_text . '</div>';
+
+                $file_name_array = get_blog_attachment($blog_id,$blog_post_id,0);
+
+                if (!empty($file_name_array)) {
+                    echo '<br /><br />';
+                    echo Display::return_icon('attachment.gif',get_lang('Attachment'));
+                    echo '<a href="download.php?file=';
+                    echo $file_name_array['path'];
+                    echo ' "> '.$file_name_array['filename'].' </a><br />';
+                    echo '</span>';
+                }
+                $username = api_htmlentities(sprintf(get_lang('LoginX'), $blog_post['username']), ENT_QUOTES);
+                echo '<span class="blogpost_info">' . get_lang('Author') . ': ' . Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username)) .' - <a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >' . get_lang('Comments') . ': ' . $blog_post_comments['number_of_comments'] . '</a></span>';
+                echo '</div>';
+            }
+        } else {
+            if($filter == '1=1') {
+                echo get_lang('NoArticles');
+            } else {
+                echo get_lang('NoArticleMatches');
+            }
+        }
 }
 
-	/**
-	 * Display the search results
-	 *
-	 * @param Integer $blog_id
-	 * @param String $query_string
-	 */
-	public static function display_search_results ($blog_id, $query_string)
-	{
-		// Init
-		$query_string = Database::escape_string($query_string);
-		$query_string_parts = explode(' ',$query_string);
-		$query_string = array();
-		foreach ($query_string_parts as $query_part) {
-			$query_string[] = " full_text LIKE '%" . $query_part."%' OR title LIKE '%" . $query_part."%' ";
-		}
-		$query_string = '('.implode('OR',$query_string) . ')';
-
-		// Display the posts
-		echo '<span class="blogpost_title">' . get_lang('SearchResults') . '</span>';
-		Blog::display_blog_posts($blog_id, $query_string);
-	}
-
-	/**
-	 * Display posts from a certain date
-	 *
-	 * @param Integer $blog_id
-	 * @param String $query_string
-	 */
-	public static function display_day_results($blog_id, $query_string)
-	{
-		$date_output = $query_string;
-		$date = explode('-',$query_string);
-		$query_string = ' DAYOFMONTH(date_creation) =' . intval($date[2]) . ' AND MONTH(date_creation) =' . intval($date[1]) . ' AND YEAR(date_creation) =' . intval($date[0]);
-
-		// Put date in correct output format
-		$date_output = api_format_date($date_output, DATE_FORMAT_LONG);
-
-		// Display the posts
-		echo '<span class="blogpost_title">' . get_lang('PostsOf') . ': ' . $date_output . '</span>';
-		Blog::display_blog_posts($blog_id, $query_string);
-	}
-
-	/**
-	 * Displays a post and his comments
-	 *
-	 * @param Integer $blog_id
-	 * @param Integer $post_id
-	 */
-	public static function display_post($blog_id, $post_id)
-	{
-		$tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
-		$tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
-		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
-
-		global $charset, $dateFormatLong;
-
-		$course_id = api_get_course_int_id();
-
-		// Get posts and author
-		$sql = "SELECT post.*, user.lastname, user.firstname, user.username
+    /**
+     * Display the search results
+     *
+     * @param Integer $blog_id
+     * @param String $query_string
+     */
+    public static function display_search_results ($blog_id, $query_string)
+    {
+        // Init
+        $query_string = Database::escape_string($query_string);
+        $query_string_parts = explode(' ',$query_string);
+        $query_string = array();
+        foreach ($query_string_parts as $query_part) {
+            $query_string[] = " full_text LIKE '%" . $query_part."%' OR title LIKE '%" . $query_part."%' ";
+        }
+        $query_string = '('.implode('OR',$query_string) . ')';
+
+        // Display the posts
+        echo '<span class="blogpost_title">' . get_lang('SearchResults') . '</span>';
+        Blog::display_blog_posts($blog_id, $query_string);
+    }
+
+    /**
+     * Display posts from a certain date
+     *
+     * @param Integer $blog_id
+     * @param String $query_string
+     */
+    public static function display_day_results($blog_id, $query_string)
+    {
+        $date_output = $query_string;
+        $date = explode('-',$query_string);
+        $query_string = ' DAYOFMONTH(date_creation) =' . intval($date[2]) . ' AND MONTH(date_creation) =' . intval($date[1]) . ' AND YEAR(date_creation) =' . intval($date[0]);
+
+        // Put date in correct output format
+        $date_output = api_format_date($date_output, DATE_FORMAT_LONG);
+
+        // Display the posts
+        echo '<span class="blogpost_title">' . get_lang('PostsOf') . ': ' . $date_output . '</span>';
+        Blog::display_blog_posts($blog_id, $query_string);
+    }
+
+    /**
+     * Displays a post and his comments
+     *
+     * @param Integer $blog_id
+     * @param Integer $post_id
+     */
+    public static function display_post($blog_id, $post_id)
+    {
+        $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
+        $tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
+        $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+
+        global $charset, $dateFormatLong;
+
+        $course_id = api_get_course_int_id();
+
+        // Get posts and author
+        $sql = "SELECT post.*, user.lastname, user.firstname, user.username
 		        FROM $tbl_blogs_posts post
 					INNER JOIN $tbl_users user
 					ON post.author_id = user.user_id
@@ -980,113 +979,113 @@ 
                     post.blog_id = '".(int)$blog_id."' AND
                     post.post_id = '".(int)$post_id."'
                 ORDER BY post_id DESC";
-		$result = Database::query($sql);
-		$blog_post = Database::fetch_array($result);
+        $result = Database::query($sql);
+        $blog_post = Database::fetch_array($result);
 
-		// Get number of comments
-		$sql = "SELECT COUNT(1) as number_of_comments
+        // Get number of comments
+        $sql = "SELECT COUNT(1) as number_of_comments
 		        FROM $tbl_blogs_comments
 				WHERE c_id = $course_id AND blog_id = '".(int)$blog_id."' AND post_id = '".(int)$post_id."'";
-		$result = Database::query($sql);
-		$blog_post_comments = Database::fetch_array($result);
+        $result = Database::query($sql);
+        $blog_post_comments = Database::fetch_array($result);
 
-		// Prepare data
-		$blog_post_text = make_clickable(stripslashes($blog_post['full_text']));
-		$blog_post_date = api_convert_and_format_date($blog_post['date_creation'], null, date_default_timezone_get());
-		$blog_post_actions = "";
+        // Prepare data
+        $blog_post_text = make_clickable(stripslashes($blog_post['full_text']));
+        $blog_post_date = api_convert_and_format_date($blog_post['date_creation'], null, date_default_timezone_get());
+        $blog_post_actions = "";
 
-		$task_id = (isset($_GET['task_id']) && is_numeric($_GET['task_id'])) ? intval($_GET['task_id']) : 0;
+        $task_id = (isset($_GET['task_id']) && is_numeric($_GET['task_id'])) ? intval($_GET['task_id']) : 0;
 
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_edit', $task_id)) {
-			$blog_post_actions .= '<a href="blog.php?action=edit_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('EditThisPost') . '">';
-			$blog_post_actions .=  Display::return_icon('edit.png');
-			$blog_post_actions .= '</a>';
+        if (api_is_allowed('BLOG_' . $blog_id, 'article_edit', $task_id)) {
+            $blog_post_actions .= '<a href="blog.php?action=edit_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('EditThisPost') . '">';
+            $blog_post_actions .=  Display::return_icon('edit.png');
+            $blog_post_actions .= '</a>';
         }
 
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_delete', $task_id)) {
-			$blog_post_actions .= '<a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&do=delete_article&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('DeleteThisArticle') . '" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;">';
+        if (api_is_allowed('BLOG_' . $blog_id, 'article_delete', $task_id)) {
+            $blog_post_actions .= '<a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&do=delete_article&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('DeleteThisArticle') . '" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;">';
             $blog_post_actions .= Display::return_icon('delete.png');
             $blog_post_actions .= '</a>';
         }
 
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_rate'))
-			$rating_select = Blog::display_rating_form('post',$blog_id,$post_id);
+        if (api_is_allowed('BLOG_' . $blog_id, 'article_rate'))
+            $rating_select = Blog::display_rating_form('post',$blog_id,$post_id);
 
-		$blog_post_text=stripslashes($blog_post_text);
+        $blog_post_text=stripslashes($blog_post_text);
 
-		// Display post
-		echo '<div class="blogpost">';
-		echo '<span class="blogpost_title"><a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '" title="' . get_lang('ReadPost') . '" >'.stripslashes($blog_post['title']) . '</a></span>';
-		echo '<span class="blogpost_date">' . $blog_post_date . '</span>';
-		echo '<span class="blogpost_text">' . $blog_post_text . '</span><br />';
+        // Display post
+        echo '<div class="blogpost">';
+        echo '<span class="blogpost_title"><a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '" title="' . get_lang('ReadPost') . '" >'.stripslashes($blog_post['title']) . '</a></span>';
+        echo '<span class="blogpost_date">' . $blog_post_date . '</span>';
+        echo '<span class="blogpost_text">' . $blog_post_text . '</span><br />';
 
-		$file_name_array = get_blog_attachment($blog_id, $post_id);
+        $file_name_array = get_blog_attachment($blog_id, $post_id);
 
         if (!empty($file_name_array)) {
-			echo ' <br />';
-			echo Display::return_icon('attachment.gif',get_lang('Attachment'));
-			echo '<a href="download.php?file=';
-			echo $file_name_array['path'];
-			echo ' "> '.$file_name_array['filename'].' </a>';
-			echo '</span>';
-			echo '<span class="attachment_comment">';
-			echo $file_name_array['comment'];
-			echo '</span>';
-			echo '<br />';
-		}
+            echo ' <br />';
+            echo Display::return_icon('attachment.gif',get_lang('Attachment'));
+            echo '<a href="download.php?file=';
+            echo $file_name_array['path'];
+            echo ' "> '.$file_name_array['filename'].' </a>';
+            echo '</span>';
+            echo '<span class="attachment_comment">';
+            echo $file_name_array['comment'];
+            echo '</span>';
+            echo '<br />';
+        }
         $username = api_htmlentities(sprintf(get_lang('LoginX'), $blog_post['username']), ENT_QUOTES);
-		echo '<span class="blogpost_info">'.get_lang('Author').': ' .Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username)).' - '.get_lang('Comments').': '.$blog_post_comments['number_of_comments'].' - '.get_lang('Rating').': '.Blog::display_rating('post',$blog_id,$post_id).$rating_select.'</span>';
-		echo '<span class="blogpost_actions">' . $blog_post_actions . '</span>';
-		echo '</div>';
-
-		// Display comments if there are any
-		if($blog_post_comments['number_of_comments'] > 0) {
-			echo '<div class="comments">';
-				echo '<span class="blogpost_title">' . get_lang('Comments') . '</span><br />';
-				Blog::get_threaded_comments(0, 0, $blog_id, $post_id, $task_id);
-			echo '</div>';
-		}
-
-		// Display comment form
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_comments_add')) {
-			Blog::display_new_comment_form($blog_id, $post_id, $blog_post['title']);
-		}
-	}
-
-	/**
-	 * Adds rating to a certain post or comment
-	 * @author Toon Keppens
-	 *
-	 * @param String $type
-	 * @param Integer $blog_id
-	 * @param Integer $item_id
-	 * @param Integer $rating
-	 *
-	 * @return Boolean success
-	 */
-	public static function add_rating($type, $blog_id, $item_id, $rating)
-	{
-		$_user = api_get_user_info();
-
-		// Init
-		$tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
-		$course_id = api_get_course_int_id();
-
-		// Check if the user has already rated this post/comment
-		$sql = "SELECT rating_id FROM $tbl_blogs_rating
+        echo '<span class="blogpost_info">'.get_lang('Author').': ' .Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username)).' - '.get_lang('Comments').': '.$blog_post_comments['number_of_comments'].' - '.get_lang('Rating').': '.Blog::display_rating('post',$blog_id,$post_id).$rating_select.'</span>';
+        echo '<span class="blogpost_actions">' . $blog_post_actions . '</span>';
+        echo '</div>';
+
+        // Display comments if there are any
+        if($blog_post_comments['number_of_comments'] > 0) {
+            echo '<div class="comments">';
+                echo '<span class="blogpost_title">' . get_lang('Comments') . '</span><br />';
+                Blog::get_threaded_comments(0, 0, $blog_id, $post_id, $task_id);
+            echo '</div>';
+        }
+
+        // Display comment form
+        if (api_is_allowed('BLOG_' . $blog_id, 'article_comments_add')) {
+            Blog::display_new_comment_form($blog_id, $post_id, $blog_post['title']);
+        }
+    }
+
+    /**
+     * Adds rating to a certain post or comment
+     * @author Toon Keppens
+     *
+     * @param String $type
+     * @param Integer $blog_id
+     * @param Integer $item_id
+     * @param Integer $rating
+     *
+     * @return Boolean success
+     */
+    public static function add_rating($type, $blog_id, $item_id, $rating)
+    {
+        $_user = api_get_user_info();
+
+        // Init
+        $tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
+        $course_id = api_get_course_int_id();
+
+        // Check if the user has already rated this post/comment
+        $sql = "SELECT rating_id FROM $tbl_blogs_rating
                 WHERE
                     c_id = $course_id AND
                     blog_id = '".(int)$blog_id."' AND
                     item_id = '".(int)$item_id."' AND
                     rating_type = '".Database::escape_string($type)."' AND
                     user_id = '".(int)$_user['user_id']."'";
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
         // Add rating
-		if (Database::num_rows($result) == 0) {
-			$sql = "INSERT INTO $tbl_blogs_rating (c_id, blog_id, rating_type, item_id, user_id, rating )
+        if (Database::num_rows($result) == 0) {
+            $sql = "INSERT INTO $tbl_blogs_rating (c_id, blog_id, rating_type, item_id, user_id, rating )
 					VALUES ($course_id, '".(int)$blog_id."', '".Database::escape_string($type)."', '".(int)$item_id."', '".(int)$_user['user_id']."', '".Database::escape_string($rating)."')";
-			Database::query($sql);
+            Database::query($sql);
 
             $id = Database::insert_id();
             if ($id) {
@@ -1094,107 +1093,107 @@ 
                 Database::query($sql);
             }
 
-			return true;
+            return true;
         } else {
-			return false;
-		}
-	}
-
-	/**
-	 * Shows the rating of user
-	 *
-	 * @param String $type
-	 * @param Integer $blog_id
-	 * @param Integer $item_id
-	 *
-	 * @return array()
-	 */
-	public static function display_rating($type, $blog_id, $item_id)
-	{
-		$tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
-		$course_id = api_get_course_int_id();
-
-		// Calculate rating
-		$sql = "SELECT AVG(rating) as rating FROM $tbl_blogs_rating
+            return false;
+        }
+    }
+
+    /**
+     * Shows the rating of user
+     *
+     * @param String $type
+     * @param Integer $blog_id
+     * @param Integer $item_id
+     *
+     * @return array()
+     */
+    public static function display_rating($type, $blog_id, $item_id)
+    {
+        $tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
+        $course_id = api_get_course_int_id();
+
+        // Calculate rating
+        $sql = "SELECT AVG(rating) as rating FROM $tbl_blogs_rating
 				WHERE
 				    c_id = $course_id AND
 				    blog_id = '".(int)$blog_id."' AND
 				    item_id = '".(int)$item_id."' AND
 				    rating_type = '".Database::escape_string($type)."' ";
-		$result = Database::query($sql);
-		$result = Database::fetch_array($result);
-		return round($result['rating'], 2);
-	}
-
-	/**
-	 * Shows the rating form if not already rated by that user
-	 * @author Toon Keppens
-	 *
-	 * @param String $type
-	 * @param Integer $blog_id
-	 * @param Integer $item_id
-	 *
-	 *@return String
-	 */
-	public static function display_rating_form ($type, $blog_id, $post_id, $comment_id = NULL)
-	{
-		$_user = api_get_user_info();
-		$tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
+        $result = Database::query($sql);
+        $result = Database::fetch_array($result);
+        return round($result['rating'], 2);
+    }
+
+    /**
+     * Shows the rating form if not already rated by that user
+     * @author Toon Keppens
+     *
+     * @param String $type
+     * @param Integer $blog_id
+     * @param Integer $item_id
+     *
+     *@return String
+     */
+    public static function display_rating_form ($type, $blog_id, $post_id, $comment_id = NULL)
+    {
+        $_user = api_get_user_info();
+        $tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
         $course_id = api_get_course_int_id();
 
         if ($type == 'post') {
-			// Check if the user has already rated this post
-			$sql = "SELECT rating_id FROM $tbl_blogs_rating
+            // Check if the user has already rated this post
+            $sql = "SELECT rating_id FROM $tbl_blogs_rating
 					WHERE c_id = $course_id AND
 					blog_id = '".(int)$blog_id."'
 					AND item_id = '".(int)$post_id."'
 					AND rating_type = '".Database::escape_string($type)."'
 					AND user_id = '".(int)$_user['user_id']."'";
-			$result = Database::query($sql);
+            $result = Database::query($sql);
             // Add rating
             if (Database::num_rows($result) == 0) {
-				return ' - ' . get_lang('RateThis') . ': <form method="get" action="blog.php" style="display: inline" id="frm_rating_' . $type . '_' . $post_id . '" name="frm_rating_' . $type . '_' . $post_id . '"><select name="rating" onchange="document.forms[\'frm_rating_' . $type . '_' . $post_id . '\'].submit()"><option value="">-</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select><input type="hidden" name="action" value="view_post" /><input type="hidden" name="type" value="' . $type . '" /><input type="hidden" name="do" value="rate" /><input type="hidden" name="blog_id" value="' . $blog_id . '" /><input type="hidden" name="post_id" value="' . $post_id . '" /></form>';
+                return ' - ' . get_lang('RateThis') . ': <form method="get" action="blog.php" style="display: inline" id="frm_rating_' . $type . '_' . $post_id . '" name="frm_rating_' . $type . '_' . $post_id . '"><select name="rating" onchange="document.forms[\'frm_rating_' . $type . '_' . $post_id . '\'].submit()"><option value="">-</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select><input type="hidden" name="action" value="view_post" /><input type="hidden" name="type" value="' . $type . '" /><input type="hidden" name="do" value="rate" /><input type="hidden" name="blog_id" value="' . $blog_id . '" /><input type="hidden" name="post_id" value="' . $post_id . '" /></form>';
             } else {
-				return '';
-			}
-		}
+                return '';
+            }
+        }
 
         if ($type = 'comment') {
-			// Check if the user has already rated this comment
-			$sql = "SELECT rating_id FROM $tbl_blogs_rating
+            // Check if the user has already rated this comment
+            $sql = "SELECT rating_id FROM $tbl_blogs_rating
 					WHERE c_id = $course_id AND blog_id = '".(int)$blog_id ."'
 					AND item_id = '".(int)$comment_id."'
 					AND rating_type = '".Database::escape_string($type)."'
 					AND user_id = '".(int)$_user['user_id']."'";
-			$result = Database::query($sql);
+            $result = Database::query($sql);
 
             if (Database::num_rows($result) == 0) {
-				return ' - ' . get_lang('RateThis') . ': <form method="get" action="blog.php" style="display: inline" id="frm_rating_' . $type . '_' . $comment_id . '" name="frm_rating_' . $type . '_' . $comment_id . '"><select name="rating" onchange="document.forms[\'frm_rating_' . $type . '_' . $comment_id . '\'].submit()"><option value="">-</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select><input type="hidden" name="action" value="view_post" /><input type="hidden" name="type" value="' . $type . '" /><input type="hidden" name="do" value="rate" /><input type="hidden" name="blog_id" value="' . $blog_id . '" /><input type="hidden" name="post_id" value="' . $post_id . '" /><input type="hidden" name="comment_id" value="' . $comment_id . '" /></form>';
+                return ' - ' . get_lang('RateThis') . ': <form method="get" action="blog.php" style="display: inline" id="frm_rating_' . $type . '_' . $comment_id . '" name="frm_rating_' . $type . '_' . $comment_id . '"><select name="rating" onchange="document.forms[\'frm_rating_' . $type . '_' . $comment_id . '\'].submit()"><option value="">-</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select><input type="hidden" name="action" value="view_post" /><input type="hidden" name="type" value="' . $type . '" /><input type="hidden" name="do" value="rate" /><input type="hidden" name="blog_id" value="' . $blog_id . '" /><input type="hidden" name="post_id" value="' . $post_id . '" /><input type="hidden" name="comment_id" value="' . $comment_id . '" /></form>';
             } else {
-				return '';
-			}
-		}
-	}
-
-	/**
-	 * This functions gets all replys to a post, threaded.
-	 *
-	 * @param Integer $current
-	 * @param Integer $current_level
-	 * @param Integer $blog_id
-	 * @param Integer $post_id
-	 */
-	public static function get_threaded_comments($current = 0, $current_level = 0, $blog_id, $post_id, $task_id = 0)
-	{
-		$tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
-		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
-		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
-		global $charset;
-
-		$course_id = api_get_course_int_id();
-
-		// Select top level comments
-		$next_level = $current_level + 1;
+                return '';
+            }
+        }
+    }
+
+    /**
+     * This functions gets all replys to a post, threaded.
+     *
+     * @param Integer $current
+     * @param Integer $current_level
+     * @param Integer $blog_id
+     * @param Integer $post_id
+     */
+    public static function get_threaded_comments($current = 0, $current_level = 0, $blog_id, $post_id, $task_id = 0)
+    {
+        $tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
+        $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+        global $charset;
+
+        $course_id = api_get_course_int_id();
+
+        // Select top level comments
+        $next_level = $current_level + 1;
         $sql = "SELECT comments.*, user.lastname, user.firstname, user.username, task.color
                 FROM $tbl_blogs_comments comments
                 INNER JOIN $tbl_users user
@@ -1206,11 +1205,11 @@ 
                     parent_comment_id = $current AND
                     comments.blog_id = '".(int)$blog_id."' AND
                     comments.post_id = '".(int)$post_id."'";
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
-		while($comment = Database::fetch_array($result)) {
-			// Select the children recursivly
-			$tmp = "SELECT comments.*, user.lastname, user.firstname, user.username
+        while($comment = Database::fetch_array($result)) {
+            // Select the children recursivly
+            $tmp = "SELECT comments.*, user.lastname, user.firstname, user.username
 			        FROM $tbl_blogs_comments comments
 					INNER JOIN $tbl_users user
 					ON comments.author_id = user.user_id
@@ -1219,15 +1218,15 @@ 
 						comment_id = $current
 						AND blog_id = '".(int)$blog_id."'
 						AND post_id = '".(int)$post_id."'";
-			$tmp = Database::query($tmp);
-			$tmp = Database::fetch_array($tmp);
-			$parent_cat = $tmp['parent_comment_id'];
-			$border_color = '';
-
-			// Prepare data
-			$comment_text = make_clickable(stripslashes($comment['comment']));
-			$blog_comment_date = api_convert_and_format_date($comment['date_creation'], null, date_default_timezone_get());
-			$blog_comment_actions = "";
+            $tmp = Database::query($tmp);
+            $tmp = Database::fetch_array($tmp);
+            $parent_cat = $tmp['parent_comment_id'];
+            $border_color = '';
+
+            // Prepare data
+            $comment_text = make_clickable(stripslashes($comment['comment']));
+            $blog_comment_date = api_convert_and_format_date($comment['date_creation'], null, date_default_timezone_get());
+            $blog_comment_actions = "";
             if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) {
                 $blog_comment_actions .= '<a href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$post_id.'&do=delete_comment&comment_id='.$comment['comment_id'].'&task_id='.$task_id.'" title="'.get_lang(
                         'DeleteThisComment'
@@ -1242,92 +1241,92 @@ 
                 $rating_select = Blog::display_rating_form('comment', $blog_id, $post_id, $comment['comment_id']);
             }
 
-			if (!is_null($comment['task_id'])) {
-				$border_color = ' border-left: 3px solid #' . $comment['color'];
-			}
-
-			$comment_text = stripslashes($comment_text);
-
-			// Output...
-			$margin = $current_level * 30;
-			echo '<div class="blogpost_comment" style="margin-left: ' . $margin . 'px;' . $border_color . '">';
-				echo '<span class="blogpost_comment_title"><a href="#add_comment" onclick="document.getElementById(\'comment_parent_id\').value=\'' . $comment['comment_id'] . '\'; document.getElementById(\'comment_title\').value=\'Re: '.addslashes($comment['title']) . '\'" title="' . get_lang('ReplyToThisComment') . '" >'.stripslashes($comment['title']) . '</a></span>';
-				echo '<span class="blogpost_comment_date">' . $blog_comment_date . '</span>';
-				echo '<span class="blogpost_text">' . $comment_text . '</span>';
-
-				$file_name_array = get_blog_attachment($blog_id,$post_id, $comment['comment_id']);
-				if (!empty($file_name_array)) {
-					echo '<br /><br />';
-					echo Display::return_icon('attachment.gif',get_lang('Attachment'));
-					echo '<a href="download.php?file=';
-					echo $file_name_array['path'];
-					echo ' "> '.$file_name_array['filename'].' </a>';
-					echo '<span class="attachment_comment">';
-					echo $file_name_array['comment'];
-					echo '</span><br />';
-				}
+            if (!is_null($comment['task_id'])) {
+                $border_color = ' border-left: 3px solid #' . $comment['color'];
+            }
+
+            $comment_text = stripslashes($comment_text);
+
+            // Output...
+            $margin = $current_level * 30;
+            echo '<div class="blogpost_comment" style="margin-left: ' . $margin . 'px;' . $border_color . '">';
+                echo '<span class="blogpost_comment_title"><a href="#add_comment" onclick="document.getElementById(\'comment_parent_id\').value=\'' . $comment['comment_id'] . '\'; document.getElementById(\'comment_title\').value=\'Re: '.addslashes($comment['title']) . '\'" title="' . get_lang('ReplyToThisComment') . '" >'.stripslashes($comment['title']) . '</a></span>';
+                echo '<span class="blogpost_comment_date">' . $blog_comment_date . '</span>';
+                echo '<span class="blogpost_text">' . $comment_text . '</span>';
+
+                $file_name_array = get_blog_attachment($blog_id,$post_id, $comment['comment_id']);
+                if (!empty($file_name_array)) {
+                    echo '<br /><br />';
+                    echo Display::return_icon('attachment.gif',get_lang('Attachment'));
+                    echo '<a href="download.php?file=';
+                    echo $file_name_array['path'];
+                    echo ' "> '.$file_name_array['filename'].' </a>';
+                    echo '<span class="attachment_comment">';
+                    echo $file_name_array['comment'];
+                    echo '</span><br />';
+                }
                 $username = api_htmlentities(sprintf(get_lang('LoginX'), $comment['username']), ENT_QUOTES);
-				echo '<span class="blogpost_comment_info">'.get_lang('Author').': '.Display::tag('span', api_get_person_name($comment['firstname'], $comment['lastname']), array('title'=>$username)).' - '.get_lang('Rating').': '.Blog::display_rating('comment', $blog_id, $comment['comment_id']).$rating_select.'</span>';
-				echo '<span class="blogpost_actions">' . $blog_comment_actions . '</span>';
-			echo '</div>';
-
-			// Go further down the tree.
-			Blog::get_threaded_comments($comment['comment_id'], $next_level, $blog_id, $post_id);
-		}
-	}
-
-	/**
-	 * Displays the form to create a new post
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 */
-	public static function display_form_new_post($blog_id)
-	{
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_add')) {
-			$form = new FormValidator(
-				'add_post',
-				'post',
-				api_get_path(WEB_CODE_PATH)."blog/blog.php?action=new_post&blog_id=" . $blog_id . "&" . api_get_cidreq(),
-				null,
-				array('enctype' => 'multipart/form-data')
-			);
-			$form->addHidden('post_title_edited', 'false');
-			$form->addHeader(get_lang('NewPost'));
-			$form->addText('title', get_lang('Title'));
-			$config = array();
-			if (!api_is_allowed_to_edit()) {
-				$config['ToolbarSet'] = 'ProjectStudent';
-			} else {
-				$config['ToolbarSet'] = 'Project';
-			}
-			$form->addHtmlEditor('full_text', get_lang('Content'), false, false, $config);
-			$form->addFile('user_upload', get_lang('AddAnAttachment'));
-			$form->addTextarea('post_file_comment', get_lang('FileComment'));
-			$form->addHidden('new_post_submit', 'true');
-			$form->addButton('save', get_lang('Save'));
-
-			$form->display();
-		} else {
-			api_not_allowed();
-		}
-	}
-
-	/**
-	 * Displays the form to edit a post
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 */
-	public static function display_form_edit_post($blog_id, $post_id)
-	{
-		$tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
-		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
-
-		$course_id = api_get_course_int_id();
-
-		// Get posts and author
-		$sql = "SELECT post.*, user.lastname, user.firstname
+                echo '<span class="blogpost_comment_info">'.get_lang('Author').': '.Display::tag('span', api_get_person_name($comment['firstname'], $comment['lastname']), array('title'=>$username)).' - '.get_lang('Rating').': '.Blog::display_rating('comment', $blog_id, $comment['comment_id']).$rating_select.'</span>';
+                echo '<span class="blogpost_actions">' . $blog_comment_actions . '</span>';
+            echo '</div>';
+
+            // Go further down the tree.
+            Blog::get_threaded_comments($comment['comment_id'], $next_level, $blog_id, $post_id);
+        }
+    }
+
+    /**
+     * Displays the form to create a new post
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     */
+    public static function display_form_new_post($blog_id)
+    {
+        if (api_is_allowed('BLOG_' . $blog_id, 'article_add')) {
+            $form = new FormValidator(
+                'add_post',
+                'post',
+                api_get_path(WEB_CODE_PATH)."blog/blog.php?action=new_post&blog_id=" . $blog_id . "&" . api_get_cidreq(),
+                null,
+                array('enctype' => 'multipart/form-data')
+            );
+            $form->addHidden('post_title_edited', 'false');
+            $form->addHeader(get_lang('NewPost'));
+            $form->addText('title', get_lang('Title'));
+            $config = array();
+            if (!api_is_allowed_to_edit()) {
+                $config['ToolbarSet'] = 'ProjectStudent';
+            } else {
+                $config['ToolbarSet'] = 'Project';
+            }
+            $form->addHtmlEditor('full_text', get_lang('Content'), false, false, $config);
+            $form->addFile('user_upload', get_lang('AddAnAttachment'));
+            $form->addTextarea('post_file_comment', get_lang('FileComment'));
+            $form->addHidden('new_post_submit', 'true');
+            $form->addButton('save', get_lang('Save'));
+
+            $form->display();
+        } else {
+            api_not_allowed();
+        }
+    }
+
+    /**
+     * Displays the form to edit a post
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     */
+    public static function display_form_edit_post($blog_id, $post_id)
+    {
+        $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
+        $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+
+        $course_id = api_get_course_int_id();
+
+        // Get posts and author
+        $sql = "SELECT post.*, user.lastname, user.firstname
 				FROM $tbl_blogs_posts post
 				INNER JOIN $tbl_users user ON post.author_id = user.user_id
 				WHERE
@@ -1335,74 +1334,74 @@ 
 				post.blog_id 		= '".(int)$blog_id ."'
 				AND post.post_id	= '".(int)$post_id."'
 				ORDER BY post_id DESC";
-		$result = Database::query($sql);
-		$blog_post = Database::fetch_array($result);
-
-		// Form
-		$form = new FormValidator(
-			'edit_post',
-			'post',
-			api_get_path(WEB_CODE_PATH).'blog/blog.php?action=edit_post&post_id=' . intval($_GET['post_id']) . '&blog_id=' . intval($blog_id) . '&article_id='.intval($_GET['article_id']).'&task_id='.intval($_GET['task_id'])
-		);
-
-		$form->addHeader(get_lang('EditPost'));
-		$form->addText('title', get_lang('Title'));
-
-		if (!api_is_allowed_to_edit()) {
-			$config['ToolbarSet'] = 'ProjectStudent';
-		} else {
-			$config['ToolbarSet'] = 'Project';
-		}
-		$form->addHtmlEditor('full_text', get_lang('Content'), false, false, $config);
-
-		$form->addHidden('action', '');
-		$form->addHidden('edit_post_submit', 'true');
-		$form->addHidden('post_id', intval($_GET['post_id']));
-		$form->addButton('save', get_lang('Save'));
-		$form->setDefaults($blog_post);
-		$form->display();
-	}
-
-	/**
-	 * Displays a list of tasks in this blog
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 */
-	public static function display_task_list($blog_id)
+        $result = Database::query($sql);
+        $blog_post = Database::fetch_array($result);
+
+        // Form
+        $form = new FormValidator(
+            'edit_post',
+            'post',
+            api_get_path(WEB_CODE_PATH).'blog/blog.php?action=edit_post&post_id=' . intval($_GET['post_id']) . '&blog_id=' . intval($blog_id) . '&article_id='.intval($_GET['article_id']).'&task_id='.intval($_GET['task_id'])
+        );
+
+        $form->addHeader(get_lang('EditPost'));
+        $form->addText('title', get_lang('Title'));
+
+        if (!api_is_allowed_to_edit()) {
+            $config['ToolbarSet'] = 'ProjectStudent';
+        } else {
+            $config['ToolbarSet'] = 'Project';
+        }
+        $form->addHtmlEditor('full_text', get_lang('Content'), false, false, $config);
+
+        $form->addHidden('action', '');
+        $form->addHidden('edit_post_submit', 'true');
+        $form->addHidden('post_id', intval($_GET['post_id']));
+        $form->addButton('save', get_lang('Save'));
+        $form->setDefaults($blog_post);
+        $form->display();
+    }
+
+    /**
+     * Displays a list of tasks in this blog
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     */
+    public static function display_task_list($blog_id)
     {
-		global $charset;
+        global $charset;
         $course_id = api_get_course_int_id();
 
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_add')) {
-			$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
-			$counter = 0;
-			global $color2;
+        if (api_is_allowed('BLOG_' . $blog_id, 'article_add')) {
+            $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+            $counter = 0;
+            global $color2;
 
-			echo '<div class="actions">';
-			echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=add">';
+            echo '<div class="actions">';
+            echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=add">';
             echo Display::return_icon('blog_newtasks.gif', get_lang('AddTasks'));
             echo get_lang('AddTasks') . '</a> ';
-			echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=assign">';
+            echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=assign">';
             echo Display::return_icon('blog_task.gif', get_lang('AssignTasks'));
             echo get_lang('AssignTasks') . '</a>';
-			?>
+            ?>
 				<a href="<?php echo api_get_self(); ?>?action=manage_rights&blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('ManageRights') ?>">
                     <?php echo Display::return_icon('blog_admin_users.png', get_lang('RightsManager'),'',ICON_SIZE_SMALL). get_lang('RightsManager') ?></a>
 			<?php
-			echo '</div>';
+            echo '</div>';
 
-			echo '<span class="blogpost_title">' . get_lang('TaskList') . '</span><br />';
-			echo "<table class=\"data_table\">";
-			echo	"<tr bgcolor=\"$color2\" align=\"center\" valign=\"top\">",
-					 "<th width='240'><b>",get_lang('Title'),"</b></th>\n",
-					 "<th><b>",get_lang('Description'),"</b></th>\n",
-					 "<th><b>",get_lang('Color'),"</b></th>\n",
-					 "<th width='50'><b>",get_lang('Modify'),"</b></th>\n",
-				"</tr>\n";
+            echo '<span class="blogpost_title">' . get_lang('TaskList') . '</span><br />';
+            echo "<table class=\"data_table\">";
+            echo	"<tr bgcolor=\"$color2\" align=\"center\" valign=\"top\">",
+                        "<th width='240'><b>",get_lang('Title'),"</b></th>\n",
+                        "<th><b>",get_lang('Description'),"</b></th>\n",
+                        "<th><b>",get_lang('Color'),"</b></th>\n",
+                        "<th width='50'><b>",get_lang('Modify'),"</b></th>\n",
+                "</tr>\n";
 
 
-			$sql = " SELECT
+            $sql = " SELECT
                         blog_id,
                         task_id,
                         blog_id,
@@ -1413,22 +1412,22 @@ 
                     FROM " . $tbl_blogs_tasks . "
                     WHERE c_id = $course_id AND blog_id = " . (int)$blog_id . "
                     ORDER BY system_task, title";
-			$result = Database::query($sql);
-
-
-			while($task = Database::fetch_array($result)) {
-				$counter++;
-				$css_class = (($counter % 2) == 0) ? "row_odd" : "row_even";
-				$delete_icon = ($task['system_task'] == '1') ? "delete_na.gif" : "delete.gif";
-				$delete_title = ($task['system_task'] == '1') ? get_lang('DeleteSystemTask') : get_lang('DeleteTask');
-				$delete_link = ($task['system_task'] == '1') ? '#' : api_get_self() . '?action=manage_tasks&blog_id=' . $task['blog_id'] . '&do=delete&task_id=' . $task['task_id'];
-				$delete_confirm = ($task['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"';
-
-				echo	'<tr class="' . $css_class . '" valign="top">',
-                         '<td width="240">' . Security::remove_XSS($task['title']) . '</td>',
-                         '<td>' . Security::remove_XSS($task['description']) . '</td>',
-                         '<td><span style="background-color: #' . $task['color'] . '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></td>',
-                         '<td width="50">',
+            $result = Database::query($sql);
+
+
+            while($task = Database::fetch_array($result)) {
+                $counter++;
+                $css_class = (($counter % 2) == 0) ? "row_odd" : "row_even";
+                $delete_icon = ($task['system_task'] == '1') ? "delete_na.gif" : "delete.gif";
+                $delete_title = ($task['system_task'] == '1') ? get_lang('DeleteSystemTask') : get_lang('DeleteTask');
+                $delete_link = ($task['system_task'] == '1') ? '#' : api_get_self() . '?action=manage_tasks&blog_id=' . $task['blog_id'] . '&do=delete&task_id=' . $task['task_id'];
+                $delete_confirm = ($task['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"';
+
+                echo	'<tr class="' . $css_class . '" valign="top">',
+                            '<td width="240">' . Security::remove_XSS($task['title']) . '</td>',
+                            '<td>' . Security::remove_XSS($task['description']) . '</td>',
+                            '<td><span style="background-color: #' . $task['color'] . '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></td>',
+                            '<td width="50">',
                             '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $task['blog_id'] . '&do=edit&task_id=' . $task['task_id'] . '">',
                             '<img src="../img/edit.gif" border="0" title="' . get_lang('EditTask') . '" />',
                             "</a>\n",
@@ -1436,41 +1435,41 @@ 
                             $delete_confirm,
                             '><img src="../img/' . $delete_icon . '" border="0" title="' . $delete_title . '" />',
                             "</a>\n",
-                         '</td>',
+                            '</td>',
                     '</tr>';
-			}
-			echo "</table>";
-		}
-	}
-
-	/**
-	 * Displays a list of tasks assigned to a user in this blog
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 */
-	public static function display_assigned_task_list ($blog_id)
+            }
+            echo "</table>";
+        }
+    }
+
+    /**
+     * Displays a list of tasks assigned to a user in this blog
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     */
+    public static function display_assigned_task_list ($blog_id)
     {
-		// Init
-		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
-		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
-		$tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
-		$counter = 0;
-		global $charset,$color2;
-
-		echo '<span class="blogpost_title">' . get_lang('AssignedTasks') . '</span><br />';
-		echo "<table class=\"data_table\">";
-		echo	"<tr bgcolor=\"$color2\" align=\"center\" valign=\"top\">",
-				 "<th width='240'><b>",get_lang('Member'),"</b></th>\n",
-				 "<th><b>",get_lang('Task'),"</b></th>\n",
-				 "<th><b>",get_lang('Description'),"</b></th>\n",
-				 "<th><b>",get_lang('TargetDate'),"</b></th>\n",
-				 "<th width='50'><b>",get_lang('Modify'),"</b></th>\n",
-			"</tr>";
-
-		$course_id = api_get_course_int_id();
-
-		$sql = "SELECT task_rel_user.*, task.title, user.firstname, user.lastname, user.username, task.description, task.system_task, task.blog_id, task.task_id
+        // Init
+        $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+        $tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+        $counter = 0;
+        global $charset,$color2;
+
+        echo '<span class="blogpost_title">' . get_lang('AssignedTasks') . '</span><br />';
+        echo "<table class=\"data_table\">";
+        echo	"<tr bgcolor=\"$color2\" align=\"center\" valign=\"top\">",
+                    "<th width='240'><b>",get_lang('Member'),"</b></th>\n",
+                    "<th><b>",get_lang('Task'),"</b></th>\n",
+                    "<th><b>",get_lang('Description'),"</b></th>\n",
+                    "<th><b>",get_lang('TargetDate'),"</b></th>\n",
+                    "<th width='50'><b>",get_lang('Modify'),"</b></th>\n",
+            "</tr>";
+
+        $course_id = api_get_course_int_id();
+
+        $sql = "SELECT task_rel_user.*, task.title, user.firstname, user.lastname, user.username, task.description, task.system_task, task.blog_id, task.task_id
 				FROM $tbl_blogs_tasks_rel_user task_rel_user
 				INNER JOIN $tbl_blogs_tasks task ON task_rel_user.task_id = task.task_id
 				INNER JOIN $tbl_users user ON task_rel_user.user_id = user.user_id
@@ -1479,45 +1478,45 @@ 
 					task.c_id = $course_id AND
 					task_rel_user.blog_id = '".(int)$blog_id."'
 				ORDER BY target_date ASC";
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
-		while ($assignment = Database::fetch_array($result)) {
-			$counter++;
-			$css_class = (($counter % 2)==0) ? "row_odd" : "row_even";
-			$delete_icon = ($assignment['system_task'] == '1') ? "delete_na.gif" : "delete.gif";
-			$delete_title = ($assignment['system_task'] == '1') ? get_lang('DeleteSystemTask') : get_lang('DeleteTask');
-			$delete_link = ($assignment['system_task'] == '1') ? '#' : api_get_self() . '?action=manage_tasks&blog_id=' . $assignment['blog_id'] . '&do=delete&task_id=' . $assignment['task_id'];
-			$delete_confirm = ($assignment['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"';
+        while ($assignment = Database::fetch_array($result)) {
+            $counter++;
+            $css_class = (($counter % 2)==0) ? "row_odd" : "row_even";
+            $delete_icon = ($assignment['system_task'] == '1') ? "delete_na.gif" : "delete.gif";
+            $delete_title = ($assignment['system_task'] == '1') ? get_lang('DeleteSystemTask') : get_lang('DeleteTask');
+            $delete_link = ($assignment['system_task'] == '1') ? '#' : api_get_self() . '?action=manage_tasks&blog_id=' . $assignment['blog_id'] . '&do=delete&task_id=' . $assignment['task_id'];
+            $delete_confirm = ($assignment['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"';
 
             $username = api_htmlentities(sprintf(get_lang('LoginX'), $assignment['username']), ENT_QUOTES);
 
-			echo	'<tr class="' . $css_class . '" valign="top">',
-						 '<td width="240">' . Display::tag('span', api_get_person_name($assignment['firstname'], $assignment['lastname']), array('title'=>$username)) . '</td>',
-						 '<td>'.stripslashes($assignment['title']) . '</td>',
-						 '<td>'.stripslashes($assignment['description']) . '</td>',
-						 '<td>' . $assignment['target_date'] . '</td>',
-						 '<td width="50">',
-						 	'<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $assignment['blog_id'] . '&do=edit_assignment&task_id=' . $assignment['task_id'] . '&user_id=' . $assignment['user_id'] . '">',
-							'<img src="../img/edit.gif" border="0" title="' . get_lang('EditTask') . '" />',
-							"</a>\n",
-							'<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $assignment['blog_id'] . '&do=delete_assignment&task_id=' . $assignment['task_id'] . '&user_id=' . $assignment['user_id'] . '" ',
-							'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"',
-							'<img src="../img/' . $delete_icon . '" border="0" title="' . $delete_title . '" />',
-							"</a>\n",
-						 '</td>',
-					'</tr>';
-		}
-		echo "</table>";
-	}
-
-	/**
-	 * Displays new task form
-	 * @author Toon Keppens
-	 *
-	 */
-	public static function display_new_task_form ($blog_id)
-	{
-		// Init
+            echo	'<tr class="' . $css_class . '" valign="top">',
+                            '<td width="240">' . Display::tag('span', api_get_person_name($assignment['firstname'], $assignment['lastname']), array('title'=>$username)) . '</td>',
+                            '<td>'.stripslashes($assignment['title']) . '</td>',
+                            '<td>'.stripslashes($assignment['description']) . '</td>',
+                            '<td>' . $assignment['target_date'] . '</td>',
+                            '<td width="50">',
+                                '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $assignment['blog_id'] . '&do=edit_assignment&task_id=' . $assignment['task_id'] . '&user_id=' . $assignment['user_id'] . '">',
+                            '<img src="../img/edit.gif" border="0" title="' . get_lang('EditTask') . '" />',
+                            "</a>\n",
+                            '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $assignment['blog_id'] . '&do=delete_assignment&task_id=' . $assignment['task_id'] . '&user_id=' . $assignment['user_id'] . '" ',
+                            'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"',
+                            '<img src="../img/' . $delete_icon . '" border="0" title="' . $delete_title . '" />',
+                            "</a>\n",
+                            '</td>',
+                    '</tr>';
+        }
+        echo "</table>";
+    }
+
+    /**
+     * Displays new task form
+     * @author Toon Keppens
+     *
+     */
+    public static function display_new_task_form ($blog_id)
+    {
+        // Init
         $colors = array(
             'FFFFFF',
             'FFFF99',
@@ -1536,14 +1535,14 @@ 
             '000000'
         );
 
-		// form
-		echo '<form name="add_task" method="post" action="blog.php?action=manage_tasks&blog_id=' . $blog_id . '">';
+        // form
+        echo '<form name="add_task" method="post" action="blog.php?action=manage_tasks&blog_id=' . $blog_id . '">';
 
-		// form title
-		echo '<legend>'.get_lang('AddTask').'</legend>';
+        // form title
+        echo '<legend>'.get_lang('AddTask').'</legend>';
 
-		// task title
-		echo '	<div class="control-group">
+        // task title
+        echo '	<div class="control-group">
 					<label class="control-label">
 						<span class="form_required">*</span>' . get_lang('Title') . '
 					</label>
@@ -1552,8 +1551,8 @@ 
 					</div>
 				</div>';
 
-		// task comment
-		echo '	<div class="control-group">
+        // task comment
+        echo '	<div class="control-group">
 					<label class="control-label">
 						' . get_lang('Description') . '
 					</label>
@@ -1562,8 +1561,8 @@ 
 					</div>
 				</div>';
 
-		// task management
-		echo '	<div class="control-group">
+        // task management
+        echo '	<div class="control-group">
 					<label class="control-label">
 						' . get_lang('TaskManager') . '
 					</label>
@@ -1584,12 +1583,12 @@ 
                         echo '<td style="border:1px dotted #808080; text-align:center;"><input id="commentsDelete" name="chkCommentsDelete" type="checkbox" /></td>';
                     echo '</tr>';
                 echo '</table>';
-		echo '		</div>
+        echo '		</div>
 				</div>';
 
 
-		// task color
-		echo '	<div class="control-group">
+        // task color
+        echo '	<div class="control-group">
 					<label class="control-label">
 						' . get_lang('Color') . '
 					</label>
@@ -1600,40 +1599,40 @@ 
                     echo '<option value="' . $color . '" ' . $style . '>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
                 }
         echo '</select>';
-		echo '		</div>
+        echo '		</div>
 				</div>';
 
-		// submit
-		echo '	<div class="control-group">
+        // submit
+        echo '	<div class="control-group">
 					<div class="controls">
 							<input type="hidden" name="action" value="" />
 							<input type="hidden" name="new_task_submit" value="true" />
 						<button class="save" type="submit" name="Submit">' . get_lang('Save') . '</button>
 					</div>
 				</div>';
-		echo '</form>';
+        echo '</form>';
 
-		echo '<div style="clear:both; margin-bottom: 10px;"></div>';
-	}
+        echo '<div style="clear:both; margin-bottom: 10px;"></div>';
+    }
 
 
-	/**
-	 * Displays edit task form
-	 * @author Toon Keppens
-	 *
-	 */
-	public static function display_edit_task_form ($blog_id, $task_id) {
-		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+    /**
+     * Displays edit task form
+     * @author Toon Keppens
+     *
+     */
+    public static function display_edit_task_form ($blog_id, $task_id) {
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
         $course_id = api_get_course_int_id();
 
-		$colors = array('FFFFFF','FFFF99','FFCC99','FF9933','FF6699','CCFF99','CC9966','66FF00', '9966FF', 'CF3F3F', '990033','669933','0033FF','003366','000000');
+        $colors = array('FFFFFF','FFFF99','FFCC99','FF9933','FF6699','CCFF99','CC9966','66FF00', '9966FF', 'CF3F3F', '990033','669933','0033FF','003366','000000');
 
-		$sql = "SELECT blog_id, task_id, title, description, color FROM $tbl_blogs_tasks WHERE c_id = $course_id AND task_id = '".(int)$task_id."'";
-		$result = Database::query($sql);
-		$task = Database::fetch_array($result);
+        $sql = "SELECT blog_id, task_id, title, description, color FROM $tbl_blogs_tasks WHERE c_id = $course_id AND task_id = '".(int)$task_id."'";
+        $result = Database::query($sql);
+        $task = Database::fetch_array($result);
 
-		// Display
-		echo '<form name="edit_task" method="post" action="blog.php?action=manage_tasks&blog_id=' . $blog_id . '">
+        // Display
+        echo '<form name="edit_task" method="post" action="blog.php?action=manage_tasks&blog_id=' . $blog_id . '">
 					<legend>' . get_lang('EditTask') . '</legend>
 					<table width="100%" border="0" cellspacing="2">
 						<tr>
@@ -1645,42 +1644,42 @@ 
 					   <td><textarea name="task_description" cols="45">'.Security::remove_XSS($task['description']).'</textarea></td>
 						</tr>';
 
-						/* edit by Kevin Van Den Haute (kevin@develop-it.be) */
-						$tbl_tasks_permissions = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
+                        /* edit by Kevin Van Den Haute (kevin@develop-it.be) */
+                        $tbl_tasks_permissions = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
 
-						$sql = " SELECT id, action FROM " . $tbl_tasks_permissions . "
+                        $sql = " SELECT id, action FROM " . $tbl_tasks_permissions . "
 							     WHERE c_id = $course_id AND task_id = '" . (int)$task_id."'";
-						$result = Database::query($sql);
-
-						$arrPermissions = array();
-
-						while ($row = Database::fetch_array($result))
-							$arrPermissions[] = $row['action'];
-
-						    echo '<tr>';
-							echo '<td style="text-align:right; vertical-align:top;">' . get_lang('TaskManager') . ':&nbsp;&nbsp;</td>';
-							echo '<td>';
-								echo '<table  class="data_table" cellspacing="0" style="border-collapse:collapse; width:446px;">';
-									echo '<tr>';
-										echo '<th colspan="2" style="width:223px;">' . get_lang('ArticleManager') . '</th>';
-										echo '<th width:223px;>' . get_lang('CommentManager') . '</th>';
-									echo '</tr>';
-									echo '<tr>';
-										echo '<th style="width:111px;"><label for="articleDelete">' . get_lang('Delete') . '</label></th>';
-										echo '<th style="width:112px;"><label for="articleEdit">' . get_lang('Edit') . '</label></th>';
-										echo '<th style="width:223px;"><label for="commentsDelete">' . get_lang('Delete') . '</label></th>';
-									echo '</tr>';
-									echo '<tr>';
-										echo '<td style="text-align:center;"><input ' . ((in_array('article_delete', $arrPermissions)) ? 'checked ' : '') . 'id="articleDelete" name="chkArticleDelete" type="checkbox" /></td>';
-										echo '<td style="text-align:center;"><input ' . ((in_array('article_edit', $arrPermissions)) ? 'checked ' : '') . 'id="articleEdit" name="chkArticleEdit" type="checkbox" /></td>';
-										echo '<td style="text-align:center;"><input ' . ((in_array('article_comments_delete', $arrPermissions)) ? 'checked ' : '') . 'id="commentsDelete" name="chkCommentsDelete" type="checkbox" /></td>';
-									echo '</tr>';
-								echo '</table>';
-							echo '</td>';
-						echo '</tr>';
-						/* end of edit */
-
-						echo '<tr>
+                        $result = Database::query($sql);
+
+                        $arrPermissions = array();
+
+                        while ($row = Database::fetch_array($result))
+                            $arrPermissions[] = $row['action'];
+
+                            echo '<tr>';
+                            echo '<td style="text-align:right; vertical-align:top;">' . get_lang('TaskManager') . ':&nbsp;&nbsp;</td>';
+                            echo '<td>';
+                                echo '<table  class="data_table" cellspacing="0" style="border-collapse:collapse; width:446px;">';
+                                    echo '<tr>';
+                                        echo '<th colspan="2" style="width:223px;">' . get_lang('ArticleManager') . '</th>';
+                                        echo '<th width:223px;>' . get_lang('CommentManager') . '</th>';
+                                    echo '</tr>';
+                                    echo '<tr>';
+                                        echo '<th style="width:111px;"><label for="articleDelete">' . get_lang('Delete') . '</label></th>';
+                                        echo '<th style="width:112px;"><label for="articleEdit">' . get_lang('Edit') . '</label></th>';
+                                        echo '<th style="width:223px;"><label for="commentsDelete">' . get_lang('Delete') . '</label></th>';
+                                    echo '</tr>';
+                                    echo '<tr>';
+                                        echo '<td style="text-align:center;"><input ' . ((in_array('article_delete', $arrPermissions)) ? 'checked ' : '') . 'id="articleDelete" name="chkArticleDelete" type="checkbox" /></td>';
+                                        echo '<td style="text-align:center;"><input ' . ((in_array('article_edit', $arrPermissions)) ? 'checked ' : '') . 'id="articleEdit" name="chkArticleEdit" type="checkbox" /></td>';
+                                        echo '<td style="text-align:center;"><input ' . ((in_array('article_comments_delete', $arrPermissions)) ? 'checked ' : '') . 'id="commentsDelete" name="chkCommentsDelete" type="checkbox" /></td>';
+                                    echo '</tr>';
+                                echo '</table>';
+                            echo '</td>';
+                        echo '</tr>';
+                        /* end of edit */
+
+                        echo '<tr>
 					   <td align="right">' . get_lang('Color') . ':&nbsp;&nbsp;</td>
 					   <td>
 					   	<select name="task_color" id="color" style="width: 150px; background-color: #' . $task['color'] . '" onchange="document.getElementById(\'color\').style.backgroundColor=\'#\'+document.getElementById(\'color\').value" onkeypress="document.getElementById(\'color\').style.backgroundColor=\'#\'+document.getElementById(\'color\').value">';
@@ -1689,7 +1688,7 @@ 
                                 $style = 'style="background-color: #' . $color . '"';
                                 echo '<option value="' . $color . '" ' . $style . ' ' . $selected . ' >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
                             }
-		echo '			   </select>
+        echo '			   </select>
 						  </td>
 						</tr>
 						<tr>
@@ -1702,34 +1701,34 @@ 
 						</tr>
 					</table>
 				</form>';
-	}
-
-	/**
-	 * @param $blog_id
-	 * @return FormValidator
-	 */
-	public static function getTaskForm($blog_id)
-	{
-		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
-		$tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
-		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
-		$course_id = api_get_course_int_id();
-
-		// Get users in this blog / make select list of it
-		$sql = "SELECT user.user_id, user.firstname, user.lastname, user.username
+    }
+
+    /**
+     * @param $blog_id
+     * @return FormValidator
+     */
+    public static function getTaskForm($blog_id)
+    {
+        $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+        $tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+        $course_id = api_get_course_int_id();
+
+        // Get users in this blog / make select list of it
+        $sql = "SELECT user.user_id, user.firstname, user.lastname, user.username
 				FROM $tbl_users user
 				INNER JOIN $tbl_blogs_rel_user blogs_rel_user
 				ON user.user_id = blogs_rel_user.user_id
 				WHERE blogs_rel_user.c_id = $course_id AND blogs_rel_user.blog_id = '".(int)$blog_id."'";
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
-		$options = array();
-		while ($user = Database::fetch_array($result)) {
-			$options[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
-		}
+        $options = array();
+        while ($user = Database::fetch_array($result)) {
+            $options[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
+        }
 
-		// Get tasks in this blog / make select list of it
-		$sql = "
+        // Get tasks in this blog / make select list of it
+        $sql = "
 			SELECT
 				blog_id,
 				task_id,
@@ -1741,97 +1740,97 @@ 
 			FROM $tbl_blogs_tasks
 			WHERE c_id = $course_id AND blog_id = " . (int)$blog_id . "
 			ORDER BY system_task, title";
-		$result = Database::query($sql);
-
-		$taskOptions = array();
-		while ($task = Database::fetch_array($result)) {
-			$taskOptions[$task['task_id']] = stripslashes($task['title']);
-		}
-
-		$form = new FormValidator(
-			'assign_task',
-			'post',
-			api_get_path(
-				WEB_CODE_PATH
-			).'blog/blog.php?action=manage_tasks&blog_id='.$blog_id
-		);
-
-		$form->addHeader(get_lang('AssignTask'));
-		$form->addSelect('task_user_id', get_lang('SelectUser'), $options);
-		$form->addSelect('task_task_id', get_lang('SelectTask'), $taskOptions);
-		$form->addDatePicker('task_day', get_lang('SelectTargetDate'));
-
-		$form->addHidden('action', '');
-		$form->addButtonSave(get_lang('Ok'));
-
-		return $form;
-	}
-
-	/**
-	 * Displays assign task form
-	 * @author Toon Keppens
-	 *
-	 */
-	public static function display_assign_task_form($blog_id)
-	{
-		$form = self::getTaskForm($blog_id);
-		$form->addHidden('assign_task_submit', 'true');
-		$form->display();
-		echo '<div style="clear: both; margin-bottom:10px;"></div>';
-	}
-
-	/**
-	 * Displays assign task form
-	 * @author Toon Keppens
-	 *
-	 */
-	public static function display_edit_assigned_task_form($blog_id, $task_id, $user_id)
-	{
-		$tbl_blogs_tasks_rel_user 	= Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
-
-		$course_id = api_get_course_int_id();
-
-		// Get assignd date;
-		$sql = "
+        $result = Database::query($sql);
+
+        $taskOptions = array();
+        while ($task = Database::fetch_array($result)) {
+            $taskOptions[$task['task_id']] = stripslashes($task['title']);
+        }
+
+        $form = new FormValidator(
+            'assign_task',
+            'post',
+            api_get_path(
+                WEB_CODE_PATH
+            ).'blog/blog.php?action=manage_tasks&blog_id='.$blog_id
+        );
+
+        $form->addHeader(get_lang('AssignTask'));
+        $form->addSelect('task_user_id', get_lang('SelectUser'), $options);
+        $form->addSelect('task_task_id', get_lang('SelectTask'), $taskOptions);
+        $form->addDatePicker('task_day', get_lang('SelectTargetDate'));
+
+        $form->addHidden('action', '');
+        $form->addButtonSave(get_lang('Ok'));
+
+        return $form;
+    }
+
+    /**
+     * Displays assign task form
+     * @author Toon Keppens
+     *
+     */
+    public static function display_assign_task_form($blog_id)
+    {
+        $form = self::getTaskForm($blog_id);
+        $form->addHidden('assign_task_submit', 'true');
+        $form->display();
+        echo '<div style="clear: both; margin-bottom:10px;"></div>';
+    }
+
+    /**
+     * Displays assign task form
+     * @author Toon Keppens
+     *
+     */
+    public static function display_edit_assigned_task_form($blog_id, $task_id, $user_id)
+    {
+        $tbl_blogs_tasks_rel_user 	= Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+
+        $course_id = api_get_course_int_id();
+
+        // Get assignd date;
+        $sql = "
 			SELECT target_date
 			FROM $tbl_blogs_tasks_rel_user
 			WHERE c_id = $course_id AND
 			      blog_id = '".(int)$blog_id."' AND
 			      user_id = '".(int)$user_id."' AND
 			      task_id = '".(int)$task_id."'";
-		$result = Database::query($sql);
-		$row = Database::fetch_assoc($result);
-
-		$date = $row['target_date'];
-
-		$defaults = [
-			'task_user_id' => $user_id,
-			'task_task_id' => $task_id,
-			'task_day' => $date
-		];
-		$form = self::getTaskForm($blog_id);
-		$form->addHidden('old_task_id', $task_id);
-		$form->addHidden('old_user_id', $user_id);
-		$form->addHidden('old_target_date', $date);
-		$form->addHidden('assign_task_edit_submit', 'true');
-		$form->setDefaults($defaults);
-		$form->display();
-	}
-
-	/**
-	 * Assigns a task to a user in a blog
-	 *
-	 * @param Integer $blog_id
-	 * @param Integer $user_id
-	 * @param Integer $task_id
-	 * @param Date $target_date
-	 */
-	public static function assign_task($blog_id, $user_id, $task_id, $target_date)
-	{
-		$tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
-		$course_id = api_get_course_int_id();
-
-		$sql = "
+        $result = Database::query($sql);
+        $row = Database::fetch_assoc($result);
+
+        $date = $row['target_date'];
+
+        $defaults = [
+            'task_user_id' => $user_id,
+            'task_task_id' => $task_id,
+            'task_day' => $date
+        ];
+        $form = self::getTaskForm($blog_id);
+        $form->addHidden('old_task_id', $task_id);
+        $form->addHidden('old_user_id', $user_id);
+        $form->addHidden('old_target_date', $date);
+        $form->addHidden('assign_task_edit_submit', 'true');
+        $form->setDefaults($defaults);
+        $form->display();
+    }
+
+    /**
+     * Assigns a task to a user in a blog
+     *
+     * @param Integer $blog_id
+     * @param Integer $user_id
+     * @param Integer $task_id
+     * @param Date $target_date
+     */
+    public static function assign_task($blog_id, $user_id, $task_id, $target_date)
+    {
+        $tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+        $course_id = api_get_course_int_id();
+
+        $sql = "
 			SELECT COUNT(*) as 'number'
 			FROM " . $tbl_blogs_tasks_rel_user . "
 			WHERE c_id = $course_id AND
@@ -1840,11 +1839,11 @@ 
 			AND	task_id = " . (int)$task_id . "
 		";
 
-		$result = Database::query($sql);
-		$row = Database::fetch_assoc($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_assoc($result);
 
-		if ($row['number'] == 0) {
-			$sql = "
+        if ($row['number'] == 0) {
+            $sql = "
 				INSERT INTO " . $tbl_blogs_tasks_rel_user . " (
 					c_id,
 					blog_id,
@@ -1859,9 +1858,9 @@ 
 					'" . Database::escape_string($target_date) . "'
 				)";
 
-			Database::query($sql);
-		}
-	}
+            Database::query($sql);
+        }
+    }
 
     /**
      * @param $blog_id
@@ -1881,11 +1880,11 @@ 
         $old_task_id,
         $old_target_date
     ) {
-		$tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+        $tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
 
-		$course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
 
-		$sql = "SELECT COUNT(*) as 'number'
+        $sql = "SELECT COUNT(*) as 'number'
                 FROM " . $tbl_blogs_tasks_rel_user . "
                 WHERE
                     c_id = $course_id AND
@@ -1894,11 +1893,11 @@ 
                     task_id = " . (int)$task_id . "
             ";
 
-		$result = Database::query($sql);
-		$row = Database::fetch_assoc($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_assoc($result);
 
-		if ($row['number'] == 0 || ($row['number'] != 0 && $task_id == $old_task_id && $user_id == $old_user_id)) {
-			$sql = "
+        if ($row['number'] == 0 || ($row['number'] != 0 && $task_id == $old_task_id && $user_id == $old_user_id)) {
+            $sql = "
 				UPDATE " . $tbl_blogs_tasks_rel_user . "
 				SET
 					user_id = " . (int)$user_id . ",
@@ -1911,76 +1910,76 @@ 
 					task_id = " . (int)$old_task_id . " AND
 					target_date = '" . Database::escape_string($old_target_date) . "'
 			";
-			Database::query($sql);
-		}
-	}
-
-	/**
-	 * Displays a list with posts a user can select to execute his task.
-	 *
-	 * @param Integer $blog_id
-	 * @param unknown_type $task_id
-	 */
-	public static function display_select_task_post($blog_id, $task_id)
+            Database::query($sql);
+        }
+    }
+
+    /**
+     * Displays a list with posts a user can select to execute his task.
+     *
+     * @param Integer $blog_id
+     * @param unknown_type $task_id
+     */
+    public static function display_select_task_post($blog_id, $task_id)
     {
-		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
-		$tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
-		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
-		$course_id = api_get_course_int_id();
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+        $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
+        $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+        $course_id = api_get_course_int_id();
 
 
-		$sql = "SELECT title, description FROM $tbl_blogs_tasks
+        $sql = "SELECT title, description FROM $tbl_blogs_tasks
 				WHERE task_id = '".(int)$task_id."'
 				AND c_id = $course_id";
-		$result = Database::query($sql);
-		$row = Database::fetch_assoc($result);
-		// Get posts and authors
-		$sql = "SELECT post.*, user.lastname, user.firstname, user.username
+        $result = Database::query($sql);
+        $row = Database::fetch_assoc($result);
+        // Get posts and authors
+        $sql = "SELECT post.*, user.lastname, user.firstname, user.username
 				FROM $tbl_blogs_posts post
 				INNER JOIN $tbl_users user ON post.author_id = user.user_id
 				WHERE post.blog_id = '".(int)$blog_id."' AND post.c_id = $course_id
 				ORDER BY post_id DESC
 				LIMIT 0, 100";
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
-		// Display
-		echo '<span class="blogpost_title">' . get_lang('SelectTaskArticle') . ' "' . stripslashes($row['title']) . '"</span>';
-		echo '<span style="font-style: italic;"">'.stripslashes($row['description']) . '</span><br><br>';
+        // Display
+        echo '<span class="blogpost_title">' . get_lang('SelectTaskArticle') . ' "' . stripslashes($row['title']) . '"</span>';
+        echo '<span style="font-style: italic;"">'.stripslashes($row['description']) . '</span><br><br>';
 
-		if (Database::num_rows($result) > 0) {
-			while($blog_post = Database::fetch_array($result)) {
-			    $username = api_htmlentities(sprintf(get_lang('LoginX'), $blog_post['username']), ENT_QUOTES);
-				echo '<a href="blog.php?action=execute_task&blog_id=' . $blog_id . '&task_id=' . $task_id . '&post_id=' . $blog_post['post_id'] . '#add_comment">'.stripslashes($blog_post['title']) . '</a>, ' . get_lang('WrittenBy') . ' ' . stripslashes(Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username))) . '<br />';
-			}
+        if (Database::num_rows($result) > 0) {
+            while($blog_post = Database::fetch_array($result)) {
+                $username = api_htmlentities(sprintf(get_lang('LoginX'), $blog_post['username']), ENT_QUOTES);
+                echo '<a href="blog.php?action=execute_task&blog_id=' . $blog_id . '&task_id=' . $task_id . '&post_id=' . $blog_post['post_id'] . '#add_comment">'.stripslashes($blog_post['title']) . '</a>, ' . get_lang('WrittenBy') . ' ' . stripslashes(Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username))) . '<br />';
+            }
         } else {
             echo get_lang('NoArticles');
         }
-	}
-
-	/**
-	 * Subscribes a user to a given blog
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 * @param Integer $user_id
-	 */
-	public static function set_user_subscribed($blog_id, $user_id)
+    }
+
+    /**
+     * Subscribes a user to a given blog
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     * @param Integer $user_id
+     */
+    public static function set_user_subscribed($blog_id, $user_id)
     {
-		// Init
-		$tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
-		$tbl_user_permissions = Database::get_course_table(TABLE_PERMISSION_USER);
+        // Init
+        $tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
+        $tbl_user_permissions = Database::get_course_table(TABLE_PERMISSION_USER);
 
-		$course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
 
-		// Subscribe the user
-		$sql = "INSERT INTO $tbl_blogs_rel_user (c_id, blog_id, user_id )
+        // Subscribe the user
+        $sql = "INSERT INTO $tbl_blogs_rel_user (c_id, blog_id, user_id )
 		        VALUES ($course_id, '".(int)$blog_id."', '".(int)$user_id."');";
-		Database::query($sql);
+        Database::query($sql);
 
-		// Give this user basic rights
-		$sql = "INSERT INTO $tbl_user_permissions (c_id, user_id,tool,action)
+        // Give this user basic rights
+        $sql = "INSERT INTO $tbl_user_permissions (c_id, user_id,tool,action)
 		        VALUES ($course_id, '".(int)$user_id."','BLOG_" . (int)$blog_id."','article_add')";
-		Database::query($sql);
+        Database::query($sql);
 
         $id = Database::insert_id();
         if ($id) {
@@ -1988,9 +1987,9 @@ 
             Database::query($sql);
         }
 
-		$sql = "INSERT INTO $tbl_user_permissions (c_id, user_id,tool,action)
+        $sql = "INSERT INTO $tbl_user_permissions (c_id, user_id,tool,action)
 		        VALUES ($course_id, '".(int)$user_id."','BLOG_" . (int)$blog_id."','article_comments_add')";
-		Database::query($sql);
+        Database::query($sql);
 
         $id = Database::insert_id();
         if ($id) {
@@ -1998,197 +1997,197 @@ 
             Database::query($sql);
         }
 
-	}
+    }
 
-	/**
-	 * Unsubscribe a user from a given blog
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 * @param Integer $user_id
-	 */
-	public static function set_user_unsubscribed($blog_id, $user_id)
+    /**
+     * Unsubscribe a user from a given blog
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     * @param Integer $user_id
+     */
+    public static function set_user_unsubscribed($blog_id, $user_id)
     {
-		// Init
+        // Init
         $tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
         $tbl_user_permissions = Database::get_course_table(TABLE_PERMISSION_USER);
 
-		// Unsubscribe the user
-		$sql = "DELETE FROM $tbl_blogs_rel_user
+        // Unsubscribe the user
+        $sql = "DELETE FROM $tbl_blogs_rel_user
 		        WHERE blog_id = '".(int)$blog_id."' AND user_id = '".(int)$user_id."'";
-		Database::query($sql);
+        Database::query($sql);
 
-		// Remove this user's permissions.
-		$sql = "DELETE FROM $tbl_user_permissions
+        // Remove this user's permissions.
+        $sql = "DELETE FROM $tbl_user_permissions
 		        WHERE user_id = '".(int)$user_id."'";
-		Database::query($sql);
-	}
-
-	/**
-	 * Displays the form to register users in a blog (in a course)
-	 * The listed users are users subcribed in the course.
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 *
-	 * @return Html Form with sortable table with users to subcribe in a blog, in a course.
-	 */
-	public static function display_form_user_subscribe($blog_id)
-	{
-		$_course = api_get_course_info();
-		$is_western_name_order = api_is_western_name_order();
-		$session_id = api_get_session_id();
-		$course_id = $_course['real_id'];
-
-		$currentCourse = $_course['code'];
-		$tbl_users 			= Database::get_main_table(TABLE_MAIN_USER);
-		$tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
-
-		echo '<legend>'.get_lang('SubscribeMembers').'</legend>';
-
-		$properties["width"] = "100%";
-
-		// Get blog members' id.
-		$sql = "SELECT user.user_id FROM $tbl_users user
+        Database::query($sql);
+    }
+
+    /**
+     * Displays the form to register users in a blog (in a course)
+     * The listed users are users subcribed in the course.
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     *
+     * @return Html Form with sortable table with users to subcribe in a blog, in a course.
+     */
+    public static function display_form_user_subscribe($blog_id)
+    {
+        $_course = api_get_course_info();
+        $is_western_name_order = api_is_western_name_order();
+        $session_id = api_get_session_id();
+        $course_id = $_course['real_id'];
+
+        $currentCourse = $_course['code'];
+        $tbl_users 			= Database::get_main_table(TABLE_MAIN_USER);
+        $tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
+
+        echo '<legend>'.get_lang('SubscribeMembers').'</legend>';
+
+        $properties["width"] = "100%";
+
+        // Get blog members' id.
+        $sql = "SELECT user.user_id FROM $tbl_users user
 				INNER JOIN $tbl_blogs_rel_user blogs_rel_user
 				ON user.user_id = blogs_rel_user.user_id
 				WHERE blogs_rel_user.c_id = $course_id AND blogs_rel_user.blog_id = '".intval($blog_id)."'";
-		$result = Database::query($sql);
-
-		$blog_member_ids = array();
-		while($user = Database::fetch_array($result)) {
-			$blog_member_ids[] = $user['user_id'];
-		}
-
-		// Set table headers
-		$column_header[] = array ('', false, '');
-		if ($is_western_name_order) {
-			$column_header[] = array(get_lang('FirstName'), true, '');
-			$column_header[] = array(get_lang('LastName'), true, '');
-		} else {
-			$column_header[] = array(get_lang('LastName'), true, '');
-			$column_header[] = array(get_lang('FirstName'), true, '');
-		}
-		$column_header[] = array(get_lang('Email'), false, '');
-		$column_header[] = array(get_lang('Register'), false, '');
+        $result = Database::query($sql);
+
+        $blog_member_ids = array();
+        while($user = Database::fetch_array($result)) {
+            $blog_member_ids[] = $user['user_id'];
+        }
+
+        // Set table headers
+        $column_header[] = array ('', false, '');
+        if ($is_western_name_order) {
+            $column_header[] = array(get_lang('FirstName'), true, '');
+            $column_header[] = array(get_lang('LastName'), true, '');
+        } else {
+            $column_header[] = array(get_lang('LastName'), true, '');
+            $column_header[] = array(get_lang('FirstName'), true, '');
+        }
+        $column_header[] = array(get_lang('Email'), false, '');
+        $column_header[] = array(get_lang('Register'), false, '');
 
         $student_list = CourseManager:: get_student_list_from_course_code(
             $currentCourse,
             false,
             $session_id
         );
-		$user_data = array();
-
-		// Add users that are not in this blog to the list.
-		foreach ($student_list as $key=>$user) {
-			if(isset($user['id_user'])) {
-				$user['user_id'] = $user['id_user'];
-			}
-			if(!in_array($user['user_id'],$blog_member_ids)) {
-				$a_infosUser = api_get_user_info($user['user_id']);
-				$row = array ();
-				$row[] = '<input type="checkbox" name="user[]" value="' . $a_infosUser['user_id'] . '" '.((isset($_GET['selectall']) && $_GET['selectall'] == "subscribe") ? ' checked="checked" ' : '') . '/>';
-				$username = api_htmlentities(sprintf(get_lang('LoginX'), $a_infosUser["username"]), ENT_QUOTES);
-				if ($is_western_name_order) {
-					$row[] = $a_infosUser["firstname"];
-					$row[] = Display::tag('span', $a_infosUser["lastname"], array('title'=>$username));
-				} else {
-					$row[] = Display::tag('span', $a_infosUser["lastname"], array('title'=>$username));
-					$row[] = $a_infosUser["firstname"];
-				}
-				$row[] = Display::icon_mailto_link($a_infosUser["email"]);
-
-				//Link to register users
-				if ($a_infosUser["user_id"] != $_SESSION['_user']['user_id']){
-					$row[] = "<a class=\"btn btn-primary \" href=\"" .api_get_self()."?action=manage_members&blog_id=$blog_id&register=yes&user_id=" . $a_infosUser["user_id"]."\">" . get_lang('Register')."</a>";
-				} else {
-					$row[] = '';
-				}
-				$user_data[] = $row;
-			}
-		}
-
-		// Display
-		$query_vars['action'] = 'manage_members';
-		$query_vars['blog_id'] = $blog_id;
-		echo '<form method="post" action="blog.php?action=manage_members&blog_id=' . $blog_id . '">';
-			Display::display_sortable_table($column_header, $user_data,null,null,$query_vars);
-			$link = '';
-			$link .= isset ($_GET['action']) ? 'action=' . Security::remove_XSS($_GET['action']) . '&' : '';
-			$link .= "blog_id=$blog_id&";
-
-			echo '<a href="blog.php?' . $link . 'selectall=subscribe">' . get_lang('SelectAll') . '</a> - ';
-			echo '<a href="blog.php?' . $link . '">' . get_lang('UnSelectAll') . '</a> ';
-			echo get_lang('WithSelected') . ' : ';
-			echo '<select name="action">';
-			echo '<option value="select_subscribe">' . get_lang('Register') . '</option>';
-			echo '</select>';
-			echo '<input type="hidden" name="register" value="true" />';
-			echo '<button class="save" type="submit">' . get_lang('Ok') . '</button>';
-		echo '</form>';
-	}
-
-	/**
-	 * Displays the form to register users in a blog (in a course)
-	 * The listed users are users subcribed in the course.
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 *
-	 * @return Html Form with sortable table with users to unsubcribe from a blog.
-	 */
-	public static function display_form_user_unsubscribe ($blog_id)
-	{
-		$_user = api_get_user_info();
-		$is_western_name_order = api_is_western_name_order();
-
-		// Init
-		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
-		$tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
-
-		echo '<legend>'.get_lang('UnsubscribeMembers').'</legend>';
-
-		$properties["width"] = "100%";
-		//table column titles
-		$column_header[] = array ('', false, '');
-		if ($is_western_name_order) {
-			$column_header[] = array (get_lang('FirstName'), true, '');
-			$column_header[] = array (get_lang('LastName'), true, '');
-		} else {
-			$column_header[] = array (get_lang('LastName'), true, '');
-			$column_header[] = array (get_lang('FirstName'), true, '');
-		}
-		$column_header[] = array (get_lang('Email'), false, '');
-		$column_header[] = array (get_lang('TaskManager'), true, '');
-		$column_header[] = array (get_lang('UnRegister'), false, '');
-
-		$course_id = api_get_course_int_id();
-
-		$sql = "SELECT user.user_id, user.lastname, user.firstname, user.email, user.username
+        $user_data = array();
+
+        // Add users that are not in this blog to the list.
+        foreach ($student_list as $key=>$user) {
+            if(isset($user['id_user'])) {
+                $user['user_id'] = $user['id_user'];
+            }
+            if(!in_array($user['user_id'],$blog_member_ids)) {
+                $a_infosUser = api_get_user_info($user['user_id']);
+                $row = array ();
+                $row[] = '<input type="checkbox" name="user[]" value="' . $a_infosUser['user_id'] . '" '.((isset($_GET['selectall']) && $_GET['selectall'] == "subscribe") ? ' checked="checked" ' : '') . '/>';
+                $username = api_htmlentities(sprintf(get_lang('LoginX'), $a_infosUser["username"]), ENT_QUOTES);
+                if ($is_western_name_order) {
+                    $row[] = $a_infosUser["firstname"];
+                    $row[] = Display::tag('span', $a_infosUser["lastname"], array('title'=>$username));
+                } else {
+                    $row[] = Display::tag('span', $a_infosUser["lastname"], array('title'=>$username));
+                    $row[] = $a_infosUser["firstname"];
+                }
+                $row[] = Display::icon_mailto_link($a_infosUser["email"]);
+
+                //Link to register users
+                if ($a_infosUser["user_id"] != $_SESSION['_user']['user_id']){
+                    $row[] = "<a class=\"btn btn-primary \" href=\"" .api_get_self()."?action=manage_members&blog_id=$blog_id&register=yes&user_id=" . $a_infosUser["user_id"]."\">" . get_lang('Register')."</a>";
+                } else {
+                    $row[] = '';
+                }
+                $user_data[] = $row;
+            }
+        }
+
+        // Display
+        $query_vars['action'] = 'manage_members';
+        $query_vars['blog_id'] = $blog_id;
+        echo '<form method="post" action="blog.php?action=manage_members&blog_id=' . $blog_id . '">';
+            Display::display_sortable_table($column_header, $user_data,null,null,$query_vars);
+            $link = '';
+            $link .= isset ($_GET['action']) ? 'action=' . Security::remove_XSS($_GET['action']) . '&' : '';
+            $link .= "blog_id=$blog_id&";
+
+            echo '<a href="blog.php?' . $link . 'selectall=subscribe">' . get_lang('SelectAll') . '</a> - ';
+            echo '<a href="blog.php?' . $link . '">' . get_lang('UnSelectAll') . '</a> ';
+            echo get_lang('WithSelected') . ' : ';
+            echo '<select name="action">';
+            echo '<option value="select_subscribe">' . get_lang('Register') . '</option>';
+            echo '</select>';
+            echo '<input type="hidden" name="register" value="true" />';
+            echo '<button class="save" type="submit">' . get_lang('Ok') . '</button>';
+        echo '</form>';
+    }
+
+    /**
+     * Displays the form to register users in a blog (in a course)
+     * The listed users are users subcribed in the course.
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     *
+     * @return Html Form with sortable table with users to unsubcribe from a blog.
+     */
+    public static function display_form_user_unsubscribe ($blog_id)
+    {
+        $_user = api_get_user_info();
+        $is_western_name_order = api_is_western_name_order();
+
+        // Init
+        $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+        $tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
+
+        echo '<legend>'.get_lang('UnsubscribeMembers').'</legend>';
+
+        $properties["width"] = "100%";
+        //table column titles
+        $column_header[] = array ('', false, '');
+        if ($is_western_name_order) {
+            $column_header[] = array (get_lang('FirstName'), true, '');
+            $column_header[] = array (get_lang('LastName'), true, '');
+        } else {
+            $column_header[] = array (get_lang('LastName'), true, '');
+            $column_header[] = array (get_lang('FirstName'), true, '');
+        }
+        $column_header[] = array (get_lang('Email'), false, '');
+        $column_header[] = array (get_lang('TaskManager'), true, '');
+        $column_header[] = array (get_lang('UnRegister'), false, '');
+
+        $course_id = api_get_course_int_id();
+
+        $sql = "SELECT user.user_id, user.lastname, user.firstname, user.email, user.username
                 FROM $tbl_users user INNER JOIN $tbl_blogs_rel_user blogs_rel_user
                 ON user.user_id = blogs_rel_user.user_id
                 WHERE blogs_rel_user.c_id = $course_id AND  blogs_rel_user.blog_id = '".(int)$blog_id."'";
 
-		if (!($sql_result = Database::query($sql))) {
-			return false;
-		}
-
-		$user_data = array ();
-
-		while ($myrow = Database::fetch_array($sql_result)) {
-			$row = array ();
-			$row[] = '<input type="checkbox" name="user[]" value="' . $myrow['user_id'] . '" '.((isset($_GET['selectall']) && $_GET['selectall'] == "unsubscribe") ? ' checked="checked" ' : '') . '/>';
-			$username = api_htmlentities(sprintf(get_lang('LoginX'), $myrow["username"]), ENT_QUOTES);
-			if ($is_western_name_order) {
-				$row[] = $myrow["firstname"];
-				$row[] = Display::tag('span', $myrow["lastname"], array('title'=>$username));
-			} else {
-				$row[] = Display::tag('span', $myrow["lastname"], array('title'=>$username));
-				$row[] = $myrow["firstname"];
-			}
-			$row[] = Display::icon_mailto_link($myrow["email"]);
-
-			$sql = "SELECT bt.title task
+        if (!($sql_result = Database::query($sql))) {
+            return false;
+        }
+
+        $user_data = array ();
+
+        while ($myrow = Database::fetch_array($sql_result)) {
+            $row = array ();
+            $row[] = '<input type="checkbox" name="user[]" value="' . $myrow['user_id'] . '" '.((isset($_GET['selectall']) && $_GET['selectall'] == "unsubscribe") ? ' checked="checked" ' : '') . '/>';
+            $username = api_htmlentities(sprintf(get_lang('LoginX'), $myrow["username"]), ENT_QUOTES);
+            if ($is_western_name_order) {
+                $row[] = $myrow["firstname"];
+                $row[] = Display::tag('span', $myrow["lastname"], array('title'=>$username));
+            } else {
+                $row[] = Display::tag('span', $myrow["lastname"], array('title'=>$username));
+                $row[] = $myrow["firstname"];
+            }
+            $row[] = Display::icon_mailto_link($myrow["email"]);
+
+            $sql = "SELECT bt.title task
 					FROM " . Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER) . " btu
 					INNER JOIN " . Database::get_course_table(TABLE_BLOGS_TASKS) . " bt
 					ON btu.task_id = bt.task_id
@@ -2196,158 +2195,158 @@ 
 							bt.c_id 	= $course_id  AND
 							btu.blog_id = $blog_id AND
 							btu.user_id = " . $myrow['user_id'];
-			$sql_res = Database::query($sql);
-
-			$task = '';
-
-			while($r = Database::fetch_array($sql_res)) {
-				$task .= stripslashes($r['task']) . ', ';
-			}
-			//echo $task;
-			$task = (api_strlen(trim($task)) != 0) ? api_substr($task, 0, api_strlen($task) - 2) : get_lang('Reader');
-			$row[] = $task;
-			//Link to register users
-
-			if ($myrow["user_id"] != $_user['user_id']) {
-				$row[] = "<a class=\"btn btn-primary\" href=\"" .api_get_self()."?action=manage_members&blog_id=$blog_id&unregister=yes&user_id=" . $myrow['user_id']."\">" . get_lang('UnRegister')."</a>";
-			} else {
-				$row[] = '';
-			}
-
-			$user_data[] = $row;
-		}
-
-		$query_vars['action'] = 'manage_members';
-		$query_vars['blog_id'] = $blog_id;
-		echo '<form method="post" action="blog.php?action=manage_members&blog_id=' . $blog_id . '">';
-		Display::display_sortable_table($column_header, $user_data,null,null,$query_vars);
-		$link = '';
-		$link .= isset ($_GET['action']) ? 'action=' . Security::remove_XSS($_GET['action']). '&' : '';
-		$link .= "blog_id=$blog_id&";
-
-		echo '<a href="blog.php?' . $link . 'selectall=unsubscribe">' . get_lang('SelectAll') . '</a> - ';
-		echo '<a href="blog.php?' . $link . '">' . get_lang('UnSelectAll') . '</a> ';
-		echo get_lang('WithSelected') . ' : ';
-		echo '<select name="action">';
-		echo '<option value="select_unsubscribe">' . get_lang('UnRegister') . '</option>';
-		echo '</select>';
-		echo '<input type="hidden" name="unregister" value="true" />';
-		echo '<button class="save" type="submit">' . get_lang('Ok') . '</button>';
-		echo '</form>';
-	}
-
-	/**
-	 * Displays a matrix with selectboxes. On the left: users, on top: possible rights.
-	 * The blog admin can thus select what a certain user can do in the current blog
-	 *
-	 * @param Integer $blog_id
-	 */
-	public static function display_form_user_rights ($blog_id)
+            $sql_res = Database::query($sql);
+
+            $task = '';
+
+            while($r = Database::fetch_array($sql_res)) {
+                $task .= stripslashes($r['task']) . ', ';
+            }
+            //echo $task;
+            $task = (api_strlen(trim($task)) != 0) ? api_substr($task, 0, api_strlen($task) - 2) : get_lang('Reader');
+            $row[] = $task;
+            //Link to register users
+
+            if ($myrow["user_id"] != $_user['user_id']) {
+                $row[] = "<a class=\"btn btn-primary\" href=\"" .api_get_self()."?action=manage_members&blog_id=$blog_id&unregister=yes&user_id=" . $myrow['user_id']."\">" . get_lang('UnRegister')."</a>";
+            } else {
+                $row[] = '';
+            }
+
+            $user_data[] = $row;
+        }
+
+        $query_vars['action'] = 'manage_members';
+        $query_vars['blog_id'] = $blog_id;
+        echo '<form method="post" action="blog.php?action=manage_members&blog_id=' . $blog_id . '">';
+        Display::display_sortable_table($column_header, $user_data,null,null,$query_vars);
+        $link = '';
+        $link .= isset ($_GET['action']) ? 'action=' . Security::remove_XSS($_GET['action']). '&' : '';
+        $link .= "blog_id=$blog_id&";
+
+        echo '<a href="blog.php?' . $link . 'selectall=unsubscribe">' . get_lang('SelectAll') . '</a> - ';
+        echo '<a href="blog.php?' . $link . '">' . get_lang('UnSelectAll') . '</a> ';
+        echo get_lang('WithSelected') . ' : ';
+        echo '<select name="action">';
+        echo '<option value="select_unsubscribe">' . get_lang('UnRegister') . '</option>';
+        echo '</select>';
+        echo '<input type="hidden" name="unregister" value="true" />';
+        echo '<button class="save" type="submit">' . get_lang('Ok') . '</button>';
+        echo '</form>';
+    }
+
+    /**
+     * Displays a matrix with selectboxes. On the left: users, on top: possible rights.
+     * The blog admin can thus select what a certain user can do in the current blog
+     *
+     * @param Integer $blog_id
+     */
+    public static function display_form_user_rights ($blog_id)
+    {
+        echo '<legend>'.get_lang('RightsManager').'</legend>';
+        echo '<br />';
+
+        // Integration of patricks permissions system.
+        require_once api_get_path(SYS_CODE_PATH).'permissions/blog_permissions.inc.php';
+    }
+
+    /**
+     * Displays the form to create a new post
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     */
+    public static function display_new_comment_form($blog_id, $post_id, $title)
+    {
+        $form = new FormValidator(
+            'add_post',
+            'post',
+            api_get_path(WEB_CODE_PATH)."blog/blog.php?action=view_post&blog_id=" . intval($blog_id)  . "&post_id=".intval($post_id)."&".api_get_cidreq(),
+            null,
+            array('enctype' => 'multipart/form-data')
+        );
+
+        $header = get_lang('AddNewComment');
+        if (isset($_GET['task_id'])) {
+            $header = get_lang('ExecuteThisTask');
+        }
+        $form->addHeader($header);
+        $form->addText('title', get_lang('Title'));
+
+        $config = array();
+        if (!api_is_allowed_to_edit()) {
+            $config['ToolbarSet'] = 'ProjectComment';
+        } else {
+            $config['ToolbarSet'] = 'ProjectCommentStudent';
+        }
+        $form->addHtmlEditor('comment', get_lang('Comment'), false, false, $config);
+        $form->addFile('user_upload', get_lang('AddAnAttachment'));
+
+        $form->addTextarea('post_file_comment', get_lang('FileComment'));
+
+        $form->addHidden('action', null);
+        $form->addHidden('comment_parent_id', 0);
+
+        if (isset($_GET['task_id'])) {
+            $form->addHidden('new_task_execution_submit', 'true');
+            $form->addHidden('task_id', intval($_GET['task_id']));
+        } else {
+            $form->addHidden('new_comment_submit', 'true');
+        }
+        $form->addButton('save', get_lang('Save'));
+        $form->display();
+    }
+
+
+    /**
+     * show the calender of the given month
+     * @author Patrick Cool
+     * @author Toon Keppens
+     *
+     * @param Array $blogitems an array containing all the blog items for the given month
+     * @param Integer $month: the integer value of the month we are viewing
+     * @param Integer $year: the 4-digit year indication e.g. 2005
+     * @param String $monthName: the language variable for the mont name
+     *
+     * @return html code
+     */
+    public static function display_minimonthcalendar($month, $year, $blog_id)
     {
-		echo '<legend>'.get_lang('RightsManager').'</legend>';
-		echo '<br />';
-
-		// Integration of patricks permissions system.
-		require_once api_get_path(SYS_CODE_PATH).'permissions/blog_permissions.inc.php';
-	}
-
-	/**
-	 * Displays the form to create a new post
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 */
-	public static function display_new_comment_form($blog_id, $post_id, $title)
-	{
-		$form = new FormValidator(
-			'add_post',
-			'post',
-			api_get_path(WEB_CODE_PATH)."blog/blog.php?action=view_post&blog_id=" . intval($blog_id)  . "&post_id=".intval($post_id)."&".api_get_cidreq(),
-			null,
-			array('enctype' => 'multipart/form-data')
-		);
-
-		$header = get_lang('AddNewComment');
-		if (isset($_GET['task_id'])) {
-			$header = get_lang('ExecuteThisTask');
-		}
-		$form->addHeader($header);
-		$form->addText('title', get_lang('Title'));
-
-		$config = array();
-		if (!api_is_allowed_to_edit()) {
-			$config['ToolbarSet'] = 'ProjectComment';
-		} else {
-			$config['ToolbarSet'] = 'ProjectCommentStudent';
-		}
-		$form->addHtmlEditor('comment', get_lang('Comment'), false, false, $config);
-		$form->addFile('user_upload', get_lang('AddAnAttachment'));
-
-		$form->addTextarea('post_file_comment', get_lang('FileComment'));
-
-		$form->addHidden('action', null);
-		$form->addHidden('comment_parent_id', 0);
-
-		if (isset($_GET['task_id'])) {
-			$form->addHidden('new_task_execution_submit', 'true');
-			$form->addHidden('task_id', intval($_GET['task_id']));
-		} else {
-			$form->addHidden('new_comment_submit', 'true');
-		}
-		$form->addButton('save', get_lang('Save'));
-		$form->display();
-	}
-
-
-	/**
-	 * show the calender of the given month
-	 * @author Patrick Cool
-	 * @author Toon Keppens
-	 *
-	 * @param Array $blogitems an array containing all the blog items for the given month
-	 * @param Integer $month: the integer value of the month we are viewing
-	 * @param Integer $year: the 4-digit year indication e.g. 2005
-	 * @param String $monthName: the language variable for the mont name
-	 *
-	 * @return html code
-	*/
-	public static function display_minimonthcalendar($month, $year, $blog_id)
-	{
-		// Init
-		$_user = api_get_user_info();
-		global $DaysShort;
-		global $MonthsLong;
-
-		$posts = array();
-		$tasks = array();
-
-		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
-		$tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
-		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
-		$tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
-		$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
-
-		$course_id = api_get_course_int_id();
-
-		//Handle leap year
-		$numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
-
-		if(($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0))
-			$numberofdays[2] = 29;
-
-		//Get the first day of the month
-		$dayone = getdate(mktime(0, 0, 0, $month, 1, $year));
-		$monthName = $MonthsLong[$month-1];
-
-		//Start the week on monday
-		$startdayofweek = $dayone['wday'] <> 0 ? ($dayone['wday'] - 1) : 6;
-		$blogId = isset($_GET['blog_id']) ? intval($_GET['blog_id']) : null;
-		$filter = isset($_GET['filter']) ? Security::remove_XSS($_GET['filter']) : null;
-		$backwardsURL = api_get_self()."?blog_id=" . $blogId."&filter=" . $filter."&month=". ($month == 1 ? 12 : $month -1)."&year=". ($month == 1 ? $year -1 : $year);
-		$forewardsURL = api_get_self()."?blog_id=" . $blogId."&filter=" . $filter."&month=". ($month == 12 ? 1 : $month +1)."&year=". ($month == 12 ? $year +1 : $year);
-
-		// Get posts for this month
-		$sql = "SELECT post.*, DAYOFMONTH(date_creation) as post_day, user.lastname, user.firstname
+        // Init
+        $_user = api_get_user_info();
+        global $DaysShort;
+        global $MonthsLong;
+
+        $posts = array();
+        $tasks = array();
+
+        $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+        $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+        $tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+        $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
+
+        $course_id = api_get_course_int_id();
+
+        //Handle leap year
+        $numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+
+        if(($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0))
+            $numberofdays[2] = 29;
+
+        //Get the first day of the month
+        $dayone = getdate(mktime(0, 0, 0, $month, 1, $year));
+        $monthName = $MonthsLong[$month-1];
+
+        //Start the week on monday
+        $startdayofweek = $dayone['wday'] <> 0 ? ($dayone['wday'] - 1) : 6;
+        $blogId = isset($_GET['blog_id']) ? intval($_GET['blog_id']) : null;
+        $filter = isset($_GET['filter']) ? Security::remove_XSS($_GET['filter']) : null;
+        $backwardsURL = api_get_self()."?blog_id=" . $blogId."&filter=" . $filter."&month=". ($month == 1 ? 12 : $month -1)."&year=". ($month == 1 ? $year -1 : $year);
+        $forewardsURL = api_get_self()."?blog_id=" . $blogId."&filter=" . $filter."&month=". ($month == 12 ? 1 : $month +1)."&year=". ($month == 12 ? $year +1 : $year);
+
+        // Get posts for this month
+        $sql = "SELECT post.*, DAYOFMONTH(date_creation) as post_day, user.lastname, user.firstname
 				FROM $tbl_blogs_posts post
 				INNER JOIN $tbl_users user
 				ON post.author_id = user.user_id
@@ -2357,20 +2356,20 @@ 
 					MONTH(date_creation) = '".(int)$month."' AND
 					YEAR(date_creation) = '".(int)$year."'
 				ORDER BY date_creation";
-		$result = Database::query($sql);
-
-		// We will create an array of days on which there are posts.
-		if( Database::num_rows($result) > 0) {
-			while($blog_post = Database::fetch_array($result)) {
-				// If the day of this post is not yet in the array, add it.
-				if (!in_array($blog_post['post_day'], $posts))
-					$posts[] = $blog_post['post_day'];
-			}
-		}
-
-		// Get tasks for this month
-		if ($_user['user_id']) {
-			$sql = " SELECT task_rel_user.*,  DAYOFMONTH(target_date) as task_day, task.title, blog.blog_name
+        $result = Database::query($sql);
+
+        // We will create an array of days on which there are posts.
+        if( Database::num_rows($result) > 0) {
+            while($blog_post = Database::fetch_array($result)) {
+                // If the day of this post is not yet in the array, add it.
+                if (!in_array($blog_post['post_day'], $posts))
+                    $posts[] = $blog_post['post_day'];
+            }
+        }
+
+        // Get tasks for this month
+        if ($_user['user_id']) {
+            $sql = " SELECT task_rel_user.*,  DAYOFMONTH(target_date) as task_day, task.title, blog.blog_name
 				FROM $tbl_blogs_tasks_rel_user task_rel_user
 				INNER JOIN $tbl_blogs_tasks task ON task_rel_user.task_id = task.task_id
 				INNER JOIN $tbl_blogs blog ON task_rel_user.blog_id = blog.blog_id
@@ -2382,84 +2381,84 @@ 
 					MONTH(target_date) = '".(int)$month."' AND
 					YEAR(target_date) = '".(int)$year."'
 				ORDER BY target_date ASC";
-			$result = Database::query($sql);
-
-			if (Database::num_rows($result) > 0) {
-				while ($mytask = Database::fetch_array($result)) {
-					$tasks[$mytask['task_day']][$mytask['task_id']]['task_id'] = $mytask['task_id'];
-					$tasks[$mytask['task_day']][$mytask['task_id']]['title'] = $mytask['title'];
-					$tasks[$mytask['task_day']][$mytask['task_id']]['blog_id'] = $mytask['blog_id'];
-					$tasks[$mytask['task_day']][$mytask['task_id']]['blog_name'] = $mytask['blog_name'];
-					$tasks[$mytask['task_day']][$mytask['task_id']]['day'] = $mytask['task_day'];
-				}
-			}
-		}
-
-		echo 	'<table id="smallcalendar" class="table table-responsive">',
-				"<tr id=\"title\">\n",
-				"<th width=\"10%\"><a href=\"", $backwardsURL, "\">&laquo;</a></th>\n",
-				"<th align=\"center\" width=\"80%\" colspan=\"5\">", $monthName, " ", $year, "</th>\n",
-				"<th width=\"10%\" align=\"right\"><a href=\"", $forewardsURL, "\">&raquo;</a></th>\n", "</tr>";
-
-		echo "<tr>\n";
-
-		for($ii = 1; $ii < 8; $ii ++)
-			echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>";
-
-		echo "</tr>";
-
-		$curday = -1;
-		$today = getdate();
-
-		while ($curday <= $numberofdays[$month]) {
-			echo "<tr>";
-			for ($ii = 0; $ii < 7; $ii ++) {
-				if (($curday == -1) && ($ii == $startdayofweek))
-					$curday = 1;
-
-			 	if (($curday > 0) && ($curday <= $numberofdays[$month])) {
-					$bgcolor = $ii < 5 ? $class="class=\"days_week\"" : $class="class=\"days_weekend\"";
-					$dayheader = "$curday";
-
-					if(($curday == $today['mday']) && ($year == $today['year']) && ($month == $today['mon'])) {
-						$dayheader = "$curday";
-						$class = "class=\"days_today\"";
-					}
-
-					echo "<td " . $class.">";
-
-					// If there are posts on this day, create a filter link.
-					if(in_array($curday, $posts))
-						echo '<a href="blog.php?blog_id=' . $blog_id . '&filter=' . $year . '-' . $month . '-' . $curday . '&month=' . $month . '&year=' . $year . '" title="' . get_lang('ViewPostsOfThisDay') . '">' . $curday . '</a>';
-					else
-						echo $dayheader;
-
-					if (count($tasks) > 0) {
-						if (isset($tasks[$curday]) && is_array($tasks[$curday])) {
-							// Add tasks to calendar
-							foreach ($tasks[$curday] as $task) {
-								echo '<a href="blog.php?action=execute_task&blog_id=' . $task['blog_id'] . '&task_id='.stripslashes($task['task_id']) . '" title="' . $task['title'] . ' : ' . get_lang('InBlog') . ' : ' . $task['blog_name'] . ' - ' . get_lang('ExecuteThisTask') . '">
+            $result = Database::query($sql);
+
+            if (Database::num_rows($result) > 0) {
+                while ($mytask = Database::fetch_array($result)) {
+                    $tasks[$mytask['task_day']][$mytask['task_id']]['task_id'] = $mytask['task_id'];
+                    $tasks[$mytask['task_day']][$mytask['task_id']]['title'] = $mytask['title'];
+                    $tasks[$mytask['task_day']][$mytask['task_id']]['blog_id'] = $mytask['blog_id'];
+                    $tasks[$mytask['task_day']][$mytask['task_id']]['blog_name'] = $mytask['blog_name'];
+                    $tasks[$mytask['task_day']][$mytask['task_id']]['day'] = $mytask['task_day'];
+                }
+            }
+        }
+
+        echo 	'<table id="smallcalendar" class="table table-responsive">',
+                "<tr id=\"title\">\n",
+                "<th width=\"10%\"><a href=\"", $backwardsURL, "\">&laquo;</a></th>\n",
+                "<th align=\"center\" width=\"80%\" colspan=\"5\">", $monthName, " ", $year, "</th>\n",
+                "<th width=\"10%\" align=\"right\"><a href=\"", $forewardsURL, "\">&raquo;</a></th>\n", "</tr>";
+
+        echo "<tr>\n";
+
+        for($ii = 1; $ii < 8; $ii ++)
+            echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>";
+
+        echo "</tr>";
+
+        $curday = -1;
+        $today = getdate();
+
+        while ($curday <= $numberofdays[$month]) {
+            echo "<tr>";
+            for ($ii = 0; $ii < 7; $ii ++) {
+                if (($curday == -1) && ($ii == $startdayofweek))
+                    $curday = 1;
+
+                    if (($curday > 0) && ($curday <= $numberofdays[$month])) {
+                    $bgcolor = $ii < 5 ? $class="class=\"days_week\"" : $class="class=\"days_weekend\"";
+                    $dayheader = "$curday";
+
+                    if(($curday == $today['mday']) && ($year == $today['year']) && ($month == $today['mon'])) {
+                        $dayheader = "$curday";
+                        $class = "class=\"days_today\"";
+                    }
+
+                    echo "<td " . $class.">";
+
+                    // If there are posts on this day, create a filter link.
+                    if(in_array($curday, $posts))
+                        echo '<a href="blog.php?blog_id=' . $blog_id . '&filter=' . $year . '-' . $month . '-' . $curday . '&month=' . $month . '&year=' . $year . '" title="' . get_lang('ViewPostsOfThisDay') . '">' . $curday . '</a>';
+                    else
+                        echo $dayheader;
+
+                    if (count($tasks) > 0) {
+                        if (isset($tasks[$curday]) && is_array($tasks[$curday])) {
+                            // Add tasks to calendar
+                            foreach ($tasks[$curday] as $task) {
+                                echo '<a href="blog.php?action=execute_task&blog_id=' . $task['blog_id'] . '&task_id='.stripslashes($task['task_id']) . '" title="' . $task['title'] . ' : ' . get_lang('InBlog') . ' : ' . $task['blog_name'] . ' - ' . get_lang('ExecuteThisTask') . '">
 								<img src="../img/blog_task.gif" alt="Task" title="' . get_lang('ExecuteThisTask') . '" /></a>';
-							}
-						}
-					}
-
-					echo "</td>";
-					$curday ++;
-				} else
-					echo "<td>&nbsp;</td>";
-			}
-			echo "</tr>";
-		}
-		echo "</table>";
-	}
-
-	/**
-	 * Blog admin | Display the form to add a new blog.
-	 *
-	 */
-	public static function display_new_blog_form()
-	{
+                            }
+                        }
+                    }
+
+                    echo "</td>";
+                    $curday ++;
+                } else
+                    echo "<td>&nbsp;</td>";
+            }
+            echo "</tr>";
+        }
+        echo "</table>";
+    }
+
+    /**
+     * Blog admin | Display the form to add a new blog.
+     *
+     */
+    public static function display_new_blog_form()
+    {
         $form = new FormValidator('add_blog', 'post', 'blog_admin.php?action=add');
         $form->addElement('header', get_lang('AddBlog'));
         $form->addElement('text', 'blog_name', get_lang('Title'));
@@ -2469,34 +2468,34 @@ 
         $form->addButtonSave(get_lang('SaveProject'));
 
         $defaults = array(
-			'blog_name' => isset($_POST['blog_name']) ? Security::remove_XSS($_POST['blog_name']) : null,
-        	'blog_subtitle' => isset($_POST['blog_subtitle']) ? Security::remove_XSS($_POST['blog_subtitle']) : null
-		);
+            'blog_name' => isset($_POST['blog_name']) ? Security::remove_XSS($_POST['blog_name']) : null,
+            'blog_subtitle' => isset($_POST['blog_subtitle']) ? Security::remove_XSS($_POST['blog_subtitle']) : null
+        );
         $form->setDefaults($defaults);
         $form->display();
-	}
-
-	/**
-	 * Blog admin | Display the form to edit a blog.
-	 *
-	 */
-	public static function display_edit_blog_form($blog_id)
-	{
-	    $course_id = api_get_course_int_id();
-		$blog_id= intval($blog_id);
-		$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
-
-		$sql = "SELECT blog_id, blog_name, blog_subtitle
+    }
+
+    /**
+     * Blog admin | Display the form to edit a blog.
+     *
+     */
+    public static function display_edit_blog_form($blog_id)
+    {
+        $course_id = api_get_course_int_id();
+        $blog_id= intval($blog_id);
+        $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
+
+        $sql = "SELECT blog_id, blog_name, blog_subtitle
 		        FROM $tbl_blogs
 		        WHERE c_id = $course_id AND blog_id = '".$blog_id."'";
-		$result = Database::query($sql);
-		$blog = Database::fetch_array($result);
+        $result = Database::query($sql);
+        $blog = Database::fetch_array($result);
 
-		// the form contained errors but we do not want to lose the changes the user already did
-		if ($_POST) {
-			$blog['blog_name'] = Security::remove_XSS($_POST['blog_name']);
-			$blog['blog_subtitle'] = Security::remove_XSS($_POST['blog_subtitle']);
-		}
+        // the form contained errors but we do not want to lose the changes the user already did
+        if ($_POST) {
+            $blog['blog_name'] = Security::remove_XSS($_POST['blog_name']);
+            $blog['blog_subtitle'] = Security::remove_XSS($_POST['blog_subtitle']);
+        }
 
         $form = new FormValidator('edit_blog', 'post','blog_admin.php?action=edit&blog_id='.intval($_GET['blog_id']));
         $form->addElement('header', get_lang('EditBlog'));
@@ -2512,82 +2511,82 @@ 
         $defaults['blog_subtitle'] = $blog['blog_subtitle'];
         $form->setDefaults($defaults);
         $form->display();
-	}
+    }
 
-	/**
-	 * Blog admin | Returns table with blogs in this course
-	 */
-	public static function display_blog_list()
+    /**
+     * Blog admin | Returns table with blogs in this course
+     */
+    public static function display_blog_list()
     {
-		global $charset;
-		$_user = api_get_user_info();
+        global $charset;
+        $_user = api_get_user_info();
         $course_id = api_get_course_int_id();
 
-		$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
+        $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
 
-		//condition for the session
-		$session_id = api_get_session_id();
-		$condition_session = api_get_session_condition($session_id, false);
+        //condition for the session
+        $session_id = api_get_session_id();
+        $condition_session = api_get_session_condition($session_id, false);
 
-		$sql = "SELECT blog_name, blog_subtitle, visibility, blog_id, session_id
+        $sql = "SELECT blog_name, blog_subtitle, visibility, blog_id, session_id
 				FROM $tbl_blogs WHERE c_id = $course_id
 				ORDER BY date_creation DESC";
-		$result = Database::query($sql);
-		$list_info = array();
-		if (Database::num_rows($result)) {
-			while ($row_project=Database::fetch_row($result)) {
-				$list_info[]=$row_project;
-			}
-		}
-
-		$list_content_blog = array();
-		$list_body_blog = array();
-
-		if (is_array($list_info)) {
-			foreach ($list_info as $key => $info_log) {
-				// Validation when belongs to a session
-				$session_img = api_get_session_image($info_log[4], $_user['status']);
-
-				$url_start_blog = 'blog.php' ."?". "blog_id=".$info_log[3]. "&".api_get_cidreq();
-				$title = $info_log[0];
+        $result = Database::query($sql);
+        $list_info = array();
+        if (Database::num_rows($result)) {
+            while ($row_project=Database::fetch_row($result)) {
+                $list_info[]=$row_project;
+            }
+        }
+
+        $list_content_blog = array();
+        $list_body_blog = array();
+
+        if (is_array($list_info)) {
+            foreach ($list_info as $key => $info_log) {
+                // Validation when belongs to a session
+                $session_img = api_get_session_image($info_log[4], $_user['status']);
+
+                $url_start_blog = 'blog.php' ."?". "blog_id=".$info_log[3]. "&".api_get_cidreq();
+                $title = $info_log[0];
                         $image = Display::return_icon('blog.png', $title);
-    			$list_name = '<div style="float: left; width: 35px; height: 22px;"><a href="'.$url_start_blog.'">' . $image . '</a></div><a href="'.$url_start_blog.'">' .$title. '</a>' . $session_img;
+                $list_name = '<div style="float: left; width: 35px; height: 22px;"><a href="'.$url_start_blog.'">' . $image . '</a></div><a href="'.$url_start_blog.'">' .$title. '</a>' . $session_img;
 
-				$list_body_blog[] = $list_name;
-				$list_body_blog[] = $info_log[1];
+                $list_body_blog[] = $list_name;
+                $list_body_blog[] = $info_log[1];
 
-				$visibility_icon=($info_log[2]==0) ? 'invisible' : 'visible';
-				$visibility_info=($info_log[2]==0) ? 'Visible' : 'Invisible';
-			 	$my_image = '<a href="' .api_get_self(). '?action=edit&blog_id=' . $info_log[3] . '">';
+                $visibility_icon=($info_log[2]==0) ? 'invisible' : 'visible';
+                $visibility_info=($info_log[2]==0) ? 'Visible' : 'Invisible';
+                    $my_image = '<a href="' .api_get_self(). '?action=edit&blog_id=' . $info_log[3] . '">';
                                 $my_image.= Display::return_icon('edit.png', get_lang('EditBlog'));
 
-				$my_image.= "</a>\n";
-				$my_image.= '<a href="' .api_get_self(). '?action=delete&blog_id=' . $info_log[3] . '" ';
-				$my_image.= 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;" >';
+                $my_image.= "</a>\n";
+                $my_image.= '<a href="' .api_get_self(). '?action=delete&blog_id=' . $info_log[3] . '" ';
+                $my_image.= 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;" >';
                                 $my_image.= Display::return_icon('delete.png', get_lang('DeleteBlog'));
 
-				$my_image.= "</a>\n";
-				$my_image.= '<a href="' .api_get_self(). '?action=visibility&blog_id=' . $info_log[3] . '">';
+                $my_image.= "</a>\n";
+                $my_image.= '<a href="' .api_get_self(). '?action=visibility&blog_id=' . $info_log[3] . '">';
                                 $my_image.= Display::return_icon($visibility_icon . '.gif', get_lang($visibility_info));
 
-				$my_image.= "</a>\n";
+                $my_image.= "</a>\n";
 
-				$list_body_blog[]=$my_image;
+                $list_body_blog[]=$my_image;
 
-				$list_content_blog[]=$list_body_blog;
-				$list_body_blog = array();
+                $list_content_blog[]=$list_body_blog;
+                $list_body_blog = array();
 
-			}
-			$parameters='';
-			//$parameters=array('action'=>Security::remove_XSS($_GET['action']));
-			$table = new SortableTableFromArrayConfig($list_content_blog, 1,20,'project');
-			//$table->set_additional_parameters($parameters);
-			$table->set_header(0, get_lang('Title'));
-			$table->set_header(1, get_lang('SubTitle'));
-			$table->set_header(2, get_lang('Modify'));
-			$table->display();
-		}
-	}
+            }
+            $parameters='';
+            //$parameters=array('action'=>Security::remove_XSS($_GET['action']));
+            $table = new SortableTableFromArrayConfig($list_content_blog, 1,20,'project');
+            //$table->set_additional_parameters($parameters);
+            $table->set_header(0, get_lang('Title'));
+            $table->set_header(1, get_lang('SubTitle'));
+            $table->set_header(2, get_lang('Modify'));
+            $table->display();
+        }
+    }
 }
 
 /**
@@ -2607,34 +2606,34 @@ 
  */
 function get_blog_attachment($blog_id, $post_id=null,$comment_id=null)
 {
-	$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
-
-	$blog_id = intval($blog_id);
-	$comment_id = intval($comment_id);
-	$post_id = intval($post_id);
-	$row=array();
-	$where='';
-	if (!empty ($post_id) && is_numeric($post_id)) {
-		$where.=' AND post_id ="'.$post_id.'" ';
-	}
-
-	if (!empty ($comment_id) && is_numeric($comment_id)) {
-		if (!empty ($post_id)) {
-			$where.= ' AND ';
-		}
-		$where.=' comment_id ="'.$comment_id.'" ';
-	}
+    $blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+
+    $blog_id = intval($blog_id);
+    $comment_id = intval($comment_id);
+    $post_id = intval($post_id);
+    $row=array();
+    $where='';
+    if (!empty ($post_id) && is_numeric($post_id)) {
+        $where.=' AND post_id ="'.$post_id.'" ';
+    }
+
+    if (!empty ($comment_id) && is_numeric($comment_id)) {
+        if (!empty ($post_id)) {
+            $where.= ' AND ';
+        }
+        $where.=' comment_id ="'.$comment_id.'" ';
+    }
 
     $course_id = api_get_course_int_id();
 
-	$sql = 'SELECT path, filename, comment FROM '. $blog_table_attachment.'
+    $sql = 'SELECT path, filename, comment FROM '. $blog_table_attachment.'
 	        WHERE c_id = '.$course_id.' AND blog_id ="'.intval($blog_id).'"  '.$where;
 
-	$result=Database::query($sql);
-	if (Database::num_rows($result)!=0) {
-		$row=Database::fetch_array($result);
-	}
-	return $row;
+    $result=Database::query($sql);
+    if (Database::num_rows($result)!=0) {
+        $row=Database::fetch_array($result);
+    }
+    return $row;
 }
 
 /**
@@ -2648,16 +2647,16 @@ 
 
 function delete_all_blog_attachment($blog_id,$post_id=null,$comment_id=null)
 {
-	$_course = api_get_course_info();
-	$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
-	$blog_id = intval($blog_id);
-	$comment_id = intval($comment_id);
-	$post_id = intval($post_id);
+    $_course = api_get_course_info();
+    $blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+    $blog_id = intval($blog_id);
+    $comment_id = intval($comment_id);
+    $post_id = intval($post_id);
 
     $course_id = api_get_course_int_id();
-	$where = null;
+    $where = null;
 
-	// delete files in DB
+    // delete files in DB
     if (!empty ($post_id) && is_numeric($post_id)) {
         $where .= ' AND post_id ="'.$post_id.'" ';
     }
@@ -2669,25 +2668,25 @@ 
         $where .= ' comment_id ="'.$comment_id.'" ';
     }
 
-	// delete all files in directory
-	$courseDir   = $_course['path'].'/upload/blog';
-	$sys_course_path = api_get_path(SYS_COURSE_PATH);
-	$updir = $sys_course_path.$courseDir;
+    // delete all files in directory
+    $courseDir   = $_course['path'].'/upload/blog';
+    $sys_course_path = api_get_path(SYS_COURSE_PATH);
+    $updir = $sys_course_path.$courseDir;
 
-	$sql = 'SELECT path FROM '.$blog_table_attachment.'
+    $sql = 'SELECT path FROM '.$blog_table_attachment.'
 	        WHERE c_id = '.$course_id.' AND blog_id ="'.intval($blog_id).'"  '.$where;
-	$result=Database::query($sql);
-
-	while ($row=Database::fetch_row($result)) {
-		$file=$updir.'/'.$row[0];
-		if (Security::check_abs_path($file,$updir) )
-		{
-			@ unlink($file);
-		}
-	}
-	$sql = 'DELETE FROM '. $blog_table_attachment.'
+    $result=Database::query($sql);
+
+    while ($row=Database::fetch_row($result)) {
+        $file=$updir.'/'.$row[0];
+        if (Security::check_abs_path($file,$updir) )
+        {
+            @ unlink($file);
+        }
+    }
+    $sql = 'DELETE FROM '. $blog_table_attachment.'
 	        WHERE c_id = '.$course_id.' AND  blog_id ="'.intval($blog_id).'"  '.$where;
-	Database::query($sql);
+    Database::query($sql);
 }
 
 /**
@@ -2697,12 +2696,12 @@ 
  */
 function get_blog_post_from_user($course_code, $user_id)
 {
-	$tbl_blogs 		= Database::get_course_table(TABLE_BLOGS);
-	$tbl_blog_post 	= Database::get_course_table(TABLE_BLOGS_POSTS);
-	$course_info 	= api_get_course_info($course_code);
-	$course_id 		= $course_info['real_id'];
+    $tbl_blogs 		= Database::get_course_table(TABLE_BLOGS);
+    $tbl_blog_post 	= Database::get_course_table(TABLE_BLOGS_POSTS);
+    $course_info 	= api_get_course_info($course_code);
+    $course_id 		= $course_info['real_id'];
 
-	$sql = "SELECT DISTINCT blog.blog_id, post_id, title, full_text, post.date_creation
+    $sql = "SELECT DISTINCT blog.blog_id, post_id, title, full_text, post.date_creation
 			FROM $tbl_blogs blog
 			INNER JOIN  $tbl_blog_post post
 			ON (blog.blog_id = post.blog_id)
@@ -2711,19 +2710,19 @@ 
 				post.c_id = $course_id AND
 				author_id =  $user_id AND visibility = 1
 			ORDER BY post.date_creation DESC ";
-	$result = Database::query($sql);
-	$return_data = '';
-
-	if (Database::num_rows($result)!=0) {
-		while ($row=Database::fetch_array($result)) {
-			$return_data.=  '<div class="clear"></div><br />';
-			$return_data.=  '<div class="actions" style="margin-left:5px;margin-right:5px;">'.Display::return_icon('blog_article.png',get_lang('BlogPosts')).' '.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.$my_course_id.' " >'.get_lang('SeeBlog').'</a></div></div>';
-			$return_data.=  '<br / >';
-			$return_data.= $row['full_text'];
-			$return_data.= '<br /><br />';
-		}
-	}
-	return $return_data;
+    $result = Database::query($sql);
+    $return_data = '';
+
+    if (Database::num_rows($result)!=0) {
+        while ($row=Database::fetch_array($result)) {
+            $return_data.=  '<div class="clear"></div><br />';
+            $return_data.=  '<div class="actions" style="margin-left:5px;margin-right:5px;">'.Display::return_icon('blog_article.png',get_lang('BlogPosts')).' '.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.$my_course_id.' " >'.get_lang('SeeBlog').'</a></div></div>';
+            $return_data.=  '<br / >';
+            $return_data.= $row['full_text'];
+            $return_data.= '<br /><br />';
+        }
+    }
+    return $return_data;
 }
 
 /**
@@ -2740,7 +2739,7 @@ 
     $course_info = api_get_course_info($course_code);
     $course_id = $course_info['real_id'];
 
-	$sql = "SELECT DISTINCT blog.blog_id, comment_id, title, comment, comment.date_creation
+    $sql = "SELECT DISTINCT blog.blog_id, comment_id, title, comment, comment.date_creation
 			FROM $tbl_blogs blog INNER JOIN  $tbl_blog_comment comment
 			ON (blog.blog_id = comment.blog_id)
 			WHERE 	blog.c_id = $course_id AND
@@ -2748,18 +2747,18 @@ 
 					author_id =  $user_id AND
 					visibility = 1
 			ORDER BY blog_name";
-	$result = Database::query($sql);
-	$return_data = '';
-	if (Database::num_rows($result)!=0) {
-		while ($row=Database::fetch_array($result)) {
-			$return_data.=  '<div class="clear"></div><br />';
-			$return_data.=  '<div class="actions" style="margin-left:5px;margin-right:5px;">'.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.Security::remove_XSS($course_code).' " >'.get_lang('SeeBlog').'</a></div></div>';
-			$return_data.=  '<br / >';
-			//$return_data.=  '<strong>'.$row['title'].'</strong>'; echo '<br>';*/
-			$return_data.=  $row['comment'];
-			$return_data.=  '<br />';
-		}
-	}
-	return $return_data;
+    $result = Database::query($sql);
+    $return_data = '';
+    if (Database::num_rows($result)!=0) {
+        while ($row=Database::fetch_array($result)) {
+            $return_data.=  '<div class="clear"></div><br />';
+            $return_data.=  '<div class="actions" style="margin-left:5px;margin-right:5px;">'.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.Security::remove_XSS($course_code).' " >'.get_lang('SeeBlog').'</a></div></div>';
+            $return_data.=  '<br / >';
+            //$return_data.=  '<strong>'.$row['title'].'</strong>'; echo '<br>';*/
+            $return_data.=  $row['comment'];
+            $return_data.=  '<br />';
+        }
+    }
+    return $return_data;
 }
 

Spacing +400 added lines, -400 removed lines

@@ -21,7 +21,7 @@ 
 	 *
 	 * @return String Blog Title
 	 */
-	public static function get_blog_title ($blog_id)
+	public static function get_blog_title($blog_id)
 	{
 	    $course_id = api_get_course_int_id();
 
@@ -30,8 +30,8 @@ 
 			$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
 
 			$sql = "SELECT blog_name
-					FROM " . $tbl_blogs . "
-					WHERE c_id = $course_id AND blog_id = " . intval($blog_id);
+					FROM " . $tbl_blogs."
+					WHERE c_id = $course_id AND blog_id = ".intval($blog_id);
 
 			$result = Database::query($sql);
 			$blog = Database::fetch_array($result);
@@ -78,15 +78,15 @@ 
 
 		// Get blog members
 		$sql = "SELECT user.user_id, user.firstname, user.lastname
-				FROM " . $tbl_blogs_rel_user . " blogs_rel_user
-				INNER JOIN " . $tbl_users . " user
+				FROM " . $tbl_blogs_rel_user." blogs_rel_user
+				INNER JOIN " . $tbl_users." user
 				ON blogs_rel_user.user_id = user.user_id
 				WHERE
 				    blogs_rel_user.c_id = $course_id AND
-					blogs_rel_user.blog_id = '" . (int)$blog_id."'";
+					blogs_rel_user.blog_id = '".(int) $blog_id."'";
 		$result = Database::query($sql);
-		$blog_members = array ();
-		while($user = Database::fetch_array($result)) {
+		$blog_members = array();
+		while ($user = Database::fetch_array($result)) {
 			$blog_members[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
 		}
 
@@ -105,7 +105,7 @@ 
 		$_user = api_get_user_info();
         $course_id = api_get_course_int_id();
 
-		$current_date=date('Y-m-d H:i:s',time());
+		$current_date = date('Y-m-d H:i:s', time());
 		$session_id = api_get_session_id();
 		// Tabel definitions
         $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
@@ -130,7 +130,7 @@ 
                 'blog_name' => $title,
                 'blog_subtitle' =>  $subtitle,
                 'date_creation' => $current_date,
-                'visibility' => 1 ,
+                'visibility' => 1,
                 'session_id' => $session_id,
             ];
 			$this_blog_id = Database::insert($tbl_blogs, $params);
@@ -169,7 +169,7 @@ 
 
 			// Put it on course homepage
 			$sql = "INSERT INTO $tbl_tool (c_id, name, link, image, visibility, admin, address, added_tool, session_id)
-					VALUES ($course_id, '".Database::escape_string($title)."','blog/blog.php?blog_id=".(int)$this_blog_id."','blog.gif','1','0','pastillegris.gif',0,'$session_id')";
+					VALUES ($course_id, '".Database::escape_string($title)."','blog/blog.php?blog_id=".(int) $this_blog_id."','blog.gif','1','0','pastillegris.gif',0,'$session_id')";
 			Database::query($sql);
 
             $toolId = Database::insert_id();
@@ -204,7 +204,7 @@ 
 		        blog_subtitle = '".Database::escape_string($subtitle)."'
 		        WHERE
 		            c_id = $course_id AND
-		            blog_id ='".Database::escape_string((int)$blog_id)."'
+		            blog_id ='".Database::escape_string((int) $blog_id)."'
                 LIMIT 1";
 		Database::query($sql);
 
@@ -220,7 +220,7 @@ 
 		// Update course homepage link
 		$sql = "UPDATE $tbl_tool SET
 		        name = '".Database::escape_string($title)."'
-		        WHERE c_id = $course_id AND link = 'blog/blog.php?blog_id=".(int)$blog_id."' LIMIT 1";
+		        WHERE c_id = $course_id AND link = 'blog/blog.php?blog_id=".(int) $blog_id."' LIMIT 1";
 		Database::query($sql);
 	}
 
@@ -263,7 +263,7 @@ 
 		Database::query($sql);
 
 		// Delete blog
-		$sql ="DELETE FROM $tbl_blogs WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
+		$sql = "DELETE FROM $tbl_blogs WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
 		Database::query($sql);
 
 		// Delete from course homepage
@@ -294,13 +294,13 @@ 
 		$course_id = $_course['real_id'];
 
 		$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
-		$upload_ok=true;
-		$has_attachment=false;
+		$upload_ok = true;
+		$has_attachment = false;
 		$current_date = api_get_utc_datetime();
 
 		if (!empty($_FILES['user_upload']['name'])) {
 			$upload_ok = process_uploaded_file($_FILES['user_upload']);
-			$has_attachment=true;
+			$has_attachment = true;
 		}
 
 		if ($upload_ok) {
@@ -309,7 +309,7 @@ 
 
 			// Create the post
 			$sql = "INSERT INTO $tbl_blogs_posts (c_id, title, full_text, date_creation, blog_id, author_id )
-					VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($full_text)."','".$current_date."', '".(int)$blog_id."', '".(int)$_user['user_id']."');";
+					VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($full_text)."','".$current_date."', '".(int) $blog_id."', '".(int) $_user['user_id']."');";
 
 			Database::query($sql);
 			$last_post_id = Database::insert_id();
@@ -320,7 +320,7 @@ 
             }
 
 			if ($has_attachment) {
-				$courseDir   = $_course['path'].'/upload/blog';
+				$courseDir = $_course['path'].'/upload/blog';
 				$sys_course_path = api_get_path(SYS_COURSE_PATH);
 				$updir = $sys_course_path.$courseDir;
 
@@ -371,9 +371,9 @@ 
 
 		// Create the post
 		$sql = "UPDATE $tbl_blogs_posts SET
-		        title = '" . Database::escape_string($title)."',
+		        title = '".Database::escape_string($title)."',
 		        full_text = '" . Database::escape_string($full_text)."'
-		        WHERE c_id = $course_id AND post_id ='".(int)$post_id."' AND blog_id ='".(int)$blog_id."'
+		        WHERE c_id = $course_id AND post_id ='".(int) $post_id."' AND blog_id ='".(int) $blog_id."'
 		        LIMIT 1 ";
 		Database::query($sql);
 	}
@@ -394,21 +394,21 @@ 
 
 		// Delete ratings on this comment
 		$sql = "DELETE FROM $tbl_blogs_rating
-				WHERE c_id = $course_id AND blog_id = '".(int)$blog_id."' AND item_id = '".(int)$post_id."' AND rating_type = 'post'";
+				WHERE c_id = $course_id AND blog_id = '".(int) $blog_id."' AND item_id = '".(int) $post_id."' AND rating_type = 'post'";
 		Database::query($sql);
 
 		// Delete the post
 		$sql = "DELETE FROM $tbl_blogs_posts
-				WHERE c_id = $course_id AND post_id = '".(int)$post_id."'";
+				WHERE c_id = $course_id AND post_id = '".(int) $post_id."'";
 		Database::query($sql);
 
 		// Delete the comments
 		$sql = "DELETE FROM $tbl_blogs_comments
-				WHERE c_id = $course_id AND post_id = '".(int)$post_id."' AND blog_id = '".(int)$blog_id."'";
+				WHERE c_id = $course_id AND post_id = '".(int) $post_id."' AND blog_id = '".(int) $blog_id."'";
 		Database::query($sql);
 
 		// Delete posts and attachments
-		delete_all_blog_attachment($blog_id,$post_id);
+		delete_all_blog_attachment($blog_id, $post_id);
 	}
 
 	/**
@@ -424,7 +424,7 @@ 
 	{
 		$_user = api_get_user_info();
 		$_course = api_get_course_info();
-        $blog_table_attachment 	= Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+        $blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
 
         $upload_ok = true;
         $has_attachment = false;
@@ -433,7 +433,7 @@ 
 
 		if (!empty($_FILES['user_upload']['name'])) {
 			$upload_ok = process_uploaded_file($_FILES['user_upload']);
-			$has_attachment=true;
+			$has_attachment = true;
 		}
 
 		if ($upload_ok) {
@@ -442,7 +442,7 @@ 
 
 			// Create the comment
 			$sql = "INSERT INTO $tbl_blogs_comments (c_id, title, comment, author_id, date_creation, blog_id, post_id, parent_comment_id, task_id )
-					VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($full_text)."', '".(int)$_user['user_id']."','".$current_date."', '".(int)$blog_id."', '".(int)$post_id."', '".(int)$parent_id."', '".(int)$task_id."')";
+					VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($full_text)."', '".(int) $_user['user_id']."','".$current_date."', '".(int) $blog_id."', '".(int) $post_id."', '".(int) $parent_id."', '".(int) $task_id."')";
 			Database::query($sql);
 
 			// Empty post values, or they are shown on the page again
@@ -454,7 +454,7 @@ 
             }
 
 			if ($has_attachment) {
-				$courseDir   = $_course['path'].'/upload/blog';
+				$courseDir = $_course['path'].'/upload/blog';
 				$sys_course_path = api_get_path(SYS_COURSE_PATH);
 				$updir = $sys_course_path.$courseDir;
 
@@ -465,19 +465,19 @@ 
 				);
 
 				// user's file name
-				$file_name =$_FILES['user_upload']['name'];
+				$file_name = $_FILES['user_upload']['name'];
 
 				if (!filter_extension($new_file_name)) {
 					Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
 				} else {
 					$new_file_name = uniqid('');
-					$new_path=$updir.'/'.$new_file_name;
-					$result= @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
+					$new_path = $updir.'/'.$new_file_name;
+					$result = @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
 					$comment = Database::escape_string($file_comment);
 
 					// Storing the attachments if any
 					if ($result) {
-						$sql='INSERT INTO '.$blog_table_attachment.'(c_id, filename,comment, path, post_id,size,blog_id,comment_id) '.
+						$sql = 'INSERT INTO '.$blog_table_attachment.'(c_id, filename,comment, path, post_id,size,blog_id,comment_id) '.
 							 "VALUES ($course_id, '".Database::escape_string($file_name)."', '".$comment."', '".Database::escape_string($new_file_name)."' , '".$post_id."', '".$_FILES['user_upload']['size']."',  '".$blog_id."', '".$last_id."'  )";
 						Database::query($sql);
 
@@ -526,7 +526,7 @@ 
 
 		// Delete them recursively
 		while ($comment = Database::fetch_array($result)) {
-			Blog::delete_comment($blog_id,$post_id,$comment['comment_id']);
+			Blog::delete_comment($blog_id, $post_id, $comment['comment_id']);
 		}
 
 		// Finally, delete the selected comment to
@@ -553,7 +553,7 @@ 
 
 		// Create the task
 		$sql = "INSERT INTO $tbl_blogs_tasks (c_id, blog_id, title, description, color, system_task)
-				VALUES ($course_id , '".(int)$blog_id."', '" . Database::escape_string($title)."', '" . Database::escape_string($description)."', '" . Database::escape_string($color)."', '0');";
+				VALUES ($course_id , '".(int) $blog_id."', '".Database::escape_string($title)."', '".Database::escape_string($description)."', '".Database::escape_string($color)."', '0');";
 		Database::query($sql);
 
 		$task_id = Database::insert_id();
@@ -563,13 +563,13 @@ 
             Database::query($sql);
         }
 
-		$tool = 'BLOG_' . $blog_id;
+		$tool = 'BLOG_'.$blog_id;
 
 		if ($articleDelete == 'on') {
-			$sql = " INSERT INTO " . $tbl_tasks_permissions . " ( c_id,  task_id, tool, action) VALUES (
-					'" . (int)$course_id . "',
-					'" . (int)$task_id . "',
-					'" . Database::escape_string($tool) . "',
+			$sql = " INSERT INTO ".$tbl_tasks_permissions." ( c_id,  task_id, tool, action) VALUES (
+					'" . (int) $course_id."',
+					'" . (int) $task_id."',
+					'" . Database::escape_string($tool)."',
 					'article_delete'
 				)";
 			Database::query($sql);
@@ -584,10 +584,10 @@ 
 
 		if ($articleEdit == 'on') {
 			$sql = "
-				INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action ) VALUES (
-					'" . (int)$course_id . "',
-					'" . (int)$task_id . "',
-					'" . Database::escape_string($tool) . "',
+				INSERT INTO " . $tbl_tasks_permissions." (c_id, task_id, tool, action ) VALUES (
+					'" . (int) $course_id."',
+					'" . (int) $task_id."',
+					'" . Database::escape_string($tool)."',
 					'article_edit'
 				)";
 			Database::query($sql);
@@ -601,10 +601,10 @@ 
 
 		if ($commentsDelete == 'on') {
 			$sql = "
-				INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action ) VALUES (
-					'" . (int)$course_id . "',
-					'" . (int)$task_id . "',
-					'" . Database::escape_string($tool) . "',
+				INSERT INTO " . $tbl_tasks_permissions." (c_id, task_id, tool, action ) VALUES (
+					'" . (int) $course_id."',
+					'" . (int) $task_id."',
+					'" . Database::escape_string($tool)."',
 					'article_comments_delete'
 				)";
 			Database::query($sql);
@@ -637,20 +637,20 @@ 
 					title = '".Database::escape_string($title)."',
 					description = '".Database::escape_string($description)."',
 					color = '".Database::escape_string($color)."'
-				WHERE c_id = $course_id AND task_id ='".(int)$task_id."' LIMIT 1";
+				WHERE c_id = $course_id AND task_id ='".(int) $task_id."' LIMIT 1";
 		Database::query($sql);
 
-		$tool = 'BLOG_' . $blog_id;
+		$tool = 'BLOG_'.$blog_id;
 
-		$sql = "DELETE FROM " . $tbl_tasks_permissions . "
-				WHERE c_id = $course_id AND task_id = '" . (int)$task_id."'";
+		$sql = "DELETE FROM ".$tbl_tasks_permissions."
+				WHERE c_id = $course_id AND task_id = '".(int) $task_id."'";
 		Database::query($sql);
 
 		if ($articleDelete == 'on') {
-			$sql = "INSERT INTO " . $tbl_tasks_permissions . " ( c_id, task_id, tool, action) VALUES (
-					'" . (int)$course_id . "',
-					'" . (int)$task_id . "',
-					'" . Database::escape_string($tool) . "',
+			$sql = "INSERT INTO ".$tbl_tasks_permissions." ( c_id, task_id, tool, action) VALUES (
+					'" . (int) $course_id."',
+					'" . (int) $task_id."',
+					'" . Database::escape_string($tool)."',
 					'article_delete'
 				)";
 			Database::query($sql);
@@ -663,10 +663,10 @@ 
 		}
 
 		if ($articleEdit == 'on') {
-			$sql = "INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action) VALUES (
-					'" . (int)$course_id . "',
-					'" . (int)$task_id . "',
-					'" . Database::escape_string($tool) . "',
+			$sql = "INSERT INTO ".$tbl_tasks_permissions." (c_id, task_id, tool, action) VALUES (
+					'" . (int) $course_id."',
+					'" . (int) $task_id."',
+					'" . Database::escape_string($tool)."',
 					'article_edit'
 				)";
 			Database::query($sql);
@@ -679,10 +679,10 @@ 
 		}
 
 		if ($commentsDelete == 'on') {
-			$sql = " INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action) VALUES (
-					'" . (int)$course_id . "',
-					'" . (int)$task_id . "',
-					'" . Database::escape_string($tool) . "',
+			$sql = " INSERT INTO ".$tbl_tasks_permissions." (c_id, task_id, tool, action) VALUES (
+					'" . (int) $course_id."',
+					'" . (int) $task_id."',
+					'" . Database::escape_string($tool)."',
 					'article_comments_delete'
 				)";
 			Database::query($sql);
@@ -707,7 +707,7 @@ 
 
 		// Delete posts
 		$sql = "DELETE FROM $tbl_blogs_tasks
-				WHERE c_id = $course_id AND blog_id = '".(int)$blog_id."' AND task_id = '".(int)$task_id."'";
+				WHERE c_id = $course_id AND blog_id = '".(int) $blog_id."' AND task_id = '".(int) $task_id."'";
 		Database::query($sql);
 	}
 
@@ -725,9 +725,9 @@ 
 		$sql = "DELETE FROM $tbl_blogs_tasks_rel_user
 				WHERE
 				    c_id = $course_id AND
-				    blog_id = '".(int)$blog_id."' AND
-				    task_id = '".(int)$task_id."' AND
-				    user_id = '".(int)$user_id."'";
+				    blog_id = '".(int) $blog_id."' AND
+				    task_id = '".(int) $task_id."' AND
+				    user_id = '".(int) $user_id."'";
 		Database::query($sql);
 	}
 
@@ -741,7 +741,7 @@ 
 		$_user = api_get_user_info();
 
 		$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
-		$tbl_blogs_tasks_rel_user 	= Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+		$tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
 		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
 
 		$course_id = api_get_course_int_id();
@@ -758,7 +758,7 @@ 
                         task.c_id = $course_id AND
                         blog.c_id = $course_id AND
                         task_rel_user.c_id = $course_id AND
-                        task_rel_user.user_id = ".(int)$_user['user_id']."
+                        task_rel_user.user_id = ".(int) $_user['user_id']."
                     ORDER BY target_date ASC";
 
 			$result = Database::query($sql);
@@ -766,7 +766,7 @@ 
 			if (Database::num_rows($result) > 0) {
 				echo '<ul>';
 				while ($mytask = Database::fetch_array($result)) {
-					echo '<li><a href="blog.php?action=execute_task&blog_id=' . $mytask['blog_id'] . '&task_id='.stripslashes($mytask['task_id']) . '" title="[Blog: '.stripslashes($mytask['blog_name']) . '] ' . get_lang('ExecuteThisTask') . '">'.stripslashes($mytask['title']) . '</a></li>';
+					echo '<li><a href="blog.php?action=execute_task&blog_id='.$mytask['blog_id'].'&task_id='.stripslashes($mytask['task_id']).'" title="[Blog: '.stripslashes($mytask['blog_name']).'] '.get_lang('ExecuteThisTask').'">'.stripslashes($mytask['title']).'</a></li>';
 				}
 				echo '<ul>';
 			} else {
@@ -790,7 +790,7 @@ 
 
 		// Get blog properties
 		$sql = "SELECT blog_name, visibility FROM $tbl_blogs
-				WHERE c_id = $course_id AND blog_id='".(int)$blog_id."'";
+				WHERE c_id = $course_id AND blog_id='".(int) $blog_id."'";
 		$result = Database::query($sql);
 		$blog = Database::fetch_array($result);
 		$visibility = $blog['visibility'];
@@ -799,7 +799,7 @@ 
 		if ($visibility == 1) {
 			// Change visibility state, remove from course home.
 			$sql = "UPDATE $tbl_blogs SET visibility = '0'
-					WHERE c_id = $course_id AND blog_id ='".(int)$blog_id."' LIMIT 1";
+					WHERE c_id = $course_id AND blog_id ='".(int) $blog_id."' LIMIT 1";
 			Database::query($sql);
 
 			$sql = "DELETE FROM $tbl_tool
@@ -808,11 +808,11 @@ 
 		} else {
 			// Change visibility state, add to course home.
 			$sql = "UPDATE $tbl_blogs SET visibility = '1'
-					WHERE c_id = $course_id AND blog_id ='".(int)$blog_id."' LIMIT 1";
+					WHERE c_id = $course_id AND blog_id ='".(int) $blog_id."' LIMIT 1";
 			Database::query($sql);
 
 			$sql = "INSERT INTO $tbl_tool (c_id, name, link, image, visibility, admin, address, added_tool, target )
-					VALUES ($course_id, '".Database::escape_string($title)."', 'blog/blog.php?blog_id=".(int)$blog_id."', 'blog.gif', '1', '0', 'pastillegris.gif', '0', '_self')";
+					VALUES ($course_id, '".Database::escape_string($title)."', 'blog/blog.php?blog_id=".(int) $blog_id."', 'blog.gif', '1', '0', 'pastillegris.gif', '0', '_self')";
 			Database::query($sql);
             $id = Database::insert_id();
 
@@ -843,14 +843,14 @@ 
 		        FROM $tbl_blogs_posts post
                 INNER JOIN $tbl_users user
                 ON post.author_id = user.user_id
-				WHERE 	post.blog_id = '".(int)$blog_id."' AND
+				WHERE 	post.blog_id = '".(int) $blog_id."' AND
 						post.c_id = $course_id AND
 						$filter
-				ORDER BY post_id DESC LIMIT 0,".(int)$max_number_of_posts;
+				ORDER BY post_id DESC LIMIT 0,".(int) $max_number_of_posts;
 		$result = Database::query($sql);
 
 		// Display
-		if(Database::num_rows($result) > 0) {
+		if (Database::num_rows($result) > 0) {
 		    $limit = 200;
 			while ($blog_post = Database::fetch_array($result)) {
 				// Get number of comments
@@ -858,8 +858,8 @@ 
 						FROM $tbl_blogs_comments
 						WHERE
 						    c_id = $course_id AND
-						    blog_id = '".(int)$blog_id."' AND
-						    post_id = '" . (int)$blog_post['post_id']."'";
+						    blog_id = '".(int) $blog_id."' AND
+						    post_id = '" . (int) $blog_post['post_id']."'";
 				$tmp = Database::query($sql);
 				$blog_post_comments = Database::fetch_array($tmp);
 
@@ -870,11 +870,11 @@ 
 
 				// Create an introduction text (but keep FULL sentences)
 				$words = 0;
-				$blog_post_text_cut = cut($blog_post_text, $limit) ;
+				$blog_post_text_cut = cut($blog_post_text, $limit);
 				$words = strlen($blog_post_text);
 
 				if ($words >= $limit) {
-					$readMoreLink = ' <div class="link" onclick="document.getElementById(\'blogpost_text_' . $blog_post_id . '\').style.display=\'block\'; document.getElementById(\'blogpost_introduction_' . $blog_post_id . '\').style.display=\'none\'">' . get_lang('ReadMore') . '</div>';
+					$readMoreLink = ' <div class="link" onclick="document.getElementById(\'blogpost_text_'.$blog_post_id.'\').style.display=\'block\'; document.getElementById(\'blogpost_introduction_'.$blog_post_id.'\').style.display=\'none\'">'.get_lang('ReadMore').'</div>';
 					$introduction_text = $blog_post_text_cut;
 				} else {
 				    $introduction_text = $blog_post_text;
@@ -884,27 +884,27 @@ 
 				$introduction_text = stripslashes($introduction_text);
 
 				echo '<div class="blogpost">';
-				echo '<span class="blogpost_title"><a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >'.stripslashes($blog_post['title']) . '</a></span>';
-				echo '<span class="blogpost_date"><a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >' . $blog_post_date . '</a></span>';
-				echo '<div class="blogpost_introduction" id="blogpost_introduction_'.$blog_post_id.'">' . $introduction_text.$readMoreLink.'</div>';
-				echo '<div class="blogpost_text" id="blogpost_text_' . $blog_post_id . '" style="display: none">' . $blog_post_text . '</div>';
+				echo '<span class="blogpost_title"><a href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$blog_post['post_id'].'#add_comment" title="'.get_lang('ReadPost').'" >'.stripslashes($blog_post['title']).'</a></span>';
+				echo '<span class="blogpost_date"><a href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$blog_post['post_id'].'#add_comment" title="'.get_lang('ReadPost').'" >'.$blog_post_date.'</a></span>';
+				echo '<div class="blogpost_introduction" id="blogpost_introduction_'.$blog_post_id.'">'.$introduction_text.$readMoreLink.'</div>';
+				echo '<div class="blogpost_text" id="blogpost_text_'.$blog_post_id.'" style="display: none">'.$blog_post_text.'</div>';
 
-				$file_name_array = get_blog_attachment($blog_id,$blog_post_id,0);
+				$file_name_array = get_blog_attachment($blog_id, $blog_post_id, 0);
 
 				if (!empty($file_name_array)) {
 					echo '<br /><br />';
-					echo Display::return_icon('attachment.gif',get_lang('Attachment'));
+					echo Display::return_icon('attachment.gif', get_lang('Attachment'));
 					echo '<a href="download.php?file=';
 					echo $file_name_array['path'];
 					echo ' "> '.$file_name_array['filename'].' </a><br />';
 					echo '</span>';
 				}
 				$username = api_htmlentities(sprintf(get_lang('LoginX'), $blog_post['username']), ENT_QUOTES);
-				echo '<span class="blogpost_info">' . get_lang('Author') . ': ' . Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username)) .' - <a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >' . get_lang('Comments') . ': ' . $blog_post_comments['number_of_comments'] . '</a></span>';
+				echo '<span class="blogpost_info">'.get_lang('Author').': '.Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username)).' - <a href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$blog_post['post_id'].'#add_comment" title="'.get_lang('ReadPost').'" >'.get_lang('Comments').': '.$blog_post_comments['number_of_comments'].'</a></span>';
 				echo '</div>';
 			}
 		} else {
-			if($filter == '1=1') {
+			if ($filter == '1=1') {
 				echo get_lang('NoArticles');
 			} else {
 				echo get_lang('NoArticleMatches');
@@ -918,19 +918,19 @@ 
 	 * @param Integer $blog_id
 	 * @param String $query_string
 	 */
-	public static function display_search_results ($blog_id, $query_string)
+	public static function display_search_results($blog_id, $query_string)
 	{
 		// Init
 		$query_string = Database::escape_string($query_string);
-		$query_string_parts = explode(' ',$query_string);
+		$query_string_parts = explode(' ', $query_string);
 		$query_string = array();
 		foreach ($query_string_parts as $query_part) {
-			$query_string[] = " full_text LIKE '%" . $query_part."%' OR title LIKE '%" . $query_part."%' ";
+			$query_string[] = " full_text LIKE '%".$query_part."%' OR title LIKE '%".$query_part."%' ";
 		}
-		$query_string = '('.implode('OR',$query_string) . ')';
+		$query_string = '('.implode('OR', $query_string).')';
 
 		// Display the posts
-		echo '<span class="blogpost_title">' . get_lang('SearchResults') . '</span>';
+		echo '<span class="blogpost_title">'.get_lang('SearchResults').'</span>';
 		Blog::display_blog_posts($blog_id, $query_string);
 	}
 
@@ -943,14 +943,14 @@ 
 	public static function display_day_results($blog_id, $query_string)
 	{
 		$date_output = $query_string;
-		$date = explode('-',$query_string);
-		$query_string = ' DAYOFMONTH(date_creation) =' . intval($date[2]) . ' AND MONTH(date_creation) =' . intval($date[1]) . ' AND YEAR(date_creation) =' . intval($date[0]);
+		$date = explode('-', $query_string);
+		$query_string = ' DAYOFMONTH(date_creation) ='.intval($date[2]).' AND MONTH(date_creation) ='.intval($date[1]).' AND YEAR(date_creation) ='.intval($date[0]);
 
 		// Put date in correct output format
 		$date_output = api_format_date($date_output, DATE_FORMAT_LONG);
 
 		// Display the posts
-		echo '<span class="blogpost_title">' . get_lang('PostsOf') . ': ' . $date_output . '</span>';
+		echo '<span class="blogpost_title">'.get_lang('PostsOf').': '.$date_output.'</span>';
 		Blog::display_blog_posts($blog_id, $query_string);
 	}
 
@@ -977,8 +977,8 @@ 
 					ON post.author_id = user.user_id
                 WHERE
                     post.c_id = $course_id AND
-                    post.blog_id = '".(int)$blog_id."' AND
-                    post.post_id = '".(int)$post_id."'
+                    post.blog_id = '".(int) $blog_id."' AND
+                    post.post_id = '".(int) $post_id."'
                 ORDER BY post_id DESC";
 		$result = Database::query($sql);
 		$blog_post = Database::fetch_array($result);
@@ -986,7 +986,7 @@ 
 		// Get number of comments
 		$sql = "SELECT COUNT(1) as number_of_comments
 		        FROM $tbl_blogs_comments
-				WHERE c_id = $course_id AND blog_id = '".(int)$blog_id."' AND post_id = '".(int)$post_id."'";
+				WHERE c_id = $course_id AND blog_id = '".(int) $blog_id."' AND post_id = '".(int) $post_id."'";
 		$result = Database::query($sql);
 		$blog_post_comments = Database::fetch_array($result);
 
@@ -997,34 +997,34 @@ 
 
 		$task_id = (isset($_GET['task_id']) && is_numeric($_GET['task_id'])) ? intval($_GET['task_id']) : 0;
 
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_edit', $task_id)) {
-			$blog_post_actions .= '<a href="blog.php?action=edit_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('EditThisPost') . '">';
-			$blog_post_actions .=  Display::return_icon('edit.png');
+		if (api_is_allowed('BLOG_'.$blog_id, 'article_edit', $task_id)) {
+			$blog_post_actions .= '<a href="blog.php?action=edit_post&blog_id='.$blog_id.'&post_id='.$post_id.'&article_id='.$blog_post['post_id'].'&task_id='.$task_id.'" title="'.get_lang('EditThisPost').'">';
+			$blog_post_actions .= Display::return_icon('edit.png');
 			$blog_post_actions .= '</a>';
         }
 
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_delete', $task_id)) {
-			$blog_post_actions .= '<a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&do=delete_article&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('DeleteThisArticle') . '" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;">';
+		if (api_is_allowed('BLOG_'.$blog_id, 'article_delete', $task_id)) {
+			$blog_post_actions .= '<a href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$post_id.'&do=delete_article&article_id='.$blog_post['post_id'].'&task_id='.$task_id.'" title="'.get_lang('DeleteThisArticle').'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)).'\')) return false;">';
             $blog_post_actions .= Display::return_icon('delete.png');
             $blog_post_actions .= '</a>';
         }
 
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_rate'))
-			$rating_select = Blog::display_rating_form('post',$blog_id,$post_id);
+		if (api_is_allowed('BLOG_'.$blog_id, 'article_rate'))
+			$rating_select = Blog::display_rating_form('post', $blog_id, $post_id);
 
-		$blog_post_text=stripslashes($blog_post_text);
+		$blog_post_text = stripslashes($blog_post_text);
 
 		// Display post
 		echo '<div class="blogpost">';
-		echo '<span class="blogpost_title"><a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '" title="' . get_lang('ReadPost') . '" >'.stripslashes($blog_post['title']) . '</a></span>';
-		echo '<span class="blogpost_date">' . $blog_post_date . '</span>';
-		echo '<span class="blogpost_text">' . $blog_post_text . '</span><br />';
+		echo '<span class="blogpost_title"><a href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$blog_post['post_id'].'" title="'.get_lang('ReadPost').'" >'.stripslashes($blog_post['title']).'</a></span>';
+		echo '<span class="blogpost_date">'.$blog_post_date.'</span>';
+		echo '<span class="blogpost_text">'.$blog_post_text.'</span><br />';
 
 		$file_name_array = get_blog_attachment($blog_id, $post_id);
 
         if (!empty($file_name_array)) {
 			echo ' <br />';
-			echo Display::return_icon('attachment.gif',get_lang('Attachment'));
+			echo Display::return_icon('attachment.gif', get_lang('Attachment'));
 			echo '<a href="download.php?file=';
 			echo $file_name_array['path'];
 			echo ' "> '.$file_name_array['filename'].' </a>';
@@ -1035,20 +1035,20 @@ 
 			echo '<br />';
 		}
         $username = api_htmlentities(sprintf(get_lang('LoginX'), $blog_post['username']), ENT_QUOTES);
-		echo '<span class="blogpost_info">'.get_lang('Author').': ' .Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username)).' - '.get_lang('Comments').': '.$blog_post_comments['number_of_comments'].' - '.get_lang('Rating').': '.Blog::display_rating('post',$blog_id,$post_id).$rating_select.'</span>';
-		echo '<span class="blogpost_actions">' . $blog_post_actions . '</span>';
+		echo '<span class="blogpost_info">'.get_lang('Author').': '.Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username)).' - '.get_lang('Comments').': '.$blog_post_comments['number_of_comments'].' - '.get_lang('Rating').': '.Blog::display_rating('post', $blog_id, $post_id).$rating_select.'</span>';
+		echo '<span class="blogpost_actions">'.$blog_post_actions.'</span>';
 		echo '</div>';
 
 		// Display comments if there are any
-		if($blog_post_comments['number_of_comments'] > 0) {
+		if ($blog_post_comments['number_of_comments'] > 0) {
 			echo '<div class="comments">';
-				echo '<span class="blogpost_title">' . get_lang('Comments') . '</span><br />';
+				echo '<span class="blogpost_title">'.get_lang('Comments').'</span><br />';
 				Blog::get_threaded_comments(0, 0, $blog_id, $post_id, $task_id);
 			echo '</div>';
 		}
 
 		// Display comment form
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_comments_add')) {
+		if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_add')) {
 			Blog::display_new_comment_form($blog_id, $post_id, $blog_post['title']);
 		}
 	}
@@ -1076,16 +1076,16 @@ 
 		$sql = "SELECT rating_id FROM $tbl_blogs_rating
                 WHERE
                     c_id = $course_id AND
-                    blog_id = '".(int)$blog_id."' AND
-                    item_id = '".(int)$item_id."' AND
+                    blog_id = '".(int) $blog_id."' AND
+                    item_id = '".(int) $item_id."' AND
                     rating_type = '".Database::escape_string($type)."' AND
-                    user_id = '".(int)$_user['user_id']."'";
+                    user_id = '".(int) $_user['user_id']."'";
 		$result = Database::query($sql);
 
         // Add rating
 		if (Database::num_rows($result) == 0) {
 			$sql = "INSERT INTO $tbl_blogs_rating (c_id, blog_id, rating_type, item_id, user_id, rating )
-					VALUES ($course_id, '".(int)$blog_id."', '".Database::escape_string($type)."', '".(int)$item_id."', '".(int)$_user['user_id']."', '".Database::escape_string($rating)."')";
+					VALUES ($course_id, '".(int) $blog_id."', '".Database::escape_string($type)."', '".(int) $item_id."', '".(int) $_user['user_id']."', '".Database::escape_string($rating)."')";
 			Database::query($sql);
 
             $id = Database::insert_id();
@@ -1118,8 +1118,8 @@ 
 		$sql = "SELECT AVG(rating) as rating FROM $tbl_blogs_rating
 				WHERE
 				    c_id = $course_id AND
-				    blog_id = '".(int)$blog_id."' AND
-				    item_id = '".(int)$item_id."' AND
+				    blog_id = '".(int) $blog_id."' AND
+				    item_id = '".(int) $item_id."' AND
 				    rating_type = '".Database::escape_string($type)."' ";
 		$result = Database::query($sql);
 		$result = Database::fetch_array($result);
@@ -1136,7 +1136,7 @@ 
 	 *
 	 *@return String
 	 */
-	public static function display_rating_form ($type, $blog_id, $post_id, $comment_id = NULL)
+	public static function display_rating_form($type, $blog_id, $post_id, $comment_id = NULL)
 	{
 		$_user = api_get_user_info();
 		$tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
@@ -1146,14 +1146,14 @@ 
 			// Check if the user has already rated this post
 			$sql = "SELECT rating_id FROM $tbl_blogs_rating
 					WHERE c_id = $course_id AND
-					blog_id = '".(int)$blog_id."'
-					AND item_id = '".(int)$post_id."'
+					blog_id = '".(int) $blog_id."'
+					AND item_id = '".(int) $post_id."'
 					AND rating_type = '".Database::escape_string($type)."'
-					AND user_id = '".(int)$_user['user_id']."'";
+					AND user_id = '".(int) $_user['user_id']."'";
 			$result = Database::query($sql);
             // Add rating
             if (Database::num_rows($result) == 0) {
-				return ' - ' . get_lang('RateThis') . ': <form method="get" action="blog.php" style="display: inline" id="frm_rating_' . $type . '_' . $post_id . '" name="frm_rating_' . $type . '_' . $post_id . '"><select name="rating" onchange="document.forms[\'frm_rating_' . $type . '_' . $post_id . '\'].submit()"><option value="">-</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select><input type="hidden" name="action" value="view_post" /><input type="hidden" name="type" value="' . $type . '" /><input type="hidden" name="do" value="rate" /><input type="hidden" name="blog_id" value="' . $blog_id . '" /><input type="hidden" name="post_id" value="' . $post_id . '" /></form>';
+				return ' - '.get_lang('RateThis').': <form method="get" action="blog.php" style="display: inline" id="frm_rating_'.$type.'_'.$post_id.'" name="frm_rating_'.$type.'_'.$post_id.'"><select name="rating" onchange="document.forms[\'frm_rating_'.$type.'_'.$post_id.'\'].submit()"><option value="">-</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select><input type="hidden" name="action" value="view_post" /><input type="hidden" name="type" value="'.$type.'" /><input type="hidden" name="do" value="rate" /><input type="hidden" name="blog_id" value="'.$blog_id.'" /><input type="hidden" name="post_id" value="'.$post_id.'" /></form>';
             } else {
 				return '';
 			}
@@ -1162,14 +1162,14 @@ 
         if ($type = 'comment') {
 			// Check if the user has already rated this comment
 			$sql = "SELECT rating_id FROM $tbl_blogs_rating
-					WHERE c_id = $course_id AND blog_id = '".(int)$blog_id ."'
-					AND item_id = '".(int)$comment_id."'
+					WHERE c_id = $course_id AND blog_id = '".(int) $blog_id."'
+					AND item_id = '".(int) $comment_id."'
 					AND rating_type = '".Database::escape_string($type)."'
-					AND user_id = '".(int)$_user['user_id']."'";
+					AND user_id = '".(int) $_user['user_id']."'";
 			$result = Database::query($sql);
 
             if (Database::num_rows($result) == 0) {
-				return ' - ' . get_lang('RateThis') . ': <form method="get" action="blog.php" style="display: inline" id="frm_rating_' . $type . '_' . $comment_id . '" name="frm_rating_' . $type . '_' . $comment_id . '"><select name="rating" onchange="document.forms[\'frm_rating_' . $type . '_' . $comment_id . '\'].submit()"><option value="">-</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select><input type="hidden" name="action" value="view_post" /><input type="hidden" name="type" value="' . $type . '" /><input type="hidden" name="do" value="rate" /><input type="hidden" name="blog_id" value="' . $blog_id . '" /><input type="hidden" name="post_id" value="' . $post_id . '" /><input type="hidden" name="comment_id" value="' . $comment_id . '" /></form>';
+				return ' - '.get_lang('RateThis').': <form method="get" action="blog.php" style="display: inline" id="frm_rating_'.$type.'_'.$comment_id.'" name="frm_rating_'.$type.'_'.$comment_id.'"><select name="rating" onchange="document.forms[\'frm_rating_'.$type.'_'.$comment_id.'\'].submit()"><option value="">-</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select><input type="hidden" name="action" value="view_post" /><input type="hidden" name="type" value="'.$type.'" /><input type="hidden" name="do" value="rate" /><input type="hidden" name="blog_id" value="'.$blog_id.'" /><input type="hidden" name="post_id" value="'.$post_id.'" /><input type="hidden" name="comment_id" value="'.$comment_id.'" /></form>';
             } else {
 				return '';
 			}
@@ -1204,11 +1204,11 @@ 
                 WHERE
                     comments.c_id = $course_id AND
                     parent_comment_id = $current AND
-                    comments.blog_id = '".(int)$blog_id."' AND
-                    comments.post_id = '".(int)$post_id."'";
+                    comments.blog_id = '".(int) $blog_id."' AND
+                    comments.post_id = '".(int) $post_id."'";
 		$result = Database::query($sql);
 
-		while($comment = Database::fetch_array($result)) {
+		while ($comment = Database::fetch_array($result)) {
 			// Select the children recursivly
 			$tmp = "SELECT comments.*, user.lastname, user.firstname, user.username
 			        FROM $tbl_blogs_comments comments
@@ -1217,8 +1217,8 @@ 
 					WHERE
 						comments.c_id = $course_id AND
 						comment_id = $current
-						AND blog_id = '".(int)$blog_id."'
-						AND post_id = '".(int)$post_id."'";
+						AND blog_id = '".(int) $blog_id."'
+						AND post_id = '".(int) $post_id."'";
 			$tmp = Database::query($tmp);
 			$tmp = Database::fetch_array($tmp);
 			$parent_cat = $tmp['parent_comment_id'];
@@ -1243,22 +1243,22 @@ 
             }
 
 			if (!is_null($comment['task_id'])) {
-				$border_color = ' border-left: 3px solid #' . $comment['color'];
+				$border_color = ' border-left: 3px solid #'.$comment['color'];
 			}
 
 			$comment_text = stripslashes($comment_text);
 
 			// Output...
 			$margin = $current_level * 30;
-			echo '<div class="blogpost_comment" style="margin-left: ' . $margin . 'px;' . $border_color . '">';
-				echo '<span class="blogpost_comment_title"><a href="#add_comment" onclick="document.getElementById(\'comment_parent_id\').value=\'' . $comment['comment_id'] . '\'; document.getElementById(\'comment_title\').value=\'Re: '.addslashes($comment['title']) . '\'" title="' . get_lang('ReplyToThisComment') . '" >'.stripslashes($comment['title']) . '</a></span>';
-				echo '<span class="blogpost_comment_date">' . $blog_comment_date . '</span>';
-				echo '<span class="blogpost_text">' . $comment_text . '</span>';
+			echo '<div class="blogpost_comment" style="margin-left: '.$margin.'px;'.$border_color.'">';
+				echo '<span class="blogpost_comment_title"><a href="#add_comment" onclick="document.getElementById(\'comment_parent_id\').value=\''.$comment['comment_id'].'\'; document.getElementById(\'comment_title\').value=\'Re: '.addslashes($comment['title']).'\'" title="'.get_lang('ReplyToThisComment').'" >'.stripslashes($comment['title']).'</a></span>';
+				echo '<span class="blogpost_comment_date">'.$blog_comment_date.'</span>';
+				echo '<span class="blogpost_text">'.$comment_text.'</span>';
 
-				$file_name_array = get_blog_attachment($blog_id,$post_id, $comment['comment_id']);
+				$file_name_array = get_blog_attachment($blog_id, $post_id, $comment['comment_id']);
 				if (!empty($file_name_array)) {
 					echo '<br /><br />';
-					echo Display::return_icon('attachment.gif',get_lang('Attachment'));
+					echo Display::return_icon('attachment.gif', get_lang('Attachment'));
 					echo '<a href="download.php?file=';
 					echo $file_name_array['path'];
 					echo ' "> '.$file_name_array['filename'].' </a>';
@@ -1268,7 +1268,7 @@ 
 				}
                 $username = api_htmlentities(sprintf(get_lang('LoginX'), $comment['username']), ENT_QUOTES);
 				echo '<span class="blogpost_comment_info">'.get_lang('Author').': '.Display::tag('span', api_get_person_name($comment['firstname'], $comment['lastname']), array('title'=>$username)).' - '.get_lang('Rating').': '.Blog::display_rating('comment', $blog_id, $comment['comment_id']).$rating_select.'</span>';
-				echo '<span class="blogpost_actions">' . $blog_comment_actions . '</span>';
+				echo '<span class="blogpost_actions">'.$blog_comment_actions.'</span>';
 			echo '</div>';
 
 			// Go further down the tree.
@@ -1284,11 +1284,11 @@ 
 	 */
 	public static function display_form_new_post($blog_id)
 	{
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_add')) {
+		if (api_is_allowed('BLOG_'.$blog_id, 'article_add')) {
 			$form = new FormValidator(
 				'add_post',
 				'post',
-				api_get_path(WEB_CODE_PATH)."blog/blog.php?action=new_post&blog_id=" . $blog_id . "&" . api_get_cidreq(),
+				api_get_path(WEB_CODE_PATH)."blog/blog.php?action=new_post&blog_id=".$blog_id."&".api_get_cidreq(),
 				null,
 				array('enctype' => 'multipart/form-data')
 			);
@@ -1332,8 +1332,8 @@ 
 				INNER JOIN $tbl_users user ON post.author_id = user.user_id
 				WHERE
 				post.c_id 			= $course_id AND
-				post.blog_id 		= '".(int)$blog_id ."'
-				AND post.post_id	= '".(int)$post_id."'
+				post.blog_id 		= '".(int) $blog_id."'
+				AND post.post_id	= '".(int) $post_id."'
 				ORDER BY post_id DESC";
 		$result = Database::query($sql);
 		$blog_post = Database::fetch_array($result);
@@ -1342,7 +1342,7 @@ 
 		$form = new FormValidator(
 			'edit_post',
 			'post',
-			api_get_path(WEB_CODE_PATH).'blog/blog.php?action=edit_post&post_id=' . intval($_GET['post_id']) . '&blog_id=' . intval($blog_id) . '&article_id='.intval($_GET['article_id']).'&task_id='.intval($_GET['task_id'])
+			api_get_path(WEB_CODE_PATH).'blog/blog.php?action=edit_post&post_id='.intval($_GET['post_id']).'&blog_id='.intval($blog_id).'&article_id='.intval($_GET['article_id']).'&task_id='.intval($_GET['task_id'])
 		);
 
 		$form->addHeader(get_lang('EditPost'));
@@ -1374,31 +1374,31 @@ 
 		global $charset;
         $course_id = api_get_course_int_id();
 
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_add')) {
+		if (api_is_allowed('BLOG_'.$blog_id, 'article_add')) {
 			$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
 			$counter = 0;
 			global $color2;
 
 			echo '<div class="actions">';
-			echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=add">';
+			echo '<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$blog_id.'&do=add">';
             echo Display::return_icon('blog_newtasks.gif', get_lang('AddTasks'));
-            echo get_lang('AddTasks') . '</a> ';
-			echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=assign">';
+            echo get_lang('AddTasks').'</a> ';
+			echo '<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$blog_id.'&do=assign">';
             echo Display::return_icon('blog_task.gif', get_lang('AssignTasks'));
-            echo get_lang('AssignTasks') . '</a>';
+            echo get_lang('AssignTasks').'</a>';
 			?>
 				<a href="<?php echo api_get_self(); ?>?action=manage_rights&blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('ManageRights') ?>">
-                    <?php echo Display::return_icon('blog_admin_users.png', get_lang('RightsManager'),'',ICON_SIZE_SMALL). get_lang('RightsManager') ?></a>
+                    <?php echo Display::return_icon('blog_admin_users.png', get_lang('RightsManager'), '', ICON_SIZE_SMALL).get_lang('RightsManager') ?></a>
 			<?php
 			echo '</div>';
 
-			echo '<span class="blogpost_title">' . get_lang('TaskList') . '</span><br />';
+			echo '<span class="blogpost_title">'.get_lang('TaskList').'</span><br />';
 			echo "<table class=\"data_table\">";
 			echo	"<tr bgcolor=\"$color2\" align=\"center\" valign=\"top\">",
-					 "<th width='240'><b>",get_lang('Title'),"</b></th>\n",
-					 "<th><b>",get_lang('Description'),"</b></th>\n",
-					 "<th><b>",get_lang('Color'),"</b></th>\n",
-					 "<th width='50'><b>",get_lang('Modify'),"</b></th>\n",
+					 "<th width='240'><b>", get_lang('Title'), "</b></th>\n",
+					 "<th><b>", get_lang('Description'), "</b></th>\n",
+					 "<th><b>", get_lang('Color'), "</b></th>\n",
+					 "<th width='50'><b>", get_lang('Modify'), "</b></th>\n",
 				"</tr>\n";
 
 
@@ -1410,31 +1410,31 @@ 
                         description,
                         color,
                         system_task
-                    FROM " . $tbl_blogs_tasks . "
-                    WHERE c_id = $course_id AND blog_id = " . (int)$blog_id . "
+                    FROM " . $tbl_blogs_tasks."
+                    WHERE c_id = $course_id AND blog_id = ".(int) $blog_id."
                     ORDER BY system_task, title";
 			$result = Database::query($sql);
 
 
-			while($task = Database::fetch_array($result)) {
+			while ($task = Database::fetch_array($result)) {
 				$counter++;
 				$css_class = (($counter % 2) == 0) ? "row_odd" : "row_even";
 				$delete_icon = ($task['system_task'] == '1') ? "delete_na.gif" : "delete.gif";
 				$delete_title = ($task['system_task'] == '1') ? get_lang('DeleteSystemTask') : get_lang('DeleteTask');
-				$delete_link = ($task['system_task'] == '1') ? '#' : api_get_self() . '?action=manage_tasks&blog_id=' . $task['blog_id'] . '&do=delete&task_id=' . $task['task_id'];
-				$delete_confirm = ($task['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"';
+				$delete_link = ($task['system_task'] == '1') ? '#' : api_get_self().'?action=manage_tasks&blog_id='.$task['blog_id'].'&do=delete&task_id='.$task['task_id'];
+				$delete_confirm = ($task['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)).'\')) return false;"';
 
-				echo	'<tr class="' . $css_class . '" valign="top">',
-                         '<td width="240">' . Security::remove_XSS($task['title']) . '</td>',
-                         '<td>' . Security::remove_XSS($task['description']) . '</td>',
-                         '<td><span style="background-color: #' . $task['color'] . '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></td>',
+				echo	'<tr class="'.$css_class.'" valign="top">',
+                         '<td width="240">'.Security::remove_XSS($task['title']).'</td>',
+                         '<td>'.Security::remove_XSS($task['description']).'</td>',
+                         '<td><span style="background-color: #'.$task['color'].'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></td>',
                          '<td width="50">',
-                            '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $task['blog_id'] . '&do=edit&task_id=' . $task['task_id'] . '">',
-                            '<img src="../img/edit.gif" border="0" title="' . get_lang('EditTask') . '" />',
+                            '<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$task['blog_id'].'&do=edit&task_id='.$task['task_id'].'">',
+                            '<img src="../img/edit.gif" border="0" title="'.get_lang('EditTask').'" />',
                             "</a>\n",
-                            '<a href="' . $delete_link . '"',
+                            '<a href="'.$delete_link.'"',
                             $delete_confirm,
-                            '><img src="../img/' . $delete_icon . '" border="0" title="' . $delete_title . '" />',
+                            '><img src="../img/'.$delete_icon.'" border="0" title="'.$delete_title.'" />',
                             "</a>\n",
                          '</td>',
                     '</tr>';
@@ -1449,23 +1449,23 @@ 
 	 *
 	 * @param Integer $blog_id
 	 */
-	public static function display_assigned_task_list ($blog_id)
+	public static function display_assigned_task_list($blog_id)
     {
 		// Init
 		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
 		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
 		$tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
 		$counter = 0;
-		global $charset,$color2;
+		global $charset, $color2;
 
-		echo '<span class="blogpost_title">' . get_lang('AssignedTasks') . '</span><br />';
+		echo '<span class="blogpost_title">'.get_lang('AssignedTasks').'</span><br />';
 		echo "<table class=\"data_table\">";
 		echo	"<tr bgcolor=\"$color2\" align=\"center\" valign=\"top\">",
-				 "<th width='240'><b>",get_lang('Member'),"</b></th>\n",
-				 "<th><b>",get_lang('Task'),"</b></th>\n",
-				 "<th><b>",get_lang('Description'),"</b></th>\n",
-				 "<th><b>",get_lang('TargetDate'),"</b></th>\n",
-				 "<th width='50'><b>",get_lang('Modify'),"</b></th>\n",
+				 "<th width='240'><b>", get_lang('Member'), "</b></th>\n",
+				 "<th><b>", get_lang('Task'), "</b></th>\n",
+				 "<th><b>", get_lang('Description'), "</b></th>\n",
+				 "<th><b>", get_lang('TargetDate'), "</b></th>\n",
+				 "<th width='50'><b>", get_lang('Modify'), "</b></th>\n",
 			"</tr>";
 
 		$course_id = api_get_course_int_id();
@@ -1477,32 +1477,32 @@ 
 				WHERE
 				    task_rel_user.c_id = $course_id AND
 					task.c_id = $course_id AND
-					task_rel_user.blog_id = '".(int)$blog_id."'
+					task_rel_user.blog_id = '".(int) $blog_id."'
 				ORDER BY target_date ASC";
 		$result = Database::query($sql);
 
 		while ($assignment = Database::fetch_array($result)) {
 			$counter++;
-			$css_class = (($counter % 2)==0) ? "row_odd" : "row_even";
+			$css_class = (($counter % 2) == 0) ? "row_odd" : "row_even";
 			$delete_icon = ($assignment['system_task'] == '1') ? "delete_na.gif" : "delete.gif";
 			$delete_title = ($assignment['system_task'] == '1') ? get_lang('DeleteSystemTask') : get_lang('DeleteTask');
-			$delete_link = ($assignment['system_task'] == '1') ? '#' : api_get_self() . '?action=manage_tasks&blog_id=' . $assignment['blog_id'] . '&do=delete&task_id=' . $assignment['task_id'];
-			$delete_confirm = ($assignment['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"';
+			$delete_link = ($assignment['system_task'] == '1') ? '#' : api_get_self().'?action=manage_tasks&blog_id='.$assignment['blog_id'].'&do=delete&task_id='.$assignment['task_id'];
+			$delete_confirm = ($assignment['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)).'\')) return false;"';
 
             $username = api_htmlentities(sprintf(get_lang('LoginX'), $assignment['username']), ENT_QUOTES);
 
-			echo	'<tr class="' . $css_class . '" valign="top">',
-						 '<td width="240">' . Display::tag('span', api_get_person_name($assignment['firstname'], $assignment['lastname']), array('title'=>$username)) . '</td>',
-						 '<td>'.stripslashes($assignment['title']) . '</td>',
-						 '<td>'.stripslashes($assignment['description']) . '</td>',
-						 '<td>' . $assignment['target_date'] . '</td>',
+			echo	'<tr class="'.$css_class.'" valign="top">',
+						 '<td width="240">'.Display::tag('span', api_get_person_name($assignment['firstname'], $assignment['lastname']), array('title'=>$username)).'</td>',
+						 '<td>'.stripslashes($assignment['title']).'</td>',
+						 '<td>'.stripslashes($assignment['description']).'</td>',
+						 '<td>'.$assignment['target_date'].'</td>',
 						 '<td width="50">',
-						 	'<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $assignment['blog_id'] . '&do=edit_assignment&task_id=' . $assignment['task_id'] . '&user_id=' . $assignment['user_id'] . '">',
-							'<img src="../img/edit.gif" border="0" title="' . get_lang('EditTask') . '" />',
+						 	'<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$assignment['blog_id'].'&do=edit_assignment&task_id='.$assignment['task_id'].'&user_id='.$assignment['user_id'].'">',
+							'<img src="../img/edit.gif" border="0" title="'.get_lang('EditTask').'" />',
 							"</a>\n",
-							'<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $assignment['blog_id'] . '&do=delete_assignment&task_id=' . $assignment['task_id'] . '&user_id=' . $assignment['user_id'] . '" ',
-							'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"',
-							'<img src="../img/' . $delete_icon . '" border="0" title="' . $delete_title . '" />',
+							'<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$assignment['blog_id'].'&do=delete_assignment&task_id='.$assignment['task_id'].'&user_id='.$assignment['user_id'].'" ',
+							'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)).'\')) return false;"',
+							'<img src="../img/'.$delete_icon.'" border="0" title="'.$delete_title.'" />',
 							"</a>\n",
 						 '</td>',
 					'</tr>';
@@ -1515,7 +1515,7 @@ 
 	 * @author Toon Keppens
 	 *
 	 */
-	public static function display_new_task_form ($blog_id)
+	public static function display_new_task_form($blog_id)
 	{
 		// Init
         $colors = array(
@@ -1537,7 +1537,7 @@ 
         );
 
 		// form
-		echo '<form name="add_task" method="post" action="blog.php?action=manage_tasks&blog_id=' . $blog_id . '">';
+		echo '<form name="add_task" method="post" action="blog.php?action=manage_tasks&blog_id='.$blog_id.'">';
 
 		// form title
 		echo '<legend>'.get_lang('AddTask').'</legend>';
@@ -1545,7 +1545,7 @@ 
 		// task title
 		echo '	<div class="control-group">
 					<label class="control-label">
-						<span class="form_required">*</span>' . get_lang('Title') . '
+						<span class="form_required">*</span>' . get_lang('Title').'
 					</label>
 					<div class="controls">
 						<input name="task_name" type="text" size="70" />
@@ -1555,7 +1555,7 @@ 
 		// task comment
 		echo '	<div class="control-group">
 					<label class="control-label">
-						' . get_lang('Description') . '
+						' . get_lang('Description').'
 					</label>
 					<div class="controls">
 						<textarea name="task_description" cols="45"></textarea>
@@ -1565,18 +1565,18 @@ 
 		// task management
 		echo '	<div class="control-group">
 					<label class="control-label">
-						' . get_lang('TaskManager') . '
+						' . get_lang('TaskManager').'
 					</label>
 					<div class="controls">';
                 echo '<table class="data_table" cellspacing="0" style="border-collapse:collapse; width:446px;">';
                     echo '<tr>';
-                        echo '<th colspan="2" style="width:223px;">' . get_lang('ArticleManager') . '</th>';
-                        echo '<th width:223px;>' . get_lang('CommentManager') . '</th>';
+                        echo '<th colspan="2" style="width:223px;">'.get_lang('ArticleManager').'</th>';
+                        echo '<th width:223px;>'.get_lang('CommentManager').'</th>';
                     echo '</tr>';
                     echo '<tr>';
-                        echo '<th style="width:111px;"><label for="articleDelete">' . get_lang('Delete') . '</label></th>';
-                        echo '<th style="width:112px;"><label for="articleEdit">' . get_lang('Edit') . '</label></th>';
-                        echo '<th style="width:223px;"><label for="commentsDelete">' . get_lang('Delete') . '</label></th>';
+                        echo '<th style="width:111px;"><label for="articleDelete">'.get_lang('Delete').'</label></th>';
+                        echo '<th style="width:112px;"><label for="articleEdit">'.get_lang('Edit').'</label></th>';
+                        echo '<th style="width:223px;"><label for="commentsDelete">'.get_lang('Delete').'</label></th>';
                     echo '</tr>';
                     echo '<tr>';
                         echo '<td style="text-align:center;"><input id="articleDelete" name="chkArticleDelete" type="checkbox" /></td>';
@@ -1591,13 +1591,13 @@ 
 		// task color
 		echo '	<div class="control-group">
 					<label class="control-label">
-						' . get_lang('Color') . '
+						' . get_lang('Color').'
 					</label>
 					<div class="controls">';
         echo '<select name="task_color" id="color" style="width: 150px; background-color: #eeeeee" onchange="document.getElementById(\'color\').style.backgroundColor=\'#\'+document.getElementById(\'color\').value" onkeypress="document.getElementById(\'color\').style.backgroundColor=\'#\'+document.getElementById(\'color\').value">';
                 foreach ($colors as $color) {
-                    $style = 'style="background-color: #' . $color . '"';
-                    echo '<option value="' . $color . '" ' . $style . '>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
+                    $style = 'style="background-color: #'.$color.'"';
+                    echo '<option value="'.$color.'" '.$style.'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
                 }
         echo '</select>';
 		echo '		</div>
@@ -1608,7 +1608,7 @@ 
 					<div class="controls">
 							<input type="hidden" name="action" value="" />
 							<input type="hidden" name="new_task_submit" value="true" />
-						<button class="save" type="submit" name="Submit">' . get_lang('Save') . '</button>
+						<button class="save" type="submit" name="Submit">' . get_lang('Save').'</button>
 					</div>
 				</div>';
 		echo '</form>';
@@ -1622,34 +1622,34 @@ 
 	 * @author Toon Keppens
 	 *
 	 */
-	public static function display_edit_task_form ($blog_id, $task_id) {
+	public static function display_edit_task_form($blog_id, $task_id) {
 		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
         $course_id = api_get_course_int_id();
 
-		$colors = array('FFFFFF','FFFF99','FFCC99','FF9933','FF6699','CCFF99','CC9966','66FF00', '9966FF', 'CF3F3F', '990033','669933','0033FF','003366','000000');
+		$colors = array('FFFFFF', 'FFFF99', 'FFCC99', 'FF9933', 'FF6699', 'CCFF99', 'CC9966', '66FF00', '9966FF', 'CF3F3F', '990033', '669933', '0033FF', '003366', '000000');
 
-		$sql = "SELECT blog_id, task_id, title, description, color FROM $tbl_blogs_tasks WHERE c_id = $course_id AND task_id = '".(int)$task_id."'";
+		$sql = "SELECT blog_id, task_id, title, description, color FROM $tbl_blogs_tasks WHERE c_id = $course_id AND task_id = '".(int) $task_id."'";
 		$result = Database::query($sql);
 		$task = Database::fetch_array($result);
 
 		// Display
-		echo '<form name="edit_task" method="post" action="blog.php?action=manage_tasks&blog_id=' . $blog_id . '">
-					<legend>' . get_lang('EditTask') . '</legend>
+		echo '<form name="edit_task" method="post" action="blog.php?action=manage_tasks&blog_id='.$blog_id.'">
+					<legend>' . get_lang('EditTask').'</legend>
 					<table width="100%" border="0" cellspacing="2">
 						<tr>
-					   <td align="right">' . get_lang('Title') . ':&nbsp;&nbsp;</td>
-					   <td><input name="task_name" type="text" size="70" value="'.Security::remove_XSS($task['title']) . '" /></td>
+					   <td align="right">' . get_lang('Title').':&nbsp;&nbsp;</td>
+					   <td><input name="task_name" type="text" size="70" value="'.Security::remove_XSS($task['title']).'" /></td>
 						</tr>
 						<tr>
-					   <td align="right">' . get_lang('Description') . ':&nbsp;&nbsp;</td>
+					   <td align="right">' . get_lang('Description').':&nbsp;&nbsp;</td>
 					   <td><textarea name="task_description" cols="45">'.Security::remove_XSS($task['description']).'</textarea></td>
 						</tr>';
 
 						/* edit by Kevin Van Den Haute (kevin@develop-it.be) */
 						$tbl_tasks_permissions = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
 
-						$sql = " SELECT id, action FROM " . $tbl_tasks_permissions . "
-							     WHERE c_id = $course_id AND task_id = '" . (int)$task_id."'";
+						$sql = " SELECT id, action FROM ".$tbl_tasks_permissions."
+							     WHERE c_id = $course_id AND task_id = '".(int) $task_id."'";
 						$result = Database::query($sql);
 
 						$arrPermissions = array();
@@ -1658,22 +1658,22 @@ 
 							$arrPermissions[] = $row['action'];
 
 						    echo '<tr>';
-							echo '<td style="text-align:right; vertical-align:top;">' . get_lang('TaskManager') . ':&nbsp;&nbsp;</td>';
+							echo '<td style="text-align:right; vertical-align:top;">'.get_lang('TaskManager').':&nbsp;&nbsp;</td>';
 							echo '<td>';
 								echo '<table  class="data_table" cellspacing="0" style="border-collapse:collapse; width:446px;">';
 									echo '<tr>';
-										echo '<th colspan="2" style="width:223px;">' . get_lang('ArticleManager') . '</th>';
-										echo '<th width:223px;>' . get_lang('CommentManager') . '</th>';
+										echo '<th colspan="2" style="width:223px;">'.get_lang('ArticleManager').'</th>';
+										echo '<th width:223px;>'.get_lang('CommentManager').'</th>';
 									echo '</tr>';
 									echo '<tr>';
-										echo '<th style="width:111px;"><label for="articleDelete">' . get_lang('Delete') . '</label></th>';
-										echo '<th style="width:112px;"><label for="articleEdit">' . get_lang('Edit') . '</label></th>';
-										echo '<th style="width:223px;"><label for="commentsDelete">' . get_lang('Delete') . '</label></th>';
+										echo '<th style="width:111px;"><label for="articleDelete">'.get_lang('Delete').'</label></th>';
+										echo '<th style="width:112px;"><label for="articleEdit">'.get_lang('Edit').'</label></th>';
+										echo '<th style="width:223px;"><label for="commentsDelete">'.get_lang('Delete').'</label></th>';
 									echo '</tr>';
 									echo '<tr>';
-										echo '<td style="text-align:center;"><input ' . ((in_array('article_delete', $arrPermissions)) ? 'checked ' : '') . 'id="articleDelete" name="chkArticleDelete" type="checkbox" /></td>';
-										echo '<td style="text-align:center;"><input ' . ((in_array('article_edit', $arrPermissions)) ? 'checked ' : '') . 'id="articleEdit" name="chkArticleEdit" type="checkbox" /></td>';
-										echo '<td style="text-align:center;"><input ' . ((in_array('article_comments_delete', $arrPermissions)) ? 'checked ' : '') . 'id="commentsDelete" name="chkCommentsDelete" type="checkbox" /></td>';
+										echo '<td style="text-align:center;"><input '.((in_array('article_delete', $arrPermissions)) ? 'checked ' : '').'id="articleDelete" name="chkArticleDelete" type="checkbox" /></td>';
+										echo '<td style="text-align:center;"><input '.((in_array('article_edit', $arrPermissions)) ? 'checked ' : '').'id="articleEdit" name="chkArticleEdit" type="checkbox" /></td>';
+										echo '<td style="text-align:center;"><input '.((in_array('article_comments_delete', $arrPermissions)) ? 'checked ' : '').'id="commentsDelete" name="chkCommentsDelete" type="checkbox" /></td>';
 									echo '</tr>';
 								echo '</table>';
 							echo '</td>';
@@ -1681,13 +1681,13 @@ 
 						/* end of edit */
 
 						echo '<tr>
-					   <td align="right">' . get_lang('Color') . ':&nbsp;&nbsp;</td>
+					   <td align="right">' . get_lang('Color').':&nbsp;&nbsp;</td>
 					   <td>
-					   	<select name="task_color" id="color" style="width: 150px; background-color: #' . $task['color'] . '" onchange="document.getElementById(\'color\').style.backgroundColor=\'#\'+document.getElementById(\'color\').value" onkeypress="document.getElementById(\'color\').style.backgroundColor=\'#\'+document.getElementById(\'color\').value">';
+					   	<select name="task_color" id="color" style="width: 150px; background-color: #' . $task['color'].'" onchange="document.getElementById(\'color\').style.backgroundColor=\'#\'+document.getElementById(\'color\').value" onkeypress="document.getElementById(\'color\').style.backgroundColor=\'#\'+document.getElementById(\'color\').value">';
                             foreach ($colors as $color) {
                                 $selected = ($color == $task['color']) ? ' selected' : '';
-                                $style = 'style="background-color: #' . $color . '"';
-                                echo '<option value="' . $color . '" ' . $style . ' ' . $selected . ' >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
+                                $style = 'style="background-color: #'.$color.'"';
+                                echo '<option value="'.$color.'" '.$style.' '.$selected.' >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
                             }
 		echo '			   </select>
 						  </td>
@@ -1696,9 +1696,9 @@ 
 							<td align="right">&nbsp;</td>
 							<td><br /><input type="hidden" name="action" value="" />
 							<input type="hidden" name="edit_task_submit" value="true" />
-							<input type="hidden" name="task_id" value="' . $task['task_id'] . '" />
-							<input type="hidden" name="blog_id" value="' . $task['blog_id'] . '" />
-							<button class="save" type="submit" name="Submit">' . get_lang('Save') . '</button></td>
+							<input type="hidden" name="task_id" value="' . $task['task_id'].'" />
+							<input type="hidden" name="blog_id" value="' . $task['blog_id'].'" />
+							<button class="save" type="submit" name="Submit">' . get_lang('Save').'</button></td>
 						</tr>
 					</table>
 				</form>';
@@ -1720,7 +1720,7 @@ 
 				FROM $tbl_users user
 				INNER JOIN $tbl_blogs_rel_user blogs_rel_user
 				ON user.user_id = blogs_rel_user.user_id
-				WHERE blogs_rel_user.c_id = $course_id AND blogs_rel_user.blog_id = '".(int)$blog_id."'";
+				WHERE blogs_rel_user.c_id = $course_id AND blogs_rel_user.blog_id = '".(int) $blog_id."'";
 		$result = Database::query($sql);
 
 		$options = array();
@@ -1739,7 +1739,7 @@ 
 				color,
 				system_task
 			FROM $tbl_blogs_tasks
-			WHERE c_id = $course_id AND blog_id = " . (int)$blog_id . "
+			WHERE c_id = $course_id AND blog_id = ".(int) $blog_id."
 			ORDER BY system_task, title";
 		$result = Database::query($sql);
 
@@ -1787,7 +1787,7 @@ 
 	 */
 	public static function display_edit_assigned_task_form($blog_id, $task_id, $user_id)
 	{
-		$tbl_blogs_tasks_rel_user 	= Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+		$tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
 
 		$course_id = api_get_course_int_id();
 
@@ -1796,9 +1796,9 @@ 
 			SELECT target_date
 			FROM $tbl_blogs_tasks_rel_user
 			WHERE c_id = $course_id AND
-			      blog_id = '".(int)$blog_id."' AND
-			      user_id = '".(int)$user_id."' AND
-			      task_id = '".(int)$task_id."'";
+			      blog_id = '".(int) $blog_id."' AND
+			      user_id = '".(int) $user_id."' AND
+			      task_id = '".(int) $task_id."'";
 		$result = Database::query($sql);
 		$row = Database::fetch_assoc($result);
 
@@ -1833,11 +1833,11 @@ 
 
 		$sql = "
 			SELECT COUNT(*) as 'number'
-			FROM " . $tbl_blogs_tasks_rel_user . "
+			FROM " . $tbl_blogs_tasks_rel_user."
 			WHERE c_id = $course_id AND
-			blog_id = " . (int)$blog_id . "
-			AND	user_id = " . (int)$user_id . "
-			AND	task_id = " . (int)$task_id . "
+			blog_id = ".(int) $blog_id."
+			AND	user_id = " . (int) $user_id."
+			AND	task_id = " . (int) $task_id."
 		";
 
 		$result = Database::query($sql);
@@ -1845,18 +1845,18 @@ 
 
 		if ($row['number'] == 0) {
 			$sql = "
-				INSERT INTO " . $tbl_blogs_tasks_rel_user . " (
+				INSERT INTO " . $tbl_blogs_tasks_rel_user." (
 					c_id,
 					blog_id,
 					user_id,
 					task_id,
 					target_date
 				) VALUES (
-					'" . (int)$course_id . "',
-					'" . (int)$blog_id . "',
-					'" . (int)$user_id . "',
-					'" . (int)$task_id . "',
-					'" . Database::escape_string($target_date) . "'
+					'" . (int) $course_id."',
+					'" . (int) $blog_id."',
+					'" . (int) $user_id."',
+					'" . (int) $task_id."',
+					'" . Database::escape_string($target_date)."'
 				)";
 
 			Database::query($sql);
@@ -1886,12 +1886,12 @@ 
 		$course_id = api_get_course_int_id();
 
 		$sql = "SELECT COUNT(*) as 'number'
-                FROM " . $tbl_blogs_tasks_rel_user . "
+                FROM " . $tbl_blogs_tasks_rel_user."
                 WHERE
                     c_id = $course_id AND
-                    blog_id = " . (int)$blog_id . " AND
-                    user_id = " . (int)$user_id . " AND
-                    task_id = " . (int)$task_id . "
+                    blog_id = ".(int) $blog_id." AND
+                    user_id = " . (int) $user_id." AND
+                    task_id = " . (int) $task_id."
             ";
 
 		$result = Database::query($sql);
@@ -1899,17 +1899,17 @@ 
 
 		if ($row['number'] == 0 || ($row['number'] != 0 && $task_id == $old_task_id && $user_id == $old_user_id)) {
 			$sql = "
-				UPDATE " . $tbl_blogs_tasks_rel_user . "
+				UPDATE " . $tbl_blogs_tasks_rel_user."
 				SET
-					user_id = " . (int)$user_id . ",
-					task_id = " . (int)$task_id . ",
-					target_date = '" . Database::escape_string($target_date) . "'
+					user_id = " . (int) $user_id.",
+					task_id = " . (int) $task_id.",
+					target_date = '" . Database::escape_string($target_date)."'
 				WHERE
 					c_id = $course_id AND
-					blog_id = " . (int)$blog_id . " AND
-					user_id = " . (int)$old_user_id . " AND
-					task_id = " . (int)$old_task_id . " AND
-					target_date = '" . Database::escape_string($old_target_date) . "'
+					blog_id = ".(int) $blog_id." AND
+					user_id = " . (int) $old_user_id." AND
+					task_id = " . (int) $old_task_id." AND
+					target_date = '" . Database::escape_string($old_target_date)."'
 			";
 			Database::query($sql);
 		}
@@ -1930,7 +1930,7 @@ 
 
 
 		$sql = "SELECT title, description FROM $tbl_blogs_tasks
-				WHERE task_id = '".(int)$task_id."'
+				WHERE task_id = '".(int) $task_id."'
 				AND c_id = $course_id";
 		$result = Database::query($sql);
 		$row = Database::fetch_assoc($result);
@@ -1938,19 +1938,19 @@ 
 		$sql = "SELECT post.*, user.lastname, user.firstname, user.username
 				FROM $tbl_blogs_posts post
 				INNER JOIN $tbl_users user ON post.author_id = user.user_id
-				WHERE post.blog_id = '".(int)$blog_id."' AND post.c_id = $course_id
+				WHERE post.blog_id = '".(int) $blog_id."' AND post.c_id = $course_id
 				ORDER BY post_id DESC
 				LIMIT 0, 100";
 		$result = Database::query($sql);
 
 		// Display
-		echo '<span class="blogpost_title">' . get_lang('SelectTaskArticle') . ' "' . stripslashes($row['title']) . '"</span>';
-		echo '<span style="font-style: italic;"">'.stripslashes($row['description']) . '</span><br><br>';
+		echo '<span class="blogpost_title">'.get_lang('SelectTaskArticle').' "'.stripslashes($row['title']).'"</span>';
+		echo '<span style="font-style: italic;"">'.stripslashes($row['description']).'</span><br><br>';
 
 		if (Database::num_rows($result) > 0) {
-			while($blog_post = Database::fetch_array($result)) {
+			while ($blog_post = Database::fetch_array($result)) {
 			    $username = api_htmlentities(sprintf(get_lang('LoginX'), $blog_post['username']), ENT_QUOTES);
-				echo '<a href="blog.php?action=execute_task&blog_id=' . $blog_id . '&task_id=' . $task_id . '&post_id=' . $blog_post['post_id'] . '#add_comment">'.stripslashes($blog_post['title']) . '</a>, ' . get_lang('WrittenBy') . ' ' . stripslashes(Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username))) . '<br />';
+				echo '<a href="blog.php?action=execute_task&blog_id='.$blog_id.'&task_id='.$task_id.'&post_id='.$blog_post['post_id'].'#add_comment">'.stripslashes($blog_post['title']).'</a>, '.get_lang('WrittenBy').' '.stripslashes(Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username))).'<br />';
 			}
         } else {
             echo get_lang('NoArticles');
@@ -1974,12 +1974,12 @@ 
 
 		// Subscribe the user
 		$sql = "INSERT INTO $tbl_blogs_rel_user (c_id, blog_id, user_id )
-		        VALUES ($course_id, '".(int)$blog_id."', '".(int)$user_id."');";
+		        VALUES ($course_id, '".(int) $blog_id."', '".(int) $user_id."');";
 		Database::query($sql);
 
 		// Give this user basic rights
 		$sql = "INSERT INTO $tbl_user_permissions (c_id, user_id,tool,action)
-		        VALUES ($course_id, '".(int)$user_id."','BLOG_" . (int)$blog_id."','article_add')";
+		        VALUES ($course_id, '".(int) $user_id."','BLOG_".(int) $blog_id."','article_add')";
 		Database::query($sql);
 
         $id = Database::insert_id();
@@ -1989,7 +1989,7 @@ 
         }
 
 		$sql = "INSERT INTO $tbl_user_permissions (c_id, user_id,tool,action)
-		        VALUES ($course_id, '".(int)$user_id."','BLOG_" . (int)$blog_id."','article_comments_add')";
+		        VALUES ($course_id, '".(int) $user_id."','BLOG_".(int) $blog_id."','article_comments_add')";
 		Database::query($sql);
 
         $id = Database::insert_id();
@@ -2015,12 +2015,12 @@ 
 
 		// Unsubscribe the user
 		$sql = "DELETE FROM $tbl_blogs_rel_user
-		        WHERE blog_id = '".(int)$blog_id."' AND user_id = '".(int)$user_id."'";
+		        WHERE blog_id = '".(int) $blog_id."' AND user_id = '".(int) $user_id."'";
 		Database::query($sql);
 
 		// Remove this user's permissions.
 		$sql = "DELETE FROM $tbl_user_permissions
-		        WHERE user_id = '".(int)$user_id."'";
+		        WHERE user_id = '".(int) $user_id."'";
 		Database::query($sql);
 	}
 
@@ -2041,7 +2041,7 @@ 
 		$course_id = $_course['real_id'];
 
 		$currentCourse = $_course['code'];
-		$tbl_users 			= Database::get_main_table(TABLE_MAIN_USER);
+		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
 		$tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
 
 		echo '<legend>'.get_lang('SubscribeMembers').'</legend>';
@@ -2056,12 +2056,12 @@ 
 		$result = Database::query($sql);
 
 		$blog_member_ids = array();
-		while($user = Database::fetch_array($result)) {
+		while ($user = Database::fetch_array($result)) {
 			$blog_member_ids[] = $user['user_id'];
 		}
 
 		// Set table headers
-		$column_header[] = array ('', false, '');
+		$column_header[] = array('', false, '');
 		if ($is_western_name_order) {
 			$column_header[] = array(get_lang('FirstName'), true, '');
 			$column_header[] = array(get_lang('LastName'), true, '');
@@ -2081,13 +2081,13 @@ 
 
 		// Add users that are not in this blog to the list.
 		foreach ($student_list as $key=>$user) {
-			if(isset($user['id_user'])) {
+			if (isset($user['id_user'])) {
 				$user['user_id'] = $user['id_user'];
 			}
-			if(!in_array($user['user_id'],$blog_member_ids)) {
+			if (!in_array($user['user_id'], $blog_member_ids)) {
 				$a_infosUser = api_get_user_info($user['user_id']);
-				$row = array ();
-				$row[] = '<input type="checkbox" name="user[]" value="' . $a_infosUser['user_id'] . '" '.((isset($_GET['selectall']) && $_GET['selectall'] == "subscribe") ? ' checked="checked" ' : '') . '/>';
+				$row = array();
+				$row[] = '<input type="checkbox" name="user[]" value="'.$a_infosUser['user_id'].'" '.((isset($_GET['selectall']) && $_GET['selectall'] == "subscribe") ? ' checked="checked" ' : '').'/>';
 				$username = api_htmlentities(sprintf(get_lang('LoginX'), $a_infosUser["username"]), ENT_QUOTES);
 				if ($is_western_name_order) {
 					$row[] = $a_infosUser["firstname"];
@@ -2099,8 +2099,8 @@ 
 				$row[] = Display::icon_mailto_link($a_infosUser["email"]);
 
 				//Link to register users
-				if ($a_infosUser["user_id"] != $_SESSION['_user']['user_id']){
-					$row[] = "<a class=\"btn btn-primary \" href=\"" .api_get_self()."?action=manage_members&blog_id=$blog_id&register=yes&user_id=" . $a_infosUser["user_id"]."\">" . get_lang('Register')."</a>";
+				if ($a_infosUser["user_id"] != $_SESSION['_user']['user_id']) {
+					$row[] = "<a class=\"btn btn-primary \" href=\"".api_get_self()."?action=manage_members&blog_id=$blog_id&register=yes&user_id=".$a_infosUser["user_id"]."\">".get_lang('Register')."</a>";
 				} else {
 					$row[] = '';
 				}
@@ -2111,20 +2111,20 @@ 
 		// Display
 		$query_vars['action'] = 'manage_members';
 		$query_vars['blog_id'] = $blog_id;
-		echo '<form method="post" action="blog.php?action=manage_members&blog_id=' . $blog_id . '">';
-			Display::display_sortable_table($column_header, $user_data,null,null,$query_vars);
+		echo '<form method="post" action="blog.php?action=manage_members&blog_id='.$blog_id.'">';
+			Display::display_sortable_table($column_header, $user_data, null, null, $query_vars);
 			$link = '';
-			$link .= isset ($_GET['action']) ? 'action=' . Security::remove_XSS($_GET['action']) . '&' : '';
+			$link .= isset ($_GET['action']) ? 'action='.Security::remove_XSS($_GET['action']).'&' : '';
 			$link .= "blog_id=$blog_id&";
 
-			echo '<a href="blog.php?' . $link . 'selectall=subscribe">' . get_lang('SelectAll') . '</a> - ';
-			echo '<a href="blog.php?' . $link . '">' . get_lang('UnSelectAll') . '</a> ';
-			echo get_lang('WithSelected') . ' : ';
+			echo '<a href="blog.php?'.$link.'selectall=subscribe">'.get_lang('SelectAll').'</a> - ';
+			echo '<a href="blog.php?'.$link.'">'.get_lang('UnSelectAll').'</a> ';
+			echo get_lang('WithSelected').' : ';
 			echo '<select name="action">';
-			echo '<option value="select_subscribe">' . get_lang('Register') . '</option>';
+			echo '<option value="select_subscribe">'.get_lang('Register').'</option>';
 			echo '</select>';
 			echo '<input type="hidden" name="register" value="true" />';
-			echo '<button class="save" type="submit">' . get_lang('Ok') . '</button>';
+			echo '<button class="save" type="submit">'.get_lang('Ok').'</button>';
 		echo '</form>';
 	}
 
@@ -2137,7 +2137,7 @@ 
 	 *
 	 * @return Html Form with sortable table with users to unsubcribe from a blog.
 	 */
-	public static function display_form_user_unsubscribe ($blog_id)
+	public static function display_form_user_unsubscribe($blog_id)
 	{
 		$_user = api_get_user_info();
 		$is_western_name_order = api_is_western_name_order();
@@ -2150,34 +2150,34 @@ 
 
 		$properties["width"] = "100%";
 		//table column titles
-		$column_header[] = array ('', false, '');
+		$column_header[] = array('', false, '');
 		if ($is_western_name_order) {
-			$column_header[] = array (get_lang('FirstName'), true, '');
-			$column_header[] = array (get_lang('LastName'), true, '');
+			$column_header[] = array(get_lang('FirstName'), true, '');
+			$column_header[] = array(get_lang('LastName'), true, '');
 		} else {
-			$column_header[] = array (get_lang('LastName'), true, '');
-			$column_header[] = array (get_lang('FirstName'), true, '');
+			$column_header[] = array(get_lang('LastName'), true, '');
+			$column_header[] = array(get_lang('FirstName'), true, '');
 		}
-		$column_header[] = array (get_lang('Email'), false, '');
-		$column_header[] = array (get_lang('TaskManager'), true, '');
-		$column_header[] = array (get_lang('UnRegister'), false, '');
+		$column_header[] = array(get_lang('Email'), false, '');
+		$column_header[] = array(get_lang('TaskManager'), true, '');
+		$column_header[] = array(get_lang('UnRegister'), false, '');
 
 		$course_id = api_get_course_int_id();
 
 		$sql = "SELECT user.user_id, user.lastname, user.firstname, user.email, user.username
                 FROM $tbl_users user INNER JOIN $tbl_blogs_rel_user blogs_rel_user
                 ON user.user_id = blogs_rel_user.user_id
-                WHERE blogs_rel_user.c_id = $course_id AND  blogs_rel_user.blog_id = '".(int)$blog_id."'";
+                WHERE blogs_rel_user.c_id = $course_id AND  blogs_rel_user.blog_id = '".(int) $blog_id."'";
 
 		if (!($sql_result = Database::query($sql))) {
 			return false;
 		}
 
-		$user_data = array ();
+		$user_data = array();
 
 		while ($myrow = Database::fetch_array($sql_result)) {
-			$row = array ();
-			$row[] = '<input type="checkbox" name="user[]" value="' . $myrow['user_id'] . '" '.((isset($_GET['selectall']) && $_GET['selectall'] == "unsubscribe") ? ' checked="checked" ' : '') . '/>';
+			$row = array();
+			$row[] = '<input type="checkbox" name="user[]" value="'.$myrow['user_id'].'" '.((isset($_GET['selectall']) && $_GET['selectall'] == "unsubscribe") ? ' checked="checked" ' : '').'/>';
 			$username = api_htmlentities(sprintf(get_lang('LoginX'), $myrow["username"]), ENT_QUOTES);
 			if ($is_western_name_order) {
 				$row[] = $myrow["firstname"];
@@ -2189,19 +2189,19 @@ 
 			$row[] = Display::icon_mailto_link($myrow["email"]);
 
 			$sql = "SELECT bt.title task
-					FROM " . Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER) . " btu
-					INNER JOIN " . Database::get_course_table(TABLE_BLOGS_TASKS) . " bt
+					FROM " . Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER)." btu
+					INNER JOIN " . Database::get_course_table(TABLE_BLOGS_TASKS)." bt
 					ON btu.task_id = bt.task_id
 					WHERE 	btu.c_id 	= $course_id  AND
 							bt.c_id 	= $course_id  AND
 							btu.blog_id = $blog_id AND
-							btu.user_id = " . $myrow['user_id'];
+							btu.user_id = ".$myrow['user_id'];
 			$sql_res = Database::query($sql);
 
 			$task = '';
 
-			while($r = Database::fetch_array($sql_res)) {
-				$task .= stripslashes($r['task']) . ', ';
+			while ($r = Database::fetch_array($sql_res)) {
+				$task .= stripslashes($r['task']).', ';
 			}
 			//echo $task;
 			$task = (api_strlen(trim($task)) != 0) ? api_substr($task, 0, api_strlen($task) - 2) : get_lang('Reader');
@@ -2209,7 +2209,7 @@ 
 			//Link to register users
 
 			if ($myrow["user_id"] != $_user['user_id']) {
-				$row[] = "<a class=\"btn btn-primary\" href=\"" .api_get_self()."?action=manage_members&blog_id=$blog_id&unregister=yes&user_id=" . $myrow['user_id']."\">" . get_lang('UnRegister')."</a>";
+				$row[] = "<a class=\"btn btn-primary\" href=\"".api_get_self()."?action=manage_members&blog_id=$blog_id&unregister=yes&user_id=".$myrow['user_id']."\">".get_lang('UnRegister')."</a>";
 			} else {
 				$row[] = '';
 			}
@@ -2219,20 +2219,20 @@ 
 
 		$query_vars['action'] = 'manage_members';
 		$query_vars['blog_id'] = $blog_id;
-		echo '<form method="post" action="blog.php?action=manage_members&blog_id=' . $blog_id . '">';
-		Display::display_sortable_table($column_header, $user_data,null,null,$query_vars);
+		echo '<form method="post" action="blog.php?action=manage_members&blog_id='.$blog_id.'">';
+		Display::display_sortable_table($column_header, $user_data, null, null, $query_vars);
 		$link = '';
-		$link .= isset ($_GET['action']) ? 'action=' . Security::remove_XSS($_GET['action']). '&' : '';
+		$link .= isset ($_GET['action']) ? 'action='.Security::remove_XSS($_GET['action']).'&' : '';
 		$link .= "blog_id=$blog_id&";
 
-		echo '<a href="blog.php?' . $link . 'selectall=unsubscribe">' . get_lang('SelectAll') . '</a> - ';
-		echo '<a href="blog.php?' . $link . '">' . get_lang('UnSelectAll') . '</a> ';
-		echo get_lang('WithSelected') . ' : ';
+		echo '<a href="blog.php?'.$link.'selectall=unsubscribe">'.get_lang('SelectAll').'</a> - ';
+		echo '<a href="blog.php?'.$link.'">'.get_lang('UnSelectAll').'</a> ';
+		echo get_lang('WithSelected').' : ';
 		echo '<select name="action">';
-		echo '<option value="select_unsubscribe">' . get_lang('UnRegister') . '</option>';
+		echo '<option value="select_unsubscribe">'.get_lang('UnRegister').'</option>';
 		echo '</select>';
 		echo '<input type="hidden" name="unregister" value="true" />';
-		echo '<button class="save" type="submit">' . get_lang('Ok') . '</button>';
+		echo '<button class="save" type="submit">'.get_lang('Ok').'</button>';
 		echo '</form>';
 	}
 
@@ -2242,7 +2242,7 @@ 
 	 *
 	 * @param Integer $blog_id
 	 */
-	public static function display_form_user_rights ($blog_id)
+	public static function display_form_user_rights($blog_id)
     {
 		echo '<legend>'.get_lang('RightsManager').'</legend>';
 		echo '<br />';
@@ -2262,7 +2262,7 @@ 
 		$form = new FormValidator(
 			'add_post',
 			'post',
-			api_get_path(WEB_CODE_PATH)."blog/blog.php?action=view_post&blog_id=" . intval($blog_id)  . "&post_id=".intval($post_id)."&".api_get_cidreq(),
+			api_get_path(WEB_CODE_PATH)."blog/blog.php?action=view_post&blog_id=".intval($blog_id)."&post_id=".intval($post_id)."&".api_get_cidreq(),
 			null,
 			array('enctype' => 'multipart/form-data')
 		);
@@ -2330,21 +2330,21 @@ 
 		$course_id = api_get_course_int_id();
 
 		//Handle leap year
-		$numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+		$numberofdays = array(0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 
-		if(($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0))
+		if (($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0))
 			$numberofdays[2] = 29;
 
 		//Get the first day of the month
 		$dayone = getdate(mktime(0, 0, 0, $month, 1, $year));
-		$monthName = $MonthsLong[$month-1];
+		$monthName = $MonthsLong[$month - 1];
 
 		//Start the week on monday
 		$startdayofweek = $dayone['wday'] <> 0 ? ($dayone['wday'] - 1) : 6;
 		$blogId = isset($_GET['blog_id']) ? intval($_GET['blog_id']) : null;
 		$filter = isset($_GET['filter']) ? Security::remove_XSS($_GET['filter']) : null;
-		$backwardsURL = api_get_self()."?blog_id=" . $blogId."&filter=" . $filter."&month=". ($month == 1 ? 12 : $month -1)."&year=". ($month == 1 ? $year -1 : $year);
-		$forewardsURL = api_get_self()."?blog_id=" . $blogId."&filter=" . $filter."&month=". ($month == 12 ? 1 : $month +1)."&year=". ($month == 12 ? $year +1 : $year);
+		$backwardsURL = api_get_self()."?blog_id=".$blogId."&filter=".$filter."&month=".($month == 1 ? 12 : $month - 1)."&year=".($month == 1 ? $year - 1 : $year);
+		$forewardsURL = api_get_self()."?blog_id=".$blogId."&filter=".$filter."&month=".($month == 12 ? 1 : $month + 1)."&year=".($month == 12 ? $year + 1 : $year);
 
 		// Get posts for this month
 		$sql = "SELECT post.*, DAYOFMONTH(date_creation) as post_day, user.lastname, user.firstname
@@ -2353,15 +2353,15 @@ 
 				ON post.author_id = user.user_id
 				WHERE
 					post.c_id = $course_id AND
-					post.blog_id = '".(int)$blog_id."' AND
-					MONTH(date_creation) = '".(int)$month."' AND
-					YEAR(date_creation) = '".(int)$year."'
+					post.blog_id = '".(int) $blog_id."' AND
+					MONTH(date_creation) = '".(int) $month."' AND
+					YEAR(date_creation) = '".(int) $year."'
 				ORDER BY date_creation";
 		$result = Database::query($sql);
 
 		// We will create an array of days on which there are posts.
-		if( Database::num_rows($result) > 0) {
-			while($blog_post = Database::fetch_array($result)) {
+		if (Database::num_rows($result) > 0) {
+			while ($blog_post = Database::fetch_array($result)) {
 				// If the day of this post is not yet in the array, add it.
 				if (!in_array($blog_post['post_day'], $posts))
 					$posts[] = $blog_post['post_day'];
@@ -2378,9 +2378,9 @@ 
 					task_rel_user.c_id = $course_id AND
 					task.c_id = $course_id AND
 					blog.c_id = $course_id AND
-					task_rel_user.user_id = '".(int)$_user['user_id']."' AND
-					MONTH(target_date) = '".(int)$month."' AND
-					YEAR(target_date) = '".(int)$year."'
+					task_rel_user.user_id = '".(int) $_user['user_id']."' AND
+					MONTH(target_date) = '".(int) $month."' AND
+					YEAR(target_date) = '".(int) $year."'
 				ORDER BY target_date ASC";
 			$result = Database::query($sql);
 
@@ -2403,7 +2403,7 @@ 
 
 		echo "<tr>\n";
 
-		for($ii = 1; $ii < 8; $ii ++)
+		for ($ii = 1; $ii < 8; $ii++)
 			echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>";
 
 		echo "</tr>";
@@ -2413,24 +2413,24 @@ 
 
 		while ($curday <= $numberofdays[$month]) {
 			echo "<tr>";
-			for ($ii = 0; $ii < 7; $ii ++) {
+			for ($ii = 0; $ii < 7; $ii++) {
 				if (($curday == -1) && ($ii == $startdayofweek))
 					$curday = 1;
 
 			 	if (($curday > 0) && ($curday <= $numberofdays[$month])) {
-					$bgcolor = $ii < 5 ? $class="class=\"days_week\"" : $class="class=\"days_weekend\"";
+					$bgcolor = $ii < 5 ? $class = "class=\"days_week\"" : $class = "class=\"days_weekend\"";
 					$dayheader = "$curday";
 
-					if(($curday == $today['mday']) && ($year == $today['year']) && ($month == $today['mon'])) {
+					if (($curday == $today['mday']) && ($year == $today['year']) && ($month == $today['mon'])) {
 						$dayheader = "$curday";
 						$class = "class=\"days_today\"";
 					}
 
-					echo "<td " . $class.">";
+					echo "<td ".$class.">";
 
 					// If there are posts on this day, create a filter link.
-					if(in_array($curday, $posts))
-						echo '<a href="blog.php?blog_id=' . $blog_id . '&filter=' . $year . '-' . $month . '-' . $curday . '&month=' . $month . '&year=' . $year . '" title="' . get_lang('ViewPostsOfThisDay') . '">' . $curday . '</a>';
+					if (in_array($curday, $posts))
+						echo '<a href="blog.php?blog_id='.$blog_id.'&filter='.$year.'-'.$month.'-'.$curday.'&month='.$month.'&year='.$year.'" title="'.get_lang('ViewPostsOfThisDay').'">'.$curday.'</a>';
 					else
 						echo $dayheader;
 
@@ -2438,14 +2438,14 @@ 
 						if (isset($tasks[$curday]) && is_array($tasks[$curday])) {
 							// Add tasks to calendar
 							foreach ($tasks[$curday] as $task) {
-								echo '<a href="blog.php?action=execute_task&blog_id=' . $task['blog_id'] . '&task_id='.stripslashes($task['task_id']) . '" title="' . $task['title'] . ' : ' . get_lang('InBlog') . ' : ' . $task['blog_name'] . ' - ' . get_lang('ExecuteThisTask') . '">
-								<img src="../img/blog_task.gif" alt="Task" title="' . get_lang('ExecuteThisTask') . '" /></a>';
+								echo '<a href="blog.php?action=execute_task&blog_id='.$task['blog_id'].'&task_id='.stripslashes($task['task_id']).'" title="'.$task['title'].' : '.get_lang('InBlog').' : '.$task['blog_name'].' - '.get_lang('ExecuteThisTask').'">
+								<img src="../img/blog_task.gif" alt="Task" title="' . get_lang('ExecuteThisTask').'" /></a>';
 							}
 						}
 					}
 
 					echo "</td>";
-					$curday ++;
+					$curday++;
 				} else
 					echo "<td>&nbsp;</td>";
 			}
@@ -2483,7 +2483,7 @@ 
 	public static function display_edit_blog_form($blog_id)
 	{
 	    $course_id = api_get_course_int_id();
-		$blog_id= intval($blog_id);
+		$blog_id = intval($blog_id);
 		$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
 
 		$sql = "SELECT blog_id, blog_name, blog_subtitle
@@ -2498,7 +2498,7 @@ 
 			$blog['blog_subtitle'] = Security::remove_XSS($_POST['blog_subtitle']);
 		}
 
-        $form = new FormValidator('edit_blog', 'post','blog_admin.php?action=edit&blog_id='.intval($_GET['blog_id']));
+        $form = new FormValidator('edit_blog', 'post', 'blog_admin.php?action=edit&blog_id='.intval($_GET['blog_id']));
         $form->addElement('header', get_lang('EditBlog'));
         $form->addElement('text', 'blog_name', get_lang('Title'));
         $form->addElement('textarea', 'blog_subtitle', get_lang('SubTitle'));
@@ -2535,8 +2535,8 @@ 
 		$result = Database::query($sql);
 		$list_info = array();
 		if (Database::num_rows($result)) {
-			while ($row_project=Database::fetch_row($result)) {
-				$list_info[]=$row_project;
+			while ($row_project = Database::fetch_row($result)) {
+				$list_info[] = $row_project;
 			}
 		}
 
@@ -2548,39 +2548,39 @@ 
 				// Validation when belongs to a session
 				$session_img = api_get_session_image($info_log[4], $_user['status']);
 
-				$url_start_blog = 'blog.php' ."?". "blog_id=".$info_log[3]. "&".api_get_cidreq();
+				$url_start_blog = 'blog.php'."?"."blog_id=".$info_log[3]."&".api_get_cidreq();
 				$title = $info_log[0];
                         $image = Display::return_icon('blog.png', $title);
-    			$list_name = '<div style="float: left; width: 35px; height: 22px;"><a href="'.$url_start_blog.'">' . $image . '</a></div><a href="'.$url_start_blog.'">' .$title. '</a>' . $session_img;
+    			$list_name = '<div style="float: left; width: 35px; height: 22px;"><a href="'.$url_start_blog.'">'.$image.'</a></div><a href="'.$url_start_blog.'">'.$title.'</a>'.$session_img;
 
 				$list_body_blog[] = $list_name;
 				$list_body_blog[] = $info_log[1];
 
-				$visibility_icon=($info_log[2]==0) ? 'invisible' : 'visible';
-				$visibility_info=($info_log[2]==0) ? 'Visible' : 'Invisible';
-			 	$my_image = '<a href="' .api_get_self(). '?action=edit&blog_id=' . $info_log[3] . '">';
-                                $my_image.= Display::return_icon('edit.png', get_lang('EditBlog'));
+				$visibility_icon = ($info_log[2] == 0) ? 'invisible' : 'visible';
+				$visibility_info = ($info_log[2] == 0) ? 'Visible' : 'Invisible';
+			 	$my_image = '<a href="'.api_get_self().'?action=edit&blog_id='.$info_log[3].'">';
+                                $my_image .= Display::return_icon('edit.png', get_lang('EditBlog'));
 
-				$my_image.= "</a>\n";
-				$my_image.= '<a href="' .api_get_self(). '?action=delete&blog_id=' . $info_log[3] . '" ';
-				$my_image.= 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;" >';
-                                $my_image.= Display::return_icon('delete.png', get_lang('DeleteBlog'));
+				$my_image .= "</a>\n";
+				$my_image .= '<a href="'.api_get_self().'?action=delete&blog_id='.$info_log[3].'" ';
+				$my_image .= 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)).'\')) return false;" >';
+                                $my_image .= Display::return_icon('delete.png', get_lang('DeleteBlog'));
 
-				$my_image.= "</a>\n";
-				$my_image.= '<a href="' .api_get_self(). '?action=visibility&blog_id=' . $info_log[3] . '">';
-                                $my_image.= Display::return_icon($visibility_icon . '.gif', get_lang($visibility_info));
+				$my_image .= "</a>\n";
+				$my_image .= '<a href="'.api_get_self().'?action=visibility&blog_id='.$info_log[3].'">';
+                                $my_image .= Display::return_icon($visibility_icon.'.gif', get_lang($visibility_info));
 
-				$my_image.= "</a>\n";
+				$my_image .= "</a>\n";
 
-				$list_body_blog[]=$my_image;
+				$list_body_blog[] = $my_image;
 
-				$list_content_blog[]=$list_body_blog;
+				$list_content_blog[] = $list_body_blog;
 				$list_body_blog = array();
 
 			}
-			$parameters='';
+			$parameters = '';
 			//$parameters=array('action'=>Security::remove_XSS($_GET['action']));
-			$table = new SortableTableFromArrayConfig($list_content_blog, 1,20,'project');
+			$table = new SortableTableFromArrayConfig($list_content_blog, 1, 20, 'project');
 			//$table->set_additional_parameters($parameters);
 			$table->set_header(0, get_lang('Title'));
 			$table->set_header(1, get_lang('SubTitle'));
@@ -2605,34 +2605,34 @@ 
  * @author Julio Montoya Dokeos
  * @version avril 2008, dokeos 1.8.5
  */
-function get_blog_attachment($blog_id, $post_id=null,$comment_id=null)
+function get_blog_attachment($blog_id, $post_id = null, $comment_id = null)
 {
 	$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
 
 	$blog_id = intval($blog_id);
 	$comment_id = intval($comment_id);
 	$post_id = intval($post_id);
-	$row=array();
-	$where='';
+	$row = array();
+	$where = '';
 	if (!empty ($post_id) && is_numeric($post_id)) {
-		$where.=' AND post_id ="'.$post_id.'" ';
+		$where .= ' AND post_id ="'.$post_id.'" ';
 	}
 
 	if (!empty ($comment_id) && is_numeric($comment_id)) {
 		if (!empty ($post_id)) {
-			$where.= ' AND ';
+			$where .= ' AND ';
 		}
-		$where.=' comment_id ="'.$comment_id.'" ';
+		$where .= ' comment_id ="'.$comment_id.'" ';
 	}
 
     $course_id = api_get_course_int_id();
 
-	$sql = 'SELECT path, filename, comment FROM '. $blog_table_attachment.'
+	$sql = 'SELECT path, filename, comment FROM '.$blog_table_attachment.'
 	        WHERE c_id = '.$course_id.' AND blog_id ="'.intval($blog_id).'"  '.$where;
 
-	$result=Database::query($sql);
-	if (Database::num_rows($result)!=0) {
-		$row=Database::fetch_array($result);
+	$result = Database::query($sql);
+	if (Database::num_rows($result) != 0) {
+		$row = Database::fetch_array($result);
 	}
 	return $row;
 }
@@ -2646,7 +2646,7 @@ 
  * @version avril 2008, dokeos 1.8.5
  */
 
-function delete_all_blog_attachment($blog_id,$post_id=null,$comment_id=null)
+function delete_all_blog_attachment($blog_id, $post_id = null, $comment_id = null)
 {
 	$_course = api_get_course_info();
 	$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
@@ -2670,22 +2670,22 @@ 
     }
 
 	// delete all files in directory
-	$courseDir   = $_course['path'].'/upload/blog';
+	$courseDir = $_course['path'].'/upload/blog';
 	$sys_course_path = api_get_path(SYS_COURSE_PATH);
 	$updir = $sys_course_path.$courseDir;
 
 	$sql = 'SELECT path FROM '.$blog_table_attachment.'
 	        WHERE c_id = '.$course_id.' AND blog_id ="'.intval($blog_id).'"  '.$where;
-	$result=Database::query($sql);
+	$result = Database::query($sql);
 
-	while ($row=Database::fetch_row($result)) {
-		$file=$updir.'/'.$row[0];
-		if (Security::check_abs_path($file,$updir) )
+	while ($row = Database::fetch_row($result)) {
+		$file = $updir.'/'.$row[0];
+		if (Security::check_abs_path($file, $updir))
 		{
 			@ unlink($file);
 		}
 	}
-	$sql = 'DELETE FROM '. $blog_table_attachment.'
+	$sql = 'DELETE FROM '.$blog_table_attachment.'
 	        WHERE c_id = '.$course_id.' AND  blog_id ="'.intval($blog_id).'"  '.$where;
 	Database::query($sql);
 }
@@ -2698,8 +2698,8 @@ 
 function get_blog_post_from_user($course_code, $user_id)
 {
 	$tbl_blogs 		= Database::get_course_table(TABLE_BLOGS);
-	$tbl_blog_post 	= Database::get_course_table(TABLE_BLOGS_POSTS);
-	$course_info 	= api_get_course_info($course_code);
+	$tbl_blog_post = Database::get_course_table(TABLE_BLOGS_POSTS);
+	$course_info = api_get_course_info($course_code);
 	$course_id 		= $course_info['real_id'];
 
 	$sql = "SELECT DISTINCT blog.blog_id, post_id, title, full_text, post.date_creation
@@ -2714,13 +2714,13 @@ 
 	$result = Database::query($sql);
 	$return_data = '';
 
-	if (Database::num_rows($result)!=0) {
-		while ($row=Database::fetch_array($result)) {
-			$return_data.=  '<div class="clear"></div><br />';
-			$return_data.=  '<div class="actions" style="margin-left:5px;margin-right:5px;">'.Display::return_icon('blog_article.png',get_lang('BlogPosts')).' '.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.$my_course_id.' " >'.get_lang('SeeBlog').'</a></div></div>';
-			$return_data.=  '<br / >';
-			$return_data.= $row['full_text'];
-			$return_data.= '<br /><br />';
+	if (Database::num_rows($result) != 0) {
+		while ($row = Database::fetch_array($result)) {
+			$return_data .= '<div class="clear"></div><br />';
+			$return_data .= '<div class="actions" style="margin-left:5px;margin-right:5px;">'.Display::return_icon('blog_article.png', get_lang('BlogPosts')).' '.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.$my_course_id.' " >'.get_lang('SeeBlog').'</a></div></div>';
+			$return_data .= '<br / >';
+			$return_data .= $row['full_text'];
+			$return_data .= '<br /><br />';
 		}
 	}
 	return $return_data;
@@ -2750,14 +2750,14 @@ 
 			ORDER BY blog_name";
 	$result = Database::query($sql);
 	$return_data = '';
-	if (Database::num_rows($result)!=0) {
-		while ($row=Database::fetch_array($result)) {
-			$return_data.=  '<div class="clear"></div><br />';
-			$return_data.=  '<div class="actions" style="margin-left:5px;margin-right:5px;">'.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.Security::remove_XSS($course_code).' " >'.get_lang('SeeBlog').'</a></div></div>';
-			$return_data.=  '<br / >';
+	if (Database::num_rows($result) != 0) {
+		while ($row = Database::fetch_array($result)) {
+			$return_data .= '<div class="clear"></div><br />';
+			$return_data .= '<div class="actions" style="margin-left:5px;margin-right:5px;">'.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.Security::remove_XSS($course_code).' " >'.get_lang('SeeBlog').'</a></div></div>';
+			$return_data .= '<br / >';
 			//$return_data.=  '<strong>'.$row['title'].'</strong>'; echo '<br>';*/
-			$return_data.=  $row['comment'];
-			$return_data.=  '<br />';
+			$return_data .= $row['comment'];
+			$return_data .= '<br />';
 		}
 	}
 	return $return_data;

Braces +26 added lines, -18 removed lines

@@ -1009,8 +1009,9 @@ 
             $blog_post_actions .= '</a>';
         }
 
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_rate'))
-			$rating_select = Blog::display_rating_form('post',$blog_id,$post_id);
+		if (api_is_allowed('BLOG_' . $blog_id, 'article_rate')) {
+					$rating_select = Blog::display_rating_form('post',$blog_id,$post_id);
+		}
 
 		$blog_post_text=stripslashes($blog_post_text);
 
@@ -1654,8 +1655,9 @@ 
 
 						$arrPermissions = array();
 
-						while ($row = Database::fetch_array($result))
-							$arrPermissions[] = $row['action'];
+						while ($row = Database::fetch_array($result)) {
+													$arrPermissions[] = $row['action'];
+						}
 
 						    echo '<tr>';
 							echo '<td style="text-align:right; vertical-align:top;">' . get_lang('TaskManager') . ':&nbsp;&nbsp;</td>';
@@ -2332,8 +2334,9 @@ 
 		//Handle leap year
 		$numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 
-		if(($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0))
-			$numberofdays[2] = 29;
+		if(($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0)) {
+					$numberofdays[2] = 29;
+		}
 
 		//Get the first day of the month
 		$dayone = getdate(mktime(0, 0, 0, $month, 1, $year));
@@ -2363,8 +2366,9 @@ 
 		if( Database::num_rows($result) > 0) {
 			while($blog_post = Database::fetch_array($result)) {
 				// If the day of this post is not yet in the array, add it.
-				if (!in_array($blog_post['post_day'], $posts))
-					$posts[] = $blog_post['post_day'];
+				if (!in_array($blog_post['post_day'], $posts)) {
+									$posts[] = $blog_post['post_day'];
+				}
 			}
 		}
 
@@ -2403,8 +2407,9 @@ 
 
 		echo "<tr>\n";
 
-		for($ii = 1; $ii < 8; $ii ++)
-			echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>";
+		for($ii = 1; $ii < 8; $ii ++) {
+					echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>";
+		}
 
 		echo "</tr>";
 
@@ -2414,8 +2419,9 @@ 
 		while ($curday <= $numberofdays[$month]) {
 			echo "<tr>";
 			for ($ii = 0; $ii < 7; $ii ++) {
-				if (($curday == -1) && ($ii == $startdayofweek))
-					$curday = 1;
+				if (($curday == -1) && ($ii == $startdayofweek)) {
+									$curday = 1;
+				}
 
 			 	if (($curday > 0) && ($curday <= $numberofdays[$month])) {
 					$bgcolor = $ii < 5 ? $class="class=\"days_week\"" : $class="class=\"days_weekend\"";
@@ -2429,10 +2435,11 @@ 
 					echo "<td " . $class.">";
 
 					// If there are posts on this day, create a filter link.
-					if(in_array($curday, $posts))
-						echo '<a href="blog.php?blog_id=' . $blog_id . '&filter=' . $year . '-' . $month . '-' . $curday . '&month=' . $month . '&year=' . $year . '" title="' . get_lang('ViewPostsOfThisDay') . '">' . $curday . '</a>';
-					else
-						echo $dayheader;
+					if(in_array($curday, $posts)) {
+											echo '<a href="blog.php?blog_id=' . $blog_id . '&filter=' . $year . '-' . $month . '-' . $curday . '&month=' . $month . '&year=' . $year . '" title="' . get_lang('ViewPostsOfThisDay') . '">' . $curday . '</a>';
+					} else {
+											echo $dayheader;
+					}
 
 					if (count($tasks) > 0) {
 						if (isset($tasks[$curday]) && is_array($tasks[$curday])) {
@@ -2446,8 +2453,9 @@ 
 
 					echo "</td>";
 					$curday ++;
-				} else
-					echo "<td>&nbsp;</td>";
+				} else {
+									echo "<td>&nbsp;</td>";
+				}
 			}
 			echo "</tr>";
 		}