chamilo / chamilo-lms

main/course_description/edit.php

Spacing +6 added lines, -6 removed lines

@@ -34,21 +34,21 @@ 
 }
 $categories[ADD_BLOCK] = get_lang('NewBloc');
 
-$i=1;
+$i = 1;
 echo '<div class="actions" style="margin-bottom:30px">';
 echo '<a href="index.php?'.api_get_cidreq().'">'.
-		Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
+		Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ToolCourseDescription'), '', ICON_SIZE_MEDIUM).
 	'</a>';
 
 ksort($categories);
 foreach ($categories as $id => $title) {
-	if ($i==ADD_BLOCK) {
+	if ($i == ADD_BLOCK) {
 		echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
+			Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
 		break;
 	} else {
 		echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
+			Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
 		$i++;
 	}
 }
@@ -56,7 +56,7 @@ 
 
 // error messages
 if (isset($error) && intval($error) == 1) {
-	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
+	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
 }
 
 // default header title form

Indentation +41 added lines, -41 removed lines

@@ -10,67 +10,67 @@ 
 // protect a course script
 api_protect_course_script(true);
 if (empty($id)) {
-	$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : '';
-	if (empty($id)) {
-		// If the ID was not provided, find the first matching description item given the item type
-		$course_description = new CourseDescription();
-		$description = $course_description->get_data_by_description_type($description_type);
-		if (count($description) > 0) {
-			$id = $description['id'];
-		}
-		// If no corresponding description is found, edit a new one
-		unset($course_description);
-	}
+    $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : '';
+    if (empty($id)) {
+        // If the ID was not provided, find the first matching description item given the item type
+        $course_description = new CourseDescription();
+        $description = $course_description->get_data_by_description_type($description_type);
+        if (count($description) > 0) {
+            $id = $description['id'];
+        }
+        // If no corresponding description is found, edit a new one
+        unset($course_description);
+    }
 }
 $original_id = $id;
 
 if (empty($error)) {
-	$token = Security::get_token();
+    $token = Security::get_token();
 }
 // display categories
 $categories = array();
 foreach ($default_description_titles as $id => $title) {
-	$categories[$id] = $title;
+    $categories[$id] = $title;
 }
 $categories[ADD_BLOCK] = get_lang('NewBloc');
 
 $i=1;
 echo '<div class="actions" style="margin-bottom:30px">';
 echo '<a href="index.php?'.api_get_cidreq().'">'.
-		Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
-	'</a>';
+        Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
+    '</a>';
 
 ksort($categories);
 foreach ($categories as $id => $title) {
-	if ($i==ADD_BLOCK) {
-		echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
-		break;
-	} else {
-		echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
-		$i++;
-	}
+    if ($i==ADD_BLOCK) {
+        echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
+            Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
+        break;
+    } else {
+        echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
+            Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
+        $i++;
+    }
 }
 echo '</div>';
 
 // error messages
 if (isset($error) && intval($error) == 1) {
-	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
+    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
 }
 
 // default header title form
 $description_type = intval($description_type);
 $header = $default_description_titles[$description_type];
 if ($description_type >= ADD_BLOCK) {
-	$header = $default_description_titles[ADD_BLOCK];
+    $header = $default_description_titles[ADD_BLOCK];
 }
 
 // display form
 $form = new FormValidator(
-	'course_description',
-	'POST',
-	'index.php?action=edit&id='.$original_id.'&description_type='.$description_type.'&'.api_get_cidreq()
+    'course_description',
+    'POST',
+    'index.php?action=edit&id='.$original_id.'&description_type='.$description_type.'&'.api_get_cidreq()
 );
 
 $form->addElement('header', $header);
@@ -80,15 +80,15 @@ 
 $form->addText('title', get_lang('Title'), true, array('size' => '50'));
 $form->applyFilter('title', 'html_filter');
 $form->addHtmlEditor(
-	'contentDescription',
-	get_lang('Content'),
-	true,
-	false,
-	array(
-		'ToolbarSet' => 'TrainingDescription',
-		'Width' => '100%',
-		'Height' => '200',
-	)
+    'contentDescription',
+    get_lang('Content'),
+    true,
+    false,
+    array(
+        'ToolbarSet' => 'TrainingDescription',
+        'Width' => '100%',
+        'Height' => '200',
+    )
 );
 $form->addButtonCreate(get_lang('Save'));
 
@@ -104,8 +104,8 @@ 
 $form->setDefaults($default);
 
 if (isset ($question[$description_type])) {
-	$message = '<strong>'.get_lang('QuestionPlan').'</strong><br />';
-	$message .= $question[$description_type];
-	Display::display_normal_message($message, false);
+    $message = '<strong>'.get_lang('QuestionPlan').'</strong><br />';
+    $message .= $question[$description_type];
+    Display::display_normal_message($message, false);
 }
 $form->display();

main/inc/lib/app_view.php

Spacing +4 added lines, -4 removed lines

@@ -16,7 +16,7 @@ 
      * @param string  tool name (optional)
      * @param string $template_path
      */
-    public function __construct($toolname = '', $template_path=null)
+    public function __construct($toolname = '', $template_path = null)
     {
         if (!empty($toolname)) {
             if (isset($template_path)) {
@@ -27,7 +27,7 @@ 
             if (is_dir($path)) {
                 $this->tool_path = $path;
             } else {
-                throw new Exception('View::__construct() $path directory does not exist ' . $path);
+                throw new Exception('View::__construct() $path directory does not exist '.$path);
             }
         }
     }
@@ -39,7 +39,7 @@ 
     public function set_data($data)
     {
         if (!is_array($data)) {
-            throw new Exception('View::set_data() $data must to be an array, you have sent a' . gettype( $data ));
+            throw new Exception('View::set_data() $data must to be an array, you have sent a'.gettype($data));
         }
         $this->data = $data;
     }
@@ -49,7 +49,7 @@ 
      * @param string layout view
      * @param string $layout
      */
-    public function set_layout( $layout )
+    public function set_layout($layout)
     {
         $this->layout = $layout;
     }

main/inc/lib/add_many_session_to_category_functions.lib.php

Indentation +21 added lines, -21 removed lines

@@ -25,29 +25,29 @@
     function search_courses($needle,$type)
     {
         $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
-		$xajax_response = new xajaxResponse();
-		$return = '';
-		if(!empty($needle) && !empty($type)) {
-			// xajax send utf8 datas... datas in db can be non-utf8 datas
-			$charset = api_get_system_encoding();
-			$needle = api_convert_encoding($needle, $charset, 'utf-8');
-			$needle = Database::escape_string($needle);
+        $xajax_response = new xajaxResponse();
+        $return = '';
+        if(!empty($needle) && !empty($type)) {
+            // xajax send utf8 datas... datas in db can be non-utf8 datas
+            $charset = api_get_system_encoding();
+            $needle = api_convert_encoding($needle, $charset, 'utf-8');
+            $needle = Database::escape_string($needle);
 
-			$sql = 'SELECT * FROM '.$tbl_session.' WHERE name LIKE "'.$needle.'%" ORDER BY id';
+            $sql = 'SELECT * FROM '.$tbl_session.' WHERE name LIKE "'.$needle.'%" ORDER BY id';
 
-			$rs = Database::query($sql);
-			$course_list = array();
+            $rs = Database::query($sql);
+            $course_list = array();
 
-			$return .= '<select id="origin" name="NoSessionCategoryList[]" multiple="multiple" size="20" style="width:340px;">';
-			while($course = Database :: fetch_array($rs)) {
-				$course_list[] = $course['id'];
-				$return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'],ENT_QUOTES).'">'.$course['name'].'</option>';
-			}
-			$return .= '</select>';
-			$xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
-		}
-		$_SESSION['course_list'] = $course_list;
+            $return .= '<select id="origin" name="NoSessionCategoryList[]" multiple="multiple" size="20" style="width:340px;">';
+            while($course = Database :: fetch_array($rs)) {
+                $course_list[] = $course['id'];
+                $return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'],ENT_QUOTES).'">'.$course['name'].'</option>';
+            }
+            $return .= '</select>';
+            $xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
+        }
+        $_SESSION['course_list'] = $course_list;
         
-		return $xajax_response;
-	}
+        return $xajax_response;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -22,12 +22,12 @@ 
      * @assert () !== ''
      * @assert ('abc','single') !== ''
      */
-    function search_courses($needle,$type)
+    function search_courses($needle, $type)
     {
         $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
 		$xajax_response = new xajaxResponse();
 		$return = '';
-		if(!empty($needle) && !empty($type)) {
+		if (!empty($needle) && !empty($type)) {
 			// xajax send utf8 datas... datas in db can be non-utf8 datas
 			$charset = api_get_system_encoding();
 			$needle = api_convert_encoding($needle, $charset, 'utf-8');
@@ -39,12 +39,12 @@ 
 			$course_list = array();
 
 			$return .= '<select id="origin" name="NoSessionCategoryList[]" multiple="multiple" size="20" style="width:340px;">';
-			while($course = Database :: fetch_array($rs)) {
+			while ($course = Database :: fetch_array($rs)) {
 				$course_list[] = $course['id'];
-				$return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'],ENT_QUOTES).'">'.$course['name'].'</option>';
+				$return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'], ENT_QUOTES).'">'.$course['name'].'</option>';
 			}
 			$return .= '</select>';
-			$xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
+			$xajax_response -> addAssign('ajax_list_courses_multiple', 'innerHTML', api_utf8_encode($return));
 		}
 		$_SESSION['course_list'] = $course_list;
         

main/wiki/wiki.inc.php

Doc Comments +12 added lines, -4 removed lines

@@ -258,7 +258,7 @@ 
      * This function saves a change in a wiki page
      * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
      * @param array $values
-     * @return language string saying that the changes are stored
+     * @return string string saying that the changes are stored
      **/
     public function save_wiki($values)
     {
@@ -1196,6 +1196,7 @@ 
      * Checks if this navigation tab has to be set to active
      * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
      *
+     * @param string $paramwk
      * @return string html code
      */
     public function is_active_navigation_tab($paramwk)
@@ -1711,6 +1712,7 @@ 
 
     /**
      * Sends pending e-mails
+     * @param string $type
      */
     public function check_emailcue($id_or_ref, $type, $lastime='', $lastuser='')
     {
@@ -2011,6 +2013,7 @@ 
 
     /**
      * Exports the wiki page to PDF
+     * @param string $course_code
      */
     public function export_to_pdf($id, $course_code)
     {
@@ -2478,6 +2481,7 @@ 
     /**
      * Draws an HTML form select with the given options
      *
+     * @param string $name
      */
     public function make_select($name,$values,$checked='')
     {
@@ -2514,7 +2518,7 @@ 
     /**
      * Get wiki information
      * @param   int|bool     wiki id
-     * @return  array   wiki data
+     * @return  string   wiki data
      */
     public function getWikiDataFromDb($id)
     {
@@ -2561,6 +2565,7 @@ 
      * Get wiki information
      * @param   string     wiki id
      * @param int $courseId
+     * @param string $title
      * @return  array   wiki data
      */
     public function getPageByTitle($title, $courseId = null)
@@ -2593,6 +2598,8 @@ 
      * @param int $courseId
      * @param string
      * @param string
+     * @param string $groupfilter
+     * @param string $condition_session
      * @return bool
      */
     public function deletePage($title, $courseId, $groupfilter = null, $condition_session = null)
@@ -3644,6 +3651,7 @@ 
 
     /**
      * Show all pages
+     * @param string $action
      */
     public function allPages($action)
     {
@@ -4200,7 +4208,7 @@ 
 
     /**
      * Restore page
-     * @return bool
+     * @return false|null
      */
     public function restorePage()
     {
@@ -4302,7 +4310,7 @@ 
     }
 
     /**
-     * @param int|bool $wikiId
+     * @param false|string $wikiId
      */
     public function setWikiData($wikiId)
     {

Spacing +614 added lines, -614 removed lines

@@ -99,12 +99,12 @@ 
      **/
     public function links_to($input)
     {
-        $input_array = preg_split("/(\[\[|\]\])/",$input,-1, PREG_SPLIT_DELIM_CAPTURE);
+        $input_array = preg_split("/(\[\[|\]\])/", $input, -1, PREG_SPLIT_DELIM_CAPTURE);
         $all_links = array();
 
         foreach ($input_array as $key=>$value) {
-            if (isset($input_array[$key-1]) && $input_array[$key-1] == '[[' &&
-                isset($input_array[$key+1]) && $input_array[$key+1] == ']]'
+            if (isset($input_array[$key - 1]) && $input_array[$key - 1] == '[[' &&
+                isset($input_array[$key + 1]) && $input_array[$key + 1] == ']]'
             ) {
                 if (api_strpos($value, "|") !== false) {
                     $full_link_array = explode("|", $value);
@@ -114,10 +114,10 @@ 
                     $link = trim($value);
                     $title = trim($value);
                 }
-                unset($input_array[$key-1]);
-                unset($input_array[$key+1]);
+                unset($input_array[$key - 1]);
+                unset($input_array[$key + 1]);
                 //replace blank spaces by _ within the links. But to remove links at the end add a blank space
-                $all_links[]= Database::escape_string(str_replace(' ','_',$link)).' ';
+                $all_links[] = Database::escape_string(str_replace(' ', '_', $link)).' ';
             }
         }
         $output = implode($all_links);
@@ -170,7 +170,7 @@ 
      **/
     public function detect_ftp_link($input)
     {
-        $ftplink='href="ftp';
+        $ftplink = 'href="ftp';
         $ftplinkStyle = 'class="wiki_ftp_link" href="ftp';
         $output = str_replace($ftplink, $ftplinkStyle, $input);
 
@@ -215,21 +215,21 @@ 
     {
         $groupId = api_get_group_id();
         //now doubles brackets
-        $input_array = preg_split("/(\[\[|\]\])/",$input,-1, PREG_SPLIT_DELIM_CAPTURE);
+        $input_array = preg_split("/(\[\[|\]\])/", $input, -1, PREG_SPLIT_DELIM_CAPTURE);
 
         foreach ($input_array as $key => $value) {
             //now doubles brackets
-            if (isset($input_array[$key-1]) && $input_array[$key-1] == '[[' AND
-                $input_array[$key+1] == ']]'
+            if (isset($input_array[$key - 1]) && $input_array[$key - 1] == '[[' AND
+                $input_array[$key + 1] == ']]'
             ) {
                 // now full wikilink
-                if (api_strpos($value, "|") !== false){
-                    $full_link_array=explode("|", $value);
-                    $link=trim(strip_tags($full_link_array[0]));
-                    $title=trim($full_link_array[1]);
+                if (api_strpos($value, "|") !== false) {
+                    $full_link_array = explode("|", $value);
+                    $link = trim(strip_tags($full_link_array[0]));
+                    $title = trim($full_link_array[1]);
                 } else {
-                    $link=trim(strip_tags($value));
-                    $title=trim($value);
+                    $link = trim(strip_tags($value));
+                    $title = trim($value);
                 }
 
                 //if wikilink is homepage
@@ -241,14 +241,14 @@ 
                 }
 
                 // note: checkreflink checks if the link is still free. If it is not used then it returns true, if it is used, then it returns false. Now the title may be different
-                if (self::checktitle(strtolower(str_replace(' ','_',$link)))) {
+                if (self::checktitle(strtolower(str_replace(' ', '_', $link)))) {
                     $link = api_html_entity_decode($link);
-                    $input_array[$key]='<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?'.api_get_cidreq().'&action=addnew&amp;title='.Security::remove_XSS($link).'&group_id='.$groupId.'" class="new_wiki_link">'.$title.'</a>';
+                    $input_array[$key] = '<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?'.api_get_cidreq().'&action=addnew&amp;title='.Security::remove_XSS($link).'&group_id='.$groupId.'" class="new_wiki_link">'.$title.'</a>';
                 } else {
-                    $input_array[$key]='<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?'.api_get_cidreq().'&action=showpage&amp;title='.urlencode(strtolower(str_replace(' ','_',$link))).'&group_id='.$groupId.'" class="wiki_link">'.$title.'</a>';
+                    $input_array[$key] = '<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?'.api_get_cidreq().'&action=showpage&amp;title='.urlencode(strtolower(str_replace(' ', '_', $link))).'&group_id='.$groupId.'" class="wiki_link">'.$title.'</a>';
                 }
-                unset($input_array[$key-1]);
-                unset($input_array[$key+1]);
+                unset($input_array[$key - 1]);
+                unset($input_array[$key + 1]);
             }
         }
         $output = implode('', $input_array);
@@ -294,11 +294,11 @@ 
         // are not made here, but through the interce buttons
 
         // cleaning the variables
-        if (api_get_setting('htmlpurifier_wiki') == 'true'){
+        if (api_get_setting('htmlpurifier_wiki') == 'true') {
             //$purifier = new HTMLPurifier();
             $values['content'] = Security::remove_XSS($values['content']);
         }
-        $version = intval($values['version']) + 1 ;
+        $version = intval($values['version']) + 1;
         $linkTo = self::links_to($values['content']); //and check links content
 
         //cleaning config variables
@@ -321,7 +321,7 @@ 
             $_clean['startdate_assig'] = null;
         }
 
-        if (isset($values['initenddate']) && $values['initenddate']==1) {
+        if (isset($values['initenddate']) && $values['initenddate'] == 1) {
             $_clean['enddate_assig'] = $values['enddate_assig'];
         } else {
             $_clean['enddate_assig'] = null;
@@ -332,7 +332,7 @@ 
         }
 
         if (!empty($values['max_text']) || !empty($values['max_version'])) {
-            $_clean['max_text']	= $values['max_text'];
+            $_clean['max_text'] = $values['max_text'];
             $_clean['max_version'] = $values['max_version'];
         }
 
@@ -383,7 +383,7 @@ 
                 $groupId
             );
 
-            if ($values['page_id']== 0) {
+            if ($values['page_id'] == 0) {
                 $sql = 'UPDATE '.$tbl_wiki.' SET page_id="'.$id.'"
                         WHERE c_id = '.$course_id.' AND iid ="'.$id.'"';
                 Database::query($sql);
@@ -467,7 +467,7 @@ 
         $_course = $this->courseInfo;
         $r_user_id = api_get_user_id();
         $r_dtime = api_get_utc_datetime();
-        $r_version = $r_version+1;
+        $r_version = $r_version + 1;
         $r_comment = get_lang('RestoredFromVersion').': '.$c_version;
         $session_id = api_get_session_id();
         $course_id = api_get_course_int_id();
@@ -572,9 +572,9 @@ 
         // Unlike ordinary pages of pages of assignments.
         // Allow create a ordinary page although there is a assignment with the same name
         if ($_clean['assignment'] == 2 || $_clean['assignment'] == 1) {
-            $page = str_replace(' ','_',$values['title']."_uass".$assig_user_id);
+            $page = str_replace(' ', '_', $values['title']."_uass".$assig_user_id);
         } else {
-            $page = str_replace(' ','_',$values['title']);
+            $page = str_replace(' ', '_', $values['title']);
         }
         $_clean['reflink'] = $page;
         $_clean['title']   = trim($values['title']);
@@ -728,7 +728,7 @@ 
      */
     public function setForm($form, $row = array())
     {
-        $toolBar = api_is_allowed_to_edit(null,true)
+        $toolBar = api_is_allowed_to_edit(null, true)
             ? array('ToolbarSet' => 'Wiki', 'Width' => '100%', 'Height' => '400')
             : array('ToolbarSet' => 'WikiStudent', 'Width' => '100%', 'Height' => '400', 'UserStatus' => 'student');
 
@@ -739,7 +739,7 @@ 
 
         $form->addElement('select', 'progress', get_lang('Progress'), $progress);
 
-        if ((api_is_allowed_to_edit(false,true) ||
+        if ((api_is_allowed_to_edit(false, true) ||
             api_is_platform_admin()) &&
             isset($row['reflink']) && $row['reflink'] != 'index'
         ) {
@@ -879,13 +879,13 @@ 
         if ($newtitle) {
             $pageMIX = $newtitle; //display the page after it is created
         } else {
-            $pageMIX = $page;//display current page
+            $pageMIX = $page; //display current page
         }
 
         $filter = null;
         if (isset($_GET['view']) && $_GET['view']) {
             $_clean['view'] = Database::escape_string($_GET['view']);
-            $filter =' AND w.id="'.$_clean['view'].'"';
+            $filter = ' AND w.id="'.$_clean['view'].'"';
         }
 
         // First, check page visibility in the first page version
@@ -929,7 +929,7 @@ 
         $groupInfo = GroupManager::get_group_properties(api_get_group_id());
 
         // if both are empty and we are displaying the index page then we display the default text.
-        if ($row['content']=='' && $row['title']=='' && $page=='index') {
+        if ($row['content'] == '' && $row['title'] == '' && $page == 'index') {
 
             if (api_is_allowed_to_edit(false, true) ||
                 api_is_platform_admin() ||
@@ -937,8 +937,8 @@ 
                 api_is_allowed_in_course()
             ) {
                 //Table structure for better export to pdf
-                $default_table_for_content_Start='<table align="center" border="0"><tr><td align="center">';
-                $default_table_for_content_End='</td></tr></table>';
+                $default_table_for_content_Start = '<table align="center" border="0"><tr><td align="center">';
+                $default_table_for_content_End = '</td></tr></table>';
                 $content = $default_table_for_content_Start.
                     sprintf(get_lang('DefaultContent'), api_get_path(WEB_IMG_PATH)).
                     $default_table_for_content_End;
@@ -953,23 +953,23 @@ 
 
         //assignment mode: identify page type
         $icon_assignment = null;
-        if ($row['assignment']==1) {
-            $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',ICON_SIZE_SMALL);
-        } elseif($row['assignment']==2) {
-            $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
+        if ($row['assignment'] == 1) {
+            $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL);
+        } elseif ($row['assignment'] == 2) {
+            $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
         }
 
         //task mode
         $icon_task = null;
         if (!empty($row['task'])) {
-            $icon_task=Display::return_icon('wiki_task.png', get_lang('StandardTask'),'',ICON_SIZE_SMALL);
+            $icon_task = Display::return_icon('wiki_task.png', get_lang('StandardTask'), '', ICON_SIZE_SMALL);
         }
 
         // Show page. Show page to all users if isn't hide page. Mode assignments: if student is the author, can view
         if ($KeyVisibility == "1" ||
             api_is_allowed_to_edit(false, true) ||
             api_is_platform_admin() ||
-            ($row['assignment'] == 2 && $KeyVisibility=="0" && (api_get_user_id() == $row['user_id'])) ||
+            ($row['assignment'] == 2 && $KeyVisibility == "0" && (api_get_user_id() == $row['user_id'])) ||
             api_is_allowed_in_course()
         ) {
             $actionsLeft = '';
@@ -995,13 +995,13 @@ 
             $protect_page = null;
             $lock_unlock_protect = null;
             // page action: protecting (locking) the page
-            if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
-                if (self::check_protect_page()==1) {
+            if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+                if (self::check_protect_page() == 1) {
                     $protect_page = Display::return_icon('lock.png', get_lang('PageLockedExtra'), '', ICON_SIZE_MEDIUM);
-                    $lock_unlock_protect='unlock';
+                    $lock_unlock_protect = 'unlock';
                 } else {
                     $protect_page = Display::return_icon('unlock.png', get_lang('PageUnlockedExtra'), '', ICON_SIZE_MEDIUM);
-                    $lock_unlock_protect='lock';
+                    $lock_unlock_protect = 'lock';
                 }
             }
 
@@ -1013,13 +1013,13 @@ 
             $visibility_page = null;
             $lock_unlock_visibility = null;
             //page action: visibility
-            if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+            if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                 if (self::check_visibility_page() == 1) {
-                    $visibility_page = Display::return_icon('visible.png', get_lang('ShowPageExtra'),'', ICON_SIZE_MEDIUM);
+                    $visibility_page = Display::return_icon('visible.png', get_lang('ShowPageExtra'), '', ICON_SIZE_MEDIUM);
                     $lock_unlock_visibility = 'invisible';
 
                 } else {
-                    $visibility_page = Display::return_icon('invisible.png', get_lang('HidePageExtra'),'', ICON_SIZE_MEDIUM);
+                    $visibility_page = Display::return_icon('invisible.png', get_lang('HidePageExtra'), '', ICON_SIZE_MEDIUM);
                     $lock_unlock_visibility = 'visible';
                 }
             }
@@ -1031,11 +1031,11 @@ 
 
             //page action: notification
             if (api_is_allowed_to_session_edit()) {
-                if (self::check_notify_page($page)==1) {
-                    $notify_page = Display::return_icon('messagebox_info.png', get_lang('NotifyByEmail'),'',ICON_SIZE_MEDIUM);
+                if (self::check_notify_page($page) == 1) {
+                    $notify_page = Display::return_icon('messagebox_info.png', get_lang('NotifyByEmail'), '', ICON_SIZE_MEDIUM);
                     $lock_unlock_notify_page = 'unlocknotify';
                 } else {
-                    $notify_page = Display::return_icon('mail.png', get_lang('CancelNotifyByEmail'),'',ICON_SIZE_MEDIUM);
+                    $notify_page = Display::return_icon('mail.png', get_lang('CancelNotifyByEmail'), '', ICON_SIZE_MEDIUM);
                     $lock_unlock_notify_page = 'locknotify';
                 }
             }
@@ -1047,33 +1047,33 @@ 
                 ) {
                     // menu discuss page
                     $actionsRight .= '<a href="index.php?'.api_get_cidreq().'&action=discuss&title='.api_htmlentities(urlencode($page)).'" '.self::is_active_navigation_tab('discuss').'>'.
-                        Display::return_icon('discuss.png',get_lang('DiscussThisPage'),'',ICON_SIZE_MEDIUM).'</a>';
+                        Display::return_icon('discuss.png', get_lang('DiscussThisPage'), '', ICON_SIZE_MEDIUM).'</a>';
                 }
 
                 //menu history
                 $actionsRight .= '<a href="index.php?'.api_get_cidreq().'&action=history&title='.api_htmlentities(urlencode($page)).'" '.self::is_active_navigation_tab('history').'>'.
-                    Display::return_icon('history.png',get_lang('ShowPageHistory'),'',ICON_SIZE_MEDIUM).'</a>';
+                    Display::return_icon('history.png', get_lang('ShowPageHistory'), '', ICON_SIZE_MEDIUM).'</a>';
                 //menu linkspages
                 $actionsRight .= '<a href="index.php?'.api_get_cidreq().'action=links&title='.api_htmlentities(urlencode($page)).'" '.self::is_active_navigation_tab('links').'>'.
-                    Display::return_icon('what_link_here.png',get_lang('LinksPages'),'',ICON_SIZE_MEDIUM).'</a>';
+                    Display::return_icon('what_link_here.png', get_lang('LinksPages'), '', ICON_SIZE_MEDIUM).'</a>';
 
                 //menu delete wikipage
-                if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                     $actionsRight .= '<a href="index.php?action=delete&'.api_get_cidreq().'&title='.api_htmlentities(urlencode($page)).'"'.self::is_active_navigation_tab('delete').'>'.
-                        Display::return_icon('delete.png',get_lang('DeleteThisPage'),'',ICON_SIZE_MEDIUM).'</a>';
+                        Display::return_icon('delete.png', get_lang('DeleteThisPage'), '', ICON_SIZE_MEDIUM).'</a>';
                 }
 
                 $actionsRight .= '<a href="index.php?'.api_get_cidreq().'&action=showpage&actionpage='.$lock_unlock_notify_page.'&title='.api_htmlentities(urlencode($page)).'">'.
                     $notify_page.'</a>';
 
                 // Page action: copy last version to doc area
-                if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                     $actionsRight .= '<a href="index.php?'.api_get_cidreq().'&action=export2doc&wiki_id='.$row['id'].'">'.
                         Display::return_icon('export_to_documents.png', get_lang('ExportToDocArea'), '', ICON_SIZE_MEDIUM).'</a>';
                 }
 
                 $actionsRight .= '<a href="index.php?'.api_get_cidreq().'&action=export_to_pdf&wiki_id='.$row['id'].'">'.
-                    Display::return_icon('pdf.png',get_lang('ExportToPDF'),'',ICON_SIZE_MEDIUM).'</a>';
+                    Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
 
                 $unoconv = api_get_configuration_value('unoconv.binaries');
                 if ($unoconv) {
@@ -1126,7 +1126,7 @@ 
                     )
                 );
 
-            $footerWiki = '<div id="wikifooter">'.get_lang('Progress').': '.($row['progress']*10).'%&nbsp;&nbsp;&nbsp;'.get_lang('Rating').': '.$row['score'].'&nbsp;&nbsp;&nbsp;'.get_lang('Words').': '.self::word_count($content).'</div>';
+            $footerWiki = '<div id="wikifooter">'.get_lang('Progress').': '.($row['progress'] * 10).'%&nbsp;&nbsp;&nbsp;'.get_lang('Rating').': '.$row['score'].'&nbsp;&nbsp;&nbsp;'.get_lang('Words').': '.self::word_count($content).'</div>';
 
             echo Display::panel($pageWiki, $pageTitle, $footerWiki);
         } //end filter visibility
@@ -1150,7 +1150,7 @@ 
 
         # strip all html tags
         $wc = strip_tags($document);
-        $wc = html_entity_decode($wc, ENT_NOQUOTES, 'UTF-8');// TODO:test also old html_entity_decode(utf8_encode($wc))
+        $wc = html_entity_decode($wc, ENT_NOQUOTES, 'UTF-8'); // TODO:test also old html_entity_decode(utf8_encode($wc))
 
         # remove 'words' that don't consist of alphanumerical characters or punctuation. And fix accents and some letters
         $pattern = "#[^(\w|\d|\'|\"|\.|\!|\?|;|,|\\|\/|\-|:|\&|@|á|é|í|ó|ú|à|è|ì|ò|ù|ä|ë|ï|ö|ü|Á|É|Í|Ó|Ú|À|È|Ò|Ù|Ä|Ë|Ï|Ö|Ü|â|ê|î|ô|û|Â|Ê|Î|Ô|Û|ñ|Ñ|ç|Ç)]+#";
@@ -1183,15 +1183,15 @@ 
 
         $course_id = api_get_course_int_id();
 
-        $sql='SELECT id FROM '.$tbl_wiki.'
+        $sql = 'SELECT id FROM '.$tbl_wiki.'
               WHERE
                 c_id = '.$course_id.' AND
                 title="'.Database::escape_string($title).'" AND
                 '.$groupfilter.$condition_session.'
               ORDER BY id ASC';
-        $result=Database::query($sql);
-        $cant=Database::num_rows($result);
-        if ($cant>0) {
+        $result = Database::query($sql);
+        $cant = Database::num_rows($result);
+        if ($cant > 0) {
             return true;
         } else {
             return false;
@@ -1273,20 +1273,20 @@ 
         $page = $this->page;
 
         $course_id = api_get_course_int_id();
-        $sql='SELECT * FROM '.$tbl_wiki.'
+        $sql = 'SELECT * FROM '.$tbl_wiki.'
               WHERE
                 c_id = '.$course_id.' AND
                 reflink="'.Database::escape_string($page).'" AND
                 '.$groupfilter.$condition_session.'
               ORDER BY id ASC';
 
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
         $status_editlock = $row['editlock'];
         $id = $row['page_id'];
 
         ///change status
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
             if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'lock' && $status_editlock == 0) {
                 $status_editlock = 1;
             }
@@ -1298,13 +1298,13 @@ 
                     WHERE c_id = '.$course_id.' AND page_id="'.$id.'"';
             Database::query($sql);
 
-            $sql='SELECT * FROM '.$tbl_wiki.'
+            $sql = 'SELECT * FROM '.$tbl_wiki.'
                   WHERE
                     c_id = '.$course_id.' AND
                     reflink="'.Database::escape_string($page).'" AND
                     '.$groupfilter.$condition_session.'
                   ORDER BY id ASC';
-            $result=Database::query($sql);
+            $result = Database::query($sql);
             $row = Database::fetch_array($result);
         }
 
@@ -1335,13 +1335,13 @@ 
         $row = Database::fetch_array($result);
         $status_visibility = $row['visibility'];
         //change status
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
-            if (isset($_GET['actionpage']) && $_GET['actionpage']=='visible' && $status_visibility==0) {
-                $status_visibility=1;
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'visible' && $status_visibility == 0) {
+                $status_visibility = 1;
 
             }
-            if (isset($_GET['actionpage']) && $_GET['actionpage']=='invisible' && $status_visibility==1) {
-                $status_visibility=0;
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'invisible' && $status_visibility == 1) {
+                $status_visibility = 0;
             }
 
             $sql = 'UPDATE '.$tbl_wiki.' SET visibility="'.Database::escape_string($status_visibility).'"
@@ -1358,12 +1358,12 @@ 
                         reflink="'.Database::escape_string($page).'" AND
                         '.$groupfilter.$condition_session.'
                     ORDER BY id ASC';
-            $result=Database::query($sql);
+            $result = Database::query($sql);
             $row = Database::fetch_array($result);
         }
 
         if (empty($row['id'])) {
-            $row['visibility']= 1;
+            $row['visibility'] = 1;
         }
 
         //show status
@@ -1390,18 +1390,18 @@ 
                     reflink="'.Database::escape_string($page).'" AND
                     '.$groupfilter.$condition_session.'
                 ORDER BY id ASC';
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
 
         $status_visibility_disc = $row['visibility_disc'];
 
         //change status
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
-            if (isset($_GET['actionpage']) && $_GET['actionpage'] =='showdisc' && $status_visibility_disc==0) {
-                $status_visibility_disc=1;
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'showdisc' && $status_visibility_disc == 0) {
+                $status_visibility_disc = 1;
             }
-            if (isset($_GET['actionpage']) && $_GET['actionpage'] =='hidedisc' && $status_visibility_disc==1) {
-                $status_visibility_disc=0;
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'hidedisc' && $status_visibility_disc == 1) {
+                $status_visibility_disc = 0;
             }
 
             $sql = 'UPDATE '.$tbl_wiki.' SET visibility_disc="'.Database::escape_string($status_visibility_disc).'"
@@ -1449,14 +1449,14 @@ 
         $result = Database::query($sql);
         $row = Database::fetch_array($result);
 
-        $status_addlock_disc=$row['addlock_disc'];
+        $status_addlock_disc = $row['addlock_disc'];
 
         //change status
         if (api_is_allowed_to_edit() || api_is_platform_admin()) {
-            if (isset($_GET['actionpage']) && $_GET['actionpage'] =='lockdisc' && $status_addlock_disc==0) {
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'lockdisc' && $status_addlock_disc == 0) {
                 $status_addlock_disc = 1;
             }
-            if (isset($_GET['actionpage']) && $_GET['actionpage'] =='unlockdisc' && $status_addlock_disc==1) {
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'unlockdisc' && $status_addlock_disc == 1) {
                 $status_addlock_disc = 0;
             }
 
@@ -1478,8 +1478,8 @@ 
                         reflink="'.Database::escape_string($page).'" AND
                         '.$groupfilter.$condition_session.'
                     ORDER BY id ASC';
-            $result=Database::query($sql);
-            $row=Database::fetch_array($result);
+            $result = Database::query($sql);
+            $row = Database::fetch_array($result);
         }
 
         return $row['addlock_disc'];
@@ -1504,17 +1504,17 @@ 
                     reflink="'.Database::escape_string($page).'" AND
                     '.$groupfilter.$condition_session.'
                 ORDER BY id ASC';
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
-        $status_ratinglock_disc=$row['ratinglock_disc'];
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
+        $status_ratinglock_disc = $row['ratinglock_disc'];
 
         //change status
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
-            if (isset($_GET['actionpage']) && $_GET['actionpage'] =='lockrating' && $status_ratinglock_disc==0) {
-                $status_ratinglock_disc=1;
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'lockrating' && $status_ratinglock_disc == 0) {
+                $status_ratinglock_disc = 1;
             }
-            if (isset($_GET['actionpage']) && $_GET['actionpage'] =='unlockrating' && $status_ratinglock_disc==1) {
-                $status_ratinglock_disc=0;
+            if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'unlockrating' && $status_ratinglock_disc == 1) {
+                $status_ratinglock_disc = 0;
             }
 
             $sql = 'UPDATE '.$tbl_wiki.'
@@ -1530,14 +1530,14 @@ 
             // these three lines remain necessary. They do that by changing the
             // page state is made when you press the button and not have to wait
             // to change his page
-            $sql='SELECT * FROM '.$tbl_wiki.'
+            $sql = 'SELECT * FROM '.$tbl_wiki.'
                   WHERE
                     c_id = '.$course_id.' AND
                     reflink="'.Database::escape_string($page).'" AND
                     '.$groupfilter.$condition_session.'
                   ORDER BY id ASC';
-            $result=Database::query($sql);
-            $row=Database::fetch_array($result);
+            $result = Database::query($sql);
+            $row = Database::fetch_array($result);
         }
 
         return $row['ratinglock_disc'];
@@ -1562,24 +1562,24 @@ 
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE c_id = '.$course_id.' AND reflink="'.$reflink.'" AND '.$groupfilter.$condition_session.'
                 ORDER BY id ASC';
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
         $id = $row['id'];
-        $sql='SELECT * FROM '.$tbl_wiki_mailcue.'
+        $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
               WHERE c_id = '.$course_id.' AND id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="P"';
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
 
         $idm = $row['id'];
 
         if (empty($idm)) {
-            $status_notify=0;
+            $status_notify = 0;
         } else {
-            $status_notify=1;
+            $status_notify = 1;
         }
 
         // Change status
-        if (isset($_GET['actionpage']) && $_GET['actionpage'] =='locknotify' && $status_notify==0) {
+        if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'locknotify' && $status_notify == 0) {
             $sql = "SELECT id FROM $tbl_wiki_mailcue
                     WHERE c_id = $course_id AND id = $id AND user_id = $userId";
             $result = Database::query($sql);
@@ -1588,18 +1588,18 @@ 
                 $exist = true;
             }
             if ($exist == false) {
-                $sql="INSERT INTO ".$tbl_wiki_mailcue." (c_id, id, user_id, type, group_id, session_id) VALUES
+                $sql = "INSERT INTO ".$tbl_wiki_mailcue." (c_id, id, user_id, type, group_id, session_id) VALUES
                 ($course_id, '".$id."','".api_get_user_id()."','P','".$groupId."','".$session_id."')";
                 Database::query($sql);
             }
-            $status_notify=1;
+            $status_notify = 1;
         }
 
-        if (isset($_GET['actionpage']) && $_GET['actionpage'] =='unlocknotify' && $status_notify==1) {
+        if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'unlocknotify' && $status_notify == 1) {
             $sql = 'DELETE FROM '.$tbl_wiki_mailcue.'
                     WHERE id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="P" AND c_id = '.$course_id;
             Database::query($sql);
-            $status_notify=0;
+            $status_notify = 0;
         }
 
         return $status_notify;
@@ -1625,9 +1625,9 @@ 
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE c_id = '.$course_id.' AND reflink="'.$reflink.'" AND '.$groupfilter.$condition_session.'
                 ORDER BY id ASC';
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
-        $id=$row['id'];
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
+        $id = $row['id'];
         $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
                 WHERE c_id = '.$course_id.' AND id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="D"';
         $result = Database::query($sql);
@@ -1635,23 +1635,23 @@ 
         $idm = $row['id'];
 
         if (empty($idm)) {
-            $status_notify_disc=0;
+            $status_notify_disc = 0;
         } else {
-            $status_notify_disc=1;
+            $status_notify_disc = 1;
         }
 
         //change status
-        if (isset($_GET['actionpage']) && $_GET['actionpage'] =='locknotifydisc' && $status_notify_disc==0) {
-            $sql="INSERT INTO ".$tbl_wiki_mailcue." (c_id, id, user_id, type, group_id, session_id) VALUES
+        if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'locknotifydisc' && $status_notify_disc == 0) {
+            $sql = "INSERT INTO ".$tbl_wiki_mailcue." (c_id, id, user_id, type, group_id, session_id) VALUES
             ($course_id, '".$id."','".api_get_user_id()."','D','".$groupId."','".$session_id."')";
             Database::query($sql);
-            $status_notify_disc=1;
+            $status_notify_disc = 1;
         }
-        if (isset($_GET['actionpage']) && $_GET['actionpage'] =='unlocknotifydisc' && $status_notify_disc==1) {
+        if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'unlocknotifydisc' && $status_notify_disc == 1) {
             $sql = 'DELETE FROM '.$tbl_wiki_mailcue.'
                     WHERE c_id = '.$course_id.' AND id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="D" AND c_id = '.$course_id;
             Database::query($sql);
-            $status_notify_disc=0;
+            $status_notify_disc = 0;
         }
 
         return $status_notify_disc;
@@ -1666,7 +1666,7 @@ 
         $tbl_wiki_mailcue = $this->tbl_wiki_mailcue;
         $course_id = api_get_course_int_id();
         $groupId = api_get_group_id();
-        $session_id=api_get_session_id();
+        $session_id = api_get_session_id();
 
         $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
                 WHERE
@@ -1675,31 +1675,31 @@ 
                     type="F" AND
                     group_id="'.$groupId.'" AND
                     session_id="'.$session_id.'"';
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
 
-        $idm=$row['user_id'];
+        $idm = $row['user_id'];
 
         if (empty($idm)) {
-            $status_notify_all=0;
+            $status_notify_all = 0;
         } else {
-            $status_notify_all=1;
+            $status_notify_all = 1;
         }
 
         //change status
-        if (isset($_GET['actionpage']) && $_GET['actionpage'] =='locknotifyall' && $status_notify_all==0) {
-            $sql="INSERT INTO ".$tbl_wiki_mailcue." (c_id, user_id, type, group_id, session_id) VALUES
+        if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'locknotifyall' && $status_notify_all == 0) {
+            $sql = "INSERT INTO ".$tbl_wiki_mailcue." (c_id, user_id, type, group_id, session_id) VALUES
             ($course_id, '".api_get_user_id()."','F','".$groupId."','".$session_id."')";
             Database::query($sql);
-            $status_notify_all=1;
+            $status_notify_all = 1;
         }
 
         if (isset($_GET['actionpage']) &&
             isset($_GET['actionpage']) &&
-            $_GET['actionpage']  =='unlocknotifyall' &&
+            $_GET['actionpage'] == 'unlocknotifyall' &&
             $status_notify_all == 1
         ) {
-            $sql ='DELETE FROM '.$tbl_wiki_mailcue.'
+            $sql = 'DELETE FROM '.$tbl_wiki_mailcue.'
                    WHERE
                     c_id = '.$course_id.' AND
                     user_id="'.api_get_user_id().'" AND
@@ -1708,7 +1708,7 @@ 
                     session_id="'.$session_id.'" AND
                     c_id = '.$course_id;
             Database::query($sql);
-            $status_notify_all=0;
+            $status_notify_all = 0;
         }
 
         //show status
@@ -1718,7 +1718,7 @@ 
     /**
      * Sends pending e-mails
      */
-    public function check_emailcue($id_or_ref, $type, $lastime='', $lastuser='')
+    public function check_emailcue($id_or_ref, $type, $lastime = '', $lastuser = '')
     {
         $tbl_wiki_mailcue = $this->tbl_wiki_mailcue;
         $tbl_wiki = $this->tbl_wiki;
@@ -1726,14 +1726,14 @@ 
         $groupfilter = $this->groupfilter;
         $_course = $this->courseInfo;
         $groupId = api_get_group_id();
-        $session_id=api_get_session_id();
+        $session_id = api_get_session_id();
         $course_id = api_get_course_int_id();
 
-        $group_properties  = GroupManager :: get_group_properties($groupId);
+        $group_properties = GroupManager :: get_group_properties($groupId);
         $group_name = $group_properties['name'];
         $allow_send_mail = false; //define the variable to below
         $email_assignment = null;
-        if ($type=='P') {
+        if ($type == 'P') {
             //if modifying a wiki page
             //first, current author and time
             //Who is the author?
@@ -1744,22 +1744,22 @@ 
             $year = substr($lastime, 0, 4);
             $month = substr($lastime, 5, 2);
             $day = substr($lastime, 8, 2);
-            $hours=substr($lastime, 11,2);
-            $minutes=substr($lastime, 14,2);
-            $seconds=substr($lastime, 17,2);
-            $email_date_changes=$day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds;
+            $hours = substr($lastime, 11, 2);
+            $minutes = substr($lastime, 14, 2);
+            $seconds = substr($lastime, 17, 2);
+            $email_date_changes = $day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds;
 
             //second, extract data from first reg
             $sql = 'SELECT * FROM '.$tbl_wiki.'
                     WHERE  c_id = '.$course_id.' AND reflink="'.$id_or_ref.'" AND '.$groupfilter.$condition_session.'
                     ORDER BY id ASC';
-            $result=Database::query($sql);
-            $row=Database::fetch_array($result);
+            $result = Database::query($sql);
+            $row = Database::fetch_array($result);
 
-            $id=$row['id'];
-            $email_page_name=$row['title'];
-            if ($row['visibility']==1) {
-                $allow_send_mail=true; //if visibility off - notify off
+            $id = $row['id'];
+            $email_page_name = $row['title'];
+            if ($row['visibility'] == 1) {
+                $allow_send_mail = true; //if visibility off - notify off
                 $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
                         WHERE
                             c_id = '.$course_id.' AND
@@ -1769,10 +1769,10 @@ 
                             group_id="'.$groupId.'" AND
                             session_id="'.$session_id.'"';
                 //type: P=page, D=discuss, F=full.
-                $result=Database::query($sql);
-                $emailtext=get_lang('EmailWikipageModified').' <strong>'.$email_page_name.'</strong> '.get_lang('Wiki');
+                $result = Database::query($sql);
+                $emailtext = get_lang('EmailWikipageModified').' <strong>'.$email_page_name.'</strong> '.get_lang('Wiki');
             }
-        } elseif ($type=='D') {
+        } elseif ($type == 'D') {
             //if added a post to discuss
 
             //first, current author and time
@@ -1784,25 +1784,25 @@ 
             $year = substr($lastime, 0, 4);
             $month = substr($lastime, 5, 2);
             $day = substr($lastime, 8, 2);
-            $hours=substr($lastime, 11,2);
-            $minutes=substr($lastime, 14,2);
-            $seconds=substr($lastime, 17,2);
-            $email_date_changes=$day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds;
+            $hours = substr($lastime, 11, 2);
+            $minutes = substr($lastime, 14, 2);
+            $seconds = substr($lastime, 17, 2);
+            $email_date_changes = $day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds;
 
             //second, extract data from first reg
 
-            $id=$id_or_ref; //$id_or_ref is id from tblwiki
+            $id = $id_or_ref; //$id_or_ref is id from tblwiki
 
             $sql = 'SELECT * FROM '.$tbl_wiki.'
                     WHERE c_id = '.$course_id.' AND id="'.$id.'"
                     ORDER BY id ASC';
 
-            $result=Database::query($sql);
-            $row=Database::fetch_array($result);
+            $result = Database::query($sql);
+            $row = Database::fetch_array($result);
 
-            $email_page_name=$row['title'];
-            if ($row['visibility_disc']==1) {
-                $allow_send_mail=true; //if visibility off - notify off
+            $email_page_name = $row['title'];
+            if ($row['visibility_disc'] == 1) {
+                $allow_send_mail = true; //if visibility off - notify off
                 $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
                         WHERE
                             c_id = '.$course_id.' AND
@@ -1813,22 +1813,22 @@ 
                             session_id="'.$session_id.'"';
                 //type: P=page, D=discuss, F=full
                 $result = Database::query($sql);
-                $emailtext=get_lang('EmailWikiPageDiscAdded').' <strong>'.$email_page_name.'</strong> '.get_lang('Wiki');
+                $emailtext = get_lang('EmailWikiPageDiscAdded').' <strong>'.$email_page_name.'</strong> '.get_lang('Wiki');
             }
-        } elseif($type=='A') {
+        } elseif ($type == 'A') {
             //for added pages
-            $id=0; //for tbl_wiki_mailcue
+            $id = 0; //for tbl_wiki_mailcue
             $sql = 'SELECT * FROM '.$tbl_wiki.'
                     WHERE c_id = '.$course_id.'
                     ORDER BY id DESC'; //the added is always the last
 
-            $result=Database::query($sql);
-            $row=Database::fetch_array($result);
-            $email_page_name=$row['title'];
+            $result = Database::query($sql);
+            $row = Database::fetch_array($result);
+            $email_page_name = $row['title'];
 
             //Who is the author?
             $userinfo = api_get_user_info($row['user_id']);
-            $email_user_author= get_lang('AddedBy').': '.$userinfo['complete_name'];
+            $email_user_author = get_lang('AddedBy').': '.$userinfo['complete_name'];
 
             //When ?
             $year = substr($row['dtime'], 0, 4);
@@ -1837,33 +1837,33 @@ 
             $hours = substr($row['dtime'], 11, 2);
             $minutes = substr($row['dtime'], 14, 2);
             $seconds = substr($row['dtime'], 17, 2);
-            $email_date_changes=$day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds;
-
-            if($row['assignment']==0) {
-                $allow_send_mail=true;
-            } elseif($row['assignment']==1) {
-                $email_assignment=get_lang('AssignmentDescExtra').' ('.get_lang('AssignmentMode').')';
-                $allow_send_mail=true;
-            } elseif($row['assignment']==2) {
-                $allow_send_mail=false; //Mode tasks: avoids notifications to all users about all users
+            $email_date_changes = $day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds;
+
+            if ($row['assignment'] == 0) {
+                $allow_send_mail = true;
+            } elseif ($row['assignment'] == 1) {
+                $email_assignment = get_lang('AssignmentDescExtra').' ('.get_lang('AssignmentMode').')';
+                $allow_send_mail = true;
+            } elseif ($row['assignment'] == 2) {
+                $allow_send_mail = false; //Mode tasks: avoids notifications to all users about all users
             }
 
             $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
                     WHERE c_id = '.$course_id.' AND  id="'.$id.'" AND type="F" AND group_id="'.$groupId.'" AND session_id="'.$session_id.'"';
             //type: P=page, D=discuss, F=full
-            $result=Database::query($sql);
+            $result = Database::query($sql);
 
-            $emailtext = get_lang('EmailWikiPageAdded').' <strong>'.$email_page_name.'</strong> '.get_lang('In').' '. get_lang('Wiki');
-        } elseif ($type=='E') {
-            $id=0;
-            $allow_send_mail=true;
+            $emailtext = get_lang('EmailWikiPageAdded').' <strong>'.$email_page_name.'</strong> '.get_lang('In').' '.get_lang('Wiki');
+        } elseif ($type == 'E') {
+            $id = 0;
+            $allow_send_mail = true;
 
             //Who is the author?
-            $userinfo = api_get_user_info(api_get_user_id());	//current user
+            $userinfo = api_get_user_info(api_get_user_id()); //current user
             $email_user_author = get_lang('DeletedBy').': '.$userinfo['complete_name'];
             //When ?
-            $today = date('r');		//current time
-            $email_date_changes=$today;
+            $today = date('r'); //current time
+            $email_date_changes = $today;
 
             $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
                     WHERE
@@ -1877,16 +1877,16 @@ 
         ///make and send email
         if ($allow_send_mail) {
             while ($row = Database::fetch_array($result)) {
-                $userinfo = api_get_user_info($row['user_id']);	//$row['user_id'] obtained from tbl_wiki_mailcue
+                $userinfo = api_get_user_info($row['user_id']); //$row['user_id'] obtained from tbl_wiki_mailcue
                 $name_to = $userinfo['complete_name'];
                 $email_to = $userinfo['email'];
                 $sender_name = api_get_setting('emailAdministrator');
                 $sender_email = api_get_setting('emailAdministrator');
                 $email_subject = get_lang('EmailWikiChanges').' - '.$_course['official_code'];
                 $email_body = get_lang('DearUser').' '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).',<br /><br />';
-                if($session_id==0){
+                if ($session_id == 0) {
                     $email_body .= $emailtext.' <strong>'.$_course['name'].' - '.$group_name.'</strong><br /><br /><br />';
-                }else{
+                } else {
                     $email_body .= $emailtext.' <strong>'.$_course['name'].' ('.api_get_session_name(api_get_session_id()).') - '.$group_name.'</strong><br /><br /><br />';
                 }
                 $email_body .= $email_user_author.' ('.$email_date_changes.')<br /><br /><br />';
@@ -1964,23 +1964,23 @@ 
             $template);
 
         if (0 != $groupId) {
-            $groupPart = '_group' . $groupId; // and add groupId to put the same document title in different groups
-            $group_properties  = GroupManager :: get_group_properties($groupId);
+            $groupPart = '_group'.$groupId; // and add groupId to put the same document title in different groups
+            $group_properties = GroupManager :: get_group_properties($groupId);
             $groupPath = $group_properties['directory'];
         } else {
             $groupPart = '';
-            $groupPath ='';
+            $groupPath = '';
         }
 
-        $exportDir = api_get_path(SYS_COURSE_PATH).api_get_course_path(). '/document'.$groupPath;
-        $exportFile = api_replace_dangerous_char($wikiTitle) . $groupPart;
+        $exportDir = api_get_path(SYS_COURSE_PATH).api_get_course_path().'/document'.$groupPath;
+        $exportFile = api_replace_dangerous_char($wikiTitle).$groupPart;
         $wikiContents = trim(preg_replace("/\[[\[]?([^\]|]*)[|]?([^|\]]*)\][\]]?/", "$1", $wikiContents));
         //TODO: put link instead of title
 
         $wikiContents = str_replace('{CONTENT}', $wikiContents, $template);
 
         // replace relative path by absolute path for courses, so you can see items into this page wiki (images, mp3, etc..) exported in documents
-        if (api_strpos($wikiContents,'../..'.api_get_path(REL_COURSE_PATH)) !== false) {
+        if (api_strpos($wikiContents, '../..'.api_get_path(REL_COURSE_PATH)) !== false) {
             $web_course_path = api_get_path(WEB_COURSE_PATH);
             $wikiContents = str_replace('../..'.api_get_path(REL_COURSE_PATH), $web_course_path, $wikiContents);
         }
@@ -1991,8 +1991,8 @@ 
             $i++;
         }
 
-        $wikiFileName = $exportFile . '_' . $i . '.html';
-        $exportPath = $exportDir . '/' . $wikiFileName;
+        $wikiFileName = $exportFile.'_'.$i.'.html';
+        $exportPath = $exportDir.'/'.$wikiFileName;
 
         file_put_contents($exportPath, $wikiContents);
         $doc_id = add_document(
@@ -2037,14 +2037,14 @@ 
         $content_pdf = api_html_entity_decode($data['content'], ENT_QUOTES, api_get_system_encoding());
 
         //clean wiki links
-        $content_pdf=trim(preg_replace("/\[[\[]?([^\]|]*)[|]?([^|\]]*)\][\]]?/", "$1", $content_pdf));
+        $content_pdf = trim(preg_replace("/\[[\[]?([^\]|]*)[|]?([^|\]]*)\][\]]?/", "$1", $content_pdf));
         //TODO: It should be better to display the link insted of the tile but it is hard for [[title]] links
 
         $title_pdf = api_html_entity_decode($data['title'], ENT_QUOTES, api_get_system_encoding());
         $title_pdf = api_utf8_encode($title_pdf, api_get_system_encoding());
         $content_pdf = api_utf8_encode($content_pdf, api_get_system_encoding());
 
-        $html='
+        $html = '
         <!-- defines the headers/footers - this must occur before the headers/footers are set -->
 
         <!--mpdf
@@ -2103,9 +2103,9 @@ 
         $groupId = api_get_group_id();
         $groupInfo = GroupManager::get_group_properties($groupId);
 
-        if ($groupId==0) {
+        if ($groupId == 0) {
             //extract course members
-            if(!empty($session_id)) {
+            if (!empty($session_id)) {
                 $a_users_to_add = CourseManager::get_user_list_from_course_code(api_get_course_id(), $session_id);
             } else {
                 $a_users_to_add = CourseManager::get_user_list_from_course_code(api_get_course_id(), 0);
@@ -2131,7 +2131,7 @@ 
         $username = api_htmlentities(sprintf(get_lang('LoginX'), $userinfo['username'], ENT_QUOTES));
         $name = $userinfo['complete_name']." - ".$username;
 
-        $photo = '<img src="' . $userinfo['avatar'] . '" alt="' . $name . '"  width="40" height="50" align="top" title="' . $name . '"  />';
+        $photo = '<img src="'.$userinfo['avatar'].'" alt="'.$name.'"  width="40" height="50" align="top" title="'.$name.'"  />';
 
         // teacher assignment title
         $title_orig = $values['title'];
@@ -2161,7 +2161,7 @@ 
                 $userPicture = UserManager::getUserPicture($assig_user_id);
                 $username = api_htmlentities(sprintf(get_lang('LoginX'), $o_user_to_add['username'], ENT_QUOTES));
                 $name = api_get_person_name($o_user_to_add['firstname'], $o_user_to_add['lastname'])." . ".$username;
-                $photo= '<img src="'.$userPicture.'" alt="'.$name.'"  width="40" height="50" align="bottom" title="'.$name.'"  />';
+                $photo = '<img src="'.$userPicture.'" alt="'.$name.'"  width="40" height="50" align="bottom" title="'.$name.'"  />';
 
                 $is_tutor_of_group = GroupManager::is_tutor_of_group($assig_user_id, $groupInfo['iid']); //student is tutor
                 $is_tutor_and_member = GroupManager::is_tutor_of_group($assig_user_id, $groupInfo['iid']) &&
@@ -2169,17 +2169,17 @@ 
                 // student is tutor and member
 
                 if ($is_tutor_and_member) {
-                    $status_in_group=get_lang('GroupTutorAndMember');
+                    $status_in_group = get_lang('GroupTutorAndMember');
                 } else {
-                    if($is_tutor_of_group) {
-                        $status_in_group=get_lang('GroupTutor');
+                    if ($is_tutor_of_group) {
+                        $status_in_group = get_lang('GroupTutor');
                     } else {
-                        $status_in_group=" "; //get_lang('GroupStandardMember')
+                        $status_in_group = " "; //get_lang('GroupStandardMember')
                     }
                 }
 
-                if ($assignment_type==1) {
-                    $values['title']= $title_orig;
+                if ($assignment_type == 1) {
+                    $values['title'] = $title_orig;
                     $values['content'] = '<div align="center" style="background-color: #F5F8FB; border:solid; border-color: #E6E6E6">
                     <table border="0">
                     <tr><td style="font-size:24px">'.get_lang('AssignmentWork').'</td></tr>
@@ -2195,7 +2195,7 @@ 
                         ).
                         ' [['.Security::remove_XSS($_POST['title'])."_uass".$assig_user_id.' | '.$photo.']] '.$status_in_group.'</li>';
                     //don't change this line without guaranteeing that users will be ordered by last names in the following format (surname, name)
-                    $values['assignment']=2;
+                    $values['assignment'] = 2;
                 }
                 $this->assig_user_id = $assig_user_id;
                 self::save_new_wiki($values);
@@ -2204,12 +2204,12 @@ 
 
         foreach ($a_users_to_add as $o_user_to_add) {
             if ($o_user_to_add['user_id'] == $userId) {
-                $assig_user_id=$o_user_to_add['user_id'];
+                $assig_user_id = $o_user_to_add['user_id'];
                 if ($assignment_type == 1) {
-                    $values['title']= $title_orig;
-                    $values['comment']=get_lang('AssignmentDesc');
+                    $values['title'] = $title_orig;
+                    $values['comment'] = get_lang('AssignmentDesc');
                     sort($all_students_pages);
-                    $values['content']=$content_orig_A.$content_orig_B.'<br/>
+                    $values['content'] = $content_orig_A.$content_orig_B.'<br/>
                     <div align="center" style="font-size:18px; background-color: #F5F8FB; border:solid; border-color:#E6E6E6">
                     '.get_lang('AssignmentLinkstoStudentsPage').'
                     </div><br/>
@@ -2217,7 +2217,7 @@ 
                     <ol>'.implode($all_students_pages).'</ol>
                     </div>
                     <br/>';
-                    $values['assignment']=1;
+                    $values['assignment'] = 1;
                 }
                 $this->assig_user_id = $assig_user_id;
                 self::save_new_wiki($values);
@@ -2231,7 +2231,7 @@ 
      * @param   int     Whether to search the contents (1) or just the titles (0)
      * @param int
      */
-    public function display_wiki_search_results($search_term, $search_content=0, $all_vers=0)
+    public function display_wiki_search_results($search_term, $search_content = 0, $all_vers = 0)
     {
         $tbl_wiki = $this->tbl_wiki;
         $condition_session = $this->condition_session;
@@ -2243,9 +2243,9 @@ 
         echo '</legend>';
 
         //only by professors when page is hidden
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
-            if ($all_vers=='1') {
-                if ($search_content=='1') {
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+            if ($all_vers == '1') {
+                if ($search_content == '1') {
                     $sql = "SELECT * FROM ".$tbl_wiki."
                             WHERE
                                 c_id = $course_id AND
@@ -2262,7 +2262,7 @@ 
                     //search all pages and all versions
                 }
             } else {
-                if ($search_content=='1') {
+                if ($search_content == '1') {
                     $sql = "SELECT * FROM ".$tbl_wiki." s1
                             WHERE
                                 s1.c_id = $course_id AND
@@ -2313,7 +2313,7 @@ 
                     //search all pages and all versions
                 }
             } else {
-                if($search_content=='1') {
+                if ($search_content == '1') {
                     $sql = "SELECT * FROM ".$tbl_wiki." s1
                             WHERE
                                 s1.c_id = $course_id AND
@@ -2361,17 +2361,17 @@ 
                 $seconds = substr($obj->dtime, 17, 2);
 
                 //get type assignment icon
-                if($obj->assignment==1) {
-                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==2) {
-                    $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==0) {
+                if ($obj->assignment == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 2) {
+                    $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 0) {
                     $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
                 $row = array();
                 $row[] = $ShowAssignment;
 
-                if($all_vers=='1') {
+                if ($all_vers == '1') {
                     $row[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=showpage&title='.api_htmlentities(urlencode($obj->reflink)).'&view='.$obj->id.'&session_id='.api_htmlentities(urlencode($_GET['$session_id'])).'&group_id='.api_htmlentities(urlencode($_GET['group_id'])).'">'.
                         api_htmlentities($obj->title).'</a>';
                 } else {
@@ -2382,21 +2382,21 @@ 
                 $row[] = ($obj->user_id != 0 && $userinfo !== false) ? UserManager::getUserProfileLink($userinfo) : get_lang('Anonymous').' ('.$obj->user_ip.')';
                 $row[] = $year.'-'.$month.'-'.$day.' '.$hours.":".$minutes.":".$seconds;
 
-                if ($all_vers=='1') {
+                if ($all_vers == '1') {
                     $row[] = $obj->version;
                 } else {
                     $showdelete = '';
-                    if (api_is_allowed_to_edit(false,true)|| api_is_platform_admin()) {
-                        $showdelete=' <a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                            Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL);
+                    if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+                        $showdelete = ' <a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
+                            Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL);
                     }
                     $row[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=edit&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('edit.png', get_lang('EditPage'),'',ICON_SIZE_SMALL).'</a>
+                        Display::return_icon('edit.png', get_lang('EditPage'), '', ICON_SIZE_SMALL).'</a>
                         <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=discuss&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('discuss.png', get_lang('Discuss'),'',ICON_SIZE_SMALL).'</a>
+                        Display::return_icon('discuss.png', get_lang('Discuss'), '', ICON_SIZE_SMALL).'</a>
                         <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=history&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('history.png', get_lang('History'),'',ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=links&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('what_link_here.png', get_lang('LinksPages'),'',ICON_SIZE_SMALL).'</a>'.$showdelete;
+                        Display::return_icon('history.png', get_lang('History'), '', ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=links&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
+                        Display::return_icon('what_link_here.png', get_lang('LinksPages'), '', ICON_SIZE_SMALL).'</a>'.$showdelete;
                 }
                 $rows[] = $row;
             }
@@ -2421,16 +2421,16 @@ 
                     'all_vers' => $all_vers,
                 )
             );
-            $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;'));
-            $table->set_header(1,get_lang('Title'), true);
+            $table->set_header(0, get_lang('Type'), true, array('style' => 'width:30px;'));
+            $table->set_header(1, get_lang('Title'), true);
             if ($all_vers == '1') {
-                $table->set_header(2,get_lang('Author'), true);
-                $table->set_header(3,get_lang('Date'), true);
-                $table->set_header(4,get_lang('Version'), true);
+                $table->set_header(2, get_lang('Author'), true);
+                $table->set_header(3, get_lang('Date'), true);
+                $table->set_header(4, get_lang('Version'), true);
             } else {
-                $table->set_header(2,get_lang('Author').' ('.get_lang('LastVersion').')', true);
-                $table->set_header(3,get_lang('Date').' ('.get_lang('LastVersion').')', true);
-                $table->set_header(4,get_lang('Actions'), false, array ('style' => 'width:130px;'));
+                $table->set_header(2, get_lang('Author').' ('.get_lang('LastVersion').')', true);
+                $table->set_header(3, get_lang('Date').' ('.get_lang('LastVersion').')', true);
+                $table->set_header(4, get_lang('Actions'), false, array('style' => 'width:130px;'));
             }
             $table->display();
         } else {
@@ -2443,14 +2443,14 @@ 
      * @todo replace this function with the formvalidator datepicker
      *
      */
-    public function draw_date_picker($prefix,$default='')
+    public function draw_date_picker($prefix, $default = '')
     {
         if (empty($default)) {
             $default = date('Y-m-d H:i:s');
         }
         $parts = explode(' ', $default);
-        list($d_year,$d_month,$d_day) = explode('-',$parts[0]);
-        list($d_hour,$d_minute) = explode(':',$parts[1]);
+        list($d_year, $d_month, $d_day) = explode('-', $parts[0]);
+        list($d_hour, $d_minute) = explode(':', $parts[1]);
 
         $month_list = array(
             1 => get_lang('JanuaryLong'),
@@ -2467,9 +2467,9 @@ 
             12 => get_lang('DecemberLong'),
         );
 
-        $minute = range(10,59);
-        array_unshift($minute,'00','01','02','03','04','05','06','07','08','09');
-        $date_form = self::make_select($prefix.'_day', array_combine(range(1,31),range(1,31)), $d_day);
+        $minute = range(10, 59);
+        array_unshift($minute, '00', '01', '02', '03', '04', '05', '06', '07', '08', '09');
+        $date_form = self::make_select($prefix.'_day', array_combine(range(1, 31), range(1, 31)), $d_day);
         $date_form .= self::make_select($prefix.'_month', $month_list, $d_month);
         $date_form .= self::make_select(
                 $prefix.'_year',
@@ -2482,7 +2482,7 @@ 
                 ),
                 $d_year
             ).'&nbsp;&nbsp;&nbsp;&nbsp;';
-        $date_form .= self::make_select($prefix.'_hour', array_combine(range(0,23),range(0,23)), $d_hour).' : ';
+        $date_form .= self::make_select($prefix.'_hour', array_combine(range(0, 23), range(0, 23)), $d_hour).' : ';
         $date_form .= self::make_select($prefix.'_minute', $minute, $d_minute);
 
         return $date_form;
@@ -2492,11 +2492,11 @@ 
      * Draws an HTML form select with the given options
      *
      */
-    public function make_select($name,$values,$checked='')
+    public function make_select($name, $values, $checked = '')
     {
         $output = '<select name="'.$name.'" id="'.$name.'">';
-        foreach($values as $key => $value) {
-            $output .= '<option value="'.$key.'" '.(($checked==$key)?'selected="selected"':'').'>'.$value.'</option>';
+        foreach ($values as $key => $value) {
+            $output .= '<option value="'.$key.'" '.(($checked == $key) ? 'selected="selected"' : '').'>'.$value.'</option>';
         }
         $output .= '</select>';
         return $output;
@@ -2520,7 +2520,7 @@ 
      */
     public function two_digits($number)
     {
-        $number = (int)$number;
+        $number = (int) $number;
         return ($number < 10) ? '0'.$number : $number;
     }
 
@@ -2541,7 +2541,7 @@ 
                 WHERE c_id = '.$course_id.' AND id = '.$id.' ';
         $result = Database::query($sql);
         $data = array();
-        while ($row=Database::fetch_array($result,'ASSOC'))   {
+        while ($row = Database::fetch_array($result, 'ASSOC')) {
             $data = $row;
         }
         return $data;
@@ -2595,7 +2595,7 @@ 
         $result = Database::query($sql);
         $data = array();
         if (Database::num_rows($result)) {
-            $data = Database::fetch_array($result,'ASSOC');
+            $data = Database::fetch_array($result, 'ASSOC');
         }
 
         return $data;
@@ -2689,9 +2689,9 @@ 
         $result = self::getAllWiki();
         if (!empty($result)) {
             foreach ($result  as $is_editing_block) {
-                $max_edit_time	= 1200; // 20 minutes
-                $timestamp_edit	= strtotime($is_editing_block['time_edit']);
-                $time_editing	= time()-$timestamp_edit;
+                $max_edit_time = 1200; // 20 minutes
+                $timestamp_edit = strtotime($is_editing_block['time_edit']);
+                $time_editing = time() - $timestamp_edit;
 
                 // First prevent concurrent users and double version
                 if ($is_editing_block['is_editing'] == $userId) {
@@ -2700,7 +2700,7 @@ 
                     Session::erase('_version');
                 }
                 // Second checks if has exceeded the time that a page may be available or if a page was edited and saved by its author
-                if ($time_editing > $max_edit_time || ($is_editing_block['is_editing'] == $userId && $action!='edit')) {
+                if ($time_editing > $max_edit_time || ($is_editing_block['is_editing'] == $userId && $action != 'edit')) {
                     self::updateWikiIsEditing($is_editing_block['is_editing']);
                 }
             }
@@ -2748,7 +2748,7 @@ 
                 FROM ".$tbl_wiki."
                 WHERE c_id = $course_id AND ".$groupfilter.$condition_session."";
 
-        $allpages=Database::query($sql);
+        $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
             $total_versions = $row['TOTAL_VERS'];
             $total_visits = intval($row['TOTAL_VISITS']);
@@ -2758,30 +2758,30 @@ 
                 WHERE c_id = $course_id AND ".$groupfilter.$condition_session."";
         $allpages = Database::query($sql);
 
-        while ($row=Database::fetch_array($allpages)) {
+        while ($row = Database::fetch_array($allpages)) {
             $total_words = $total_words + self::word_count($row['content']);
-            $total_links 			= $total_links+substr_count($row['content'], "href=");
-            $total_links_anchors 	= $total_links_anchors+substr_count($row['content'], 'href="#');
-            $total_links_mail		= $total_links_mail+substr_count($row['content'], 'href="mailto');
-            $total_links_ftp 		= $total_links_ftp+substr_count($row['content'], 'href="ftp');
-            $total_links_irc		= $total_links_irc+substr_count($row['content'], 'href="irc');
-            $total_links_news 		= $total_links_news+substr_count($row['content'], 'href="news');
-            $total_wlinks 			= $total_wlinks+substr_count($row['content'], "[[");
-            $total_images 			= $total_images+substr_count($row['content'], "<img");
+            $total_links = $total_links + substr_count($row['content'], "href=");
+            $total_links_anchors = $total_links_anchors + substr_count($row['content'], 'href="#');
+            $total_links_mail		= $total_links_mail + substr_count($row['content'], 'href="mailto');
+            $total_links_ftp 		= $total_links_ftp + substr_count($row['content'], 'href="ftp');
+            $total_links_irc = $total_links_irc + substr_count($row['content'], 'href="irc');
+            $total_links_news = $total_links_news + substr_count($row['content'], 'href="news');
+            $total_wlinks 			= $total_wlinks + substr_count($row['content'], "[[");
+            $total_images 			= $total_images + substr_count($row['content'], "<img");
             $clean_total_flash = preg_replace('/player.swf/', ' ', $row['content']);
-            $total_flash			= $total_flash+substr_count($clean_total_flash, '.swf"');
+            $total_flash = $total_flash + substr_count($clean_total_flash, '.swf"');
             //.swf" end quotes prevent insert swf through flvplayer (is not counted)
-            $total_mp3				= $total_mp3+substr_count($row['content'], ".mp3");
-            $total_flv_p = $total_flv_p+substr_count($row['content'], ".flv");
-            $total_flv				=	$total_flv_p/5;
-            $total_youtube			= $total_youtube+substr_count($row['content'], "http://www.youtube.com");
-            $total_multimedia		= $total_multimedia+substr_count($row['content'], "video/x-msvideo");
-            $total_tables			= $total_tables+substr_count($row['content'], "<table");
+            $total_mp3				= $total_mp3 + substr_count($row['content'], ".mp3");
+            $total_flv_p = $total_flv_p + substr_count($row['content'], ".flv");
+            $total_flv				= $total_flv_p / 5;
+            $total_youtube = $total_youtube + substr_count($row['content'], "http://www.youtube.com");
+            $total_multimedia = $total_multimedia + substr_count($row['content'], "video/x-msvideo");
+            $total_tables = $total_tables + substr_count($row['content'], "<table");
         }
 
         //check only last version of all pages (current page)
 
-        $sql =' SELECT *, COUNT(*) AS TOTAL_PAGES, SUM(hits) AS TOTAL_VISITS_LV
+        $sql = ' SELECT *, COUNT(*) AS TOTAL_PAGES, SUM(hits) AS TOTAL_VISITS_LV
                 FROM  '.$tbl_wiki.' s1
                 WHERE s1.c_id = '.$course_id.' AND id=(
                     SELECT MAX(s2.id)
@@ -2792,9 +2792,9 @@ 
                         '.$groupfilter.' AND
                         session_id='.$session_id.')';
         $allpages = Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_pages	 		= $row['TOTAL_PAGES'];
-            $total_visits_lv 		= intval($row['TOTAL_VISITS_LV']);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_pages = $row['TOTAL_PAGES'];
+            $total_visits_lv = intval($row['TOTAL_VISITS_LV']);
         }
 
         $total_words_lv = 0;
@@ -2826,29 +2826,29 @@ 
                 )';
         $allpages = Database::query($sql);
 
-        while ($row=Database::fetch_array($allpages)) {
-            $total_words_lv 		= $total_words_lv+ self::word_count($row['content']);
-            $total_links_lv 		= $total_links_lv+substr_count($row['content'], "href=");
-            $total_links_anchors_lv	= $total_links_anchors_lv+substr_count($row['content'], 'href="#');
-            $total_links_mail_lv 	= $total_links_mail_lv+substr_count($row['content'], 'href="mailto');
-            $total_links_ftp_lv 	= $total_links_ftp_lv+substr_count($row['content'], 'href="ftp');
-            $total_links_irc_lv 	= $total_links_irc_lv+substr_count($row['content'], 'href="irc');
-            $total_links_news_lv 	= $total_links_news_lv+substr_count($row['content'], 'href="news');
-            $total_wlinks_lv 		= $total_wlinks_lv+substr_count($row['content'], "[[");
-            $total_images_lv 		= $total_images_lv+substr_count($row['content'], "<img");
+        while ($row = Database::fetch_array($allpages)) {
+            $total_words_lv 		= $total_words_lv + self::word_count($row['content']);
+            $total_links_lv 		= $total_links_lv + substr_count($row['content'], "href=");
+            $total_links_anchors_lv = $total_links_anchors_lv + substr_count($row['content'], 'href="#');
+            $total_links_mail_lv 	= $total_links_mail_lv + substr_count($row['content'], 'href="mailto');
+            $total_links_ftp_lv 	= $total_links_ftp_lv + substr_count($row['content'], 'href="ftp');
+            $total_links_irc_lv 	= $total_links_irc_lv + substr_count($row['content'], 'href="irc');
+            $total_links_news_lv 	= $total_links_news_lv + substr_count($row['content'], 'href="news');
+            $total_wlinks_lv 		= $total_wlinks_lv + substr_count($row['content'], "[[");
+            $total_images_lv 		= $total_images_lv + substr_count($row['content'], "<img");
             $clean_total_flash_lv = preg_replace('/player.swf/', ' ', $row['content']);
-            $total_flash_lv			= $total_flash_lv+substr_count($clean_total_flash_lv, '.swf"');
+            $total_flash_lv = $total_flash_lv + substr_count($clean_total_flash_lv, '.swf"');
             //.swf" end quotes prevent insert swf through flvplayer (is not counted)
-            $total_mp3_lv			= $total_mp3_lv+substr_count($row['content'], ".mp3");
-            $total_flv_p_lv = $total_flv_p_lv+substr_count($row['content'], ".flv");
-            $total_flv_lv			= $total_flv_p_lv/5;
-            $total_youtube_lv		= $total_youtube_lv+substr_count($row['content'], "http://www.youtube.com");
-            $total_multimedia_lv	= $total_multimedia_lv+substr_count($row['content'], "video/x-msvideo");
-            $total_tables_lv		= $total_tables_lv+substr_count($row['content'], "<table");
+            $total_mp3_lv			= $total_mp3_lv + substr_count($row['content'], ".mp3");
+            $total_flv_p_lv = $total_flv_p_lv + substr_count($row['content'], ".flv");
+            $total_flv_lv			= $total_flv_p_lv / 5;
+            $total_youtube_lv = $total_youtube_lv + substr_count($row['content'], "http://www.youtube.com");
+            $total_multimedia_lv = $total_multimedia_lv + substr_count($row['content'], "video/x-msvideo");
+            $total_tables_lv = $total_tables_lv + substr_count($row['content'], "<table");
         }
 
         //Total pages edited at this time
-        $total_editing_now=0;
+        $total_editing_now = 0;
         $sql = 'SELECT *, COUNT(*) AS TOTAL_EDITING_NOW
                 FROM  '.$tbl_wiki.' s1
                 WHERE is_editing!=0 AND s1.c_id = '.$course_id.' AND
@@ -2863,66 +2863,66 @@ 
         )';
 
         // Can not use group by because the mark is set in the latest version
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_editing_now	= $row['TOTAL_EDITING_NOW'];
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_editing_now = $row['TOTAL_EDITING_NOW'];
         }
 
         // Total hidden pages
-        $total_hidden=0;
+        $total_hidden = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE  c_id = '.$course_id.' AND visibility=0 AND '.$groupfilter.$condition_session.'
                 GROUP BY reflink';
         // or group by page_id. As the mark of hidden places it in all versions of the page, I can use group by to see the first
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_hidden = $total_hidden+1;
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_hidden = $total_hidden + 1;
         }
 
         //Total protect pages
-        $total_protected=0;
+        $total_protected = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE  c_id = '.$course_id.' AND editlock=1 AND '.$groupfilter.$condition_session.'
                 GROUP BY reflink';
         // or group by page_id. As the mark of protected page is the first version of the page, I can use group by
 
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_protected = $total_protected+1;
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_protected = $total_protected + 1;
         }
 
         // Total empty versions.
-        $total_empty_content=0;
+        $total_empty_content = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE
                     c_id = '.$course_id.' AND
                     content="" AND
                     '.$groupfilter.$condition_session.'';
         $allpages = Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_empty_content	= $total_empty_content+1;
+        while ($row = Database::fetch_array($allpages)) {
+            $total_empty_content = $total_empty_content + 1;
         }
 
         //Total empty pages (last version)
 
-        $total_empty_content_lv=0;
+        $total_empty_content_lv = 0;
         $sql = 'SELECT  * FROM  '.$tbl_wiki.' s1
                 WHERE s1.c_id = '.$course_id.' AND content="" AND id=(
                 SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2
                 WHERE s1.c_id = '.$course_id.' AND s1.reflink = s2.reflink AND '.$groupfilter.' AND session_id='.$session_id.')';
-        $allpages=Database::query($sql);
+        $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
-            $total_empty_content_lv	= $total_empty_content_lv+1;
+            $total_empty_content_lv = $total_empty_content_lv + 1;
         }
 
         // Total locked discuss pages
-        $total_lock_disc=0;
+        $total_lock_disc = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE c_id = '.$course_id.' AND addlock_disc=0 AND '.$groupfilter.$condition_session.'
                 GROUP BY reflink';//group by because mark lock in all vers, then always is ok
-        $allpages=Database::query($sql);
+        $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
-            $total_lock_disc	= $total_lock_disc+1;
+            $total_lock_disc = $total_lock_disc + 1;
         }
 
         // Total hidden discuss pages.
@@ -2933,7 +2933,7 @@ 
         //group by because mark lock in all vers, then always is ok
         $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
-            $total_hidden_disc	= $total_hidden_disc+1;
+            $total_hidden_disc = $total_hidden_disc + 1;
         }
 
         //Total versions with any short comment by user or system
@@ -2941,44 +2941,44 @@ 
         $total_comment_version = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE c_id = '.$course_id.' AND comment!="" AND '.$groupfilter.$condition_session.'';
-        $allpages=Database::query($sql);
+        $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
-            $total_comment_version	= $total_comment_version+1;
+            $total_comment_version = $total_comment_version + 1;
         }
 
         // Total pages that can only be scored by teachers.
 
-        $total_only_teachers_rating=0;
+        $total_only_teachers_rating = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE c_id = '.$course_id.' AND
                 ratinglock_disc = 0 AND
                 '.$groupfilter.$condition_session.'
                 GROUP BY reflink';//group by because mark lock in all vers, then always is ok
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_only_teachers_rating	= $total_only_teachers_rating+1;
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_only_teachers_rating = $total_only_teachers_rating + 1;
         }
 
         // Total pages scored by peers
         // put always this line alfter check num all pages and num pages rated by teachers
-        $total_rating_by_peers=$total_pages-$total_only_teachers_rating;
+        $total_rating_by_peers = $total_pages - $total_only_teachers_rating;
 
         //Total pages identified as standard task
 
-        $total_task=0;
-        $sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.'
+        $total_task = 0;
+        $sql = 'SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.'
               WHERE '.$tbl_wiki_conf.'.c_id = '.$course_id.' AND
                '.$tbl_wiki_conf.'.task!="" AND
                '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND
                 '.$tbl_wiki.'.'.$groupfilter.$condition_session;
         $allpages = Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_task=$total_task+1;
+        while ($row = Database::fetch_array($allpages)) {
+            $total_task = $total_task + 1;
         }
 
         //Total pages identified as teacher page (wiki portfolio mode - individual assignment)
 
-        $total_teacher_assignment=0;
+        $total_teacher_assignment = 0;
         $sql = 'SELECT  * FROM  '.$tbl_wiki.' s1
                 WHERE s1.c_id = '.$course_id.' AND assignment=1 AND id=(
                     SELECT MAX(s2.id)
@@ -2988,20 +2988,20 @@ 
         //mark all versions, but do not use group by reflink because y want the pages not versions
         $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
-            $total_teacher_assignment=$total_teacher_assignment+1;
+            $total_teacher_assignment = $total_teacher_assignment + 1;
         }
 
         //Total pages identifies as student page (wiki portfolio mode - individual assignment)
 
-        $total_student_assignment=0;
+        $total_student_assignment = 0;
         $sql = 'SELECT  * FROM  '.$tbl_wiki.' s1
                 WHERE s1.c_id = '.$course_id.' AND assignment=2 AND
                 id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2
                 WHERE s2.c_id = '.$course_id.' AND s1.reflink = s2.reflink AND '.$groupfilter.' AND session_id='.$session_id.')';
         //mark all versions, but do not use group by reflink because y want the pages not versions
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_student_assignment = $total_student_assignment+1;
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_student_assignment = $total_student_assignment + 1;
         }
 
         //Current Wiki status add new pages
@@ -3010,14 +3010,14 @@ 
                 GROUP BY addlock';//group by because mark 0 in all vers, then always is ok
         $allpages = Database::query($sql);
         $wiki_add_lock = null;
-        while ($row=Database::fetch_array($allpages)) {
-            $wiki_add_lock=$row['addlock'];
+        while ($row = Database::fetch_array($allpages)) {
+            $wiki_add_lock = $row['addlock'];
         }
 
-        if ($wiki_add_lock==1) {
-            $status_add_new_pag=get_lang('Yes');
+        if ($wiki_add_lock == 1) {
+            $status_add_new_pag = get_lang('Yes');
         } else {
-            $status_add_new_pag=get_lang('No');
+            $status_add_new_pag = get_lang('No');
         }
 
         //Creation date of the oldest wiki page and version
@@ -3040,7 +3040,7 @@ 
                 ORDER BY dtime DESC 
                 LIMIT 1';
         $allpages = Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
+        while ($row = Database::fetch_array($allpages)) {
             $last_wiki_date = $row['dtime'];
         }
 
@@ -3053,18 +3053,18 @@ 
         // Do not use "count" because using "group by", would give a wrong value
         $allpages = Database::query($sql);
         $total_score = 0;
-        while ($row=Database::fetch_array($allpages)) {
-            $total_score = $total_score+$row['TOTAL_SCORE'];
+        while ($row = Database::fetch_array($allpages)) {
+            $total_score = $total_score + $row['TOTAL_SCORE'];
         }
 
         if (!empty($total_pages)) {
-            $media_score = $total_score/$total_pages;
+            $media_score = $total_score / $total_pages;
             //put always this line alfter check num all pages
         }
 
         // Average user progress in his pages.
 
-        $media_progress=0;
+        $media_progress = 0;
         $sql = 'SELECT  *, SUM(progress) AS TOTAL_PROGRESS
                 FROM  '.$tbl_wiki.' s1
                 WHERE s1.c_id = '.$course_id.' AND id=
@@ -3078,24 +3078,24 @@ 
         // As the value is only the latest version I can not use group by
         $allpages = Database::query($sql);
         while ($row = Database::fetch_array($allpages)) {
-            $total_progress	= $row['TOTAL_PROGRESS'];
+            $total_progress = $row['TOTAL_PROGRESS'];
         }
 
         if (!empty($total_pages)) {
-            $media_progress=$total_progress/$total_pages;
+            $media_progress = $total_progress / $total_pages;
             //put always this line alfter check num all pages
         }
 
         //Total users that have participated in the Wiki
 
-        $total_users=0;
+        $total_users = 0;
         $sql = 'SELECT * FROM '.$tbl_wiki.'
                 WHERE  c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
                 GROUP BY user_id';
         //as the mark of user it in all versions of the page, I can use group by to see the first
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_users = $total_users+1;
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_users = $total_users + 1;
         }
 
         // Total of different IP addresses that have participated in the wiki
@@ -3103,9 +3103,9 @@ 
         $sql = 'SELECT * FROM '.$tbl_wiki.'
               WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
               GROUP BY user_ip';
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            $total_ip	= $total_ip+1;
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_ip = $total_ip + 1;
         }
 
         echo '<table class="data_table">';
@@ -3297,18 +3297,18 @@ 
                 $userinfo = api_get_user_info($obj->user_id);
                 $username = api_htmlentities(sprintf(get_lang('LoginX'), $userinfo['username']), ENT_QUOTES);
                 $row = array();
-                if ($obj->user_id != 0  && $userinfo !== false) {
+                if ($obj->user_id != 0 && $userinfo !== false) {
                     $row[] = UserManager::getUserProfileLink($userinfo).'
                             <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=usercontrib&user_id='.urlencode($obj->user_id).
                         '&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'"></a>';
                 } else {
                     $row[] = get_lang('Anonymous').' ('.$obj->user_ip.')';
                 }
-                $row[] ='<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=usercontrib&user_id='.urlencode($obj->user_id).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.$obj->NUM_EDIT.'</a>';
+                $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=usercontrib&user_id='.urlencode($obj->user_id).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.$obj->NUM_EDIT.'</a>';
                 $rows[] = $row;
             }
 
-            $table = new SortableTableFromArrayConfig($rows,1,10,'MostActiveUsersA_table','','','DESC');
+            $table = new SortableTableFromArrayConfig($rows, 1, 10, 'MostActiveUsersA_table', '', '', 'DESC');
             $table->set_additional_parameters(
                 array(
                     'cidReq' => Security::remove_XSS($_GET['cidReq']),
@@ -3317,8 +3317,8 @@ 
                     'group_id' => Security::remove_XSS($_GET['group_id'])
                 )
             );
-            $table->set_header(0,get_lang('Author'), true);
-            $table->set_header(1,get_lang('Contributions'), true,array ('style' => 'width:30px;'));
+            $table->set_header(0, get_lang('Author'), true);
+            $table->set_header(1, get_lang('Contributions'), true, array('style' => 'width:30px;'));
             $table->display();
         }
     }
@@ -3334,8 +3334,8 @@ 
         $groupfilter = $this->groupfilter;
         $tbl_wiki_discuss = $this->tbl_wiki_discuss;
 
-        if (api_get_session_id()!=0 &&
-            api_is_allowed_to_session_edit(false,true)==false
+        if (api_get_session_id() != 0 &&
+            api_is_allowed_to_session_edit(false, true) == false
         ) {
             api_not_allowed();
         }
@@ -3396,9 +3396,9 @@ 
         //mode assignment: previous to show  page type
         $icon_assignment = null;
         if ($row['assignment'] == 1) {
-            $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',ICON_SIZE_SMALL);
+            $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL);
         } elseif ($row['assignment'] == 2) {
-            $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'),'',ICON_SIZE_SMALL);
+            $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'), '', ICON_SIZE_SMALL);
         }
 
         $countWPost = null;
@@ -3413,19 +3413,19 @@ 
             if ($row['visibility_disc'] == 1 ||
                 api_is_allowed_to_edit(false, true) ||
                 api_is_platform_admin() ||
-                ($row['assignment'] == 2 && $row['visibility_disc']==0 && (api_get_user_id()==$row['user_id']))
+                ($row['assignment'] == 2 && $row['visibility_disc'] == 0 && (api_get_user_id() == $row['user_id']))
             ) {
                 echo '<div id="wikititle">';
                 // discussion action: protecting (locking) the discussion
                 $addlock_disc = null;
                 $lock_unlock_disc = null;
-                if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                     if (self::check_addlock_discuss() == 1) {
-                        $addlock_disc = Display::return_icon('unlock.png', get_lang('UnlockDiscussExtra'),'',ICON_SIZE_SMALL);
-                        $lock_unlock_disc ='unlockdisc';
+                        $addlock_disc = Display::return_icon('unlock.png', get_lang('UnlockDiscussExtra'), '', ICON_SIZE_SMALL);
+                        $lock_unlock_disc = 'unlockdisc';
                     } else {
-                        $addlock_disc = Display::return_icon('lock.png', get_lang('LockDiscussExtra'),'',ICON_SIZE_SMALL);
-                        $lock_unlock_disc ='lockdisc';
+                        $addlock_disc = Display::return_icon('lock.png', get_lang('LockDiscussExtra'), '', ICON_SIZE_SMALL);
+                        $lock_unlock_disc = 'lockdisc';
                     }
                 }
                 echo '<span style="float:right">';
@@ -3436,12 +3436,12 @@ 
                 $visibility_disc = null;
                 $hide_show_disc = null;
                 if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
-                    if (self::check_visibility_discuss()==1) {
+                    if (self::check_visibility_discuss() == 1) {
                         /// TODO: 	Fix Mode assignments: If is hidden, show discussion to student only if student is the author
-                        $visibility_disc = Display::return_icon('visible.png', get_lang('ShowDiscussExtra'),'',ICON_SIZE_SMALL);
+                        $visibility_disc = Display::return_icon('visible.png', get_lang('ShowDiscussExtra'), '', ICON_SIZE_SMALL);
                         $hide_show_disc = 'hidedisc';
                     } else {
-                        $visibility_disc = Display::return_icon('invisible.png', get_lang('HideDiscussExtra'),'',ICON_SIZE_SMALL);
+                        $visibility_disc = Display::return_icon('invisible.png', get_lang('HideDiscussExtra'), '', ICON_SIZE_SMALL);
                         $hide_show_disc = 'showdisc';
                     }
                 }
@@ -3454,10 +3454,10 @@ 
                 $ratinglock_disc = null;
                 if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                     if (self::check_ratinglock_discuss() == 1) {
-                        $ratinglock_disc = Display::return_icon('star.png', get_lang('UnlockRatingDiscussExtra'),'',ICON_SIZE_SMALL);
+                        $ratinglock_disc = Display::return_icon('star.png', get_lang('UnlockRatingDiscussExtra'), '', ICON_SIZE_SMALL);
                         $lock_unlock_rating_disc = 'unlockrating';
                     } else {
-                        $ratinglock_disc = Display::return_icon('star_na.png', get_lang('LockRatingDiscussExtra'),'',ICON_SIZE_SMALL);
+                        $ratinglock_disc = Display::return_icon('star_na.png', get_lang('LockRatingDiscussExtra'), '', ICON_SIZE_SMALL);
                         $lock_unlock_rating_disc = 'lockrating';
                     }
                 }
@@ -3468,11 +3468,11 @@ 
 
                 //discussion action: email notification
                 if (self::check_notify_discuss($page) == 1) {
-                    $notify_disc= Display::return_icon('messagebox_info.png', get_lang('NotifyDiscussByEmail'),'',ICON_SIZE_SMALL);
-                    $lock_unlock_notify_disc='unlocknotifydisc';
+                    $notify_disc = Display::return_icon('messagebox_info.png', get_lang('NotifyDiscussByEmail'), '', ICON_SIZE_SMALL);
+                    $lock_unlock_notify_disc = 'unlocknotifydisc';
                 } else {
-                    $notify_disc= Display::return_icon('mail.png', get_lang('CancelNotifyDiscussByEmail'),'',ICON_SIZE_SMALL);
-                    $lock_unlock_notify_disc='locknotifydisc';
+                    $notify_disc = Display::return_icon('mail.png', get_lang('CancelNotifyDiscussByEmail'), '', ICON_SIZE_SMALL);
+                    $lock_unlock_notify_disc = 'locknotifydisc';
                 }
                 echo '<span style="float:right">';
                 echo '<a href="index.php?action=discuss&amp;actionpage='.$lock_unlock_notify_disc.'&amp;title='.api_htmlentities(urlencode($page)).'">'.$notify_disc.'</a>';
@@ -3481,26 +3481,26 @@ 
                 echo $icon_assignment.'&nbsp;&nbsp;&nbsp;'.api_htmlentities($row['title']);
 
                 if ($lastuserinfo !== false) {
-                    echo ' (' . get_lang('MostRecentVersionBy') . ' ' . UserManager::getUserProfileLink($lastuserinfo) . ' ' . $lastversiondate . $countWPost . ')' . $avg_WPost_score . ' '; //TODO: read average score
+                    echo ' ('.get_lang('MostRecentVersionBy').' '.UserManager::getUserProfileLink($lastuserinfo).' '.$lastversiondate.$countWPost.')'.$avg_WPost_score.' '; //TODO: read average score
                 }
 
                 echo '</div>';
-                if ($row['addlock_disc']==1 || api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                if ($row['addlock_disc'] == 1 || api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                     //show comments but students can't add theirs
                     ?>
                     <form name="form1" method="post" action="">
                         <table>
                             <tr>
-                                <td valign="top" ><?php echo get_lang('Comments');?>:</td>
-                                <?php  echo '<input type="hidden" name="wpost_id" value="'.md5(uniqid(rand(), true)).'">';//prevent double post ?>
+                                <td valign="top" ><?php echo get_lang('Comments'); ?>:</td>
+                                <?php  echo '<input type="hidden" name="wpost_id" value="'.md5(uniqid(rand(), true)).'">'; //prevent double post ?>
                                 <td><textarea name="comment" cols="80" rows="5" id="comment"></textarea></td>
                             </tr>
                             <tr>
                                 <?php
                                 //check if rating is allowed
-                                if ($row['ratinglock_disc']==1 || api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                                if ($row['ratinglock_disc'] == 1 || api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                                     ?>
-                                    <td><?php echo get_lang('Rating');?>: </td>
+                                    <td><?php echo get_lang('Rating'); ?>: </td>
                                     <td valign="top"><select name="rating" id="rating">
                                             <option value="-" selected>-</option>
                                             <option value="0">0</option>
@@ -3517,7 +3517,7 @@ 
                                         </select></td>
                                 <?php
                                 } else {
-                                    echo '<input type=hidden name="rating" value="-">';// must pass a default value to avoid rate automatically
+                                    echo '<input type=hidden name="rating" value="-">'; // must pass a default value to avoid rate automatically
                                 }
                                 ?>
                             </tr>
@@ -3557,12 +3557,12 @@ 
                 $sql = "SELECT * FROM $tbl_wiki_discuss
                         WHERE c_id = $course_id AND publication_id='".$id."' AND NOT p_score='-'";
                 $result3 = Database::query($sql);
-                $countWPost_score= Database::num_rows($result3);
+                $countWPost_score = Database::num_rows($result3);
 
-                echo ' - '.get_lang('NumCommentsScore').': '.$countWPost_score;//
+                echo ' - '.get_lang('NumCommentsScore').': '.$countWPost_score; //
 
-                if ($countWPost_score!=0) {
-                    $avg_WPost_score = round($row2['sumWPost'] / $countWPost_score,2).' / 10';
+                if ($countWPost_score != 0) {
+                    $avg_WPost_score = round($row2['sumWPost'] / $countWPost_score, 2).' / 10';
                 } else {
                     $avg_WPost_score = $countWPost_score;
                 }
@@ -3580,16 +3580,16 @@ 
 
                 echo '<hr noshade size="1">';
 
-                while ($row=Database::fetch_array($result)) {
+                while ($row = Database::fetch_array($result)) {
                     $userinfo = api_get_user_info($row['userc_id']);
-                    if (($userinfo['status'])=="5") {
-                        $author_status=get_lang('Student');
+                    if (($userinfo['status']) == "5") {
+                        $author_status = get_lang('Student');
                     } else {
-                        $author_status=get_lang('Teacher');
+                        $author_status = get_lang('Teacher');
                     }
 
                     $name = $userinfo['complete_name'];
-                    $author_photo= '<img src="'.$userinfo['avatar'].'" alt="'.api_htmlentities($name).'"  width="40" height="50" align="top"  title="'.api_htmlentities($name).'"  />';
+                    $author_photo = '<img src="'.$userinfo['avatar'].'" alt="'.api_htmlentities($name).'"  width="40" height="50" align="top"  title="'.api_htmlentities($name).'"  />';
 
                     //stars
                     $p_score = $row['p_score'];
@@ -3635,7 +3635,7 @@ 
                     if ($userinfo !== false) {
                         $userProfile = UserManager::getUserProfileLink($userinfo);
                     }
-                    echo '<td style=" color:#999999">' . $userProfile . ' (' . $author_status . ') '.
+                    echo '<td style=" color:#999999">'.$userProfile.' ('.$author_status.') '.
                         api_get_local_time($row['dtime'], null, date_default_timezone_get()).
                         ' - '.get_lang('Rating').': '.$row['p_score'].' '.$imagerating.' </td>';
                     echo '</tr>';
@@ -3672,7 +3672,7 @@ 
         }
         echo '</div>';
 
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { //only by professors if page is hidden
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { //only by professors if page is hidden
             $sql = 'SELECT  *
                     FROM  '.$tbl_wiki.' s1
         		    WHERE s1.c_id = '.$course_id.' AND id=(
@@ -3698,11 +3698,11 @@ 
                 $username = api_htmlentities(sprintf(get_lang('LoginX'), $userinfo['username']), ENT_QUOTES);
 
                 //get type assignment icon
-                if ($obj->assignment==1) {
-                    $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==2) {
-                    $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==0) {
+                if ($obj->assignment == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 2) {
+                    $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 0) {
                     $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
 
@@ -3725,29 +3725,29 @@ 
                 }
                 $row[] = api_get_local_time($obj->dtime, null, date_default_timezone_get());
                 $showdelete = '';
-                if (api_is_allowed_to_edit(false,true)|| api_is_platform_admin()) {
-                    $showdelete =' <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=delete&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL);
+                if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
+                    $showdelete = ' <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=delete&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
+                        Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL);
                 }
-                if (api_is_allowed_to_session_edit(false,true) ) {
+                if (api_is_allowed_to_session_edit(false, true)) {
                     $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=edit&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('edit.png', get_lang('EditPage'),'',ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=discuss&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('discuss.png', get_lang('Discuss'),'',ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=history&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('history.png', get_lang('History'),'',ICON_SIZE_SMALL).'</a>
+                        Display::return_icon('edit.png', get_lang('EditPage'), '', ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=discuss&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
+                        Display::return_icon('discuss.png', get_lang('Discuss'), '', ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=history&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
+                        Display::return_icon('history.png', get_lang('History'), '', ICON_SIZE_SMALL).'</a>
                         <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=links&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                        Display::return_icon('what_link_here.png', get_lang('LinksPages'),'',ICON_SIZE_SMALL).'</a>'.$showdelete;
+                        Display::return_icon('what_link_here.png', get_lang('LinksPages'), '', ICON_SIZE_SMALL).'</a>'.$showdelete;
                 }
                 $rows[] = $row;
             }
 
-            $table = new SortableTableFromArrayConfig($rows,1,10,'AllPages_table','','','ASC');
-            $table->set_additional_parameters(array('cidReq' =>Security::remove_XSS($_GET['cidReq']),'action'=>Security::remove_XSS($action),'group_id'=>Security::remove_XSS($_GET['group_id'])));
-            $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;'));
-            $table->set_header(1,get_lang('Title'), true);
-            $table->set_header(2,get_lang('Author').' ('.get_lang('LastVersion').')', true);
-            $table->set_header(3,get_lang('Date').' ('.get_lang('LastVersion').')', true);
-            if (api_is_allowed_to_session_edit(false,true) ) {
-                $table->set_header(4,get_lang('Actions'), true, array ('style' => 'width:130px;'));
+            $table = new SortableTableFromArrayConfig($rows, 1, 10, 'AllPages_table', '', '', 'ASC');
+            $table->set_additional_parameters(array('cidReq' =>Security::remove_XSS($_GET['cidReq']), 'action'=>Security::remove_XSS($action), 'group_id'=>Security::remove_XSS($_GET['group_id'])));
+            $table->set_header(0, get_lang('Type'), true, array('style' => 'width:30px;'));
+            $table->set_header(1, get_lang('Title'), true);
+            $table->set_header(2, get_lang('Author').' ('.get_lang('LastVersion').')', true);
+            $table->set_header(3, get_lang('Date').' ('.get_lang('LastVersion').')', true);
+            if (api_is_allowed_to_session_edit(false, true)) {
+                $table->set_header(4, get_lang('Actions'), true, array('style' => 'width:130px;'));
             }
             $table->display();
         }
@@ -3767,13 +3767,13 @@ 
         $groupfilter = $this->groupfilter;
         $tbl_wiki_conf = $this->tbl_wiki_conf;
 
-        if (api_is_allowed_to_session_edit(false,true) ) {
-            if (self::check_notify_all()==1) {
-                $notify_all= Display::return_icon('messagebox_info.png', get_lang('NotifyByEmail'),'',ICON_SIZE_SMALL).' '.get_lang('NotNotifyChanges');
-                $lock_unlock_notify_all='unlocknotifyall';
+        if (api_is_allowed_to_session_edit(false, true)) {
+            if (self::check_notify_all() == 1) {
+                $notify_all = Display::return_icon('messagebox_info.png', get_lang('NotifyByEmail'), '', ICON_SIZE_SMALL).' '.get_lang('NotNotifyChanges');
+                $lock_unlock_notify_all = 'unlocknotifyall';
             } else {
-                $notify_all=Display::return_icon('mail.png', get_lang('CancelNotifyByEmail'),'',ICON_SIZE_SMALL).' '.get_lang('NotifyChanges');
-                $lock_unlock_notify_all='locknotifyall';
+                $notify_all = Display::return_icon('mail.png', get_lang('CancelNotifyByEmail'), '', ICON_SIZE_SMALL).' '.get_lang('NotifyChanges');
+                $lock_unlock_notify_all = 'locknotifyall';
             }
         }
 
@@ -3781,7 +3781,7 @@ 
         echo '<a href="index.php?action=recentchanges&amp;actionpage='.$lock_unlock_notify_all.'&amp;title='.api_htmlentities(urlencode($page)).'">'.$notify_all.'</a>';
         echo '</span>'.get_lang('RecentChanges').'</div>';
 
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { //only by professors if page is hidden
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { //only by professors if page is hidden
             $sql = 'SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.'
         		WHERE 	'.$tbl_wiki_conf.'.c_id= '.$course_id.' AND
         				'.$tbl_wiki.'.c_id= '.$course_id.' AND
@@ -3809,19 +3809,19 @@ 
                 $userinfo = api_get_user_info($obj->user_id);
 
                 //get type assignment icon
-                if ($obj->assignment==1) {
-                    $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==2) {
-                    $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==0) {
-                    $ShowAssignment=Display::return_icon('px_transparent.gif');
+                if ($obj->assignment == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 2) {
+                    $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 0) {
+                    $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
 
                 // Get icon task
                 if (!empty($obj->task)) {
-                    $icon_task=Display::return_icon('wiki_task.png', get_lang('StandardTask'),'',ICON_SIZE_SMALL);
+                    $icon_task = Display::return_icon('wiki_task.png', get_lang('StandardTask'), '', ICON_SIZE_SMALL);
                 } else {
-                    $icon_task=Display::return_icon('px_transparent.gif');
+                    $icon_task = Display::return_icon('px_transparent.gif');
                 }
 
                 $row = array();
@@ -3829,7 +3829,7 @@ 
                 $row[] = $ShowAssignment.$icon_task;
                 $row[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=showpage&title='.api_htmlentities(urlencode($obj->reflink)).'&amp;view='.$obj->id.'&session_id='.api_get_session_id().'&group_id='.api_get_group_id().'">'.
                     api_htmlentities($obj->title).'</a>';
-                $row[] = $obj->version>1 ? get_lang('EditedBy') : get_lang('AddedBy');
+                $row[] = $obj->version > 1 ? get_lang('EditedBy') : get_lang('AddedBy');
                 if ($userinfo !== false) {
                     $row[] = UserManager::getUserProfileLink($userinfo);
                 } else {
@@ -3838,7 +3838,7 @@ 
                 $rows[] = $row;
             }
 
-            $table = new SortableTableFromArrayConfig($rows,0,10,'RecentPages_table','','','DESC');
+            $table = new SortableTableFromArrayConfig($rows, 0, 10, 'RecentPages_table', '', '', 'DESC');
             $table->set_additional_parameters(
                 array(
                     'cidReq' =>api_get_course_id(),
@@ -3847,11 +3847,11 @@ 
                     'group_id' => api_get_group_id()
                 )
             );
-            $table->set_header(0,get_lang('Date'), true, array ('style' => 'width:200px;'));
-            $table->set_header(1,get_lang('Type'), true, array ('style' => 'width:30px;'));
-            $table->set_header(2,get_lang('Title'), true);
-            $table->set_header(3,get_lang('Actions'), true, array ('style' => 'width:80px;'));
-            $table->set_header(4,get_lang('Author'), true);
+            $table->set_header(0, get_lang('Date'), true, array('style' => 'width:200px;'));
+            $table->set_header(1, get_lang('Type'), true, array('style' => 'width:30px;'));
+            $table->set_header(2, get_lang('Title'), true);
+            $table->set_header(3, get_lang('Actions'), true, array('style' => 'width:80px;'));
+            $table->set_header(4, get_lang('Author'), true);
             $table->display();
         }
     }
@@ -3883,17 +3883,17 @@ 
 
             //get type assignment icon
             $ShowAssignment = '';
-            if ($row['assignment']==1) {
-                $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL);
-            } elseif ($row['assignment']==2) {
-                $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-            } elseif ($row['assignment']==0) {
-                $ShowAssignment=Display::return_icon('px_transparent.gif');
+            if ($row['assignment'] == 1) {
+                $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL);
+            } elseif ($row['assignment'] == 2) {
+                $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+            } elseif ($row['assignment'] == 0) {
+                $ShowAssignment = Display::return_icon('px_transparent.gif');
             }
 
             //fix Title to reflink (link Main Page)
-            if ($page==get_lang('DefaultTitle')) {
-                $page='index';
+            if ($page == get_lang('DefaultTitle')) {
+                $page = 'index';
             }
 
             echo '<div id="wikititle">';
@@ -3904,11 +3904,11 @@ 
             //fix index to title Main page into linksto
 
             if ($page == 'index') {
-                $page = str_replace(' ','_',get_lang('DefaultTitle'));
+                $page = str_replace(' ', '_', get_lang('DefaultTitle'));
             }
 
             //table
-            if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+            if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                 //only by professors if page is hidden
                 $sql = "SELECT * FROM ".$tbl_wiki." s1
                         WHERE s1.c_id = $course_id AND linksto LIKE '%".Database::escape_string($page)."%' AND id=(
@@ -3935,10 +3935,10 @@ 
                     //get time
                     $year 	 = substr($obj->dtime, 0, 4);
                     $month	 = substr($obj->dtime, 5, 2);
-                    $day 	 = substr($obj->dtime, 8, 2);
-                    $hours   = substr($obj->dtime, 11,2);
-                    $minutes = substr($obj->dtime, 14,2);
-                    $seconds = substr($obj->dtime, 17,2);
+                    $day = substr($obj->dtime, 8, 2);
+                    $hours   = substr($obj->dtime, 11, 2);
+                    $minutes = substr($obj->dtime, 14, 2);
+                    $seconds = substr($obj->dtime, 17, 2);
 
                     //get type assignment icon
                     if ($obj->assignment == 1) {
@@ -3950,7 +3950,7 @@ 
                     }
 
                     $row = array();
-                    $row[] =$ShowAssignment;
+                    $row[] = $ShowAssignment;
                     $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=showpage&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
                         api_htmlentities($obj->title).'</a>';
                     if ($userinfo !== false) {
@@ -4057,13 +4057,13 @@ 
         $userId = intval($userId);
         $userinfo = api_get_user_info($userId);
         if ($userinfo !== false) {
-            echo '<div class="actions">' . get_lang('UserContributions') . ': ' . UserManager::getUserProfileLink($userinfo) .
-                '<a href="' . api_get_self() . '?cidReq=' . $_course['code'] . '&action=usercontrib&user_id=' . $userId .
-                '&session_id=' . $this->session_id . '&group_id=' . $this->group_id . '">' .
+            echo '<div class="actions">'.get_lang('UserContributions').': '.UserManager::getUserProfileLink($userinfo).
+                '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=usercontrib&user_id='.$userId.
+                '&session_id='.$this->session_id.'&group_id='.$this->group_id.'">'.
                 '</a></div>';
         }
 
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
             //only by professors if page is hidden
             $sql = 'SELECT * FROM '.$tbl_wiki.'
                     WHERE
@@ -4088,19 +4088,19 @@ 
                 // Get time
                 $year 	 = substr($obj->dtime, 0, 4);
                 $month	 = substr($obj->dtime, 5, 2);
-                $day 	 = substr($obj->dtime, 8, 2);
-                $hours   = substr($obj->dtime, 11,2);
-                $minutes = substr($obj->dtime, 14,2);
-                $seconds = substr($obj->dtime, 17,2);
+                $day = substr($obj->dtime, 8, 2);
+                $hours   = substr($obj->dtime, 11, 2);
+                $minutes = substr($obj->dtime, 14, 2);
+                $seconds = substr($obj->dtime, 17, 2);
 
                 //get type assignment icon
                 $ShowAssignment = '';
-                if ($obj->assignment==1) {
-                    $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==2) {
-                    $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==0) {
-                    $ShowAssignment= Display::return_icon('px_transparent.gif');
+                if ($obj->assignment == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 2) {
+                    $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 0) {
+                    $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
 
                 $row = array();
@@ -4116,7 +4116,7 @@ 
 
             }
 
-            $table = new SortableTableFromArrayConfig($rows,2,10,'UsersContributions_table','','','ASC');
+            $table = new SortableTableFromArrayConfig($rows, 2, 10, 'UsersContributions_table', '', '', 'ASC');
             $table->set_additional_parameters(
                 array(
                     'cidReq' => Security::remove_XSS($_GET['cidReq']),
@@ -4126,13 +4126,13 @@ 
                     'group_id' => intval($_GET['group_id']),
                 )
             );
-            $table->set_header(0,get_lang('Date'), true, array ('style' => 'width:200px;'));
-            $table->set_header(1,get_lang('Type'), true, array ('style' => 'width:30px;'));
-            $table->set_header(2,get_lang('Title'), true, array ('style' => 'width:200px;'));
-            $table->set_header(3,get_lang('Version'), true, array ('style' => 'width:30px;'));
-            $table->set_header(4,get_lang('Comment'), true, array ('style' => 'width:200px;'));
-            $table->set_header(5,get_lang('Progress'), true, array ('style' => 'width:30px;'));
-            $table->set_header(6,get_lang('Rating'), true, array ('style' => 'width:30px;'));
+            $table->set_header(0, get_lang('Date'), true, array('style' => 'width:200px;'));
+            $table->set_header(1, get_lang('Type'), true, array('style' => 'width:30px;'));
+            $table->set_header(2, get_lang('Title'), true, array('style' => 'width:200px;'));
+            $table->set_header(3, get_lang('Version'), true, array('style' => 'width:30px;'));
+            $table->set_header(4, get_lang('Comment'), true, array('style' => 'width:200px;'));
+            $table->set_header(5, get_lang('Progress'), true, array('style' => 'width:30px;'));
+            $table->set_header(6, get_lang('Rating'), true, array('style' => 'width:30px;'));
             $table->display();
         }
     }
@@ -4150,7 +4150,7 @@ 
 
         echo '<div class="actions">'.get_lang('MostChangedPages').'</div>';
 
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { //only by professors if page is hidden
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { //only by professors if page is hidden
             $sql = 'SELECT *, MAX(version) AS MAX FROM '.$tbl_wiki.'
                     WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
                     GROUP BY reflink';//TODO:check MAX and group by return last version
@@ -4168,12 +4168,12 @@ 
             while ($obj = Database::fetch_object($allpages)) {
                 //get type assignment icon
                 $ShowAssignment = '';
-                if ($obj->assignment==1) {
-                    $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==2) {
-                    $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==0) {
-                    $ShowAssignment= Display::return_icon('px_transparent.gif');
+                if ($obj->assignment == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 2) {
+                    $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 0) {
+                    $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
 
                 $row = array();
@@ -4201,9 +4201,9 @@ 
                     'group_id' => intval($_GET['group_id']),
                 )
             );
-            $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;'));
-            $table->set_header(1,get_lang('Title'), true);
-            $table->set_header(2,get_lang('Changes'), true);
+            $table->set_header(0, get_lang('Type'), true, array('style' => 'width:30px;'));
+            $table->set_header(1, get_lang('Title'), true);
+            $table->set_header(2, get_lang('Changes'), true);
             $table->display();
         }
     }
@@ -4228,7 +4228,7 @@ 
         /* Only teachers and platform admin can edit the index page.
         Only teachers and platform admin can edit an assignment teacher*/
         if (($current_row['reflink'] == 'index' || $current_row['reflink'] == '' || $current_row['assignment'] == 1) &&
-            (!api_is_allowed_to_edit(false,true) && $this->group_id == 0)
+            (!api_is_allowed_to_edit(false, true) && $this->group_id == 0)
         ) {
             Display::addFlash(
                 Display::display_normal_message(get_lang('OnlyEditPagesCourseManager'), false, true)
@@ -4239,7 +4239,7 @@ 
             if ($current_row['group_id'] != 0) {
                 $groupInfo = GroupManager::get_group_properties($this->group_id);
                 //Only teacher, platform admin and group members can edit a wiki group
-                if (api_is_allowed_to_edit(false,true) ||
+                if (api_is_allowed_to_edit(false, true) ||
                     api_is_platform_admin() ||
                     GroupManager :: is_user_in_group($userId, $groupInfo['iid']) ||
                     api_is_allowed_in_course()
@@ -4258,9 +4258,9 @@ 
             //$icon_assignment = null;
             if ($current_row['assignment'] == 1) {
                 Display::addFlash(Display::display_normal_message(get_lang('EditAssignmentWarning'), false, true));
-            } elseif($current_row['assignment']==2) {
-                if (($userId == $current_row['user_id'])==false) {
-                    if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+            } elseif ($current_row['assignment'] == 2) {
+                if (($userId == $current_row['user_id']) == false) {
+                    if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                         $PassEdit = true;
                     } else {
                         Display::addFlash(Display::display_warning_message(get_lang('LockByTeacher'), false, true));
@@ -4274,11 +4274,11 @@ 
             //show editor if edit is allowed
             if ($PassEdit) {
                 if ($current_row['editlock'] == 1 &&
-                    (api_is_allowed_to_edit(false,true)==false || api_is_platform_admin()==false)
+                    (api_is_allowed_to_edit(false, true) == false || api_is_platform_admin() == false)
                 ) {
                     Display::addFlash(Display::display_normal_message(get_lang('PageLockedExtra'), false, true));
                 } else {
-                    if ($last_row['is_editing']!=0 && $last_row['is_editing'] != $userId) {
+                    if ($last_row['is_editing'] != 0 && $last_row['is_editing'] != $userId) {
                         // Checking for concurrent users
                         $timestamp_edit = strtotime($last_row['time_edit']);
                         $time_editing = time() - $timestamp_edit;
@@ -4287,7 +4287,7 @@ 
                         $userinfo = api_get_user_info($last_row['is_editing']);
                         $is_being_edited = get_lang('ThisPageisBeginEditedBy').' <a href='.$userinfo['profile_url'].'>'.
                             Display::tag('span', $userinfo['complete_name_with_username']).
-                            get_lang('ThisPageisBeginEditedTryLater').' '.date( "i",$rest_time).' '.get_lang('MinMinutes');
+                            get_lang('ThisPageisBeginEditedTryLater').' '.date("i", $rest_time).' '.get_lang('MinMinutes');
                         Display::addFlash(Display::display_normal_message($is_being_edited, false, true));
                     } else {
                         Display::addFlash(Display::display_confirmation_message(
@@ -4395,9 +4395,9 @@ 
                 GROUP BY reflink
                 ORDER BY reflink ASC';
         $allpages = Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
-            if ($row['reflink']=='index') {
-                $row['reflink']=str_replace(' ', '_', get_lang('DefaultTitle'));
+        while ($row = Database::fetch_array($allpages)) {
+            if ($row['reflink'] == 'index') {
+                $row['reflink'] = str_replace(' ', '_', get_lang('DefaultTitle'));
             }
             $pages[] = $row['reflink'];
         }
@@ -4415,16 +4415,16 @@ 
 
         $allpages = Database::query($sql);
 
-        while ($row=Database::fetch_array($allpages)) {
+        while ($row = Database::fetch_array($allpages)) {
             //remove self reference
-            $row['linksto']= str_replace($row["reflink"], " ", trim($row["linksto"]));
+            $row['linksto'] = str_replace($row["reflink"], " ", trim($row["linksto"]));
             $refs = explode(" ", trim($row["linksto"]));
 
             // Find linksto into reflink. If found ->page is linked
             foreach ($refs as $v) {
                 if (in_array($v, $pages)) {
-                    if (trim($v)!="") {
-                        $linked[]=$v;
+                    if (trim($v) != "") {
+                        $linked[] = $v;
                     }
                 }
             }
@@ -4436,12 +4436,12 @@ 
         $rows = array();
         foreach ($linked as $linked_show) {
             $row = array();
-            $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=showpage&title='.api_htmlentities(urlencode(str_replace('_',' ',$linked_show))).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
-                str_replace('_',' ',$linked_show).'</a>';
+            $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=showpage&title='.api_htmlentities(urlencode(str_replace('_', ' ', $linked_show))).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.
+                str_replace('_', ' ', $linked_show).'</a>';
             $rows[] = $row;
         }
 
-        $table = new SortableTableFromArrayConfig($rows,0,10,'LinkedPages_table','','','DESC');
+        $table = new SortableTableFromArrayConfig($rows, 0, 10, 'LinkedPages_table', '', '', 'DESC');
         $table->set_additional_parameters(
             array(
                 'cidReq' => Security::remove_XSS($_GET['cidReq']),
@@ -4450,7 +4450,7 @@ 
                 'group_id' => intval($_GET['group_id']),
             )
         );
-        $table->set_header(0,get_lang('Title'), true);
+        $table->set_header(0, get_lang('Title'), true);
         $table->display();
     }
 
@@ -4475,8 +4475,8 @@ 
                 WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
                 GROUP BY reflink
                 ORDER BY reflink ASC';
-        $allpages=Database::query($sql);
-        while ($row=Database::fetch_array($allpages)) {
+        $allpages = Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
             $pages[] = $row['reflink'];
         }
 
@@ -4491,14 +4491,14 @@ 
                 )';
         $allpages = Database::query($sql);
         $array_refs_linked = array();
-        while ($row=Database::fetch_array($allpages)) {
-            $row['linksto']= str_replace($row["reflink"], " ", trim($row["linksto"])); //remove self reference
+        while ($row = Database::fetch_array($allpages)) {
+            $row['linksto'] = str_replace($row["reflink"], " ", trim($row["linksto"])); //remove self reference
             $refs = explode(" ", trim($row["linksto"]));
-            foreach ($refs as $ref_linked){
-                if ($ref_linked==str_replace(' ','_',get_lang('DefaultTitle'))) {
-                    $ref_linked='index';
+            foreach ($refs as $ref_linked) {
+                if ($ref_linked == str_replace(' ', '_', get_lang('DefaultTitle'))) {
+                    $ref_linked = 'index';
                 }
-                $array_refs_linked[]= $ref_linked;
+                $array_refs_linked[] = $ref_linked;
             }
         }
 
@@ -4520,20 +4520,20 @@ 
 		                '.$groupfilter.$condition_session.' AND
 		                reflink="'.Database::escape_string($orphaned_show).'"
                     GROUP BY reflink';
-            $allpages=Database::query($sql);
-            while ($row=Database::fetch_array($allpages)) {
-                $orphaned_title=$row['title'];
-                $orphaned_visibility=$row['visibility'];
-                if ($row['assignment']==1) {
-                    $ShowAssignment=Display::return_icon('wiki_assignment.png','','',ICON_SIZE_SMALL);
-                } elseif ($row['assignment']==2) {
-                    $ShowAssignment=Display::return_icon('wiki_work.png','','',ICON_SIZE_SMALL);
-                } elseif ($row['assignment']==0) {
-                    $ShowAssignment= Display::return_icon('px_transparent.gif');
+            $allpages = Database::query($sql);
+            while ($row = Database::fetch_array($allpages)) {
+                $orphaned_title = $row['title'];
+                $orphaned_visibility = $row['visibility'];
+                if ($row['assignment'] == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', '', '', ICON_SIZE_SMALL);
+                } elseif ($row['assignment'] == 2) {
+                    $ShowAssignment = Display::return_icon('wiki_work.png', '', '', ICON_SIZE_SMALL);
+                } elseif ($row['assignment'] == 0) {
+                    $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
             }
 
-            if (!api_is_allowed_to_edit(false,true) || !api_is_platform_admin() && $orphaned_visibility==0){
+            if (!api_is_allowed_to_edit(false, true) || !api_is_platform_admin() && $orphaned_visibility == 0) {
                 continue;
             }
 
@@ -4545,7 +4545,7 @@ 
             $rows[] = $row;
         }
 
-        $table = new SortableTableFromArrayConfig($rows,1, 10, 'OrphanedPages_table','','','DESC');
+        $table = new SortableTableFromArrayConfig($rows, 1, 10, 'OrphanedPages_table', '', '', 'DESC');
         $table->set_additional_parameters(
             array(
                 'cidReq' => Security::remove_XSS($_GET['cidReq']),
@@ -4554,8 +4554,8 @@ 
                 'group_id' => intval($_GET['group_id']),
             )
         );
-        $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;'));
-        $table->set_header(1,get_lang('Title'), true);
+        $table->set_header(0, get_lang('Type'), true, array('style' => 'width:30px;'));
+        $table->set_header(1, get_lang('Title'), true);
         $table->display();
     }
 
@@ -4577,11 +4577,11 @@ 
                 WHERE  c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
                 GROUP BY reflink
                 ORDER BY reflink ASC';
-        $allpages=Database::query($sql);
+        $allpages = Database::query($sql);
 
-        while ($row=Database::fetch_array($allpages)) {
-            if ($row['reflink']=='index'){
-                $row['reflink']=str_replace(' ','_',get_lang('DefaultTitle'));
+        while ($row = Database::fetch_array($allpages)) {
+            if ($row['reflink'] == 'index') {
+                $row['reflink'] = str_replace(' ', '_', get_lang('DefaultTitle'));
             }
             $pages[] = $row['reflink'];
         }
@@ -4595,31 +4595,31 @@ 
 
         $allpages = Database::query($sql);
 
-        while ($row=Database::fetch_array($allpages)) {
+        while ($row = Database::fetch_array($allpages)) {
             $refs = explode(" ", trim($row["linksto"]));
             // Find linksto into reflink. If not found ->page is wanted
             foreach ($refs as $v) {
 
                 if (!in_array($v, $pages)) {
-                    if (trim($v)!="") {
-                        $wanted[]=$v;
+                    if (trim($v) != "") {
+                        $wanted[] = $v;
                     }
                 }
             }
         }
 
-        $wanted = array_unique($wanted);//make a unique list
+        $wanted = array_unique($wanted); //make a unique list
 
         //show table
         $rows = array();
         foreach ($wanted as $wanted_show) {
             $row = array();
             $wanted_show = Security::remove_XSS($wanted_show);
-            $row[] = '<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?cidReq=&action=addnew&title='.str_replace('_',' ',$wanted_show).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'" class="new_wiki_link">'.str_replace('_',' ',$wanted_show).'</a>';//meter un remove xss en lugar de htmlentities
+            $row[] = '<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?cidReq=&action=addnew&title='.str_replace('_', ' ', $wanted_show).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'" class="new_wiki_link">'.str_replace('_', ' ', $wanted_show).'</a>'; //meter un remove xss en lugar de htmlentities
             $rows[] = $row;
         }
 
-        $table = new SortableTableFromArrayConfig($rows,0,10,'WantedPages_table','','','DESC');
+        $table = new SortableTableFromArrayConfig($rows, 0, 10, 'WantedPages_table', '', '', 'DESC');
         $table->set_additional_parameters(
             array(
                 'cidReq' => Security::remove_XSS($_GET['cidReq']),
@@ -4628,7 +4628,7 @@ 
                 'group_id' => intval($_GET['group_id']),
             )
         );
-        $table->set_header(0,get_lang('Title'), true);
+        $table->set_header(0, get_lang('Title'), true);
         $table->display();
     }
 
@@ -4645,7 +4645,7 @@ 
 
         echo '<div class="actions">'.get_lang('MostVisitedPages').'</div>';
 
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { //only by professors if page is hidden
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { //only by professors if page is hidden
             $sql = 'SELECT *, SUM(hits) AS tsum FROM '.$tbl_wiki.'
                     WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
                     GROUP BY reflink';
@@ -4666,11 +4666,11 @@ 
             while ($obj = Database::fetch_object($allpages)) {
                 //get type assignment icon
                 $ShowAssignment = '';
-                if ($obj->assignment==1) {
-                    $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==2) {
-                    $ShowAssignment=$ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL);
-                } elseif ($obj->assignment==0) {
+                if ($obj->assignment == 1) {
+                    $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 2) {
+                    $ShowAssignment = $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL);
+                } elseif ($obj->assignment == 0) {
                     $ShowAssignment = Display::return_icon('px_transparent.gif');
                 }
 
@@ -4699,7 +4699,7 @@ 
                     'group_id' => intval($_GET['group_id']),
                 )
             );
-            $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;'));
+            $table->set_header(0, get_lang('Type'), true, array('style' => 'width:30px;'));
             $table->set_header(1, get_lang('Title'), true);
             $table->set_header(2, get_lang('Visits'), true);
             $table->display();
@@ -4724,8 +4724,8 @@ 
 
         if (api_is_allowed_to_session_edit(false, true) && api_is_allowed_to_edit()) {
             // menu add page
-            $actionsLeft .= '<a href="index.php?cidReq=' . $_course['id'] . '&action=addnew&session_id=' . $session_id . '&group_id=' . $groupId . '"' . self::is_active_navigation_tab('addnew').'>'
-            . Display::return_icon('add.png', get_lang('AddNew'), '', ICON_SIZE_MEDIUM) . '</a>';
+            $actionsLeft .= '<a href="index.php?cidReq='.$_course['id'].'&action=addnew&session_id='.$session_id.'&group_id='.$groupId.'"'.self::is_active_navigation_tab('addnew').'>'
+            . Display::return_icon('add.png', get_lang('AddNew'), '', ICON_SIZE_MEDIUM).'</a>';
         }
 
         $lock_unlock_addnew = null;
@@ -4733,12 +4733,12 @@ 
 
         if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
             // page action: enable or disable the adding of new pages
-            if (self::check_addnewpagelock()==0) {
+            if (self::check_addnewpagelock() == 0) {
                 $protect_addnewpage = Display::return_icon('off.png', get_lang('AddOptionProtected'));
-                $lock_unlock_addnew ='unlockaddnew';
+                $lock_unlock_addnew = 'unlockaddnew';
             } else {
                 $protect_addnewpage = Display::return_icon('on.png', get_lang('AddOptionUnprotected'));
-                $lock_unlock_addnew ='lockaddnew';
+                $lock_unlock_addnew = 'lockaddnew';
             }
         }
 
@@ -4774,7 +4774,7 @@ 
             return;
         }
 
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
             Display::addFlash('<div id="wikititle">'.get_lang('DeletePageHistory').'</div>');
 
             if ($page == "index") {
@@ -4816,7 +4816,7 @@ 
         $userId = api_get_user_id();
 
         if (api_get_session_id() != 0 &&
-            api_is_allowed_to_session_edit(false,true) == false
+            api_is_allowed_to_session_edit(false, true) == false
         ) {
             api_not_allowed();
         }
@@ -4839,12 +4839,12 @@ 
                 Display::display_error_message(get_lang('MustSelectPage'), false, true)
             );
             return;
-        } elseif ($row['content']=='' && $row['title']=='' && $page=='index') {
+        } elseif ($row['content'] == '' && $row['title'] == '' && $page == 'index') {
 
             // Table structure for better export to pdf
             $default_table_for_content_Start = '<table align="center" border="0"><tr><td align="center">';
             $default_table_for_content_End = '</td></tr></table>';
-            $content = $default_table_for_content_Start.sprintf(get_lang('DefaultContent'),api_get_path(WEB_IMG_PATH)).$default_table_for_content_End;
+            $content = $default_table_for_content_Start.sprintf(get_lang('DefaultContent'), api_get_path(WEB_IMG_PATH)).$default_table_for_content_End;
             $title = get_lang('DefaultTitle');
             $page_id = 0;
         } else {
@@ -4871,7 +4871,7 @@ 
             if (!empty($groupId)) {
                 $groupInfo = GroupManager::get_group_properties($groupId);
                 //Only teacher, platform admin and group members can edit a wiki group
-                if (api_is_allowed_to_edit(false,true) ||
+                if (api_is_allowed_to_edit(false, true) ||
                     api_is_platform_admin() ||
                     GroupManager :: is_user_in_group($userId, $groupInfo['iid'])
                 ) {
@@ -4884,7 +4884,7 @@ 
                     );
                 }
             } else {
-                $PassEdit=true;
+                $PassEdit = true;
             }
 
             $icon_assignment = null;
@@ -4894,10 +4894,10 @@ 
                     Display::return_message(get_lang('EditAssignmentWarning'))
                 );
 
-                $icon_assignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',ICON_SIZE_SMALL);
+                $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL);
             } elseif ($row['assignment'] == 2) {
-                $icon_assignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'),'',ICON_SIZE_SMALL);
-                if (($userId == $row['user_id'])==false) {
+                $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'), '', ICON_SIZE_SMALL);
+                if (($userId == $row['user_id']) == false) {
                     if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                         $PassEdit = true;
                     } else {
@@ -4917,7 +4917,7 @@ 
             if ($PassEdit) {
                 //show editor if edit is allowed <<<<<
                 if ($row['editlock'] == 1 &&
-                    (api_is_allowed_to_edit(false, true) == false || api_is_platform_admin()==false)
+                    (api_is_allowed_to_edit(false, true) == false || api_is_platform_admin() == false)
                 ) {
                     Display::addFlash(
                         Display::return_message(
@@ -4927,7 +4927,7 @@ 
                 } else {
                     // Check tasks
 
-                    if (!empty($row['startdate_assig']) &&  time() < api_strtotime($row['startdate_assig'])
+                    if (!empty($row['startdate_assig']) && time() < api_strtotime($row['startdate_assig'])
                     ) {
                         $message = get_lang('TheTaskDoesNotBeginUntil').': '.api_get_local_time($row['startdate_assig']);
 
@@ -4945,7 +4945,7 @@ 
 
                     if (!empty($row['enddate_assig']) &&
                         time() > strtotime($row['enddate_assig']) &&
-                        $row['delayedsubmit']==0
+                        $row['delayedsubmit'] == 0
                     ) {
                         $message = get_lang('TheDeadlineHasBeenCompleted').': '.api_get_local_time($row['enddate_assig']);
                         Display::addFlash(
@@ -4954,20 +4954,20 @@ 
                                 'warning'
                             )
                         );
-                        if (!api_is_allowed_to_edit(false,true)) {
+                        if (!api_is_allowed_to_edit(false, true)) {
                             $this->redirectHome();
                         }
                     }
 
-                    if (!empty($row['max_version']) && $row['version']>=$row['max_version']) {
-                        $message=get_lang('HasReachedMaxiNumVersions');
+                    if (!empty($row['max_version']) && $row['version'] >= $row['max_version']) {
+                        $message = get_lang('HasReachedMaxiNumVersions');
                         Display::addFlash(
                             Display::return_message(
                                 $message,
                                 'warning'
                             )
                         );
-                        if (!api_is_allowed_to_edit(false,true)) {
+                        if (!api_is_allowed_to_edit(false, true)) {
                             $this->redirectHome();
                         }
                     }
@@ -4980,7 +4980,7 @@ 
                                 'warning'
                             )
                         );
-                        if (!api_is_allowed_to_edit(false,true)) {
+                        if (!api_is_allowed_to_edit(false, true)) {
                             $this->redirectHome();
                         }
                     }
@@ -4988,7 +4988,7 @@ 
                     if (!empty($row['task'])) {
                         //previous change 0 by text
                         if (!empty($row['startdate_assig'])) {
-                            $message_task_startdate  =get_lang('No');
+                            $message_task_startdate = get_lang('No');
                         } else {
                             $message_task_startdate = api_get_local_time($row['startdate_assig']);
                         }
@@ -4999,31 +4999,31 @@ 
                             $message_task_enddate = api_get_local_time($row['enddate_assig']);
                         }
 
-                        if ($row['delayedsubmit']==0) {
-                            $message_task_delayedsubmit=get_lang('No');
+                        if ($row['delayedsubmit'] == 0) {
+                            $message_task_delayedsubmit = get_lang('No');
                         } else {
-                            $message_task_delayedsubmit=get_lang('Yes');
+                            $message_task_delayedsubmit = get_lang('Yes');
                         }
 
-                        if ($row['max_version']==0) {
-                            $message_task_max_version=get_lang('No');
+                        if ($row['max_version'] == 0) {
+                            $message_task_max_version = get_lang('No');
                         } else {
-                            $message_task_max_version=$row['max_version'];
+                            $message_task_max_version = $row['max_version'];
                         }
 
-                        if ($row['max_text']==0) {
-                            $message_task_max_text=get_lang('No');
+                        if ($row['max_text'] == 0) {
+                            $message_task_max_text = get_lang('No');
                         } else {
-                            $message_task_max_text=$row['max_text'];
+                            $message_task_max_text = $row['max_text'];
                         }
 
                         // Comp message
-                        $message_task='<b>'.get_lang('DescriptionOfTheTask').'</b><p>'.$row['task'].'</p><hr>';
-                        $message_task.='<p>'.get_lang('StartDate').': '.$message_task_startdate.'</p>';
-                        $message_task.='<p>'.get_lang('EndDate').': '.$message_task_enddate;
-                        $message_task.=' ('.get_lang('AllowLaterSends').') '.$message_task_delayedsubmit.'</p>';
-                        $message_task.='<p>'.get_lang('OtherSettings').': '.get_lang('NMaxVersion').': '.$message_task_max_version;
-                        $message_task.=' '.get_lang('NMaxWords').': '.$message_task_max_text;
+                        $message_task = '<b>'.get_lang('DescriptionOfTheTask').'</b><p>'.$row['task'].'</p><hr>';
+                        $message_task .= '<p>'.get_lang('StartDate').': '.$message_task_startdate.'</p>';
+                        $message_task .= '<p>'.get_lang('EndDate').': '.$message_task_enddate;
+                        $message_task .= ' ('.get_lang('AllowLaterSends').') '.$message_task_delayedsubmit.'</p>';
+                        $message_task .= '<p>'.get_lang('OtherSettings').': '.get_lang('NMaxVersion').': '.$message_task_max_version;
+                        $message_task .= ' '.get_lang('NMaxWords').': '.$message_task_max_text;
                         // Display message
                         Display::addFlash(
                             Display::return_message(
@@ -5034,11 +5034,11 @@ 
 
                     $feedback_message = '';
                     if ($row['progress'] == $row['fprogress1'] && !empty($row['fprogress1'])) {
-                        $feedback_message='<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback1']).'</p>';
+                        $feedback_message = '<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback1']).'</p>';
                     } elseif ($row['progress'] == $row['fprogress2'] && !empty($row['fprogress2'])) {
-                        $feedback_message='<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback2']).'</p>';
+                        $feedback_message = '<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback2']).'</p>';
                     } elseif ($row['progress'] == $row['fprogress3'] && !empty($row['fprogress3'])) {
-                        $feedback_message='<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback3']).'</p>';
+                        $feedback_message = '<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback3']).'</p>';
                     }
 
                     if (!empty($feedback_message)) {
@@ -5063,15 +5063,15 @@ 
                                 WHERE c_id = '.$course_id.' AND id="'.$row['id'].'"';
                         Database::query($sql);
                     } elseif ($row['is_editing'] != $userId) {
-                        $timestamp_edit=strtotime($row['time_edit']);
+                        $timestamp_edit = strtotime($row['time_edit']);
                         $time_editing = time() - $timestamp_edit;
                         $max_edit_time = 1200; // 20 minutes
                         $rest_time = $max_edit_time - $time_editing;
 
                         $userinfo = api_get_user_info($row['is_editing']);
                         if ($userinfo !== false) {
-                            $is_being_edited = get_lang('ThisPageisBeginEditedBy') . ' ' . UserManager::getUserProfileLink($userinfo) . '
-                            ' . get_lang('ThisPageisBeginEditedTryLater') . ' ' . date("i", $rest_time) . ' ' . get_lang('MinMinutes') . '';
+                            $is_being_edited = get_lang('ThisPageisBeginEditedBy').' '.UserManager::getUserProfileLink($userinfo).'
+                            ' . get_lang('ThisPageisBeginEditedTryLater').' '.date("i", $rest_time).' '.get_lang('MinMinutes').'';
                         }
 
                         Display::addFlash(
@@ -5088,7 +5088,7 @@ 
                     // Form.
                     $url = api_get_self().'?action=edit&title='.urlencode($page).'&session_id='.api_get_session_id().'&group_id='.api_get_group_id().'&'.api_get_cidreq();
                     $form = new FormValidator('wiki', 'post', $url);
-                    $form->addElement('header', $icon_assignment.str_repeat('&nbsp;',3).api_htmlentities($title));
+                    $form->addElement('header', $icon_assignment.str_repeat('&nbsp;', 3).api_htmlentities($title));
                     self::setForm($form, $row);
                     $form->addElement('hidden', 'title');
                     $form->addElement('button', 'SaveWikiChange', get_lang('Save'));
@@ -5174,7 +5174,7 @@ 
         $KeyAssignment = null;
         $KeyTitle = null;
         $KeyUserId = null;
-        while ($row=Database::fetch_array($result)) {
+        while ($row = Database::fetch_array($result)) {
             $KeyVisibility = $row['visibility'];
             $KeyAssignment = $row['assignment'];
             $KeyTitle = $row['title'];
@@ -5183,7 +5183,7 @@ 
         $icon_assignment = null;
         if ($KeyAssignment == 1) {
             $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL);
-        } elseif($KeyAssignment == 2) {
+        } elseif ($KeyAssignment == 2) {
             $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'), '', ICON_SIZE_SMALL);
         }
 
@@ -5191,10 +5191,10 @@ 
 
         //if the page is hidden and is a job only sees its author and professor
         if ($KeyVisibility == 1 ||
-            api_is_allowed_to_edit(false,true) ||
+            api_is_allowed_to_edit(false, true) ||
             api_is_platform_admin() ||
             (
-                $KeyAssignment==2 && $KeyVisibility==0 &&
+                $KeyAssignment == 2 && $KeyVisibility == 0 &&
                 ($userId == $KeyUserId)
             )
         ) {
@@ -5224,7 +5224,7 @@ 
                     get_lang('ShowDifferences').' '.get_lang('WordsDiff').'</button>';
                 echo '<br/><br/>';
 
-                $counter=0;
+                $counter = 0;
                 $total_versions = Database::num_rows($result);
 
                 while ($row = Database::fetch_array($result)) {
@@ -5232,10 +5232,10 @@ 
                     $username = api_htmlentities(sprintf(get_lang('LoginX'), $userinfo['username']), ENT_QUOTES);
 
                     echo '<li style="margin-bottom: 5px;">';
-                    ($counter==0) ? $oldstyle='style="visibility: hidden;"':$oldstyle='';
-                    ($counter==0) ? $newchecked=' checked': $newchecked='';
-                    ($counter==$total_versions-1) ? $newstyle='style="visibility: hidden;"':$newstyle='';
-                    ($counter==1) ? $oldchecked=' checked':$oldchecked='';
+                    ($counter == 0) ? $oldstyle = 'style="visibility: hidden;"' : $oldstyle = '';
+                    ($counter == 0) ? $newchecked = ' checked' : $newchecked = '';
+                    ($counter == $total_versions - 1) ? $newstyle = 'style="visibility: hidden;"' : $newstyle = '';
+                    ($counter == 1) ? $oldchecked = ' checked' : $oldchecked = '';
                     echo '<input name="old" value="'.$row['id'].'" type="radio" '.$oldstyle.' '.$oldchecked.'/> ';
                     echo '<input name="new" value="'.$row['id'].'" type="radio" '.$newstyle.' '.$newchecked.'/> ';
                     echo '<a href="'.api_get_self().'?action=showpage&amp;title='.api_htmlentities(urlencode($page)).'&amp;view='.$row['id'].'">';
@@ -5255,8 +5255,8 @@ 
                         $comment = api_substr($comment, 0, 100);
                         if ($comment !== false) {
                             $comment = api_htmlentities($comment);
-                            echo get_lang('Comments').': ' . $comment;
-                            if (api_strlen($row['comment'])>100) {
+                            echo get_lang('Comments').': '.$comment;
+                            if (api_strlen($row['comment']) > 100) {
                                 echo '... ';
                             }
                         }
@@ -5282,8 +5282,8 @@ 
 
                 $sql_new = "SELECT * FROM $tbl_wiki
                             WHERE c_id = $course_id AND id='".Database::escape_string($_POST['new'])."'";
-                $result_new=Database::query($sql_new);
-                $version_new=Database::fetch_array($result_new);
+                $result_new = Database::query($sql_new);
+                $version_new = Database::fetch_array($result_new);
                 $oldTime = isset($version_old['dtime']) ? $version_old['dtime'] : null;
                 $oldContent = isset($version_old['content']) ? $version_old['content'] : null;
 
@@ -5310,9 +5310,9 @@ 
 
 
                 if (isset($_POST['HistoryDifferences'])) {
-                    echo '<table>'.diff($oldContent, $version_new['content'], true, 'format_table_line' ).'</table>'; // format_line mode is better for words
+                    echo '<table>'.diff($oldContent, $version_new['content'], true, 'format_table_line').'</table>'; // format_line mode is better for words
                     echo '<br />';
-                    echo '<strong>'.get_lang('Legend').'</strong><div class="diff">' . "\n";
+                    echo '<strong>'.get_lang('Legend').'</strong><div class="diff">'."\n";
                     echo '<table><tr>';
                     echo  '<td>';
                     echo '</td><td>';
@@ -5331,7 +5331,7 @@ 
                     $renderer = new Text_Diff_Renderer_inline();
                     echo '<style>del{background:#fcc}ins{background:#cfc}</style>'.$renderer->render($diff); // Code inline
                     echo '<br />';
-                    echo '<strong>'.get_lang('Legend').'</strong><div class="diff">' . "\n";
+                    echo '<strong>'.get_lang('Legend').'</strong><div class="diff">'."\n";
                     echo '<table><tr>';
                     echo  '<td>';
                     echo '</td><td>';
@@ -5379,7 +5379,7 @@ 
         echo '<td style="vertical-align:top">';
         echo '<ul>';
         // Submenu Statistics
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
             echo '<li><a href="index.php?cidReq='.$_course['id'].'&action=statistics&session_id='.$session_id.'&group_id='.$groupId.'">'.get_lang('Statistics').'</a></li>';
         }
         echo '      </ul>';
@@ -5452,7 +5452,7 @@ 
                 break;
             case 'deletewiki':
                 $title = '<div class="actions">'.get_lang('DeleteWiki').'</div>';
-                if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                     $message = get_lang('ConfirmDeleteWiki');
                     $message .= '<p>
                         <a href="index.php?'.api_get_cidreq().'">'.get_lang('No').'</a>
@@ -5483,7 +5483,7 @@ 
                 self::getLinks($page);
                 break;
             case 'addnew':
-                if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {
+                if (api_get_session_id() != 0 && api_is_allowed_to_session_edit(false, true) == false) {
                     api_not_allowed();
                 }
                 $groupInfo = GroupManager::get_group_properties(api_get_group_id());
@@ -5491,7 +5491,7 @@ 
                 echo '<br/>';
                 //first, check if page index was created. chektitle=false
                 if (self::checktitle('index')) {
-                    if (api_is_allowed_to_edit(false,true) ||
+                    if (api_is_allowed_to_edit(false, true) ||
                         api_is_platform_admin() ||
                         GroupManager::is_user_in_group(api_get_user_id(), $groupInfo['iid']) ||
                         api_is_allowed_in_course()
@@ -5500,11 +5500,11 @@ 
                     } else {
                         Display::addFlash(Display::display_normal_message(get_lang('WikiStandBy'), false, true));
                     }
-                } elseif (self::check_addnewpagelock()==0 && (api_is_allowed_to_edit(false, true)==false || api_is_platform_admin()==false)) {
+                } elseif (self::check_addnewpagelock() == 0 && (api_is_allowed_to_edit(false, true) == false || api_is_platform_admin() == false)) {
                     Display::addFlash(Display::display_error_message(get_lang('AddPagesLocked'), false, true));
                 } else {
                     $groupInfo = GroupManager::get_group_properties(api_get_group_id());
-                    if (api_is_allowed_to_edit(false,true) ||
+                    if (api_is_allowed_to_edit(false, true) ||
                         api_is_platform_admin() ||
                         GroupManager::is_user_in_group(api_get_user_id(), $groupInfo['iid']) ||
                         $_GET['group_id'] == 0

Braces +4 added lines, -7 removed lines

@@ -1893,7 +1893,7 @@ 
                 $email_body = get_lang('DearUser').' '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).',<br /><br />';
                 if($session_id==0){
                     $email_body .= $emailtext.' <strong>'.$_course['name'].' - '.$group_name.'</strong><br /><br /><br />';
-                }else{
+                } else{
                     $email_body .= $emailtext.' <strong>'.$_course['name'].' ('.api_get_session_name(api_get_session_id()).') - '.$group_name.'</strong><br /><br /><br />';
                 }
                 $email_body .= $email_user_author.' ('.$email_date_changes.')<br /><br /><br />';
@@ -2283,8 +2283,7 @@ 
                                         s1.reflink = s2.reflink AND
                                         ".$groupfilter.$condition_session.")";
                     // warning don't use group by reflink because don't return the last version
-                }
-                else {
+                } else {
                     $sql = " SELECT * FROM ".$tbl_wiki." s1
                             WHERE
                                 s1.c_id = $course_id AND
@@ -3726,8 +3725,7 @@ 
                 '.api_htmlentities($obj->title).'</a>';
                 if ($userinfo !== false) {
                     $row[] = UserManager::getUserProfileLink($userinfo);
-                }
-                else {
+                } else {
                     $row[] = get_lang('Anonymous').' ('.api_htmlentities($obj->user_ip).')';
                 }
                 $row[] = api_get_local_time($obj->dtime, null, date_default_timezone_get());
@@ -3962,8 +3960,7 @@ 
                         api_htmlentities($obj->title).'</a>';
                     if ($userinfo !== false) {
                         $row[] = UserManager::getUserProfileLink($userinfo);
-                    }
-                    else {
+                    } else {
                         $row[] = get_lang('Anonymous').' ('.$obj->user_ip.')';
                     }
                     $row[] = $year.'-'.$month.'-'.$day.' '.$hours.":".$minutes.":".$seconds;

main/inc/lib/CourseChatUtils.php

Doc Comments +2 added lines, -2 removed lines

@@ -1415,7 +1415,7 @@ 
 
     /**
      * Get the emoji list to include in chat
-     * @return array
+     * @return string[]
      */
     public static function getEmojisToInclude()
     {
@@ -1738,7 +1738,7 @@ 
 
     /**
      * Get the number of users connected in chat
-     * @return mixed
+     * @return integer
      */
     public function countUsersOnline()
     {

Spacing +65 added lines, -65 removed lines

@@ -67,7 +67,7 @@ 
             return '';
         }
 
-        Emojione\Emojione::$imagePathPNG = api_get_path(WEB_LIBRARY_PATH) . 'javascript/emojione/png/';
+        Emojione\Emojione::$imagePathPNG = api_get_path(WEB_LIBRARY_PATH).'javascript/emojione/png/';
         Emojione\Emojione::$ascii = true;
 
         $message = trim($message);
@@ -113,15 +113,15 @@ 
         $user = $em->find('ChamiloUserBundle:User', $this->userId);
         $courseInfo = api_get_course_info_by_id($this->courseId);
         $isMaster = (bool) api_is_course_admin();
-        $document_path = api_get_path(SYS_COURSE_PATH) . $courseInfo['path'] . '/document';
+        $document_path = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document';
         $basepath_chat = '/chat_files';
 
         if (!$this->groupId) {
             $group_info = GroupManager::get_group_properties($this->groupId);
-            $basepath_chat = $group_info['directory'] . '/chat_files';
+            $basepath_chat = $group_info['directory'].'/chat_files';
         }
 
-        $chat_path = $document_path . $basepath_chat . '/';
+        $chat_path = $document_path.$basepath_chat.'/';
 
         if (!is_dir($chat_path)) {
             if (is_file($chat_path)) {
@@ -131,25 +131,25 @@ 
 
         $date_now = date('Y-m-d');
         $timeNow = date('d/m/y H:i:s');
-        $basename_chat = 'messages-' . $date_now;
+        $basename_chat = 'messages-'.$date_now;
 
         if ($this->groupId && !$friendId) {
-            $basename_chat = 'messages-' . $date_now . '_gid-' . $this->groupId;
+            $basename_chat = 'messages-'.$date_now.'_gid-'.$this->groupId;
         } elseif ($this->sessionId && !$friendId) {
-            $basename_chat = 'messages-' . $date_now . '_sid-' . $this->sessionId;
+            $basename_chat = 'messages-'.$date_now.'_sid-'.$this->sessionId;
         } elseif ($friendId) {
             if ($this->userId < $friendId) {
-                $basename_chat = 'messages-' . $date_now . '_uid-' . $this->userId . '-' . $friendId;
+                $basename_chat = 'messages-'.$date_now.'_uid-'.$this->userId.'-'.$friendId;
             } else {
-                $basename_chat = 'messages-' . $date_now . '_uid-' . $friendId . '-' . $this->userId;
+                $basename_chat = 'messages-'.$date_now.'_uid-'.$friendId.'-'.$this->userId;
             }
         }
 
         $message = self::prepareMessage($message);
 
-        $fileTitle = $basename_chat . '.log.html';
-        $filePath = $basepath_chat . '/' . $fileTitle;
-        $absoluteFilePath = $chat_path . $fileTitle;
+        $fileTitle = $basename_chat.'.log.html';
+        $filePath = $basepath_chat.'/'.$fileTitle;
+        $absoluteFilePath = $chat_path.$fileTitle;
 
         if (!file_exists($absoluteFilePath)) {
             $doc_id = add_document($courseInfo, $filePath, 'file', 0, $fileTitle);
@@ -182,23 +182,23 @@ 
             $fileContent = '
                 <div class="message-teacher">
                     <div class="content-message">
-                        <div class="chat-message-block-name">' . $user->getCompleteName() . '</div>
-                        <div class="chat-message-block-content">' . $message . '</div>
-                        <div class="message-date">' . $timeNow . '</div>
+                        <div class="chat-message-block-name">' . $user->getCompleteName().'</div>
+                        <div class="chat-message-block-content">' . $message.'</div>
+                        <div class="message-date">' . $timeNow.'</div>
                     </div>
                     <div class="icon-message"></div>
-                    <img class="chat-image" src="' . $userPhoto . '">
+                    <img class="chat-image" src="' . $userPhoto.'">
                 </div>
             ';
         } else {
             $fileContent = '
                 <div class="message-student">
-                    <img class="chat-image" src="' . $userPhoto . '">
+                    <img class="chat-image" src="' . $userPhoto.'">
                     <div class="icon-message"></div>
                     <div class="content-message">
-                        <div class="chat-message-block-name">' . $user->getCompleteName() . '</div>
-                        <div class="chat-message-block-content">' . $message . '</div>
-                        <div class="message-date">' . $timeNow . '</div>
+                        <div class="chat-message-block-name">' . $user->getCompleteName().'</div>
+                        <div class="chat-message-block-content">' . $message.'</div>
+                        <div class="message-date">' . $timeNow.'</div>
                     </div>
                 </div>
             ';
@@ -293,9 +293,9 @@ 
         $extraCondition = null;
 
         if ($this->groupId) {
-            $extraCondition = 'AND ccc.toGroupId = ' . intval($this->groupId);
+            $extraCondition = 'AND ccc.toGroupId = '.intval($this->groupId);
         } else {
-            $extraCondition = 'AND ccc.sessionId = ' . intval($this->sessionId);
+            $extraCondition = 'AND ccc.sessionId = '.intval($this->sessionId);
         }
 
         $currentTime = new DateTime(api_get_utc_datetime(), new DateTimeZone('UTC'));
@@ -1394,7 +1394,7 @@ 
     {
         return [
             ':bowtie:',
-            ':smile:'|
+            ':smile:' |
             ':laughing:',
             ':blush:',
             ':smiley:',
@@ -1467,17 +1467,17 @@ 
     public function getFileName($absolute = false, $friendId = 0)
     {
         $date = date('Y-m-d');
-        $base = 'messages-' . $date . '.log.html';
+        $base = 'messages-'.$date.'.log.html';
 
         if ($this->groupId && !$friendId) {
-            $base = 'messages-' . $date . '_gid-' . $this->groupId . '.log.html';
+            $base = 'messages-'.$date.'_gid-'.$this->groupId.'.log.html';
         } elseif ($this->sessionId && !$friendId) {
-            $base = 'messages-' . $date . '_sid-' . $this->sessionId . '.log.html';
+            $base = 'messages-'.$date.'_sid-'.$this->sessionId.'.log.html';
         } elseif ($friendId) {
             if ($this->userId < $friendId) {
-                $base = 'messages-' . $date . '_uid-' . $this->userId . '-' . $friendId . '.log.html';
+                $base = 'messages-'.$date.'_uid-'.$this->userId.'-'.$friendId.'.log.html';
             } else {
-                $base = 'messages-' . $date . '_uid-' . $friendId . '-' . $this->userId . '.log.html';
+                $base = 'messages-'.$date.'_uid-'.$friendId.'-'.$this->userId.'.log.html';
             }
         }
 
@@ -1486,16 +1486,16 @@ 
         }
 
         $courseInfo = api_get_course_info_by_id($this->courseId);
-        $document_path = api_get_path(SYS_COURSE_PATH) . $courseInfo['path'] . '/document';
+        $document_path = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document';
 
-        $chatPath = $document_path . '/chat_files/';
+        $chatPath = $document_path.'/chat_files/';
 
         if ($this->groupId) {
             $group_info = GroupManager::get_group_properties($this->groupId);
-            $chatPath = $document_path . $group_info['directory'] . '/chat_files/';
+            $chatPath = $document_path.$group_info['directory'].'/chat_files/';
         }
 
-        return $chatPath . $base;
+        return $chatPath.$base;
     }
 
     /**
@@ -1508,16 +1508,16 @@ 
     {
         $courseInfo = api_get_course_info_by_id($this->courseId);
         $date_now = date('Y-m-d');
-        $isMaster = (bool)api_is_course_admin();
+        $isMaster = (bool) api_is_course_admin();
         $basepath_chat = '/chat_files';
-        $document_path = api_get_path(SYS_COURSE_PATH) . $courseInfo['path'] . '/document';
+        $document_path = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document';
 
         if ($this->groupId) {
             $group_info = GroupManager:: get_group_properties($this->groupId);
-            $basepath_chat = $group_info['directory'] . '/chat_files';
+            $basepath_chat = $group_info['directory'].'/chat_files';
         }
 
-        $chat_path = $document_path . $basepath_chat . '/';
+        $chat_path = $document_path.$basepath_chat.'/';
 
         if (!is_dir($chat_path)) {
             if (is_file($chat_path)) {
@@ -1544,24 +1544,24 @@ 
             }
         }
 
-        $filename_chat = 'messages-' . $date_now . '.log.html';
+        $filename_chat = 'messages-'.$date_now.'.log.html';
 
         if ($this->groupId && !$friendId) {
-            $filename_chat = 'messages-' . $date_now . '_gid-' . $this->groupId . '.log.html';
+            $filename_chat = 'messages-'.$date_now.'_gid-'.$this->groupId.'.log.html';
         } else if ($this->sessionId && !$friendId) {
-            $filename_chat = 'messages-' . $date_now . '_sid-' . $this->sessionId . '.log.html';
+            $filename_chat = 'messages-'.$date_now.'_sid-'.$this->sessionId.'.log.html';
         } elseif ($friendId) {
             if ($this->userId < $friendId) {
-                $filename_chat = 'messages-' . $date_now . '_uid-' . $this->userId . '-' . $friendId . '.log.html';
+                $filename_chat = 'messages-'.$date_now.'_uid-'.$this->userId.'-'.$friendId.'.log.html';
             } else {
-                $filename_chat = 'messages-' . $date_now . '_uid-' . $friendId . '-' . $this->userId . '.log.html';
+                $filename_chat = 'messages-'.$date_now.'_uid-'.$friendId.'-'.$this->userId.'.log.html';
             }
         }
 
-        if (!file_exists($chat_path . $filename_chat)) {
-            @fclose(fopen($chat_path . $filename_chat, 'w'));
+        if (!file_exists($chat_path.$filename_chat)) {
+            @fclose(fopen($chat_path.$filename_chat, 'w'));
             if (!api_is_anonymous()) {
-                $doc_id = add_document($courseInfo, $basepath_chat . '/' . $filename_chat, 'file', 0, $filename_chat);
+                $doc_id = add_document($courseInfo, $basepath_chat.'/'.$filename_chat, 'file', 0, $filename_chat);
                 api_item_property_update(
                     $courseInfo,
                     TOOL_DOCUMENT,
@@ -1590,17 +1590,17 @@ 
             }
         }
 
-        $basename_chat = 'messages-' . $date_now;
+        $basename_chat = 'messages-'.$date_now;
 
         if ($this->groupId && !$friendId) {
-            $basename_chat = 'messages-' . $date_now . '_gid-' . $this->groupId;
+            $basename_chat = 'messages-'.$date_now.'_gid-'.$this->groupId;
         } else if ($this->sessionId && !$friendId) {
-            $basename_chat = 'messages-' . $date_now . '_sid-' . $this->sessionId;
+            $basename_chat = 'messages-'.$date_now.'_sid-'.$this->sessionId;
         } elseif ($friendId) {
             if ($this->userId < $friendId) {
-                $basename_chat = 'messages-' . $date_now . '_uid-' . $this->userId . '-' . $friendId;
+                $basename_chat = 'messages-'.$date_now.'_uid-'.$this->userId.'-'.$friendId;
             } else {
-                $basename_chat = 'messages-' . $date_now . '_uid-' . $friendId . '-' . $this->userId;
+                $basename_chat = 'messages-'.$date_now.'_uid-'.$friendId.'-'.$this->userId;
             }
         }
 
@@ -1608,19 +1608,19 @@ 
 
             $i = 1;
 
-            while (file_exists($chat_path . $basename_chat . '-' . $i . '.log.html')) {
+            while (file_exists($chat_path.$basename_chat.'-'.$i.'.log.html')) {
                 $i++;
             }
 
-            @rename($chat_path . $basename_chat . '.log.html', $chat_path . $basename_chat . '-' . $i . '.log.html');
-            @fclose(fopen($chat_path . $basename_chat . '.log.html', 'w'));
+            @rename($chat_path.$basename_chat.'.log.html', $chat_path.$basename_chat.'-'.$i.'.log.html');
+            @fclose(fopen($chat_path.$basename_chat.'.log.html', 'w'));
 
             $doc_id = add_document(
                 $courseInfo,
-                $basepath_chat . '/' . $basename_chat . '-' . $i . '.log.html',
+                $basepath_chat.'/'.$basename_chat.'-'.$i.'.log.html',
                 'file',
-                filesize($chat_path . $basename_chat . '-' . $i . '.log.html'),
-                $basename_chat . '-' . $i . '.log.html'
+                filesize($chat_path.$basename_chat.'-'.$i.'.log.html'),
+                $basename_chat.'-'.$i.'.log.html'
             );
 
             api_item_property_update(
@@ -1651,7 +1651,7 @@ 
 
             $doc_id = DocumentManager::get_document_id(
                 $courseInfo,
-                $basepath_chat . '/' . $basename_chat . '.log.html'
+                $basepath_chat.'/'.$basename_chat.'.log.html'
             );
 
             update_existing_document($courseInfo, $doc_id, 0);
@@ -1660,8 +1660,8 @@ 
         $remove = 0;
         $content = array();
 
-        if (file_exists($chat_path . $basename_chat . '.log.html')) {
-            $content = file($chat_path . $basename_chat . '.log.html');
+        if (file_exists($chat_path.$basename_chat.'.log.html')) {
+            $content = file($chat_path.$basename_chat.'.log.html');
             $nbr_lines = sizeof($content);
             $remove = $nbr_lines - 100;
         }
@@ -1674,7 +1674,7 @@ 
 
         if (isset($_GET['origin']) && $_GET['origin'] == 'whoisonline') {
             //the caller
-            $content[0] = get_lang('CallSent') . '<br />' . $content[0];
+            $content[0] = get_lang('CallSent').'<br />'.$content[0];
         }
 
         $history = '<div id="content-chat">';
@@ -1689,7 +1689,7 @@ 
             $history .= '
                 <div id="clear-chat">
                     <button type="button" id="chat-reset" class="btn btn-danger btn-sm">
-                        ' . get_lang('ClearList') . '
+                        ' . get_lang('ClearList').'
                     </button>
                 </div>
             ';
@@ -1710,9 +1710,9 @@ 
         $extraCondition = null;
 
         if ($this->groupId) {
-            $extraCondition = 'AND ccc.toGroupId = ' . intval($this->groupId);
+            $extraCondition = 'AND ccc.toGroupId = '.intval($this->groupId);
         } else {
-            $extraCondition = 'AND ccc.sessionId = ' . intval($this->sessionId);
+            $extraCondition = 'AND ccc.sessionId = '.intval($this->sessionId);
         }
 
         $number = Database::getManager()
@@ -1742,9 +1742,9 @@ 
         $extraCondition = null;
 
         if ($this->groupId) {
-            $extraCondition = 'AND ccc.toGroupId = ' . intval($this->groupId);
+            $extraCondition = 'AND ccc.toGroupId = '.intval($this->groupId);
         } else {
-            $extraCondition = 'AND ccc.sessionId = ' . intval($this->sessionId);
+            $extraCondition = 'AND ccc.sessionId = '.intval($this->sessionId);
         }
 
         $number = Database::getManager()
@@ -1780,7 +1780,7 @@ 
                 'lastname' => $user->getLastname(),
                 'status' => !$this->sessionId ? $subscription->getStatus() : $user->getStatus(),
                 'image_url' => UserManager::getUserPicture($user->getId(), USER_IMAGE_SIZE_MEDIUM),
-                'profile_url' => api_get_path(WEB_CODE_PATH) . 'social/profile.php?u=' . $user->getId(),
+                'profile_url' => api_get_path(WEB_CODE_PATH).'social/profile.php?u='.$user->getId(),
                 'complete_name' => $user->getCompleteName(),
                 'username' => $user->getUsername(),
                 'email' => $user->getEmail(),

main/chat/chat.php

Spacing +4 added lines, -4 removed lines

@@ -17,11 +17,11 @@ 
 ];
 
 foreach ($externalCSS as $css) {
-    $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_JS_PATH) . $css);
+    $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_JS_PATH).$css);
 }
 
-$htmlHeadXtra[] = api_get_css(api_get_path(WEB_CSS_PATH) . 'chat.css');
-$htmlHeadXtra[] = api_get_css(api_get_path(WEB_CSS_PATH) . 'markdown.css');
+$htmlHeadXtra[] = api_get_css(api_get_path(WEB_CSS_PATH).'chat.css');
+$htmlHeadXtra[] = api_get_css(api_get_path(WEB_CSS_PATH).'markdown.css');
 
 $externalJS = [
     'highlight/highlight.pack.js',
@@ -41,7 +41,7 @@ 
         continue;
     }
 
-    $iconList[$key] = strtoupper($icon) . '.png';
+    $iconList[$key] = strtoupper($icon).'.png';
 }
 
 $view = new Template(get_lang('Chat'), false, false, false, true, false);

main/inc/lib/glossary.lib.php

Doc Comments +3 added lines, -3 removed lines

@@ -95,7 +95,7 @@ 
      *
      * @param array  $values  Array of title + description (name => $title, description => $comment)
      *
-     * @return mixed   Term id on success, false on failure
+     * @return false|string   Term id on success, false on failure
      *
      */
     public static function save_glossary($values, $showMessage = true)
@@ -448,7 +448,7 @@ 
 
     /**
      * Display the glossary terms in a list
-     * @return bool true
+     * @return string true
      */
     public static function displayGlossaryList()
     {
@@ -585,7 +585,7 @@ 
      * Update action icons column
      *
      * @param integer $glossary_id
-     * @param array   $url_params Parameters to use to affect links
+     * @param string   $url_params Parameters to use to affect links
      * @param array   $row The line of results from a query on the glossary table
      *
      * @return string HTML string for the action icons columns

Spacing +18 added lines, -18 removed lines

@@ -47,9 +47,9 @@ 
      *
      * @return string The glossary description
      */
-    public static function get_glossary_term_by_glossary_id ($glossary_id)
+    public static function get_glossary_term_by_glossary_id($glossary_id)
     {
-        $glossary_table  = Database::get_course_table(TABLE_GLOSSARY);
+        $glossary_table = Database::get_course_table(TABLE_GLOSSARY);
         $course_id = api_get_course_int_id();
         $sql = "SELECT description FROM $glossary_table
                 WHERE c_id = $course_id  AND glossary_id =".intval($glossary_id);
@@ -72,7 +72,7 @@ 
      */
     public static function get_glossary_term_by_glossary_name($glossary_name)
     {
-        $glossary_table  = Database::get_course_table(TABLE_GLOSSARY);
+        $glossary_table = Database::get_course_table(TABLE_GLOSSARY);
         $session_id = api_get_session_id();
         $course_id = api_get_course_int_id();
         $sql_filter = api_get_session_condition($session_id);
@@ -225,7 +225,7 @@ 
         $get_max = "SELECT MAX(display_order) FROM $t_glossary
                     WHERE c_id = $course_id ";
         $res_max = Database::query($get_max);
-        if (Database::num_rows($res_max)==0) {
+        if (Database::num_rows($res_max) == 0) {
             return 0;
         }
         $row = Database::fetch_array($res_max);
@@ -254,7 +254,7 @@ 
                 WHERE
                     c_id = $course_id AND
                     name = '".Database::escape_string($term)."'";
-        if ($not_id<>'') {
+        if ($not_id <> '') {
             $sql .= " AND glossary_id <> '".intval($not_id)."'";
         }
         $result = Database::query($sql);
@@ -378,25 +378,25 @@ 
         $actionsLeft = '';
         if (api_is_allowed_to_edit(null, true)) {
             $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=addglossary&msg=add?'.api_get_cidreq().'">'.
-                Display::return_icon('new_glossary_term.png',get_lang('TermAddNew'), '', ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_glossary_term.png', get_lang('TermAddNew'), '', ICON_SIZE_MEDIUM).'</a>';
         }
 
         $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=export">'.
-            Display::return_icon('export_csv.png',get_lang('ExportGlossaryAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('export_csv.png', get_lang('ExportGlossaryAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
         if (api_is_allowed_to_edit(null, true)) {
             $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=import">'.
-                Display::return_icon('import_csv.png',get_lang('ImportGlossary'), '', ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('import_csv.png', get_lang('ImportGlossary'), '', ICON_SIZE_MEDIUM).'</a>';
         }
 
         $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=export_to_pdf">'.
-            Display::return_icon('pdf.png',get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
 
         if (($view == 'table') || (!isset($view))) {
             $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=list">'.
-                Display::return_icon('view_detailed.png',get_lang('ListView'), '', ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('view_detailed.png', get_lang('ListView'), '', ICON_SIZE_MEDIUM).'</a>';
         } else {
             $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=table">'.
-                Display::return_icon('view_text.png',get_lang('TableView'), '', ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('view_text.png', get_lang('TableView'), '', ICON_SIZE_MEDIUM).'</a>';
         }
 
         /* BUILD SEARCH FORM */
@@ -433,7 +433,7 @@ 
             $table->set_header(1, get_lang('TermDefinition'), true);
             if (api_is_allowed_to_edit(null, true)) {
                 $table->set_header(2, get_lang('Actions'), false, 'width=90px', array('class' => 'td_actions'));
-                $table->set_column_filter(2, array('GlossaryManager','actions_filter'));
+                $table->set_column_filter(2, array('GlossaryManager', 'actions_filter'));
             }
             $content .= $table->return_table();
         }
@@ -455,8 +455,8 @@ 
         $content = '';
         foreach ($glossary_data as $key => $glossary_item) {
             $actions = '';
-            if (api_is_allowed_to_edit(null,true)) {
-                $actions = '<div class="pull-right">'.self::actions_filter($glossary_item[2], '',$glossary_item).'</div>';
+            if (api_is_allowed_to_edit(null, true)) {
+                $actions = '<div class="pull-right">'.self::actions_filter($glossary_item[2], '', $glossary_item).'</div>';
             }
             $content .= Display::panel($glossary_item[1], $glossary_item[0].' '.$actions);
         }
@@ -469,7 +469,7 @@ 
      * @return integer Count of glossary terms
      *
      */
-    public static function get_number_glossary_terms($session_id=0)
+    public static function get_number_glossary_terms($session_id = 0)
     {
         // Database table definition
         $t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
@@ -563,7 +563,7 @@ 
         while ($data = Database::fetch_array($res)) {
             // Validation when belongs to a session
             $session_img = api_get_session_image($data['session_id'], $_user['status']);
-            $array[0] = $data[0] . $session_img;
+            $array[0] = $data[0].$session_img;
 
             if (!$view || $view === 'table') {
                 $array[1] = str_replace(array('<p>', '</p>'), array('', '<br />'), $data[1]);
@@ -593,13 +593,13 @@ 
     {
         $glossary_id = $row[2];
         $return = '<a href="'.api_get_self().'?action=edit_glossary&glossary_id='.$glossary_id.'&'.api_get_cidreq().'&msg=edit">'.
-            Display::return_icon('edit.png',get_lang('Edit'),'',22).'</a>';
+            Display::return_icon('edit.png', get_lang('Edit'), '', 22).'</a>';
         $glossary_data = GlossaryManager::get_glossary_information($glossary_id);
         $glossary_term = $glossary_data['name'];
         if (api_is_allowed_to_edit(null, true)) {
             if ($glossary_data['session_id'] == api_get_session_id()) {
                 $return .= '<a href="'.api_get_self().'?action=delete_glossary&glossary_id='.$glossary_id.'&'.api_get_cidreq().'" onclick="return confirmation(\''.$glossary_term.'\');">'.
-                    Display::return_icon('delete.png', get_lang('Delete'),'',22).'</a>';
+                    Display::return_icon('delete.png', get_lang('Delete'), '', 22).'</a>';
             } else {
                 $return = get_lang('EditionNotAvailableFromSession');
             }

main/auth/openid/login.php

Spacing +14 added lines, -14 removed lines

@@ -64,7 +64,7 @@ 
     // Now that there is an association created, move on
     // to request authentication from the IdP
     $identity = (!empty($services[0]['delegate'])) ? $services[0]['delegate'] : $claimed_id;
-    if (isset($services[0]['types']) && is_array($services[0]['types']) && in_array(OPENID_NS_2_0 . '/server', $services[0]['types'])) {
+    if (isset($services[0]['types']) && is_array($services[0]['types']) && in_array(OPENID_NS_2_0.'/server', $services[0]['types'])) {
         $identity = 'http://openid.net/identifier_select/2.0';
     }
     $authn_request = openid_authentication_request($claimed_id, $identity, $return_to, $assoc_handle, $services[0]['version']);
@@ -119,7 +119,7 @@ 
 
     $xrds_url = $claimed_id;
     if (_openid_is_xri($claimed_id)) {
-        $xrds_url = 'http://xri.net/' . $claimed_id;
+        $xrds_url = 'http://xri.net/'.$claimed_id;
     }
     $url = @parse_url($xrds_url);
     if ($url['scheme'] == 'http' || $url['scheme'] == 'https') {
@@ -182,7 +182,7 @@ 
     //@todo Remove Old Associations:
     $openid_association = Database::get_main_table(TABLE_MAIN_OPENID_ASSOCIATION);
     $sql = "DELETE FROM $openid_association
-            WHERE created + expires_in < '" . api_get_utc_datetime() . "'";
+            WHERE created + expires_in < '".api_get_utc_datetime()."'";
     Database::query($sql);
 
     // Check to see if we have an association for this IdP already
@@ -339,17 +339,17 @@ 
     switch ($uri['scheme']) {
         case 'http':
             $port = isset($uri['port']) ? $uri['port'] : 80;
-            $host = $uri['host'] . ($port != 80 ? ':' . $port : '');
+            $host = $uri['host'].($port != 80 ? ':'.$port : '');
             $fp = @fsockopen($uri['host'], $port, $errno, $errstr, 15);
             break;
         case 'https':
             // Note: Only works for PHP 4.3 compiled with OpenSSL.
             $port = isset($uri['port']) ? $uri['port'] : 443;
-            $host = $uri['host'] . ($port != 443 ? ':' . $port : '');
-            $fp = @fsockopen('ssl://' . $uri['host'], $port, $errno, $errstr, 20);
+            $host = $uri['host'].($port != 443 ? ':'.$port : '');
+            $fp = @fsockopen('ssl://'.$uri['host'], $port, $errno, $errstr, 20);
             break;
         default:
-            $result->error = 'invalid schema ' . $uri['scheme'];
+            $result->error = 'invalid schema '.$uri['scheme'];
             return $result;
     }
 
@@ -365,7 +365,7 @@ 
     // Construct the path to act on.
     $path = isset($uri['path']) ? $uri['path'] : '/';
     if (isset($uri['query'])) {
-        $path .= '?' . $uri['query'];
+        $path .= '?'.$uri['query'];
     }
 
     // Create HTTP request.
@@ -375,23 +375,23 @@ 
         // host that do not take into account the port number.
         'Host' => "Host: $host",
         'User-Agent' => 'User-Agent: Chamilo (+http://www.chamilo.org/)',
-        'Content-Length' => 'Content-Length: ' . strlen($data)
+        'Content-Length' => 'Content-Length: '.strlen($data)
     );
 
     // If the server url has a user then attempt to use basic authentication
     if (isset($uri['user'])) {
-        $defaults['Authorization'] = 'Authorization: Basic ' . base64_encode($uri['user'] . (!empty($uri['pass']) ? ":" . $uri['pass'] : ''));
+        $defaults['Authorization'] = 'Authorization: Basic '.base64_encode($uri['user'].(!empty($uri['pass']) ? ":".$uri['pass'] : ''));
     }
 
     foreach ($headers as $header => $value) {
-        $defaults[$header] = $header . ': ' . $value;
+        $defaults[$header] = $header.': '.$value;
     }
 
-    $request = $method . ' ' . $path . " HTTP/1.0\r\n";
+    $request = $method.' '.$path." HTTP/1.0\r\n";
     $request .= implode("\r\n", $defaults);
     $request .= "\r\n\r\n";
     if ($data) {
-        $request .= $data . "\r\n";
+        $request .= $data."\r\n";
     }
     $result->request = $request;
 
@@ -417,7 +417,7 @@ 
         if (isset($result->headers[$header]) && $header == 'Set-Cookie') {
             // RFC 2109: the Set-Cookie response header comprises the token Set-
             // Cookie:, followed by a comma-separated list of one or more cookies.
-            $result->headers[$header] .= ',' . trim($value);
+            $result->headers[$header] .= ','.trim($value);
         } else {
             $result->headers[$header] = trim($value);
         }

main/webservices/webservice_course.php

Indentation +455 added lines, -455 removed lines

@@ -12,490 +12,490 @@
  */
 class WSCourse extends WS
 {
-	/**
-	 * Deletes a course (helper method)
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @return mixed True if the course was successfully deleted, WSError otherwise
-	 */
-	protected function deleteCourseHelper($course_id_field_name, $course_id_value) {
-		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSError) {
-			return $course_id;
-		} else {
-			$course_code = CourseManager::get_course_code_from_course_id($course_id);
-			CourseManager::delete_course($course_code);
-			return true;
-		}
-	}
+    /**
+     * Deletes a course (helper method)
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @return mixed True if the course was successfully deleted, WSError otherwise
+     */
+    protected function deleteCourseHelper($course_id_field_name, $course_id_value) {
+        $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+        if($course_id instanceof WSError) {
+            return $course_id;
+        } else {
+            $course_code = CourseManager::get_course_code_from_course_id($course_id);
+            CourseManager::delete_course($course_code);
+            return true;
+        }
+    }
 
-	/**
-	 * Deletes a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 */
-	public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Deletes a course
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     */
+    public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Deletes multiple courses
-	 *
-	 * @param string API secret key
-	 * @param array Array of courses with elements of the form array('course_id_field_name' => 'name_of_field', 'course_id_value' => 'value')
-	 * @return array Array with elements like array('course_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
-	 * than 0, an error occured
-	 */
-	public function DeleteCourses($secret_key, $courses) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($courses as $course) {
-				$result_tmp = array();
-				$result_op = $this->deleteCourseHelper($course['course_id_field_name'], $course['course_id_value']);
-				$result_tmp['course_id_value'] = $course['course_id_value'];
-				if($result_op instanceof WSError) {
-					// Return the error in the results
-					$result_tmp['result'] = $result_op->toArray();
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
+    /**
+     * Deletes multiple courses
+     *
+     * @param string API secret key
+     * @param array Array of courses with elements of the form array('course_id_field_name' => 'name_of_field', 'course_id_value' => 'value')
+     * @return array Array with elements like array('course_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
+     * than 0, an error occured
+     */
+    public function DeleteCourses($secret_key, $courses) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            foreach($courses as $course) {
+                $result_tmp = array();
+                $result_op = $this->deleteCourseHelper($course['course_id_field_name'], $course['course_id_value']);
+                $result_tmp['course_id_value'] = $course['course_id_value'];
+                if($result_op instanceof WSError) {
+                    // Return the error in the results
+                    $result_tmp['result'] = $result_op->toArray();
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
 
-	/**
-	 * Creates a course (helper method)
-	 *
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Wanted code. If it's not defined, it will be generated automatically
-	 * @param string Tutor name
-	 * @param string Course admin user id field name
-	 * @param string Course admin user id value
-	 * @param string Course language
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param array Course extra fields
-	 * @return mixed Generated id if creation was successful, WSError otherwise
-	 */
-	protected function createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
-		// Add the original course id field name and value to the extra fields if needed
-		$extras_associative = array();
-		if($course_id_field_name != "chamilo_course_id") {
-			$extras_associative[$course_id_field_name] = $course_id_value;
-		}
-		foreach($extras as $extra) {
-			$extras_associative[$extra['field_name']] = $extra['field_value'];
-		}
-		$course_admin_id = $this->getUserId($course_admin_user_id_field_name, $course_admin_user_id_value);
-		if($course_admin_id instanceof WSError) {
-			return $course_admin_id;
-		}
-		if($wanted_code == '') {
-			$wanted_code = CourseManager::generate_course_code($title);
-		}
-		$result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
-		if (!$result) {
-			return new WSError(202, 'There was an error creating the course');
-		} else {
-			// Update extra fields
-			foreach($extras_associative as $fname => $fvalue) {
-				CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
-			}
-			// Get course id
-			$course_info = CourseManager::get_course_information($result);
-			return $course_info['real_id'];
-		}
-	}
+    /**
+     * Creates a course (helper method)
+     *
+     * @param string Title
+     * @param string Category code
+     * @param string Wanted code. If it's not defined, it will be generated automatically
+     * @param string Tutor name
+     * @param string Course admin user id field name
+     * @param string Course admin user id value
+     * @param string Course language
+     * @param string Course id field name
+     * @param string Course id value
+     * @param array Course extra fields
+     * @return mixed Generated id if creation was successful, WSError otherwise
+     */
+    protected function createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
+        // Add the original course id field name and value to the extra fields if needed
+        $extras_associative = array();
+        if($course_id_field_name != "chamilo_course_id") {
+            $extras_associative[$course_id_field_name] = $course_id_value;
+        }
+        foreach($extras as $extra) {
+            $extras_associative[$extra['field_name']] = $extra['field_value'];
+        }
+        $course_admin_id = $this->getUserId($course_admin_user_id_field_name, $course_admin_user_id_value);
+        if($course_admin_id instanceof WSError) {
+            return $course_admin_id;
+        }
+        if($wanted_code == '') {
+            $wanted_code = CourseManager::generate_course_code($title);
+        }
+        $result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
+        if (!$result) {
+            return new WSError(202, 'There was an error creating the course');
+        } else {
+            // Update extra fields
+            foreach($extras_associative as $fname => $fvalue) {
+                CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
+            }
+            // Get course id
+            $course_info = CourseManager::get_course_information($result);
+            return $course_info['real_id'];
+        }
+    }
 
-	/**
-	 * Creates a course
-	 *
-	 * @param string API secret key
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Wanted code. If it's not defined, it will be generated automatically
-	 * @param string Tutor name
-	 * @param string Course admin user id field name
-	 * @param string Course admin user id value
-	 * @param string Course language
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param array Course extra fields
-	 * @return int Course id generated
-	 */
-	public function CreateCourse($secret_key, $title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
-		// First, verify the secret key
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			} else {
-				return $result;
-			}
-		}
-	}
+    /**
+     * Creates a course
+     *
+     * @param string API secret key
+     * @param string Title
+     * @param string Category code
+     * @param string Wanted code. If it's not defined, it will be generated automatically
+     * @param string Tutor name
+     * @param string Course admin user id field name
+     * @param string Course admin user id value
+     * @param string Course language
+     * @param string Course id field name
+     * @param string Course id value
+     * @param array Course extra fields
+     * @return int Course id generated
+     */
+    public function CreateCourse($secret_key, $title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
+        // First, verify the secret key
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            } else {
+                return $result;
+            }
+        }
+    }
 
-	/**
-	 * Create multiple courses
-	 *
-	 * @param string API secret key
-	 * @param array Courses to be created, with elements following the structure presented in CreateCourse
-	 * @return array Array with elements of the form array('course_id_value' => 'original value sent', 'course_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
-	 */
-	public function CreateCourses($secret_key, $courses) {
-		// First, verify the secret key
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($courses as $course) {
-				$result_tmp = array();
+    /**
+     * Create multiple courses
+     *
+     * @param string API secret key
+     * @param array Courses to be created, with elements following the structure presented in CreateCourse
+     * @return array Array with elements of the form array('course_id_value' => 'original value sent', 'course_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
+     */
+    public function CreateCourses($secret_key, $courses) {
+        // First, verify the secret key
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            foreach($courses as $course) {
+                $result_tmp = array();
                 // re-initialize variables just in case
                 $title = $category_code = $wanted_code = $tutor_name = $course_admin_user_id_field_name = $course_admin_user_id_value = $language = $course_id_field_name = $course_id_value = $extras = 0;
-				extract($course);
-				$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
-				if($result instanceof WSError) {
-					$result_tmp['result'] = $result->toArray();
-					$result_tmp['course_id_value'] = $course_id_value;
-					$result_tmp['course_id_generated'] = 0;
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-					$result_tmp['course_id_value'] = $course_id_value;
-					$result_tmp['course_id_generated'] = $result;
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
+                extract($course);
+                $result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
+                if($result instanceof WSError) {
+                    $result_tmp['result'] = $result->toArray();
+                    $result_tmp['course_id_value'] = $course_id_value;
+                    $result_tmp['course_id_generated'] = 0;
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                    $result_tmp['course_id_value'] = $course_id_value;
+                    $result_tmp['course_id_generated'] = $result;
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
 
-	/**
-	 * Edits a course (helper method)
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Department name
-	 * @param string Department url
-	 * @param string Course language
-	 * @param int Visibility
-	 * @param int Subscribe (0 = denied, 1 = allowed)
-	 * @param int Unsubscribe (0 = denied, 1 = allowed)
-	 * @param string Visual code
-	 * @param array Course extra fields
-	 * @return mixed True in case of success, WSError otherwise
-	 */
-	protected function editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
-		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSError) {
-			return $course_id;
-		} else {
-			$attributes = array();
-			if(!empty($title)) {
-				$attributes['title'] = $title;
-			}
-			if(!empty($category_code)) {
-				$attributes['category_code'] = $category_code;
-			}
-			if(!empty($department_name)) {
-				$attributes['department_name'] = $department_name;
-			}
-			if(!empty($department_url)) {
-				$attributes['department_url'] = $department_url;
-			}
-			if(!empty($language)) {
-				$attributes['course_language'] = $language;
-			}
-			if($visibility != '') {
-				$attributes['visibility'] = (int)$visibility;
-			}
-			if($subscribe != '') {
-				$attributes['subscribe'] = (int)$subscribe;
-			}
-			if($unsubscribe != '') {
-				$attributes['unsubscribe'] = (int)$unsubscribe;
-			}
-			if(!empty($visual_code)) {
-				$attributes['visual_code'] = $visual_code;
-			}
-			if(!empty($attributes)) {
-				CourseManager::update_attributes($course_id, $attributes);
-			}
-			if(!empty($extras)) {
-				$course_code = CourseManager::get_course_code_from_course_id($course_id);
-				$extras_associative = array();
-				foreach($extras as $extra) {
-					$extras_associative[$extra['field_name']] = $extra['field_value'];
-				}
-				foreach($extras_associative as $fname => $fvalue) {
-					CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
-				}
-			}
-			return true;
-		}
-	}
+    /**
+     * Edits a course (helper method)
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Title
+     * @param string Category code
+     * @param string Department name
+     * @param string Department url
+     * @param string Course language
+     * @param int Visibility
+     * @param int Subscribe (0 = denied, 1 = allowed)
+     * @param int Unsubscribe (0 = denied, 1 = allowed)
+     * @param string Visual code
+     * @param array Course extra fields
+     * @return mixed True in case of success, WSError otherwise
+     */
+    protected function editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
+        $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+        if($course_id instanceof WSError) {
+            return $course_id;
+        } else {
+            $attributes = array();
+            if(!empty($title)) {
+                $attributes['title'] = $title;
+            }
+            if(!empty($category_code)) {
+                $attributes['category_code'] = $category_code;
+            }
+            if(!empty($department_name)) {
+                $attributes['department_name'] = $department_name;
+            }
+            if(!empty($department_url)) {
+                $attributes['department_url'] = $department_url;
+            }
+            if(!empty($language)) {
+                $attributes['course_language'] = $language;
+            }
+            if($visibility != '') {
+                $attributes['visibility'] = (int)$visibility;
+            }
+            if($subscribe != '') {
+                $attributes['subscribe'] = (int)$subscribe;
+            }
+            if($unsubscribe != '') {
+                $attributes['unsubscribe'] = (int)$unsubscribe;
+            }
+            if(!empty($visual_code)) {
+                $attributes['visual_code'] = $visual_code;
+            }
+            if(!empty($attributes)) {
+                CourseManager::update_attributes($course_id, $attributes);
+            }
+            if(!empty($extras)) {
+                $course_code = CourseManager::get_course_code_from_course_id($course_id);
+                $extras_associative = array();
+                foreach($extras as $extra) {
+                    $extras_associative[$extra['field_name']] = $extra['field_value'];
+                }
+                foreach($extras_associative as $fname => $fvalue) {
+                    CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
+                }
+            }
+            return true;
+        }
+    }
 
-	/**
-	 * Edits a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Department name
-	 * @param string Department url
-	 * @param string Course language
-	 * @param int Visibility
-	 * @param int Subscribe (0 = denied, 1 = allowed)
-	 * @param int Unsubscribe (0 = denied, 1 = allowed)
-	 * @param string Visual code
-	 * @param array Course extra fields
-	 */
-	public function EditCourse($secret_key, $course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Edits a course
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Title
+     * @param string Category code
+     * @param string Department name
+     * @param string Department url
+     * @param string Course language
+     * @param int Visibility
+     * @param int Subscribe (0 = denied, 1 = allowed)
+     * @param int Unsubscribe (0 = denied, 1 = allowed)
+     * @param string Visual code
+     * @param array Course extra fields
+     */
+    public function EditCourse($secret_key, $course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * List courses
-	 *
-	 * @param string API secret key
-	 * @param string A list of visibility filter we want to apply
-	 * @return array An array with elements of the form ('id' => 'Course internal id', 'code' => 'Course code', 'title' => 'Course title', 'language' => 'Course language', 'visibility' => 'Course visibility',
-	 * 'category_name' => 'Name of the category of the course', 'number_students' => 'Number of students in the course', 'external_course_id' => 'External course id')
-	 */
-	public function ListCourses($secret_key, $visibility = 'public,public-registered,private,closed') {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
+    /**
+     * List courses
+     *
+     * @param string API secret key
+     * @param string A list of visibility filter we want to apply
+     * @return array An array with elements of the form ('id' => 'Course internal id', 'code' => 'Course code', 'title' => 'Course title', 'language' => 'Course language', 'visibility' => 'Course visibility',
+     * 'category_name' => 'Name of the category of the course', 'number_students' => 'Number of students in the course', 'external_course_id' => 'External course id')
+     */
+    public function ListCourses($secret_key, $visibility = 'public,public-registered,private,closed') {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
             $visibilities = split(',',$visibility);
             $vis = array('public' => '3', 'public-registered' => '2', 'private' => '1', 'closed' => '0');
             foreach ($visibilities as $p => $visibility) {
                 $visibilities[$p] = $vis[$visibility];
             }
-			$courses_result = array();
-			$category_names = array();
+            $courses_result = array();
+            $category_names = array();
 
-			$courses = CourseManager::get_courses_list();
-			foreach($courses as $course) {
+            $courses = CourseManager::get_courses_list();
+            foreach($courses as $course) {
                 //skip elements that do not match required visibility
                 if (!in_array($course['visibility'],$visibilities)) { continue; }
-				$course_tmp = array();
-				$course_tmp['id'] = $course['id'];
-				$course_tmp['code'] = $course['code'];
-				$course_tmp['title'] = $course['title'];
-				$course_tmp['language'] = $course['course_language'];
-				$course_tmp['visibility'] = $course['visibility'];
+                $course_tmp = array();
+                $course_tmp['id'] = $course['id'];
+                $course_tmp['code'] = $course['code'];
+                $course_tmp['title'] = $course['title'];
+                $course_tmp['language'] = $course['course_language'];
+                $course_tmp['visibility'] = $course['visibility'];
 
-				// Determining category name
-				if($category_names[$course['category_code']]) {
-					$course_tmp['category_name'] = $category_names[$course['category_code']];
-				} else {
-					$category = CourseManager::get_course_category($course['category_code']);
-					$category_names[$course['category_code']] = $category['name'];
-					$course_tmp['category_name'] = $category['name'];
-				}
+                // Determining category name
+                if($category_names[$course['category_code']]) {
+                    $course_tmp['category_name'] = $category_names[$course['category_code']];
+                } else {
+                    $category = CourseManager::get_course_category($course['category_code']);
+                    $category_names[$course['category_code']] = $category['name'];
+                    $course_tmp['category_name'] = $category['name'];
+                }
 
-				// Determining number of students registered in course
-				$user_list = CourseManager::get_user_list_from_course_code($course['code'], 0);
-				$course_tmp['number_students'] = count($user_list);
+                // Determining number of students registered in course
+                $user_list = CourseManager::get_user_list_from_course_code($course['code'], 0);
+                $course_tmp['number_students'] = count($user_list);
 
-				// Determining external course id - this code misses the external course id field name
-				// $course_tmp['external_course_id'] = CourseManager::get_course_extra_field_value($course_field_name, $course['code']);
+                // Determining external course id - this code misses the external course id field name
+                // $course_tmp['external_course_id'] = CourseManager::get_course_extra_field_value($course_field_name, $course['code']);
 
 
-				$courses_result[] = $course_tmp;
-			}
+                $courses_result[] = $course_tmp;
+            }
 
-			return $courses_result;
-		}
-	}
+            return $courses_result;
+        }
+    }
 
-	/**
-	 * Subscribe or unsubscribe user to a course (helper method)
-	 *
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 * @param int Set to 1 to subscribe, 0 to unsubscribe
-	 * @param int Status (STUDENT or TEACHER) Used for subscription only
-	 * @return mixed True if subscription or unsubscription was successful, false otherwise
-	 */
-	protected function changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $state, $status = STUDENT) {
-		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSError) {
-			return $course_id;
-		} else {
-			$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-			if($user_id instanceof WSError) {
-				return $user_id;
-			} else {
-				$course_code = CourseManager::get_course_code_from_course_id($course_id);
-				if($state == 0) {
-					// Unsubscribe user
-					CourseManager::unsubscribe_user($user_id, $course_code);
-					return true;
-				} else {
-					// Subscribe user
-					if(CourseManager::subscribe_user($user_id, $course_code, $status)) {
-						return true;
-					} else {
-						return new WSError(203, 'An error occured subscribing to this course');
-					}
-				}
-			}
-		}
-	}
+    /**
+     * Subscribe or unsubscribe user to a course (helper method)
+     *
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     * @param int Set to 1 to subscribe, 0 to unsubscribe
+     * @param int Status (STUDENT or TEACHER) Used for subscription only
+     * @return mixed True if subscription or unsubscription was successful, false otherwise
+     */
+    protected function changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $state, $status = STUDENT) {
+        $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+        if($course_id instanceof WSError) {
+            return $course_id;
+        } else {
+            $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+            if($user_id instanceof WSError) {
+                return $user_id;
+            } else {
+                $course_code = CourseManager::get_course_code_from_course_id($course_id);
+                if($state == 0) {
+                    // Unsubscribe user
+                    CourseManager::unsubscribe_user($user_id, $course_code);
+                    return true;
+                } else {
+                    // Subscribe user
+                    if(CourseManager::subscribe_user($user_id, $course_code, $status)) {
+                        return true;
+                    } else {
+                        return new WSError(203, 'An error occured subscribing to this course');
+                    }
+                }
+            }
+        }
+    }
 
-	/**
-	 * Subscribe user to a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 * @param int Status (1 = Teacher, 5 = Student)
-	 */
-	public function SubscribeUserToCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $status) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 1, $status);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Subscribe user to a course
+     *
+     * @param string API secret key
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     * @param int Status (1 = Teacher, 5 = Student)
+     */
+    public function SubscribeUserToCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $status) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 1, $status);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Unsusbscribe user from course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 */
-	public function UnsubscribeUserFromCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 0);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Unsusbscribe user from course
+     *
+     * @param string API secret key
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     */
+    public function UnsubscribeUserFromCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 0);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Returns the descriptions of a course, along with their id
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @return array Returns an array with elements of the form ('course_desc_id' => 1, 'course_desc_title' => 'Title', 'course_desc_content' => 'Content')
-	 */
-	public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
-				return $course_id;
-			} else {
-				// Course exists, get its descriptions
-				$descriptions = CourseDescription::get_descriptions($course_id);
-				$results = array();
-				foreach($descriptions as $description) {
-					$results[] = array('course_desc_id' => $description->get_description_type(),
-										'course_desc_title' => $description->get_title(),
-										'course_desc_content' => $description->get_content());
-				}
-				return $results;
-			}
-		}
-	}
+    /**
+     * Returns the descriptions of a course, along with their id
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @return array Returns an array with elements of the form ('course_desc_id' => 1, 'course_desc_title' => 'Title', 'course_desc_content' => 'Content')
+     */
+    public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+            if($course_id instanceof WSError) {
+                return $course_id;
+            } else {
+                // Course exists, get its descriptions
+                $descriptions = CourseDescription::get_descriptions($course_id);
+                $results = array();
+                foreach($descriptions as $description) {
+                    $results[] = array('course_desc_id' => $description->get_description_type(),
+                                        'course_desc_title' => $description->get_title(),
+                                        'course_desc_content' => $description->get_content());
+                }
+                return $results;
+            }
+        }
+    }
 
 
-	/**
-	 * Edit course description
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param int Category id from course description
-	 * @param string Description title
-	 * @param string Course description content
-	 */
-	public function EditCourseDescription($secret_key, $course_id_field_name, $course_id_value, $course_desc_id, $course_desc_title, $course_desc_content) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
-				return $course_id;
-			} else {
-				// Create the new course description
-				$cd = new CourseDescription();
-				$cd->set_description_type($course_desc_id);
-				$cd->set_title($course_desc_title);
-				$cd->set_content($course_desc_content);
-				$cd->set_session_id(0);
-				// Get course info
-				$course_info = CourseManager::get_course_information(CourseManager::get_course_code_from_course_id($course_id));
+    /**
+     * Edit course description
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @param int Category id from course description
+     * @param string Description title
+     * @param string Course description content
+     */
+    public function EditCourseDescription($secret_key, $course_id_field_name, $course_id_value, $course_desc_id, $course_desc_title, $course_desc_content) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+            if($course_id instanceof WSError) {
+                return $course_id;
+            } else {
+                // Create the new course description
+                $cd = new CourseDescription();
+                $cd->set_description_type($course_desc_id);
+                $cd->set_title($course_desc_title);
+                $cd->set_content($course_desc_content);
+                $cd->set_session_id(0);
+                // Get course info
+                $course_info = CourseManager::get_course_information(CourseManager::get_course_code_from_course_id($course_id));
                 $cd->set_course_id($course_info['real_id']);
-				// Check if this course description exists
-				$descriptions = CourseDescription::get_descriptions($course_id);
-				$exists = false;
-				foreach($descriptions as $description) {
-					if($description->get_description_type() == $course_desc_id) {
-						$exists = true;
-					}
-				}
-				if (!$exists) {
-					$cd->set_progress(0);
-					$cd->insert();
-				} else {
-					$cd->update();
-				}
-			}
-		}
-	}
+                // Check if this course description exists
+                $descriptions = CourseDescription::get_descriptions($course_id);
+                $exists = false;
+                foreach($descriptions as $description) {
+                    if($description->get_description_type() == $course_desc_id) {
+                        $exists = true;
+                    }
+                }
+                if (!$exists) {
+                    $cd->set_progress(0);
+                    $cd->insert();
+                } else {
+                    $cd->update();
+                }
+            }
+        }
+    }
 }

Spacing +55 added lines, -55 removed lines

@@ -21,7 +21,7 @@ 
 	 */
 	protected function deleteCourseHelper($course_id_field_name, $course_id_value) {
 		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSError) {
+		if ($course_id instanceof WSError) {
 			return $course_id;
 		} else {
 			$course_code = CourseManager::get_course_code_from_course_id($course_id);
@@ -39,11 +39,11 @@ 
 	 */
 	public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -59,15 +59,15 @@ 
 	 */
 	public function DeleteCourses($secret_key, $courses) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$results = array();
-			foreach($courses as $course) {
+			foreach ($courses as $course) {
 				$result_tmp = array();
 				$result_op = $this->deleteCourseHelper($course['course_id_field_name'], $course['course_id_value']);
 				$result_tmp['course_id_value'] = $course['course_id_value'];
-				if($result_op instanceof WSError) {
+				if ($result_op instanceof WSError) {
 					// Return the error in the results
 					$result_tmp['result'] = $result_op->toArray();
 				} else {
@@ -97,17 +97,17 @@ 
 	protected function createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
 		// Add the original course id field name and value to the extra fields if needed
 		$extras_associative = array();
-		if($course_id_field_name != "chamilo_course_id") {
+		if ($course_id_field_name != "chamilo_course_id") {
 			$extras_associative[$course_id_field_name] = $course_id_value;
 		}
-		foreach($extras as $extra) {
+		foreach ($extras as $extra) {
 			$extras_associative[$extra['field_name']] = $extra['field_value'];
 		}
 		$course_admin_id = $this->getUserId($course_admin_user_id_field_name, $course_admin_user_id_value);
-		if($course_admin_id instanceof WSError) {
+		if ($course_admin_id instanceof WSError) {
 			return $course_admin_id;
 		}
-		if($wanted_code == '') {
+		if ($wanted_code == '') {
 			$wanted_code = CourseManager::generate_course_code($title);
 		}
 		$result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
@@ -115,7 +115,7 @@ 
 			return new WSError(202, 'There was an error creating the course');
 		} else {
 			// Update extra fields
-			foreach($extras_associative as $fname => $fvalue) {
+			foreach ($extras_associative as $fname => $fvalue) {
 				CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
 			}
 			// Get course id
@@ -143,11 +143,11 @@ 
 	public function CreateCourse($secret_key, $title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
 		// First, verify the secret key
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			} else {
 				return $result;
@@ -165,17 +165,17 @@ 
 	public function CreateCourses($secret_key, $courses) {
 		// First, verify the secret key
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$results = array();
-			foreach($courses as $course) {
+			foreach ($courses as $course) {
 				$result_tmp = array();
                 // re-initialize variables just in case
                 $title = $category_code = $wanted_code = $tutor_name = $course_admin_user_id_field_name = $course_admin_user_id_value = $language = $course_id_field_name = $course_id_value = $extras = 0;
 				extract($course);
 				$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
-				if($result instanceof WSError) {
+				if ($result instanceof WSError) {
 					$result_tmp['result'] = $result->toArray();
 					$result_tmp['course_id_value'] = $course_id_value;
 					$result_tmp['course_id_generated'] = 0;
@@ -209,47 +209,47 @@ 
 	 */
 	protected function editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
 		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSError) {
+		if ($course_id instanceof WSError) {
 			return $course_id;
 		} else {
 			$attributes = array();
-			if(!empty($title)) {
+			if (!empty($title)) {
 				$attributes['title'] = $title;
 			}
-			if(!empty($category_code)) {
+			if (!empty($category_code)) {
 				$attributes['category_code'] = $category_code;
 			}
-			if(!empty($department_name)) {
+			if (!empty($department_name)) {
 				$attributes['department_name'] = $department_name;
 			}
-			if(!empty($department_url)) {
+			if (!empty($department_url)) {
 				$attributes['department_url'] = $department_url;
 			}
-			if(!empty($language)) {
+			if (!empty($language)) {
 				$attributes['course_language'] = $language;
 			}
-			if($visibility != '') {
-				$attributes['visibility'] = (int)$visibility;
+			if ($visibility != '') {
+				$attributes['visibility'] = (int) $visibility;
 			}
-			if($subscribe != '') {
-				$attributes['subscribe'] = (int)$subscribe;
+			if ($subscribe != '') {
+				$attributes['subscribe'] = (int) $subscribe;
 			}
-			if($unsubscribe != '') {
-				$attributes['unsubscribe'] = (int)$unsubscribe;
+			if ($unsubscribe != '') {
+				$attributes['unsubscribe'] = (int) $unsubscribe;
 			}
-			if(!empty($visual_code)) {
+			if (!empty($visual_code)) {
 				$attributes['visual_code'] = $visual_code;
 			}
-			if(!empty($attributes)) {
+			if (!empty($attributes)) {
 				CourseManager::update_attributes($course_id, $attributes);
 			}
-			if(!empty($extras)) {
+			if (!empty($extras)) {
 				$course_code = CourseManager::get_course_code_from_course_id($course_id);
 				$extras_associative = array();
-				foreach($extras as $extra) {
+				foreach ($extras as $extra) {
 					$extras_associative[$extra['field_name']] = $extra['field_value'];
 				}
-				foreach($extras_associative as $fname => $fvalue) {
+				foreach ($extras_associative as $fname => $fvalue) {
 					CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
 				}
 			}
@@ -276,11 +276,11 @@ 
 	 */
 	public function EditCourse($secret_key, $course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -296,10 +296,10 @@ 
 	 */
 	public function ListCourses($secret_key, $visibility = 'public,public-registered,private,closed') {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
-            $visibilities = split(',',$visibility);
+            $visibilities = split(',', $visibility);
             $vis = array('public' => '3', 'public-registered' => '2', 'private' => '1', 'closed' => '0');
             foreach ($visibilities as $p => $visibility) {
                 $visibilities[$p] = $vis[$visibility];
@@ -308,9 +308,9 @@ 
 			$category_names = array();
 
 			$courses = CourseManager::get_courses_list();
-			foreach($courses as $course) {
+			foreach ($courses as $course) {
                 //skip elements that do not match required visibility
-                if (!in_array($course['visibility'],$visibilities)) { continue; }
+                if (!in_array($course['visibility'], $visibilities)) { continue; }
 				$course_tmp = array();
 				$course_tmp['id'] = $course['id'];
 				$course_tmp['code'] = $course['code'];
@@ -319,7 +319,7 @@ 
 				$course_tmp['visibility'] = $course['visibility'];
 
 				// Determining category name
-				if($category_names[$course['category_code']]) {
+				if ($category_names[$course['category_code']]) {
 					$course_tmp['category_name'] = $category_names[$course['category_code']];
 				} else {
 					$category = CourseManager::get_course_category($course['category_code']);
@@ -355,21 +355,21 @@ 
 	 */
 	protected function changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $state, $status = STUDENT) {
 		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSError) {
+		if ($course_id instanceof WSError) {
 			return $course_id;
 		} else {
 			$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-			if($user_id instanceof WSError) {
+			if ($user_id instanceof WSError) {
 				return $user_id;
 			} else {
 				$course_code = CourseManager::get_course_code_from_course_id($course_id);
-				if($state == 0) {
+				if ($state == 0) {
 					// Unsubscribe user
 					CourseManager::unsubscribe_user($user_id, $course_code);
 					return true;
 				} else {
 					// Subscribe user
-					if(CourseManager::subscribe_user($user_id, $course_code, $status)) {
+					if (CourseManager::subscribe_user($user_id, $course_code, $status)) {
 						return true;
 					} else {
 						return new WSError(203, 'An error occured subscribing to this course');
@@ -391,11 +391,11 @@ 
 	 */
 	public function SubscribeUserToCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $status) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 1, $status);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -412,11 +412,11 @@ 
 	 */
 	public function UnsubscribeUserFromCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 0);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -432,17 +432,17 @@ 
 	 */
 	public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
+			if ($course_id instanceof WSError) {
 				return $course_id;
 			} else {
 				// Course exists, get its descriptions
 				$descriptions = CourseDescription::get_descriptions($course_id);
 				$results = array();
-				foreach($descriptions as $description) {
+				foreach ($descriptions as $description) {
 					$results[] = array('course_desc_id' => $description->get_description_type(),
 										'course_desc_title' => $description->get_title(),
 										'course_desc_content' => $description->get_content());
@@ -465,11 +465,11 @@ 
 	 */
 	public function EditCourseDescription($secret_key, $course_id_field_name, $course_id_value, $course_desc_id, $course_desc_title, $course_desc_content) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
+			if ($course_id instanceof WSError) {
 				return $course_id;
 			} else {
 				// Create the new course description
@@ -484,8 +484,8 @@ 
 				// Check if this course description exists
 				$descriptions = CourseDescription::get_descriptions($course_id);
 				$exists = false;
-				foreach($descriptions as $description) {
-					if($description->get_description_type() == $course_desc_id) {
+				foreach ($descriptions as $description) {
+					if ($description->get_description_type() == $course_desc_id) {
 						$exists = true;
 					}
 				}

Doc Comments +1 added lines

@@ -342,6 +342,7 @@
 	 * @param string User id value
 	 * @param int Set to 1 to subscribe, 0 to unsubscribe
 	 * @param int Status (STUDENT or TEACHER) Used for subscription only
+	 * @param integer $state
 	 * @return mixed True if subscription or unsubscription was successful, false otherwise
 	 */
 	protected function changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $state, $status = STUDENT) {