chamilo / chamilo-lms

main/inc/lib/array.lib.php

Spacing +3 added lines, -3 removed lines

@@ -110,10 +110,10 @@ 
 {
 	$old_locale = setlocale(LC_ALL, null);
 	$code = api_get_language_isocode();
-	$locale_list = array($code.'.utf8', 'en.utf8','en_US.utf8','en_GB.utf8');
+	$locale_list = array($code.'.utf8', 'en.utf8', 'en_US.utf8', 'en_GB.utf8');
 	$try_sort = false;
 
-	foreach($locale_list as $locale) {
+	foreach ($locale_list as $locale) {
 		$my_local = setlocale(LC_COLLATE, $locale);
 		if ($my_local) {
 			$try_sort = true;
@@ -151,7 +151,7 @@ 
     $flatten = array();
     array_walk_recursive(
         $array,
-        function ($value) use (&$flatten) {
+        function($value) use (&$flatten) {
             $flatten[] = $value;
         }
     );

main/inc/lib/surveymanager.lib.php

Spacing +12 added lines, -12 removed lines

@@ -19,7 +19,7 @@ 
     {
         // Database table definitions
         $table_survey = Database :: get_course_table(TABLE_SURVEY);
-        $table_survey_question 	= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+        $table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
         $table_user = Database :: get_main_table(TABLE_MAIN_USER);
 
         // searching
@@ -45,23 +45,23 @@ 
 				GROUP BY survey.survey_id";
 
         $res = Database::query($sql);
-        $surveys_parents = array ();
+        $surveys_parents = array();
         $refs = array();
         $list = array();
-        $plain_array=array();
+        $plain_array = array();
 
-        while ($survey = Database::fetch_array($res,'ASSOC')) {
-            $plain_array[$survey['survey_id']]=$survey;
-            $surveys_parents[]=$survey['survey_version'];
-            $thisref = &$refs[ $survey['survey_id'] ];
+        while ($survey = Database::fetch_array($res, 'ASSOC')) {
+            $plain_array[$survey['survey_id']] = $survey;
+            $surveys_parents[] = $survey['survey_version'];
+            $thisref = &$refs[$survey['survey_id']];
             $thisref['parent_id'] = $survey['parent_id'];
             $thisref['name'] = $survey['name'];
             $thisref['id'] = $survey['survey_id'];
             $thisref['survey_version'] = $survey['survey_version'];
             if ($survey['parent_id'] == 0) {
-                $list[ $survey['survey_id'] ] = &$thisref;
+                $list[$survey['survey_id']] = &$thisref;
             } else {
-                $refs[ $survey['parent_id'] ]['children'][ $survey['survey_id'] ] = &$thisref;
+                $refs[$survey['parent_id']]['children'][$survey['survey_id']] = &$thisref;
             }
         }
         $this->surveylist = $list;
@@ -80,7 +80,7 @@ 
     public function getParentId($id)
     {
         $node = $this->plainsurveylist[$id];
-        if (is_array($node)&& !empty($node['parent_id'])) {
+        if (is_array($node) && !empty($node['parent_id'])) {
             return $node['parent_id'];
         } else {
             return -1;
@@ -100,12 +100,12 @@ 
         if (is_array($list)) {
             foreach ($list as $key => $node) {
                 if (isset($node['children']) && is_array($node['children'])) {
-                    $result[$key]= $node['name'];
+                    $result[$key] = $node['name'];
                     $re = self::createList($node['children']);
                     if (!empty($re)) {
                         if (is_array($re)) {
                             foreach ($re as $key => $r) {
-                                $result[$key] = '' . $r;
+                                $result[$key] = ''.$r;
                             }
                         } else {
                             $result[] = $re;

main/inc/lib/notebook.lib.php

Spacing +25 added lines, -25 removed lines

@@ -29,7 +29,7 @@ 
         return "<script>
 				function confirmation (name)
 				{
-					if (confirm(\" " . get_lang("NoteConfirmDelete") . " \"+ name + \" ?\"))
+					if (confirm(\" " . get_lang("NoteConfirmDelete")." \"+ name + \" ?\"))
 						{return true;}
 					else
 						{return false;}
@@ -107,7 +107,7 @@ 
                 description 		AS note_comment,
                 session_id			AS session_id
                FROM $t_notebook
-               WHERE c_id = $course_id AND notebook_id = '" . intval($notebook_id) . "' ";
+               WHERE c_id = $course_id AND notebook_id = '".intval($notebook_id)."' ";
         $result = Database::query($sql);
         if (Database::num_rows($result) != 1) {
             return array();
@@ -181,8 +181,8 @@ 
         $sql = "DELETE FROM $t_notebook
                 WHERE
                     c_id = $course_id AND
-                    notebook_id='" . intval($notebook_id) . "' AND
-                    user_id = '" . api_get_user_id() . "'";
+                    notebook_id='".intval($notebook_id)."' AND
+                    user_id = '" . api_get_user_id()."'";
         $result = Database::query($sql);
         $affected_rows = Database::affected_rows($result);
         if ($affected_rows != 1) {
@@ -220,22 +220,22 @@ 
         echo '<div class="actions">';
         if (!api_is_anonymous()) {
             if (api_get_session_id() == 0)
-                echo '<a href="index.php?' . api_get_cidreq() . '&action=addnote">' .
-                    Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32') . '</a>';
+                echo '<a href="index.php?'.api_get_cidreq().'&action=addnote">'.
+                    Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32').'</a>';
             elseif (api_is_allowed_to_session_edit(false, true)) {
-                echo '<a href="index.php?' . api_get_cidreq() . '&action=addnote">' .
-                    Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32') . '</a>';
+                echo '<a href="index.php?'.api_get_cidreq().'&action=addnote">'.
+                    Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32').'</a>';
             }
         } else {
-            echo '<a href="javascript:void(0)">' . Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32') . '</a>';
+            echo '<a href="javascript:void(0)">'.Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32').'</a>';
         }
 
-        echo '<a href="index.php?' . api_get_cidreq() . '&action=changeview&view=creation_date&direction=' . $link_sort_direction . '">' .
-            Display::return_icon('notes_order_by_date_new.png', get_lang('OrderByCreationDate'), '', '32') . '</a>';
-        echo '<a href="index.php?' . api_get_cidreq() . '&action=changeview&view=update_date&direction=' . $link_sort_direction . '">' .
-            Display::return_icon('notes_order_by_date_mod.png', get_lang('OrderByModificationDate'), '', '32') . '</a>';
-        echo '<a href="index.php?' . api_get_cidreq() . '&action=changeview&view=title&direction=' . $link_sort_direction . '">' .
-            Display::return_icon('notes_order_by_title.png', get_lang('OrderByTitle'), '', '32') . '</a>';
+        echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=creation_date&direction='.$link_sort_direction.'">'.
+            Display::return_icon('notes_order_by_date_new.png', get_lang('OrderByCreationDate'), '', '32').'</a>';
+        echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=update_date&direction='.$link_sort_direction.'">'.
+            Display::return_icon('notes_order_by_date_mod.png', get_lang('OrderByModificationDate'), '', '32').'</a>';
+        echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=title&direction='.$link_sort_direction.'">'.
+            Display::return_icon('notes_order_by_title.png', get_lang('OrderByTitle'), '', '32').'</a>';
         echo '</div>';
 
         if (!isset($_SESSION['notebook_view']) || !in_array($_SESSION['notebook_view'], array('creation_date', 'update_date', 'title'))) {
@@ -246,9 +246,9 @@ 
         $t_notebook = Database :: get_course_table(TABLE_NOTEBOOK);
         $order_by = "";
         if ($_SESSION['notebook_view'] == 'creation_date' || $_SESSION['notebook_view'] == 'update_date') {
-            $order_by = " ORDER BY " . $_SESSION['notebook_view'] . " $sort_direction ";
+            $order_by = " ORDER BY ".$_SESSION['notebook_view']." $sort_direction ";
         } else {
-            $order_by = " ORDER BY " . $_SESSION['notebook_view'] . " $sort_direction ";
+            $order_by = " ORDER BY ".$_SESSION['notebook_view']." $sort_direction ";
         }
 
         //condition for the session
@@ -261,7 +261,7 @@ 
         $sql = "SELECT * FROM $t_notebook
                 WHERE
                     c_id = $course_id AND
-                    user_id = '" . api_get_user_id() . "'
+                    user_id = '".api_get_user_id()."'
                     $condition_session
                     $cond_extra $order_by
                 ";
@@ -274,18 +274,18 @@ 
 
             $updateValue = '';
             if ($row['update_date'] <> $row['creation_date']) {
-                $updateValue = ', ' . get_lang('UpdateDate') . ': ' . date_to_str_ago($update_date) . '&nbsp;&nbsp;<span class="dropbox_date">' . $update_date . '</span>';
+                $updateValue = ', '.get_lang('UpdateDate').': '.date_to_str_ago($update_date).'&nbsp;&nbsp;<span class="dropbox_date">'.$update_date.'</span>';
             }
 
-            $actions = '<a href="' . api_get_self() . '?action=editnote&notebook_id=' . $row['notebook_id'] . '">' .
-                Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL) . '</a>';
-            $actions .= '<a href="' . api_get_self() . '?action=deletenote&notebook_id=' . $row['notebook_id'] . '" onclick="return confirmation(\'' . $row['title'] . '\');">' .
-                Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL) . '</a>';
+            $actions = '<a href="'.api_get_self().'?action=editnote&notebook_id='.$row['notebook_id'].'">'.
+                Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
+            $actions .= '<a href="'.api_get_self().'?action=deletenote&notebook_id='.$row['notebook_id'].'" onclick="return confirmation(\''.$row['title'].'\');">'.
+                Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
 
             echo Display::panel(
                 $row['description'],
-                $row['title'] . $session_img.' <div class="pull-right">'.$actions.'</div>',
-                get_lang('CreationDate') . ': ' . date_to_str_ago($creation_date) . '&nbsp;&nbsp;<span class="dropbox_date">' . $creation_date . $updateValue."</span>"
+                $row['title'].$session_img.' <div class="pull-right">'.$actions.'</div>',
+                get_lang('CreationDate').': '.date_to_str_ago($creation_date).'&nbsp;&nbsp;<span class="dropbox_date">'.$creation_date.$updateValue."</span>"
             );
         }
     }

main/inc/lib/legal.lib.php

Spacing +20 added lines, -20 removed lines

@@ -44,7 +44,7 @@ 
             Database::insert($legal_table, $params);
 
             return true;
-        } elseif($last['type'] != $type && $language==$last['language_id']) {
+        } elseif ($last['type'] != $type && $language == $last['language_id']) {
             //update
             $id = $last['legal_id'];
             $params = [
@@ -77,7 +77,7 @@ 
 	public static function get_last_condition_version($language)
     {
 		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$language= Database::escape_string($language);
+		$language = Database::escape_string($language);
 		$sql = "SELECT version FROM $legal_conditions_table
 		        WHERE language_id = '".$language."'
 		        ORDER BY legal_id DESC LIMIT 1 ";
@@ -97,10 +97,10 @@ 
 	 * @param int $language language id
 	 * @return array all the info of a Term and condition
 	 */
-	public static function get_last_condition ($language)
+	public static function get_last_condition($language)
     {
 		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$language= Database::escape_string($language);
+		$language = Database::escape_string($language);
 		$sql = "SELECT * FROM $legal_conditions_table
                 WHERE language_id = '".$language."'
                 ORDER BY version DESC
@@ -124,9 +124,9 @@ 
                 ORDER BY version DESC
                 LIMIT 1 ";
         $result = Database::query($sql);
-        if (Database::num_rows($result)>0){
+        if (Database::num_rows($result) > 0) {
             $version = Database::fetch_array($result);
-            $version = explode(':',$version[0]);
+            $version = explode(':', $version[0]);
 
             return $version[0];
         } else {
@@ -153,7 +153,7 @@ 
                 break;
                 // Page link
             case 1:
-                $preview ='<fieldset>
+                $preview = '<fieldset>
                              <legend>'.get_lang('TermsAndConditions').'</legend>';
                 $preview .= '<div id="legal-accept-wrapper" class="form-item">
                 <label class="option" for="legal-accept">
@@ -185,25 +185,25 @@ 
 		$number_of_items = intval($number_of_items);
 		$column = intval($column);
 
- 		$sql  = "SELECT version, original_name as language, content, changes, type, FROM_UNIXTIME(date)
+ 		$sql = "SELECT version, original_name as language, content, changes, type, FROM_UNIXTIME(date)
 				FROM $legal_conditions_table inner join $lang_table l on(language_id = l.id) ";
 		$sql .= "ORDER BY language, version ASC ";
 		$sql .= "LIMIT $from, $number_of_items ";
 
 		$result = Database::query($sql);
-		$legals = array ();
-		$versions = array ();
+		$legals = array();
+		$versions = array();
 		while ($legal = Database::fetch_array($result)) {
 			// max 2000 chars
 			//echo strlen($legal[1]); echo '<br>';
-			$versions[]=$legal[0];
-			$languages[]=$legal[1];
-			if (strlen($legal[2])>2000)
-				$legal[2]= substr($legal[2],0,2000).' ... ';
-			if ($legal[4]==0)
-				$legal[4]= get_lang('HTMLText');
-			elseif($legal[4]==1)
-				$legal[4]=get_lang('PageLink');
+			$versions[] = $legal[0];
+			$languages[] = $legal[1];
+			if (strlen($legal[2]) > 2000)
+				$legal[2] = substr($legal[2], 0, 2000).' ... ';
+			if ($legal[4] == 0)
+				$legal[4] = get_lang('HTMLText');
+			elseif ($legal[4] == 1)
+				$legal[4] = get_lang('PageLink');
 			$legals[] = $legal;
 		}
 		return $legals;
@@ -220,7 +220,7 @@ 
 		        FROM $legal_conditions_table
 		        ORDER BY legal_id DESC ";
 		$result = Database::query($sql);
-		$url = Database::fetch_array($result,'ASSOC');
+		$url = Database::fetch_array($result, 'ASSOC');
 		$result = $url['count_result'];
 
 		return $result;
@@ -241,6 +241,6 @@ 
 		        WHERE legal_id="'.$legal_id.'" AND language_id="'.$language_id.'"';
 		$rs = Database::query($sql);
 
-		return Database::result($rs,0,'type');
+		return Database::result($rs, 0, 'type');
 	}
 }

main/inc/lib/blog.lib.php

Spacing +399 added lines, -399 removed lines

@@ -21,7 +21,7 @@ 
 	 *
 	 * @return String Blog Title
 	 */
-	public static function get_blog_title ($blog_id)
+	public static function get_blog_title($blog_id)
 	{
 	    $course_id = api_get_course_int_id();
 
@@ -30,8 +30,8 @@ 
 			$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
 
 			$sql = "SELECT blog_name
-					FROM " . $tbl_blogs . "
-					WHERE c_id = $course_id AND blog_id = " . intval($blog_id);
+					FROM " . $tbl_blogs."
+					WHERE c_id = $course_id AND blog_id = ".intval($blog_id);
 
 			$result = Database::query($sql);
 			$blog = Database::fetch_array($result);
@@ -78,15 +78,15 @@ 
 
 		// Get blog members
 		$sql = "SELECT user.user_id, user.firstname, user.lastname
-				FROM " . $tbl_blogs_rel_user . " blogs_rel_user
-				INNER JOIN " . $tbl_users . " user
+				FROM " . $tbl_blogs_rel_user." blogs_rel_user
+				INNER JOIN " . $tbl_users." user
 				ON blogs_rel_user.user_id = user.user_id
 				WHERE
 				    blogs_rel_user.c_id = $course_id AND
-					blogs_rel_user.blog_id = '" . (int)$blog_id."'";
+					blogs_rel_user.blog_id = '".(int) $blog_id."'";
 		$result = Database::query($sql);
-		$blog_members = array ();
-		while($user = Database::fetch_array($result)) {
+		$blog_members = array();
+		while ($user = Database::fetch_array($result)) {
 			$blog_members[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
 		}
 
@@ -105,7 +105,7 @@ 
 		$_user = api_get_user_info();
         $course_id = api_get_course_int_id();
 
-		$current_date=date('Y-m-d H:i:s',time());
+		$current_date = date('Y-m-d H:i:s', time());
 		$session_id = api_get_session_id();
 		// Tabel definitions
         $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
@@ -130,7 +130,7 @@ 
                 'blog_name' => $title,
                 'blog_subtitle' =>  $subtitle,
                 'date_creation' => $current_date,
-                'visibility' => 1 ,
+                'visibility' => 1,
                 'session_id' => $session_id,
             ];
 			$this_blog_id = Database::insert($tbl_blogs, $params);
@@ -169,7 +169,7 @@ 
 
 			// Put it on course homepage
 			$sql = "INSERT INTO $tbl_tool (c_id, name, link, image, visibility, admin, address, added_tool, session_id)
-					VALUES ($course_id, '".Database::escape_string($title)."','blog/blog.php?blog_id=".(int)$this_blog_id."','blog.gif','1','0','pastillegris.gif',0,'$session_id')";
+					VALUES ($course_id, '".Database::escape_string($title)."','blog/blog.php?blog_id=".(int) $this_blog_id."','blog.gif','1','0','pastillegris.gif',0,'$session_id')";
 			Database::query($sql);
 
             $toolId = Database::insert_id();
@@ -204,7 +204,7 @@ 
 		        blog_subtitle = '".Database::escape_string($subtitle)."'
 		        WHERE
 		            c_id = $course_id AND
-		            blog_id ='".Database::escape_string((int)$blog_id)."'
+		            blog_id ='".Database::escape_string((int) $blog_id)."'
                 LIMIT 1";
 		Database::query($sql);
 
@@ -220,7 +220,7 @@ 
 		// Update course homepage link
 		$sql = "UPDATE $tbl_tool SET
 		        name = '".Database::escape_string($title)."'
-		        WHERE c_id = $course_id AND link = 'blog/blog.php?blog_id=".(int)$blog_id."' LIMIT 1";
+		        WHERE c_id = $course_id AND link = 'blog/blog.php?blog_id=".(int) $blog_id."' LIMIT 1";
 		Database::query($sql);
 	}
 
@@ -263,7 +263,7 @@ 
 		Database::query($sql);
 
 		// Delete blog
-		$sql ="DELETE FROM $tbl_blogs WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
+		$sql = "DELETE FROM $tbl_blogs WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
 		Database::query($sql);
 
 		// Delete from course homepage
@@ -294,13 +294,13 @@ 
 		$course_id = $_course['real_id'];
 
 		$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
-		$upload_ok=true;
-		$has_attachment=false;
+		$upload_ok = true;
+		$has_attachment = false;
 		$current_date = api_get_utc_datetime();
 
 		if (!empty($_FILES['user_upload']['name'])) {
 			$upload_ok = process_uploaded_file($_FILES['user_upload']);
-			$has_attachment=true;
+			$has_attachment = true;
 		}
 
 		if ($upload_ok) {
@@ -309,7 +309,7 @@ 
 
 			// Create the post
 			$sql = "INSERT INTO $tbl_blogs_posts (c_id, title, full_text, date_creation, blog_id, author_id )
-					VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($full_text)."','".$current_date."', '".(int)$blog_id."', '".(int)$_user['user_id']."');";
+					VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($full_text)."','".$current_date."', '".(int) $blog_id."', '".(int) $_user['user_id']."');";
 
 			Database::query($sql);
 			$last_post_id = Database::insert_id();
@@ -320,7 +320,7 @@ 
             }
 
 			if ($has_attachment) {
-				$courseDir   = $_course['path'].'/upload/blog';
+				$courseDir = $_course['path'].'/upload/blog';
 				$sys_course_path = api_get_path(SYS_COURSE_PATH);
 				$updir = $sys_course_path.$courseDir;
 
@@ -371,9 +371,9 @@ 
 
 		// Create the post
 		$sql = "UPDATE $tbl_blogs_posts SET
-		        title = '" . Database::escape_string($title)."',
+		        title = '".Database::escape_string($title)."',
 		        full_text = '" . Database::escape_string($full_text)."'
-		        WHERE c_id = $course_id AND post_id ='".(int)$post_id."' AND blog_id ='".(int)$blog_id."'
+		        WHERE c_id = $course_id AND post_id ='".(int) $post_id."' AND blog_id ='".(int) $blog_id."'
 		        LIMIT 1 ";
 		Database::query($sql);
 	}
@@ -394,21 +394,21 @@ 
 
 		// Delete ratings on this comment
 		$sql = "DELETE FROM $tbl_blogs_rating
-				WHERE c_id = $course_id AND blog_id = '".(int)$blog_id."' AND item_id = '".(int)$post_id."' AND rating_type = 'post'";
+				WHERE c_id = $course_id AND blog_id = '".(int) $blog_id."' AND item_id = '".(int) $post_id."' AND rating_type = 'post'";
 		Database::query($sql);
 
 		// Delete the post
 		$sql = "DELETE FROM $tbl_blogs_posts
-				WHERE c_id = $course_id AND post_id = '".(int)$post_id."'";
+				WHERE c_id = $course_id AND post_id = '".(int) $post_id."'";
 		Database::query($sql);
 
 		// Delete the comments
 		$sql = "DELETE FROM $tbl_blogs_comments
-				WHERE c_id = $course_id AND post_id = '".(int)$post_id."' AND blog_id = '".(int)$blog_id."'";
+				WHERE c_id = $course_id AND post_id = '".(int) $post_id."' AND blog_id = '".(int) $blog_id."'";
 		Database::query($sql);
 
 		// Delete posts and attachments
-		delete_all_blog_attachment($blog_id,$post_id);
+		delete_all_blog_attachment($blog_id, $post_id);
 	}
 
 	/**
@@ -424,7 +424,7 @@ 
 	{
 		$_user = api_get_user_info();
 		$_course = api_get_course_info();
-        $blog_table_attachment 	= Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+        $blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
 
         $upload_ok = true;
         $has_attachment = false;
@@ -433,7 +433,7 @@ 
 
 		if (!empty($_FILES['user_upload']['name'])) {
 			$upload_ok = process_uploaded_file($_FILES['user_upload']);
-			$has_attachment=true;
+			$has_attachment = true;
 		}
 
 		if ($upload_ok) {
@@ -442,7 +442,7 @@ 
 
 			// Create the comment
 			$sql = "INSERT INTO $tbl_blogs_comments (c_id, title, comment, author_id, date_creation, blog_id, post_id, parent_comment_id, task_id )
-					VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($full_text)."', '".(int)$_user['user_id']."','".$current_date."', '".(int)$blog_id."', '".(int)$post_id."', '".(int)$parent_id."', '".(int)$task_id."')";
+					VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($full_text)."', '".(int) $_user['user_id']."','".$current_date."', '".(int) $blog_id."', '".(int) $post_id."', '".(int) $parent_id."', '".(int) $task_id."')";
 			Database::query($sql);
 
 			// Empty post values, or they are shown on the page again
@@ -454,7 +454,7 @@ 
             }
 
 			if ($has_attachment) {
-				$courseDir   = $_course['path'].'/upload/blog';
+				$courseDir = $_course['path'].'/upload/blog';
 				$sys_course_path = api_get_path(SYS_COURSE_PATH);
 				$updir = $sys_course_path.$courseDir;
 
@@ -465,19 +465,19 @@ 
 				);
 
 				// user's file name
-				$file_name =$_FILES['user_upload']['name'];
+				$file_name = $_FILES['user_upload']['name'];
 
 				if (!filter_extension($new_file_name)) {
 					Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
 				} else {
 					$new_file_name = uniqid('');
-					$new_path=$updir.'/'.$new_file_name;
-					$result= @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
+					$new_path = $updir.'/'.$new_file_name;
+					$result = @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
 					$comment = Database::escape_string($file_comment);
 
 					// Storing the attachments if any
 					if ($result) {
-						$sql='INSERT INTO '.$blog_table_attachment.'(c_id, filename,comment, path, post_id,size,blog_id,comment_id) '.
+						$sql = 'INSERT INTO '.$blog_table_attachment.'(c_id, filename,comment, path, post_id,size,blog_id,comment_id) '.
 							 "VALUES ($course_id, '".Database::escape_string($file_name)."', '".$comment."', '".Database::escape_string($new_file_name)."' , '".$post_id."', '".$_FILES['user_upload']['size']."',  '".$blog_id."', '".$last_id."'  )";
 						Database::query($sql);
 
@@ -526,7 +526,7 @@ 
 
 		// Delete them recursively
 		while ($comment = Database::fetch_array($result)) {
-			Blog::delete_comment($blog_id,$post_id,$comment['comment_id']);
+			Blog::delete_comment($blog_id, $post_id, $comment['comment_id']);
 		}
 
 		// Finally, delete the selected comment to
@@ -553,7 +553,7 @@ 
 
 		// Create the task
 		$sql = "INSERT INTO $tbl_blogs_tasks (c_id, blog_id, title, description, color, system_task)
-				VALUES ($course_id , '".(int)$blog_id."', '" . Database::escape_string($title)."', '" . Database::escape_string($description)."', '" . Database::escape_string($color)."', '0');";
+				VALUES ($course_id , '".(int) $blog_id."', '".Database::escape_string($title)."', '".Database::escape_string($description)."', '".Database::escape_string($color)."', '0');";
 		Database::query($sql);
 
 		$task_id = Database::insert_id();
@@ -563,13 +563,13 @@ 
             Database::query($sql);
         }
 
-		$tool = 'BLOG_' . $blog_id;
+		$tool = 'BLOG_'.$blog_id;
 
 		if ($articleDelete == 'on') {
-			$sql = " INSERT INTO " . $tbl_tasks_permissions . " ( c_id,  task_id, tool, action) VALUES (
-					'" . (int)$course_id . "',
-					'" . (int)$task_id . "',
-					'" . Database::escape_string($tool) . "',
+			$sql = " INSERT INTO ".$tbl_tasks_permissions." ( c_id,  task_id, tool, action) VALUES (
+					'" . (int) $course_id."',
+					'" . (int) $task_id."',
+					'" . Database::escape_string($tool)."',
 					'article_delete'
 				)";
 			Database::query($sql);
@@ -584,10 +584,10 @@ 
 
 		if ($articleEdit == 'on') {
 			$sql = "
-				INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action ) VALUES (
-					'" . (int)$course_id . "',
-					'" . (int)$task_id . "',
-					'" . Database::escape_string($tool) . "',
+				INSERT INTO " . $tbl_tasks_permissions." (c_id, task_id, tool, action ) VALUES (
+					'" . (int) $course_id."',
+					'" . (int) $task_id."',
+					'" . Database::escape_string($tool)."',
 					'article_edit'
 				)";
 			Database::query($sql);
@@ -601,10 +601,10 @@ 
 
 		if ($commentsDelete == 'on') {
 			$sql = "
-				INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action ) VALUES (
-					'" . (int)$course_id . "',
-					'" . (int)$task_id . "',
-					'" . Database::escape_string($tool) . "',
+				INSERT INTO " . $tbl_tasks_permissions." (c_id, task_id, tool, action ) VALUES (
+					'" . (int) $course_id."',
+					'" . (int) $task_id."',
+					'" . Database::escape_string($tool)."',
 					'article_comments_delete'
 				)";
 			Database::query($sql);
@@ -637,20 +637,20 @@ 
 					title = '".Database::escape_string($title)."',
 					description = '".Database::escape_string($description)."',
 					color = '".Database::escape_string($color)."'
-				WHERE c_id = $course_id AND task_id ='".(int)$task_id."' LIMIT 1";
+				WHERE c_id = $course_id AND task_id ='".(int) $task_id."' LIMIT 1";
 		Database::query($sql);
 
-		$tool = 'BLOG_' . $blog_id;
+		$tool = 'BLOG_'.$blog_id;
 
-		$sql = "DELETE FROM " . $tbl_tasks_permissions . "
-				WHERE c_id = $course_id AND task_id = '" . (int)$task_id."'";
+		$sql = "DELETE FROM ".$tbl_tasks_permissions."
+				WHERE c_id = $course_id AND task_id = '".(int) $task_id."'";
 		Database::query($sql);
 
 		if ($articleDelete == 'on') {
-			$sql = "INSERT INTO " . $tbl_tasks_permissions . " ( c_id, task_id, tool, action) VALUES (
-					'" . (int)$course_id . "',
-					'" . (int)$task_id . "',
-					'" . Database::escape_string($tool) . "',
+			$sql = "INSERT INTO ".$tbl_tasks_permissions." ( c_id, task_id, tool, action) VALUES (
+					'" . (int) $course_id."',
+					'" . (int) $task_id."',
+					'" . Database::escape_string($tool)."',
 					'article_delete'
 				)";
 			Database::query($sql);
@@ -663,10 +663,10 @@ 
 		}
 
 		if ($articleEdit == 'on') {
-			$sql = "INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action) VALUES (
-					'" . (int)$course_id . "',
-					'" . (int)$task_id . "',
-					'" . Database::escape_string($tool) . "',
+			$sql = "INSERT INTO ".$tbl_tasks_permissions." (c_id, task_id, tool, action) VALUES (
+					'" . (int) $course_id."',
+					'" . (int) $task_id."',
+					'" . Database::escape_string($tool)."',
 					'article_edit'
 				)";
 			Database::query($sql);
@@ -679,10 +679,10 @@ 
 		}
 
 		if ($commentsDelete == 'on') {
-			$sql = " INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action) VALUES (
-					'" . (int)$course_id . "',
-					'" . (int)$task_id . "',
-					'" . Database::escape_string($tool) . "',
+			$sql = " INSERT INTO ".$tbl_tasks_permissions." (c_id, task_id, tool, action) VALUES (
+					'" . (int) $course_id."',
+					'" . (int) $task_id."',
+					'" . Database::escape_string($tool)."',
 					'article_comments_delete'
 				)";
 			Database::query($sql);
@@ -707,7 +707,7 @@ 
 
 		// Delete posts
 		$sql = "DELETE FROM $tbl_blogs_tasks
-				WHERE c_id = $course_id AND blog_id = '".(int)$blog_id."' AND task_id = '".(int)$task_id."'";
+				WHERE c_id = $course_id AND blog_id = '".(int) $blog_id."' AND task_id = '".(int) $task_id."'";
 		Database::query($sql);
 	}
 
@@ -725,9 +725,9 @@ 
 		$sql = "DELETE FROM $tbl_blogs_tasks_rel_user
 				WHERE
 				    c_id = $course_id AND
-				    blog_id = '".(int)$blog_id."' AND
-				    task_id = '".(int)$task_id."' AND
-				    user_id = '".(int)$user_id."'";
+				    blog_id = '".(int) $blog_id."' AND
+				    task_id = '".(int) $task_id."' AND
+				    user_id = '".(int) $user_id."'";
 		Database::query($sql);
 	}
 
@@ -741,7 +741,7 @@ 
 		$_user = api_get_user_info();
 
 		$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
-		$tbl_blogs_tasks_rel_user 	= Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+		$tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
 		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
 
 		$course_id = api_get_course_int_id();
@@ -758,7 +758,7 @@ 
                         task.c_id = $course_id AND
                         blog.c_id = $course_id AND
                         task_rel_user.c_id = $course_id AND
-                        task_rel_user.user_id = ".(int)$_user['user_id']."
+                        task_rel_user.user_id = ".(int) $_user['user_id']."
                     ORDER BY target_date ASC";
 
 			$result = Database::query($sql);
@@ -766,7 +766,7 @@ 
 			if (Database::num_rows($result) > 0) {
 				echo '<ul>';
 				while ($mytask = Database::fetch_array($result)) {
-					echo '<li><a href="blog.php?action=execute_task&blog_id=' . $mytask['blog_id'] . '&task_id='.stripslashes($mytask['task_id']) . '" title="[Blog: '.stripslashes($mytask['blog_name']) . '] ' . get_lang('ExecuteThisTask') . '">'.stripslashes($mytask['title']) . '</a></li>';
+					echo '<li><a href="blog.php?action=execute_task&blog_id='.$mytask['blog_id'].'&task_id='.stripslashes($mytask['task_id']).'" title="[Blog: '.stripslashes($mytask['blog_name']).'] '.get_lang('ExecuteThisTask').'">'.stripslashes($mytask['title']).'</a></li>';
 				}
 				echo '<ul>';
 			} else {
@@ -790,7 +790,7 @@ 
 
 		// Get blog properties
 		$sql = "SELECT blog_name, visibility FROM $tbl_blogs
-				WHERE c_id = $course_id AND blog_id='".(int)$blog_id."'";
+				WHERE c_id = $course_id AND blog_id='".(int) $blog_id."'";
 		$result = Database::query($sql);
 		$blog = Database::fetch_array($result);
 		$visibility = $blog['visibility'];
@@ -799,7 +799,7 @@ 
 		if ($visibility == 1) {
 			// Change visibility state, remove from course home.
 			$sql = "UPDATE $tbl_blogs SET visibility = '0'
-					WHERE c_id = $course_id AND blog_id ='".(int)$blog_id."' LIMIT 1";
+					WHERE c_id = $course_id AND blog_id ='".(int) $blog_id."' LIMIT 1";
 			Database::query($sql);
 
 			$sql = "DELETE FROM $tbl_tool
@@ -808,11 +808,11 @@ 
 		} else {
 			// Change visibility state, add to course home.
 			$sql = "UPDATE $tbl_blogs SET visibility = '1'
-					WHERE c_id = $course_id AND blog_id ='".(int)$blog_id."' LIMIT 1";
+					WHERE c_id = $course_id AND blog_id ='".(int) $blog_id."' LIMIT 1";
 			Database::query($sql);
 
 			$sql = "INSERT INTO $tbl_tool (c_id, name, link, image, visibility, admin, address, added_tool, target )
-					VALUES ($course_id, '".Database::escape_string($title)."', 'blog/blog.php?blog_id=".(int)$blog_id."', 'blog.gif', '1', '0', 'pastillegris.gif', '0', '_self')";
+					VALUES ($course_id, '".Database::escape_string($title)."', 'blog/blog.php?blog_id=".(int) $blog_id."', 'blog.gif', '1', '0', 'pastillegris.gif', '0', '_self')";
 			Database::query($sql);
             $id = Database::insert_id();
 
@@ -843,14 +843,14 @@ 
 		        FROM $tbl_blogs_posts post
                 INNER JOIN $tbl_users user
                 ON post.author_id = user.user_id
-				WHERE 	post.blog_id = '".(int)$blog_id."' AND
+				WHERE 	post.blog_id = '".(int) $blog_id."' AND
 						post.c_id = $course_id AND
 						$filter
-				ORDER BY post_id DESC LIMIT 0,".(int)$max_number_of_posts;
+				ORDER BY post_id DESC LIMIT 0,".(int) $max_number_of_posts;
 		$result = Database::query($sql);
 
 		// Display
-		if(Database::num_rows($result) > 0) {
+		if (Database::num_rows($result) > 0) {
 		    $limit = 200;
 			while ($blog_post = Database::fetch_array($result)) {
 				// Get number of comments
@@ -858,8 +858,8 @@ 
 						FROM $tbl_blogs_comments
 						WHERE
 						    c_id = $course_id AND
-						    blog_id = '".(int)$blog_id."' AND
-						    post_id = '" . (int)$blog_post['post_id']."'";
+						    blog_id = '".(int) $blog_id."' AND
+						    post_id = '" . (int) $blog_post['post_id']."'";
 				$tmp = Database::query($sql);
 				$blog_post_comments = Database::fetch_array($tmp);
 
@@ -870,11 +870,11 @@ 
 
 				// Create an introduction text (but keep FULL sentences)
 				$words = 0;
-				$blog_post_text_cut = cut($blog_post_text, $limit) ;
+				$blog_post_text_cut = cut($blog_post_text, $limit);
 				$words = strlen($blog_post_text);
 
 				if ($words >= $limit) {
-					$readMoreLink = ' <div class="link" onclick="document.getElementById(\'blogpost_text_' . $blog_post_id . '\').style.display=\'block\'; document.getElementById(\'blogpost_introduction_' . $blog_post_id . '\').style.display=\'none\'">' . get_lang('ReadMore') . '</div>';
+					$readMoreLink = ' <div class="link" onclick="document.getElementById(\'blogpost_text_'.$blog_post_id.'\').style.display=\'block\'; document.getElementById(\'blogpost_introduction_'.$blog_post_id.'\').style.display=\'none\'">'.get_lang('ReadMore').'</div>';
 					$introduction_text = $blog_post_text_cut;
 				} else {
 				    $introduction_text = $blog_post_text;
@@ -884,27 +884,27 @@ 
 				$introduction_text = stripslashes($introduction_text);
 
 				echo '<div class="blogpost">';
-				echo '<span class="blogpost_title"><a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >'.stripslashes($blog_post['title']) . '</a></span>';
-				echo '<span class="blogpost_date"><a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >' . $blog_post_date . '</a></span>';
-				echo '<div class="blogpost_introduction" id="blogpost_introduction_'.$blog_post_id.'">' . $introduction_text.$readMoreLink.'</div>';
-				echo '<div class="blogpost_text" id="blogpost_text_' . $blog_post_id . '" style="display: none">' . $blog_post_text . '</div>';
+				echo '<span class="blogpost_title"><a href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$blog_post['post_id'].'#add_comment" title="'.get_lang('ReadPost').'" >'.stripslashes($blog_post['title']).'</a></span>';
+				echo '<span class="blogpost_date"><a href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$blog_post['post_id'].'#add_comment" title="'.get_lang('ReadPost').'" >'.$blog_post_date.'</a></span>';
+				echo '<div class="blogpost_introduction" id="blogpost_introduction_'.$blog_post_id.'">'.$introduction_text.$readMoreLink.'</div>';
+				echo '<div class="blogpost_text" id="blogpost_text_'.$blog_post_id.'" style="display: none">'.$blog_post_text.'</div>';
 
-				$file_name_array = get_blog_attachment($blog_id,$blog_post_id,0);
+				$file_name_array = get_blog_attachment($blog_id, $blog_post_id, 0);
 
 				if (!empty($file_name_array)) {
 					echo '<br /><br />';
-					echo Display::return_icon('attachment.gif',get_lang('Attachment'));
+					echo Display::return_icon('attachment.gif', get_lang('Attachment'));
 					echo '<a href="download.php?file=';
 					echo $file_name_array['path'];
 					echo ' "> '.$file_name_array['filename'].' </a><br />';
 					echo '</span>';
 				}
 				$username = api_htmlentities(sprintf(get_lang('LoginX'), $blog_post['username']), ENT_QUOTES);
-				echo '<span class="blogpost_info">' . get_lang('Author') . ': ' . Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username)) .' - <a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >' . get_lang('Comments') . ': ' . $blog_post_comments['number_of_comments'] . '</a></span>';
+				echo '<span class="blogpost_info">'.get_lang('Author').': '.Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username)).' - <a href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$blog_post['post_id'].'#add_comment" title="'.get_lang('ReadPost').'" >'.get_lang('Comments').': '.$blog_post_comments['number_of_comments'].'</a></span>';
 				echo '</div>';
 			}
 		} else {
-			if($filter == '1=1') {
+			if ($filter == '1=1') {
 				echo get_lang('NoArticles');
 			} else {
 				echo get_lang('NoArticleMatches');
@@ -918,19 +918,19 @@ 
 	 * @param Integer $blog_id
 	 * @param String $query_string
 	 */
-	public static function display_search_results ($blog_id, $query_string)
+	public static function display_search_results($blog_id, $query_string)
 	{
 		// Init
 		$query_string = Database::escape_string($query_string);
-		$query_string_parts = explode(' ',$query_string);
+		$query_string_parts = explode(' ', $query_string);
 		$query_string = array();
 		foreach ($query_string_parts as $query_part) {
-			$query_string[] = " full_text LIKE '%" . $query_part."%' OR title LIKE '%" . $query_part."%' ";
+			$query_string[] = " full_text LIKE '%".$query_part."%' OR title LIKE '%".$query_part."%' ";
 		}
-		$query_string = '('.implode('OR',$query_string) . ')';
+		$query_string = '('.implode('OR', $query_string).')';
 
 		// Display the posts
-		echo '<span class="blogpost_title">' . get_lang('SearchResults') . '</span>';
+		echo '<span class="blogpost_title">'.get_lang('SearchResults').'</span>';
 		Blog::display_blog_posts($blog_id, $query_string);
 	}
 
@@ -943,14 +943,14 @@ 
 	public static function display_day_results($blog_id, $query_string)
 	{
 		$date_output = $query_string;
-		$date = explode('-',$query_string);
-		$query_string = ' DAYOFMONTH(date_creation) =' . intval($date[2]) . ' AND MONTH(date_creation) =' . intval($date[1]) . ' AND YEAR(date_creation) =' . intval($date[0]);
+		$date = explode('-', $query_string);
+		$query_string = ' DAYOFMONTH(date_creation) ='.intval($date[2]).' AND MONTH(date_creation) ='.intval($date[1]).' AND YEAR(date_creation) ='.intval($date[0]);
 
 		// Put date in correct output format
 		$date_output = api_format_date($date_output, DATE_FORMAT_LONG);
 
 		// Display the posts
-		echo '<span class="blogpost_title">' . get_lang('PostsOf') . ': ' . $date_output . '</span>';
+		echo '<span class="blogpost_title">'.get_lang('PostsOf').': '.$date_output.'</span>';
 		Blog::display_blog_posts($blog_id, $query_string);
 	}
 
@@ -977,8 +977,8 @@ 
 					ON post.author_id = user.user_id
                 WHERE
                     post.c_id = $course_id AND
-                    post.blog_id = '".(int)$blog_id."' AND
-                    post.post_id = '".(int)$post_id."'
+                    post.blog_id = '".(int) $blog_id."' AND
+                    post.post_id = '".(int) $post_id."'
                 ORDER BY post_id DESC";
 		$result = Database::query($sql);
 		$blog_post = Database::fetch_array($result);
@@ -986,7 +986,7 @@ 
 		// Get number of comments
 		$sql = "SELECT COUNT(1) as number_of_comments
 		        FROM $tbl_blogs_comments
-				WHERE c_id = $course_id AND blog_id = '".(int)$blog_id."' AND post_id = '".(int)$post_id."'";
+				WHERE c_id = $course_id AND blog_id = '".(int) $blog_id."' AND post_id = '".(int) $post_id."'";
 		$result = Database::query($sql);
 		$blog_post_comments = Database::fetch_array($result);
 
@@ -997,28 +997,28 @@ 
 
 		$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') . '"><img src="../img/edit.gif" /></a>';
+		if (api_is_allowed('BLOG_'.$blog_id, 'article_edit', $task_id))
+			$blog_post_actions .= '<a href="blog.php?action=edit_post&blog_id='.$blog_id.'&post_id='.$post_id.'&article_id='.$blog_post['post_id'].'&task_id='.$task_id.'" title="'.get_lang('EditThisPost').'"><img src="../img/edit.gif" /></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;"><img src="../img/delete.gif" border="0" /></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;"><img src="../img/delete.gif" border="0" /></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>';
@@ -1029,20 +1029,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']);
 		}
 	}
@@ -1070,16 +1070,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();
@@ -1112,8 +1112,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);
@@ -1130,7 +1130,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);
@@ -1140,14 +1140,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 '';
 			}
@@ -1156,14 +1156,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 '';
 			}
@@ -1198,11 +1198,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
@@ -1211,8 +1211,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'];
@@ -1222,26 +1222,26 @@ 
 			$comment_text = make_clickable(stripslashes($comment['comment']));
 			$blog_comment_date = api_convert_and_format_date($comment['date_creation'], null, date_default_timezone_get());
 			$blog_comment_actions = "";
-			if(api_is_allowed('BLOG_' . $blog_id, 'article_comments_delete', $task_id)) { $blog_comment_actions .= '<a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&do=delete_comment&comment_id=' . $comment['comment_id'] . '&task_id=' . $task_id . '" title="' . get_lang('DeleteThisComment') . '" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"><img src="../img/delete.gif" border="0" /></a>'; }
-			if(api_is_allowed('BLOG_' . $blog_id, 'article_comments_rate')) { $rating_select = Blog::display_rating_form('comment', $blog_id, $post_id, $comment['comment_id']); }
+			if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) { $blog_comment_actions .= '<a href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$post_id.'&do=delete_comment&comment_id='.$comment['comment_id'].'&task_id='.$task_id.'" title="'.get_lang('DeleteThisComment').'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)).'\')) return false;"><img src="../img/delete.gif" border="0" /></a>'; }
+			if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_rate')) { $rating_select = Blog::display_rating_form('comment', $blog_id, $post_id, $comment['comment_id']); }
 
 			if (!is_null($comment['task_id'])) {
-				$border_color = ' border-left: 3px solid #' . $comment['color'];
+				$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>';
@@ -1251,7 +1251,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.
@@ -1267,11 +1267,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')
 			);
@@ -1315,8 +1315,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);
@@ -1325,7 +1325,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'));
@@ -1357,26 +1357,26 @@ 
 		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"><img src="../img/blog_newtasks.gif" border="0" align="middle" alt="'.get_lang('AddTasks').'" />' . get_lang('AddTasks') . '</a> ';
-			echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=assign"><img src="../img/blog_task.gif" border="0" align="middle" alt="'.get_lang('AssignTasks').'" />' . get_lang('AssignTasks') . '</a>';
+			echo '<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$blog_id.'&do=add"><img src="../img/blog_newtasks.gif" border="0" align="middle" alt="'.get_lang('AddTasks').'" />'.get_lang('AddTasks').'</a> ';
+			echo '<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$blog_id.'&do=assign"><img src="../img/blog_task.gif" border="0" align="middle" alt="'.get_lang('AssignTasks').'" />'.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>
+				<a href="<?php echo api_get_self(); ?>?action=manage_rights&blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('ManageRights') ?>"><?php echo Display::return_icon('blog_admin_users.png', get_lang('RightsManager'), '', ICON_SIZE_SMALL).get_lang('RightsManager') ?></a>
 			<?php
 			echo '</div>';
 
-			echo '<span class="blogpost_title">' . get_lang('TaskList') . '</span><br />';
+			echo '<span class="blogpost_title">'.get_lang('TaskList').'</span><br />';
 			echo "<table class=\"data_table\">";
 			echo	"<tr bgcolor=\"$color2\" align=\"center\" valign=\"top\">",
-					 "<th width='240'><b>",get_lang('Title'),"</b></th>\n",
-					 "<th><b>",get_lang('Description'),"</b></th>\n",
-					 "<th><b>",get_lang('Color'),"</b></th>\n",
-					 "<th width='50'><b>",get_lang('Modify'),"</b></th>\n",
+					 "<th width='240'><b>", get_lang('Title'), "</b></th>\n",
+					 "<th><b>", get_lang('Description'), "</b></th>\n",
+					 "<th><b>", get_lang('Color'), "</b></th>\n",
+					 "<th width='50'><b>", get_lang('Modify'), "</b></th>\n",
 				"</tr>\n";
 
 
@@ -1388,31 +1388,31 @@ 
                         description,
                         color,
                         system_task
-                    FROM " . $tbl_blogs_tasks . "
-                    WHERE c_id = $course_id AND blog_id = " . (int)$blog_id . "
+                    FROM " . $tbl_blogs_tasks."
+                    WHERE c_id = $course_id AND blog_id = ".(int) $blog_id."
                     ORDER BY system_task, title";
 			$result = Database::query($sql);
 
 
-			while($task = Database::fetch_array($result)) {
+			while ($task = Database::fetch_array($result)) {
 				$counter++;
 				$css_class = (($counter % 2) == 0) ? "row_odd" : "row_even";
 				$delete_icon = ($task['system_task'] == '1') ? "delete_na.gif" : "delete.gif";
 				$delete_title = ($task['system_task'] == '1') ? get_lang('DeleteSystemTask') : get_lang('DeleteTask');
-				$delete_link = ($task['system_task'] == '1') ? '#' : api_get_self() . '?action=manage_tasks&blog_id=' . $task['blog_id'] . '&do=delete&task_id=' . $task['task_id'];
-				$delete_confirm = ($task['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"';
+				$delete_link = ($task['system_task'] == '1') ? '#' : api_get_self().'?action=manage_tasks&blog_id='.$task['blog_id'].'&do=delete&task_id='.$task['task_id'];
+				$delete_confirm = ($task['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)).'\')) return false;"';
 
-				echo	'<tr class="' . $css_class . '" valign="top">',
-							 '<td width="240">' . Security::remove_XSS($task['title']) . '</td>',
-							 '<td>' . Security::remove_XSS($task['description']) . '</td>',
-							 '<td><span style="background-color: #' . $task['color'] . '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></td>',
+				echo	'<tr class="'.$css_class.'" valign="top">',
+							 '<td width="240">'.Security::remove_XSS($task['title']).'</td>',
+							 '<td>'.Security::remove_XSS($task['description']).'</td>',
+							 '<td><span style="background-color: #'.$task['color'].'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></td>',
 							 '<td width="50">',
-							 	'<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $task['blog_id'] . '&do=edit&task_id=' . $task['task_id'] . '">',
-								'<img src="../img/edit.gif" border="0" title="' . get_lang('EditTask') . '" />',
+							 	'<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$task['blog_id'].'&do=edit&task_id='.$task['task_id'].'">',
+								'<img src="../img/edit.gif" border="0" title="'.get_lang('EditTask').'" />',
 								"</a>\n",
-								'<a href="' . $delete_link . '"',
+								'<a href="'.$delete_link.'"',
 								$delete_confirm,
-								'><img src="../img/' . $delete_icon . '" border="0" title="' . $delete_title . '" />',
+								'><img src="../img/'.$delete_icon.'" border="0" title="'.$delete_title.'" />',
 								"</a>\n",
 							 '</td>',
 						'</tr>';
@@ -1427,23 +1427,23 @@ 
 	 *
 	 * @param Integer $blog_id
 	 */
-	public static function display_assigned_task_list ($blog_id)
+	public static function display_assigned_task_list($blog_id)
     {
 		// Init
 		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
 		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
 		$tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
 		$counter = 0;
-		global $charset,$color2;
+		global $charset, $color2;
 
-		echo '<span class="blogpost_title">' . get_lang('AssignedTasks') . '</span><br />';
+		echo '<span class="blogpost_title">'.get_lang('AssignedTasks').'</span><br />';
 		echo "<table class=\"data_table\">";
 		echo	"<tr bgcolor=\"$color2\" align=\"center\" valign=\"top\">",
-				 "<th width='240'><b>",get_lang('Member'),"</b></th>\n",
-				 "<th><b>",get_lang('Task'),"</b></th>\n",
-				 "<th><b>",get_lang('Description'),"</b></th>\n",
-				 "<th><b>",get_lang('TargetDate'),"</b></th>\n",
-				 "<th width='50'><b>",get_lang('Modify'),"</b></th>\n",
+				 "<th width='240'><b>", get_lang('Member'), "</b></th>\n",
+				 "<th><b>", get_lang('Task'), "</b></th>\n",
+				 "<th><b>", get_lang('Description'), "</b></th>\n",
+				 "<th><b>", get_lang('TargetDate'), "</b></th>\n",
+				 "<th width='50'><b>", get_lang('Modify'), "</b></th>\n",
 			"</tr>";
 
 		$course_id = api_get_course_int_id();
@@ -1455,32 +1455,32 @@ 
 				WHERE
 				    task_rel_user.c_id = $course_id AND
 					task.c_id = $course_id AND
-					task_rel_user.blog_id = '".(int)$blog_id."'
+					task_rel_user.blog_id = '".(int) $blog_id."'
 				ORDER BY target_date ASC";
 		$result = Database::query($sql);
 
 		while ($assignment = Database::fetch_array($result)) {
 			$counter++;
-			$css_class = (($counter % 2)==0) ? "row_odd" : "row_even";
+			$css_class = (($counter % 2) == 0) ? "row_odd" : "row_even";
 			$delete_icon = ($assignment['system_task'] == '1') ? "delete_na.gif" : "delete.gif";
 			$delete_title = ($assignment['system_task'] == '1') ? get_lang('DeleteSystemTask') : get_lang('DeleteTask');
-			$delete_link = ($assignment['system_task'] == '1') ? '#' : api_get_self() . '?action=manage_tasks&blog_id=' . $assignment['blog_id'] . '&do=delete&task_id=' . $assignment['task_id'];
-			$delete_confirm = ($assignment['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"';
+			$delete_link = ($assignment['system_task'] == '1') ? '#' : api_get_self().'?action=manage_tasks&blog_id='.$assignment['blog_id'].'&do=delete&task_id='.$assignment['task_id'];
+			$delete_confirm = ($assignment['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)).'\')) return false;"';
 
             $username = api_htmlentities(sprintf(get_lang('LoginX'), $assignment['username']), ENT_QUOTES);
 
-			echo	'<tr class="' . $css_class . '" valign="top">',
-						 '<td width="240">' . Display::tag('span', api_get_person_name($assignment['firstname'], $assignment['lastname']), array('title'=>$username)) . '</td>',
-						 '<td>'.stripslashes($assignment['title']) . '</td>',
-						 '<td>'.stripslashes($assignment['description']) . '</td>',
-						 '<td>' . $assignment['target_date'] . '</td>',
+			echo	'<tr class="'.$css_class.'" valign="top">',
+						 '<td width="240">'.Display::tag('span', api_get_person_name($assignment['firstname'], $assignment['lastname']), array('title'=>$username)).'</td>',
+						 '<td>'.stripslashes($assignment['title']).'</td>',
+						 '<td>'.stripslashes($assignment['description']).'</td>',
+						 '<td>'.$assignment['target_date'].'</td>',
 						 '<td width="50">',
-						 	'<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $assignment['blog_id'] . '&do=edit_assignment&task_id=' . $assignment['task_id'] . '&user_id=' . $assignment['user_id'] . '">',
-							'<img src="../img/edit.gif" border="0" title="' . get_lang('EditTask') . '" />',
+						 	'<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$assignment['blog_id'].'&do=edit_assignment&task_id='.$assignment['task_id'].'&user_id='.$assignment['user_id'].'">',
+							'<img src="../img/edit.gif" border="0" title="'.get_lang('EditTask').'" />',
 							"</a>\n",
-							'<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $assignment['blog_id'] . '&do=delete_assignment&task_id=' . $assignment['task_id'] . '&user_id=' . $assignment['user_id'] . '" ',
-							'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"',
-							'<img src="../img/' . $delete_icon . '" border="0" title="' . $delete_title . '" />',
+							'<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$assignment['blog_id'].'&do=delete_assignment&task_id='.$assignment['task_id'].'&user_id='.$assignment['user_id'].'" ',
+							'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)).'\')) return false;"',
+							'<img src="../img/'.$delete_icon.'" border="0" title="'.$delete_title.'" />',
 							"</a>\n",
 						 '</td>',
 					'</tr>';
@@ -1493,7 +1493,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(
@@ -1515,7 +1515,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>';
@@ -1523,7 +1523,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" />
@@ -1533,7 +1533,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>
@@ -1543,18 +1543,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>';
@@ -1569,13 +1569,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>
@@ -1586,7 +1586,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>';
@@ -1600,34 +1600,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();
@@ -1636,22 +1636,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>';
@@ -1659,13 +1659,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>
@@ -1674,9 +1674,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>';
@@ -1698,7 +1698,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();
@@ -1717,7 +1717,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);
 
@@ -1765,7 +1765,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();
 
@@ -1774,9 +1774,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);
 
@@ -1811,11 +1811,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);
@@ -1823,18 +1823,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);
@@ -1864,12 +1864,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);
@@ -1877,17 +1877,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);
 		}
@@ -1908,7 +1908,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);
@@ -1916,19 +1916,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');
@@ -1952,12 +1952,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();
@@ -1967,7 +1967,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();
@@ -1993,12 +1993,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);
 	}
 
@@ -2019,7 +2019,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>';
@@ -2034,12 +2034,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, '');
@@ -2059,13 +2059,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"];
@@ -2077,8 +2077,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[] = '';
 				}
@@ -2089,20 +2089,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>';
 	}
 
@@ -2115,7 +2115,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();
@@ -2128,34 +2128,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"];
@@ -2167,19 +2167,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');
@@ -2187,7 +2187,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[] = '';
 			}
@@ -2197,20 +2197,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>';
 	}
 
@@ -2220,7 +2220,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 />';
@@ -2240,7 +2240,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')
 		);
@@ -2308,21 +2308,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
@@ -2331,15 +2331,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'];
@@ -2356,9 +2356,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);
 
@@ -2381,7 +2381,7 @@ 
 
 		echo "<tr>\n";
 
-		for($ii = 1; $ii < 8; $ii ++)
+		for ($ii = 1; $ii < 8; $ii++)
 			echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>";
 
 		echo "</tr>";
@@ -2391,24 +2391,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;
 
@@ -2416,14 +2416,14 @@ 
 						if (isset($tasks[$curday]) && is_array($tasks[$curday])) {
 							// Add tasks to calendar
 							foreach ($tasks[$curday] as $task) {
-								echo '<a href="blog.php?action=execute_task&blog_id=' . $task['blog_id'] . '&task_id='.stripslashes($task['task_id']) . '" title="' . $task['title'] . ' : ' . get_lang('InBlog') . ' : ' . $task['blog_name'] . ' - ' . get_lang('ExecuteThisTask') . '">
-								<img src="../img/blog_task.gif" alt="Task" title="' . get_lang('ExecuteThisTask') . '" /></a>';
+								echo '<a href="blog.php?action=execute_task&blog_id='.$task['blog_id'].'&task_id='.stripslashes($task['task_id']).'" title="'.$task['title'].' : '.get_lang('InBlog').' : '.$task['blog_name'].' - '.get_lang('ExecuteThisTask').'">
+								<img src="../img/blog_task.gif" alt="Task" title="' . get_lang('ExecuteThisTask').'" /></a>';
 							}
 						}
 					}
 
 					echo "</td>";
-					$curday ++;
+					$curday++;
 				} else
 					echo "<td>&nbsp;</td>";
 			}
@@ -2461,7 +2461,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
@@ -2476,7 +2476,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'));
@@ -2513,8 +2513,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;
 			}
 		}
 
@@ -2526,39 +2526,39 @@ 
 				// Validation when belongs to a session
 				$session_img = api_get_session_image($info_log[4], $_user['status']);
 
-				$url_start_blog = 'blog.php' ."?". "blog_id=".$info_log[3]. "&".api_get_cidreq();
+				$url_start_blog = 'blog.php'."?"."blog_id=".$info_log[3]."&".api_get_cidreq();
 				$title = $info_log[0];
                         $image = Display::return_icon('blog.png', $title);
-    			$list_name = '<div style="float: left; width: 35px; height: 22px;"><a href="'.$url_start_blog.'">' . $image . '</a></div><a href="'.$url_start_blog.'">' .$title. '</a>' . $session_img;
+    			$list_name = '<div style="float: left; width: 35px; height: 22px;"><a href="'.$url_start_blog.'">'.$image.'</a></div><a href="'.$url_start_blog.'">'.$title.'</a>'.$session_img;
 
 				$list_body_blog[] = $list_name;
 				$list_body_blog[] = $info_log[1];
 
-				$visibility_icon=($info_log[2]==0) ? 'invisible' : 'visible';
-				$visibility_info=($info_log[2]==0) ? 'Visible' : 'Invisible';
-			 	$my_image = '<a href="' .api_get_self(). '?action=edit&blog_id=' . $info_log[3] . '">';
-                                $my_image.= Display::return_icon('edit.png', get_lang('EditBlog'));
+				$visibility_icon = ($info_log[2] == 0) ? 'invisible' : 'visible';
+				$visibility_info = ($info_log[2] == 0) ? 'Visible' : 'Invisible';
+			 	$my_image = '<a href="'.api_get_self().'?action=edit&blog_id='.$info_log[3].'">';
+                                $my_image .= Display::return_icon('edit.png', get_lang('EditBlog'));
 
-				$my_image.= "</a>\n";
-				$my_image.= '<a href="' .api_get_self(). '?action=delete&blog_id=' . $info_log[3] . '" ';
-				$my_image.= 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;" >';
-                                $my_image.= Display::return_icon('delete.png', get_lang('DeleteBlog'));
+				$my_image .= "</a>\n";
+				$my_image .= '<a href="'.api_get_self().'?action=delete&blog_id='.$info_log[3].'" ';
+				$my_image .= 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)).'\')) return false;" >';
+                                $my_image .= Display::return_icon('delete.png', get_lang('DeleteBlog'));
 
-				$my_image.= "</a>\n";
-				$my_image.= '<a href="' .api_get_self(). '?action=visibility&blog_id=' . $info_log[3] . '">';
-                                $my_image.= Display::return_icon($visibility_icon . '.gif', get_lang($visibility_info));
+				$my_image .= "</a>\n";
+				$my_image .= '<a href="'.api_get_self().'?action=visibility&blog_id='.$info_log[3].'">';
+                                $my_image .= Display::return_icon($visibility_icon.'.gif', get_lang($visibility_info));
 
-				$my_image.= "</a>\n";
+				$my_image .= "</a>\n";
 
-				$list_body_blog[]=$my_image;
+				$list_body_blog[] = $my_image;
 
-				$list_content_blog[]=$list_body_blog;
+				$list_content_blog[] = $list_body_blog;
 				$list_body_blog = array();
 
 			}
