chamilo / chamilo-lms

main/wiki/wiki.inc.php

Spacing +647 added lines, -647 removed lines

@@ -99,25 +99,25 @@ 
      **/
     public function links_to($input)
     {
-        $input_array = preg_split("/(\[\[|\]\])/",$input,-1, PREG_SPLIT_DELIM_CAPTURE);
+        $input_array = preg_split("/(\[\[|\]\])/", $input, -1, PREG_SPLIT_DELIM_CAPTURE);
         $all_links = array();
 
         foreach ($input_array as $key=>$value) {
-            if (isset($input_array[$key-1]) && $input_array[$key-1] == '[[' &&
-                isset($input_array[$key+1]) && $input_array[$key+1] == ']]'
+            if (isset($input_array[$key - 1]) && $input_array[$key - 1] == '[[' &&
+                isset($input_array[$key + 1]) && $input_array[$key + 1] == ']]'
             ) {
                 if (api_strpos($value, "|") !== false) {
-                    $full_link_array=explode("|", $value);
-                    $link=trim($full_link_array[0]);
-                    $title=trim($full_link_array[1]);
+                    $full_link_array = explode("|", $value);
+                    $link = trim($full_link_array[0]);
+                    $title = trim($full_link_array[1]);
                 } else {
-                    $link=trim($value);
-                    $title=trim($value);
+                    $link = trim($value);
+                    $title = trim($value);
                 }
-                unset($input_array[$key-1]);
-                unset($input_array[$key+1]);
+                unset($input_array[$key - 1]);
+                unset($input_array[$key + 1]);
                 //replace blank spaces by _ within the links. But to remove links at the end add a blank space
-                $all_links[]= Database::escape_string(str_replace(' ','_',$link)).' ';
+                $all_links[] = Database::escape_string(str_replace(' ', '_', $link)).' ';
             }
         }
         $output = implode($all_links);
@@ -131,9 +131,9 @@ 
      **/
     public function detect_external_link($input)
     {
-        $exlink='href=';
-        $exlinkStyle='class="wiki_link_ext" href=';
-        $output=str_replace($exlink, $exlinkStyle, $input);
+        $exlink = 'href=';
+        $exlinkStyle = 'class="wiki_link_ext" href=';
+        $output = str_replace($exlink, $exlinkStyle, $input);
         return $output;
     }
 
@@ -144,7 +144,7 @@ 
     public function detect_anchor_link($input)
     {
         $anchorlink = 'href="#';
-        $anchorlinkStyle='class="wiki_anchor_link" href="#';
+        $anchorlinkStyle = 'class="wiki_anchor_link" href="#';
         $output = str_replace($anchorlink, $anchorlinkStyle, $input);
 
         return $output;
@@ -169,7 +169,7 @@ 
      **/
     public function detect_ftp_link($input)
     {
-        $ftplink='href="ftp';
+        $ftplink = 'href="ftp';
         $ftplinkStyle = 'class="wiki_ftp_link" href="ftp';
         $output = str_replace($ftplink, $ftplinkStyle, $input);
 
@@ -214,21 +214,21 @@ 
     {
         $groupId = api_get_group_id();
         //now doubles brackets
-        $input_array = preg_split("/(\[\[|\]\])/",$input,-1, PREG_SPLIT_DELIM_CAPTURE);
+        $input_array = preg_split("/(\[\[|\]\])/", $input, -1, PREG_SPLIT_DELIM_CAPTURE);
 
         foreach ($input_array as $key => $value) {
             //now doubles brackets
-            if (isset($input_array[$key-1]) && $input_array[$key-1] == '[[' AND
-                $input_array[$key+1] == ']]'
+            if (isset($input_array[$key - 1]) && $input_array[$key - 1] == '[[' AND
+                $input_array[$key + 1] == ']]'
             ) {
                 // now full wikilink
-                if (api_strpos($value, "|") !== false){
-                    $full_link_array=explode("|", $value);
-                    $link=trim(strip_tags($full_link_array[0]));
-                    $title=trim($full_link_array[1]);
+                if (api_strpos($value, "|") !== false) {
+                    $full_link_array = explode("|", $value);
+                    $link = trim(strip_tags($full_link_array[0]));
+                    $title = trim($full_link_array[1]);
                 } else {
-                    $link=trim(strip_tags($value));
-                    $title=trim($value);
+                    $link = trim(strip_tags($value));
+                    $title = trim($value);
                 }
 
                 //if wikilink is homepage
@@ -240,17 +240,17 @@ 
                 }
 
                 // note: checkreflink checks if the link is still free. If it is not used then it returns true, if it is used, then it returns false. Now the title may be different
-                if (self::checktitle(strtolower(str_replace(' ','_',$link)))) {
+                if (self::checktitle(strtolower(str_replace(' ', '_', $link)))) {
                     $link = api_html_entity_decode($link);
-                    $input_array[$key]='<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?'.api_get_cidreq().'&action=addnew&amp;title='.Security::remove_XSS($link).'&group_id='.$groupId.'" class="new_wiki_link">'.$title.'</a>';
+                    $input_array[$key] = '<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?'.api_get_cidreq().'&action=addnew&amp;title='.Security::remove_XSS($link).'&group_id='.$groupId.'" class="new_wiki_link">'.$title.'</a>';
                 } else {
-                    $input_array[$key]='<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?'.api_get_cidreq().'&action=showpage&amp;title='.urlencode(strtolower(str_replace(' ','_',$link))).'&group_id='.$groupId.'" class="wiki_link">'.$title.'</a>';
+                    $input_array[$key] = '<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?'.api_get_cidreq().'&action=showpage&amp;title='.urlencode(strtolower(str_replace(' ', '_', $link))).'&group_id='.$groupId.'" class="wiki_link">'.$title.'</a>';
                 }
-                unset($input_array[$key-1]);
-                unset($input_array[$key+1]);
+                unset($input_array[$key - 1]);
+                unset($input_array[$key + 1]);
             }
         }
-        $output = implode('',$input_array);
+        $output = implode('', $input_array);
         return $output;
     }
 
@@ -292,11 +292,11 @@ 
         // are not made here, but through the interce buttons
 
         // cleaning the variables
-        if (api_get_setting('htmlpurifier_wiki') == 'true'){
+        if (api_get_setting('htmlpurifier_wiki') == 'true') {
             //$purifier = new HTMLPurifier();
             $values['content'] = Security::remove_XSS($values['content']);
         }
-        $version = intval($values['version']) + 1 ;
+        $version = intval($values['version']) + 1;
         $linkTo = self::links_to($values['content']); //and check links content
 
         //cleaning config variables
@@ -319,7 +319,7 @@ 
             $_clean['startdate_assig'] = '0000-00-00 00:00:00';
         }
 
-        if (isset($values['initenddate']) && $values['initenddate']==1) {
+        if (isset($values['initenddate']) && $values['initenddate'] == 1) {
             $_clean['enddate_assig'] = $values['enddate_assig'];
         } else {
             $_clean['enddate_assig'] = '0000-00-00 00:00:00';
@@ -330,7 +330,7 @@ 
         }
 
         if (!empty($values['max_text']) || !empty($values['max_version'])) {
-            $_clean['max_text']	= $values['max_text'];
+            $_clean['max_text'] = $values['max_text'];
             $_clean['max_version'] = $values['max_version'];
         }
 
@@ -381,7 +381,7 @@ 
                 $groupId
             );
 
-            if ($values['page_id']== 0) {
+            if ($values['page_id'] == 0) {
                 $sql = 'UPDATE '.$tbl_wiki.' SET page_id="'.$id.'"
                         WHERE c_id = '.$course_id.' AND iid ="'.$id.'"';
                 Database::query($sql);
@@ -465,7 +465,7 @@ 
         $_course = $this->courseInfo;
         $r_user_id = api_get_user_id();
         $r_dtime = api_get_utc_datetime();
-        $r_version = $r_version+1;
+        $r_version = $r_version + 1;
         $r_comment = get_lang('RestoredFromVersion').': '.$c_version;
         $session_id = api_get_session_id();
         $course_id = api_get_course_int_id();
@@ -570,9 +570,9 @@ 
         // Unlike ordinary pages of pages of assignments.
         // Allow create a ordinary page although there is a assignment with the same name
         if ($_clean['assignment'] == 2 || $_clean['assignment'] == 1) {
-            $page = str_replace(' ','_',$values['title']."_uass".$assig_user_id);
+            $page = str_replace(' ', '_', $values['title']."_uass".$assig_user_id);
         } else {
-            $page = str_replace(' ','_',$values['title']);
+            $page = str_replace(' ', '_', $values['title']);
         }
         $_clean['reflink'] = $page;
         $_clean['title']   = trim($values['title']);
@@ -608,7 +608,7 @@ 
 
         $groupId = api_get_group_id();
 
-        $_clean['linksto'] = self::links_to($_clean['content']);	//check wikilinks
+        $_clean['linksto'] = self::links_to($_clean['content']); //check wikilinks
 
         // cleaning config variables
         $_clean['task'] = isset($values['task']) ? $values['task'] : '';
@@ -724,7 +724,7 @@ 
      */
     public function setForm($form, $row = array())
     {
-        $toolBar = api_is_allowed_to_edit(null,true)
+        $toolBar = api_is_allowed_to_edit(null, true)
             ? array('ToolbarSet' => 'Wiki', 'Width' => '100%', 'Height' => '400')
             : array('ToolbarSet' => 'WikiStudent', 'Width' => '100%', 'Height' => '400', 'UserStatus' => 'student');
 
@@ -735,7 +735,7 @@ 
 
         $form->addElement('select', 'progress', get_lang('Progress'), $progress);
 
-        if ((api_is_allowed_to_edit(false,true) ||
+        if ((api_is_allowed_to_edit(false, true) ||
             api_is_platform_admin()) &&
             isset($row['reflink']) && $row['reflink'] != 'index'
         ) {
@@ -875,13 +875,13 @@ 
         if ($newtitle) {
             $pageMIX = $newtitle; //display the page after it is created
         } else {
-            $pageMIX = $page;//display current page
+            $pageMIX = $page; //display current page
         }
 
         $filter = null;
         if (isset($_GET['view']) && $_GET['view']) {
             $_clean['view'] = Database::escape_string($_GET['view']);
-            $filter =' AND w.id="'.$_clean['view'].'"';
+            $filter = ' AND w.id="'.$_clean['view'].'"';
         }
 
         // First, check page visibility in the first page version
@@ -923,14 +923,14 @@ 
         }
 
         // if both are empty and we are displaying the index page then we display the default text.
-        if ($row['content']=='' && $row['title']=='' && $page=='index') {
+        if ($row['content'] == '' && $row['title'] == '' && $page == 'index') {
             if (api_is_allowed_to_edit(false, true) ||
                 api_is_platform_admin() ||
                 GroupManager::is_user_in_group(api_get_user_id(), api_get_group_id())
             ) {
                 //Table structure for better export to pdf
-                $default_table_for_content_Start='<table align="center" border="0"><tr><td align="center">';
-                $default_table_for_content_End='</td></tr></table>';
+                $default_table_for_content_Start = '<table align="center" border="0"><tr><td align="center">';
+                $default_table_for_content_End = '</td></tr></table>';
                 $content = $default_table_for_content_Start.
                     sprintf(get_lang('DefaultContent'), api_get_path(WEB_IMG_PATH)).
                     $default_table_for_content_End;
@@ -945,23 +945,23 @@ 
 
         //assignment mode: identify page type
         $icon_assignment = null;
-        if ($row['assignment']==1) {
-            $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',ICON_SIZE_SMALL);
-        } elseif($row['assignment']==2) {
-            $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
+        if ($row['assignment'] == 1) {
+            $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL);
+        } elseif ($row['assignment'] == 2) {
+            $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
         }
 
         //task mode
         $icon_task = null;
         if (!empty($row['task'])) {
-            $icon_task=Display::return_icon('wiki_task.png', get_lang('StandardTask'),'',ICON_SIZE_SMALL);
+            $icon_task = Display::return_icon('wiki_task.png', get_lang('StandardTask'), '', ICON_SIZE_SMALL);
         }
 
         // Show page. Show page to all users if isn't hide page. Mode assignments: if student is the author, can view
         if ($KeyVisibility == "1" ||
             api_is_allowed_to_edit(false, true) ||
             api_is_platform_admin() ||
-            ($row['assignment'] == 2 && $KeyVisibility=="0" && (api_get_user_id() == $row['user_id']))
+            ($row['assignment'] == 2 && $KeyVisibility == "0" && (api_get_user_id() == $row['user_id']))
         ) {
             $actionsLeft = '';
 
@@ -986,13 +986,13 @@ 
             $protect_page = null;
             $lock_unlock_protect = null;
             // page action: protecting (locking) the page
-            if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
-                if (self::check_protect_page()==1) {
+            if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+                if (self::check_protect_page() == 1) {
                     $protect_page = Display::return_icon('lock.png', get_lang('PageLockedExtra'), '', ICON_SIZE_MEDIUM);
-                    $lock_unlock_protect='unlock';
+                    $lock_unlock_protect = 'unlock';
                 } else {
                     $protect_page = Display::return_icon('unlock.png', get_lang('PageUnlockedExtra'), '', ICON_SIZE_MEDIUM);
-                    $lock_unlock_protect='lock';
+                    $lock_unlock_protect = 'lock';
                 }
             }
 
@@ -1004,13 +1004,13 @@ 
             $visibility_page = null;
             $lock_unlock_visibility = null;
             //page action: visibility
-            if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+            if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                 if (self::check_visibility_page() == 1) {
-                    $visibility_page = Display::return_icon('visible.png', get_lang('ShowPageExtra'),'', ICON_SIZE_MEDIUM);
+                    $visibility_page = Display::return_icon('visible.png', get_lang('ShowPageExtra'), '', ICON_SIZE_MEDIUM);
                     $lock_unlock_visibility = 'invisible';
 
                 } else {
-                    $visibility_page = Display::return_icon('invisible.png', get_lang('HidePageExtra'),'', ICON_SIZE_MEDIUM);
+                    $visibility_page = Display::return_icon('invisible.png', get_lang('HidePageExtra'), '', ICON_SIZE_MEDIUM);
                     $lock_unlock_visibility = 'visible';
                 }
             }
@@ -1022,11 +1022,11 @@ 
 
             //page action: notification
             if (api_is_allowed_to_session_edit()) {
-                if (self::check_notify_page($page)==1) {
-                    $notify_page = Display::return_icon('messagebox_info.png', get_lang('NotifyByEmail'),'',ICON_SIZE_MEDIUM);
+                if (self::check_notify_page($page) == 1) {
+                    $notify_page = Display::return_icon('messagebox_info.png', get_lang('NotifyByEmail'), '', ICON_SIZE_MEDIUM);
                     $lock_unlock_notify_page = 'unlocknotify';
                 } else {
-                    $notify_page = Display::return_icon('mail.png', get_lang('CancelNotifyByEmail'),'',ICON_SIZE_MEDIUM);
+                    $notify_page = Display::return_icon('mail.png', get_lang('CancelNotifyByEmail'), '', ICON_SIZE_MEDIUM);
                     $lock_unlock_notify_page = 'locknotify';
                 }
             }
@@ -1038,33 +1038,33 @@ 
                 ) {
                     // menu discuss page
                     $actionsRight .= '<a href="index.php?'.api_get_cidreq().'&action=discuss&title='.api_htmlentities(urlencode($page)).'" '.self::is_active_navigation_tab('discuss').'>'.
-                        Display::return_icon('discuss.png',get_lang('DiscussThisPage'),'',ICON_SIZE_MEDIUM).'</a>';
+                        Display::return_icon('discuss.png', get_lang('DiscussThisPage'), '', ICON_SIZE_MEDIUM).'</a>';
                 }
 
                 //menu history
                 $actionsRight .= '<a href="index.php?'.api_get_cidreq().'&action=history&title='.api_htmlentities(urlencode($page)).'" '.self::is_active_navigation_tab('history').'>'.
-                    Display::return_icon('history.png',get_lang('ShowPageHistory'),'',ICON_SIZE_MEDIUM).'</a>';
+                    Display::return_icon('history.png', get_lang('ShowPageHistory'), '', ICON_SIZE_MEDIUM).'</a>';
                 //menu linkspages
                 $actionsRight .= '<a href="index.php?'.api_get_cidreq().'action=links&title='.api_htmlentities(urlencode($page)).'" '.self::is_active_navigation_tab('links').'>'.
-                    Display::return_icon('what_link_here.png',get_lang('LinksPages'),'',ICON_SIZE_MEDIUM).'</a>';
+                    Display::return_icon('what_link_here.png', get_lang('LinksPages'), '', ICON_SIZE_MEDIUM).'</a>';
 
                 //menu delete wikipage
-                if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                     $actionsRight .= '<a href="index.php?action=delete&'.api_get_cidreq().'&title='.api_htmlentities(urlencode($page)).'"'.self::is_active_navigation_tab('delete').'>'.
-                        Display::return_icon('delete.png',get_lang('DeleteThisPage'),'',ICON_SIZE_MEDIUM).'</a>';
+                        Display::return_icon('delete.png', get_lang('DeleteThisPage'), '', ICON_SIZE_MEDIUM).'</a>';
                 }
 
                 $actionsRight .= '<a href="index.php?'.api_get_cidreq().'&action=showpage&actionpage='.$lock_unlock_notify_page.'&title='.api_htmlentities(urlencode($page)).'">'.
                     $notify_page.'</a>';
 
                 // Page action: copy last version to doc area
-                if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                     $actionsRight .= '<a href="index.php?'.api_get_cidreq().'&action=export2doc&wiki_id='.$row['id'].'">'.
                         Display::return_icon('export_to_documents.png', get_lang('ExportToDocArea'), '', ICON_SIZE_MEDIUM).'</a>';
                 }
 
                 $actionsRight .= '<a href="index.php?'.api_get_cidreq().'&action=export_to_pdf&wiki_id='.$row['id'].'">'.
-                    Display::return_icon('pdf.png',get_lang('ExportToPDF'),'',ICON_SIZE_MEDIUM).'</a>';
+                    Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
 
                 $unoconv = api_get_configuration_value('unoconv.binaries');
                 if ($unoconv) {
@@ -1120,7 +1120,7 @@ 
                     )
                 );
 
-            $footerWiki = '<div id="wikifooter">'.get_lang('Progress').': '.($row['progress']*10).'%&nbsp;&nbsp;&nbsp;'.get_lang('Rating').': '.$row['score'].'&nbsp;&nbsp;&nbsp;'.get_lang('Words').': '.self::word_count($content).'</div>';
+            $footerWiki = '<div id="wikifooter">'.get_lang('Progress').': '.($row['progress'] * 10).'%&nbsp;&nbsp;&nbsp;'.get_lang('Rating').': '.$row['score'].'&nbsp;&nbsp;&nbsp;'.get_lang('Words').': '.self::word_count($content).'</div>';
 
             echo Display::panel($pageWiki, $pageTitle, $footerWiki);
         } //end filter visibility
@@ -1144,7 +1144,7 @@ 
 
         # strip all html tags
         $wc = strip_tags($document);
-        $wc = html_entity_decode($wc, ENT_NOQUOTES, 'UTF-8');// TODO:test also old html_entity_decode(utf8_encode($wc))
+        $wc = html_entity_decode($wc, ENT_NOQUOTES, 'UTF-8'); // TODO:test also old html_entity_decode(utf8_encode($wc))
 
         # remove 'words' that don't consist of alphanumerical characters or punctuation. And fix accents and some letters
         $pattern = "#[^(\w|\d|\'|\"|\.|\!|\?|;|,|\\|\/|\-|:|\&|@|á|é|í|ó|ú|à|è|ì|ò|ù|ä|ë|ï|ö|ü|Á|É|Í|Ó|Ú|À|È|Ò|Ù|Ä|Ë|Ï|Ö|Ü|â|ê|î|ô|û|Â|Ê|Î|Ô|Û|ñ|Ñ|ç|Ç)]+#";
@@ -1177,15 +1177,15 @@ 
 
         $course_id = api_get_course_int_id();
 
-        $sql='SELECT id FROM '.$tbl_wiki.'
+        $sql = 'SELECT id FROM '.$tbl_wiki.'
               WHERE
                 c_id = '.$course_id.' AND
                 title="'.Database::escape_string($title).'" AND
                 '.$groupfilter.$condition_session.'
               ORDER BY id ASC';
-        $result=Database::query($sql);
-        $cant=Database::num_rows($result);
-        if ($cant>0) {
+        $result = Database::query($sql);
+        $cant = Database::num_rows($result);
+        if ($cant > 0) {
             return true;
         } else {
             return false;
@@ -1267,20 +1267,20 @@ 
         $page = $this->page;
 
         $course_id = api_get_course_int_id();
-        $sql='SELECT * FROM '.$tbl_wiki.'
+        $sql = 'SELECT * FROM '.$tbl_wiki.'
               WHERE
                 c_id = '.$course_id.' AND
                 reflink="'.Database::escape_string($page).'" AND
                 '.$groupfilter.$condition_session.'
               ORDER BY id ASC';
 
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
         $status_editlock = $row['editlock'];
         $id = $row['id'];
 
         ///change status
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
             if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'lock' && $status_editlock == 0) {
                 $status_editlock = 1;
             }
@@ -1292,13 +1292,13 @@ 
                     WHERE c_id = '.$course_id.' AND id="'.$id.'"';
             Database::query($sql);
 
-            $sql='SELECT * FROM '.$tbl_wiki.'
+            $sql = 'SELECT * FROM '.$tbl_wiki.'
                   WHERE
                     c_id = '.$course_id.' AND
                     reflink="'.Database::escape_string($page).'" AND
                     '.$groupfilter.$condition_session.'
                   ORDER BY id ASC';
-            $result=Database::query($sql);
+            $result = Database::query($sql);
             $row = Database::fetch_array($result);
         }
 
@@ -1329,13 +1329,13 @@ 
         $row = Database::fetch_array($result);
         $status_visibility = $row['visibility'];
         //change status
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
-            if (isset($_GET['actionpage']) && $_GET['actionpage']=='visible' && $status_visibility==0) {
-                $status_visibility=1;
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'visible' && $status_visibility == 0) {
+                $status_visibility = 1;
 
             }
-            if (isset($_GET['actionpage']) && $_GET['actionpage']=='invisible' && $status_visibility==1) {
-                $status_visibility=0;
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'invisible' && $status_visibility == 1) {
+                $status_visibility = 0;
             }
 
             $sql = 'UPDATE '.$tbl_wiki.' SET visibility="'.Database::escape_string($status_visibility).'"
@@ -1352,12 +1352,12 @@ 
                         reflink="'.Database::escape_string($page).'" AND
                         '.$groupfilter.$condition_session.'
                     ORDER BY id ASC';
-            $result=Database::query($sql);
+            $result = Database::query($sql);
             $row = Database::fetch_array($result);
         }
 
         if (empty($row['id'])) {
-            $row['visibility']= 1;
+            $row['visibility'] = 1;
         }
 
         //show status
@@ -1384,18 +1384,18 @@ 
                     reflink="'.Database::escape_string($page).'" AND
                     '.$groupfilter.$condition_session.'
                 ORDER BY id ASC';
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
 
         $status_visibility_disc = $row['visibility_disc'];
 
         //change status
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
-            if (isset($_GET['actionpage']) && $_GET['actionpage'] =='showdisc' && $status_visibility_disc==0) {
-                $status_visibility_disc=1;
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'showdisc' && $status_visibility_disc == 0) {
+                $status_visibility_disc = 1;
             }
-            if (isset($_GET['actionpage']) && $_GET['actionpage'] =='hidedisc' && $status_visibility_disc==1) {
-                $status_visibility_disc=0;
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'hidedisc' && $status_visibility_disc == 1) {
+                $status_visibility_disc = 0;
             }
 
             $sql = 'UPDATE '.$tbl_wiki.' SET visibility_disc="'.Database::escape_string($status_visibility_disc).'"
@@ -1443,14 +1443,14 @@ 
         $result = Database::query($sql);
         $row = Database::fetch_array($result);
 
-        $status_addlock_disc=$row['addlock_disc'];
+        $status_addlock_disc = $row['addlock_disc'];
 
         //change status
         if (api_is_allowed_to_edit() || api_is_platform_admin()) {
-            if (isset($_GET['actionpage']) && $_GET['actionpage'] =='lockdisc' && $status_addlock_disc==0) {
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'lockdisc' && $status_addlock_disc == 0) {
                 $status_addlock_disc = 1;
             }
-            if (isset($_GET['actionpage']) && $_GET['actionpage'] =='unlockdisc' && $status_addlock_disc==1) {
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'unlockdisc' && $status_addlock_disc == 1) {
                 $status_addlock_disc = 0;
             }
 
@@ -1472,8 +1472,8 @@ 
                         reflink="'.Database::escape_string($page).'" AND
                         '.$groupfilter.$condition_session.'
                     ORDER BY id ASC';
-            $result=Database::query($sql);
-            $row=Database::fetch_array($result);
+            $result = Database::query($sql);
+            $row = Database::fetch_array($result);
         }
 
         return $row['addlock_disc'];
@@ -1498,17 +1498,17 @@ 
                     reflink="'.Database::escape_string($page).'" AND
                     '.$groupfilter.$condition_session.'
                 ORDER BY id ASC';
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
-        $status_ratinglock_disc=$row['ratinglock_disc'];
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
+        $status_ratinglock_disc = $row['ratinglock_disc'];
 
         //change status
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
-            if (isset($_GET['actionpage']) && $_GET['actionpage'] =='lockrating' && $status_ratinglock_disc==0) {
-                $status_ratinglock_disc=1;
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'lockrating' && $status_ratinglock_disc == 0) {
+                $status_ratinglock_disc = 1;
             }
-            if (isset($_GET['actionpage']) && $_GET['actionpage'] =='unlockrating' && $status_ratinglock_disc==1) {
-                $status_ratinglock_disc=0;
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'unlockrating' && $status_ratinglock_disc == 1) {
+                $status_ratinglock_disc = 0;
             }
 
             $sql = 'UPDATE '.$tbl_wiki.'
@@ -1524,14 +1524,14 @@ 
             // these three lines remain necessary. They do that by changing the
             // page state is made when you press the button and not have to wait
             // to change his page
-            $sql='SELECT * FROM '.$tbl_wiki.'
+            $sql = 'SELECT * FROM '.$tbl_wiki.'
                   WHERE
                     c_id = '.$course_id.' AND
                     reflink="'.Database::escape_string($page).'" AND
                     '.$groupfilter.$condition_session.'
                   ORDER BY id ASC';
-            $result=Database::query($sql);
-            $row=Database::fetch_array($result);
+            $result = Database::query($sql);
+            $row = Database::fetch_array($result);
         }
 
         return $row['ratinglock_disc'];
@@ -1556,24 +1556,24 @@ 
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE c_id = '.$course_id.' AND reflink="'.$reflink.'" AND '.$groupfilter.$condition_session.'
                 ORDER BY id ASC';
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
         $id = $row['id'];
-        $sql='SELECT * FROM '.$tbl_wiki_mailcue.'
+        $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
               WHERE c_id = '.$course_id.' AND id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="P"';
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
 
         $idm = $row['id'];
 
         if (empty($idm)) {
-            $status_notify=0;
+            $status_notify = 0;
         } else {
-            $status_notify=1;
+            $status_notify = 1;
         }
 
         // Change status
-        if (isset($_GET['actionpage']) && $_GET['actionpage'] =='locknotify' && $status_notify==0) {
+        if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'locknotify' && $status_notify == 0) {
             $sql = "SELECT id FROM $tbl_wiki_mailcue
                     WHERE c_id = $course_id AND id = $id AND user_id = $userId";
             $result = Database::query($sql);
@@ -1582,18 +1582,18 @@ 
                 $exist = true;
             }
             if ($exist == false) {
-                $sql="INSERT INTO ".$tbl_wiki_mailcue." (c_id, id, user_id, type, group_id, session_id) VALUES
+                $sql = "INSERT INTO ".$tbl_wiki_mailcue." (c_id, id, user_id, type, group_id, session_id) VALUES
                 ($course_id, '".$id."','".api_get_user_id()."','P','".$groupId."','".$session_id."')";
                 Database::query($sql);
             }
-            $status_notify=1;
+            $status_notify = 1;
         }
 
-        if (isset($_GET['actionpage']) && $_GET['actionpage'] =='unlocknotify' && $status_notify==1) {
+        if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'unlocknotify' && $status_notify == 1) {
             $sql = 'DELETE FROM '.$tbl_wiki_mailcue.'
                     WHERE id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="P" AND c_id = '.$course_id;
             Database::query($sql);
-            $status_notify=0;
+            $status_notify = 0;
         }
 
         return $status_notify;
@@ -1619,9 +1619,9 @@ 
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE c_id = '.$course_id.' AND reflink="'.$reflink.'" AND '.$groupfilter.$condition_session.'
                 ORDER BY id ASC';
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
-        $id=$row['id'];
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
+        $id = $row['id'];
         $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
                 WHERE c_id = '.$course_id.' AND id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="D"';
         $result = Database::query($sql);
@@ -1629,23 +1629,23 @@ 
         $idm = $row['id'];
 
         if (empty($idm)) {
-            $status_notify_disc=0;
+            $status_notify_disc = 0;
         } else {
-            $status_notify_disc=1;
+            $status_notify_disc = 1;
         }
 
         //change status
-        if (isset($_GET['actionpage']) && $_GET['actionpage'] =='locknotifydisc' && $status_notify_disc==0) {
-            $sql="INSERT INTO ".$tbl_wiki_mailcue." (c_id, id, user_id, type, group_id, session_id) VALUES
+        if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'locknotifydisc' && $status_notify_disc == 0) {
+            $sql = "INSERT INTO ".$tbl_wiki_mailcue." (c_id, id, user_id, type, group_id, session_id) VALUES
             ($course_id, '".$id."','".api_get_user_id()."','D','".$groupId."','".$session_id."')";
             Database::query($sql);
-            $status_notify_disc=1;
+            $status_notify_disc = 1;
         }
-        if (isset($_GET['actionpage']) && $_GET['actionpage'] =='unlocknotifydisc' && $status_notify_disc==1) {
+        if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'unlocknotifydisc' && $status_notify_disc == 1) {
             $sql = 'DELETE FROM '.$tbl_wiki_mailcue.'
                     WHERE c_id = '.$course_id.' AND id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="D" AND c_id = '.$course_id;
             Database::query($sql);
-            $status_notify_disc=0;
+            $status_notify_disc = 0;
         }
 
         return $status_notify_disc;
@@ -1660,7 +1660,7 @@ 
         $tbl_wiki_mailcue = $this->tbl_wiki_mailcue;
         $course_id = api_get_course_int_id();
         $groupId = api_get_group_id();
-        $session_id=api_get_session_id();
+        $session_id = api_get_session_id();
 
         $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
                 WHERE
@@ -1669,31 +1669,31 @@ 
                     type="F" AND
                     group_id="'.$groupId.'" AND
                     session_id="'.$session_id.'"';
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
 
-        $idm=$row['user_id'];
+        $idm = $row['user_id'];
 
         if (empty($idm)) {
-            $status_notify_all=0;
+            $status_notify_all = 0;
         } else {
-            $status_notify_all=1;
+            $status_notify_all = 1;
         }
 
         //change status
-        if (isset($_GET['actionpage']) && $_GET['actionpage'] =='locknotifyall' && $status_notify_all==0) {
-            $sql="INSERT INTO ".$tbl_wiki_mailcue." (c_id, user_id, type, group_id, session_id) VALUES
+        if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'locknotifyall' && $status_notify_all == 0) {
+            $sql = "INSERT INTO ".$tbl_wiki_mailcue." (c_id, user_id, type, group_id, session_id) VALUES
             ($course_id, '".api_get_user_id()."','F','".$groupId."','".$session_id."')";
             Database::query($sql);
-            $status_notify_all=1;
+            $status_notify_all = 1;
         }
 
         if (isset($_GET['actionpage']) &&
             isset($_GET['actionpage']) &&
-            $_GET['actionpage']  =='unlocknotifyall' &&
+            $_GET['actionpage'] == 'unlocknotifyall' &&
             $status_notify_all == 1
         ) {
-            $sql ='DELETE FROM '.$tbl_wiki_mailcue.'
+            $sql = 'DELETE FROM '.$tbl_wiki_mailcue.'
                    WHERE
                     c_id = '.$course_id.' AND
                     user_id="'.api_get_user_id().'" AND
@@ -1702,7 +1702,7 @@ 
                     session_id="'.$session_id.'" AND
                     c_id = '.$course_id;
             Database::query($sql);
-            $status_notify_all=0;
+            $status_notify_all = 0;
         }
 
         //show status
@@ -1712,7 +1712,7 @@ 
     /**
      * Sends pending e-mails
      */
-    public function check_emailcue($id_or_ref, $type, $lastime='', $lastuser='')
+    public function check_emailcue($id_or_ref, $type, $lastime = '', $lastuser = '')
     {
         $tbl_wiki_mailcue = $this->tbl_wiki_mailcue;
         $tbl_wiki = $this->tbl_wiki;
@@ -1720,14 +1720,14 @@ 
         $groupfilter = $this->groupfilter;
         $_course = $this->courseInfo;
         $groupId = api_get_group_id();
-        $session_id=api_get_session_id();
+        $session_id = api_get_session_id();
         $course_id = api_get_course_int_id();
 
-        $group_properties  = GroupManager :: get_group_properties($groupId);
+        $group_properties = GroupManager :: get_group_properties($groupId);
         $group_name = $group_properties['name'];
         $allow_send_mail = false; //define the variable to below
         $email_assignment = null;
-        if ($type=='P') {
+        if ($type == 'P') {
             //if modifying a wiki page
             //first, current author and time
             //Who is the author?
@@ -1738,22 +1738,22 @@ 
             $year = substr($lastime, 0, 4);
             $month = substr($lastime, 5, 2);
             $day = substr($lastime, 8, 2);
-            $hours=substr($lastime, 11,2);
-            $minutes=substr($lastime, 14,2);
-            $seconds=substr($lastime, 17,2);
-            $email_date_changes=$day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds;
+            $hours = substr($lastime, 11, 2);
+            $minutes = substr($lastime, 14, 2);
+            $seconds = substr($lastime, 17, 2);
+            $email_date_changes = $day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds;
 
             //second, extract data from first reg
             $sql = 'SELECT * FROM '.$tbl_wiki.'
                     WHERE  c_id = '.$course_id.' AND reflink="'.$id_or_ref.'" AND '.$groupfilter.$condition_session.'
                     ORDER BY id ASC';
-            $result=Database::query($sql);
-            $row=Database::fetch_array($result);
+            $result = Database::query($sql);
+            $row = Database::fetch_array($result);
 
-            $id=$row['id'];
-            $email_page_name=$row['title'];
-            if ($row['visibility']==1) {
-                $allow_send_mail=true; //if visibility off - notify off
+            $id = $row['id'];
+            $email_page_name = $row['title'];
+            if ($row['visibility'] == 1) {
+                $allow_send_mail = true; //if visibility off - notify off
                 $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
                         WHERE
                             c_id = '.$course_id.' AND
@@ -1763,10 +1763,10 @@ 
                             group_id="'.$groupId.'" AND
                             session_id="'.$session_id.'"';
                 //type: P=page, D=discuss, F=full.
-                $result=Database::query($sql);
-                $emailtext=get_lang('EmailWikipageModified').' <strong>'.$email_page_name.'</strong> '.get_lang('Wiki');
+                $result = Database::query($sql);
+                $emailtext = get_lang('EmailWikipageModified').' <strong>'.$email_page_name.'</strong> '.get_lang('Wiki');
             }
-        } elseif ($type=='D') {
+        } elseif ($type == 'D') {
             //if added a post to discuss
 
             //first, current author and time
@@ -1778,25 +1778,25 @@ 
             $year = substr($lastime, 0, 4);
             $month = substr($lastime, 5, 2);
             $day = substr($lastime, 8, 2);
-            $hours=substr($lastime, 11,2);
-            $minutes=substr($lastime, 14,2);
-            $seconds=substr($lastime, 17,2);
-            $email_date_changes=$day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds;
+            $hours = substr($lastime, 11, 2);
+            $minutes = substr($lastime, 14, 2);
+            $seconds = substr($lastime, 17, 2);
+            $email_date_changes = $day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds;
 
             //second, extract data from first reg
 
-            $id=$id_or_ref; //$id_or_ref is id from tblwiki
+            $id = $id_or_ref; //$id_or_ref is id from tblwiki
 
             $sql = 'SELECT * FROM '.$tbl_wiki.'
                     WHERE c_id = '.$course_id.' AND id="'.$id.'"
                     ORDER BY id ASC';
 
-            $result=Database::query($sql);
-            $row=Database::fetch_array($result);
+            $result = Database::query($sql);
+            $row = Database::fetch_array($result);
 
-            $email_page_name=$row['title'];
-            if ($row['visibility_disc']==1) {
-                $allow_send_mail=true; //if visibility off - notify off
+            $email_page_name = $row['title'];
+            if ($row['visibility_disc'] == 1) {
+                $allow_send_mail = true; //if visibility off - notify off
                 $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
                         WHERE
                             c_id = '.$course_id.' AND
@@ -1807,22 +1807,22 @@ 
                             session_id="'.$session_id.'"';
                 //type: P=page, D=discuss, F=full
                 $result = Database::query($sql);
-                $emailtext=get_lang('EmailWikiPageDiscAdded').' <strong>'.$email_page_name.'</strong> '.get_lang('Wiki');
+                $emailtext = get_lang('EmailWikiPageDiscAdded').' <strong>'.$email_page_name.'</strong> '.get_lang('Wiki');
             }
-        } elseif($type=='A') {
+        } elseif ($type == 'A') {
             //for added pages
-            $id=0; //for tbl_wiki_mailcue
+            $id = 0; //for tbl_wiki_mailcue
             $sql = 'SELECT * FROM '.$tbl_wiki.'
                     WHERE c_id = '.$course_id.'
                     ORDER BY id DESC'; //the added is always the last
 
-            $result=Database::query($sql);
-            $row=Database::fetch_array($result);
-            $email_page_name=$row['title'];
+            $result = Database::query($sql);
+            $row = Database::fetch_array($result);
+            $email_page_name = $row['title'];
 
             //Who is the author?
             $userinfo = api_get_user_info($row['user_id']);
-            $email_user_author= get_lang('AddedBy').': '.$userinfo['complete_name'];
+            $email_user_author = get_lang('AddedBy').': '.$userinfo['complete_name'];
 
             //When ?
             $year = substr($row['dtime'], 0, 4);
@@ -1831,33 +1831,33 @@ 
             $hours = substr($row['dtime'], 11, 2);
             $minutes = substr($row['dtime'], 14, 2);
             $seconds = substr($row['dtime'], 17, 2);
-            $email_date_changes=$day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds;
-
-            if($row['assignment']==0) {
-                $allow_send_mail=true;
-            } elseif($row['assignment']==1) {
-                $email_assignment=get_lang('AssignmentDescExtra').' ('.get_lang('AssignmentMode').')';
-                $allow_send_mail=true;
-            } elseif($row['assignment']==2) {
-                $allow_send_mail=false; //Mode tasks: avoids notifications to all users about all users
+            $email_date_changes = $day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds;
+
+            if ($row['assignment'] == 0) {
+                $allow_send_mail = true;
+            } elseif ($row['assignment'] == 1) {
+                $email_assignment = get_lang('AssignmentDescExtra').' ('.get_lang('AssignmentMode').')';
+                $allow_send_mail = true;
+            } elseif ($row['assignment'] == 2) {
+                $allow_send_mail = false; //Mode tasks: avoids notifications to all users about all users
             }
 
             $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
                     WHERE c_id = '.$course_id.' AND  id="'.$id.'" AND type="F" AND group_id="'.$groupId.'" AND session_id="'.$session_id.'"';
             //type: P=page, D=discuss, F=full
-            $result=Database::query($sql);
+            $result = Database::query($sql);
 
-            $emailtext = get_lang('EmailWikiPageAdded').' <strong>'.$email_page_name.'</strong> '.get_lang('In').' '. get_lang('Wiki');
-        } elseif ($type=='E') {
-            $id=0;
-            $allow_send_mail=true;
+            $emailtext = get_lang('EmailWikiPageAdded').' <strong>'.$email_page_name.'</strong> '.get_lang('In').' '.get_lang('Wiki');
+        } elseif ($type == 'E') {
+            $id = 0;
+            $allow_send_mail = true;
 
             //Who is the author?
-            $userinfo = api_get_user_info(api_get_user_id());	//current user
+            $userinfo = api_get_user_info(api_get_user_id()); //current user
             $email_user_author = get_lang('DeletedBy').': '.$userinfo['complete_name'];
             //When ?
-            $today = date('r');		//current time
-            $email_date_changes=$today;
+            $today = date('r'); //current time
+            $email_date_changes = $today;
 
             $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
                     WHERE
@@ -1871,16 +1871,16 @@ 
         ///make and send email
         if ($allow_send_mail) {
             while ($row = Database::fetch_array($result)) {
-                $userinfo = api_get_user_info($row['user_id']);	//$row['user_id'] obtained from tbl_wiki_mailcue
+                $userinfo = api_get_user_info($row['user_id']); //$row['user_id'] obtained from tbl_wiki_mailcue
                 $name_to = $userinfo['complete_name'];
                 $email_to = $userinfo['email'];
                 $sender_name = api_get_setting('emailAdministrator');
                 $sender_email = api_get_setting('emailAdministrator');
                 $email_subject = get_lang('EmailWikiChanges').' - '.$_course['official_code'];
                 $email_body = get_lang('DearUser').' '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).',<br /><br />';
-                if($session_id==0){
+                if ($session_id == 0) {
                     $email_body .= $emailtext.' <strong>'.$_course['name'].' - '.$group_name.'</strong><br /><br /><br />';
-                }else{
+                } else {
                     $email_body .= $emailtext.' <strong>'.$_course['name'].' ('.api_get_session_name(api_get_session_id()).') - '.$group_name.'</strong><br /><br /><br />';
                 }
                 $email_body .= $email_user_author.' ('.$email_date_changes.')<br /><br /><br />';
@@ -1958,25 +1958,25 @@ 
             $template);
 
         if (0 != $groupId) {
-            $groupPart = '_group' . $groupId; // and add groupId to put the same document title in different groups
-            $group_properties  = GroupManager :: get_group_properties($groupId);
+            $groupPart = '_group'.$groupId; // and add groupId to put the same document title in different groups
+            $group_properties = GroupManager :: get_group_properties($groupId);
             $groupPath = $group_properties['directory'];
         } else {
             $groupPart = '';
-            $groupPath ='';
+            $groupPath = '';
         }
 
-        $exportDir = api_get_path(SYS_COURSE_PATH).api_get_course_path(). '/document'.$groupPath;
-        $exportFile = api_replace_dangerous_char($wikiTitle) . $groupPart;
+        $exportDir = api_get_path(SYS_COURSE_PATH).api_get_course_path().'/document'.$groupPath;
+        $exportFile = api_replace_dangerous_char($wikiTitle).$groupPart;
         $wikiContents = trim(preg_replace("/\[[\[]?([^\]|]*)[|]?([^|\]]*)\][\]]?/", "$1", $wikiContents));
         //TODO: put link instead of title
 
         $wikiContents = str_replace('{CONTENT}', $wikiContents, $template);
 
         // replace relative path by absolute path for courses, so you can see items into this page wiki (images, mp3, etc..) exported in documents
-        if (api_strpos($wikiContents,'../../courses/') !== false) {
+        if (api_strpos($wikiContents, '../../courses/') !== false) {
             $web_course_path = api_get_path(WEB_COURSE_PATH);
-            $wikiContents = str_replace('../../courses/',$web_course_path,$wikiContents);
+            $wikiContents = str_replace('../../courses/', $web_course_path, $wikiContents);
         }
 
         $i = 1;
@@ -1985,8 +1985,8 @@ 
             $i++;
         }
 
-        $wikiFileName = $exportFile . '_' . $i . '.html';
-        $exportPath = $exportDir . '/' . $wikiFileName;
+        $wikiFileName = $exportFile.'_'.$i.'.html';
+        $exportPath = $exportDir.'/'.$wikiFileName;
 
         file_put_contents($exportPath, $wikiContents);
         $doc_id = add_document(
@@ -2031,14 +2031,14 @@ 
         $content_pdf = api_html_entity_decode($data['content'], ENT_QUOTES, api_get_system_encoding());
 
         //clean wiki links
-        $content_pdf=trim(preg_replace("/\[[\[]?([^\]|]*)[|]?([^|\]]*)\][\]]?/", "$1", $content_pdf));
+        $content_pdf = trim(preg_replace("/\[[\[]?([^\]|]*)[|]?([^|\]]*)\][\]]?/", "$1", $content_pdf));
         //TODO: It should be better to display the link insted of the tile but it is hard for [[title]] links
 
         $title_pdf = api_html_entity_decode($data['title'], ENT_QUOTES, api_get_system_encoding());
         $title_pdf = api_utf8_encode($title_pdf, api_get_system_encoding());
         $content_pdf = api_utf8_encode($content_pdf, api_get_system_encoding());
 
-        $html='
+        $html = '
         <!-- defines the headers/footers - this must occur before the headers/footers are set -->
 
         <!--mpdf
@@ -2093,9 +2093,9 @@ 
         $session_id = $this->session_id;
         $groupId = api_get_group_id();
 
-        if ($groupId==0) {
+        if ($groupId == 0) {
             //extract course members
-            if(!empty($session_id)) {
+            if (!empty($session_id)) {
                 $a_users_to_add = CourseManager::get_user_list_from_course_code(api_get_course_id(), $session_id);
             } else {
                 $a_users_to_add = CourseManager::get_user_list_from_course_code(api_get_course_id(), 0);
@@ -2121,7 +2121,7 @@ 
         $username = api_htmlentities(sprintf(get_lang('LoginX'), $userinfo['username'], ENT_QUOTES));
         $name = $userinfo['complete_name']." - ".$username;
 
-        $photo = '<img src="' . $userinfo['avatar'] . '" alt="' . $name . '"  width="40" height="50" align="top" title="' . $name . '"  />';
+        $photo = '<img src="'.$userinfo['avatar'].'" alt="'.$name.'"  width="40" height="50" align="top" title="'.$name.'"  />';
 
         // teacher assignment title
         $title_orig = $values['title'];
@@ -2149,24 +2149,24 @@ 
                 $userPicture = UserManager::getUserPicture($assig_user_id);
                 $username = api_htmlentities(sprintf(get_lang('LoginX'), $o_user_to_add['username'], ENT_QUOTES));
                 $name = api_get_person_name($o_user_to_add['firstname'], $o_user_to_add['lastname'])." . ".$username;
-                $photo= '<img src="'.$userPicture.'" alt="'.$name.'"  width="40" height="50" align="bottom" title="'.$name.'"  />';
+                $photo = '<img src="'.$userPicture.'" alt="'.$name.'"  width="40" height="50" align="bottom" title="'.$name.'"  />';
 
                 $is_tutor_of_group = GroupManager::is_tutor_of_group($assig_user_id, $groupId); //student is tutor
                 $is_tutor_and_member = GroupManager::is_tutor_of_group($assig_user_id, $groupId) && GroupManager::is_subscribed($assig_user_id, $groupId);
                 // student is tutor and member
 
                 if ($is_tutor_and_member) {
-                    $status_in_group=get_lang('GroupTutorAndMember');
+                    $status_in_group = get_lang('GroupTutorAndMember');
                 } else {
-                    if($is_tutor_of_group) {
-                        $status_in_group=get_lang('GroupTutor');
+                    if ($is_tutor_of_group) {
+                        $status_in_group = get_lang('GroupTutor');
                     } else {
-                        $status_in_group=" "; //get_lang('GroupStandardMember')
+                        $status_in_group = " "; //get_lang('GroupStandardMember')
                     }
                 }
 
-                if ($assignment_type==1) {
-                    $values['title']= $title_orig;
+                if ($assignment_type == 1) {
+                    $values['title'] = $title_orig;
                     $values['content'] = '<div align="center" style="background-color: #F5F8FB; border:solid; border-color: #E6E6E6">
                     <table border="0">
                     <tr><td style="font-size:24px">'.get_lang('AssignmentWork').'</td></tr>
@@ -2182,7 +2182,7 @@ 
                         ).
                         ' [['.$_POST['title']."_uass".$assig_user_id.' | '.$photo.']] '.$status_in_group.'</li>';
                     //don't change this line without guaranteeing that users will be ordered by last names in the following format (surname, name)
-                    $values['assignment']=2;
+                    $values['assignment'] = 2;
                 }
                 $this->assig_user_id = $assig_user_id;
                 self::save_new_wiki($values);
@@ -2191,12 +2191,12 @@ 
 
         foreach ($a_users_to_add as $o_user_to_add) {
             if ($o_user_to_add['user_id'] == $userId) {
-                $assig_user_id=$o_user_to_add['user_id'];
+                $assig_user_id = $o_user_to_add['user_id'];
                 if ($assignment_type == 1) {
-                    $values['title']= $title_orig;
-                    $values['comment']=get_lang('AssignmentDesc');
+                    $values['title'] = $title_orig;
+                    $values['comment'] = get_lang('AssignmentDesc');
                     sort($all_students_pages);
-                    $values['content']=$content_orig_A.$content_orig_B.'<br/>
+                    $values['content'] = $content_orig_A.$content_orig_B.'<br/>
                     <div align="center" style="font-size:18px; background-color: #F5F8FB; border:solid; border-color:#E6E6E6">
                     '.get_lang('AssignmentLinkstoStudentsPage').'
                     </div><br/>
@@ -2204,7 +2204,7 @@ 
                     <ol>'.implode($all_students_pages).'</ol>
                     </div>
                     <br/>';
-                    $values['assignment']=1;
+                    $values['assignment'] = 1;
                 }
                 $this->assig_user_id = $assig_user_id;
                 self::save_new_wiki($values);
@@ -2218,7 +2218,7 @@ 
      * @param   int     Whether to search the contents (1) or just the titles (0)
      * @param int
      */
-    public function display_wiki_search_results($search_term, $search_content=0, $all_vers=0)
+    public function display_wiki_search_results($search_term, $search_content = 0, $all_vers = 0)
     {
         $tbl_wiki = $this->tbl_wiki;
         $condition_session = $this->condition_session;
@@ -2230,9 +2230,9 @@ 
         echo '</legend>';
 
         //only by professors when page is hidden
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
-            if ($all_vers=='1') {
-                if ($search_content=='1') {
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+            if ($all_vers == '1') {
+                if ($search_content == '1') {
                     $sql = "SELECT * FROM ".$tbl_wiki."
                             WHERE
                                 c_id = $course_id AND
@@ -2249,7 +2249,7 @@ 
                     //search all pages and all versions
                 }
             } else {
-                if ($search_content=='1') {
+                if ($search_content == '1') {
                     $sql = "SELECT * FROM ".$tbl_wiki." s1
                             WHERE
                                 s1.c_id = $course_id AND
@@ -2300,7 +2300,7 @@ 
                     //search all pages and all versions
                 }
             } else {
-                if($search_content=='1') {
+                if ($search_content == '1') {
                     $sql = "SELECT * FROM ".$tbl_wiki." s1
                             WHERE
                                 s1.c_id = $course_id AND
@@ -2348,17 +2348,17 @@ 
                 $seconds = substr($obj->dtime, 17, 2);
 
                 //get type assignment icon
-                if($obj->assignment==1) {
-                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==2) {
-                    $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==0) {
+                if ($obj->assignment == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 2) {
+                    $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 0) {
                     $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
                 $row = array();
                 $row[] = $ShowAssignment;
 
-                if($all_vers=='1') {
+                if ($all_vers == '1') {
                     $row[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=showpage&title='.api_htmlentities(urlencode($obj->reflink)).'&view='.$obj->id.'&session_id='.api_htmlentities(urlencode($_GET['$session_id'])).'&group_id='.api_htmlentities(urlencode($_GET['group_id'])).'">'.
                         api_htmlentities($obj->title).'</a>';
                 } else {
@@ -2369,21 +2369,21 @@ 
                 $row[] = $obj->user_id != 0 ? UserManager::getUserProfileLink($userinfo) : get_lang('Anonymous').' ('.$obj->user_ip.')';
                 $row[] = $year.'-'.$month.'-'.$day.' '.$hours.":".$minutes.":".$seconds;
 
-                if ($all_vers=='1') {
+                if ($all_vers == '1') {
                     $row[] = $obj->version;
                 } else {
                     $showdelete = '';
-                    if (api_is_allowed_to_edit(false,true)|| api_is_platform_admin()) {
-                        $showdelete=' <a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                            Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL);
+                    if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+                        $showdelete = ' <a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
+                            Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL);
                     }
                     $row[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=edit&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('edit.png', get_lang('EditPage'),'',ICON_SIZE_SMALL).'</a>
+                        Display::return_icon('edit.png', get_lang('EditPage'), '', ICON_SIZE_SMALL).'</a>
                         <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=discuss&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('discuss.png', get_lang('Discuss'),'',ICON_SIZE_SMALL).'</a>
+                        Display::return_icon('discuss.png', get_lang('Discuss'), '', ICON_SIZE_SMALL).'</a>
                         <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=history&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('history.png', get_lang('History'),'',ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=links&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('what_link_here.png', get_lang('LinksPages'),'',ICON_SIZE_SMALL).'</a>'.$showdelete;
+                        Display::return_icon('history.png', get_lang('History'), '', ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=links&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
+                        Display::return_icon('what_link_here.png', get_lang('LinksPages'), '', ICON_SIZE_SMALL).'</a>'.$showdelete;
                 }
                 $rows[] = $row;
             }
@@ -2408,16 +2408,16 @@ 
                     'all_vers' => $all_vers,
                 )
             );
-            $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;'));
-            $table->set_header(1,get_lang('Title'), true);
+            $table->set_header(0, get_lang('Type'), true, array('style' => 'width:30px;'));
+            $table->set_header(1, get_lang('Title'), true);
             if ($all_vers == '1') {
-                $table->set_header(2,get_lang('Author'), true);
-                $table->set_header(3,get_lang('Date'), true);
-                $table->set_header(4,get_lang('Version'), true);
+                $table->set_header(2, get_lang('Author'), true);
+                $table->set_header(3, get_lang('Date'), true);
+                $table->set_header(4, get_lang('Version'), true);
             } else {
-                $table->set_header(2,get_lang('Author').' ('.get_lang('LastVersion').')', true);
-                $table->set_header(3,get_lang('Date').' ('.get_lang('LastVersion').')', true);
-                $table->set_header(4,get_lang('Actions'), false, array ('style' => 'width:130px;'));
+                $table->set_header(2, get_lang('Author').' ('.get_lang('LastVersion').')', true);
+                $table->set_header(3, get_lang('Date').' ('.get_lang('LastVersion').')', true);
+                $table->set_header(4, get_lang('Actions'), false, array('style' => 'width:130px;'));
             }
             $table->display();
         } else {
@@ -2430,14 +2430,14 @@ 
      * @todo replace this function with the formvalidator datepicker
      *
      */
-    public function draw_date_picker($prefix,$default='')
+    public function draw_date_picker($prefix, $default = '')
     {
         if (empty($default)) {
             $default = date('Y-m-d H:i:s');
         }
         $parts = explode(' ', $default);
-        list($d_year,$d_month,$d_day) = explode('-',$parts[0]);
-        list($d_hour,$d_minute) = explode(':',$parts[1]);
+        list($d_year, $d_month, $d_day) = explode('-', $parts[0]);
+        list($d_hour, $d_minute) = explode(':', $parts[1]);
 
         $month_list = array(
             1 => get_lang('JanuaryLong'),
@@ -2454,9 +2454,9 @@ 
             12 => get_lang('DecemberLong'),
         );
 
-        $minute = range(10,59);
-        array_unshift($minute,'00','01','02','03','04','05','06','07','08','09');
-        $date_form = self::make_select($prefix.'_day', array_combine(range(1,31),range(1,31)), $d_day);
+        $minute = range(10, 59);
+        array_unshift($minute, '00', '01', '02', '03', '04', '05', '06', '07', '08', '09');
+        $date_form = self::make_select($prefix.'_day', array_combine(range(1, 31), range(1, 31)), $d_day);
         $date_form .= self::make_select($prefix.'_month', $month_list, $d_month);
         $date_form .= self::make_select(
                 $prefix.'_year',
@@ -2469,7 +2469,7 @@ 
                 ),
                 $d_year
             ).'&nbsp;&nbsp;&nbsp;&nbsp;';
-        $date_form .= self::make_select($prefix.'_hour', array_combine(range(0,23),range(0,23)), $d_hour).' : ';
+        $date_form .= self::make_select($prefix.'_hour', array_combine(range(0, 23), range(0, 23)), $d_hour).' : ';
         $date_form .= self::make_select($prefix.'_minute', $minute, $d_minute);
 
         return $date_form;
@@ -2479,11 +2479,11 @@ 
      * Draws an HTML form select with the given options
      *
      */
-    public function make_select($name,$values,$checked='')
+    public function make_select($name, $values, $checked = '')
     {
         $output = '<select name="'.$name.'" id="'.$name.'">';
-        foreach($values as $key => $value) {
-            $output .= '<option value="'.$key.'" '.(($checked==$key)?'selected="selected"':'').'>'.$value.'</option>';
+        foreach ($values as $key => $value) {
+            $output .= '<option value="'.$key.'" '.(($checked == $key) ? 'selected="selected"' : '').'>'.$value.'</option>';
         }
         $output .= '</select>';
         return $output;
@@ -2507,7 +2507,7 @@ 
      */
     public function two_digits($number)
     {
-        $number = (int)$number;
+        $number = (int) $number;
         return ($number < 10) ? '0'.$number : $number;
     }
 
@@ -2525,7 +2525,7 @@ 
                 WHERE c_id = '.$course_id.' AND id = '.$id.' ';
         $result = Database::query($sql);
         $data = array();
-        while ($row=Database::fetch_array($result,'ASSOC'))   {
+        while ($row = Database::fetch_array($result, 'ASSOC')) {
             $data = $row;
         }
         return $data;
@@ -2579,7 +2579,7 @@ 
         $result = Database::query($sql);
         $data = array();
         if (Database::num_rows($result)) {
-            $data = Database::fetch_array($result,'ASSOC');
+            $data = Database::fetch_array($result, 'ASSOC');
         }
 
         return $data;
@@ -2673,9 +2673,9 @@ 
         $result = self::getAllWiki();
         if (!empty($result)) {
             foreach ($result  as $is_editing_block) {
-                $max_edit_time	= 1200; // 20 minutes
-                $timestamp_edit	= strtotime($is_editing_block['time_edit']);
-                $time_editing	= time()-$timestamp_edit;
+                $max_edit_time = 1200; // 20 minutes
+                $timestamp_edit = strtotime($is_editing_block['time_edit']);
+                $time_editing = time() - $timestamp_edit;
 
                 // First prevent concurrent users and double version
                 if ($is_editing_block['is_editing'] == $userId) {
@@ -2684,7 +2684,7 @@ 
                     unset($_SESSION['_version']);
                 }
                 // Second checks if has exceeded the time that a page may be available or if a page was edited and saved by its author
-                if ($time_editing > $max_edit_time || ($is_editing_block['is_editing'] == $userId && $action!='edit')) {
+                if ($time_editing > $max_edit_time || ($is_editing_block['is_editing'] == $userId && $action != 'edit')) {
                     self::updateWikiIsEditing($is_editing_block['is_editing']);
                 }
             }
@@ -2732,7 +2732,7 @@ 
                 FROM ".$tbl_wiki."
                 WHERE c_id = $course_id AND ".$groupfilter.$condition_session."";
 
-        $allpages=Database::query($sql);
+        $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
             $total_versions = $row['TOTAL_VERS'];
             $total_visits = intval($row['TOTAL_VISITS']);
@@ -2742,30 +2742,30 @@ 
                 WHERE c_id = $course_id AND ".$groupfilter.$condition_session."";
         $allpages = Database::query($sql);
 
-        while ($row=Database::fetch_array($allpages)) {
+        while ($row = Database::fetch_array($allpages)) {
             $total_words = $total_words + self::word_count($row['content']);
-            $total_links 			= $total_links+substr_count($row['content'], "href=");
-            $total_links_anchors 	= $total_links_anchors+substr_count($row['content'], 'href="#');
-            $total_links_mail		= $total_links_mail+substr_count($row['content'], 'href="mailto');
-            $total_links_ftp 		= $total_links_ftp+substr_count($row['content'], 'href="ftp');
-            $total_links_irc		= $total_links_irc+substr_count($row['content'], 'href="irc');
-            $total_links_news 		= $total_links_news+substr_count($row['content'], 'href="news');
-            $total_wlinks 			= $total_wlinks+substr_count($row['content'], "[[");
-            $total_images 			= $total_images+substr_count($row['content'], "<img");
+            $total_links = $total_links + substr_count($row['content'], "href=");
+            $total_links_anchors = $total_links_anchors + substr_count($row['content'], 'href="#');
+            $total_links_mail		= $total_links_mail + substr_count($row['content'], 'href="mailto');
+            $total_links_ftp 		= $total_links_ftp + substr_count($row['content'], 'href="ftp');
+            $total_links_irc = $total_links_irc + substr_count($row['content'], 'href="irc');
+            $total_links_news = $total_links_news + substr_count($row['content'], 'href="news');
+            $total_wlinks 			= $total_wlinks + substr_count($row['content'], "[[");
+            $total_images 			= $total_images + substr_count($row['content'], "<img");
             $clean_total_flash = preg_replace('/player.swf/', ' ', $row['content']);
-            $total_flash			= $total_flash+substr_count($clean_total_flash, '.swf"');
+            $total_flash = $total_flash + substr_count($clean_total_flash, '.swf"');
             //.swf" end quotes prevent insert swf through flvplayer (is not counted)
-            $total_mp3				= $total_mp3+substr_count($row['content'], ".mp3");
-            $total_flv_p = $total_flv_p+substr_count($row['content'], ".flv");
-            $total_flv				=	$total_flv_p/5;
-            $total_youtube			= $total_youtube+substr_count($row['content'], "http://www.youtube.com");
-            $total_multimedia		= $total_multimedia+substr_count($row['content'], "video/x-msvideo");
-            $total_tables			= $total_tables+substr_count($row['content'], "<table");
+            $total_mp3				= $total_mp3 + substr_count($row['content'], ".mp3");
+            $total_flv_p = $total_flv_p + substr_count($row['content'], ".flv");
+            $total_flv				= $total_flv_p / 5;
+            $total_youtube = $total_youtube + substr_count($row['content'], "http://www.youtube.com");
+            $total_multimedia = $total_multimedia + substr_count($row['content'], "video/x-msvideo");
+            $total_tables = $total_tables + substr_count($row['content'], "<table");
         }
 
         //check only last version of all pages (current page)
 
-        $sql =' SELECT *, COUNT(*) AS TOTAL_PAGES, SUM(hits) AS TOTAL_VISITS_LV
+        $sql = ' SELECT *, COUNT(*) AS TOTAL_PAGES, SUM(hits) AS TOTAL_VISITS_LV
                 FROM  '.$tbl_wiki.' s1
                 WHERE s1.c_id = '.$course_id.' AND id=(
                     SELECT MAX(s2.id)
@@ -2776,9 +2776,9 @@ 
                         '.$groupfilter.' AND
                         session_id='.$session_id.')';
         $allpages = Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_pages	 		= $row['TOTAL_PAGES'];
-            $total_visits_lv 		= intval($row['TOTAL_VISITS_LV']);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_pages = $row['TOTAL_PAGES'];
+            $total_visits_lv = intval($row['TOTAL_VISITS_LV']);
         }
 
         $total_words_lv = 0;
@@ -2810,29 +2810,29 @@ 
                 )';
         $allpages = Database::query($sql);
 
-        while ($row=Database::fetch_array($allpages)) {
-            $total_words_lv 		= $total_words_lv+ self::word_count($row['content']);
-            $total_links_lv 		= $total_links_lv+substr_count($row['content'], "href=");
-            $total_links_anchors_lv	= $total_links_anchors_lv+substr_count($row['content'], 'href="#');
-            $total_links_mail_lv 	= $total_links_mail_lv+substr_count($row['content'], 'href="mailto');
-            $total_links_ftp_lv 	= $total_links_ftp_lv+substr_count($row['content'], 'href="ftp');
-            $total_links_irc_lv 	= $total_links_irc_lv+substr_count($row['content'], 'href="irc');
-            $total_links_news_lv 	= $total_links_news_lv+substr_count($row['content'], 'href="news');
-            $total_wlinks_lv 		= $total_wlinks_lv+substr_count($row['content'], "[[");
-            $total_images_lv 		= $total_images_lv+substr_count($row['content'], "<img");
+        while ($row = Database::fetch_array($allpages)) {
+            $total_words_lv 		= $total_words_lv + self::word_count($row['content']);
+            $total_links_lv 		= $total_links_lv + substr_count($row['content'], "href=");
+            $total_links_anchors_lv = $total_links_anchors_lv + substr_count($row['content'], 'href="#');
+            $total_links_mail_lv 	= $total_links_mail_lv + substr_count($row['content'], 'href="mailto');
+            $total_links_ftp_lv 	= $total_links_ftp_lv + substr_count($row['content'], 'href="ftp');
+            $total_links_irc_lv 	= $total_links_irc_lv + substr_count($row['content'], 'href="irc');
+            $total_links_news_lv 	= $total_links_news_lv + substr_count($row['content'], 'href="news');
+            $total_wlinks_lv 		= $total_wlinks_lv + substr_count($row['content'], "[[");
+            $total_images_lv 		= $total_images_lv + substr_count($row['content'], "<img");
             $clean_total_flash_lv = preg_replace('/player.swf/', ' ', $row['content']);
-            $total_flash_lv			= $total_flash_lv+substr_count($clean_total_flash_lv, '.swf"');
+            $total_flash_lv = $total_flash_lv + substr_count($clean_total_flash_lv, '.swf"');
             //.swf" end quotes prevent insert swf through flvplayer (is not counted)
-            $total_mp3_lv			= $total_mp3_lv+substr_count($row['content'], ".mp3");
-            $total_flv_p_lv = $total_flv_p_lv+substr_count($row['content'], ".flv");
-            $total_flv_lv			= $total_flv_p_lv/5;
-            $total_youtube_lv		= $total_youtube_lv+substr_count($row['content'], "http://www.youtube.com");
-            $total_multimedia_lv	= $total_multimedia_lv+substr_count($row['content'], "video/x-msvideo");
-            $total_tables_lv		= $total_tables_lv+substr_count($row['content'], "<table");
+            $total_mp3_lv			= $total_mp3_lv + substr_count($row['content'], ".mp3");
+            $total_flv_p_lv = $total_flv_p_lv + substr_count($row['content'], ".flv");
+            $total_flv_lv			= $total_flv_p_lv / 5;
+            $total_youtube_lv = $total_youtube_lv + substr_count($row['content'], "http://www.youtube.com");
+            $total_multimedia_lv = $total_multimedia_lv + substr_count($row['content'], "video/x-msvideo");
+            $total_tables_lv = $total_tables_lv + substr_count($row['content'], "<table");
         }
 
         //Total pages edited at this time
-        $total_editing_now=0;
+        $total_editing_now = 0;
         $sql = 'SELECT *, COUNT(*) AS TOTAL_EDITING_NOW
                 FROM  '.$tbl_wiki.' s1
                 WHERE is_editing!=0 AND s1.c_id = '.$course_id.' AND
@@ -2847,66 +2847,66 @@ 
         )';
 
         // Can not use group by because the mark is set in the latest version
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_editing_now	= $row['TOTAL_EDITING_NOW'];
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_editing_now = $row['TOTAL_EDITING_NOW'];
         }
 
         // Total hidden pages
-        $total_hidden=0;
+        $total_hidden = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE  c_id = '.$course_id.' AND visibility=0 AND '.$groupfilter.$condition_session.'
                 GROUP BY reflink';
         // or group by page_id. As the mark of hidden places it in all versions of the page, I can use group by to see the first
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_hidden = $total_hidden+1;
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_hidden = $total_hidden + 1;
         }
 
         //Total protect pages
-        $total_protected=0;
+        $total_protected = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE  c_id = '.$course_id.' AND editlock=1 AND '.$groupfilter.$condition_session.'
                 GROUP BY reflink';
         // or group by page_id. As the mark of protected page is the first version of the page, I can use group by
 
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_protected = $total_protected+1;
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_protected = $total_protected + 1;
         }
 
         // Total empty versions.
-        $total_empty_content=0;
+        $total_empty_content = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE
                     c_id = '.$course_id.' AND
                     content="" AND
                     '.$groupfilter.$condition_session.'';
         $allpages = Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_empty_content	= $total_empty_content+1;
+        while ($row = Database::fetch_array($allpages)) {
+            $total_empty_content = $total_empty_content + 1;
         }
 
         //Total empty pages (last version)
 
-        $total_empty_content_lv=0;
+        $total_empty_content_lv = 0;
         $sql = 'SELECT  * FROM  '.$tbl_wiki.' s1
                 WHERE s1.c_id = '.$course_id.' AND content="" AND id=(
                 SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2
                 WHERE s1.c_id = '.$course_id.' AND s1.reflink = s2.reflink AND '.$groupfilter.' AND session_id='.$session_id.')';
-        $allpages=Database::query($sql);
+        $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
-            $total_empty_content_lv	= $total_empty_content_lv+1;
+            $total_empty_content_lv = $total_empty_content_lv + 1;
         }
 
         // Total locked discuss pages
-        $total_lock_disc=0;
+        $total_lock_disc = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE c_id = '.$course_id.' AND addlock_disc=0 AND '.$groupfilter.$condition_session.'
                 GROUP BY reflink';//group by because mark lock in all vers, then always is ok
-        $allpages=Database::query($sql);
+        $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
-            $total_lock_disc	= $total_lock_disc+1;
+            $total_lock_disc = $total_lock_disc + 1;
         }
 
         // Total hidden discuss pages.
@@ -2917,7 +2917,7 @@ 
         //group by because mark lock in all vers, then always is ok
         $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
-            $total_hidden_disc	= $total_hidden_disc+1;
+            $total_hidden_disc = $total_hidden_disc + 1;
         }
 
         //Total versions with any short comment by user or system
@@ -2925,44 +2925,44 @@ 
         $total_comment_version = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE c_id = '.$course_id.' AND comment!="" AND '.$groupfilter.$condition_session.'';
-        $allpages=Database::query($sql);
+        $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
-            $total_comment_version	= $total_comment_version+1;
+            $total_comment_version = $total_comment_version + 1;
         }
 
         // Total pages that can only be scored by teachers.
 
-        $total_only_teachers_rating=0;
+        $total_only_teachers_rating = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE c_id = '.$course_id.' AND
                 ratinglock_disc = 0 AND
                 '.$groupfilter.$condition_session.'
                 GROUP BY reflink';//group by because mark lock in all vers, then always is ok
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_only_teachers_rating	= $total_only_teachers_rating+1;
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_only_teachers_rating = $total_only_teachers_rating + 1;
         }
 
         // Total pages scored by peers
         // put always this line alfter check num all pages and num pages rated by teachers
-        $total_rating_by_peers=$total_pages-$total_only_teachers_rating;
+        $total_rating_by_peers = $total_pages - $total_only_teachers_rating;
 
         //Total pages identified as standard task
 
-        $total_task=0;
-        $sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.'
+        $total_task = 0;
+        $sql = 'SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.'
               WHERE '.$tbl_wiki_conf.'.c_id = '.$course_id.' AND
                '.$tbl_wiki_conf.'.task!="" AND
                '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND
                 '.$tbl_wiki.'.'.$groupfilter.$condition_session;
         $allpages = Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_task=$total_task+1;
+        while ($row = Database::fetch_array($allpages)) {
+            $total_task = $total_task + 1;
         }
 
         //Total pages identified as teacher page (wiki portfolio mode - individual assignment)
 
-        $total_teacher_assignment=0;
+        $total_teacher_assignment = 0;
         $sql = 'SELECT  * FROM  '.$tbl_wiki.' s1
                 WHERE s1.c_id = '.$course_id.' AND assignment=1 AND id=(
                     SELECT MAX(s2.id)
@@ -2972,20 +2972,20 @@ 
         //mark all versions, but do not use group by reflink because y want the pages not versions
         $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
-            $total_teacher_assignment=$total_teacher_assignment+1;
+            $total_teacher_assignment = $total_teacher_assignment + 1;
         }
 
         //Total pages identifies as student page (wiki portfolio mode - individual assignment)
 
-        $total_student_assignment=0;
+        $total_student_assignment = 0;
         $sql = 'SELECT  * FROM  '.$tbl_wiki.' s1
                 WHERE s1.c_id = '.$course_id.' AND assignment=2 AND
                 id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2
                 WHERE s2.c_id = '.$course_id.' AND s1.reflink = s2.reflink AND '.$groupfilter.' AND session_id='.$session_id.')';
         //mark all versions, but do not use group by reflink because y want the pages not versions
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_student_assignment = $total_student_assignment+1;
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_student_assignment = $total_student_assignment + 1;
         }
 
         //Current Wiki status add new pages
@@ -2994,36 +2994,36 @@ 
                 GROUP BY addlock';//group by because mark 0 in all vers, then always is ok
         $allpages = Database::query($sql);
         $wiki_add_lock = null;
-        while ($row=Database::fetch_array($allpages)) {
-            $wiki_add_lock=$row['addlock'];
+        while ($row = Database::fetch_array($allpages)) {
+            $wiki_add_lock = $row['addlock'];
         }
 
-        if ($wiki_add_lock==1) {
-            $status_add_new_pag=get_lang('Yes');
+        if ($wiki_add_lock == 1) {
+            $status_add_new_pag = get_lang('Yes');
         } else {
-            $status_add_new_pag=get_lang('No');
+            $status_add_new_pag = get_lang('No');
         }
 
         //Creation date of the oldest wiki page and version
 
-        $first_wiki_date='0000-00-00 00:00:00';
+        $first_wiki_date = '0000-00-00 00:00:00';
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
                 ORDER BY dtime ASC LIMIT 1';
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $first_wiki_date=$row['dtime'];
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $first_wiki_date = $row['dtime'];
         }
 
         // Date of publication of the latest wiki version.
 
-        $last_wiki_date='0000-00-00 00:00:00';
+        $last_wiki_date = '0000-00-00 00:00:00';
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
                 ORDER BY dtime DESC LIMIT 1';
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $last_wiki_date=$row['dtime'];
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $last_wiki_date = $row['dtime'];
         }
 
         // Average score of all wiki pages. (If a page has not scored zero rated)
@@ -3035,18 +3035,18 @@ 
         // Do not use "count" because using "group by", would give a wrong value
         $allpages = Database::query($sql);
         $total_score = 0;
-        while ($row=Database::fetch_array($allpages)) {
-            $total_score = $total_score+$row['TOTAL_SCORE'];
+        while ($row = Database::fetch_array($allpages)) {
+            $total_score = $total_score + $row['TOTAL_SCORE'];
         }
 
         if (!empty($total_pages)) {
-            $media_score = $total_score/$total_pages;
+            $media_score = $total_score / $total_pages;
             //put always this line alfter check num all pages
         }
 
         // Average user progress in his pages.
 
-        $media_progress=0;
+        $media_progress = 0;
         $sql = 'SELECT  *, SUM(progress) AS TOTAL_PROGRESS
                 FROM  '.$tbl_wiki.' s1
                 WHERE s1.c_id = '.$course_id.' AND id=
@@ -3060,24 +3060,24 @@ 
         // As the value is only the latest version I can not use group by
         $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
-            $total_progress	= $row['TOTAL_PROGRESS'];
+            $total_progress = $row['TOTAL_PROGRESS'];
         }
 
         if (!empty($total_pages)) {
-            $media_progress=$total_progress/$total_pages;
+            $media_progress = $total_progress / $total_pages;
             //put always this line alfter check num all pages
         }
 
         //Total users that have participated in the Wiki
 
-        $total_users=0;
+        $total_users = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE  c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
                 GROUP BY user_id';
         //as the mark of user it in all versions of the page, I can use group by to see the first
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_users = $total_users+1;
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_users = $total_users + 1;
         }
 
         // Total of different IP addresses that have participated in the wiki
@@ -3085,9 +3085,9 @@ 
         $sql = 'SELECT * FROM '.$tbl_wiki.'
               WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
               GROUP BY user_ip';
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_ip	= $total_ip+1;
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_ip = $total_ip + 1;
         }
 
         echo '<table class="data_table">';
@@ -3286,11 +3286,11 @@ 
                 } else {
                     $row[] = get_lang('Anonymous').' ('.$obj->user_ip.')';
                 }
-                $row[] ='<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=usercontrib&user_id='.urlencode($obj->user_id).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.$obj->NUM_EDIT.'</a>';
+                $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=usercontrib&user_id='.urlencode($obj->user_id).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.$obj->NUM_EDIT.'</a>';
                 $rows[] = $row;
             }
 
-            $table = new SortableTableFromArrayConfig($rows,1,10,'MostActiveUsersA_table','','','DESC');
+            $table = new SortableTableFromArrayConfig($rows, 1, 10, 'MostActiveUsersA_table', '', '', 'DESC');
             $table->set_additional_parameters(
                 array(
                     'cidReq' => Security::remove_XSS($_GET['cidReq']),
@@ -3299,8 +3299,8 @@ 
                     'group_id' => Security::remove_XSS($_GET['group_id'])
                 )
             );
-            $table->set_header(0,get_lang('Author'), true);
-            $table->set_header(1,get_lang('Contributions'), true,array ('style' => 'width:30px;'));
+            $table->set_header(0, get_lang('Author'), true);
+            $table->set_header(1, get_lang('Contributions'), true, array('style' => 'width:30px;'));
             $table->display();
         }
     }
@@ -3316,8 +3316,8 @@ 
         $groupfilter = $this->groupfilter;
         $tbl_wiki_discuss = $this->tbl_wiki_discuss;
 
-        if (api_get_session_id()!=0 &&
-            api_is_allowed_to_session_edit(false,true)==false
+        if (api_get_session_id() != 0 &&
+            api_is_allowed_to_session_edit(false, true) == false
         ) {
             api_not_allowed();
         }
@@ -3380,9 +3380,9 @@ 
         //mode assignment: previous to show  page type
         $icon_assignment = null;
         if ($row['assignment'] == 1) {
-            $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',ICON_SIZE_SMALL);
+            $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL);
         } elseif ($row['assignment'] == 2) {
-            $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'),'',ICON_SIZE_SMALL);
+            $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'), '', ICON_SIZE_SMALL);
         }
 
         $countWPost = null;
@@ -3393,23 +3393,23 @@ 
             // Show discussion to students if isn't hidden.
             // Show page to all teachers if is hidden.
             // Mode assignments: If is hidden, show pages to student only if student is the author
-            if ($row['visibility_disc']==1 ||
-                api_is_allowed_to_edit(false,true) ||
+            if ($row['visibility_disc'] == 1 ||
+                api_is_allowed_to_edit(false, true) ||
                 api_is_platform_admin() ||
-                ($row['assignment']==2 && $row['visibility_disc']==0 && (api_get_user_id()==$row['user_id']))
+                ($row['assignment'] == 2 && $row['visibility_disc'] == 0 && (api_get_user_id() == $row['user_id']))
             ) {
                 echo '<div id="wikititle">';
 
                 // discussion action: protecting (locking) the discussion
                 $addlock_disc = null;
                 $lock_unlock_disc = null;
-                if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                     if (self::check_addlock_discuss() == 1) {
-                        $addlock_disc = Display::return_icon('unlock.png', get_lang('UnlockDiscussExtra'),'',ICON_SIZE_SMALL);
-                        $lock_unlock_disc ='unlockdisc';
+                        $addlock_disc = Display::return_icon('unlock.png', get_lang('UnlockDiscussExtra'), '', ICON_SIZE_SMALL);
+                        $lock_unlock_disc = 'unlockdisc';
                     } else {
-                        $addlock_disc = Display::return_icon('lock.png', get_lang('LockDiscussExtra'),'',ICON_SIZE_SMALL);
-                        $lock_unlock_disc ='lockdisc';
+                        $addlock_disc = Display::return_icon('lock.png', get_lang('LockDiscussExtra'), '', ICON_SIZE_SMALL);
+                        $lock_unlock_disc = 'lockdisc';
                     }
                 }
                 echo '<span style="float:right">';
@@ -3419,13 +3419,13 @@ 
                 // discussion action: visibility.  Show discussion to students if isn't hidden. Show page to all teachers if is hidden.
                 $visibility_disc = null;
                 $hide_show_disc = null;
-                if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
-                    if (self::check_visibility_discuss()==1) {
+                if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+                    if (self::check_visibility_discuss() == 1) {
                         /// TODO: 	Fix Mode assignments: If is hidden, show discussion to student only if student is the author
-                        $visibility_disc = Display::return_icon('visible.png', get_lang('ShowDiscussExtra'),'',ICON_SIZE_SMALL);
+                        $visibility_disc = Display::return_icon('visible.png', get_lang('ShowDiscussExtra'), '', ICON_SIZE_SMALL);
                         $hide_show_disc = 'hidedisc';
                     } else {
-                        $visibility_disc = Display::return_icon('invisible.png', get_lang('HideDiscussExtra'),'',ICON_SIZE_SMALL);
+                        $visibility_disc = Display::return_icon('invisible.png', get_lang('HideDiscussExtra'), '', ICON_SIZE_SMALL);
                         $hide_show_disc = 'showdisc';
                     }
                 }
@@ -3436,12 +3436,12 @@ 
                 //discussion action: check add rating lock. Show/Hide list to rating for all student
                 $lock_unlock_rating_disc = null;
                 $ratinglock_disc = null;
-                if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                     if (self::check_ratinglock_discuss() == 1) {
-                        $ratinglock_disc = Display::return_icon('star.png', get_lang('UnlockRatingDiscussExtra'),'',ICON_SIZE_SMALL);
+                        $ratinglock_disc = Display::return_icon('star.png', get_lang('UnlockRatingDiscussExtra'), '', ICON_SIZE_SMALL);
                         $lock_unlock_rating_disc = 'unlockrating';
                     } else {
-                        $ratinglock_disc = Display::return_icon('star_na.png', get_lang('LockRatingDiscussExtra'),'',ICON_SIZE_SMALL);
+                        $ratinglock_disc = Display::return_icon('star_na.png', get_lang('LockRatingDiscussExtra'), '', ICON_SIZE_SMALL);
                         $lock_unlock_rating_disc = 'lockrating';
                     }
                 }
@@ -3452,11 +3452,11 @@ 
 
                 //discussion action: email notification
                 if (self::check_notify_discuss($page) == 1) {
-                    $notify_disc= Display::return_icon('messagebox_info.png', get_lang('NotifyDiscussByEmail'),'',ICON_SIZE_SMALL);
-                    $lock_unlock_notify_disc='unlocknotifydisc';
+                    $notify_disc = Display::return_icon('messagebox_info.png', get_lang('NotifyDiscussByEmail'), '', ICON_SIZE_SMALL);
+                    $lock_unlock_notify_disc = 'unlocknotifydisc';
                 } else {
-                    $notify_disc= Display::return_icon('mail.png', get_lang('CancelNotifyDiscussByEmail'),'',ICON_SIZE_SMALL);
-                    $lock_unlock_notify_disc='locknotifydisc';
+                    $notify_disc = Display::return_icon('mail.png', get_lang('CancelNotifyDiscussByEmail'), '', ICON_SIZE_SMALL);
+                    $lock_unlock_notify_disc = 'locknotifydisc';
                 }
                 echo '<span style="float:right">';
                 echo '<a href="index.php?action=discuss&amp;actionpage='.$lock_unlock_notify_disc.'&amp;title='.api_htmlentities(urlencode($page)).'">'.$notify_disc.'</a>';
@@ -3468,22 +3468,22 @@ 
 
                 echo '</div>';
 
-                if ($row['addlock_disc']==1 || api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                if ($row['addlock_disc'] == 1 || api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                     //show comments but students can't add theirs
                     ?>
                     <form name="form1" method="post" action="">
                         <table>
                             <tr>
-                                <td valign="top" ><?php echo get_lang('Comments');?>:</td>
-                                <?php  echo '<input type="hidden" name="wpost_id" value="'.md5(uniqid(rand(), true)).'">';//prevent double post ?>
+                                <td valign="top" ><?php echo get_lang('Comments'); ?>:</td>
+                                <?php  echo '<input type="hidden" name="wpost_id" value="'.md5(uniqid(rand(), true)).'">'; //prevent double post ?>
                                 <td><textarea name="comment" cols="80" rows="5" id="comment"></textarea></td>
                             </tr>
                             <tr>
                                 <?php
                                 //check if rating is allowed
-                                if ($row['ratinglock_disc']==1 || api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                                if ($row['ratinglock_disc'] == 1 || api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                                     ?>
-                                    <td><?php echo get_lang('Rating');?>: </td>
+                                    <td><?php echo get_lang('Rating'); ?>: </td>
                                     <td valign="top"><select name="rating" id="rating">
                                             <option value="-" selected>-</option>
                                             <option value="0">0</option>
@@ -3500,7 +3500,7 @@ 
                                         </select></td>
                                 <?php
                                 } else {
-                                    echo '<input type=hidden name="rating" value="-">';// must pass a default value to avoid rate automatically
+                                    echo '<input type=hidden name="rating" value="-">'; // must pass a default value to avoid rate automatically
                                 }
                                 ?>
                             </tr>
@@ -3540,12 +3540,12 @@ 
                 $sql = "SELECT * FROM $tbl_wiki_discuss
                         WHERE c_id = $course_id AND publication_id='".$id."' AND NOT p_score='-'";
                 $result3 = Database::query($sql);
-                $countWPost_score= Database::num_rows($result3);
+                $countWPost_score = Database::num_rows($result3);
 
-                echo ' - '.get_lang('NumCommentsScore').': '.$countWPost_score;//
+                echo ' - '.get_lang('NumCommentsScore').': '.$countWPost_score; //
 
-                if ($countWPost_score!=0) {
-                    $avg_WPost_score = round($row2['sumWPost'] / $countWPost_score,2).' / 10';
+                if ($countWPost_score != 0) {
+                    $avg_WPost_score = round($row2['sumWPost'] / $countWPost_score, 2).' / 10';
                 } else {
                     $avg_WPost_score = $countWPost_score;
                 }
@@ -3563,16 +3563,16 @@ 
 
                 echo '<hr noshade size="1">';
 
-                while ($row=Database::fetch_array($result)) {
+                while ($row = Database::fetch_array($result)) {
                     $userinfo = api_get_user_info($row['userc_id']);
-                    if (($userinfo['status'])=="5") {
-                        $author_status=get_lang('Student');
+                    if (($userinfo['status']) == "5") {
+                        $author_status = get_lang('Student');
                     } else {
-                        $author_status=get_lang('Teacher');
+                        $author_status = get_lang('Teacher');
                     }
 
                     $name = $userinfo['complete_name'];
-                    $author_photo= '<img src="'.$userinfo['avatar'].'" alt="'.api_htmlentities($name).'"  width="40" height="50" align="top"  title="'.api_htmlentities($name).'"  />';
+                    $author_photo = '<img src="'.$userinfo['avatar'].'" alt="'.api_htmlentities($name).'"  width="40" height="50" align="top"  title="'.api_htmlentities($name).'"  />';
 
                     //stars
                     $p_score = $row['p_score'];
@@ -3651,7 +3651,7 @@ 
         }
         echo '</div>';
 
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { //only by professors if page is hidden
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { //only by professors if page is hidden
             $sql = 'SELECT  *
                     FROM  '.$tbl_wiki.' s1
         		    WHERE s1.c_id = '.$course_id.' AND id=(
@@ -3677,26 +3677,26 @@ 
                 $username = api_htmlentities(sprintf(get_lang('LoginX'), $userinfo['username']), ENT_QUOTES);
 
                 //get type assignment icon
-                if ($obj->assignment==1) {
-                    $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==2) {
-                    $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==0) {
+                if ($obj->assignment == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 2) {
+                    $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 0) {
                     $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
 
                 //get icon task
                 if (!empty($obj->task)) {
-                    $icon_task=Display::return_icon('wiki_task.png', get_lang('StandardTask'),'',ICON_SIZE_SMALL);
+                    $icon_task = Display::return_icon('wiki_task.png', get_lang('StandardTask'), '', ICON_SIZE_SMALL);
                 } else {
-                    $icon_task= Display::return_icon('px_transparent.gif');
+                    $icon_task = Display::return_icon('px_transparent.gif');
                 }
 
                 $row = array();
                 $row[] = $ShowAssignment.$icon_task;
                 $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=showpage&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">
                 '.api_htmlentities($obj->title).'</a>';
-                if ($obj->user_id <>0) {
+                if ($obj->user_id <> 0) {
                     $row[] = UserManager::getUserProfileLink($userinfo);
                 }
                 else {
@@ -3704,29 +3704,29 @@ 
                 }
                 $row[] = api_get_local_time($obj->dtime, null, date_default_timezone_get());
                 $showdelete = '';
-                if (api_is_allowed_to_edit(false,true)|| api_is_platform_admin()) {
-                    $showdelete =' <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=delete&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL);
+                if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+                    $showdelete = ' <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=delete&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
+                        Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL);
                 }
-                if (api_is_allowed_to_session_edit(false,true) ) {
+                if (api_is_allowed_to_session_edit(false, true)) {
                     $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=edit&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('edit.png', get_lang('EditPage'),'',ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=discuss&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('discuss.png', get_lang('Discuss'),'',ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=history&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('history.png', get_lang('History'),'',ICON_SIZE_SMALL).'</a>
+                        Display::return_icon('edit.png', get_lang('EditPage'), '', ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=discuss&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
+                        Display::return_icon('discuss.png', get_lang('Discuss'), '', ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=history&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
+                        Display::return_icon('history.png', get_lang('History'), '', ICON_SIZE_SMALL).'</a>
                         <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=links&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('what_link_here.png', get_lang('LinksPages'),'',ICON_SIZE_SMALL).'</a>'.$showdelete;
+                        Display::return_icon('what_link_here.png', get_lang('LinksPages'), '', ICON_SIZE_SMALL).'</a>'.$showdelete;
                 }
                 $rows[] = $row;
             }
 
-            $table = new SortableTableFromArrayConfig($rows,1,10,'AllPages_table','','','ASC');
-            $table->set_additional_parameters(array('cidReq' =>Security::remove_XSS($_GET['cidReq']),'action'=>Security::remove_XSS($action),'group_id'=>Security::remove_XSS($_GET['group_id'])));
-            $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;'));
-            $table->set_header(1,get_lang('Title'), true);
-            $table->set_header(2,get_lang('Author').' ('.get_lang('LastVersion').')', true);
-            $table->set_header(3,get_lang('Date').' ('.get_lang('LastVersion').')', true);
-            if (api_is_allowed_to_session_edit(false,true) ) {
-                $table->set_header(4,get_lang('Actions'), true, array ('style' => 'width:130px;'));
+            $table = new SortableTableFromArrayConfig($rows, 1, 10, 'AllPages_table', '', '', 'ASC');
+            $table->set_additional_parameters(array('cidReq' =>Security::remove_XSS($_GET['cidReq']), 'action'=>Security::remove_XSS($action), 'group_id'=>Security::remove_XSS($_GET['group_id'])));
+            $table->set_header(0, get_lang('Type'), true, array('style' => 'width:30px;'));
+            $table->set_header(1, get_lang('Title'), true);
+            $table->set_header(2, get_lang('Author').' ('.get_lang('LastVersion').')', true);
+            $table->set_header(3, get_lang('Date').' ('.get_lang('LastVersion').')', true);
+            if (api_is_allowed_to_session_edit(false, true)) {
+                $table->set_header(4, get_lang('Actions'), true, array('style' => 'width:130px;'));
             }
             $table->display();
         }
@@ -3746,13 +3746,13 @@ 
         $groupfilter = $this->groupfilter;
         $tbl_wiki_conf = $this->tbl_wiki_conf;
 
-        if (api_is_allowed_to_session_edit(false,true) ) {
-            if (self::check_notify_all()==1) {
-                $notify_all= Display::return_icon('messagebox_info.png', get_lang('NotifyByEmail'),'',ICON_SIZE_SMALL).' '.get_lang('NotNotifyChanges');
-                $lock_unlock_notify_all='unlocknotifyall';
+        if (api_is_allowed_to_session_edit(false, true)) {
+            if (self::check_notify_all() == 1) {
+                $notify_all = Display::return_icon('messagebox_info.png', get_lang('NotifyByEmail'), '', ICON_SIZE_SMALL).' '.get_lang('NotNotifyChanges');
+                $lock_unlock_notify_all = 'unlocknotifyall';
             } else {
-                $notify_all=Display::return_icon('mail.png', get_lang('CancelNotifyByEmail'),'',ICON_SIZE_SMALL).' '.get_lang('NotifyChanges');
-                $lock_unlock_notify_all='locknotifyall';
+                $notify_all = Display::return_icon('mail.png', get_lang('CancelNotifyByEmail'), '', ICON_SIZE_SMALL).' '.get_lang('NotifyChanges');
+                $lock_unlock_notify_all = 'locknotifyall';
             }
         }
 
@@ -3760,7 +3760,7 @@ 
         echo '<a href="index.php?action=recentchanges&amp;actionpage='.$lock_unlock_notify_all.'&amp;title='.api_htmlentities(urlencode($page)).'">'.$notify_all.'</a>';
         echo '</span>'.get_lang('RecentChanges').'</div>';
 
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { //only by professors if page is hidden
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { //only by professors if page is hidden
             $sql = 'SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.'
         		WHERE 	'.$tbl_wiki_conf.'.c_id= '.$course_id.' AND
         				'.$tbl_wiki.'.c_id= '.$course_id.' AND
@@ -3788,19 +3788,19 @@ 
                 $userinfo = api_get_user_info($obj->user_id);
 
                 //get type assignment icon
-                if ($obj->assignment==1) {
-                    $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==2) {
-                    $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==0) {
-                    $ShowAssignment=Display::return_icon('px_transparent.gif');
+                if ($obj->assignment == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 2) {
+                    $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 0) {
+                    $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
 
                 // Get icon task
                 if (!empty($obj->task)) {
-                    $icon_task=Display::return_icon('wiki_task.png', get_lang('StandardTask'),'',ICON_SIZE_SMALL);
+                    $icon_task = Display::return_icon('wiki_task.png', get_lang('StandardTask'), '', ICON_SIZE_SMALL);
                 } else {
-                    $icon_task=Display::return_icon('px_transparent.gif');
+                    $icon_task = Display::return_icon('px_transparent.gif');
                 }
 
                 $row = array();
@@ -3808,8 +3808,8 @@ 
                 $row[] = $ShowAssignment.$icon_task;
                 $row[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=showpage&title='.api_htmlentities(urlencode($obj->reflink)).'&amp;view='.$obj->id.'&session_id='.api_get_session_id().'&group_id='.api_get_group_id().'">'.
                     api_htmlentities($obj->title).'</a>';
-                $row[] = $obj->version>1 ? get_lang('EditedBy') : get_lang('AddedBy');
-                if ($obj->user_id <> 0 ) {
+                $row[] = $obj->version > 1 ? get_lang('EditedBy') : get_lang('AddedBy');
+                if ($obj->user_id <> 0) {
                     $row[] = UserManager::getUserProfileLink($userinfo);
                 } else {
                     $row[] = get_lang('Anonymous').' ('.api_htmlentities($obj->user_ip).')';
@@ -3817,7 +3817,7 @@ 
                 $rows[] = $row;
             }
 
-            $table = new SortableTableFromArrayConfig($rows,0,10,'RecentPages_table','','','DESC');
+            $table = new SortableTableFromArrayConfig($rows, 0, 10, 'RecentPages_table', '', '', 'DESC');
             $table->set_additional_parameters(
                 array(
                     'cidReq' =>api_get_course_id(),
@@ -3826,11 +3826,11 @@ 
                     'group_id' => api_get_group_id()
                 )
             );
-            $table->set_header(0,get_lang('Date'), true, array ('style' => 'width:200px;'));
-            $table->set_header(1,get_lang('Type'), true, array ('style' => 'width:30px;'));
-            $table->set_header(2,get_lang('Title'), true);
-            $table->set_header(3,get_lang('Actions'), true, array ('style' => 'width:80px;'));
-            $table->set_header(4,get_lang('Author'), true);
+            $table->set_header(0, get_lang('Date'), true, array('style' => 'width:200px;'));
+            $table->set_header(1, get_lang('Type'), true, array('style' => 'width:30px;'));
+            $table->set_header(2, get_lang('Title'), true);
+            $table->set_header(3, get_lang('Actions'), true, array('style' => 'width:80px;'));
+            $table->set_header(4, get_lang('Author'), true);
             $table->display();
         }
     }
@@ -3862,17 +3862,17 @@ 
 
             //get type assignment icon
             $ShowAssignment = '';
-            if ($row['assignment']==1) {
-                $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL);
-            } elseif ($row['assignment']==2) {
-                $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-            } elseif ($row['assignment']==0) {
-                $ShowAssignment=Display::return_icon('px_transparent.gif');
+            if ($row['assignment'] == 1) {
+                $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL);
+            } elseif ($row['assignment'] == 2) {
+                $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+            } elseif ($row['assignment'] == 0) {
+                $ShowAssignment = Display::return_icon('px_transparent.gif');
             }
 
             //fix Title to reflink (link Main Page)
-            if ($page==get_lang('DefaultTitle')) {
-                $page='index';
+            if ($page == get_lang('DefaultTitle')) {
+                $page = 'index';
             }
 
             echo '<div id="wikititle">';
@@ -3883,11 +3883,11 @@ 
             //fix index to title Main page into linksto
 
             if ($page == 'index') {
-                $page = str_replace(' ','_',get_lang('DefaultTitle'));
+                $page = str_replace(' ', '_', get_lang('DefaultTitle'));
             }
 
             //table
-            if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+            if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                 //only by professors if page is hidden
                 $sql = "SELECT * FROM ".$tbl_wiki." s1
                         WHERE s1.c_id = $course_id AND linksto LIKE '%".Database::escape_string($page)."%' AND id=(
@@ -3914,25 +3914,25 @@ 
                     //get time
                     $year 	 = substr($obj->dtime, 0, 4);
                     $month	 = substr($obj->dtime, 5, 2);
-                    $day 	 = substr($obj->dtime, 8, 2);
-                    $hours   = substr($obj->dtime, 11,2);
-                    $minutes = substr($obj->dtime, 14,2);
-                    $seconds = substr($obj->dtime, 17,2);
+                    $day = substr($obj->dtime, 8, 2);
+                    $hours   = substr($obj->dtime, 11, 2);
+                    $minutes = substr($obj->dtime, 14, 2);
+                    $seconds = substr($obj->dtime, 17, 2);
 
                     //get type assignment icon
-                    if ($obj->assignment==1) {
-                        $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL);
-                    } elseif ($obj->assignment==2) {
-                        $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-                    } elseif ($obj->assignment==0) {
-                        $ShowAssignment=Display::return_icon('px_transparent.gif');
+                    if ($obj->assignment == 1) {
+                        $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL);
+                    } elseif ($obj->assignment == 2) {
+                        $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+                    } elseif ($obj->assignment == 0) {
+                        $ShowAssignment = Display::return_icon('px_transparent.gif');
                     }
 
                     $row = array();
-                    $row[] =$ShowAssignment;
+                    $row[] = $ShowAssignment;
                     $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=showpage&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
                         api_htmlentities($obj->title).'</a>';
-                    if ($obj->user_id <>0) {
+                    if ($obj->user_id <> 0) {
                         $row[] = UserManager::getUserProfileLink($userinfo);
                     }
                     else {
@@ -4041,7 +4041,7 @@ 
             '&session_id='.$this->session_id.'&group_id='.$this->group_id.'">
             </a></div>';
 
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
             //only by professors if page is hidden
             $sql = 'SELECT * FROM '.$tbl_wiki.'
                     WHERE
@@ -4066,19 +4066,19 @@ 
                 // Get time
                 $year 	 = substr($obj->dtime, 0, 4);
                 $month	 = substr($obj->dtime, 5, 2);
-                $day 	 = substr($obj->dtime, 8, 2);
-                $hours   = substr($obj->dtime, 11,2);
-                $minutes = substr($obj->dtime, 14,2);
-                $seconds = substr($obj->dtime, 17,2);
+                $day = substr($obj->dtime, 8, 2);
+                $hours   = substr($obj->dtime, 11, 2);
+                $minutes = substr($obj->dtime, 14, 2);
+                $seconds = substr($obj->dtime, 17, 2);
 
                 //get type assignment icon
                 $ShowAssignment = '';
-                if ($obj->assignment==1) {
-                    $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==2) {
-                    $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==0) {
-                    $ShowAssignment= Display::return_icon('px_transparent.gif');
+                if ($obj->assignment == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 2) {
+                    $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 0) {
+                    $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
 
                 $row = array();
@@ -4094,7 +4094,7 @@ 
 
             }
 
-            $table = new SortableTableFromArrayConfig($rows,2,10,'UsersContributions_table','','','ASC');
+            $table = new SortableTableFromArrayConfig($rows, 2, 10, 'UsersContributions_table', '', '', 'ASC');
             $table->set_additional_parameters(
                 array(
                     'cidReq' => Security::remove_XSS($_GET['cidReq']),
@@ -4104,13 +4104,13 @@ 
                     'group_id' => intval($_GET['group_id']),
                 )
             );
-            $table->set_header(0,get_lang('Date'), true, array ('style' => 'width:200px;'));
-            $table->set_header(1,get_lang('Type'), true, array ('style' => 'width:30px;'));
-            $table->set_header(2,get_lang('Title'), true, array ('style' => 'width:200px;'));
-            $table->set_header(3,get_lang('Version'), true, array ('style' => 'width:30px;'));
-            $table->set_header(4,get_lang('Comment'), true, array ('style' => 'width:200px;'));
-            $table->set_header(5,get_lang('Progress'), true, array ('style' => 'width:30px;'));
-            $table->set_header(6,get_lang('Rating'), true, array ('style' => 'width:30px;'));
+            $table->set_header(0, get_lang('Date'), true, array('style' => 'width:200px;'));
+            $table->set_header(1, get_lang('Type'), true, array('style' => 'width:30px;'));
+            $table->set_header(2, get_lang('Title'), true, array('style' => 'width:200px;'));
+            $table->set_header(3, get_lang('Version'), true, array('style' => 'width:30px;'));
+            $table->set_header(4, get_lang('Comment'), true, array('style' => 'width:200px;'));
+            $table->set_header(5, get_lang('Progress'), true, array('style' => 'width:30px;'));
+            $table->set_header(6, get_lang('Rating'), true, array('style' => 'width:30px;'));
             $table->display();
         }
     }
@@ -4128,7 +4128,7 @@ 
 
         echo '<div class="actions">'.get_lang('MostChangedPages').'</div>';
 
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { //only by professors if page is hidden
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { //only by professors if page is hidden
             $sql = 'SELECT *, MAX(version) AS MAX FROM '.$tbl_wiki.'
                     WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
                     GROUP BY reflink';//TODO:check MAX and group by return last version
@@ -4146,12 +4146,12 @@ 
             while ($obj = Database::fetch_object($allpages)) {
                 //get type assignment icon
                 $ShowAssignment = '';
-                if ($obj->assignment==1) {
-                    $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==2) {
-                    $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==0) {
-                    $ShowAssignment= Display::return_icon('px_transparent.gif');
+                if ($obj->assignment == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 2) {
+                    $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 0) {
+                    $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
 
                 $row = array();
@@ -4179,9 +4179,9 @@ 
                     'group_id' => intval($_GET['group_id']),
                 )
             );
-            $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;'));
-            $table->set_header(1,get_lang('Title'), true);
-            $table->set_header(2,get_lang('Changes'), true);
+            $table->set_header(0, get_lang('Type'), true, array('style' => 'width:30px;'));
+            $table->set_header(1, get_lang('Title'), true);
+            $table->set_header(2, get_lang('Changes'), true);
             $table->display();
         }
     }
@@ -4206,7 +4206,7 @@ 
         /* Only teachers and platform admin can edit the index page.
         Only teachers and platform admin can edit an assignment teacher*/
         if (($current_row['reflink'] == 'index' || $current_row['reflink'] == '' || $current_row['assignment'] == 1) &&
-            (!api_is_allowed_to_edit(false,true) && $this->group_id == 0)
+            (!api_is_allowed_to_edit(false, true) && $this->group_id == 0)
         ) {
             self::setMessage(
                 Display::display_normal_message(get_lang('OnlyEditPagesCourseManager'), false, true)
@@ -4216,7 +4216,7 @@ 
             // check if is a wiki group
             if ($current_row['group_id'] != 0) {
                 //Only teacher, platform admin and group members can edit a wiki group
-                if (api_is_allowed_to_edit(false,true) ||
+                if (api_is_allowed_to_edit(false, true) ||
                     api_is_platform_admin() ||
                     GroupManager :: is_user_in_group($userId, $this->group_id)
                 ) {
@@ -4234,9 +4234,9 @@ 
             //$icon_assignment = null;
             if ($current_row['assignment'] == 1) {
                 self::setMessage(Display::display_normal_message(get_lang('EditAssignmentWarning'), false, true));
-            } elseif($current_row['assignment']==2) {
-                if (($userId == $current_row['user_id'])==false) {
-                    if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+            } elseif ($current_row['assignment'] == 2) {
+                if (($userId == $current_row['user_id']) == false) {
+                    if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                         $PassEdit = true;
                     } else {
                         self::setMessage(Display::display_warning_message(get_lang('LockByTeacher'), false, true));
@@ -4250,11 +4250,11 @@ 
             //show editor if edit is allowed
             if ($PassEdit) {
                 if ($current_row['editlock'] == 1 &&
-                    (api_is_allowed_to_edit(false,true)==false || api_is_platform_admin()==false)
+                    (api_is_allowed_to_edit(false, true) == false || api_is_platform_admin() == false)
                 ) {
                     self::setMessage(Display::display_normal_message(get_lang('PageLockedExtra'), false, true));
                 } else {
-                    if ($last_row['is_editing']!=0 && $last_row['is_editing'] != $userId) {
+                    if ($last_row['is_editing'] != 0 && $last_row['is_editing'] != $userId) {
                         // Checking for concurrent users
                         $timestamp_edit = strtotime($last_row['time_edit']);
                         $time_editing = time() - $timestamp_edit;
@@ -4263,7 +4263,7 @@ 
                         $userinfo = api_get_user_info($last_row['is_editing']);
                         $is_being_edited = get_lang('ThisPageisBeginEditedBy').' <a href='.$userinfo['profile_url'].'>'.
                             Display::tag('span', $userinfo['complete_name_with_username']).
-                            get_lang('ThisPageisBeginEditedTryLater').' '.date( "i",$rest_time).' '.get_lang('MinMinutes');
+                            get_lang('ThisPageisBeginEditedTryLater').' '.date("i", $rest_time).' '.get_lang('MinMinutes');
                         self::setMessage(Display::display_normal_message($is_being_edited, false, true));
                     } else {
                         self::setMessage(Display::display_confirmation_message(
@@ -4371,9 +4371,9 @@ 
                 GROUP BY reflink
                 ORDER BY reflink ASC';
         $allpages = Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            if ($row['reflink']=='index') {
-                $row['reflink']=str_replace(' ', '_', get_lang('DefaultTitle'));
+        while ($row = Database::fetch_array($allpages)) {
+            if ($row['reflink'] == 'index') {
+                $row['reflink'] = str_replace(' ', '_', get_lang('DefaultTitle'));
             }
             $pages[] = $row['reflink'];
         }
@@ -4391,16 +4391,16 @@ 
 
         $allpages = Database::query($sql);
 
-        while ($row=Database::fetch_array($allpages)) {
+        while ($row = Database::fetch_array($allpages)) {
             //remove self reference
-            $row['linksto']= str_replace($row["reflink"], " ", trim($row["linksto"]));
+            $row['linksto'] = str_replace($row["reflink"], " ", trim($row["linksto"]));
             $refs = explode(" ", trim($row["linksto"]));
 
             // Find linksto into reflink. If found ->page is linked
             foreach ($refs as $v) {
                 if (in_array($v, $pages)) {
-                    if (trim($v)!="") {
-                        $linked[]=$v;
+                    if (trim($v) != "") {
+                        $linked[] = $v;
                     }
                 }
             }
@@ -4412,12 +4412,12 @@ 
         $rows = array();
         foreach ($linked as $linked_show) {
             $row = array();
-            $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=showpage&title='.api_htmlentities(urlencode(str_replace('_',' ',$linked_show))).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                str_replace('_',' ',$linked_show).'</a>';
+            $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=showpage&title='.api_htmlentities(urlencode(str_replace('_', ' ', $linked_show))).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
+                str_replace('_', ' ', $linked_show).'</a>';
             $rows[] = $row;
         }
 
-        $table = new SortableTableFromArrayConfig($rows,0,10,'LinkedPages_table','','','DESC');
+        $table = new SortableTableFromArrayConfig($rows, 0, 10, 'LinkedPages_table', '', '', 'DESC');
         $table->set_additional_parameters(
             array(
                 'cidReq' => Security::remove_XSS($_GET['cidReq']),
@@ -4426,7 +4426,7 @@ 
                 'group_id' => intval($_GET['group_id']),
             )
         );
-        $table->set_header(0,get_lang('Title'), true);
+        $table->set_header(0, get_lang('Title'), true);
         $table->display();
     }
 
@@ -4451,8 +4451,8 @@ 
                 WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
                 GROUP BY reflink
                 ORDER BY reflink ASC';
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
             $pages[] = $row['reflink'];
         }
 
@@ -4467,14 +4467,14 @@ 
                 )';
         $allpages = Database::query($sql);
         $array_refs_linked = array();
-        while ($row=Database::fetch_array($allpages)) {
-            $row['linksto']= str_replace($row["reflink"], " ", trim($row["linksto"])); //remove self reference
+        while ($row = Database::fetch_array($allpages)) {
+            $row['linksto'] = str_replace($row["reflink"], " ", trim($row["linksto"])); //remove self reference
             $refs = explode(" ", trim($row["linksto"]));
-            foreach ($refs as $ref_linked){
-                if ($ref_linked==str_replace(' ','_',get_lang('DefaultTitle'))) {
-                    $ref_linked='index';
+            foreach ($refs as $ref_linked) {
+                if ($ref_linked == str_replace(' ', '_', get_lang('DefaultTitle'))) {
+                    $ref_linked = 'index';
                 }
-                $array_refs_linked[]= $ref_linked;
+                $array_refs_linked[] = $ref_linked;
             }
         }
 
@@ -4496,20 +4496,20 @@ 
 		                '.$groupfilter.$condition_session.' AND
 		                reflink="'.Database::escape_string($orphaned_show).'"
                     GROUP BY reflink';
-            $allpages=Database::query($sql);
-            while ($row=Database::fetch_array($allpages)) {
-                $orphaned_title=$row['title'];
-                $orphaned_visibility=$row['visibility'];
-                if ($row['assignment']==1) {
-                    $ShowAssignment=Display::return_icon('wiki_assignment.png','','',ICON_SIZE_SMALL);
-                } elseif ($row['assignment']==2) {
-                    $ShowAssignment=Display::return_icon('wiki_work.png','','',ICON_SIZE_SMALL);
-                } elseif ($row['assignment']==0) {
-                    $ShowAssignment= Display::return_icon('px_transparent.gif');
+            $allpages = Database::query($sql);
+            while ($row = Database::fetch_array($allpages)) {
+                $orphaned_title = $row['title'];
+                $orphaned_visibility = $row['visibility'];
+                if ($row['assignment'] == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', '', '', ICON_SIZE_SMALL);
+                } elseif ($row['assignment'] == 2) {
+                    $ShowAssignment = Display::return_icon('wiki_work.png', '', '', ICON_SIZE_SMALL);
+                } elseif ($row['assignment'] == 0) {
+                    $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
             }
 
-            if (!api_is_allowed_to_edit(false,true) || !api_is_platform_admin() && $orphaned_visibility==0){
+            if (!api_is_allowed_to_edit(false, true) || !api_is_platform_admin() && $orphaned_visibility == 0) {
                 continue;
             }
 
@@ -4521,7 +4521,7 @@ 
             $rows[] = $row;
         }
 
-        $table = new SortableTableFromArrayConfig($rows,1, 10, 'OrphanedPages_table','','','DESC');
+        $table = new SortableTableFromArrayConfig($rows, 1, 10, 'OrphanedPages_table', '', '', 'DESC');
         $table->set_additional_parameters(
             array(
                 'cidReq' => Security::remove_XSS($_GET['cidReq']),
@@ -4530,8 +4530,8 @@ 
                 'group_id' => intval($_GET['group_id']),
             )
         );
-        $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;'));
-        $table->set_header(1,get_lang('Title'), true);
+        $table->set_header(0, get_lang('Type'), true, array('style' => 'width:30px;'));
+        $table->set_header(1, get_lang('Title'), true);
         $table->display();
     }
 
@@ -4553,11 +4553,11 @@ 
                 WHERE  c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
                 GROUP BY reflink
                 ORDER BY reflink ASC';
-        $allpages=Database::query($sql);
+        $allpages = Database::query($sql);
 
-        while ($row=Database::fetch_array($allpages)) {
-            if ($row['reflink']=='index'){
-                $row['reflink']=str_replace(' ','_',get_lang('DefaultTitle'));
+        while ($row = Database::fetch_array($allpages)) {
+            if ($row['reflink'] == 'index') {
+                $row['reflink'] = str_replace(' ', '_', get_lang('DefaultTitle'));
             }
             $pages[] = $row['reflink'];
         }
@@ -4571,31 +4571,31 @@ 
 
         $allpages = Database::query($sql);
 
-        while ($row=Database::fetch_array($allpages)) {
+        while ($row = Database::fetch_array($allpages)) {
             $refs = explode(" ", trim($row["linksto"]));
             // Find linksto into reflink. If not found ->page is wanted
             foreach ($refs as $v) {
 
                 if (!in_array($v, $pages)) {
-                    if (trim($v)!="") {
-                        $wanted[]=$v;
+                    if (trim($v) != "") {
+                        $wanted[] = $v;
                     }
                 }
             }
         }
 
-        $wanted = array_unique($wanted);//make a unique list
+        $wanted = array_unique($wanted); //make a unique list
 
         //show table
         $rows = array();
         foreach ($wanted as $wanted_show) {
             $row = array();
             $wanted_show = Security::remove_XSS($wanted_show);
-            $row[] = '<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?cidReq=&action=addnew&title='.str_replace('_',' ',$wanted_show).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'" class="new_wiki_link">'.str_replace('_',' ',$wanted_show).'</a>';//meter un remove xss en lugar de htmlentities
+            $row[] = '<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?cidReq=&action=addnew&title='.str_replace('_', ' ', $wanted_show).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'" class="new_wiki_link">'.str_replace('_', ' ', $wanted_show).'</a>'; //meter un remove xss en lugar de htmlentities
             $rows[] = $row;
         }
 
-        $table = new SortableTableFromArrayConfig($rows,0,10,'WantedPages_table','','','DESC');
+        $table = new SortableTableFromArrayConfig($rows, 0, 10, 'WantedPages_table', '', '', 'DESC');
         $table->set_additional_parameters(
             array(
                 'cidReq' => Security::remove_XSS($_GET['cidReq']),
@@ -4604,7 +4604,7 @@ 
                 'group_id' => intval($_GET['group_id']),
             )
         );
-        $table->set_header(0,get_lang('Title'), true);
+        $table->set_header(0, get_lang('Title'), true);
         $table->display();
     }
 
@@ -4621,7 +4621,7 @@ 
 
         echo '<div class="actions">'.get_lang('MostVisitedPages').'</div>';
 
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { //only by professors if page is hidden
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { //only by professors if page is hidden
             $sql = 'SELECT *, SUM(hits) AS tsum FROM '.$tbl_wiki.'
                     WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
                     GROUP BY reflink';
@@ -4642,11 +4642,11 @@ 
             while ($obj = Database::fetch_object($allpages)) {
                 //get type assignment icon
                 $ShowAssignment = '';
-                if ($obj->assignment==1) {
-                    $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==2) {
-                    $ShowAssignment=$ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==0) {
+                if ($obj->assignment == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 2) {
+                    $ShowAssignment = $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 0) {
                     $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
 
@@ -4675,7 +4675,7 @@ 
                     'group_id' => intval($_GET['group_id']),
                 )
             );
-            $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;'));
+            $table->set_header(0, get_lang('Type'), true, array('style' => 'width:30px;'));
             $table->set_header(1, get_lang('Title'), true);
             $table->set_header(2, get_lang('Visits'), true);
             $table->display();
@@ -4700,8 +4700,8 @@ 
 
         if (api_is_allowed_to_session_edit(false, true) && api_is_allowed_to_edit()) {
             // menu add page
-            $actionsLeft .= '<a href="index.php?cidReq=' . $_course['id'] . '&action=addnew&session_id=' . $session_id . '&group_id=' . $groupId . '"' . self::is_active_navigation_tab('addnew').'>'
-            . Display::return_icon('add.png', get_lang('AddNew'), '', ICON_SIZE_MEDIUM) . '</a>';
+            $actionsLeft .= '<a href="index.php?cidReq='.$_course['id'].'&action=addnew&session_id='.$session_id.'&group_id='.$groupId.'"'.self::is_active_navigation_tab('addnew').'>'
+            . Display::return_icon('add.png', get_lang('AddNew'), '', ICON_SIZE_MEDIUM).'</a>';
         }
 
         $lock_unlock_addnew = null;
@@ -4709,12 +4709,12 @@ 
 
         if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
             // page action: enable or disable the adding of new pages
-            if (self::check_addnewpagelock()==0) {
+            if (self::check_addnewpagelock() == 0) {
                 $protect_addnewpage = Display::return_icon('off.png', get_lang('AddOptionProtected'));
-                $lock_unlock_addnew ='unlockaddnew';
+                $lock_unlock_addnew = 'unlockaddnew';
             } else {
                 $protect_addnewpage = Display::return_icon('on.png', get_lang('AddOptionUnprotected'));
-                $lock_unlock_addnew ='lockaddnew';
+                $lock_unlock_addnew = 'lockaddnew';
             }
         }
 
@@ -4734,7 +4734,7 @@ 
             get_lang('RecentChanges').'</a>';
 
 
-        echo Display::toolbarAction('toolbar-wiki', array( 0 => $actionsLeft));
+        echo Display::toolbarAction('toolbar-wiki', array(0 => $actionsLeft));
     }
 
     /**
@@ -4752,7 +4752,7 @@ 
             return;
         }
 
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
             self::setMessage('<div id="wikititle">'.get_lang('DeletePageHistory').'</div>');
 
             if ($page == "index") {
@@ -4794,7 +4794,7 @@ 
         $userId = api_get_user_id();
 
         if (api_get_session_id() != 0 &&
-            api_is_allowed_to_session_edit(false,true) == false
+            api_is_allowed_to_session_edit(false, true) == false
         ) {
             api_not_allowed();
         }
@@ -4817,12 +4817,12 @@ 
                 Display::display_error_message(get_lang('MustSelectPage'), false, true)
             );
             return;
-        } elseif ($row['content']=='' && $row['title']=='' && $page=='index') {
+        } elseif ($row['content'] == '' && $row['title'] == '' && $page == 'index') {
 
             // Table structure for better export to pdf
             $default_table_for_content_Start = '<table align="center" border="0"><tr><td align="center">';
             $default_table_for_content_End = '</td></tr></table>';
-            $content = $default_table_for_content_Start.sprintf(get_lang('DefaultContent'),api_get_path(WEB_IMG_PATH)).$default_table_for_content_End;
+            $content = $default_table_for_content_Start.sprintf(get_lang('DefaultContent'), api_get_path(WEB_IMG_PATH)).$default_table_for_content_End;
             $title = get_lang('DefaultTitle');
             $page_id = 0;
         } else {
@@ -4847,7 +4847,7 @@ 
             // Check if is a wiki group
             if (!empty($groupId)) {
                 //Only teacher, platform admin and group members can edit a wiki group
-                if (api_is_allowed_to_edit(false,true) ||
+                if (api_is_allowed_to_edit(false, true) ||
                     api_is_platform_admin() ||
                     GroupManager :: is_user_in_group($userId, $groupId)
                 ) {
@@ -4860,7 +4860,7 @@ 
                     );
                 }
             } else {
-                $PassEdit=true;
+                $PassEdit = true;
             }
 
             $icon_assignment = null;
@@ -4870,10 +4870,10 @@ 
                     Display::return_message(get_lang('EditAssignmentWarning'))
                 );
 
-                $icon_assignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',ICON_SIZE_SMALL);
+                $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL);
             } elseif ($row['assignment'] == 2) {
-                $icon_assignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'),'',ICON_SIZE_SMALL);
-                if (($userId == $row['user_id'])==false) {
+                $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'), '', ICON_SIZE_SMALL);
+                if (($userId == $row['user_id']) == false) {
                     if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                         $PassEdit = true;
                     } else {
@@ -4893,7 +4893,7 @@ 
             if ($PassEdit) {
                 //show editor if edit is allowed
                 if ($row['editlock'] == 1 &&
-                    (api_is_allowed_to_edit(false, true) == false || api_is_platform_admin()==false)
+                    (api_is_allowed_to_edit(false, true) == false || api_is_platform_admin() == false)
                 ) {
                     Display::addFlash(
                         Display::return_message(
@@ -4904,8 +4904,8 @@ 
                     // Check tasks
 
                     if (!empty($row['startdate_assig']) &&
-                        $row['startdate_assig']!='0000-00-00 00:00:00' &&
-                        time()<strtotime($row['startdate_assig'])
+                        $row['startdate_assig'] != '0000-00-00 00:00:00' &&
+                        time() < strtotime($row['startdate_assig'])
                     ) {
                         $message = get_lang('TheTaskDoesNotBeginUntil').': '.api_get_local_time($row['startdate_assig'], null, date_default_timezone_get());
 
@@ -4922,10 +4922,10 @@ 
                     }
 
                     if (!empty($row['enddate_assig']) &&
-                        $row['enddate_assig']!='0000-00-00 00:00:00' &&
+                        $row['enddate_assig'] != '0000-00-00 00:00:00' &&
                         time() > strtotime($row['enddate_assig']) &&
-                        $row['enddate_assig']!='0000-00-00 00:00:00' &&
-                        $row['delayedsubmit']==0
+                        $row['enddate_assig'] != '0000-00-00 00:00:00' &&
+                        $row['delayedsubmit'] == 0
                     ) {
                         $message = get_lang('TheDeadlineHasBeenCompleted').': '.api_get_local_time($row['enddate_assig'], null, date_default_timezone_get());
                         Display::addFlash(
@@ -4934,20 +4934,20 @@ 
                                 'warning'
                             )
                         );
-                        if (!api_is_allowed_to_edit(false,true)) {
+                        if (!api_is_allowed_to_edit(false, true)) {
                             $this->redirectHome();
                         }
                     }
 
-                    if (!empty($row['max_version']) && $row['version']>=$row['max_version']) {
-                        $message=get_lang('HasReachedMaxiNumVersions');
+                    if (!empty($row['max_version']) && $row['version'] >= $row['max_version']) {
+                        $message = get_lang('HasReachedMaxiNumVersions');
                         Display::addFlash(
                             Display::return_message(
                                 $message,
                                 'warning'
                             )
                         );
-                        if (!api_is_allowed_to_edit(false,true)) {
+                        if (!api_is_allowed_to_edit(false, true)) {
                             $this->redirectHome();
                         }
                     }
@@ -4960,50 +4960,50 @@ 
                                 'warning'
                             )
                         );
-                        if (!api_is_allowed_to_edit(false,true)) {
+                        if (!api_is_allowed_to_edit(false, true)) {
                             $this->redirectHome();
                         }
                     }
 
                     if (!empty($row['task'])) {
                         //previous change 0 by text
-                        if ($row['startdate_assig']=='0000-00-00 00:00:00') {
-                            $message_task_startdate  =get_lang('No');
+                        if ($row['startdate_assig'] == '0000-00-00 00:00:00') {
+                            $message_task_startdate = get_lang('No');
                         } else {
                             $message_task_startdate = api_get_local_time($row['startdate_assig'], null, date_default_timezone_get());
                         }
 
-                        if ($row['enddate_assig']=='0000-00-00 00:00:00') {
+                        if ($row['enddate_assig'] == '0000-00-00 00:00:00') {
                             $message_task_enddate = get_lang('No');
                         } else {
                             $message_task_enddate = api_get_local_time($row['enddate_assig'], null, date_default_timezone_get());
                         }
 
-                        if ($row['delayedsubmit']==0) {
-                            $message_task_delayedsubmit=get_lang('No');
+                        if ($row['delayedsubmit'] == 0) {
+                            $message_task_delayedsubmit = get_lang('No');
                         } else {
-                            $message_task_delayedsubmit=get_lang('Yes');
+                            $message_task_delayedsubmit = get_lang('Yes');
                         }
 
-                        if ($row['max_version']==0) {
-                            $message_task_max_version=get_lang('No');
+                        if ($row['max_version'] == 0) {
+                            $message_task_max_version = get_lang('No');
                         } else {
-                            $message_task_max_version=$row['max_version'];
+                            $message_task_max_version = $row['max_version'];
                         }
 
-                        if ($row['max_text']==0) {
-                            $message_task_max_text=get_lang('No');
+                        if ($row['max_text'] == 0) {
+                            $message_task_max_text = get_lang('No');
                         } else {
-                            $message_task_max_text=$row['max_text'];
+                            $message_task_max_text = $row['max_text'];
                         }
 
                         // Comp message
-                        $message_task='<b>'.get_lang('DescriptionOfTheTask').'</b><p>'.$row['task'].'</p><hr>';
-                        $message_task.='<p>'.get_lang('StartDate').': '.$message_task_startdate.'</p>';
-                        $message_task.='<p>'.get_lang('EndDate').': '.$message_task_enddate;
-                        $message_task.=' ('.get_lang('AllowLaterSends').') '.$message_task_delayedsubmit.'</p>';
-                        $message_task.='<p>'.get_lang('OtherSettings').': '.get_lang('NMaxVersion').': '.$message_task_max_version;
-                        $message_task.=' '.get_lang('NMaxWords').': '.$message_task_max_text;
+                        $message_task = '<b>'.get_lang('DescriptionOfTheTask').'</b><p>'.$row['task'].'</p><hr>';
+                        $message_task .= '<p>'.get_lang('StartDate').': '.$message_task_startdate.'</p>';
+                        $message_task .= '<p>'.get_lang('EndDate').': '.$message_task_enddate;
+                        $message_task .= ' ('.get_lang('AllowLaterSends').') '.$message_task_delayedsubmit.'</p>';
+                        $message_task .= '<p>'.get_lang('OtherSettings').': '.get_lang('NMaxVersion').': '.$message_task_max_version;
+                        $message_task .= ' '.get_lang('NMaxWords').': '.$message_task_max_text;
                         // Display message
                         Display::addFlash(
                             Display::return_message(
@@ -5014,11 +5014,11 @@ 
 
                     $feedback_message = '';
                     if ($row['progress'] == $row['fprogress1'] && !empty($row['fprogress1'])) {
-                        $feedback_message='<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback1']).'</p>';
+                        $feedback_message = '<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback1']).'</p>';
                     } elseif ($row['progress'] == $row['fprogress2'] && !empty($row['fprogress2'])) {
-                        $feedback_message='<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback2']).'</p>';
+                        $feedback_message = '<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback2']).'</p>';
                     } elseif ($row['progress'] == $row['fprogress3'] && !empty($row['fprogress3'])) {
-                        $feedback_message='<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback3']).'</p>';
+                        $feedback_message = '<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback3']).'</p>';
                     }
 
                     if (!empty($feedback_message)) {
@@ -5043,14 +5043,14 @@ 
                                 WHERE c_id = '.$course_id.' AND id="'.$row['id'].'"';
                         Database::query($sql);
                     } elseif ($row['is_editing'] != $userId) {
-                        $timestamp_edit=strtotime($row['time_edit']);
+                        $timestamp_edit = strtotime($row['time_edit']);
                         $time_editing = time() - $timestamp_edit;
                         $max_edit_time = 1200; // 20 minutes
                         $rest_time = $max_edit_time - $time_editing;
 
                         $userinfo = api_get_user_info($row['is_editing']);
                         $is_being_edited = get_lang('ThisPageisBeginEditedBy').' '.UserManager::getUserProfileLink($userinfo).'
-                            '.get_lang('ThisPageisBeginEditedTryLater').' '.date( "i",$rest_time).' '.get_lang('MinMinutes').'';
+                            '.get_lang('ThisPageisBeginEditedTryLater').' '.date("i", $rest_time).' '.get_lang('MinMinutes').'';
 
                         Display::addFlash(
                             Display::return_message(
@@ -5064,7 +5064,7 @@ 
                     // Form.
                     $url = api_get_self().'?action=edit&title='.urlencode($page).'&session_id='.api_get_session_id().'&group_id='.api_get_group_id().'&'.api_get_cidreq();
                     $form = new FormValidator('wiki', 'post', $url);
-                    $form->addElement('header', $icon_assignment.str_repeat('&nbsp;',3).api_htmlentities($title));
+                    $form->addElement('header', $icon_assignment.str_repeat('&nbsp;', 3).api_htmlentities($title));
                     self::setForm($form, $row);
                     $form->addElement('hidden', 'title');
                     $form->addElement('button', 'SaveWikiChange', get_lang('Save'));
@@ -5087,7 +5087,7 @@ 
                             );
                         } elseif (!self::double_post($_POST['wpost_id'])) {
                             //double post
-                        } elseif ($_POST['version']!='' && $_SESSION['_version'] !=0 && $_POST['version'] != $_SESSION['_version']) {
+                        } elseif ($_POST['version'] != '' && $_SESSION['_version'] != 0 && $_POST['version'] != $_SESSION['_version']) {
                             //prevent concurrent users and double version
                             Display::addFlash(
                                 Display::return_message(
@@ -5149,7 +5149,7 @@ 
         $KeyAssignment = null;
         $KeyTitle = null;
         $KeyUserId = null;
-        while ($row=Database::fetch_array($result)) {
+        while ($row = Database::fetch_array($result)) {
             $KeyVisibility = $row['visibility'];
             $KeyAssignment = $row['assignment'];
             $KeyTitle = $row['title'];
@@ -5158,7 +5158,7 @@ 
         $icon_assignment = null;
         if ($KeyAssignment == 1) {
             $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL);
-        } elseif($KeyAssignment == 2) {
+        } elseif ($KeyAssignment == 2) {
             $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'), '', ICON_SIZE_SMALL);
         }
 
@@ -5166,10 +5166,10 @@ 
 
         //if the page is hidden and is a job only sees its author and professor
         if ($KeyVisibility == 1 ||
-            api_is_allowed_to_edit(false,true) ||
+            api_is_allowed_to_edit(false, true) ||
             api_is_platform_admin() ||
             (
-                $KeyAssignment==2 && $KeyVisibility==0 &&
+                $KeyAssignment == 2 && $KeyVisibility == 0 &&
                 ($userId == $KeyUserId)
             )
         ) {
@@ -5199,7 +5199,7 @@ 
                     get_lang('ShowDifferences').' '.get_lang('WordsDiff').'</button>';
                 echo '<br/><br/>';
 
-                $counter=0;
+                $counter = 0;
                 $total_versions = Database::num_rows($result);
 
                 while ($row = Database::fetch_array($result)) {
@@ -5207,10 +5207,10 @@ 
                     $username = api_htmlentities(sprintf(get_lang('LoginX'), $userinfo['username']), ENT_QUOTES);
 
                     echo '<li style="margin-bottom: 5px;">';
-                    ($counter==0) ? $oldstyle='style="visibility: hidden;"':$oldstyle='';
-                    ($counter==0) ? $newchecked=' checked': $newchecked='';
-                    ($counter==$total_versions-1) ? $newstyle='style="visibility: hidden;"':$newstyle='';
-                    ($counter==1) ? $oldchecked=' checked':$oldchecked='';
+                    ($counter == 0) ? $oldstyle = 'style="visibility: hidden;"' : $oldstyle = '';
+                    ($counter == 0) ? $newchecked = ' checked' : $newchecked = '';
+                    ($counter == $total_versions - 1) ? $newstyle = 'style="visibility: hidden;"' : $newstyle = '';
+                    ($counter == 1) ? $oldchecked = ' checked' : $oldchecked = '';
                     echo '<input name="old" value="'.$row['id'].'" type="radio" '.$oldstyle.' '.$oldchecked.'/> ';
                     echo '<input name="new" value="'.$row['id'].'" type="radio" '.$newstyle.' '.$newchecked.'/> ';
                     echo '<a href="'.api_get_self().'?action=showpage&amp;title='.api_htmlentities(urlencode($page)).'&amp;view='.$row['id'].'">';
@@ -5228,7 +5228,7 @@ 
                     $comment = $row['comment'];
                     if (!empty($comment)) {
                         echo get_lang('Comments').': '.api_htmlentities(api_substr($row['comment'], 0, 100));
-                        if (api_strlen($row['comment'])>100) {
+                        if (api_strlen($row['comment']) > 100) {
                             echo '... ';
                         }
                     } else {
@@ -5253,8 +5253,8 @@ 
 
                 $sql_new = "SELECT * FROM $tbl_wiki
                             WHERE c_id = $course_id AND id='".Database::escape_string($_POST['new'])."'";
-                $result_new=Database::query($sql_new);
-                $version_new=Database::fetch_array($result_new);
+                $result_new = Database::query($sql_new);
+                $version_new = Database::fetch_array($result_new);
                 $oldTime = isset($version_old['dtime']) ? $version_old['dtime'] : null;
                 $oldContent = isset($version_old['content']) ? $version_old['content'] : null;
 
@@ -5281,9 +5281,9 @@ 
 
 
                 if (isset($_POST['HistoryDifferences'])) {
-                    echo '<table>'.diff($oldContent, $version_new['content'], true, 'format_table_line' ).'</table>'; // format_line mode is better for words
+                    echo '<table>'.diff($oldContent, $version_new['content'], true, 'format_table_line').'</table>'; // format_line mode is better for words
                     echo '<br />';
-                    echo '<strong>'.get_lang('Legend').'</strong><div class="diff">' . "\n";
+                    echo '<strong>'.get_lang('Legend').'</strong><div class="diff">'."\n";
                     echo '<table><tr>';
                     echo  '<td>';
                     echo '</td><td>';
@@ -5302,7 +5302,7 @@ 
                     $renderer = new Text_Diff_Renderer_inline();
                     echo '<style>del{background:#fcc}ins{background:#cfc}</style>'.$renderer->render($diff); // Code inline
                     echo '<br />';
-                    echo '<strong>'.get_lang('Legend').'</strong><div class="diff">' . "\n";
+                    echo '<strong>'.get_lang('Legend').'</strong><div class="diff">'."\n";
                     echo '<table><tr>';
                     echo  '<td>';
                     echo '</td><td>';
@@ -5350,7 +5350,7 @@ 
         echo '<td style="vertical-align:top">';
         echo '<ul>';
         // Submenu Statistics
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
             echo '<li><a href="index.php?cidReq='.$_course['id'].'&action=statistics&session_id='.$session_id.'&group_id='.$groupId.'">'.get_lang('Statistics').'</a></li>';
         }
         echo '      </ul>';
@@ -5423,7 +5423,7 @@ 
                 break;
             case 'deletewiki':
                 $title = '<div class="actions">'.get_lang('DeleteWiki').'</div>';
-                if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                     $message = get_lang('ConfirmDeleteWiki');
                     $message .= '<p>
                         <a href="index.php?'.api_get_cidreq().'">'.get_lang('No').'</a>
@@ -5454,14 +5454,14 @@ 
                 self::getLinks($page);
                 break;
             case 'addnew':
-                if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {
+                if (api_get_session_id() != 0 && api_is_allowed_to_session_edit(false, true) == false) {
                     api_not_allowed();
                 }
                 echo '<div class="actions">'.get_lang('AddNew').'</div>';
                 echo '<br/>';
                 //first, check if page index was created. chektitle=false
                 if (self::checktitle('index')) {
-                    if (api_is_allowed_to_edit(false,true) ||
+                    if (api_is_allowed_to_edit(false, true) ||
                         api_is_platform_admin() ||
                         GroupManager::is_user_in_group(api_get_user_id(), api_get_group_id())
                     ) {
@@ -5469,10 +5469,10 @@ 
                     } else {
                         self::setMessage(Display::display_normal_message(get_lang('WikiStandBy'), false, true));
                     }
-                } elseif (self::check_addnewpagelock()==0 && (api_is_allowed_to_edit(false, true)==false || api_is_platform_admin()==false)) {
+                } elseif (self::check_addnewpagelock() == 0 && (api_is_allowed_to_edit(false, true) == false || api_is_platform_admin() == false)) {
                     self::setMessage(Display::display_error_message(get_lang('AddPagesLocked'), false, true));
                 } else {
-                    if (api_is_allowed_to_edit(false,true) ||
+                    if (api_is_allowed_to_edit(false, true) ||
                         api_is_platform_admin() ||
                         GroupManager::is_user_in_group(api_get_user_id(), api_get_group_id()) ||
                         $_GET['group_id'] == 0

main/inc/lib/formvalidator/Element/SelectLanguage.php

Spacing +3 added lines, -3 removed lines

@@ -17,10 +17,10 @@
 		$this->_options = array();
 		$this->_values = array();
 		foreach ($languages['name'] as $index => $name) {
-			if($languages['folder'][$index] == api_get_setting('platformLanguage')) {
-				$this->addOption($name,$languages['folder'][$index],array('selected'=>'selected'));
+			if ($languages['folder'][$index] == api_get_setting('platformLanguage')) {
+				$this->addOption($name, $languages['folder'][$index], array('selected'=>'selected'));
 			} else {
-				$this->addOption($name,$languages['folder'][$index]);
+				$this->addOption($name, $languages['folder'][$index]);
 			}
 		}
 	}

main/inc/lib/blog.lib.php

Spacing +380 added lines, -380 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();
 
@@ -29,8 +29,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);
@@ -129,7 +129,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);
@@ -168,7 +168,7 @@ 
 
 			// Put it on course homepage
 			$sql = "INSERT INTO $tbl_tool (c_id, name, link, image, visibility, admin, address, added_tool, session_id, target)
-					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();
@@ -203,7 +203,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);
 
@@ -219,7 +219,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);
 	}
 
@@ -261,7 +261,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
@@ -292,13 +292,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) {
@@ -307,7 +307,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();
@@ -318,7 +318,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;
 
@@ -369,9 +369,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);
 	}
@@ -392,21 +392,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);
 	}
 
 	/**
@@ -422,7 +422,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;
@@ -431,7 +431,7 @@ 
 
 		if (!empty($_FILES['user_upload']['name'])) {
 			$upload_ok = process_uploaded_file($_FILES['user_upload']);
-			$has_attachment=true;
+			$has_attachment = true;
 		}
 
 		if ($upload_ok) {
@@ -440,7 +440,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
@@ -452,7 +452,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;
 
@@ -463,19 +463,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);
 
@@ -524,7 +524,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
@@ -550,7 +550,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();
@@ -560,13 +560,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);
@@ -581,10 +581,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);
@@ -598,10 +598,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);
@@ -634,20 +634,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);
@@ -660,10 +660,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);
@@ -676,10 +676,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);
@@ -704,7 +704,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);
 	}
 
@@ -722,9 +722,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);
 	}
 
@@ -738,7 +738,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();
@@ -755,7 +755,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);
@@ -763,7 +763,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 {
@@ -787,7 +787,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'];
@@ -796,7 +796,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
@@ -805,11 +805,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();
 
@@ -840,14 +840,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
@@ -855,8 +855,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);
 
@@ -867,11 +867,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;
@@ -881,27 +881,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');
@@ -915,19 +915,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);
 	}
 
@@ -940,14 +940,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);
 	}
 
@@ -974,8 +974,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);
@@ -983,7 +983,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);
 
@@ -994,34 +994,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>';
@@ -1032,20 +1032,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']);
 		}
 	}
@@ -1073,16 +1073,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();
@@ -1115,8 +1115,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);
@@ -1133,7 +1133,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);
@@ -1143,14 +1143,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 '';
 			}
@@ -1159,14 +1159,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 '';
 			}
@@ -1201,11 +1201,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
@@ -1214,8 +1214,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'];
@@ -1240,22 +1240,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>';
@@ -1265,7 +1265,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.
@@ -1281,11 +1281,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')
 			);
@@ -1329,8 +1329,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);
@@ -1339,7 +1339,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'));
@@ -1371,31 +1371,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>",
-					 "<th><b>",get_lang('Description'),"</b></th>",
-					 "<th><b>",get_lang('Color'),"</b></th>",
-					 "<th width='50'><b>",get_lang('Modify'),"</b></th>",
+					 "<th width='240'><b>", get_lang('Title'), "</b></th>",
+					 "<th><b>", get_lang('Description'), "</b></th>",
+					 "<th><b>", get_lang('Color'), "</b></th>",
+					 "<th width='50'><b>", get_lang('Modify'), "</b></th>",
 				"</tr>";
 
 
@@ -1407,8 +1407,8 @@ 
                         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);
 
@@ -1417,10 +1417,10 @@ 
 				$css_class = (($counter % 2) == 0) ? "row_odd" : "row_even";
 				$delete_icon = ($task['system_task'] == '1') ? "delete_na.png" : "delete.png";
 				$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">';
+				echo '<tr class="'.$css_class.'" valign="top">';
                 echo '<td width="240">'.Security::remove_XSS($task['title']).'</td>';
                 echo '<td>'.Security::remove_XSS($task['description']).'</td>';
                 echo '<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>';
@@ -1446,23 +1446,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>",
-				 "<th><b>",get_lang('Task'),"</b></th>",
-				 "<th><b>",get_lang('Description'),"</b></th>",
-				 "<th><b>",get_lang('TargetDate'),"</b></th>",
-				 "<th width='50'><b>",get_lang('Modify'),"</b></th>",
+				 "<th width='240'><b>", get_lang('Member'), "</b></th>",
+				 "<th><b>", get_lang('Task'), "</b></th>",
+				 "<th><b>", get_lang('Description'), "</b></th>",
+				 "<th><b>", get_lang('TargetDate'), "</b></th>",
+				 "<th width='50'><b>", get_lang('Modify'), "</b></th>",
 			"</tr>";
 
 		$course_id = api_get_course_int_id();
@@ -1474,17 +1474,17 @@ 
 				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.png" : "delete.png";
 			$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);
 
@@ -1516,7 +1516,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(
@@ -1538,7 +1538,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>';
@@ -1546,7 +1546,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" />
@@ -1556,7 +1556,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>
@@ -1566,18 +1566,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>';
@@ -1592,13 +1592,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>
@@ -1609,7 +1609,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>';
@@ -1623,34 +1623,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();
@@ -1659,22 +1659,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>';
@@ -1682,13 +1682,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>
@@ -1697,9 +1697,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>';
@@ -1721,7 +1721,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();
@@ -1740,7 +1740,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);
 
@@ -1788,7 +1788,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();
 
@@ -1797,9 +1797,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);
 
@@ -1834,11 +1834,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);
@@ -1846,18 +1846,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);
@@ -1887,12 +1887,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);
@@ -1900,17 +1900,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);
 		}
@@ -1931,7 +1931,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);
@@ -1939,19 +1939,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');
@@ -1975,12 +1975,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();
@@ -1990,7 +1990,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();
@@ -2016,12 +2016,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);
 	}
 
@@ -2042,7 +2042,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>';
@@ -2057,12 +2057,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, '');
@@ -2082,13 +2082,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"];
@@ -2100,8 +2100,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[] = '';
 				}
@@ -2112,20 +2112,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>';
 	}
 
@@ -2138,7 +2138,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();
@@ -2151,34 +2151,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"];
@@ -2190,19 +2190,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');
@@ -2210,7 +2210,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[] = '';
 			}
@@ -2220,20 +2220,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>';
 	}
 
@@ -2243,7 +2243,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 />';
@@ -2263,7 +2263,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')
 		);
@@ -2331,21 +2331,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
@@ -2354,15 +2354,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'];
@@ -2379,9 +2379,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);
 
@@ -2404,7 +2404,7 @@ 
 
 		echo "<tr>";
 
-		for($ii = 1; $ii < 8; $ii ++)
+		for ($ii = 1; $ii < 8; $ii++)
 			echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>";
 
 		echo "</tr>";
@@ -2414,24 +2414,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;
 
@@ -2439,7 +2439,7 @@ 
 						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') . '">';
+								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').'">';
 								echo Display::return_icon('blog_task.gif', get_lang('ExecuteThisTask'));
                                 echo '</a>';
 							}
@@ -2447,7 +2447,7 @@ 
 					}
 
 					echo "</td>";
-					$curday ++;
+					$curday++;
 				} else
 					echo "<td>&nbsp;</td>";
 			}
@@ -2485,7 +2485,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
@@ -2500,7 +2500,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'));
@@ -2536,8 +2536,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;
 			}
 		}
 
@@ -2549,35 +2549,35 @@ 
 				// 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>";
-				$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>";
+				$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>";
-				$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>";
+				$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>";
-				$list_body_blog[]=$my_image;
-				$list_content_blog[]=$list_body_blog;
+				$my_image .= "</a>";
+				$list_body_blog[] = $my_image;
+				$list_content_blog[] = $list_body_blog;
 				$list_body_blog = array();
 			}
 
-			$table = new SortableTableFromArrayConfig($list_content_blog, 1,20,'project');
+			$table = new SortableTableFromArrayConfig($list_content_blog, 1, 20, 'project');
 			$table->set_header(0, get_lang('Title'));
 			$table->set_header(1, get_lang('SubTitle'));
 			$table->set_header(2, get_lang('Modify'));
@@ -2601,34 +2601,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;
 }
@@ -2642,7 +2642,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);
@@ -2666,22 +2666,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);
 }
@@ -2694,8 +2694,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
@@ -2710,13 +2710,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;
@@ -2746,14 +2746,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;

main/gradebook/lib/scoredisplay.class.php

Spacing +18 added lines, -18 removed lines

@@ -44,7 +44,7 @@ 
         //Setting custom enabled
         $value = api_get_setting('gradebook_score_display_custom');
         $value = $value['my_display_custom'];
-        $this->custom_enabled  = $value == 'true' ? true : false;
+        $this->custom_enabled = $value == 'true' ? true : false;
 
         if ($this->custom_enabled) {
             $params = array('category = ?' =>  array('Gradebook'));
@@ -61,10 +61,10 @@ 
                 sort($portal_displays);
             }
             $this->custom_display = $portal_displays;
-            if (count($this->custom_display)>0) {
+            if (count($this->custom_display) > 0) {
                 $value = api_get_setting('gradebook_score_display_upperlimit');
                 $value = $value['my_display_upperlimit'];
-                $this->upperlimit_included  = $value == 'true' ? true : false;
+                $this->upperlimit_included = $value == 'true' ? true : false;
                 $this->custom_display_conv = $this->convert_displays($this->custom_display);
             }
         }
@@ -75,7 +75,7 @@ 
             //Load course settings
             if ($this->custom_enabled) {
                 $this->custom_display = $this->get_custom_displays();
-                if (count($this->custom_display)> 0) {
+                if (count($this->custom_display) > 0) {
                     $this->custom_display_conv = $this->convert_displays($this->custom_display);
                 }
             }
@@ -103,7 +103,7 @@ 
     /**
      * Compare the custom display of 2 scores, can be useful in sorting
      */
-    public static function compare_scores_by_custom_display ($score1, $score2)
+    public static function compare_scores_by_custom_display($score1, $score2)
     {
         if (!isset($score1)) {
             return (isset($score2) ? 1 : 0);
@@ -116,7 +116,7 @@ 
             if ($custom1 == $custom2) {
                 return 0;
             } else {
-                return (($score1[0]/$score1[1]) < ($score2[0]/$score2[1]) ? -1 : 1);
+                return (($score1[0] / $score1[1]) < ($score2[0] / $score2[1]) ? -1 : 1);
             }
         }
     }
@@ -184,7 +184,7 @@ 
         }
 
         $sql = 'SELECT id FROM '.$tbl_gradebook_category.'
-                WHERE course_code = "'.$curr_course_code.'" '. $session_condition;
+                WHERE course_code = "'.$curr_course_code.'" '.$session_condition;
         $rs  = Database::query($sql);
         $category_id = 0;
         if (Database::num_rows($rs) > 0) {
@@ -253,7 +253,7 @@ 
         );
 
         $tbl_display = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_SCORE_DISPLAY);
-        foreach($display as $value => $text) {
+        foreach ($display as $value => $text) {
             $params = array(
                 'score' => $value,
                 'display' => $text,
@@ -309,7 +309,7 @@ 
         $my_score = $score == 0 ? 1 : $score;
 
         if ($type == SCORE_BAR) {
-            $percentage = $my_score[0]/$my_score[1]*100;
+            $percentage = $my_score[0] / $my_score[1] * 100;
 
             return Display::bar_progress($percentage);
         }
@@ -350,7 +350,7 @@ 
             case SCORE_PERCENT :                        // XX %
                 return $this->display_as_percent($score);
             case SCORE_DIV_PERCENT :                    // X / Y (XX %)
-                return $this->display_as_div($score).' (' . $this->display_as_percent($score) . ')';
+                return $this->display_as_div($score).' ('.$this->display_as_percent($score).')';
             case SCORE_AVERAGE :                        // XX %
                 return $this->display_as_percent($score);
             case SCORE_DECIMAL :                        // 0.50  (X/Y)
@@ -360,7 +360,7 @@ 
                 if (!empty($custom)) {
                     $custom = ' - '.$custom;
                 }
-                return $this->display_as_div($score).' (' . $this->display_as_percent($score) . ')'.$custom;
+                return $this->display_as_div($score).' ('.$this->display_as_percent($score).')'.$custom;
             case SCORE_DIV_SIMPLE_WITH_CUSTOM :         // X - Good!
                 $custom = $this->display_custom($score);
 
@@ -412,9 +412,9 @@ 
      */
     private function display_as_decimal($score)
     {
-        $score_denom = ($score[1]==0) ? 1 : $score[1];
+        $score_denom = ($score[1] == 0) ? 1 : $score[1];
 
-        return $this->format_score($score[0]/$score_denom);
+        return $this->format_score($score[0] / $score_denom);
     }
 
     /**
@@ -422,9 +422,9 @@ 
      */
     private function display_as_percent($score)
     {
-        $score_denom = ($score[1]==0) ? 1 : $score[1];
+        $score_denom = ($score[1] == 0) ? 1 : $score[1];
 
-        return $this->format_score($score[0]/$score_denom*100) . ' %';
+        return $this->format_score($score[0] / $score_denom * 100).' %';
     }
 
     /**
@@ -440,7 +440,7 @@ 
         } else {
             $score[0] = isset($score[0]) ? $this->format_score($score[0]) : 0;
             $score[1] = isset($score[1]) ? $this->format_score($score[1]) : 0;
-            return  $score[0] . ' / ' . $score[1];
+            return  $score[0].' / '.$score[1];
         }
     }
 
@@ -450,7 +450,7 @@ 
      */
     private function display_custom($score)
     {
-        $my_score_denom= ($score[1]==0) ? 1 : $score[1];
+        $my_score_denom = ($score[1] == 0) ? 1 : $score[1];
         $scaledscore = $score[0] / $my_score_denom;
         if ($this->upperlimit_included) {
             foreach ($this->custom_display_conv as $displayitem) {
@@ -514,7 +514,7 @@ 
                 ORDER BY score';
         $result = Database::query($sql);
 
-        return Database::store_result($result,'ASSOC');
+        return Database::store_result($result, 'ASSOC');
     }
 
     /**