-			$parameters='';
+			$parameters = '';
 			//$parameters=array('action'=>Security::remove_XSS($_GET['action']));
-			$table = new SortableTableFromArrayConfig($list_content_blog, 1,20,'project');
+			$table = new SortableTableFromArrayConfig($list_content_blog, 1, 20, 'project');
 			//$table->set_additional_parameters($parameters);
 			$table->set_header(0, get_lang('Title'));
 			$table->set_header(1, get_lang('SubTitle'));
@@ -2583,34 +2583,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;
 }
@@ -2624,7 +2624,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);
@@ -2648,22 +2648,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);
 }
@@ -2676,8 +2676,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
@@ -2692,13 +2692,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;
@@ -2728,14 +2728,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/inc/lib/plugin.class.php

Spacing +8 added lines, -8 removed lines

@@ -60,7 +60,7 @@ 
         $this->fields = $settings;
 
         global $language_files;
-        $language_files[] = 'plugin_' . $this->get_name();
+        $language_files[] = 'plugin_'.$this->get_name();
     }
 
     /**
@@ -266,7 +266,7 @@ 
     {
         $settings = $this->get_settings();
         foreach ($settings as $setting) {
-            if ($setting['variable'] == ($this->get_name() . '_' . $name)) {
+            if ($setting['variable'] == ($this->get_name().'_'.$name)) {
                 return $setting['selected_value'];
             }
         }
@@ -321,7 +321,7 @@ 
 
             $interfaceLanguageId = api_get_language_id($language_interface);
             $interfaceLanguageInfo = api_get_language_info($interfaceLanguageId);
-            $languageParentId = (!empty($interfaceLanguageInfo['parent_id'])?intval($interfaceLanguageInfo['parent_id']):0);
+            $languageParentId = (!empty($interfaceLanguageInfo['parent_id']) ? intval($interfaceLanguageInfo['parent_id']) : 0);
 
             //1. Loading english if exists
             $english_path = $root.$plugin_name."/lang/english.php";
@@ -399,7 +399,7 @@ 
         if (!empty($this->course_settings)) {
             foreach ($this->course_settings as $setting) {
                 $variable = $setting['name'];
-                $value ='';
+                $value = '';
                 if (isset($setting['init_value'])) {
                     $value = ($setting['init_value']);
                 }
@@ -611,7 +611,7 @@ 
 
         //Avoid Tab Name Spaces
         $tabNameNoSpaces = preg_replace('/\s+/', '', $tabName);
-        $subkeytext = "Tabs" . $tabNameNoSpaces;
+        $subkeytext = "Tabs".$tabNameNoSpaces;
 
         //Check if it is already added
         $checkCondition = array(
@@ -627,7 +627,7 @@ 
             return false;
         }
         //End Check
-        $subkey = 'custom_tab_' . $tabNum;
+        $subkey = 'custom_tab_'.$tabNum;
         $attributes = array(
             'variable' => 'show_tabs',
             'subkey' => $subkey,
@@ -645,7 +645,7 @@ 
 
         //Save the id
         $settings = $this->get_settings();
-        $setData = array (
+        $setData = array(
             'comment' => $subkey
         );
         $whereCondition = array(
@@ -686,7 +686,7 @@ 
                 $i = 1;
                 foreach ($tabs as $row) {
                     $attributes = array(
-                        'subkey' => 'custom_tab_' . $i
+                        'subkey' => 'custom_tab_'.$i
                     );
                     $this->updateTab($row['subkey'], $attributes);
                     $i++;

main/inc/lib/events.lib.php

Spacing +10 added lines, -12 removed lines

@@ -78,9 +78,7 @@ 
         Database::query($sql);
 
         // Auto subscribe
-        $user_status = $userInfo['status']  == SESSIONADMIN ? 'sessionadmin' :
-            $userInfo['status'] == COURSEMANAGER ? 'teacher' :
-                $userInfo['status'] == DRH ? 'DRH' : 'student';
+        $user_status = $userInfo['status'] == SESSIONADMIN ? 'sessionadmin' : $userInfo['status'] == COURSEMANAGER ? 'teacher' : $userInfo['status'] == DRH ? 'DRH' : 'student';
         $autoSubscribe = api_get_setting($user_status.'_autosubscribe');
         if ($autoSubscribe) {
             $autoSubscribe = explode('|', $autoSubscribe);
@@ -334,7 +332,7 @@ 
         global $debug;
 
         if ($debug) error_log('Called to update_event_exercice');
-        if ($debug) error_log('duration:' . $duration);
+        if ($debug) error_log('duration:'.$duration);
 
         if ($exeid != '') {
             /*
@@ -382,7 +380,7 @@ 
         		   status = '".$status."',
         		   questions_to_check = '".$remind_list."',
         		   data_tracking = '".implode(',', $question_list)."',
-                   user_ip = '" . Database::escape_string(api_get_real_ip()) . "'
+                   user_ip = '" . Database::escape_string(api_get_real_ip())."'
         		 WHERE exe_id = '".Database::escape_string($exeid)."'";
             $res = Database::query($sql);
 
@@ -1036,15 +1034,15 @@ 
 
         if (!empty($exe_list) && is_array($exe_list) && count($exe_list) > 0) {
             $sql = "DELETE FROM $track_e_exercises
-                WHERE exe_id IN (" . implode(',', $exe_list) . ")";
+                WHERE exe_id IN (".implode(',', $exe_list).")";
             Database::query($sql);
 
             $sql = "DELETE FROM $track_attempts
-                WHERE exe_id IN (" . implode(',', $exe_list) . ")";
+                WHERE exe_id IN (".implode(',', $exe_list).")";
             Database::query($sql);
 
             $sql = "DELETE FROM $recording_table
-                WHERE exe_id IN (" . implode(',', $exe_list) . ")";
+                WHERE exe_id IN (".implode(',', $exe_list).")";
             Database::query($sql);
         }
 
@@ -1086,7 +1084,7 @@ 
             Event::addEvent(
                 LOG_EXERCISE_RESULT_DELETE,
                 LOG_EXERCISE_AND_USER_ID,
-                $exercise_id . '-' . $user_id,
+                $exercise_id.'-'.$user_id,
                 null,
                 null,
                 $course_id,
@@ -1458,7 +1456,7 @@ 
         $res = Database::query($sql);
         $list = array();
         while ($row = Database::fetch_array($res, 'ASSOC')) {
-            $list[$row['exe_id']] = $row;  /*
+            $list[$row['exe_id']] = $row; /*
               $sql = "SELECT * FROM $table_track_attempt WHERE exe_id = {$row['exe_id']}";
               $res_question = Database::query($sql);
               while($row_q = Database::fetch_array($res_question,'ASSOC')) {
@@ -1684,7 +1682,7 @@ 
         Event::addEvent(
             LOG_QUESTION_RESULT_DELETE,
             LOG_EXERCISE_ATTEMPT_QUESTION_ID,
-            $exe_id . '-' . $question_id,
+            $exe_id.'-'.$question_id,
             null,
             null,
             $courseId,
@@ -1720,7 +1718,7 @@ 
         Event::addEvent(
             LOG_QUESTION_RESULT_DELETE,
             LOG_EXERCISE_ATTEMPT_QUESTION_ID,
-            $exe_id . '-' . $question_id,
+            $exe_id.'-'.$question_id,
             null,
             null,
             $courseId,

main/inc/lib/course.lib.php

Spacing +327 added lines, -328 removed lines

@@ -128,9 +128,9 @@ 
                     $template = api_get_setting('course_creation_use_template');
                     if (!empty($template)) {
                         // Include the necessary libraries to generate a course copy
-                        require_once api_get_path(SYS_CODE_PATH) . 'coursecopy/classes/CourseBuilder.class.php';
-                        require_once api_get_path(SYS_CODE_PATH) . 'coursecopy/classes/CourseRestorer.class.php';
-                        require_once api_get_path(SYS_CODE_PATH) . 'coursecopy/classes/CourseSelectForm.class.php';
+                        require_once api_get_path(SYS_CODE_PATH).'coursecopy/classes/CourseBuilder.class.php';
+                        require_once api_get_path(SYS_CODE_PATH).'coursecopy/classes/CourseRestorer.class.php';
+                        require_once api_get_path(SYS_CODE_PATH).'coursecopy/classes/CourseSelectForm.class.php';
                         // Call the course copy object
                         $originCourse = api_get_course_info_by_id($template);
                         $originCourse['official_code'] = $originCourse['code'];
@@ -166,8 +166,8 @@ 
     {
         return Database::fetch_array(
             Database::query(
-                "SELECT *, id as real_id FROM " . Database::get_main_table(TABLE_MAIN_COURSE) . "
-                WHERE code='" . Database::escape_string($course_code) . "'"), 'ASSOC'
+                "SELECT *, id as real_id FROM ".Database::get_main_table(TABLE_MAIN_COURSE)."
+                WHERE code='" . Database::escape_string($course_code)."'"), 'ASSOC'
         );
     }
 
@@ -195,7 +195,7 @@ 
         $alsoSearchCode = false,
         $conditionsLike = array()
     ) {
-        $sql = "SELECT course.* FROM " . Database::get_main_table(TABLE_MAIN_COURSE) . " course ";
+        $sql = "SELECT course.* FROM ".Database::get_main_table(TABLE_MAIN_COURSE)." course ";
 
         if (!empty($urlId)) {
             $table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
@@ -203,9 +203,9 @@ 
         }
 
         if (!empty($startwith)) {
-            $sql .= "WHERE (title LIKE '" . Database::escape_string($startwith) . "%' ";
+            $sql .= "WHERE (title LIKE '".Database::escape_string($startwith)."%' ";
             if ($alsoSearchCode) {
-                $sql .= "OR code LIKE '" . Database::escape_string($startwith) . "%' ";
+                $sql .= "OR code LIKE '".Database::escape_string($startwith)."%' ";
             }
             $sql .= ') ';
             if ($visibility !== -1 && $visibility == strval(intval($visibility))) {
@@ -239,19 +239,19 @@ 
                 $value = Database::escape_string($value);
                 $simple_like = false;
                 if ($simple_like) {
-                    $temp_conditions[] = $field . " LIKE '$value%'";
+                    $temp_conditions[] = $field." LIKE '$value%'";
                 } else {
-                    $temp_conditions[] = $field . ' LIKE \'%' . $value . '%\'';
+                    $temp_conditions[] = $field.' LIKE \'%'.$value.'%\'';
                 }
             }
             $condition = ' AND ';
             if (!empty($temp_conditions)) {
-                $sql .= implode(' ' . $condition . ' ', $temp_conditions);
+                $sql .= implode(' '.$condition.' ', $temp_conditions);
             }
         }
 
         if (!empty($orderby)) {
-            $sql .= " ORDER BY " . Database::escape_string($orderby) . " ";
+            $sql .= " ORDER BY ".Database::escape_string($orderby)." ";
         } else {
             $sql .= " ORDER BY 1 ";
         }
@@ -263,13 +263,13 @@ 
         }
 
         if (!empty($howmany) && is_int($howmany) and $howmany > 0) {
-            $sql .= ' LIMIT ' . Database::escape_string($howmany);
+            $sql .= ' LIMIT '.Database::escape_string($howmany);
         } else {
             $sql .= ' LIMIT 1000000'; //virtually no limit
         }
         if (!empty($from)) {
             $from = intval($from);
-            $sql .= ' OFFSET ' . intval($from);
+            $sql .= ' OFFSET '.intval($from);
         } else {
             $sql .= ' OFFSET 0';
         }
@@ -293,8 +293,8 @@ 
         return Database::fetch_array(
             Database::query(
                 "SELECT visibility, subscribe, unsubscribe
-                FROM " . Database::get_main_table(TABLE_MAIN_COURSE) . "
-                WHERE code = '" . Database::escape_string($course_code) . "'"
+                FROM " . Database::get_main_table(TABLE_MAIN_COURSE)."
+                WHERE code = '" . Database::escape_string($course_code)."'"
             )
         );
     }
@@ -312,10 +312,10 @@ 
         $courseId = $courseInfo['real_id'];
         $result = Database::fetch_array(
             Database::query(
-                "SELECT status FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . "
+                "SELECT status FROM ".Database::get_main_table(TABLE_MAIN_COURSE_USER)."
                 WHERE
                     c_id  = $courseId AND
-                    user_id = " . intval($user_id)
+                    user_id = ".intval($user_id)
             )
         );
 
@@ -333,9 +333,9 @@ 
 
         $result = Database::fetch_array(
             Database::query("
-                SELECT * FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . "
+                SELECT * FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER)."
                 WHERE
-                    c_id  = '" . intval($courseId). "' AND
+                    c_id  = '" . intval($courseId)."' AND
                     user_id = " . intval($userId)
             )
         );
@@ -382,9 +382,9 @@ 
         $result = Database::fetch_array(
             Database::query("
                 SELECT is_tutor
-                FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . "
+                FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER)."
                 WHERE
-                    course_code = '" . Database::escape_string($course_code) . "' AND
+                    course_code = '" . Database::escape_string($course_code)."' AND
                     user_id = " . intval($user_id)
             )
         );
@@ -437,17 +437,17 @@ 
         $course_id = $course_info['real_id'];
 
         // Unsubscribe user from all groups in the course.
-        $sql = "DELETE FROM " . Database::get_course_table(TABLE_GROUP_USER) . "
-                WHERE c_id = $course_id AND user_id IN (" . $user_ids . ")";
+        $sql = "DELETE FROM ".Database::get_course_table(TABLE_GROUP_USER)."
+                WHERE c_id = $course_id AND user_id IN (".$user_ids.")";
         Database::query($sql);
-        $sql = "DELETE FROM " . Database::get_course_table(TABLE_GROUP_TUTOR) . "
-                WHERE c_id = $course_id AND user_id IN (" . $user_ids . ")";
+        $sql = "DELETE FROM ".Database::get_course_table(TABLE_GROUP_TUTOR)."
+                WHERE c_id = $course_id AND user_id IN (".$user_ids.")";
         Database::query($sql);
 
         // Erase user student publications (works) in the course - by André Boivin
 
         if (!empty($user_list)) {
-            require_once api_get_path(SYS_CODE_PATH) . 'work/work.lib.php';
+            require_once api_get_path(SYS_CODE_PATH).'work/work.lib.php';
             foreach ($user_list as $userId) {
                 // Getting all work from user
                 $workList = getWorkPerUser($userId);
@@ -466,74 +466,74 @@ 
         }
 
         // Unsubscribe user from all blogs in the course.
-        Database::query("DELETE FROM " . Database::get_course_table(TABLE_BLOGS_REL_USER) . " WHERE c_id = $course_id AND  user_id IN (" . $user_ids . ")");
-        Database::query("DELETE FROM " . Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER) . " WHERE c_id = $course_id AND  user_id IN (" . $user_ids . ")");
+        Database::query("DELETE FROM ".Database::get_course_table(TABLE_BLOGS_REL_USER)." WHERE c_id = $course_id AND  user_id IN (".$user_ids.")");
+        Database::query("DELETE FROM ".Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER)." WHERE c_id = $course_id AND  user_id IN (".$user_ids.")");
 
         // Deleting users in forum_notification and mailqueue course tables
-        $sql = "DELETE FROM  " . Database::get_course_table(TABLE_FORUM_NOTIFICATION) . "
-                WHERE c_id = $course_id AND user_id IN (" . $user_ids . ")";
+        $sql = "DELETE FROM  ".Database::get_course_table(TABLE_FORUM_NOTIFICATION)."
+                WHERE c_id = $course_id AND user_id IN (".$user_ids.")";
         Database::query($sql);
 
-        $sql = "DELETE FROM " . Database::get_course_table(TABLE_FORUM_MAIL_QUEUE) . "
-                WHERE c_id = $course_id AND user_id IN (" . $user_ids . ")";
+        $sql = "DELETE FROM ".Database::get_course_table(TABLE_FORUM_MAIL_QUEUE)."
+                WHERE c_id = $course_id AND user_id IN (".$user_ids.")";
         Database::query($sql);
 
         // Unsubscribe user from the course.
         if (!empty($session_id)) {
 
             // Delete in table session_rel_course_rel_user
-            $sql = "DELETE FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . "
+            $sql = "DELETE FROM ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)."
                     WHERE
-                        session_id ='" . $session_id . "' AND
-                        c_id = '" . $course_id . "' AND
+                        session_id ='" . $session_id."' AND
+                        c_id = '" . $course_id."' AND
                         user_id IN ($user_ids)";
             Database::query($sql);
 
             foreach ($user_list as $uid) {
                 // check if a user is register in the session with other course
-                $sql = "SELECT user_id FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . "
+                $sql = "SELECT user_id FROM ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)."
                         WHERE session_id='$session_id' AND user_id='$uid'";
                 $rs = Database::query($sql);
 
                 if (Database::num_rows($rs) == 0) {
                     // Delete in table session_rel_user
-                    $sql = "DELETE FROM " . Database::get_main_table(TABLE_MAIN_SESSION_USER) . "
+                    $sql = "DELETE FROM ".Database::get_main_table(TABLE_MAIN_SESSION_USER)."
                             WHERE
-                                session_id ='" . $session_id . "' AND
+                                session_id ='" . $session_id."' AND
                                 user_id = '$uid' AND
-                                relation_type<>" . SESSION_RELATION_TYPE_RRHH . "";
+                                relation_type<>".SESSION_RELATION_TYPE_RRHH."";
                     Database::query($sql);
                 }
             }
 
             // Update the table session
-            $sql = "SELECT COUNT(*) FROM " . Database::get_main_table(TABLE_MAIN_SESSION_USER) . "
-                    WHERE session_id = '" . $session_id . "' AND relation_type <> " . SESSION_RELATION_TYPE_RRHH;
+            $sql = "SELECT COUNT(*) FROM ".Database::get_main_table(TABLE_MAIN_SESSION_USER)."
+                    WHERE session_id = '" . $session_id."' AND relation_type <> ".SESSION_RELATION_TYPE_RRHH;
             $row = Database::fetch_array(Database::query($sql));
             $count = $row[0];
             // number of users by session
-            $sql = "UPDATE " . Database::get_main_table(TABLE_MAIN_SESSION) . " SET nbr_users = '$count'
-                    WHERE id = '" . $session_id . "'";
+            $sql = "UPDATE ".Database::get_main_table(TABLE_MAIN_SESSION)." SET nbr_users = '$count'
+                    WHERE id = '".$session_id."'";
             Database::query($sql);
 
             // Update the table session_rel_course
-            $sql = "SELECT COUNT(*) FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . "
+            $sql = "SELECT COUNT(*) FROM ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)."
                     WHERE session_id = '$session_id' AND c_id = '$course_id' AND status<>2";
             $row = Database::fetch_array(@Database::query($sql));
             $count = $row[0];
 
             // number of users by session and course
-            $sql = "UPDATE " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE) . "
+            $sql = "UPDATE ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE)."
                     SET nbr_users = '$count'
                     WHERE session_id = '$session_id' AND c_id = '$course_id'";
             Database::query($sql);
 
         } else {
-            $sql = "DELETE FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . "
+            $sql = "DELETE FROM ".Database::get_main_table(TABLE_MAIN_COURSE_USER)."
                     WHERE
-                        user_id IN (" . $user_ids . ") AND
-                        relation_type<>" . COURSE_RELATION_TYPE_RRHH . " AND
-                        c_id = '" . $course_id . "'";
+                        user_id IN (" . $user_ids.") AND
+                        relation_type<>" . COURSE_RELATION_TYPE_RRHH." AND
+                        c_id = '" . $course_id."'";
             Database::query($sql);
 
             // add event to system log
@@ -603,7 +603,7 @@ 
 
         // A preliminary check whether the user has bben already registered on the platform.
         if (Database::num_rows(Database::query(
-                "SELECT status FROM " . Database::get_main_table(TABLE_MAIN_USER) . "
+                "SELECT status FROM ".Database::get_main_table(TABLE_MAIN_USER)."
                 WHERE user_id = '$user_id' ")) == 0
         ) {
             return false; // The user has not been registered to the platform.
@@ -613,8 +613,8 @@ 
 
         if (empty($session_id)) {
             if (Database::num_rows(Database::query("
-                    SELECT * FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . "
-                    WHERE user_id = '$user_id' AND relation_type<>" . COURSE_RELATION_TYPE_RRHH . " AND c_id = '$courseId'")) > 0
+                    SELECT * FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER)."
+                    WHERE user_id = '$user_id' AND relation_type<>".COURSE_RELATION_TYPE_RRHH." AND c_id = '$courseId'")) > 0
             ) {
                 // The user has been already subscribed to the course.
                 return false;
@@ -736,7 +736,7 @@ 
         $courseId = $courseInfo['real_id'];
 
         // Check in advance whether the user has already been registered on the platform.
-        $sql = "SELECT status FROM " . $user_table . " WHERE user_id = $user_id ";
+        $sql = "SELECT status FROM ".$user_table." WHERE user_id = $user_id ";
         if (Database::num_rows(Database::query($sql)) == 0) {
             if ($debug) {
                 error_log('The user has not been registered to the platform');
@@ -748,7 +748,7 @@ 
         $sql = "SELECT * FROM $course_user_table
                 WHERE
                     user_id = $user_id AND
-                    relation_type <> " . COURSE_RELATION_TYPE_RRHH . " AND
+                    relation_type <> ".COURSE_RELATION_TYPE_RRHH." AND
                     c_id = $courseId";
         if (Database::num_rows(Database::query($sql)) > 0) {
             if ($debug) {
@@ -760,7 +760,7 @@ 
         if (!api_is_course_admin()) {
             // Check in advance whether subscription is allowed or not for this course.
             $sql = "SELECT code, visibility FROM $course_table
-                    WHERE id = $courseId AND subscribe = '" . SUBSCRIBE_NOT_ALLOWED . "'";
+                    WHERE id = $courseId AND subscribe = '".SUBSCRIBE_NOT_ALLOWED."'";
             if (Database::num_rows(Database::query($sql)) > 0) {
                 if ($debug) {
                     error_log('Subscription is not allowed for this course');
@@ -819,7 +819,7 @@ 
     {
         $wanted_course_code = Database::escape_string($wanted_course_code);
         $sql = "SELECT COUNT(*) as number
-                FROM " . Database::get_main_table(TABLE_MAIN_COURSE) . "
+                FROM " . Database::get_main_table(TABLE_MAIN_COURSE)."
                 WHERE code = '$wanted_course_code' OR visual_code = '$wanted_course_code'";
         $result = Database::fetch_array(Database::query($sql));
 
@@ -1005,7 +1005,7 @@ 
         $sql = "SELECT * FROM $table
                 WHERE
                     user_id = $userId AND
-                    relation_type = " . COURSE_RELATION_TYPE_RRHH . " AND
+                    relation_type = ".COURSE_RELATION_TYPE_RRHH." AND
                     c_id = $courseId";
 
         $result = Database::fetch_array(Database::query($sql));
@@ -1044,13 +1044,13 @@ 
                 return false;
             }
             $courseId = $courseInfo['real_id'];
-            $condition_course = ' AND c_id = ' . $courseId;
+            $condition_course = ' AND c_id = '.$courseId;
         }
 
-        $sql = "SELECT * FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . "
+        $sql = "SELECT * FROM ".Database::get_main_table(TABLE_MAIN_COURSE_USER)."
                 WHERE
                     user_id = $user_id AND
-                    relation_type<>" . COURSE_RELATION_TYPE_RRHH . "
+                    relation_type<>".COURSE_RELATION_TYPE_RRHH."
                     $condition_course ";
 
         $result = Database::fetch_array(Database::query($sql));
@@ -1066,20 +1066,20 @@ 
         }
 
         $tableSessionCourseUser = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-        $sql = 'SELECT 1 FROM ' . $tableSessionCourseUser .
-            ' WHERE user_id = ' . $user_id . ' ' . $condition_course;
+        $sql = 'SELECT 1 FROM '.$tableSessionCourseUser.
+            ' WHERE user_id = '.$user_id.' '.$condition_course;
         if (Database::num_rows(Database::query($sql)) > 0) {
             return true;
         }
 
-        $sql = 'SELECT 1 FROM ' . $tableSessionCourseUser .
-            ' WHERE user_id = ' . $user_id . ' AND status=2 ' . $condition_course;
+        $sql = 'SELECT 1 FROM '.$tableSessionCourseUser.
+            ' WHERE user_id = '.$user_id.' AND status=2 '.$condition_course;
         if (Database::num_rows(Database::query($sql)) > 0) {
             return true;
         }
 
-        $sql = 'SELECT 1 FROM ' . Database::get_main_table(TABLE_MAIN_SESSION) .
-            ' WHERE id = ' . $session_id . ' AND id_coach=' . $user_id;
+        $sql = 'SELECT 1 FROM '.Database::get_main_table(TABLE_MAIN_SESSION).
+            ' WHERE id = '.$session_id.' AND id_coach='.$user_id;
 
         if (Database::num_rows(Database::query($sql)) > 0) {
             return true;
@@ -1106,8 +1106,8 @@ 
         $courseId = $courseInfo['real_id'];
 
         $result = Database::query(
-            'SELECT status FROM ' . Database::get_main_table(TABLE_MAIN_COURSE_USER) .
-            ' WHERE c_id = ' . $courseId . ' AND user_id = ' . $user_id . ''
+            'SELECT status FROM '.Database::get_main_table(TABLE_MAIN_COURSE_USER).
+            ' WHERE c_id = '.$courseId.' AND user_id = '.$user_id.''
         );
 
         if (Database::num_rows($result) > 0) {
@@ -1137,12 +1137,12 @@ 
             $result = Database::fetch_array(
                 Database::query(
                     "SELECT *
-                    FROM " . Database::get_main_table(TABLE_MAIN_COURSE) . " course
-                    LEFT JOIN " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . " course_user
+                    FROM " . Database::get_main_table(TABLE_MAIN_COURSE)." course
+                    LEFT JOIN " . Database::get_main_table(TABLE_MAIN_COURSE_USER)." course_user
                     ON course.id = course_user.c_id
                     WHERE
                         course_user.user_id = '$user_id' AND
-                        course_user.relation_type<>" . COURSE_RELATION_TYPE_RRHH . " AND
+                        course_user.relation_type<>".COURSE_RELATION_TYPE_RRHH." AND
                         ( course.id = '$courseId')"
                 )
             );
@@ -1156,8 +1156,8 @@ 
 
         // A user?
         if (Database::num_rows(Database::query("SELECT user_id
-                FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . "
-                WHERE session_id='" . $session_id . "'
+                FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)."
+                WHERE session_id='" . $session_id."'
                 AND user_id ='$user_id'"))
         ) {
             return true;
@@ -1165,8 +1165,8 @@ 
 
         // A course coach?
         if (Database::num_rows(Database::query("SELECT user_id
-                FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . "
-                WHERE session_id='" . $session_id . "'
+                FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)."
+                WHERE session_id='" . $session_id."'
                 AND user_id = '$user_id' AND status = 2
                 AND c_id ='$courseId'"))
         ) {
@@ -1175,8 +1175,8 @@ 
 
         // A session coach?
         if (Database::num_rows(Database::query("SELECT id_coach
-                FROM " . Database::get_main_table(TABLE_MAIN_SESSION) . " AS session
-                WHERE session.id='" . $session_id . "'
+                FROM " . Database::get_main_table(TABLE_MAIN_SESSION)." AS session
+                WHERE session.id='" . $session_id."'
                 AND id_coach='$user_id'"))
         ) {
             return true;
@@ -1244,7 +1244,7 @@ 
         // we have to check if it is a valid field that can be sorted on
         if (!strstr($order_by, 'ORDER BY')) {
             if (!empty($order_by)) {
-                $order_by = 'ORDER BY ' . $order_by;
+                $order_by = 'ORDER BY '.$order_by;
             } else {
                 $order_by = '';
             }
@@ -1276,11 +1276,11 @@ 
             if (!empty($courseCodeList)) {
                 $courseCodeListForSession = array_map(array('Database', 'escape_string'), $courseCodeList);
                 $courseCodeListForSession = implode('","', $courseCodeListForSession);
-                $courseCondition = ' course.code IN ("' . $courseCodeListForSession . '")  ';
+                $courseCondition = ' course.code IN ("'.$courseCodeListForSession.'")  ';
             }
 
-            $sql .= ' FROM ' . Database::get_main_table(TABLE_MAIN_USER) . ' as user ';
-            $sql .= " LEFT JOIN ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . " as session_course_user
+            $sql .= ' FROM '.Database::get_main_table(TABLE_MAIN_USER).' as user ';
+            $sql .= " LEFT JOIN ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)." as session_course_user
                       ON
                         user.user_id = session_course_user.user_id AND
                         $sessionCondition
@@ -1322,14 +1322,14 @@ 
                 }
             }
 
-            $sql .= ' FROM ' . Database::get_main_table(TABLE_MAIN_USER) . ' as user ';
-            $sql .= ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_COURSE_USER) . ' as course_rel_user
+            $sql .= ' FROM '.Database::get_main_table(TABLE_MAIN_USER).' as user ';
+            $sql .= ' LEFT JOIN '.Database::get_main_table(TABLE_MAIN_COURSE_USER).' as course_rel_user
                         ON user.user_id = course_rel_user.user_id AND
-                        course_rel_user.relation_type <> ' . COURSE_RELATION_TYPE_RRHH . '  ';
+                        course_rel_user.relation_type <> ' . COURSE_RELATION_TYPE_RRHH.'  ';
             $sql .= " INNER JOIN $course_table course ON course_rel_user.c_id = course.id ";
 
             if (!empty($course_code)) {
-                $sql .= ' AND course_rel_user.c_id="' . $courseId . '"';
+                $sql .= ' AND course_rel_user.c_id="'.$courseId.'"';
             }
             $where[] = ' course_rel_user.c_id IS NOT NULL ';
 
@@ -1341,7 +1341,7 @@ 
 
         $multiple_access_url = api_get_multiple_access_url();
         if ($multiple_access_url) {
-            $sql .= ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER) . ' au
+            $sql .= ' LEFT JOIN '.Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER).' au
                       ON (au.user_id = user.user_id) ';
         }
 
@@ -1361,7 +1361,7 @@ 
             }
         }
 
-        $sql .= ' WHERE ' . $filter_by_status_condition . ' ' . implode(' OR ', $where);
+        $sql .= ' WHERE '.$filter_by_status_condition.' '.implode(' OR ', $where);
 
         if ($multiple_access_url) {
             $current_access_url_id = api_get_current_access_url_id();
@@ -1383,15 +1383,15 @@ 
         if (!empty($userIdList)) {
             $userIdList = array_map('intval', $userIdList);
             $userIdList = implode('","', $userIdList);
-            $sql .= ' AND user.user_id IN ("' . $userIdList . '")';
+            $sql .= ' AND user.user_id IN ("'.$userIdList.'")';
         }
 
         if (isset($filterByActive)) {
             $filterByActive = intval($filterByActive);
-            $sql .= ' AND user.active = ' . $filterByActive;
+            $sql .= ' AND user.active = '.$filterByActive;
         }
 
-        $sql .= ' ' . $order_by . ' ' . $limit;
+        $sql .= ' '.$order_by.' '.$limit;
 
         $rs = Database::query($sql);
         $users = array();
@@ -1548,7 +1548,7 @@ 
                             )
                         );
                         $report_info['progress_100'] = $progress == 100 ? Display::label(get_lang('Yes'), 'success') : Display::label(get_lang('No'));
-                        $report_info['progress'] = $progress . "%";
+                        $report_info['progress'] = $progress."%";
 
                         foreach ($extra_fields as $extra) {
                             $user_data = UserManager::get_extra_user_data_by_field($user['user_id'], $extra['1']);
@@ -1617,32 +1617,32 @@ 
         $courseInfo = api_get_course_info($course_code);
         $courseId = $courseInfo['real_id'];
 
-        $sql = 'SELECT DISTINCT count(*) as count  FROM ' . Database::get_main_table(TABLE_MAIN_USER) . ' as user ';
+        $sql = 'SELECT DISTINCT count(*) as count  FROM '.Database::get_main_table(TABLE_MAIN_USER).' as user ';
         $where = array();
         if (!empty($session_id)) {
-            $sql .= ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . ' as session_course_user
+            $sql .= ' LEFT JOIN '.Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER).' as session_course_user
                       ON
                         user.user_id = session_course_user.user_id AND
-                        session_course_user.c_id = "' . $courseId . '" AND
+                        session_course_user.c_id = "' . $courseId.'" AND
                         session_course_user.session_id  = ' . $session_id;
 
             $where[] = ' session_course_user.c_id IS NOT NULL ';
         } else {
-            $sql .= ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_COURSE_USER) . ' as course_rel_user
+            $sql .= ' LEFT JOIN '.Database::get_main_table(TABLE_MAIN_COURSE_USER).' as course_rel_user
                         ON
                             user.user_id = course_rel_user.user_id AND
-                            course_rel_user.relation_type<>' . COURSE_RELATION_TYPE_RRHH . ' AND
-                            course_rel_user.c_id = ' . $courseId ;
+                            course_rel_user.relation_type<>' . COURSE_RELATION_TYPE_RRHH.' AND
+                            course_rel_user.c_id = ' . $courseId;
             $where[] = ' course_rel_user.c_id IS NOT NULL ';
         }
 
         $multiple_access_url = api_get_multiple_access_url();
         if ($multiple_access_url) {
-            $sql .= ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER) . '  au
+            $sql .= ' LEFT JOIN '.Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER).'  au
                       ON (au.user_id = user.user_id) ';
         }
 
-        $sql .= ' WHERE ' . implode(' OR ', $where);
+        $sql .= ' WHERE '.implode(' OR ', $where);
 
         if ($multiple_access_url) {
             $current_access_url_id = api_get_current_access_url_id();
@@ -1678,8 +1678,8 @@ 
         $users = array();
 
         // We get the coach for the given course in a given session.
-        $sql = 'SELECT user_id FROM ' . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) .
-               ' WHERE session_id ="' . $session_id . '" AND c_id="' . $courseId . '" AND status = 2';
+        $sql = 'SELECT user_id FROM '.Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER).
+               ' WHERE session_id ="'.$session_id.'" AND c_id="'.$courseId.'" AND status = 2';
         $rs = Database::query($sql);
         while ($user = Database::fetch_array($rs)) {
             $user_info = api_get_user_info($user['user_id']);
@@ -1691,7 +1691,7 @@ 
 
         $table = Database::get_main_table(TABLE_MAIN_SESSION);
         // We get the session coach.
-        $sql = 'SELECT id_coach FROM ' . $table . ' WHERE id=' . $session_id;
+        $sql = 'SELECT id_coach FROM '.$table.' WHERE id='.$session_id;
         $rs = Database::query($sql);
         $session_id_coach = Database::result($rs, 0, 'id_coach');
         $user_info = api_get_user_info($session_id_coach);
@@ -1767,11 +1767,11 @@ 
             $joinSession = "";
             //Session creation date
             if (!empty($date_from) && !empty($date_to)) {
-                $joinSession = "INNER JOIN " . Database::get_main_table(TABLE_MAIN_SESSION) . " s";
+                $joinSession = "INNER JOIN ".Database::get_main_table(TABLE_MAIN_SESSION)." s";
             }
 
             $sql_query = "SELECT *
-                          FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . " scu
+                          FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)." scu
                           $joinSession
                           INNER JOIN $userTable u ON scu.user_id = u.user_id
                           WHERE scu.c_id = '$courseId' AND scu.status <> 2";
@@ -1783,11 +1783,11 @@ 
             }
 
             if ($session_id != 0) {
-                $sql_query .= ' AND scu.session_id = ' . $session_id;
+                $sql_query .= ' AND scu.session_id = '.$session_id;
             }
 
             if (!$includeInvitedUsers) {
-                $sql_query .= " AND u.status != " . INVITEE;
+                $sql_query .= " AND u.status != ".INVITEE;
             }
 
             $rs = Database::query($sql_query);
@@ -1821,8 +1821,8 @@ 
                     u.email,
                     u.username,
                     u.status
-                FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . " cu
-                INNER JOIN " . Database::get_main_table(TABLE_MAIN_USER) . " u
+                FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER)." cu
+                INNER JOIN " . Database::get_main_table(TABLE_MAIN_USER)." u
                 ON (cu.user_id = u.id)
                 WHERE
                     cu.c_id = $courseId AND
@@ -1860,7 +1860,7 @@ 
                     $teacher['lastname']
                 );
                 if ($add_link_to_profile) {
-                    $url = api_get_path(WEB_AJAX_PATH) . 'user_manager.ajax.php?a=get_user_popup&user_id=' . $teacher['user_id'];
+                    $url = api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?a=get_user_popup&user_id='.$teacher['user_id'];
                     $teacher_name = Display::url(
                         $teacher_name,
                         $url,
@@ -1874,13 +1874,13 @@ 
             }
 
             if (!empty($list)) {
-                if ($orderList === true){
+                if ($orderList === true) {
                     $html .= '<ul class="user-teacher">';
-                    foreach ($list as $teacher){
-                        $html .= Display::tag('li', Display::return_icon('teacher.png', $teacher, null, ICON_SIZE_TINY) . ' ' . $teacher);
+                    foreach ($list as $teacher) {
+                        $html .= Display::tag('li', Display::return_icon('teacher.png', $teacher, null, ICON_SIZE_TINY).' '.$teacher);
                     }
                     $html .= '</ul>';
-                }else{
+                } else {
                     $html .= array_to_string($list, $separator);
                 }
             }
@@ -1959,7 +1959,7 @@ 
             foreach ($coachs_course as $coach_course) {
                 $coach_name = api_get_person_name($coach_course['firstname'], $coach_course['lastname']);
                 if ($add_link_to_profile) {
-                    $url = api_get_path(WEB_AJAX_PATH) . 'user_manager.ajax.php?a=get_user_popup&user_id=' . $coach_course['user_id'];
+                    $url = api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?a=get_user_popup&user_id='.$coach_course['user_id'];
                     $coach_name = Display::url(
                         $coach_name,
                         $url,
@@ -1975,10 +1975,10 @@ 
         $coaches_to_string = null;
 
         if (!empty($course_coachs)) {
-            if ($orderList === true){
+            if ($orderList === true) {
                 $html .= '<ul class="user-coachs">';
-                    foreach ($course_coachs as $coachs){
-                        $html .= Display::tag('li', Display::return_icon('teacher.png', $coachs, null, ICON_SIZE_TINY) . ' ' . $coachs);
+                    foreach ($course_coachs as $coachs) {
+                        $html .= Display::tag('li', Display::return_icon('teacher.png', $coachs, null, ICON_SIZE_TINY).' '.$coachs);
                     }
                 $html .= '</ul>';
             } else {
@@ -2033,20 +2033,20 @@ 
         }
 
         $group_list = array();
-        $session_id != 0 ? $session_condition = ' WHERE g.session_id IN(1,' . intval($session_id) . ')' : $session_condition = ' WHERE g.session_id = 0';
+        $session_id != 0 ? $session_condition = ' WHERE g.session_id IN(1,'.intval($session_id).')' : $session_condition = ' WHERE g.session_id = 0';
 
         if ($in_get_empty_group == 0) {
             // get only groups that are not empty
             $sql = "SELECT DISTINCT g.id, g.name
-                    FROM " . Database::get_course_table(TABLE_GROUP) . " AS g
-                    INNER JOIN " . Database::get_course_table(TABLE_GROUP_USER) . " gu
+                    FROM " . Database::get_course_table(TABLE_GROUP)." AS g
+                    INNER JOIN " . Database::get_course_table(TABLE_GROUP_USER)." gu
                     ON (g.id = gu.group_id AND g.c_id = $course_id AND gu.c_id = $course_id)
                     $session_condition
                     ORDER BY g.name";
         } else {
             // get all groups even if they are empty
             $sql = "SELECT g.id, g.name
-                    FROM " . Database::get_course_table(TABLE_GROUP) . " AS g
+                    FROM " . Database::get_course_table(TABLE_GROUP)." AS g
                     $session_condition
                     AND c_id = $course_id";
         }
@@ -2101,7 +2101,7 @@ 
         $table_stats_uploads = Database::get_main_table(TABLE_STATISTIC_TRACK_E_UPLOADS);
 
         $codeFiltered = Database::escape_string($code);
-        $sql = "SELECT * FROM $table_course WHERE code='" . $codeFiltered . "'";
+        $sql = "SELECT * FROM $table_course WHERE code='".$codeFiltered."'";
         $res = Database::query($sql);
 
         if (Database::num_rows($res) == 0) {
@@ -2109,7 +2109,7 @@ 
         }
 
         $sql = "SELECT * FROM $table_course
-                WHERE code = '" . $codeFiltered . "'";
+                WHERE code = '".$codeFiltered."'";
         $res = Database::query($sql);
         $course = Database::fetch_array($res);
         $courseId = $course['id'];
@@ -2154,34 +2154,34 @@ 
                 }
             }
 
-            $course_dir = api_get_path(SYS_COURSE_PATH) . $course['directory'];
-            $archive_dir = api_get_path(SYS_ARCHIVE_PATH) . $course['directory'] . '_' . time();
+            $course_dir = api_get_path(SYS_COURSE_PATH).$course['directory'];
+            $archive_dir = api_get_path(SYS_ARCHIVE_PATH).$course['directory'].'_'.time();
             if (is_dir($course_dir)) {
                 rename($course_dir, $archive_dir);
             }
 
             // Unsubscribe all users from the course
-            $sql = "DELETE FROM $table_course_user WHERE c_id='" . $courseId . "'";
+            $sql = "DELETE FROM $table_course_user WHERE c_id='".$courseId."'";
             Database::query($sql);
             // Delete the course from the sessions tables
-            $sql = "DELETE FROM $table_session_course WHERE c_id='" . $courseId . "'";
+            $sql = "DELETE FROM $table_session_course WHERE c_id='".$courseId."'";
             Database::query($sql);
-            $sql = "DELETE FROM $table_session_course_user WHERE c_id='" . $courseId . "'";
+            $sql = "DELETE FROM $table_session_course_user WHERE c_id='".$courseId."'";
             Database::query($sql);
 
             // Delete from Course - URL
-            $sql = "DELETE FROM $table_course_rel_url WHERE c_id = '" . $courseId. "'";
+            $sql = "DELETE FROM $table_course_rel_url WHERE c_id = '".$courseId."'";
             Database::query($sql);
 
-            $sql = 'SELECT survey_id FROM ' . $table_course_survey . ' WHERE course_code="' . $codeFiltered . '"';
+            $sql = 'SELECT survey_id FROM '.$table_course_survey.' WHERE course_code="'.$codeFiltered.'"';
             $result_surveys = Database::query($sql);
             while ($surveys = Database::fetch_array($result_surveys)) {
                 $survey_id = $surveys[0];
-                $sql = 'DELETE FROM ' . $table_course_survey_question . ' WHERE survey_id="' . $survey_id . '"';
+                $sql = 'DELETE FROM '.$table_course_survey_question.' WHERE survey_id="'.$survey_id.'"';
                 Database::query($sql);
-                $sql = 'DELETE FROM ' . $table_course_survey_question_option . ' WHERE survey_id="' . $survey_id . '"';
+                $sql = 'DELETE FROM '.$table_course_survey_question_option.' WHERE survey_id="'.$survey_id.'"';
                 Database::query($sql);
-                $sql = 'DELETE FROM ' . $table_course_survey . ' WHERE survey_id="' . $survey_id . '"';
+                $sql = 'DELETE FROM '.$table_course_survey.' WHERE survey_id="'.$survey_id.'"';
                 Database::query($sql);
             }
 
@@ -2214,7 +2214,7 @@ 
             Database::query($sql);
 
             // Delete the course from the database
-            $sql = "DELETE FROM $table_course WHERE code = '" . $codeFiltered . "'";
+            $sql = "DELETE FROM $table_course WHERE code = '".$codeFiltered."'";
             Database::query($sql);
 
             // delete extra course fields
@@ -2260,15 +2260,15 @@ 
                 while ($row = Database::fetch_array($res_table, 'ASSOC')) {
                     $row_to_save = array();
                     foreach ($row as $key => $value) {
-                        $row_to_save[$key] = $key . "='" . Database::escape_string($row[$key]) . "'";
+                        $row_to_save[$key] = $key."='".Database::escape_string($row[$key])."'";
                     }
-                    $sql_dump .= "\nINSERT INTO $table SET " . implode(', ', $row_to_save) . ';';
+                    $sql_dump .= "\nINSERT INTO $table SET ".implode(', ', $row_to_save).';';
                 }
             }
         }
 
-        if (is_dir(api_get_path(SYS_COURSE_PATH) . $course['directory'])) {
-            $file_name = api_get_path(SYS_COURSE_PATH) . $course['directory'] . '/mysql_dump.sql';
+        if (is_dir(api_get_path(SYS_COURSE_PATH).$course['directory'])) {
+            $file_name = api_get_path(SYS_COURSE_PATH).$course['directory'].'/mysql_dump.sql';
             $handle = fopen($file_name, 'a+');
             if ($handle !== false) {
                 fwrite($handle, $sql_dump);
@@ -2296,13 +2296,13 @@ 
         $TABLECOURSE = Database::get_main_table(TABLE_MAIN_COURSE);
         $TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER);
 
-        $course_title = Database::result(Database::query('SELECT title FROM ' . $TABLECOURSE . ' WHERE code="' . $course_code . '"'),
+        $course_title = Database::result(Database::query('SELECT title FROM '.$TABLECOURSE.' WHERE code="'.$course_code.'"'),
             0, 0);
 
         $sql = 'SELECT course.code as code, course.title as title, cu.sort as sort
-                FROM ' . $TABLECOURSUSER . ' as cu, ' . $TABLECOURSE . ' as course
-                WHERE   course.id = cu.c_id AND user_id = "' . $user_id . '" AND
-                        cu.relation_type<>' . COURSE_RELATION_TYPE_RRHH . ' AND
+                FROM ' . $TABLECOURSUSER.' as cu, '.$TABLECOURSE.' as course
+                WHERE   course.id = cu.c_id AND user_id = "' . $user_id.'" AND
+                        cu.relation_type<>' . COURSE_RELATION_TYPE_RRHH.' AND
                         user_course_cat = 0
                 ORDER BY cu.sort';
         $result = Database::query($sql);
@@ -2321,21 +2321,21 @@ 
                     $course_found = true;
                     $course_sort = $courses['sort'];
                     if ($counter == 0) {
-                        $sql = 'UPDATE ' . $TABLECOURSUSER . '
+                        $sql = 'UPDATE '.$TABLECOURSUSER.'
                                 SET sort = sort+1
                                 WHERE
-                                    user_id= "' . $user_id . '" AND
-                                    relation_type<>' . COURSE_RELATION_TYPE_RRHH . '
+                                    user_id= "' . $user_id.'" AND
+                                    relation_type<>' . COURSE_RELATION_TYPE_RRHH.'
                                     AND user_course_cat="0"
-                                    AND sort > "' . $course_sort . '"';
+                                    AND sort > "' . $course_sort.'"';
                         $course_sort++;
                     } else {
-                        $sql = 'UPDATE ' . $TABLECOURSUSER . ' SET sort = sort+1
+                        $sql = 'UPDATE '.$TABLECOURSUSER.' SET sort = sort+1
                                 WHERE
-                                    user_id= "' . $user_id . '" AND
-                                    relation_type<>' . COURSE_RELATION_TYPE_RRHH . ' AND
+                                    user_id= "' . $user_id.'" AND
+                                    relation_type<>' . COURSE_RELATION_TYPE_RRHH.' AND
                                     user_course_cat="0" AND
-                                    sort >= "' . $course_sort . '"';
+                                    sort >= "' . $course_sort.'"';
                     }
                     Database::query($sql);
                     break;
@@ -2348,9 +2348,9 @@ 
 
             // We must register the course in the beginning of the list
             if (!$course_found) {
-                $course_sort = Database::result(Database::query('SELECT min(sort) as min_sort FROM ' . $TABLECOURSUSER . ' WHERE user_id="' . $user_id . '" AND user_course_cat="0"'),
+                $course_sort = Database::result(Database::query('SELECT min(sort) as min_sort FROM '.$TABLECOURSUSER.' WHERE user_id="'.$user_id.'" AND user_course_cat="0"'),
                     0, 0);
-                Database::query('UPDATE ' . $TABLECOURSUSER . ' SET sort = sort+1 WHERE user_id= "' . $user_id . '" AND user_course_cat="0"');
+                Database::query('UPDATE '.$TABLECOURSUSER.' SET sort = sort+1 WHERE user_id= "'.$user_id.'" AND user_course_cat="0"');
             }
         }
         return $course_sort;
@@ -2365,11 +2365,11 @@ 
     public static function course_exists($course_code, $accept_virtual = false)
     {
         if ($accept_virtual === true) {
-            $sql = 'SELECT 1 FROM ' . Database::get_main_table(TABLE_MAIN_COURSE) . '
-                    WHERE code="' . Database::escape_string($course_code) . '" OR visual_code="' . Database::escape_string($course_code) . '"';
+            $sql = 'SELECT 1 FROM '.Database::get_main_table(TABLE_MAIN_COURSE).'
+                    WHERE code="' . Database::escape_string($course_code).'" OR visual_code="'.Database::escape_string($course_code).'"';
         } else {
-            $sql = 'SELECT 1 FROM ' . Database::get_main_table(TABLE_MAIN_COURSE) . '
-                    WHERE code="' . Database::escape_string($course_code) . '"';
+            $sql = 'SELECT 1 FROM '.Database::get_main_table(TABLE_MAIN_COURSE).'
+                    WHERE code="' . Database::escape_string($course_code).'"';
         }
 
         return Database::num_rows(Database::query($sql));
@@ -2395,7 +2395,7 @@ 
         $student = api_get_user_info($user_id);
 
         $name_course = $information['title'];
-        $sql = "SELECT * FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . " WHERE c_id ='" . $courseId . "'";
+        $sql = "SELECT * FROM ".Database::get_main_table(TABLE_MAIN_COURSE_USER)." WHERE c_id ='".$courseId."'";
 
         // TODO: Ivan: This is a mistake, please, have a look at it. Intention here is diffcult to be guessed.
         //if ($send_to_tutor_also = true)
@@ -2410,18 +2410,18 @@ 
         while ($row = Database::fetch_array($result)) {
             $tutor = api_get_user_info($row['user_id']);
             $emailto = $tutor['email'];
-            $emailsubject = get_lang('NewUserInTheCourse') . ': ' . $name_course;
-            $emailbody = get_lang('Dear') . ': ' . api_get_person_name($tutor['firstname'], $tutor['lastname']) . "\n";
-            $emailbody .= get_lang('MessageNewUserInTheCourse') . ': ' . $name_course . "\n";
-            $emailbody .= get_lang('UserName') . ': ' . $student['username'] . "\n";
+            $emailsubject = get_lang('NewUserInTheCourse').': '.$name_course;
+            $emailbody = get_lang('Dear').': '.api_get_person_name($tutor['firstname'], $tutor['lastname'])."\n";
+            $emailbody .= get_lang('MessageNewUserInTheCourse').': '.$name_course."\n";
+            $emailbody .= get_lang('UserName').': '.$student['username']."\n";
             if (api_is_western_name_order()) {
-                $emailbody .= get_lang('FirstName') . ': ' . $student['firstname'] . "\n";
-                $emailbody .= get_lang('LastName') . ': ' . $student['lastname'] . "\n";
+                $emailbody .= get_lang('FirstName').': '.$student['firstname']."\n";
+                $emailbody .= get_lang('LastName').': '.$student['lastname']."\n";
             } else {
-                $emailbody .= get_lang('LastName') . ': ' . $student['lastname'] . "\n";
-                $emailbody .= get_lang('FirstName') . ': ' . $student['firstname'] . "\n";
+                $emailbody .= get_lang('LastName').': '.$student['lastname']."\n";
+                $emailbody .= get_lang('FirstName').': '.$student['firstname']."\n";
             }
-            $emailbody .= get_lang('Email') . ': <a href="mailto:' . $student['email'] . '">' . $student['email'] ."</a>\n\n";
+            $emailbody .= get_lang('Email').': <a href="mailto:'.$student['email'].'">'.$student['email']."</a>\n\n";
             $recipient_name = api_get_person_name($tutor['firstname'], $tutor['lastname'], null,
                 PERSON_NAME_EMAIL_ADDRESS);
             $sender_name = api_get_person_name(api_get_setting('administratorName'),
@@ -2523,9 +2523,9 @@ 
 
             $with_special_courses = $without_special_courses = '';
             if (!empty($special_course_list)) {
-                $sc_string = '"' . implode('","', $special_course_list) . '"';
-                $with_special_courses = ' course.code IN (' . $sc_string . ')';
-                $without_special_courses = ' AND course.code NOT IN (' . $sc_string . ')';
+                $sc_string = '"'.implode('","', $special_course_list).'"';
+                $with_special_courses = ' course.code IN ('.$sc_string.')';
+                $without_special_courses = ' AND course.code NOT IN ('.$sc_string.')';
             }
 
             if (!empty($with_special_courses)) {
@@ -2569,8 +2569,8 @@ 
 
         if ($include_sessions === true) {
             $sql = "SELECT DISTINCT(c.code), c.id as real_id
-                    FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . " s,
-                    " . Database::get_main_table(TABLE_MAIN_COURSE) . " c
+                    FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)." s,
+                    " . Database::get_main_table(TABLE_MAIN_COURSE)." c
                     WHERE user_id = $user_id AND s.c_id = c.id";
             $r = Database::query($sql);
             while ($row = Database::fetch_array($r, 'ASSOC')) {
@@ -2591,7 +2591,7 @@ 
     public static function get_course_id_from_path($path)
     {
         $path = Database::escape_string(str_replace('.', '', str_replace('/', '', $path)));
-        $res = Database::query("SELECT code FROM " . Database::get_main_table(TABLE_MAIN_COURSE) . "
+        $res = Database::query("SELECT code FROM ".Database::get_main_table(TABLE_MAIN_COURSE)."
                 WHERE directory LIKE BINARY '$path'");
         if ($res === false) {
             return false;
@@ -2613,8 +2613,8 @@ 
     public static function get_courses_info_from_visual_code($code)
     {
         $result = array();
-        $sql_result = Database::query("SELECT * FROM " . Database::get_main_table(TABLE_MAIN_COURSE) . "
-                WHERE visual_code = '" . Database::escape_string($code) . "'");
+        $sql_result = Database::query("SELECT * FROM ".Database::get_main_table(TABLE_MAIN_COURSE)."
+                WHERE visual_code = '" . Database::escape_string($code)."'");
         while ($virtual_course = Database::fetch_array($sql_result)) {
             $result[] = $virtual_course;
         }
@@ -2630,10 +2630,10 @@ 
     public static function get_emails_of_tutors_to_course($courseId)
     {
         $list = array();
-        $res = Database::query("SELECT user_id FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . "
-                WHERE c_id ='" . intval($courseId) . "' AND status=1");
+        $res = Database::query("SELECT user_id FROM ".Database::get_main_table(TABLE_MAIN_COURSE_USER)."
+                WHERE c_id ='" . intval($courseId)."' AND status=1");
         while ($list_users = Database::fetch_array($res)) {
-            $result = Database::query("SELECT * FROM " . Database::get_main_table(TABLE_MAIN_USER) . "
+            $result = Database::query("SELECT * FROM ".Database::get_main_table(TABLE_MAIN_USER)."
                     WHERE user_id=" . $list_users['user_id']);
             while ($row_user = Database::fetch_array($result)) {
                 $name_teacher = api_get_person_name($row_user['firstname'], $row_user['lastname']);
@@ -2676,7 +2676,7 @@ 
             }
 
             $sql = "SELECT firstname, lastname, email FROM $tbl_user
-                    WHERE user_id IN (" . implode(",", $user_ids) . ")";
+                    WHERE user_id IN (".implode(",", $user_ids).")";
             $rs_user = Database::query($sql);
 
             while ($row_emails = Database::fetch_array($rs_user)) {
@@ -2722,9 +2722,9 @@ 
      */
     public static function update_attribute($id, $name, $value)
     {
-        $id = (int)$id;
+        $id = (int) $id;
         $table = Database::get_main_table(TABLE_MAIN_COURSE);
-        $sql = "UPDATE $table SET $name = '" . Database::escape_string($value) . "'
+        $sql = "UPDATE $table SET $name = '".Database::escape_string($value)."'
                 WHERE id = '$id';";
         return Database::query($sql);
     }
@@ -2739,7 +2739,7 @@ 
      */
     public static function update_attributes($id, $attributes)
     {
-        $id = (int)$id;
+        $id = (int) $id;
         $table = Database::get_main_table(TABLE_MAIN_COURSE);
         $sql = "UPDATE $table SET ";
         $i = 0;
@@ -2748,7 +2748,7 @@ 
                 if ($i > 0) {
                     $sql .= ", ";
                 }
-                $sql .= " $name = '" . Database::escape_string($value) . "'";
+                $sql .= " $name = '".Database::escape_string($value)."'";
                 $i++;
             }
         }
@@ -2785,9 +2785,9 @@ 
     {
         return Database::result(
             Database::query('SELECT  sc.id session_category
-                FROM ' . Database::get_main_table(TABLE_MAIN_SESSION_CATEGORY) . ' sc
-                INNER JOIN ' . Database::get_main_table(TABLE_MAIN_SESSION) . ' s
-                ON sc.id=s.session_category_id WHERE s.id="' . Database::escape_string($session_id) . '"'),
+                FROM ' . Database::get_main_table(TABLE_MAIN_SESSION_CATEGORY).' sc
+                INNER JOIN ' . Database::get_main_table(TABLE_MAIN_SESSION).' s
+                ON sc.id=s.session_category_id WHERE s.id="' . Database::escape_string($session_id).'"'),
             0,
             'session_category'
         );
@@ -2830,13 +2830,13 @@ 
                 $data .= '<div class="sectiontitle">';
                 if (api_is_allowed_to_edit() && $action_show) {
                     //delete
-                    $data .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&action=delete&description_id=' . $description->id . '" onclick="javascript:if(!confirm(\'' . addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),
-                                ENT_QUOTES, $charset)) . '\')) return false;">';
+                    $data .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete&description_id='.$description->id.'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),
+                                ENT_QUOTES, $charset)).'\')) return false;">';
                     $data .= Display::return_icon('delete.gif', get_lang('Delete'),
                         array('style' => 'vertical-align:middle;float:right;'));
                     $data .= '</a> ';
                     //edit
-                    $data .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&description_id=' . $description->id . '">';
+                    $data .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&description_id='.$description->id.'">';
                     $data .= Display::return_icon('edit.png', get_lang('Edit'),
                         array('style' => 'vertical-align:middle;float:right; padding-right:4px;'), ICON_SIZE_SMALL);
                     $data .= '</a> ';
@@ -2848,7 +2848,7 @@ 
                 $data .= '</div>';
             }
         } else {
-            $data .= '<em>' . get_lang('ThisCourseDescriptionIsEmpty') . '</em>';
+            $data .= '<em>'.get_lang('ThisCourseDescriptionIsEmpty').'</em>';
         }
 
         return $data;
@@ -2915,11 +2915,11 @@ 
                     ON (a.c_id = s.c_id)
                     WHERE
                         user_id = $hr_manager_id AND
-                        relation_type=" . COURSE_RELATION_TYPE_RRHH . " AND
-                        access_url_id = " . api_get_current_access_url_id() . "";
+                        relation_type=".COURSE_RELATION_TYPE_RRHH." AND
+                        access_url_id = " . api_get_current_access_url_id()."";
         } else {
             $sql = "SELECT c_id FROM $tbl_course_rel_user
-                    WHERE user_id = $hr_manager_id AND relation_type=" . COURSE_RELATION_TYPE_RRHH . " ";
+                    WHERE user_id = $hr_manager_id AND relation_type=".COURSE_RELATION_TYPE_RRHH." ";
         }
         $result = Database::query($sql);
         if (Database::num_rows($result) > 0) {
@@ -2928,7 +2928,7 @@ 
                         WHERE
                             c_id = '{$row['c_id']}' AND
                             user_id = $hr_manager_id AND
-                            relation_type=" . COURSE_RELATION_TYPE_RRHH . " ";
+                            relation_type=".COURSE_RELATION_TYPE_RRHH." ";
                 Database::query($sql);
             }
         }
@@ -2939,7 +2939,7 @@ 
                 $courseInfo = api_get_course_info($course_code);
                 $courseId = $courseInfo['real_id'];
                 $sql = "INSERT IGNORE INTO $tbl_course_rel_user(c_id, user_id, status, relation_type)
-                        VALUES($courseId, $hr_manager_id, '" . DRH . "', '" . COURSE_RELATION_TYPE_RRHH . "')";
+                        VALUES($courseId, $hr_manager_id, '".DRH."', '".COURSE_RELATION_TYPE_RRHH."')";
                 $result = Database::query($sql);
                 if (Database::affected_rows($result)) {
                     $affected_rows++;
@@ -3022,16 +3022,16 @@ 
             case COURSEMANAGER:
                 $whereConditions .= " AND cru.user_id = '$user_id'";
                 if (!$showAllAssignedCourses) {
-                    $whereConditions .= " AND status = " . COURSEMANAGER;
+                    $whereConditions .= " AND status = ".COURSEMANAGER;
                 } else {
-                    $whereConditions .= " AND relation_type = " . COURSE_RELATION_TYPE_COURSE_MANAGER;
+                    $whereConditions .= " AND relation_type = ".COURSE_RELATION_TYPE_COURSE_MANAGER;
                 }
                 break;
             case DRH:
                 $whereConditions .= " AND
                     cru.user_id = '$user_id' AND
-                    status = " . DRH . " AND
-                    relation_type = '" . COURSE_RELATION_TYPE_RRHH . "'
+                    status = ".DRH." AND
+                    relation_type = '" . COURSE_RELATION_TYPE_RRHH."'
                 ";
                 break;
         }
@@ -3052,7 +3052,7 @@ 
                 );
                 if (!empty($courseList)) {
                     $courseListToString = implode("','", array_keys($courseList));
-                    $whereConditions .= " AND c.id IN ('" . $courseListToString . "')";
+                    $whereConditions .= " AND c.id IN ('".$courseListToString."')";
                 }
                 $tableSessionRelCourse = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
                 $orderBy = ' ORDER BY position';
@@ -3068,7 +3068,7 @@ 
                     INNER JOIN $tbl_course_rel_access_url a ON (a.c_id = c.id)
                     $extraInnerJoin
                 WHERE
-                    access_url_id = " . api_get_current_access_url_id() . "
+                    access_url_id = ".api_get_current_access_url_id()."
                     $whereConditions
                 $orderBy
                 ";
@@ -3128,10 +3128,10 @@ 
     {
         $course_info = api_get_course_info($course_code);
         // course path
-        $store_path = api_get_path(SYS_COURSE_PATH) . $course_info['path'];
+        $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path'];
         // image name for courses
-        $course_image = $store_path . '/course-pic.png';
-        $course_medium_image = $store_path . '/course-pic85x85.png';
+        $course_image = $store_path.'/course-pic.png';
+        $course_medium_image = $store_path.'/course-pic85x85.png';
 
         if (file_exists($course_image)) {
             unlink($course_image);
@@ -3165,11 +3165,11 @@ 
     {
         $course_info = api_get_course_info($courseCode);
         // course path
-        $storePath = api_get_path(SYS_COURSE_PATH) . $course_info['path'];
+        $storePath = api_get_path(SYS_COURSE_PATH).$course_info['path'];
         // image name for courses
-        $courseImage = $storePath . '/course-pic.png';
-        $courseMediumImage = $storePath . '/course-pic85x85.png';
-        $courseSmallImage = $storePath . '/course-pic32.png';
+        $courseImage = $storePath.'/course-pic.png';
+        $courseMediumImage = $storePath.'/course-pic85x85.png';
+        $courseSmallImage = $storePath.'/course-pic32.png';
 
         if (file_exists($courseImage)) {
             unlink($courseImage);
@@ -3197,26 +3197,26 @@ 
 
         $notifications = isset($params['notifications']) ? $params['notifications'] : null;
 
-        $html .= '<h3>' . $params['title'] . $notifications . '</h3> ';
+        $html .= '<h3>'.$params['title'].$notifications.'</h3> ';
 
         if (isset($params['description'])) {
-            $html .= '<p>' . $params['description'] . '</p>';
+            $html .= '<p>'.$params['description'].'</p>';
         }
         if (!empty($params['subtitle'])) {
-            $html .= '<small>' . $params['subtitle'] . '</small>';
+            $html .= '<small>'.$params['subtitle'].'</small>';
         }
         if (!empty($params['teachers'])) {
-            $html .= '<h5 class="teacher">' . Display::return_icon('teacher.png', get_lang('Teacher'), array(),
-                    ICON_SIZE_TINY) . $params['teachers'] . '</h5>';
+            $html .= '<h5 class="teacher">'.Display::return_icon('teacher.png', get_lang('Teacher'), array(),
+                    ICON_SIZE_TINY).$params['teachers'].'</h5>';
         }
         if (!empty($params['coaches'])) {
-            $html .= '<h5 class="teacher">' . Display::return_icon('teacher.png', get_lang('Coach'), array(),
-                    ICON_SIZE_TINY) . $params['coaches'] . '</h5>';
+            $html .= '<h5 class="teacher">'.Display::return_icon('teacher.png', get_lang('Coach'), array(),
+                    ICON_SIZE_TINY).$params['coaches'].'</h5>';
         }
 
         $html .= '</div>';
         $params['right_actions'] = isset($params['right_actions']) ? $params['right_actions'] : null;
-        $html .= '<div class="pull-right course-box-actions">' . $params['right_actions'] . '</div>';
+        $html .= '<div class="pull-right course-box-actions">'.$params['right_actions'].'</div>';
         $html .= '</div>';
         $html .= '</div>';
         return $html;
@@ -3232,11 +3232,11 @@ 
         $html = '';
         $html .= '<div class="row">';
         $html .= '<div class="col-md-2">';
-        if (!empty($params['link'])){
+        if (!empty($params['link'])) {
             $html .= '<a class="thumbnail" href="'.$params['link'].'">';
             $html .= $params['icon'];
             $html .= '</a>';
-        }else{
+        } else {
             $html .= $params['icon'];
         }
         $html .= '</div>';
@@ -3263,13 +3263,13 @@ 
         if ($is_sub_content) {
             $class = "course_item";
         }
-        $html .= '<div class="' . $class . '">';
+        $html .= '<div class="'.$class.'">';
         $html .= '<div class="panel-body">';
         $html .= '<div class="course-items">';
         $html .= ' <div class="row">';
         $html .= '<div class="col-md-2">';
         if (!empty($params['link'])) {
-            $html .= '<a class="thumbnail" href="' . $params['link'] . '">';
+            $html .= '<a class="thumbnail" href="'.$params['link'].'">';
             $html .= $params['icon'];
             $html .= '</a>';
         } else {
@@ -3282,25 +3282,25 @@ 
         $param_class = isset($params['class']) ? $params['class'] : '';
         $params['right_actions'] = isset($params['right_actions']) ? $params['right_actions'] : '';
 
-        $html .= '<div class="col-md-10 ' . $param_class . '">';
-        $html .= '<div class="pull-right">' . $params['right_actions'] . '</div>';
-        $html .= '<h4 class="course-items-title">' . $params['title'] . $notifications . '</h4> ';
+        $html .= '<div class="col-md-10 '.$param_class.'">';
+        $html .= '<div class="pull-right">'.$params['right_actions'].'</div>';
+        $html .= '<h4 class="course-items-title">'.$params['title'].$notifications.'</h4> ';
 
         if (isset($params['show_description'], $params['description']) && $params['show_description'] == 1) {
-            $html .= '<p class="description-session">' . $params['description'] . '</p>';
+            $html .= '<p class="description-session">'.$params['description'].'</p>';
         }
         if (!empty($params['subtitle'])) {
-            $html .= '<div class="subtitle-session">' . $params['subtitle'] . '</div>';
+            $html .= '<div class="subtitle-session">'.$params['subtitle'].'</div>';
         }
         if (!empty($params['teachers'])) {
-            $html .= '<h5 class="course-items-session">' .
-                    Display::return_icon('teacher.png', get_lang('Teacher'), array(), ICON_SIZE_TINY) .
-                $params['teachers'] . '</h5>';
+            $html .= '<h5 class="course-items-session">'.
+                    Display::return_icon('teacher.png', get_lang('Teacher'), array(), ICON_SIZE_TINY).
+                $params['teachers'].'</h5>';
         }
         if (!empty($params['coaches'])) {
-            $html .= '<h5 class="course-items-session">' .
-                Display::return_icon('teacher.png', get_lang('Coach'), array(), ICON_SIZE_TINY) .
-                $params['coaches'] . '</h5>';
+            $html .= '<h5 class="course-items-session">'.
+                Display::return_icon('teacher.png', get_lang('Coach'), array(), ICON_SIZE_TINY).
+                $params['coaches'].'</h5>';
         }
 
         $html .= '</div>';
@@ -3321,7 +3321,7 @@ 
      */
     public static function course_item_parent($main_content, $sub_content, $sub_sub_content = null)
     {
-        return '<div class="panel panel-default">' . $main_content . $sub_content . $sub_sub_content . '</div>';
+        return '<div class="panel panel-default">'.$main_content.$sub_content.$sub_sub_content.'</div>';
     }
 
     /**
@@ -3343,7 +3343,7 @@ 
 
         $with_special_courses = $without_special_courses = '';
         if (!empty($special_course_list)) {
-            $with_special_courses = ' course.code IN ("' . implode('","', $special_course_list) . '")';
+            $with_special_courses = ' course.code IN ("'.implode('","', $special_course_list).'")';
         }
         $html = null;
         $courseCount = 0;
@@ -3394,14 +3394,14 @@ 
                     $params['right_actions'] = '';
                     if (api_is_platform_admin()) {
                         if ($load_dirs) {
-                            $params['right_actions'] .= '<a id="document_preview_' . $course['id'] . '_0" class="document_preview" href="javascript:void(0);">' .
+                            $params['right_actions'] .= '<a id="document_preview_'.$course['id'].'_0" class="document_preview" href="javascript:void(0);">'.
                                 Display::return_icon(
                                     'folder.png',
                                     get_lang('Documents'),
                                     array('align' => 'absmiddle'),
                                     ICON_SIZE_SMALL
                                 ).'</a>';
-                            $params['right_actions'] .= '<a href="' . api_get_path(WEB_CODE_PATH) . 'course_info/infocours.php?cidReq=' . $course['code'] . '">' .
+                            $params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.
                                 Display::return_icon(
                                     'edit.png',
                                     get_lang('Edit'),
@@ -3409,13 +3409,13 @@ 
                                     ICON_SIZE_SMALL
                                 ).'</a>';
                             $params['right_actions'] .= Display::div('', array(
-                                    'id' => 'document_result_' . $course['id'] . '_0',
+                                    'id' => 'document_result_'.$course['id'].'_0',
                                     'class' => 'document_preview_container'
                                 ));
                         } else {
-                            $params['right_actions'] .= '<a href="' . api_get_path(WEB_CODE_PATH) . 'course_info/infocours.php?cidReq=' . $course['code'] . '">' .
+                            $params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.
                                 Display::return_icon('edit.png',
-                                    get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL) . '</a>';
+                                    get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
                         }
                         if ($course['status'] == COURSEMANAGER) {
                             //echo Display::return_icon('teachers.gif', get_lang('Status').': '.get_lang('Teacher'), array('style'=>'width: 11px; height: 11px;'));
@@ -3423,7 +3423,7 @@ 
                     } else {
                         if ($course_info['visibility'] != COURSE_VISIBILITY_CLOSED) {
                             if ($load_dirs) {
-                                $params['right_actions'] .= '<a id="document_preview_' . $course['id'] . '_0" class="document_preview" href="javascript:void(0);">' .
+                                $params['right_actions'] .= '<a id="document_preview_'.$course['id'].'_0" class="document_preview" href="javascript:void(0);">'.
                                     Display::return_icon(
                                         'folder.png',
                                         get_lang('Documents'),
@@ -3431,7 +3431,7 @@ 
                                         ICON_SIZE_SMALL
                                     ).'</a>';
                                 $params['right_actions'] .= Display::div('', array(
-                                        'id' => 'document_result_' . $course['id'] . '_0',
+                                        'id' => 'document_result_'.$course['id'].'_0',
                                         'class' => 'document_preview_container'
                                     ));
                             }
@@ -3439,14 +3439,14 @@ 
                     }
 
                     if ($course_info['visibility'] != COURSE_VISIBILITY_CLOSED || $course['status'] == COURSEMANAGER) {
-                        $course_title = '<a href="' . $course_info['course_public_url'] . '?id_session=0&autoreg=1">' . $course_info['title'] . '</a>';
+                        $course_title = '<a href="'.$course_info['course_public_url'].'?id_session=0&autoreg=1">'.$course_info['title'].'</a>';
                     } else {
-                        $course_title = $course_info['title'] . " " . Display::tag('span', get_lang('CourseClosed'),
+                        $course_title = $course_info['title']." ".Display::tag('span', get_lang('CourseClosed'),
                                 array('class' => 'item_closed'));
                     }
 
                     if (api_get_setting('display_coursecode_in_courselist') == 'true') {
-                        $course_title .= ' (' . $course_info['visual_code'] . ') ';
+                        $course_title .= ' ('.$course_info['visual_code'].') ';
                     }
                     if (api_get_setting('display_teacher_in_courselist') == 'true') {
                         $params['teachers'] = CourseManager::get_teacher_list_from_course_code_to_string(
@@ -3495,7 +3495,7 @@ 
         // Step 1: We get all the categories of the user
         $table = Database::get_main_table(TABLE_USER_COURSE_CATEGORY);
         $sql = "SELECT id, title FROM $table
-                WHERE user_id = '" . $user_id . "'
+                WHERE user_id = '".$user_id."'
                 ORDER BY sort ASC";
         $result = Database::query($sql);
         $html = null;
@@ -3556,7 +3556,7 @@ 
 
         $without_special_courses = '';
         if (!empty($special_course_list)) {
-            $without_special_courses = ' AND course.code NOT IN ("' . implode('","', $special_course_list) . '")';
+            $without_special_courses = ' AND course.code NOT IN ("'.implode('","', $special_course_list).'")';
         }
 
         //AND course_rel_user.relation_type<>".COURSE_RELATION_TYPE_RRHH."
@@ -3575,14 +3575,14 @@ 
                 WHERE
                     course.id = course_rel_user.c_id AND
                     url.c_id = course.id AND
-                    course_rel_user.user_id = '" . $user_id . "' AND
-                    course_rel_user.user_course_cat = '" . $user_category_id . "'
+                    course_rel_user.user_id = '".$user_id."' AND
+                    course_rel_user.user_course_cat = '" . $user_category_id."'
                     $without_special_courses ";
 
         // If multiple URL access mode is enabled, only fetch courses
         // corresponding to the current URL.
         if (api_get_multiple_access_url() && $current_url_id != -1) {
-            $sql .= " AND url.c_id = course.id AND access_url_id='" . $current_url_id . "'";
+            $sql .= " AND url.c_id = course.id AND access_url_id='".$current_url_id."'";
         }
         // Use user's classification for courses (if any).
         $sql .= " ORDER BY course_rel_user.user_course_cat, course_rel_user.sort ASC";
@@ -3638,17 +3638,17 @@ 
 
             if (api_is_platform_admin()) {
                 if ($load_dirs) {
-                    $params['right_actions'] .= '<a id="document_preview_' . $course_info['real_id'] . '_0" class="document_preview" href="javascript:void(0);">' . Display::return_icon('folder.png',
-                            get_lang('Documents'), array('align' => 'absmiddle'), ICON_SIZE_SMALL) . '</a>';
-                    $params['right_actions'] .= '<a href="' . api_get_path(WEB_CODE_PATH) . 'course_info/infocours.php?cidReq=' . $course['code'] . '">' . Display::return_icon('edit.png',
-                            get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL) . '</a>';
+                    $params['right_actions'] .= '<a id="document_preview_'.$course_info['real_id'].'_0" class="document_preview" href="javascript:void(0);">'.Display::return_icon('folder.png',
+                            get_lang('Documents'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
+                    $params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png',
+                            get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
                     $params['right_actions'] .= Display::div('', array(
-                            'id' => 'document_result_' . $course_info['real_id'] . '_0',
+                            'id' => 'document_result_'.$course_info['real_id'].'_0',
                             'class' => 'document_preview_container'
                         ));
                 } else {
-                    $params['right_actions'] .= '<a href="' . api_get_path(WEB_CODE_PATH) . 'course_info/infocours.php?cidReq=' . $course['code'] . '">' . Display::return_icon('edit.png',
-                            get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL) . '</a>';
+                    $params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png',
+                            get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
                 }
 
                 if ($course_info['status'] == COURSEMANAGER) {
@@ -3657,16 +3657,16 @@ 
             } else {
                 if ($course_info['visibility'] != COURSE_VISIBILITY_CLOSED) {
                     if ($load_dirs) {
-                        $params['right_actions'] .= '<a id="document_preview_' . $course_info['real_id'] . '_0" class="document_preview" href="javascript:void(0);">' . Display::return_icon('folder.png',
-                                get_lang('Documents'), array('align' => 'absmiddle'), ICON_SIZE_SMALL) . '</a>';
+                        $params['right_actions'] .= '<a id="document_preview_'.$course_info['real_id'].'_0" class="document_preview" href="javascript:void(0);">'.Display::return_icon('folder.png',
+                                get_lang('Documents'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
                         $params['right_actions'] .= Display::div('', array(
-                                'id' => 'document_result_' . $course_info['real_id'] . '_0',
+                                'id' => 'document_result_'.$course_info['real_id'].'_0',
                                 'class' => 'document_preview_container'
                             ));
                     } else {
                         if ($course_info['status'] == COURSEMANAGER) {
-                            $params['right_actions'] .= '<a href="' . api_get_path(WEB_CODE_PATH) . 'course_info/infocours.php?cidReq=' . $course['code'] . '">' . Display::return_icon('edit.png',
-                                    get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL) . '</a>';
+                            $params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png',
+                                    get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
                         }
                     }
                 }
@@ -3674,16 +3674,16 @@ 
 
             $course_title_url = '';
             if ($course_info['visibility'] != COURSE_VISIBILITY_CLOSED || $course['status'] == COURSEMANAGER) {
-                $course_title_url = api_get_path(WEB_COURSE_PATH) . $course_info['path'] . '/index.php?id_session=0';
+                $course_title_url = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/index.php?id_session=0';
                 $course_title = Display::url($course_info['title'], $course_title_url);
             } else {
-                $course_title = $course_info['title'] . " " . Display::tag('span', get_lang('CourseClosed'),
+                $course_title = $course_info['title']." ".Display::tag('span', get_lang('CourseClosed'),
                         array('class' => 'item_closed'));
             }
 
             // Start displaying the course block itself
             if (api_get_setting('display_coursecode_in_courselist') == 'true') {
-                $course_title .= ' (' . $course_info['visual_code'] . ') ';
+                $course_title .= ' ('.$course_info['visual_code'].') ';
             }
 
             if (api_get_setting('display_teacher_in_courselist') == 'true') {
@@ -3896,14 +3896,14 @@ 
                 }
 
                 if ($user_in_course_status == COURSEMANAGER || $sessionCourseAvailable) {
-                    $session_url = $course_info['course_public_url'] . '?id_session=' . $course_info['id_session'];
-                    $session_title = '<h4><a href="' . $session_url. '">'. $course_info['name'] . '</a>'.$notifications.'</h4>';
+                    $session_url = $course_info['course_public_url'].'?id_session='.$course_info['id_session'];
+                    $session_title = '<h4><a href="'.$session_url.'">'.$course_info['name'].'</a>'.$notifications.'</h4>';
                 } else {
                     $session_title = $course_info['name'];
                 }
 
             } else {
-                $session_title = $course_info['name'] . ' ' . Display::tag('span', get_lang('CourseClosed'),
+                $session_title = $course_info['name'].' '.Display::tag('span', get_lang('CourseClosed'),
                         array('class' => 'item_closed'));
             }
         } else {
@@ -3928,21 +3928,21 @@ 
             $course_visibility != COURSE_VISIBILITY_HIDDEN
         ) {
             if ($load_dirs) {
-                $params['right_actions'] .= '<a id="document_preview_' . $course_info['real_id'] . '_' . $course_info['id_session'] . '" class="document_preview" href="javascript:void(0);">' .
+                $params['right_actions'] .= '<a id="document_preview_'.$course_info['real_id'].'_'.$course_info['id_session'].'" class="document_preview" href="javascript:void(0);">'.
                     Display::return_icon('folder.png',
                         get_lang('Documents'),
                         array('align' => 'absmiddle'),
                         ICON_SIZE_SMALL
-                    ) . '</a>';
+                    ).'</a>';
                 $params['right_actions'] .= Display::div('', array(
-                    'id' => 'document_result_' . $course_info['real_id'] . '_' . $course_info['id_session'],
+                    'id' => 'document_result_'.$course_info['real_id'].'_'.$course_info['id_session'],
                     'class' => 'document_preview_container'
                 ));
             }
         }
 
         if (api_get_setting('display_coursecode_in_courselist') == 'true') {
-            $session_title .= ' (' . $course_info['visual_code'] . ') ';
+            $session_title .= ' ('.$course_info['visual_code'].') ';
         }
 
         if (api_get_setting('display_teacher_in_courselist') == 'true') {
@@ -3971,7 +3971,7 @@ 
             }
         }
 
-        $session_title .= isset($course['special_course']) ? ' ' .
+        $session_title .= isset($course['special_course']) ? ' '.
                           Display::return_icon('klipper.png', get_lang('CourseAutoRegister')) : '';
 
         $params['title'] = $session_title;
@@ -3987,12 +3987,12 @@ 
 
                 // Request for the name of the general coach
                 $sql = 'SELECT lastname, firstname,sc.name
-                        FROM ' . $tbl_session . ' ts
-                        LEFT JOIN ' . $main_user_table . ' tu
+                        FROM ' . $tbl_session.' ts
+                        LEFT JOIN ' . $main_user_table.' tu
                         ON ts.id_coach = tu.user_id
-                        INNER JOIN ' . $tbl_session_category . ' sc
+                        INNER JOIN ' . $tbl_session_category.' sc
                         ON ts.session_category_id = sc.id
-                        WHERE ts.id=' . (int)$course_info['id_session'] . '
+                        WHERE ts.id=' . (int) $course_info['id_session'].'
                         LIMIT 1';
 
                 $rs = Database::query($sql);
@@ -4007,14 +4007,14 @@ 
                     //$session['dates'] = get_lang('WithoutTimeLimits');
                     $session['dates'] = '';
                     if (api_get_setting('show_session_coach') === 'true') {
-                        $session['coach'] = get_lang('GeneralCoach') . ': ' . api_get_person_name($sessioncoach['firstname'],
+                        $session['coach'] = get_lang('GeneralCoach').': '.api_get_person_name($sessioncoach['firstname'],
                                 $sessioncoach['lastname']);
                     }
                     $active = true;
                 } else {
-                    $session ['dates'] = ' - ' . get_lang('From') . ' ' . $course_info['access_start_date'] . ' ' . get_lang('To') . ' ' . $course_info['access_end_date'];
+                    $session ['dates'] = ' - '.get_lang('From').' '.$course_info['access_start_date'].' '.get_lang('To').' '.$course_info['access_end_date'];
                     if (api_get_setting('show_session_coach') === 'true') {
-                        $session['coach'] = get_lang('GeneralCoach') . ': ' . api_get_person_name($sessioncoach['firstname'],
+                        $session['coach'] = get_lang('GeneralCoach').': '.api_get_person_name($sessioncoach['firstname'],
                                 $sessioncoach['lastname']);
                     }
                     $active = ($date_start <= $now && $date_end >= $now);
@@ -4066,9 +4066,9 @@ 
         $destination_session_id,
         $params = array()
     ) {
-        require_once api_get_path(SYS_CODE_PATH) . 'coursecopy/classes/CourseBuilder.class.php';
-        require_once api_get_path(SYS_CODE_PATH) . 'coursecopy/classes/CourseRestorer.class.php';
-        require_once api_get_path(SYS_CODE_PATH) . 'coursecopy/classes/CourseSelectForm.class.php';
+        require_once api_get_path(SYS_CODE_PATH).'coursecopy/classes/CourseBuilder.class.php';
+        require_once api_get_path(SYS_CODE_PATH).'coursecopy/classes/CourseRestorer.class.php';
+        require_once api_get_path(SYS_CODE_PATH).'coursecopy/classes/CourseSelectForm.class.php';
 
         $course_info = api_get_course_info($source_course_code);
 
@@ -4141,7 +4141,7 @@ 
             if (Database::num_rows($result) > 0) {
                 $row = Database::fetch_array($result);
                 $count = $row['count'] + 1;
-                $wanted_code = $wanted_code . '_' . $count;
+                $wanted_code = $wanted_code.'_'.$count;
                 $result = api_get_course_info($wanted_code);
                 if (empty($result)) {
                     return $wanted_code;
@@ -4175,7 +4175,7 @@ 
         $enabled = api_get_plugin_setting('courselegal', 'tool_enable');
 
         if ($enabled == 'true') {
-            require_once api_get_path(SYS_PLUGIN_PATH) . 'courselegal/config.php';
+            require_once api_get_path(SYS_PLUGIN_PATH).'courselegal/config.php';
             $plugin = CourseLegalPlugin::create();
             return $plugin->isUserAcceptedLegal($user_id, $course_code, $session_id);
         }
@@ -4220,7 +4220,7 @@ 
         $enabled = api_get_plugin_setting('courselegal', 'tool_enable');
 
         if ($enabled == 'true') {
-            require_once api_get_path(SYS_PLUGIN_PATH) . 'courselegal/config.php';
+            require_once api_get_path(SYS_PLUGIN_PATH).'courselegal/config.php';
             $plugin = CourseLegalPlugin::create();
             return $plugin->saveUserLegal($user_id, $course_code, $session_id);
         }
@@ -4561,10 +4561,10 @@ 
                 INNER JOIN $table_course_url u
                 ON u.c_id = c.id
                 WHERE
-                    u.access_url_id = " . api_get_current_access_url_id() . " AND
+                    u.access_url_id = ".api_get_current_access_url_id()." AND
                     login_course_date <= '$now' AND
                     login_course_date > DATE_SUB('$now', INTERVAL $days DAY) AND
-                    visibility <> '" . COURSE_VISIBILITY_CLOSED . "' AND visibility <> '" . COURSE_VISIBILITY_HIDDEN . "'
+                    visibility <> '".COURSE_VISIBILITY_CLOSED."' AND visibility <> '".COURSE_VISIBILITY_HIDDEN."'
                 GROUP BY a.c_id
                 ORDER BY course_count DESC
                 LIMIT $limit
@@ -4590,7 +4590,7 @@ 
     {
         $hotCourses = [];
 
-        $ajax_url = api_get_path(WEB_AJAX_PATH) . 'course.ajax.php?a=add_course_vote';
+        $ajax_url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=add_course_vote';
 
         $stok = Security::get_existing_token();
 
@@ -4612,7 +4612,7 @@ 
             if ($access_link && in_array('register', $access_link)) {
                 $my_course['extra_info']['register_button'] = Display::url(
                     Display::returnFontAwesomeIcon('sign-in'),
-                    api_get_path(WEB_COURSE_PATH) . $course_info['path'] . '/index.php?action=subscribe&sec_token=' . $stok,
+                    api_get_path(WEB_COURSE_PATH).$course_info['path'].'/index.php?action=subscribe&sec_token='.$stok,
                     array('class' => 'btn btn-success btn-sm', 'title' => get_lang('Subscribe')));
             }
 
@@ -4621,14 +4621,14 @@ 
             ) {
                 $my_course['extra_info']['go_to_course_button'] = Display::url(
                     Display::returnFontAwesomeIcon('share'),
-                    api_get_path(WEB_COURSE_PATH) . $course_info['path'] . '/index.php',
+                    api_get_path(WEB_COURSE_PATH).$course_info['path'].'/index.php',
                     array('class' => 'btn btn-default btn-sm', 'title' => get_lang('GoToCourse')));
             }
 
             if ($access_link && in_array('unsubscribe', $access_link)) {
                 $my_course['extra_info']['unsubscribe_button'] = Display::url(
                     Display::returnFontAwesomeIcon('sign-out'),
-                    api_get_path(WEB_CODE_PATH) . 'auth/courses.php?action=unsubscribe&unsubscribe=' . $courseCode . '&sec_token=' . $stok . '&category_code=' . $categoryCode,
+                    api_get_path(WEB_CODE_PATH).'auth/courses.php?action=unsubscribe&unsubscribe='.$courseCode.'&sec_token='.$stok.'&category_code='.$categoryCode,
                     array('class' => 'btn btn-danger btn-sm', 'title' => get_lang('Unreg')));
             }
 
@@ -4639,7 +4639,7 @@ 
             ) { */
                 $my_course['extra_info']['description_button'] = Display::url(
                     Display::returnFontAwesomeIcon('info-circle'),
-                    api_get_path(WEB_AJAX_PATH) . 'course_home.ajax.php?a=show_course_information&code=' . $course_info['code'],
+                    api_get_path(WEB_AJAX_PATH).'course_home.ajax.php?a=show_course_information&code='.$course_info['code'],
                     [
                         'class' => 'btn btn-default btn-sm ajax',
                         'data-title' => get_lang('Description'),
@@ -4650,8 +4650,8 @@ 
             /* get_lang('Description') */
             $my_course['extra_info']['teachers'] = CourseManager::get_teacher_list_from_course_code_to_string($course_info['code']);
             $point_info = self::get_course_ranking($course_info['real_id'], 0);
-            $my_course['extra_info']['rating_html'] = Display::return_rating_system('star_' . $course_info['real_id'],
-                $ajax_url . '&course_id=' . $course_info['real_id'], $point_info);
+            $my_course['extra_info']['rating_html'] = Display::return_rating_system('star_'.$course_info['real_id'],
+                $ajax_url.'&course_id='.$course_info['real_id'], $point_info);
 
             $hotCourses[] = $my_course;
         }
@@ -4725,9 +4725,9 @@ 
                     WHERE
                         c.id = u.c_id AND
                         u.access_url_id = $urlId AND
-                        visibility <> " . COURSE_VISIBILITY_HIDDEN;
+                        visibility <> ".COURSE_VISIBILITY_HIDDEN;
         } else {
-            $sql .= " WHERE visibility <> " . COURSE_VISIBILITY_HIDDEN;
+            $sql .= " WHERE visibility <> ".COURSE_VISIBILITY_HIDDEN;
         }
         $res = Database::query($sql);
         $row = Database::fetch_row($res);
@@ -4747,7 +4747,7 @@ 
 
         $withoutSpecialCourses = '';
         if (!empty($specialCourseList)) {
-            $withoutSpecialCourses = ' AND c.code NOT IN ("' . implode('","', $specialCourseList) . '")';
+            $withoutSpecialCourses = ' AND c.code NOT IN ("'.implode('","', $specialCourseList).'")';
         }
 
         $visibilityCondition = null;
@@ -4881,12 +4881,12 @@ 
             if (count($teachers) > 0) {
                 foreach ($teachers as $key) {
                     $key = Database::escape_string($key);
-                    $cond .= " AND user_id <> '" . $key . "'";
+                    $cond .= " AND user_id <> '".$key."'";
                 }
             }
 
-            $sql = 'DELETE FROM ' . $course_user_table . '
-                    WHERE c_id ="' . $courseId . '" AND status="1" AND relation_type = 0 ' . $cond;
+            $sql = 'DELETE FROM '.$course_user_table.'
+                    WHERE c_id ="' . $courseId.'" AND status="1" AND relation_type = 0 '.$cond;
             Database::query($sql);
         }
 
@@ -4894,12 +4894,12 @@ 
             foreach ($teachers as $userId) {
                 $userId = intval($userId);
                 // We check if the teacher is already subscribed in this course
-                $sql = 'SELECT 1 FROM ' . $course_user_table . '
-                        WHERE user_id = "' . $userId . '" AND c_id = "' . $courseId . '" ';
+                $sql = 'SELECT 1 FROM '.$course_user_table.'
+                        WHERE user_id = "' . $userId.'" AND c_id = "'.$courseId.'" ';
                 $result = Database::query($sql);
                 if (Database::num_rows($result)) {
-                    $sql = 'UPDATE ' . $course_user_table . ' SET status = "1"
-                            WHERE c_id = "' . $courseId . '" AND user_id = "' . $userId . '"  ';
+                    $sql = 'UPDATE '.$course_user_table.' SET status = "1"
+                            WHERE c_id = "' . $courseId.'" AND user_id = "'.$userId.'"  ';
                 } else {
                     $userCourseCategory = '0';
                     if (isset($teacherBackup[$userId]) &&
@@ -4909,9 +4909,9 @@ 
                         $userCourseCategory = $courseUserData['user_course_cat'];
                     }
 
-                    $sql = "INSERT INTO " . $course_user_table . " SET
-                            c_id = " . $courseId . ",
-                            user_id = " . $userId . ",
+                    $sql = "INSERT INTO ".$course_user_table." SET
+                            c_id = " . $courseId.",
+                            user_id = " . $userId.",
                             status = '1',
                             is_tutor = '0',
                             sort = '0',
@@ -5247,8 +5247,8 @@ 
     {
         $tbl_main_categories = Database:: get_main_table(TABLE_MAIN_COURSE);
         $sql = 'SELECT title
-                FROM ' . $tbl_main_categories . '
-                WHERE code = "' . Database::escape_string($code) . '"';
+                FROM ' . $tbl_main_categories.'
+                WHERE code = "' . Database::escape_string($code).'"';
         $result = Database::query($sql);
         if ($col = Database::fetch_array($result)) {
             return $col['title'];
@@ -5431,7 +5431,7 @@ 
             foreach ($group_list as $this_group) {
                 if (is_array($to_already_selected)) {
                     if (!in_array(
-                        "GROUP:" . $this_group['id'],
+                        "GROUP:".$this_group['id'],
                         $to_already_selected
                     )
                     ) { // $to_already_selected is the array containing the groups (and users) that are already selected
@@ -5439,8 +5439,8 @@ 
                         $user_disabled = ($this_group['userNb'] > 0) ? "" : "disabled=disabled";
                         $result[] = array(
                             'disabled' => $user_disabled,
-                            'value' => "GROUP:" . $this_group['id'],
-                            'content' => "G: " . $this_group['name'] . " - " . $this_group['userNb'] . " " . $user_label
+                            'value' => "GROUP:".$this_group['id'],
+                            'content' => "G: ".$this_group['name']." - ".$this_group['userNb']." ".$user_label
                         );
                     }
                 }
@@ -5452,13 +5452,13 @@ 
             foreach ($user_list as $user) {
                 if (is_array($to_already_selected)) {
                     if (!in_array(
-                        "USER:" . $user['user_id'],
+                        "USER:".$user['user_id'],
                         $to_already_selected
                     )
                     ) { // $to_already_selected is the array containing the users (and groups) that are already selected
 
                         $result[] = array(
-                            'value' => "USER:" . $user['user_id'],
+                            'value' => "USER:".$user['user_id'],
                             'content' => api_get_person_name($user['firstname'], $user['lastname'])
                         );
                     }
@@ -5487,7 +5487,7 @@ 
     {
         $category_id = intval($category_id);
         $info = Database::fetch_array(
-            Database::query('SELECT course_code FROM ' . Database::get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY) . '
+            Database::query('SELECT course_code FROM '.Database::get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY).'
             WHERE id=' . $category_id), 'ASSOC'
         );
         return $info ? $info['course_code'] : false;
@@ -5503,15 +5503,14 @@ 
     public static function getCoursesWithoutSession($startDate = null, $endDate = null, $includeClosed = false)
     {
         $dateConditional = ($startDate && $endDate) ?
-            " WHERE session_id IN (SELECT id FROM " . Database::get_main_table(TABLE_MAIN_SESSION) .
-            " WHERE access_start_date = '$startDate' AND access_end_date = '$endDate')" :
-            null;
+            " WHERE session_id IN (SELECT id FROM ".Database::get_main_table(TABLE_MAIN_SESSION).
+            " WHERE access_start_date = '$startDate' AND access_end_date = '$endDate')" : null;
         $visibility = ($includeClosed ? '' : 'visibility NOT IN (0, 4) AND ');
 
         $query = "SELECT id, code, title
-                FROM " . Database::get_main_table(TABLE_MAIN_COURSE). "
+                FROM " . Database::get_main_table(TABLE_MAIN_COURSE)."
                 WHERE $visibility code NOT IN (
-                    SELECT DISTINCT course_code FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE) . $dateConditional . ")
+                    SELECT DISTINCT course_code FROM ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE).$dateConditional.")
                 ORDER BY id";
 
         $result = Database::query($query);
@@ -5544,7 +5543,7 @@ 
                 FROM $courseTable c
                 INNER JOIN $courseUserTable cru ON c.id = cru.c_id
                 WHERE (
-                    cru.user_id IN (" . implode(', ', $userIdList) . ")
+                    cru.user_id IN (".implode(', ', $userIdList).")
                     AND cru.relation_type = 0
                 )";
 
@@ -5559,7 +5558,7 @@ 
                         INNER JOIN $courseAccessUrlTable crau ON c.id = crau.c_id
                         WHERE crau.access_url_id = $accessUrlId
                             AND (
-                            cru.id_user IN (" . implode(', ', $userIdList) . ") AND
+                            cru.id_user IN (".implode(', ', $userIdList).") AND
                             cru.relation_type = 0
                         )";
             }
@@ -5668,7 +5667,7 @@ 
 
         $without_special_courses = '';
         if (!empty($special_course_list)) {
-            $without_special_courses = ' AND course.code NOT IN ("'.implode('","',$special_course_list).'")';
+            $without_special_courses = ' AND course.code NOT IN ("'.implode('","', $special_course_list).'")';
         }
 
         //AND course_rel_user.relation_type<>".COURSE_RELATION_TYPE_RRHH."
@@ -5724,11 +5723,11 @@ 
 
         if (api_is_platform_admin()) {
             if ($loadDirs) {
-                $params['right_actions'] .= '<a id="document_preview_'.$course_info['real_id'].'_0" class="document_preview" href="javascript:void(0);">'.Display::return_icon('folder.png', get_lang('Documents'), array('align' => 'absmiddle'),ICON_SIZE_SMALL).'</a>';
-                $params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png', get_lang('Edit'), array('align' => 'absmiddle'),ICON_SIZE_SMALL).'</a>';
+                $params['right_actions'] .= '<a id="document_preview_'.$course_info['real_id'].'_0" class="document_preview" href="javascript:void(0);">'.Display::return_icon('folder.png', get_lang('Documents'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
+                $params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png', get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
                 $params['right_actions'] .= Display::div('', array('id' => 'document_result_'.$course_info['real_id'].'_0', 'class'=>'document_preview_container'));
             } else {
-                $params['right_actions'].= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png', get_lang('Edit'), array('align' => 'absmiddle'),ICON_SIZE_SMALL).'</a>';
+                $params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png', get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
             }
 
             if ($course_info['status'] == COURSEMANAGER) {
@@ -5737,11 +5736,11 @@ 
         } else {
             if ($course_info['visibility'] != COURSE_VISIBILITY_CLOSED) {
                 if ($loadDirs) {
-                    $params['right_actions'] .= '<a id="document_preview_'.$course_info['real_id'].'_0" class="document_preview" href="javascript:void(0);">'.Display::return_icon('folder.png', get_lang('Documents'), array('align' => 'absmiddle'),ICON_SIZE_SMALL).'</a>';
+                    $params['right_actions'] .= '<a id="document_preview_'.$course_info['real_id'].'_0" class="document_preview" href="javascript:void(0);">'.Display::return_icon('folder.png', get_lang('Documents'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
                     $params['right_actions'] .= Display::div('', array('id' => 'document_result_'.$course_info['real_id'].'_0', 'class'=>'document_preview_container'));
                 } else {
                     if ($course_info['status'] == COURSEMANAGER) {
-                        $params['right_actions'].= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png', get_lang('Edit'), array('align' => 'absmiddle'),ICON_SIZE_SMALL).'</a>';
+                        $params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png', get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
                     }
                 }
             }
@@ -5752,7 +5751,7 @@ 
             $course_title_url = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/?id_session=0';
             $course_title = Display::url($course_info['title'], $course_title_url);
         } else {
-            $course_title = $course_info['title']." ".Display::tag('span',get_lang('CourseClosed'), array('class'=>'item_closed'));
+            $course_title = $course_info['title']." ".Display::tag('span', get_lang('CourseClosed'), array('class'=>'item_closed'));
         }
 
         // Start displaying the course block itself

main/inc/lib/social.lib.php

Spacing +116 added lines, -116 removed lines

@@ -109,12 +109,12 @@ 
                     friend_user_id<>'.((int) $user_id).' AND
                     user_id='.((int) $user_id);
         if (isset($id_group) && $id_group > 0) {
-            $sql.=' AND relation_type='.$id_group;
+            $sql .= ' AND relation_type='.$id_group;
         }
         if (isset($search_name)) {
             $search_name = trim($search_name);
             $search_name = str_replace(' ', '', $search_name);
-            $sql.=' AND friend_user_id IN (
+            $sql .= ' AND friend_user_id IN (
                 SELECT user_id FROM '.$tbl_my_user.'
                 WHERE
                     firstName LIKE "%'.Database::escape_string($search_name).'%" OR
@@ -368,7 +368,7 @@ 
 
         $user_info = api_get_user_info($userfriend_id);
         $succes = get_lang('MessageSentTo');
-        $succes.= ' : '.api_get_person_name($user_info['firstName'], $user_info['lastName']);
+        $succes .= ' : '.api_get_person_name($user_info['firstName'], $user_info['lastName']);
 
         if (isset($subject_message) && isset($content_message) && isset($userfriend_id)) {
             $send_message = MessageManager::send_message($userfriend_id, $subject_message, $content_message);
@@ -485,7 +485,7 @@ 
         $user_in_course_status = CourseManager :: get_user_in_course_status(api_get_user_id(), $course_code);
 
         //$valor = api_get_settings_params();
-        $course_path = api_get_path(SYS_COURSE_PATH).$course_directory;   // course path
+        $course_path = api_get_path(SYS_COURSE_PATH).$course_directory; // course path
         if (api_get_setting('course_images_in_courses_list') === 'true') {
             if (file_exists($course_path.'/course-pic85x85.png')) {
                 $image = $my_course['course_info']['course_image'];
@@ -510,7 +510,7 @@ 
         if ($course_visibility != COURSE_VISIBILITY_HIDDEN &&
             ($course_visibility != COURSE_VISIBILITY_CLOSED || $user_in_course_status == COURSEMANAGER)
         ) {
-           $result .= '<span class="title">' . $course_title . '<span>';
+           $result .= '<span class="title">'.$course_title.'<span>';
         } else {
             $result .= $course_title." "." ".get_lang('CourseClosed')."";
         }
@@ -729,57 +729,57 @@ 
             $links = '<ul class="nav nav-pills nav-stacked">';
             $active = $show == 'home' ? 'active' : null;
             $links .= '
-                <li class="home-icon ' . $active . '">
-                    <a href="' . api_get_path(WEB_CODE_PATH) . 'social/home.php">
-                        ' . $homeIcon . ' ' . get_lang('Home') . '
+                <li class="home-icon ' . $active.'">
+                    <a href="' . api_get_path(WEB_CODE_PATH).'social/home.php">
+                        ' . $homeIcon.' '.get_lang('Home').'
                     </a>
                 </li>';
             $active = $show == 'messages' ? 'active' : null;
             $links .= '
-                <li class="messages-icon ' . $active . '">
-                    <a href="' . api_get_path(WEB_CODE_PATH) . 'messages/inbox.php?f=social">
-                        ' . $messagesIcon . ' ' . get_lang('Messages') . $count_unread_message . '
+                <li class="messages-icon ' . $active.'">
+                    <a href="' . api_get_path(WEB_CODE_PATH).'messages/inbox.php?f=social">
+                        ' . $messagesIcon.' '.get_lang('Messages').$count_unread_message.'
                     </a>
                 </li>';
 
             //Invitations
             $active = $show == 'invitations' ? 'active' : null;
             $links .= '
-                <li class="invitations-icon ' . $active . '">
-                    <a href="' . api_get_path(WEB_CODE_PATH) . 'social/invitations.php">
-                        ' . $invitationsIcon . ' ' . get_lang('Invitations') . $total_invitations . '
+                <li class="invitations-icon ' . $active.'">
+                    <a href="' . api_get_path(WEB_CODE_PATH).'social/invitations.php">
+                        ' . $invitationsIcon.' '.get_lang('Invitations').$total_invitations.'
                     </a>
                 </li>';
 
             //Shared profile and groups
             $active = $show == 'shared_profile' ? 'active' : null;
             $links .= '
-                <li class="shared-profile-icon' . $active . '">
-                    <a href="' . api_get_path(WEB_CODE_PATH) . 'social/profile.php">
-                        ' . $sharedProfileIcon . ' ' . get_lang('ViewMySharedProfile') . '
+                <li class="shared-profile-icon' . $active.'">
+                    <a href="' . api_get_path(WEB_CODE_PATH).'social/profile.php">
+                        ' . $sharedProfileIcon.' '.get_lang('ViewMySharedProfile').'
                     </a>
                 </li>';
             $active = $show == 'friends' ? 'active' : null;
             $links .= '
-                <li class="friends-icon ' . $active . '">
-                    <a href="' . api_get_path(WEB_CODE_PATH) . 'social/friends.php">
-                        ' . $friendsIcon . ' ' . get_lang('Friends') . '
+                <li class="friends-icon ' . $active.'">
+                    <a href="' . api_get_path(WEB_CODE_PATH).'social/friends.php">
+                        ' . $friendsIcon.' '.get_lang('Friends').'
                     </a>
                 </li>';
             $active = $show == 'browse_groups' ? 'active' : null;
             $links .= '
-                <li class="browse-groups-icon ' . $active . '">
-                    <a href="' . api_get_path(WEB_CODE_PATH) . 'social/groups.php">
-                        ' . $groupsIcon . ' ' . get_lang('SocialGroups') . '
+                <li class="browse-groups-icon ' . $active.'">
+                    <a href="' . api_get_path(WEB_CODE_PATH).'social/groups.php">
+                        ' . $groupsIcon.' '.get_lang('SocialGroups').'
                     </a>
                 </li>';
 
             //Search users
             $active = $show == 'search' ? 'active' : null;
             $links .= '
-                <li class="search-icon ' . $active . '">
-                    <a href="' . api_get_path(WEB_CODE_PATH) . 'social/search.php">
-                        ' . $searchIcon . ' ' . get_lang('Search') . '
+                <li class="search-icon ' . $active.'">
+                    <a href="' . api_get_path(WEB_CODE_PATH).'social/search.php">
+                        ' . $searchIcon.' '.get_lang('Search').'
                     </a>
                 </li>';
 
@@ -787,9 +787,9 @@ 
             $active = $show == 'myfiles' ? 'active' : null;
 
             $myFiles = '
-                <li class="myfiles-icon ' . $active . '">
-                    <a href="' . api_get_path(WEB_CODE_PATH) . 'social/myfiles.php">
-                        ' . $filesIcon . ' ' . get_lang('MyFiles') . '
+                <li class="myfiles-icon ' . $active.'">
+                    <a href="' . api_get_path(WEB_CODE_PATH).'social/myfiles.php">
+                        ' . $filesIcon.' '.get_lang('MyFiles').'
                     </a>
                 </li>';
 
@@ -798,7 +798,7 @@ 
             }
             $links .= $myFiles;
 
-            $links .='</ul>';
+            $links .= '</ul>';
             
             $html .= Display::panelCollapse(
                     get_lang('SocialNetwork'),
@@ -819,57 +819,57 @@ 
         }
 
         if ($show == 'shared_profile') {
-            $links =  '<ul class="nav nav-pills nav-stacked">';
+            $links = '<ul class="nav nav-pills nav-stacked">';
             // My own profile
             if ($show_full_profile && $user_id == intval(api_get_user_id())) {
                 $links .= '
-                    <li class="home-icon ' . $active . '">
-                        <a href="' . api_get_path(WEB_CODE_PATH) . 'social/home.php">
-                            ' . $homeIcon . ' ' . get_lang('Home') . '
+                    <li class="home-icon ' . $active.'">
+                        <a href="' . api_get_path(WEB_CODE_PATH).'social/home.php">
+                            ' . $homeIcon.' '.get_lang('Home').'
                         </a>
                     </li>
-                    <li class="messages-icon ' . $active . '">
-                        <a href="' . api_get_path(WEB_CODE_PATH) . 'messages/inbox.php?f=social">
-                            ' . $messagesIcon . ' ' . get_lang('Messages') . $count_unread_message . '
+                    <li class="messages-icon ' . $active.'">
+                        <a href="' . api_get_path(WEB_CODE_PATH).'messages/inbox.php?f=social">
+                            ' . $messagesIcon.' '.get_lang('Messages').$count_unread_message.'
                         </a>
                     </li>';
                 $active = $show == 'invitations' ? 'active' : null;
                 $links .= '
-                    <li class="invitations-icon' . $active . '">
-                        <a href="' . api_get_path(WEB_CODE_PATH) . 'social/invitations.php">
-                            ' . $invitationsIcon . ' ' . get_lang('Invitations') . $total_invitations . '
+                    <li class="invitations-icon' . $active.'">
+                        <a href="' . api_get_path(WEB_CODE_PATH).'social/invitations.php">
+                            ' . $invitationsIcon.' '.get_lang('Invitations').$total_invitations.'
                         </a>
                     </li>';
 
                 $links .= '
                     <li class="shared-profile-icon active">
-                        <a href="' . api_get_path(WEB_CODE_PATH) . 'social/profile.php">
-                            ' . $sharedProfileIcon . ' ' . get_lang('ViewMySharedProfile') . '
+                        <a href="' . api_get_path(WEB_CODE_PATH).'social/profile.php">
+                            ' . $sharedProfileIcon.' '.get_lang('ViewMySharedProfile').'
                         </a>
                     </li>
                     <li class="friends-icon">
-                        <a href="' . api_get_path(WEB_CODE_PATH) . 'social/friends.php">
-                            ' . $friendsIcon . ' ' . get_lang('Friends') . '
+                        <a href="' . api_get_path(WEB_CODE_PATH).'social/friends.php">
+                            ' . $friendsIcon.' '.get_lang('Friends').'
                         </a>
                     </li>
                     <li class="browse-groups-icon">
-                        <a href="' . api_get_path(WEB_CODE_PATH) . 'social/groups.php">
-                            ' . $groupsIcon . ' ' . get_lang('SocialGroups') . '
+                        <a href="' . api_get_path(WEB_CODE_PATH).'social/groups.php">
+                            ' . $groupsIcon.' '.get_lang('SocialGroups').'
                         </a>
                     </li>';
                 $active = $show == 'search' ? 'active' : null;
                 $links .= '
-                    <li class="search-icon ' . $active . '">
-                        <a href="' . api_get_path(WEB_CODE_PATH) . 'social/search.php">
-                            ' . $searchIcon . ' ' . get_lang('Search') . '
+                    <li class="search-icon ' . $active.'">
+                        <a href="' . api_get_path(WEB_CODE_PATH).'social/search.php">
+                            ' . $searchIcon.' '.get_lang('Search').'
                         </a>
                     </li>';
                 $active = $show == 'myfiles' ? 'active' : null;
 
                 $myFiles = '
-                    <li class="myfiles-icon ' . $active . '">
-                     <a href="' . api_get_path(WEB_CODE_PATH) . 'social/myfiles.php">
-                            ' . $filesIcon . ' ' . get_lang('MyFiles') . '
+                    <li class="myfiles-icon ' . $active.'">
+                     <a href="' . api_get_path(WEB_CODE_PATH).'social/myfiles.php">
+                            ' . $filesIcon.' '.get_lang('MyFiles').'
                         </a>
                     </li>';
 
@@ -915,7 +915,7 @@ 
                 $links .= '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/invitations.php">'.Display::return_icon('invitation.png', get_lang('YouAlreadySentAnInvitation')).'&nbsp;&nbsp;'.get_lang('YouAlreadySentAnInvitation').'</a></li>';
             } else {
                 if (!$show_full_profile) {
-                    $links .= '<li><a class="btn-to-send-invitation" href="#" data-send-to="' . $user_id . '" title="'.get_lang('SendInvitation').'">'.Display :: return_icon('invitation.png', get_lang('SocialInvitationToFriends')).'&nbsp;'.get_lang('SendInvitation').'</a></li>';
+                    $links .= '<li><a class="btn-to-send-invitation" href="#" data-send-to="'.$user_id.'" title="'.get_lang('SendInvitation').'">'.Display :: return_icon('invitation.png', get_lang('SocialInvitationToFriends')).'&nbsp;'.get_lang('SendInvitation').'</a></li>';
                 }
             }
 
@@ -1025,10 +1025,10 @@ 
         foreach ($user_list as $uid) {
             $user_info = api_get_user_info($uid, $checkIfUserOnline = true);
             $lastname = $user_info['lastname'];
-            $firstname =  $user_info['firstname'];
+            $firstname = $user_info['firstname'];
             $completeName = $firstname.', '.$lastname;
 
-            $user_rol = $user_info['status'] == 1 ? Display::return_icon('teacher.png',get_lang('Teacher'),null,ICON_SIZE_TINY) : Display::return_icon('user.png',get_lang('Student'),null,ICON_SIZE_TINY);
+            $user_rol = $user_info['status'] == 1 ? Display::return_icon('teacher.png', get_lang('Teacher'), null, ICON_SIZE_TINY) : Display::return_icon('user.png', get_lang('Student'), null, ICON_SIZE_TINY);
             $status_icon_chat = null;
             if ($user_info['user_is_online_in_chat'] == 1) {
                 $status_icon_chat = Display::return_icon('online.png', get_lang('Online'));
@@ -1039,7 +1039,7 @@ 
             $userPicture = $user_info['avatar'];
             $img = '<img class="img-responsive img-circle" title="'.$completeName.'" alt="'.$completeName.'" src="'.$userPicture.'">';
 
-            $url =  null;
+            $url = null;
             // Anonymous users can't have access to the profile
             if (!api_is_anonymous()) {
                 if (api_get_setting('allow_social_tool') == 'true') {
@@ -1205,13 +1205,13 @@ 
             case SOCIAL_CENTER_PLUGIN:
                 $social_plugins = array(1, 2);
                 if (is_array($social_plugins) && count($social_plugins) > 0) {
-                    $content.= '<div id="social-plugins">';
+                    $content .= '<div id="social-plugins">';
                     foreach ($social_plugins as $plugin) {
-                        $content.= '<div class="social-plugin-item">';
-                        $content.= $plugin;
-                        $content.= '</div>';
+                        $content .= '<div class="social-plugin-item">';
+                        $content .= $plugin;
+                        $content .= '</div>';
                     }
-                    $content.= '</div>';
+                    $content .= '</div>';
                 }
                 break;
             case SOCIAL_LEFT_PLUGIN:
@@ -1279,12 +1279,12 @@ 
         if (!in_array($extension, $allowedTypes)) {
             $flag = false;
         } else {
-            $newFileName = uniqid('') . '.' . $extension;
+            $newFileName = uniqid('').'.'.$extension;
             if (!file_exists($pathMessageAttach)) {
                 @mkdir($pathMessageAttach, api_get_permissions_for_new_directories(), true);
             }
 
-            $newPath = $pathMessageAttach . $newFileName;
+            $newPath = $pathMessageAttach.$newFileName;
             if (is_uploaded_file($fileAttach['tmp_name'])) {
                 @copy($fileAttach['tmp_name'], $newPath);
             }
@@ -1293,9 +1293,9 @@ 
             $medium = self::resize_picture($newPath, IMAGE_WALL_MEDIUM_SIZE);
 
             $big = new Image($newPath);
-            $ok = $small && $small->send_image($pathMessageAttach . IMAGE_WALL_SMALL . '_' . $newFileName) &&
-                $medium && $medium->send_image($pathMessageAttach . IMAGE_WALL_MEDIUM .'_' . $newFileName) &&
-                $big && $big->send_image($pathMessageAttach . IMAGE_WALL_BIG . '_' . $newFileName);
+            $ok = $small && $small->send_image($pathMessageAttach.IMAGE_WALL_SMALL.'_'.$newFileName) &&
+                $medium && $medium->send_image($pathMessageAttach.IMAGE_WALL_MEDIUM.'_'.$newFileName) &&
+                $big && $big->send_image($pathMessageAttach.IMAGE_WALL_BIG.'_'.$newFileName);
 
             // Insert
             $newFileName = $social.$newFileName;
@@ -1386,7 +1386,7 @@ 
             $start = '0000-00-00';
         }
 
-        $isOwnWall = (api_get_user_id() == $userId  && $userId == $friendId);
+        $isOwnWall = (api_get_user_id() == $userId && $userId == $friendId);
         $messages = self::getWallMessages($userId, MESSAGE_STATUS_WALL, $idMessage, $start, $limit, $offset);
         $formattedList = '<div class="sub-mediapost">';
         $users = array();
@@ -1401,8 +1401,8 @@ 
             }
 
             $nameComplete = api_is_western_name_order()
-                ? $users[$userIdLoop]['firstname'] .' ' . $users[$userIdLoop]['lastname']
-                : $users[$userIdLoop]['lastname'] . ' ' . $users[$userIdLoop]['firstname'];
+                ? $users[$userIdLoop]['firstname'].' '.$users[$userIdLoop]['lastname']
+                : $users[$userIdLoop]['lastname'].' '.$users[$userIdLoop]['firstname'];
             $url = api_get_path(WEB_CODE_PATH).'social/profile.php?u='.$userIdLoop;
             $media = '';
             $media .= '<div class="rep-post">';
@@ -1413,11 +1413,11 @@ 
                 $media .= '</div>';
             }
             $media .= '<div class="user-image">';
-            $media .= '<a href="'.$url.'" ><img src="'. $users[$userIdLoop]['avatar'] .
+            $media .= '<a href="'.$url.'" ><img src="'.$users[$userIdLoop]['avatar'].
                        '" alt="'.$users[$userIdLoop]['complete_name'].'" class="avatar-thumb"></a>';
             $media .= '</div>';
             $media .= '<div class="user-data">';
-            $media .= '<div class="username">' . '<a href="'.$url.'">'.$nameComplete.'</a></div>';
+            $media .= '<div class="username">'.'<a href="'.$url.'">'.$nameComplete.'</a></div>';
             $media .= '<div class="time timeago" title="'.$date.'">'.$date.'</div>';
             $media .= '</div>';
             $media .= '<div class="msg-content">';
@@ -1452,12 +1452,12 @@ 
      * @param   int     $offset     Wall messages offset
      * @return  array   $data       return user's starting wall messages along with message extra data
      */
-    public static function getWallMessagesPostHTML($userId, $friendId = 0, $start = null, $limit = 10, $offset= 0)
+    public static function getWallMessagesPostHTML($userId, $friendId = 0, $start = null, $limit = 10, $offset = 0)
     {
         if (empty($start)) {
             $start = '0000-00-00';
         }
-        $isOwnWall = (api_get_user_id() == $userId  && $userId == $friendId);
+        $isOwnWall = (api_get_user_id() == $userId && $userId == $friendId);
         $messages = self::getWallMessages($userId, MESSAGE_STATUS_WALL_POST, null, $start, $limit, $offset);
         $users = array();
         $data = array();
@@ -1516,7 +1516,7 @@ 
 
         $htmlReceiver = '';
         if ($authorId != $receiverId) {
-            $htmlReceiver = ' > <a href="'.$urlReceiver.'">' . $nameCompleteReceiver . '</a> ';
+            $htmlReceiver = ' > <a href="'.$urlReceiver.'">'.$nameCompleteReceiver.'</a> ';
         }
 
         $wallImage = '';
@@ -1551,7 +1551,7 @@ 
         $html .= '<div class="img-post">';
         $html .= $wallImage;
         $html .= '</div>';
-        $html .= '<p>'. Security::remove_XSS($message['content']).'</p>';
+        $html .= '<p>'.Security::remove_XSS($message['content']).'</p>';
         $html .= '</div>';
         $html .= '</div>'; // end mediaPost
 
@@ -1574,11 +1574,11 @@ 
         $domain = empty($url) ? parse_url($link) : parse_url($url);
         $domain = $domain['scheme'].'://'.$domain['host'];
         // Trick to verify if the Image Url Exist because of some bad metatag dev
-        if (self::verifyUrl($image) == false){
-            if (!($image[0] == '/')){
-                $domain = $domain . '/';
+        if (self::verifyUrl($image) == false) {
+            if (!($image[0] == '/')) {
+                $domain = $domain.'/';
             }
-            $image = $domain . $image;
+            $image = $domain.$image;
         }
         $title = $graph->title;
         
@@ -1630,16 +1630,16 @@ 
         if (isset($array[2]) && !empty($array[2])) {
 
             if ($size == IMAGE_WALL_SMALL) {
-                $name = IMAGE_WALL_SMALL. '_' . $array[2];
-            }else if($size == IMAGE_WALL_MEDIUM){
-                $name = IMAGE_WALL_MEDIUM. '_' . $array[2];
-            }else if($size == IMAGE_WALL_BIG){
-                $name = IMAGE_WALL_BIG. '_' . $array[2];
-            }else {
-                $name = IMAGE_WALL_SMALL. '_' . $array[2];
+                $name = IMAGE_WALL_SMALL.'_'.$array[2];
+            } else if ($size == IMAGE_WALL_MEDIUM) {
+                $name = IMAGE_WALL_MEDIUM.'_'.$array[2];
+            } else if ($size == IMAGE_WALL_BIG) {
+                $name = IMAGE_WALL_BIG.'_'.$array[2];
+            } else {
+                $name = IMAGE_WALL_SMALL.'_'.$array[2];
             }
             $lessImage = str_replace($array[2], '', $path);
-            $name = $lessImage . $name;
+            $name = $lessImage.$name;
         }
 
         return $name;
@@ -1747,18 +1747,18 @@ 
         if ($number_friends != 0) {
             if ($number_friends > $number_of_images) {
                 if (api_get_user_id() == $user_id) {
-                    $friendHtml.= ' <span><a href="friends.php">'.get_lang('SeeAll').'</a></span>';
+                    $friendHtml .= ' <span><a href="friends.php">'.get_lang('SeeAll').'</a></span>';
                 } else {
-                    $friendHtml.= ' <span>'
+                    $friendHtml .= ' <span>'
                         .'<a href="'.api_get_path(WEB_CODE_PATH).'social/profile_friends_and_groups.inc.php'
                         .'?view=friends&height=390&width=610&user_id='.$user_id.'"'
                         .'class="ajax" data-title="'.get_lang('SeeAll').'" title="'.get_lang('SeeAll').'" >'.get_lang('SeeAll').'</a></span>';
                 }
             }
 
-            $friendHtml.= '<ul class="nav nav-list">';
+            $friendHtml .= '<ul class="nav nav-list">';
             $j = 1;
-            for ($k=0; $k < $number_friends; $k++) {
+            for ($k = 0; $k < $number_friends; $k++) {
                 if ($j > $number_of_images) break;
 
                 if (isset($friends[$k])) {
@@ -1772,26 +1772,26 @@ 
                         $statusIcon = Display::span('', array('class' => 'offline_user_in_text'));
                     }
 
-                    $friendHtml.= '<li>';
-                    $friendHtml.= '<div>';
+                    $friendHtml .= '<li>';
+                    $friendHtml .= '<div>';
 
                     // the height = 92 must be the same in the image_friend_network span style in default.css
                     $friends_profile = UserManager::getUserPicture($friend['friend_user_id'], USER_IMAGE_SIZE_SMALL);
-                    $friendHtml.= '<img src="'.$friends_profile.'" id="imgfriend_'.$friend['friend_user_id'].'" title="'.$name_user.'"/>';
+                    $friendHtml .= '<img src="'.$friends_profile.'" id="imgfriend_'.$friend['friend_user_id'].'" title="'.$name_user.'"/>';
                     $link_shared = (empty($link_shared)) ? '' : '&'.$link_shared;
-                    $friendHtml.= $statusIcon .'<a href="profile.php?' .'u=' . $friend['friend_user_id'] . $link_shared . '">' . $name_user .'</a>';
-                    $friendHtml.= '</div>';
-                    $friendHtml.= '</li>';
+                    $friendHtml .= $statusIcon.'<a href="profile.php?'.'u='.$friend['friend_user_id'].$link_shared.'">'.$name_user.'</a>';
+                    $friendHtml .= '</div>';
+                    $friendHtml .= '</li>';
                 }
                 $j++;
             }
-            $friendHtml.='</ul>';
+            $friendHtml .= '</ul>';
         } else {
-            $friendHtml.= '<div class="">'.get_lang('NoFriendsInYourContactList').'<br />'
-                .'<a class="btn btn-primary" href="'.api_get_path(WEB_PATH).'whoisonline.php"><em class="fa fa-search"></em> '. get_lang('TryAndFindSomeFriends').'</a></div>';
+            $friendHtml .= '<div class="">'.get_lang('NoFriendsInYourContactList').'<br />'
+                .'<a class="btn btn-primary" href="'.api_get_path(WEB_PATH).'whoisonline.php"><em class="fa fa-search"></em> '.get_lang('TryAndFindSomeFriends').'</a></div>';
         }
 
-        $friendHtml = Display::panel($friendHtml, get_lang('SocialFriend').' (' . $number_friends . ')' );
+        $friendHtml = Display::panel($friendHtml, get_lang('SocialFriend').' ('.$number_friends.')');
 
         return $friendHtml;
     }
@@ -1812,9 +1812,9 @@ 
 
         if ($number_friends != 0) {
 
-            $friendHtml.= '<div class="list-group">';
+            $friendHtml .= '<div class="list-group">';
             $j = 1;
-            for ($k=0; $k < $number_friends; $k++) {
+            for ($k = 0; $k < $number_friends; $k++) {
                 if ($j > $number_of_images) break;
 
                 if (isset($friends[$k])) {
@@ -1823,11 +1823,11 @@ 
                     $user_info_friend = api_get_user_info($friend['friend_user_id'], true);
 
                     if ($user_info_friend['user_is_online']) {
-                        $statusIcon = Display::return_icon('statusonline.png',get_lang('Online'));
-                        $status=1;
+                        $statusIcon = Display::return_icon('statusonline.png', get_lang('Online'));
+                        $status = 1;
                     } else {
-                        $statusIcon = Display::return_icon('statusoffline.png',get_lang('Offline'));
-                        $status=0;
+                        $statusIcon = Display::return_icon('statusoffline.png', get_lang('Offline'));
+                        $status = 0;
                     }
 
                     $friendAvatarMedium = UserManager::getUserPicture($friend['friend_user_id'], USER_IMAGE_SIZE_MEDIUM);
@@ -1836,24 +1836,24 @@ 
                     $showLinkToChat = api_is_global_chat_enabled() &&
                         $friend['friend_user_id'] != api_get_user_id();
 
-                    if ($showLinkToChat){
+                    if ($showLinkToChat) {
                         $friendHtml .= '<a onclick="javascript:chatWith(\''.$friend['friend_user_id'].'\', \''.$name_user.'\', \''.$status.'\',\''.$friendAvatarSmall.'\')" href="javascript:void(0);" class="list-group-item">';
-                        $friendHtml .=  $friend_avatar.' <span class="username">' . $name_user . '</span>';
-                        $friendHtml .= '<span class="status">' . $statusIcon . '</span>';
+                        $friendHtml .= $friend_avatar.' <span class="username">'.$name_user.'</span>';
+                        $friendHtml .= '<span class="status">'.$statusIcon.'</span>';
                     } else {
                         $link_shared = (empty($link_shared)) ? '' : '&'.$link_shared;
-                        $friendHtml .= '<a href="profile.php?' .'u=' . $friend['friend_user_id'] . $link_shared . '" class="list-group-item">';
-                        $friendHtml .=  $friend_avatar.' <span class="username-all">' . $name_user . '</span>';
+                        $friendHtml .= '<a href="profile.php?'.'u='.$friend['friend_user_id'].$link_shared.'" class="list-group-item">';
+                        $friendHtml .= $friend_avatar.' <span class="username-all">'.$name_user.'</span>';
                     }
 
                     $friendHtml .= '</a>';
                 }
                 $j++;
             }
-            $friendHtml.='</div>';
+            $friendHtml .= '</div>';
         } else {
-            $friendHtml.= '<div class="help">'.get_lang('NoFriendsInYourContactList').' '
-                .'<a href="'.api_get_path(WEB_PATH).'whoisonline.php"><em class="fa fa-search"></em> '. get_lang('TryAndFindSomeFriends').'</a></div>';
+            $friendHtml .= '<div class="help">'.get_lang('NoFriendsInYourContactList').' '
+                .'<a href="'.api_get_path(WEB_PATH).'whoisonline.php"><em class="fa fa-search"></em> '.get_lang('TryAndFindSomeFriends').'</a></div>';
         }
 
         return $friendHtml;
@@ -1871,7 +1871,7 @@ 
                 'post',
                 api_get_path(WEB_CODE_PATH).'social/profile.php'.$userId,
                 null,
-                array('enctype' => 'multipart/form-data') ,
+                array('enctype' => 'multipart/form-data'),
                 FormValidator::LAYOUT_HORIZONTAL    
             );