diff --git a/main/wiki/index.php b/main/wiki/index.php
index 13dcb29d6f..11e3108e11 100644
--- a/main/wiki/index.php
+++ b/main/wiki/index.php
@@ -138,34 +138,14 @@ $wiki->page = $page;
 Display::display_introduction_section(TOOL_WIKI);
 
 /* ACTIONS */
+$wiki->blockConcurrentEditions(api_get_user_id(), $action);
 
-// Release of blocked pages to prevent concurrent editions
-echo '<div style="overflow:hidden">';
-
-$result = $wiki->getAllWiki();
-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;
-
-    //first prevent concurrent users and double version
-    if ($is_editing_block['is_editing']==$_user['user_id']) {
-        $_SESSION['_version']=$is_editing_block['version'];
-    } else {
-        unset( $_SESSION['_version'] );
-    }
-    //second checks if has exceeded the time that a page may be available or if a page was edited and saved by its author
-    if ($time_editing>$max_edit_time || ($is_editing_block['is_editing']==$_user['user_id'] && $action!='edit')) {
-        $wiki->updateWikiIsEditing($is_editing_block['is_editing']);
-    }
-}
-echo '</div>';
 // Saving a change
 
 if (isset($_POST['SaveWikiChange']) AND $_POST['title']<>'') {
-    if(empty($_POST['title'])) {
+    if (empty($_POST['title'])) {
         Display::display_error_message(get_lang("NoWikiPageTitle"));
-    } elseif(!$wiki->double_post($_POST['wpost_id'])) {
+    } elseif (!$wiki->double_post($_POST['wpost_id'])) {
         //double post
     } elseif ($_POST['version']!='' && $_SESSION['_version']!=0 && $_POST['version']!=$_SESSION['_version']) {
         //prevent concurrent users and double version
@@ -176,8 +156,7 @@ if (isset($_POST['SaveWikiChange']) AND $_POST['title']<>'') {
     }
 }
 
-//saving a new wiki entry
-echo '<div style="overflow:hidden">';
+// Saving a new wiki entry
 if (isset($_POST['SaveWikiNew'])) {
     if (empty($_POST['title'])) {
         Display::display_error_message(get_lang("NoWikiPageTitle"));
@@ -195,7 +174,6 @@ if (isset($_POST['SaveWikiNew'])) {
         if ($_clean['assignment'] == 1) {
             $wiki->auto_add_page_users($_clean['assignment']);
         }
-
         $return_message = $wiki->save_new_wiki();
         if ($return_message == false) {
             Display::display_error_message(get_lang('NoWikiPageTitle'), false);
@@ -204,12 +182,13 @@ if (isset($_POST['SaveWikiNew'])) {
         }
     }
 }
-echo '</div>';
 
 // check last version
 if (isset($_GET['view']) && $_GET['view']) {
     $sql = 'SELECT * FROM '.$tbl_wiki.'
-            WHERE c_id = '.$course_id.' AND id="'.Database::escape_string($_GET['view']).'"'; //current view
+            WHERE
+                c_id = '.$course_id.' AND
+                id="'.Database::escape_string($_GET['view']).'"'; //current view
     $result=Database::query($sql);
     $current_row=Database::fetch_array($result);
 
@@ -219,24 +198,30 @@ if (isset($_GET['view']) && $_GET['view']) {
     $last_row=Database::fetch_array($result);
 
     if ($_GET['view'] < $last_row['id']) {
-       $message= '<center>'.get_lang('NoAreSeeingTheLastVersion').'<br /> '.get_lang("Version").' (<a href="index.php?cidReq='.$_course['id'].'&action=showpage&amp;title='.api_htmlentities(urlencode($current_row['reflink'])).'&group_id='.$current_row['group_id'].'&session_id='.$current_row['session_id'].'&view='.api_htmlentities($_GET['view']).'" title="'.get_lang('CurrentVersion').'">'.$current_row['version'].'</a> / <a href="index.php?cidReq='.$_course['id'].'&action=showpage&amp;title='.api_htmlentities(urlencode($last_row['reflink'])).'&group_id='.$last_row['group_id'].'&session_id='.$last_row['session_id'].'" title="'.get_lang('LastVersion').'">'.$last_row['version'].'</a>) <br />'.get_lang("ConvertToLastVersion").': <a href="index.php?cidReq='.$_course['id'].'&action=restorepage&amp;title='.api_htmlentities(urlencode($last_row['reflink'])).'&group_id='.$last_row['group_id'].'&session_id='.$last_row['session_id'].'&view='.api_htmlentities($_GET['view']).'">'.get_lang("Restore").'</a></center>';
+       $message = '<center>'.get_lang('NoAreSeeingTheLastVersion').'<br /> '.get_lang("Version").' (<a href="index.php?cidReq='.$_course['id'].'&action=showpage&amp;title='.api_htmlentities(urlencode($current_row['reflink'])).'&group_id='.$current_row['group_id'].'&session_id='.$current_row['session_id'].'&view='.api_htmlentities($_GET['view']).'" title="'.get_lang('CurrentVersion').'">'.$current_row['version'].'</a> / <a href="index.php?cidReq='.$_course['id'].'&action=showpage&amp;title='.api_htmlentities(urlencode($last_row['reflink'])).'&group_id='.$last_row['group_id'].'&session_id='.$last_row['session_id'].'" title="'.get_lang('LastVersion').'">'.$last_row['version'].'</a>) <br />'.get_lang("ConvertToLastVersion").': <a href="index.php?cidReq='.$_course['id'].'&action=restorepage&amp;title='.api_htmlentities(urlencode($last_row['reflink'])).'&group_id='.$last_row['group_id'].'&session_id='.$last_row['session_id'].'&view='.api_htmlentities($_GET['view']).'">'.get_lang("Restore").'</a></center>';
        Display::display_warning_message($message,false);
     }
 
-    ///restore page
+    // Restore page.
 
-    if ($action=='restorepage') {
+    if ($action == 'restorepage') {
         //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) && intval($_GET['group_id'])==0)) {
+        if ((
+            $current_row['reflink']=='index' ||
+            $current_row['reflink']=='' ||
+            $current_row['assignment'] == 1
+            ) &&
+            (!api_is_allowed_to_edit(false,true) && intval($_GET['group_id'])==0)
+        ) {
             Display::display_normal_message(get_lang('OnlyEditPagesCourseManager'));
         } else {
             $PassEdit=false;
 
             //check if is a wiki group
-            if ($current_row['group_id']!=0) {
+            if ($current_row['group_id'] != 0) {
 				//Only teacher, platform admin and group members can edit a wiki group
 				if (api_is_allowed_to_edit(false,true) || api_is_platform_admin() || GroupManager :: is_user_in_group($_user['user_id'],intval($_GET['group_id']))) {
-                    $PassEdit=true;
+                    $PassEdit = true;
                 } else {
                     Display::display_normal_message(get_lang('OnlyEditPagesGroupMembers'));
                 }
@@ -263,21 +248,20 @@ if (isset($_GET['view']) && $_GET['view']) {
                 }
             }
 
-            if ($PassEdit) { //show editor if edit is allowed
+            //show editor if edit is allowed
+            if ($PassEdit) {
                 if ($row['editlock']==1 && (api_is_allowed_to_edit(false,true)==false || api_is_platform_admin()==false)) {
-                       Display::display_normal_message(get_lang('PageLockedExtra'));
+                    Display::display_normal_message(get_lang('PageLockedExtra'));
                 } else {
-                    if ($last_row['is_editing']!=0 && $last_row['is_editing']!=$_user['user_id']) {
+                    if ($last_row['is_editing']!=0 && $last_row['is_editing'] != $_user['user_id']) {
                         //checking for concurrent users
-                        $timestamp_edit=strtotime($last_row['time_edit']);
-                        $time_editing=time()-$timestamp_edit;
-                        $max_edit_time=1200; // 20 minutes
-                        $rest_time=$max_edit_time-$time_editing;
-
+                        $timestamp_edit = strtotime($last_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($last_row['is_editing']);
                         $username = api_htmlentities(sprintf(get_lang('LoginX'), $userinfo['username']), ENT_QUOTES);
-
-                        $is_being_edited= get_lang('ThisPageisBeginEditedBy').' <a href=../user/userInfo.php?uInfo='.$userinfo['user_id'].'>'.
+                        $is_being_edited = get_lang('ThisPageisBeginEditedBy').' <a href=../user/userInfo.php?uInfo='.$userinfo['user_id'].'>'.
                             Display::tag('span', api_get_person_name($userinfo['firstname'], $userinfo['lastname'], array('title'=>$username))).
                             get_lang('ThisPageisBeginEditedTryLater').' '.date( "i",$rest_time).' '.get_lang('MinMinutes');
                         Display::display_normal_message($is_being_edited, false);
@@ -304,7 +288,6 @@ if (isset($_GET['view']) && $_GET['view']) {
     }
 }
 
-echo '<div style="overflow:hidden">';
 if ($action == 'deletewiki') {
     if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
         if ($_GET['delete'] == 'yes') {
@@ -316,7 +299,6 @@ if ($action == 'deletewiki') {
 if ($action =='discuss' && isset($_POST['Submit']) && $_POST['Submit']) {
     Display::display_confirmation_message(get_lang('CommentAdded'));
 }
-echo '</div>';
 
 /* MAIN WIKI AREA */
 
@@ -386,7 +368,7 @@ if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
     echo '<a href="index.php?action=delete&amp;title='.api_htmlentities(urlencode($page)).'"'.$wiki->is_active_navigation_tab('delete').'>'.Display::return_icon('delete.png',get_lang('DeleteThisPage'),'',ICON_SIZE_MEDIUM).'</a>';
 }
 echo '</ul>';
-echo '</div>';
+echo '</div>'; // End actions
 
 
 //In new pages go to new page
@@ -406,7 +388,6 @@ if (isset($_POST['export2DOC']) && $_POST['export2DOC']) {
 }
 
 if (isset($action) && $action =='more') {
-
     echo '<div class="actions">'.get_lang('More').'</div>';
     echo '<table border="0">';
     echo '  <tr>';
@@ -422,17 +403,17 @@ if (isset($action) && $action =='more') {
     echo '    </td>';
     echo '    <td>';
     echo '      <ul>';
-   //Submenu Orphaned pages
+    // Submenu Orphaned pages
     echo '        <li><a href="index.php?cidReq='.$_course['id'].'&action=orphaned&session_id='.$session_id.'&group_id='.$groupId.'">'.get_lang('OrphanedPages').'</a></li>';
-    //Submenu Wanted pages
+    // Submenu Wanted pages
     echo '        <li><a href="index.php?cidReq='.$_course['id'].'&action=wanted&session_id='.$session_id.'&group_id='.$groupId.'">'.get_lang('WantedPages').'</a></li>';
-	//Submenu Most linked pages
+	// Submenu Most linked pages
     echo '<li><a href="index.php?cidReq='.$_course['id'].'&action=mostlinked&session_id='.$session_id.'&group_id='.$groupId.'">'.get_lang('MostLinkedPages').'</a></li>';
     echo '</ul>';
 	echo '</td>';
 	echo '<td style="vertical-align:top">';
     echo '<ul>';
-	//Submenu Statistics
+	// Submenu Statistics
 	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>';
 	}
@@ -440,584 +421,18 @@ if (isset($action) && $action =='more') {
     echo'    </td>';
     echo '  </tr>';
     echo '</table>';
-
-    //Submenu Dead end pages
-    //echo '<li><a href="index.php?cidReq='.$_course['id'].'&action=deadend&session_id='.$session_id.'&group_id='.$groupId.'">'.get_lang('DeadEndPages').'</a></li>';//TODO:
-
-    //Submenu Most new pages (not versions)
-    //echo '<li><a href="index.php?cidReq='.$_course['id'].'&action=mnew&session_id='.$session_id.'&group_id='.$groupId.'">'.get_lang('MostNewPages').'</a></li>';//TODO:
-
-    //Submenu Most long pages
-    //echo '<li><a href="index.php?cidReq='.$_course['id'].'&action=mnew&session_id='.$session_id.'&group_id='.$groupId.'">'.get_lang('MostLongPages').'</a></li>';//TODO:
-
-    //Submenu Protected pages
-    //echo '<li><a href="index.php?cidReq='.$_course['id'].'&action=protected&session_id='.$session_id.'&group_id='.$groupId.'">'.get_lang('ProtectedPages').'</a></li>';//TODO:
-
-    //Submenu Hidden pages
-    //echo '<li><a href="index.php?cidReq='.$_course['id'].'&action=hidden&session_id='.$session_id.'&group_id='.$groupId.'">'.get_lang('HiddenPages').'</a></li>';//TODO:
-
-    //Submenu Most discuss pages
-    //echo '<li><a href="index.php?cidReq='.$_course['id'].'&action=mdiscuss&session_id='.$session_id.'&group_id='.$groupId.'">'.get_lang('MostDiscussPages').'</a></li>';//TODO:
-
-    //Submenu Best scored pages
-    //echo '<li><a href="index.php?cidReq='.$_course['id'].'&action=mscored&session_id='.$session_id.'&group_id='.$groupId.'">'.get_lang('BestScoredPages').'</a></li>';//TODO:
-
-    //Submenu Pages with more progress
-    //echo '<li><a href="index.php?cidReq='.$_course['id'].'&action=mprogress&session_id='.$session_id.'&group_id='.$groupId.'">'.get_lang('MProgressPages').'</a></li>';//TODO:
-
-    //Submenu Most active users in discuss
-    //echo '<li><a href="index.php?cidReq='.$_course['id'].'&action=mactiveusers&session_id='.$session_id.'&group_id='.$groupId.'">'.get_lang('MostDiscussUsers').'</a></li>';//TODO:
-
-    //Submenu Random page
-    //echo '<li><a href="index.php?cidReq='.$_course['id'].'&action=mrandom&session_id='.$session_id.'&group_id='.$groupId.'">'.get_lang('RandomPage').'</a></li>';//TODO:
-
-	//Submenu Task
-	//echo '<li><a href="index.php?cidReq='.$_course['id'].'&action=datetasks&session_id='.$session_id.'&group_id='.$groupId.'">'.get_lang('Task').'</a></li>';//TODO:task list order by start date or end date
-
-	//Submenu Who and Where
-	//echo '<li><a href="index.php?cidReq='.$_course['id'].'&action=whoandwhere&session_id='.$session_id.'&group_id='.$groupId.'">'.get_lang('WhoAndWhere').'</a></li>';//TODO:Who and where everyone is working now?
 }
 
 // Statistics Juan Carlos Raña Trabado
 
 if ($action =='statistics' && (api_is_allowed_to_edit(false,true) || api_is_platform_admin())) {
-	echo '<div class="actions">'.get_lang('Statistics').'</div>';
-	//check all versions of all pages
-
-	$total_words 			= 0;
-	$total_links 			= 0;
-	$total_links_anchors 	= 0;
-	$total_links_mail		= 0;
-	$total_links_ftp 		= 0;
-	$total_links_irc		= 0;
-	$total_links_news 		= 0;
-	$total_wlinks 			= 0;
-	$total_images 			= 0;
-	$clean_total_flash 		= 0;
-	$total_flash			= 0;
-	$total_mp3				= 0;
-	$total_flv_p 			= 0;
-	$total_flv				= 0;
-	$total_youtube			= 0;
-	$total_multimedia		= 0;
-	$total_tables			= 0;
-
-	$sql = "SELECT *, COUNT(*) AS TOTAL_VERS, SUM(hits) AS TOTAL_VISITS
-	        FROM ".$tbl_wiki."
-	        WHERE c_id = $course_id AND ".$groupfilter.$condition_session."";
-
-	$allpages=Database::query($sql);
-	while ($row=Database::fetch_array($allpages)) {
-		$total_versions			= $row['TOTAL_VERS'];
-		$total_visits			= intval($row['TOTAL_VISITS']);
-	}
-
-	$sql="SELECT * FROM ".$tbl_wiki." WHERE c_id = $course_id AND ".$groupfilter.$condition_session."";
-	$allpages=Database::query($sql);
-
-    while ($row=Database::fetch_array($allpages)) {
-		$total_words 			= $total_words + $wiki->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");
-		$clean_total_flash = preg_replace('/player.swf/', ' ', $row['content']);
-		$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");
-    }
-
-	//check only last version of all pages (current page)
-
-	$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) FROM '.$tbl_wiki.' s2 WHERE s2.c_id = '.$course_id.' AND s1.reflink = s2.reflink AND '.$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']);
-    }
-
-	$total_words_lv			= 0;
-	$total_links_lv			= 0;
-	$total_links_anchors_lv	= 0;
-	$total_links_mail_lv 	= 0;
-	$total_links_ftp_lv 	= 0;
-	$total_links_irc_lv 	= 0;
-	$total_links_news_lv 	= 0;
-	$total_wlinks_lv 		= 0;
-	$total_images_lv 		= 0;
-	$clean_total_flash_lv 	= 0;
-	$total_flash_lv			= 0;
-	$total_mp3_lv			= 0;
-	$total_flv_p_lv		    = 0;
-	$total_flv_lv			= 0;
-	$total_youtube_lv		= 0;
-	$total_multimedia_lv	= 0;
-	$total_tables_lv		= 0;
-
-	$sql = 'SELECT * FROM  '.$tbl_wiki.' s1
-	        WHERE s1.c_id = '.$course_id.' 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.'
-            )';
-	$allpages=Database::query($sql);
-
-    while ($row=Database::fetch_array($allpages)) {
-		$total_words_lv 		= $total_words_lv+$wiki->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"');//.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 pages edited at this time
-    $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
-            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.'
-    )';
-    //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'];
-    }
-    //Total hidden pages
-    $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;
-    }
-
-    //Total protect pages
-    $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;
-    }
-
-    // Total empty versions.
-    $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;
-    }
-
-    //Total empty pages (last version)
-
-    $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);
-    while ($row=Database::fetch_array($allpages)) {
-        $total_empty_content_lv	= $total_empty_content_lv+1;
-    }
-
-    //Total locked discuss pages
-
-    $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);
-    while ($row=Database::fetch_array($allpages)) {
-        $total_lock_disc	= $total_lock_disc+1;
-    }
-
-    //Total hidden discuss pages
-
-    $total_hidden_disc=0;
-    $sql = 'SELECT * FROM '.$tbl_wiki.'
-            WHERE c_id = '.$course_id.' AND visibility_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_hidden_disc	= $total_hidden_disc+1;
-    }
-
-    //Total versions with any short comment by user or system
-
-    $total_comment_version=0;
-    $sql = 'SELECT * FROM '.$tbl_wiki.'
-            WHERE c_id = '.$course_id.' AND comment!="" AND '.$groupfilter.$condition_session.'';
-    $allpages=Database::query($sql);
-    while ($row=Database::fetch_array($allpages)) {
-        $total_comment_version	= $total_comment_version+1;
-    }
-
-    //Total pages that can only be scored by teachers
-
-    $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;
-    }
-
-    //Total pages scored by peers
-    $total_rating_by_peers=0;
-    $total_rating_by_peers=$total_pages-$total_only_teachers_rating;//put always this line alfter check num all pages and num pages rated by teachers
-
-    //Total pages identified as standard task
-
-    $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;
-    }
-
-    //Total pages identified as teacher page (wiki portfolio mode - individual assignment)
-
-    $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) 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_teacher_assignment=$total_teacher_assignment+1;
-    }
-
-    //Total pages identifies as student page (wiki portfolio mode - individual assignment)
-
-    $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;
-    }
-
-    //Current Wiki status add new pages
-    $sql = 'SELECT * FROM '.$tbl_wiki.'
-            WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
-            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'];
-    }
-
-    if ($wiki_add_lock==1) {
-        $status_add_new_pag=get_lang('Yes');
-    } else {
-        $status_add_new_pag=get_lang('No');
-    }
-
-    //Creation date of the oldest wiki page and version
-
-    $first_wiki_date='0000-00-00 00:00:00';
-    $sql='SELECT * FROM '.$tbl_wiki.'  WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' ORDER BY dtime ASC LIMIT 1';
-    $allpages=Database::query($sql);
-    while ($row=Database::fetch_array($allpages)) {
-        $first_wiki_date=$row['dtime'];
-    }
-
-    //Date of publication of the latest wiki version
-
-    $last_wiki_date='0000-00-00 00:00:00';
-    $sql='SELECT * FROM '.$tbl_wiki.'  WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' ORDER BY dtime DESC LIMIT 1';
-    $allpages=Database::query($sql);
-    while ($row=Database::fetch_array($allpages)) {
-        $last_wiki_date=$row['dtime'];
-    }
-
-    // Average score of all wiki pages. (If a page has not scored zero rated)
-
-    $media_score = 0;
-    $sql="SELECT *, SUM(score) AS TOTAL_SCORE FROM ".$tbl_wiki."
-         WHERE c_id = $course_id AND ".$groupfilter.$condition_session." GROUP BY reflink ";//group by because mark in all versions, then always is ok. 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'];
-    }
-
-    if (!empty($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;
-    $sql='SELECT  *, SUM(progress) AS TOTAL_PROGRESS FROM  '.$tbl_wiki.' s1
-         WHERE s1.c_id = '.$course_id.' 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.')';//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'];
-    }
-
-    if (!empty($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;
-    $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;
-    }
-
-    // Total of different IP addresses that have participated in the wiki
-    $total_ip=0;
-    $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;
-    }
-    ?>
-    <style>
-    thead {background:#E2E2E2}
-    tbody tr:hover {
-        background: #F9F9F9;
-        cursor:default;
-    }
-    </style>
-    <?php
-
-    echo '<table width="100%" border="1">';
-    echo '<thead>';
-    echo '<tr>';
-    echo '<td colspan="2">'.get_lang('General').'</td>';
-    echo '</tr>';
-    echo '</thead>';
-    echo '<tr>';
-    echo '<td>'.get_lang('StudentAddNewPages').'</td>';
-    echo '<td>'.$status_add_new_pag.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('DateCreateOldestWikiPage').'</td>';
-    echo '<td>'.$first_wiki_date.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('DateEditLatestWikiVersion').'</td>';
-    echo '<td>'.$last_wiki_date.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('AverageScoreAllPages').'</td>';
-    echo '<td>'.$media_score.' %</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('AverageMediaUserProgress').'</td>';
-    echo '<td>'.$media_progress.' %</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('TotalWikiUsers').'</td>';
-    echo '<td>'.$total_users.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('TotalIpAdress').'</td>';
-    echo '<td>'.$total_ip.'</td>';
-    echo '</tr>';
-    echo '</table>';
-    echo '<br/>';
-
-    echo '<table width="100%" border="1">';
-    echo '<thead>';
-    echo '<tr>';
-    echo '<td colspan="2">'.get_lang('Pages').' '.get_lang('And').' '.get_lang('Versions').'</td>';
-    echo '</tr>';
-    echo '</thead>';
-    echo '<tr>';
-    echo '<td>'.get_lang('Pages').' - '.get_lang('NumContributions').'</td>';
-    echo '<td>'.$total_pages.' ('.get_lang('Versions').': '.$total_versions.')</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('EmptyPages').'</td>';
-    echo '<td>'.$total_empty_content_lv.' ('.get_lang('Versions').': '.$total_empty_content.')</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('NumAccess').'</td>';
-    echo '<td>'.$total_visits_lv.' ('.get_lang('Versions').': '.$total_visits.')</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('TotalPagesEditedAtThisTime').'</td>';
-    echo '<td>'.$total_editing_now.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('TotalHiddenPages').'</td>';
-    echo '<td>'.$total_hidden.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('NumProtectedPages').'</td>';
-    echo '<td>'.$total_protected.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('LockedDiscussPages').'</td>';
-    echo '<td>'.$total_lock_disc.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('HiddenDiscussPages').'</td>';
-    echo '<td>'.$total_hidden_disc.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('TotalComments').'</td>';
-    echo '<td>'.$total_comment_version.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('TotalOnlyRatingByTeacher').'</td>';
-    echo '<td>'.$total_only_teachers_rating.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('TotalRatingPeers').'</td>';
-    echo '<td>'.$total_rating_by_peers.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('TotalTeacherAssignments').' - '.get_lang('PortfolioMode').'</td>';
-    echo '<td>'.$total_teacher_assignment.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('TotalStudentAssignments').' - '.get_lang('PortfolioMode').'</td>';
-    echo '<td>'.$total_student_assignment.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('TotalTask').' - '.get_lang('StandardMode').'</td>';
-    echo '<td>'.$total_task.'</td>';
-    echo '</tr>';
-    echo '</table>';
-    echo '<br/>';
-
-    echo '<table width="100%" border="1">';
-    echo '<thead>';
-    echo '<tr>';
-    echo '<td colspan="3">'.get_lang('ContentPagesInfo').'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td></td>';
-    echo '<td>'.get_lang('InTheLastVersion').'</td>';
-    echo '<td>'.get_lang('InAllVersions').'</td>';
-    echo '</tr>';
-    echo '</thead>';
-    echo '<tr>';
-    echo '<td>'.get_lang('NumWords').'</td>';
-    echo '<td>'.$total_words_lv.'</td>';
-    echo '<td>'.$total_words.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('NumlinksHtmlImagMedia').'</td>';
-    echo '<td>'.$total_links_lv.' ('.get_lang('Anchors').':'.$total_links_anchors_lv.', Mail:'.$total_links_mail_lv.', FTP:'.$total_links_ftp_lv.' IRC:'.$total_links_irc_lv.', News:'.$total_links_news_lv.', ... ) </td>';
-    echo '<td>'.$total_links.' ('.get_lang('Anchors').':'.$total_links_anchors.', Mail:'.$total_links_mail.', FTP:'.$total_links_ftp.', IRC:'.$total_links_irc.', News:'.$total_links_news.', ... ) </td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('NumWikilinks').'</td>';
-    echo '<td>'.$total_wlinks_lv.'</td>';
-    echo '<td>'.$total_wlinks.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('NumImages').'</td>';
-    echo '<td>'.$total_images_lv.'</td>';
-    echo '<td>'.$total_images.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('NumFlash').'</td>';
-    echo '<td>'.$total_flash_lv.'</td>';
-    echo '<td>'.$total_flash.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('NumMp3').'</td>';
-    echo '<td>'.$total_mp3_lv.'</td>';
-    echo '<td>'.$total_mp3.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('NumFlvVideo').'</td>';
-    echo '<td>'.$total_flv_lv.'</td>';
-    echo '<td>'.$total_flv.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('NumYoutubeVideo').'</td>';
-    echo '<td>'.$total_youtube_lv.'</td>';
-    echo '<td>'.$total_youtube.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('NumOtherAudioVideo').'</td>';
-    echo '<td>'.$total_multimedia_lv.'</td>';
-    echo '<td>'.$total_multimedia.'</td>';
-    echo '</tr>';
-    echo '<tr>';
-    echo '<td>'.get_lang('NumTables').'</td>';
-    echo '<td>'.$total_tables_lv.'</td>';
-    echo '<td>'.$total_tables.'</td>';
-    echo '</tr>';
-    echo '</table>';
-    echo '<br/>';
+    $wiki->getStats();
 }
 
 // Most active users Juan Carlos Raña Trabado
 
 if ($action =='mactiveusers') {
-    echo '<div class="actions">'.get_lang('MostActiveUsers').'</div>';
-    $sql='SELECT *, COUNT(*) AS NUM_EDIT FROM '.$tbl_wiki.'  WHERE  c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' GROUP BY user_id';
-    $allpages = Database::query($sql);
-
-    //show table
-    if (Database::num_rows($allpages) > 0) {
-        while ($obj = Database::fetch_object($allpages)) {
-            $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) {
-                $row[] = '<a href="../user/userInfo.php?uInfo='.$userinfo['user_id'].'">'.
-                    Display::tag('span', api_htmlentities(api_get_person_name($userinfo['firstname'], $userinfo['lastname'])), array('title'=>$username)).
-                    '</a><a href="'.api_get_self().'?cidReq='.$_course['id'].'&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['id'].'&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->set_additional_parameters(array('cidReq' =>Security::remove_XSS($_GET['cidReq']),'action'=>Security::remove_XSS($action),'session_id'=>Security::remove_XSS($_GET['session_id']),'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->display();
-    }
+    $wiki->getActiveUsers($action);
 }
 
 // User contributions Juan Carlos Raña Trabado
@@ -1031,7 +446,8 @@ if ($action =='usercontrib') {
             '</a><a href="'.api_get_self().'?cidReq='.$_course['id'].'&action=usercontrib&user_id='.urlencode($row['user_id']).
             '&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'"></a></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.'  WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' AND user_id="'.Database::escape_string($_GET['user_id']).'"';
     } else {
         $sql='SELECT * FROM '.$tbl_wiki.'  WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' AND user_id="'.Database::escape_string($_GET['user_id']).'" AND visibility=1';
@@ -1138,9 +554,13 @@ if ($action =='mvisited') {
     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
-        $sql='SELECT *, SUM(hits) AS tsum FROM '.$tbl_wiki.'  WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' GROUP BY reflink';
+        $sql = 'SELECT *, SUM(hits) AS tsum FROM '.$tbl_wiki.'
+                WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
+                GROUP BY reflink';
     } else {
-        $sql='SELECT *, SUM(hits) AS tsum FROM '.$tbl_wiki.'  WHERE  c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' AND visibility=1 GROUP BY reflink';
+        $sql = 'SELECT *, SUM(hits) AS tsum FROM '.$tbl_wiki.'
+                WHERE  c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' AND visibility=1
+                GROUP BY reflink';
     }
 
     $allpages=Database::query($sql);
@@ -1244,7 +664,10 @@ if ($action =='orphaned') {
     $orphaned = array();
 
     //get name pages
-    $sql='SELECT * FROM '.$tbl_wiki.'  WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' GROUP BY reflink ORDER BY reflink ASC';
+    $sql = 'SELECT * FROM '.$tbl_wiki.'
+            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)) {
         $pages[] = $row['reflink'];
@@ -1252,7 +675,8 @@ if ($action =='orphaned') {
 
     //get name refs in last pages and make a unique list
     $sql = 'SELECT  *  FROM   '.$tbl_wiki.' s1
-    		WHERE s1.c_id = '.$course_id.' AND id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s2.c_id = '.$course_id.' AND s1.reflink = s2.reflink AND '.$groupfilter.$condition_session.')';
+    		WHERE s1.c_id = '.$course_id.' AND id=(
+    		SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s2.c_id = '.$course_id.' AND s1.reflink = s2.reflink AND '.$groupfilter.$condition_session.')';
 
     $allpages=Database::query($sql);
     while ($row=Database::fetch_array($allpages)) {
@@ -1296,8 +720,8 @@ if ($action =='orphaned') {
 		}
 
 		//show table
-        $row = array ();
-			$row[] =$ShowAssignment;
+        $row = array();
+			$row[] = $ShowAssignment;
             $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['id'].'&action=showpage&title='.api_htmlentities(urlencode($orphaned_show)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.api_htmlentities($orphaned_title).'</a>';
             $rows[] = $row;
         }
@@ -1318,7 +742,9 @@ if ($action =='mostlinked') {
 	$linked = array();
 
     //get name pages
-    $sql='SELECT * FROM '.$tbl_wiki.'  WHERE  c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' GROUP BY reflink ORDER BY reflink ASC';
+    $sql = 'SELECT * FROM '.$tbl_wiki.'
+            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)) {
@@ -1329,7 +755,8 @@ if ($action =='mostlinked') {
     }
 
     //get name refs in last pages
-    $sql='SELECT  *  FROM   '.$tbl_wiki.' s1 WHERE s1.c_id = '.$course_id.' AND id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s2.c_id = '.$course_id.' AND s1.reflink = s2.reflink AND '.$groupfilter.$condition_session.')';
+    $sql = 'SELECT  *  FROM   '.$tbl_wiki.' s1 WHERE s1.c_id = '.$course_id.' AND id=(
+            SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s2.c_id = '.$course_id.' AND s1.reflink = s2.reflink AND '.$groupfilter.$condition_session.')';
 
     $allpages=Database::query($sql);
 
@@ -1347,7 +774,8 @@ if ($action =='mostlinked') {
 		}
 	}
 
-	$linked=array_unique($linked);//make a unique list. TODO:delete this line and count how many for each page
+	$linked = array_unique($linked);
+	//make a unique list. TODO:delete this line and count how many for each page
     //show table
     $rows = array();
     foreach ($linked as $linked_show) {
@@ -1367,19 +795,16 @@ if ($action =='mostlinked') {
     );
     $table->set_header(0,get_lang('Title'), true);
     $table->display();
-
 }
 
 /* Delete current page */
 
 if ($action =='delete') {
-
     if (!$_GET['title']) {
         Display::display_error_message(get_lang('MustSelectPage'));
         exit;
     }
 
-    echo '<div style="overflow:hidden">';
     if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
         echo '<div id="wikititle">'.get_lang('DeletePageHistory').'</div>';
 
@@ -1402,14 +827,11 @@ if ($action =='delete') {
     } else {
         Display::display_normal_message(get_lang("OnlyAdminDeletePageWiki"));
     }
-
-    echo '</div>';
 }
 
 /* Delete all wiki */
 
 if ($action =='deletewiki') {
-
     echo '<div class="actions">'.get_lang('DeleteWiki').'</div>';
     echo '<div style="overflow:hidden">';
     if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
@@ -1432,10 +854,7 @@ if ($action =='deletewiki') {
 /* Search wiki pages */
 
 if ($action =='searchpages') {
-
     echo '<div class="actions">'.get_lang('SearchPages').'</div>';
-    echo '<div style="overflow:hidden">';
-
 	if (isset($_GET['mode_table'])) {
 		if (!isset($_GET['SearchPages_table_page_nr'])) {
 			$_GET['search_term'] = $_POST['search_term'];
@@ -1477,7 +896,6 @@ if ($action =='searchpages') {
 			$form->display();
 		}
 	}
-    echo '</div>';
 }
 
 /* What links here. Show pages that have linked this page */
@@ -1487,9 +905,12 @@ if ($action =='links') {
         Display::display_error_message(get_lang("MustSelectPage"));
     } else {
         $sql = 'SELECT * FROM '.$tbl_wiki.'
-                WHERE c_id = '.$course_id.' AND reflink="'.Database::escape_string($page).'" AND '.$groupfilter.$condition_session.'';
-        $result=Database::query($sql);
-        $row=Database::fetch_array($result);
+                WHERE
+                    c_id = '.$course_id.' AND
+                    reflink="'.Database::escape_string($page).'" AND
+                    '.$groupfilter.$condition_session.'';
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
 
         //get type assignment icon
 
@@ -1783,9 +1204,7 @@ if (isset($action) && $action =='edit') {
 
                 //previous checking for concurrent editions
                 if ($row['is_editing']==0) {
-					echo '<div style="z-index:0">';
                     Display::display_normal_message(get_lang('WarningMaxEditingTime'));
-					echo '</div>';
 
                     $time_edit = date("Y-m-d H:i:s");
                     $sql='UPDATE '.$tbl_wiki.' SET is_editing="'.$_user['user_id'].'", time_edit="'.$time_edit.'" WHERE c_id = '.$course_id.' AND  id="'.$row['id'].'"';
@@ -1809,38 +1228,38 @@ if (isset($action) && $action =='edit') {
                 }
 
                 // Form.
-                echo '<div id="wikititle"><div style="width:70%;float:left;">'.$icon_assignment.str_repeat('&nbsp;',3).api_htmlentities($title).'</div></div>';
+                echo '<div id="wikititle">'.$icon_assignment.str_repeat('&nbsp;',3).api_htmlentities($title).'</div>';
                 echo '<form name="form1" method="post" action="'.api_get_self().'?action=showpage&amp;title='.api_htmlentities(urlencode($page)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">';
 
                 if ((api_is_allowed_to_edit(false,true) || api_is_platform_admin()) && $row['reflink'] != 'index') {
-
-                    echo'<a href="javascript://" onclick="advanced_parameters()" >
-                         <span id="plus_minus" style="float:right">&nbsp;'.
+                    echo '<a href="javascript://" onclick="advanced_parameters()" >
+                         <div id="plus_minus">&nbsp;'.
                         Display::return_icon(
                             'div_show.gif',
                             get_lang('Show'),
                             array('style'=>'vertical-align:middle')
-                        ).'&nbsp;'.get_lang('AdvancedParameters').'</span></a>';
+                        ).'&nbsp;'.get_lang('AdvancedParameters').'</div></a>';
 
                     echo '<div id="options" style="display:none; margin: 20px;" >';
 
-                    //task
-                    echo '<div>&nbsp;</div><input type="checkbox" value="1" name="checktask" onclick="javascript: if(this.checked){document.getElementById(\'option4\').style.display=\'block\';}else{document.getElementById(\'option4\').style.display=\'none\';}"/>&nbsp;'.Display::return_icon('wiki_task.png', get_lang('DefineTask'),'',ICON_SIZE_SMALL).' '.get_lang('DescriptionOfTheTask').'';
+                    // Task
+                    echo '<input type="checkbox" value="1" name="checktask" onclick="javascript: if(this.checked){document.getElementById(\'option4\').style.display=\'block\';}else{document.getElementById(\'option4\').style.display=\'none\';}"/>&nbsp;'.Display::return_icon('wiki_task.png', get_lang('DefineTask'),'',ICON_SIZE_SMALL).' '.get_lang('DescriptionOfTheTask').'';
                     echo '&nbsp;&nbsp;&nbsp;<span id="msg_error4" style="display:none;color:red"></span>';
                     echo '<div id="option4" style="padding:4px; margin:5px; border:1px dotted; display:none;">';
-                    echo '<table border="0" style="font-weight:normal">';
+                    echo '<table>';
                     echo '<tr>';
                     echo '<td>'.get_lang('DescriptionOfTheTask').'</td>';
                     echo '</tr>';
                     echo '<tr>';
-                    echo '<td>'.api_disp_html_area('task', $row['task'], '', '', null, array('ToolbarSet' => 'wiki_task', 'Width' => '585', 'Height' => '200')).'</td>';
+                    echo '<td>'.api_disp_html_area('task', $row['task'], '', '', null, array('ToolbarSet' => 'wiki_task', 'Width' => '100%', 'Height' => '200')).'</td>';
                     echo '</tr>';
                     echo '</table>';
                     echo '</div>';
 
-                    //feedback
-                    echo '<div>&nbsp;</div><input type="checkbox" value="1" name="checkfeedback" onclick="javascript: if(this.checked){document.getElementById(\'option2\').style.display=\'block\';}else{document.getElementById(\'option2\').style.display=\'none\';}"/>&nbsp;'.get_lang('AddFeedback').'';
+                    // Feedback
+                    echo '<input type="checkbox" value="1" name="checkfeedback" onclick="javascript: if(this.checked){document.getElementById(\'option2\').style.display=\'block\';}else{document.getElementById(\'option2\').style.display=\'none\';}"/>&nbsp;'.get_lang('AddFeedback').'';
                     echo '&nbsp;&nbsp;&nbsp;<span id="msg_error2" style="display:none;color:red"></span>';
+
                     echo '<div id="option2" style="padding:4px; margin:5px; border:1px dotted; display:none;">';
 
                     echo '<table border="0" style="font-weight:normal" align="center">';
@@ -1911,7 +1330,6 @@ if (isset($action) && $action =='edit') {
                     echo '<td>';
                     if ($row['startdate_assig']=='0000-00-00 00:00:00') {
                         echo $wiki->draw_date_picker('startdate_assig').' <input type="checkbox" name="initstartdate" value="1"> '.get_lang('Yes').'/'.get_lang('No').'';
-
                     } else {
                         echo $wiki->draw_date_picker('startdate_assig', $row['startdate_assig']).' <input type="checkbox" name="initstartdate" value="1">'.get_lang('Yes').'/'.get_lang('No').'';
                     }
@@ -1947,8 +1365,6 @@ if (isset($action) && $action =='edit') {
                     echo '</div>';
                 }
 
-                echo '<div id="wikicontent">';
-
                 echo '<input type="hidden" name="page_id" value="'.$page_id.'">';
                 echo '<input type="hidden" name="reflink" value="'.api_htmlentities($page).'">';
                 echo '<input type="hidden" name="title" value="'.api_htmlentities($title).'">';
@@ -1959,18 +1375,15 @@ if (isset($action) && $action =='edit') {
                 );
                 echo '<br/>';
                 echo '<br/>';
-                //if(api_is_allowed_to_edit() || api_is_platform_admin()) //off for now
-                //{
+
                 echo get_lang('Comments').':&nbsp;&nbsp;<input type="text" name="comment" size="40">&nbsp;&nbsp;&nbsp;';
-                //}
-                echo '<INPUT TYPE="hidden" NAME="assignment" VALUE="'.$row['assignment'].'"/>';
-                echo '<INPUT TYPE="hidden" NAME="version" VALUE="'.$row['version'].'"/>';
+                echo '<input TYPE="hidden" NAME="assignment" VALUE="'.$row['assignment'].'"/>';
+                echo '<input TYPE="hidden" NAME="version" VALUE="'.$row['version'].'"/>';
 
                 //hack date for edit
-                echo '<INPUT TYPE="hidden" NAME="startdate_assig" VALUE="'.$row['startdate_assig'].'"/>';
-                echo '<INPUT TYPE="hidden" NAME="enddate_assig" VALUE="'.$row['enddate_assig'].'"/>';
+                echo '<input TYPE="hidden" NAME="startdate_assig" VALUE="'.$row['startdate_assig'].'"/>';
+                echo '<input TYPE="hidden" NAME="enddate_assig" VALUE="'.$row['enddate_assig'].'"/>';
 
-                //
                 echo get_lang('Progress').':&nbsp;&nbsp;<select name="progress" id="progress">';
                 echo '<option value="'.api_htmlentities($row['progress']).'" selected>'.api_htmlentities($row['progress']).'</option>';
                 echo '<option value="10">10</option>
@@ -1988,7 +1401,6 @@ if (isset($action) && $action =='edit') {
                 echo '<input type="hidden" name="wpost_id" value="'.md5(uniqid(rand(), true)).'">';//prevent double post
                  //for save button Don't change name (see fckeditor/editor/plugins/customizations/fckplugin_compressed.js and fckplugin.js
                 echo '<button class="save" type="submit" name="SaveWikiChange">'.get_lang('Save').'</button>';
-                echo '</div>';
                 echo '</form>';
             }
         }
@@ -2002,9 +1414,11 @@ if ($action == 'history' or isset($_POST['HistoryDifferences'])) {
         Display::display_error_message(get_lang("MustSelectPage"));
         exit;
     }
-    echo '<div style="overflow:hidden">';
 
-    //First, see the property visibility that is at the last register and therefore we should select descending order. But to give ownership to each record, this is no longer necessary except for the title. TODO: check this
+    /* First, see the property visibility that is at the last register and
+    therefore we should select descending order.
+    But to give ownership to each record,
+    this is no longer necessary except for the title. TODO: check this*/
 
     $sql = 'SELECT * FROM '.$tbl_wiki.'
             WHERE c_id = '.$course_id.' AND reflink="'.Database::escape_string($page).'" AND '.$groupfilter.$condition_session.'
@@ -2041,19 +1455,20 @@ if ($action == 'history' or isset($_POST['HistoryDifferences'])) {
     ) {
         // We show the complete history
         if (!isset($_POST['HistoryDifferences']) && !isset($_POST['HistoryDifferences2'])) {
-
             $sql = 'SELECT * FROM '.$tbl_wiki.'
-                    WHERE c_id = '.$course_id.' AND reflink="'.Database::escape_string($page).'" AND '.$groupfilter.$condition_session.'
+                    WHERE
+                        c_id = '.$course_id.' AND
+                        reflink="'.Database::escape_string($page).'" AND
+                        '.$groupfilter.$condition_session.'
                     ORDER BY id DESC';
             $result = Database::query($sql);
-
             $title		= $_GET['title'];
             $group_id	= $_GET['group_id'];
 
             echo '<div id="wikititle">';
             echo $icon_assignment.'&nbsp;&nbsp;&nbsp;'.api_htmlentities($KeyTitle);
             echo '</div>';
-            echo '<div id="wikicontent">';
+
             echo '<form id="differences" method="POST" action="index.php?cidReq='.$_course['id'].'&action=history&title='.api_htmlentities(urlencode($title)).'&session_id='.api_htmlentities($session_id).'&group_id='.api_htmlentities($group_id).'">';
 
             echo '<ul style="list-style-type: none;">';
@@ -2090,10 +1505,8 @@ if ($action == 'history' or isset($_POST['HistoryDifferences'])) {
                 } else {
                     echo get_lang('Anonymous').' ('.api_htmlentities($row['user_ip']).')';
                 }
-
                 echo ' ( '.get_lang('Progress').': '.api_htmlentities($row['progress']).'%, ';
-                $comment=$row['comment'];
-
+                $comment = $row['comment'];
                 if (!empty($comment)) {
                     echo get_lang('Comments').': '.api_htmlentities(api_substr($row['comment'],0,100));
                     if (api_strlen($row['comment'])>100) {
@@ -2105,10 +1518,11 @@ if ($action == 'history' or isset($_POST['HistoryDifferences'])) {
                 echo ' ) </li>';
                 $counter++;
             } //end while
+
             echo '<br/>';
             echo '<button class="search" type="submit" name="HistoryDifferences" value="HistoryDifferences">'.get_lang('ShowDifferences').' '.get_lang('LinesDiff').'</button>';
             echo '<button class="search" type="submit" name="HistoryDifferences2" value="HistoryDifferences2">'.get_lang('ShowDifferences').' '.get_lang('WordsDiff').'</button>';
-            echo '</ul></form></div>';
+            echo '</ul></form>';
         } else { // We show the differences between two versions
             $version_old = array();
             if (isset($_POST['old'])) {
@@ -2148,11 +1562,9 @@ if ($action == 'history' or isset($_POST['HistoryDifferences'])) {
                 <span class="diffDeletedTex" >'.get_lang('WikiDiffDeletedTex').'</span></font></div>';
             }
 
-            echo '<div class="diff"><br /><br />';
 
             if (isset($_POST['HistoryDifferences'])) {
                 echo '<table>'.diff($oldContent, $version_new['content'], true, 'format_table_line' ).'</table>'; // format_line mode is better for words
-                echo '</div>';
                 echo '<br />';
                 echo '<strong>'.get_lang('Legend').'</strong><div class="diff">' . "\n";
                 echo '<table><tr>';
@@ -2164,7 +1576,6 @@ if ($action == 'history' or isset($_POST['HistoryDifferences'])) {
                 echo '<span class="diffMoved" >'.get_lang('WikiDiffMovedLine').'</span><br />';
                 echo '</td>';
                 echo '</tr></table>';
-                echo '</div>';
             }
 
             if (isset($_POST['HistoryDifferences2'])) {
@@ -2173,8 +1584,6 @@ if ($action == 'history' or isset($_POST['HistoryDifferences'])) {
                 $diff = new Text_Diff($lines1, $lines2);
                 $renderer = new Text_Diff_Renderer_inline();
                 echo '<style>del{background:#fcc}ins{background:#cfc}</style>'.$renderer->render($diff); // Code inline
-                //echo '<div class="diffEqual">'.html_entity_decode($renderer->render($diff)).'</div>'; // Html inline. By now, turned off by problems in comparing pages separated by more than one version
-                echo '</div>';
                 echo '<br />';
                 echo '<strong>'.get_lang('Legend').'</strong><div class="diff">' . "\n";
                 echo '<table><tr>';
@@ -2184,476 +1593,25 @@ if ($action == 'history' or isset($_POST['HistoryDifferences'])) {
                 echo '<span class="diffDeletedTex" >'.get_lang('WikiDiffDeletedTex').'</span><br />';
                 echo '</td>';
                 echo '</tr></table>';
-                echo '</div>';
             }
         }
     }
-    echo '</div>';
 }
 
 // Recent changes
 // @todo rss feed
 if ($action =='recentchanges') {
-    $groupId = api_get_group_id();
-    if (api_is_allowed_to_session_edit(false,true) ) {
-        if ($wiki->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';
-        }
-    }
-
-    echo '<div class="actions"><span style="float: right;">';
-    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
-        $sql = 'SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.'
-        		WHERE 	'.$tbl_wiki_conf.'.c_id= '.$course_id.' AND
-        				'.$tbl_wiki.'.c_id= '.$course_id.' AND
-        				'.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND
-        				'.$tbl_wiki.'.'.$groupfilter.$condition_session.'
-        		ORDER BY dtime DESC'; // new version
-    } else {
-        $sql='SELECT * FROM '.$tbl_wiki.' WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' AND visibility=1 ORDER BY dtime DESC';	// old version TODO: Replace by the bottom line
-    }
-
-    $allpages=Database::query($sql);
-
-    //show table
-    if (Database::num_rows($allpages) > 0) {
-        $row = array ();
-        while ($obj = Database::fetch_object($allpages)) {
-            //get author
-            $userinfo =api_get_user_info($obj->user_id);
-            $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) {
-                $ShowAssignment='<img src="../img/px_transparent.gif" />';
-            }
-
-            //get icon task
-            if (!empty($obj->task)) {
-                $icon_task=Display::return_icon('wiki_task.png', get_lang('StandardTask'),'',ICON_SIZE_SMALL);
-            } else {
-                $icon_task='<img src="../img/px_transparent.gif" />';
-            }
-
-            $row = array ();
-            $row[] = api_get_local_time($obj->dtime, null, date_default_timezone_get());
-            $row[] = $ShowAssignment.$icon_task;
-            $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['id'].'&action=showpage&title='.api_htmlentities(urlencode($obj->reflink)).'&amp;view='.$obj->id.'&session_id='.api_get_session_id().'&group_id='.api_get_group_id().'">'.api_htmlentities($obj->title).'</a>';
-            $row[] = $obj->version>1 ? get_lang('EditedBy') : get_lang('AddedBy');
-            if ($obj->user_id <> 0 ) {
-                $row[] = '<a href="../user/userInfo.php?uInfo='.$userinfo['user_id'].'">'.
-                Display::tag('span', api_htmlentities(api_get_person_name($userinfo['firstname'], $userinfo['lastname'])), array('title'=>$username)).
-                '</a>';
-            }
-            else {
-                $row[] = get_lang('Anonymous').' ('.api_htmlentities($obj->user_ip).')';
-            }
-            $rows[] = $row;
-        }
-
-        $table = new SortableTableFromArrayConfig($rows,0,10,'RecentPages_table','','','DESC');
-        $table->set_additional_parameters(
-            array(
-                'cidReq' =>api_get_course_id(),
-                'action'=>Security::remove_XSS($action),
-                'session_id' => api_get_session_id(),
-                '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->display();
-    }
+    $wiki->recentChanges($page, $action);
 }
 
 // All pages
-
-if ($action  == 'allpages') {
-    echo '<div class="actions">'.get_lang('AllPages').'</div>';
-
-    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=(
-                    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.')'; // warning don't use group by reflink because does not return the last version
-
-    } else {
-		$sql = 'SELECT  *  FROM   '.$tbl_wiki.' s1
-				WHERE visibility=1 AND s1.c_id = '.$course_id.' 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.')'; // warning don't use group by reflink because does not return the last version
-    }
-
-    $allpages=Database::query($sql);
-
-    //show table
-    if (Database::num_rows($allpages) > 0) {
-        $row = array ();
-        while ($obj = Database::fetch_object($allpages)) {
-            //get author
-            $userinfo = api_get_user_info($obj->user_id);
-            $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) {
-                $ShowAssignment='<img src="../img/px_transparent.gif" />';
-            }
-
-            //get icon task
-            if (!empty($obj->task)) {
-                $icon_task=Display::return_icon('wiki_task.png', get_lang('StandardTask'),'',ICON_SIZE_SMALL);
-            } else {
-                $icon_task='<img src="../img/px_transparent.gif" />';
-            }
-
-            $row = array();
-            $row[] =$ShowAssignment.$icon_task;
-            $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['id'].'&action=showpage&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.api_htmlentities($obj->title).'</a>';
-            if ($obj->user_id <>0) {
-                $row[] =  '<a href="../user/userInfo.php?uInfo='.$userinfo['user_id'].'">'.
-                Display::tag('span', api_htmlentities(api_get_person_name($userinfo['firstname'], $userinfo['lastname'])), array('title'=>$username)).
-                '</a>';
-            }
-            else {
-                $row[] =  get_lang('Anonymous').' ('.api_htmlentities($obj->user_ip).')';
-            }
-            $row[] = api_get_local_time($obj->dtime, null, date_default_timezone_get());
-
-            if (api_is_allowed_to_edit(false,true)|| api_is_platform_admin()) {
-                $showdelete=' <a href="'.api_get_self().'?cidReq='.$_course['id'].'&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) ) {
-                $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['id'].'&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['id'].'&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['id'].'&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['id'].'&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;
-            }
-            $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->display();
-    }
+if ($action == 'allpages') {
+    $wiki->allPages($action);
 }
 
 // Discuss pages
-
 if ($action == 'discuss') {
-    if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {
-        api_not_allowed();
-    }
-
-    if (!$_GET['title']) {
-        Display::display_error_message(get_lang("MustSelectPage"));
-        exit;
-    }
-
-    //first extract the date of last version
-    $sql = 'SELECT * FROM '.$tbl_wiki.'
-            WHERE c_id = '.$course_id.' AND reflink="'.Database::escape_string($page).'" AND '.$groupfilter.$condition_session.' ORDER BY id DESC';
-    $result=Database::query($sql);
-    $row=Database::fetch_array($result);
-    $lastversiondate=api_get_local_time($row['dtime'], null, date_default_timezone_get());
-    $lastuserinfo = api_get_user_info($row['user_id']);
-    $username = api_htmlentities(sprintf(get_lang('LoginX'), $lastuserinfo['username']), ENT_QUOTES);
-
-    //select page to discuss
-    $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);
-    $id=$row['id'];
-    $firstuserid=$row['user_id'];
-
-    //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);
-    } elseif($row['assignment']==2) {
-        $icon_assignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'),'',ICON_SIZE_SMALL);
-    }
-
-    $countWPost = null;
-    $avg_WPost_score = null;
-
-    //Show title and form to discuss if page exist
-    if ($id!='') {
-        //Show discussion to students if isn't hidden. Show page to all teachers if is hidden. Mode assignments: If is hidden, show pages to student only if student is the author
-        if ($row['visibility_disc']==1 || api_is_allowed_to_edit(false,true) || api_is_platform_admin() || ($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 ($wiki->check_addlock_discuss()==1) {
-                    $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';
-                }
-            }
-            echo '<span style="float:right">';
-            echo '<a href="index.php?action=discuss&amp;actionpage='.$lock_unlock_disc.'&amp;title='.api_htmlentities(urlencode($page)).'">'.$addlock_disc.'</a>';
-            echo '</span>';
-
-            // discussion action: visibility.  Show discussion to students if isn't hidden. Show page to all teachers if is hidden.
-            $visibility_disc = null;
-            $hide_show_disc = null;
-            if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
-                if ($wiki->check_visibility_discuss()==1) {
-                    /// TODO: 	Fix Mode assignments: If is hidden, show discussion to student only if student is the author
-                    //if(($row['assignment']==2 && $row['visibility_disc']==0 && (api_get_user_id()==$row['user_id']))==false)
-                    //{
-                        //$visibility_disc= '<img src="../img/wiki/invisible.gif" title="'.get_lang('HideDiscussExtra').'" alt="'.get_lang('HideDiscussExtra').'" />';
-
-                    //}
-                    $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);
-                    $hide_show_disc = 'showdisc';
-                }
-            }
-            echo '<span style="float:right">';
-            echo '<a href="index.php?action=discuss&amp;actionpage='.$hide_show_disc.'&amp;title='.api_htmlentities(urlencode($page)).'">'.$visibility_disc.'</a>';
-            echo '</span>';
-
-            //discussion action: check add rating lock. Show/Hide list to rating for all student
-            $lock_unlock_rating_disc = null;
-            $ratinglock_disc = null;
-            if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
-                if ($wiki->check_ratinglock_discuss()==1) {
-                    $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);
-                    $lock_unlock_rating_disc = 'lockrating';
-                }
-            }
-
-            echo '<span style="float:right">';
-            echo '<a href="index.php?action=discuss&amp;actionpage='.$lock_unlock_rating_disc.'&amp;title='.api_htmlentities(urlencode($page)).'">'.$ratinglock_disc.'</a>';
-            echo '</span>';
-
-            //discussion action: email notification
-            if ($wiki->check_notify_discuss($page)==1) {
-                $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';
-            }
-            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>';
-            echo '</span>';
-
-            echo $icon_assignment.'&nbsp;&nbsp;&nbsp;'.api_htmlentities($row['title']);
-
-            echo ' ('.get_lang('MostRecentVersionBy').' <a href="../user/userInfo.php?uInfo='.$lastuserinfo['user_id'].'">'.
-                Display::tag('span', api_htmlentities(api_get_person_name($lastuserinfo['firstname'], $lastuserinfo['lastname'])), array('title'=>$username)).
-                '</a> '.$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()) { //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><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()) {
-                        ?>
-                        <td><?php echo get_lang('Rating');?>: </td>
-                        <td valign="top"><select name="rating" id="rating">
-                           <option value="-" selected>-</option>
-                           <option value="0">0</option>
-                           <option value="1">1</option>
-                           <option value="2">2</option>
-                           <option value="3">3</option>
-                           <option value="4">4</option>
-                           <option value="5">5</option>
-                           <option value="6">6</option>
-                           <option value="7">7</option>
-                           <option value="8">8</option>
-                           <option value="9">9</option>
-                           <option value="10">10</option>
-                           </select></td>
-                        <?php
-                    } else {
-                         echo '<input type=hidden name="rating" value="-">';// must pass a default value to avoid rate automatically
-                    }
-                    ?>
-                    </tr>
-                    <tr>
-                    <td>&nbsp;</td>
-                    <td> <?php  echo '<button class="save" type="submit" name="Submit"> '.get_lang('Send').'</button>'; ?></td>
-                      </tr>
-                </table>
-                </form>
-
-                <?php
-                if (isset($_POST['Submit']) && $wiki->double_post($_POST['wpost_id'])) {
-                    $dtime = date( "Y-m-d H:i:s" );
-                    $message_author=api_get_user_id();
-                    $sql="INSERT INTO $tbl_wiki_discuss (c_id, publication_id, userc_id, comment, p_score, dtime) VALUES
-                    	($course_id, '".$id."','".$message_author."','".Database::escape_string($_POST['comment'])."','".Database::escape_string($_POST['rating'])."','".$dtime."')";
-                    $result=Database::query($sql) or die(Database::error());
-                    $wiki->check_emailcue($id, 'D', $dtime, $message_author);
-                }
-            }//end discuss lock
-
-            echo '<hr noshade size="1">';
-            $user_table = Database :: get_main_table(TABLE_MAIN_USER);
-
-            $sql="SELECT * FROM $tbl_wiki_discuss reviews, $user_table user
-                  WHERE reviews.c_id = $course_id AND reviews.publication_id='".$id."' AND user.user_id='".$firstuserid."'
-                  ORDER BY id DESC";
-            $result=Database::query($sql) or die(Database::error());
-
-            $countWPost = Database::num_rows($result);
-            echo get_lang('NumComments').": ".$countWPost; //comment's numbers
-
-            $sql="SELECT SUM(p_score) as sumWPost
-                 FROM $tbl_wiki_discuss WHERE c_id = $course_id AND publication_id = '".$id."' AND NOT p_score='-'
-                 ORDER BY id DESC";
-            $result2=Database::query($sql) or die(Database::error());
-            $row2=Database::fetch_array($result2);
-
-            $sql = "SELECT * FROM $tbl_wiki_discuss
-                    WHERE c_id = $course_id AND publication_id='".$id."' AND NOT p_score='-'";
-            $result3=Database::query($sql) or die(Database::error());
-            $countWPost_score= Database::num_rows($result3);
-
-            echo ' - '.get_lang('NumCommentsScore').': '.$countWPost_score;//
-
-            if ($countWPost_score!=0) {
-                $avg_WPost_score = round($row2['sumWPost'] / $countWPost_score,2).' / 10';
-            } else {
-                $avg_WPost_score = $countWPost_score;
-            }
-
-            echo ' - '.get_lang('RatingMedia').': '.$avg_WPost_score; // average rating
-
-            $sql = 'UPDATE '.$tbl_wiki.' SET score="'.Database::escape_string($avg_WPost_score).'"
-                    WHERE c_id = '.$course_id.' AND reflink="'.Database::escape_string($page).'" AND '.$groupfilter.$condition_session;
-            // check if work ok. TODO:
-            Database::query($sql);
-
-            echo '<hr noshade size="1">';
-            //echo '<div style="overflow:auto; height:170px;">';
-
-            while ($row=Database::fetch_array($result)) {
-                $userinfo = api_get_user_info($row['userc_id']);
-                $username = api_htmlentities(sprintf(get_lang('LoginX'), $userinfo['username']), ENT_QUOTES);
-
-                if (($userinfo['status'])=="5") {
-                    $author_status=get_lang('Student');
-                } else {
-                    $author_status=get_lang('Teacher');
-                }
-
-                $user_id=$row['userc_id'];
-                $name = api_get_person_name($userinfo['firstname'], $userinfo['lastname']);
-                $attrb=array();
-                if ($user_id<>0) {
-                    $image_path = UserManager::get_user_picture_path_by_id($user_id,'web',false, true);
-                    $image_repository = $image_path['dir'];
-                    $existing_image = $image_path['file'];
-                    $author_photo= '<img src="'.$image_repository.$existing_image.'" alt="'.api_htmlentities($name).'"  width="40" height="50" align="top" title="'.api_htmlentities($name).'"  />';
-                } else {
-                    $author_photo= '<img src="'.api_get_path(WEB_CODE_PATH)."img/unknown.jpg".'" alt="'.api_htmlentities($name).'"  width="40" height="50" align="top"  title="'.api_htmlentities($name).'"  />';
-                }
-
-                //stars
-                $p_score=$row['p_score'];
-                switch ($p_score) {
-                    case  0:
-                    $imagerating='<img src="../img/rating/stars_0.gif"/>';
-                    break;
-                    case  1:
-                    $imagerating='<img src="../img/rating/stars_5.gif"/>';
-                    break;
-                    case  2:
-                    $imagerating='<img src="../img/rating/stars_10.gif"/>';
-                    break;
-                    case  3:
-                    $imagerating='<img src="../img/rating/stars_15.gif"/>';
-                    break;
-                    case  4:
-                    $imagerating='<img src="../img/rating/stars_20.gif"/>';
-                    break;
-                    case  5:
-                    $imagerating='<img src="../img/rating/stars_25.gif"/>';
-                    break;
-                    case  6:
-                    $imagerating='<img src="../img/rating/stars_30.gif"/>';
-                    break;
-                    case  7:
-                    $imagerating='<img src="../img/rating/stars_35.gif"/>';
-                    break;
-                    case  8:
-                    $imagerating='<img src="../img/rating/stars_40.gif"/>';
-                    break;
-                    case  9:
-                    $imagerating='<img src="../img/rating/stars_45.gif"/>';
-                    break;
-                    case  10:
-                    $imagerating='<img src="../img/rating/stars_50.gif"/>';
-                    break;
-                }
-
-                echo '<p><table>';
-                echo '<tr>';
-                echo '<td rowspan="2">'.$author_photo.'</td>';
-                echo '<td style=" color:#999999"><a href="../user/userInfo.php?uInfo='.$userinfo['user_id'].'">'.
-                    Display::tag('span', api_htmlentities(api_get_person_name($userinfo['firstname'], $userinfo['lastname'])), array('title'=>$username)).
-                    '</a> ('.$author_status.') '.api_get_local_time($row['dtime'], null, date_default_timezone_get()).' - '.get_lang('Rating').': '.$row['p_score'].' '.$imagerating.' </td>';
-                echo '</tr>';
-                echo '<tr>';
-                echo '<td>'.api_htmlentities($row['comment']).'</td>';
-                echo '</tr>';
-                echo "</table>";
-                echo '<hr noshade size="1">';
-
-                }
-            } else {
-            Display::display_warning_message(get_lang('LockByTeacher'),false);
-        }
-    } else {
-            Display::display_normal_message(get_lang('DiscussNotAvailable'));
-    }
+    $wiki->getDiscuss($page);
 }
 
 Display::display_footer();
diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php
index 3a8bdcc361..1a67ab4302 100644
--- a/main/wiki/wiki.inc.php
+++ b/main/wiki/wiki.inc.php
@@ -578,7 +578,7 @@ class Wiki
             echo '<td>'.get_lang('DescriptionOfTheTask').'</td>';
             echo '</tr>';
             echo '<tr>';
-            echo '<td>'.api_disp_html_area('task', '', '', '', null, array('ToolbarSet' => 'wiki_task', 'Width' => '580', 'Height' => '200')).'</td>';
+            echo '<td>'.api_disp_html_area('task', '', '', '', null, array('ToolbarSet' => 'wiki_task', 'Width' => '100%', 'Height' => '200')).'</td>';
             echo '</tr>';
             echo '</table>';
             echo '</div>';
@@ -2013,9 +2013,9 @@ class Wiki
         if (empty($default)) {
             $default = date('Y-m-d H:i:s');
         }
-        $parts = split(' ',$default);
-        list($d_year,$d_month,$d_day) = split('-',$parts[0]);
-        list($d_hour,$d_minute) = split(':',$parts[1]);
+        $parts = explode(' ', $default);
+        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'),
@@ -2162,6 +2162,9 @@ class Wiki
         return false;
     }
 
+    /**
+     * @return array
+     */
     public function getAllWiki()
     {
         $tbl_wiki = $this->tbl_wiki;
@@ -2174,6 +2177,9 @@ class Wiki
         return Database::store_result($result, 'ASSOC');
     }
 
+    /**
+     * @param int $isEditing
+     */
     public function updateWikiIsEditing($isEditing)
     {
         $tbl_wiki = $this->tbl_wiki;
@@ -2185,4 +2191,1083 @@ class Wiki
                 WHERE c_id = '.$course_id.' AND is_editing="'.$isEditing.'" '.$condition_session;
         Database::query($sql);
     }
+
+    /**
+     * Release of blocked pages to prevent concurrent editions
+     * @param int $userId
+     * @param string $action
+     */
+    function blockConcurrentEditions($userId, $action = null)
+    {
+        $result = self::getAllWiki();
+        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;
+
+            //first prevent concurrent users and double version
+            if ($is_editing_block['is_editing'] == $userId) {
+                $_SESSION['_version']=$is_editing_block['version'];
+            } else {
+                unset($_SESSION['_version']);
+            }
+            //second checks if has exceeded the time that a page may be available or if a page was edited and saved by its author
+            if ($time_editing>$max_edit_time || ($is_editing_block['is_editing']==$userId && $action!='edit')) {
+                self::updateWikiIsEditing($is_editing_block['is_editing']);
+            }
+        }
+    }
+
+    function getStats()
+    {
+        $tbl_wiki = $this->tbl_wiki;
+        $course_id = $this->course_id;
+        $condition_session = $this->condition_session;
+        $groupfilter = $this->groupfilter;
+        $session_id = $this->session_id;
+        $tbl_wiki_conf = $this->tbl_wiki_conf;
+
+        echo '<div class="actions">'.get_lang('Statistics').'</div>';
+
+        // Check all versions of all pages
+        $total_words 			= 0;
+        $total_links 			= 0;
+        $total_links_anchors 	= 0;
+        $total_links_mail		= 0;
+        $total_links_ftp 		= 0;
+        $total_links_irc		= 0;
+        $total_links_news 		= 0;
+        $total_wlinks 			= 0;
+        $total_images 			= 0;
+        $clean_total_flash 		= 0;
+        $total_flash			= 0;
+        $total_mp3				= 0;
+        $total_flv_p 			= 0;
+        $total_flv				= 0;
+        $total_youtube			= 0;
+        $total_multimedia		= 0;
+        $total_tables			= 0;
+
+        $sql = "SELECT *, COUNT(*) AS TOTAL_VERS, SUM(hits) AS TOTAL_VISITS
+                FROM ".$tbl_wiki."
+                WHERE c_id = $course_id AND ".$groupfilter.$condition_session."";
+
+        $allpages=Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_versions = $row['TOTAL_VERS'];
+            $total_visits = intval($row['TOTAL_VISITS']);
+        }
+
+        $sql = "SELECT * FROM ".$tbl_wiki."
+                WHERE c_id = $course_id AND ".$groupfilter.$condition_session."";
+        $allpages = Database::query($sql);
+
+        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");
+            $clean_total_flash = preg_replace('/player.swf/', ' ', $row['content']);
+            $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");
+        }
+
+        //check only last version of all pages (current page)
+
+        $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)
+                FROM '.$tbl_wiki.' s2
+                WHERE s2.c_id = '.$course_id.' AND s1.reflink = s2.reflink AND '.$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']);
+        }
+
+        $total_words_lv			= 0;
+        $total_links_lv			= 0;
+        $total_links_anchors_lv	= 0;
+        $total_links_mail_lv 	= 0;
+        $total_links_ftp_lv 	= 0;
+        $total_links_irc_lv 	= 0;
+        $total_links_news_lv 	= 0;
+        $total_wlinks_lv 		= 0;
+        $total_images_lv 		= 0;
+        $clean_total_flash_lv 	= 0;
+        $total_flash_lv			= 0;
+        $total_mp3_lv			= 0;
+        $total_flv_p_lv		    = 0;
+        $total_flv_lv			= 0;
+        $total_youtube_lv		= 0;
+        $total_multimedia_lv	= 0;
+        $total_tables_lv		= 0;
+
+        $sql = 'SELECT * FROM  '.$tbl_wiki.' s1
+                WHERE s1.c_id = '.$course_id.' 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.'
+                )';
+        $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");
+            $clean_total_flash_lv = preg_replace('/player.swf/', ' ', $row['content']);
+            $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 pages edited at this time
+        $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
+                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.'
+        )';
+        //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'];
+        }
+        //Total hidden pages
+        $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;
+        }
+
+        //Total protect pages
+        $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;
+        }
+
+        // Total empty versions.
+        $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;
+        }
+
+        //Total empty pages (last version)
+
+        $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);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_empty_content_lv	= $total_empty_content_lv+1;
+        }
+
+        // Total locked discuss pages
+        $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);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_lock_disc	= $total_lock_disc+1;
+        }
+
+        // Total hidden discuss pages.
+        $total_hidden_disc = 0;
+        $sql = 'SELECT * FROM '.$tbl_wiki.'
+                WHERE c_id = '.$course_id.' AND visibility_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_hidden_disc	= $total_hidden_disc+1;
+        }
+
+        //Total versions with any short comment by user or system
+
+        $total_comment_version = 0;
+        $sql = 'SELECT * FROM '.$tbl_wiki.'
+                WHERE c_id = '.$course_id.' AND comment!="" AND '.$groupfilter.$condition_session.'';
+        $allpages=Database::query($sql);
+        while ($row = Database::fetch_array($allpages)) {
+            $total_comment_version	= $total_comment_version+1;
+        }
+
+        // Total pages that can only be scored by teachers.
+
+        $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;
+        }
+
+        // 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 pages identified as standard task
+
+        $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;
+        }
+
+        //Total pages identified as teacher page (wiki portfolio mode - individual assignment)
+
+        $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)
+                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_teacher_assignment=$total_teacher_assignment+1;
+        }
+
+        //Total pages identifies as student page (wiki portfolio mode - individual assignment)
+
+        $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;
+        }
+
+        //Current Wiki status add new pages
+        $sql = 'SELECT * FROM '.$tbl_wiki.'
+                WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
+                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'];
+        }
+
+        if ($wiki_add_lock==1) {
+            $status_add_new_pag=get_lang('Yes');
+        } else {
+            $status_add_new_pag=get_lang('No');
+        }
+
+        //Creation date of the oldest wiki page and version
+
+        $first_wiki_date='0000-00-00 00:00:00';
+        $sql = 'SELECT * FROM '.$tbl_wiki.'  WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
+                ORDER BY dtime ASC LIMIT 1';
+        $allpages=Database::query($sql);
+        while ($row=Database::fetch_array($allpages)) {
+            $first_wiki_date=$row['dtime'];
+        }
+
+        // Date of publication of the latest wiki version.
+
+        $last_wiki_date='0000-00-00 00:00:00';
+        $sql = 'SELECT * FROM '.$tbl_wiki.'  WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
+                ORDER BY dtime DESC LIMIT 1';
+        $allpages=Database::query($sql);
+        while ($row=Database::fetch_array($allpages)) {
+            $last_wiki_date=$row['dtime'];
+        }
+
+        // Average score of all wiki pages. (If a page has not scored zero rated)
+        $media_score = 0;
+        $sql = "SELECT *, SUM(score) AS TOTAL_SCORE FROM ".$tbl_wiki."
+                WHERE c_id = $course_id AND ".$groupfilter.$condition_session."
+                GROUP BY reflink ";
+        //group by because mark in all versions, then always is ok. 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'];
+        }
+
+        if (!empty($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;
+        $sql = 'SELECT  *, SUM(progress) AS TOTAL_PROGRESS
+                FROM  '.$tbl_wiki.' s1
+                WHERE s1.c_id = '.$course_id.' 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.')';
+        //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'];
+        }
+
+        if (!empty($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;
+        $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;
+        }
+
+        // Total of different IP addresses that have participated in the wiki
+        $total_ip=0;
+        $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;
+        }
+
+        echo '<table class="data_table">';
+        echo '<thead>';
+        echo '<tr>';
+        echo '<th colspan="2">'.get_lang('General').'</th>';
+        echo '</tr>';
+        echo '</thead>';
+        echo '<tr>';
+        echo '<td>'.get_lang('StudentAddNewPages').'</td>';
+        echo '<td>'.$status_add_new_pag.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('DateCreateOldestWikiPage').'</td>';
+        echo '<td>'.$first_wiki_date.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('DateEditLatestWikiVersion').'</td>';
+        echo '<td>'.$last_wiki_date.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('AverageScoreAllPages').'</td>';
+        echo '<td>'.$media_score.' %</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('AverageMediaUserProgress').'</td>';
+        echo '<td>'.$media_progress.' %</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('TotalWikiUsers').'</td>';
+        echo '<td>'.$total_users.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('TotalIpAdress').'</td>';
+        echo '<td>'.$total_ip.'</td>';
+        echo '</tr>';
+        echo '</table>';
+        echo '<br/>';
+
+        echo '<table class="data_table">';
+        echo '<thead>';
+        echo '<tr>';
+        echo '<th colspan="2">'.get_lang('Pages').' '.get_lang('And').' '.get_lang('Versions').'</th>';
+        echo '</tr>';
+        echo '</thead>';
+        echo '<tr>';
+        echo '<td>'.get_lang('Pages').' - '.get_lang('NumContributions').'</td>';
+        echo '<td>'.$total_pages.' ('.get_lang('Versions').': '.$total_versions.')</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('EmptyPages').'</td>';
+        echo '<td>'.$total_empty_content_lv.' ('.get_lang('Versions').': '.$total_empty_content.')</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('NumAccess').'</td>';
+        echo '<td>'.$total_visits_lv.' ('.get_lang('Versions').': '.$total_visits.')</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('TotalPagesEditedAtThisTime').'</td>';
+        echo '<td>'.$total_editing_now.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('TotalHiddenPages').'</td>';
+        echo '<td>'.$total_hidden.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('NumProtectedPages').'</td>';
+        echo '<td>'.$total_protected.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('LockedDiscussPages').'</td>';
+        echo '<td>'.$total_lock_disc.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('HiddenDiscussPages').'</td>';
+        echo '<td>'.$total_hidden_disc.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('TotalComments').'</td>';
+        echo '<td>'.$total_comment_version.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('TotalOnlyRatingByTeacher').'</td>';
+        echo '<td>'.$total_only_teachers_rating.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('TotalRatingPeers').'</td>';
+        echo '<td>'.$total_rating_by_peers.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('TotalTeacherAssignments').' - '.get_lang('PortfolioMode').'</td>';
+        echo '<td>'.$total_teacher_assignment.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('TotalStudentAssignments').' - '.get_lang('PortfolioMode').'</td>';
+        echo '<td>'.$total_student_assignment.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('TotalTask').' - '.get_lang('StandardMode').'</td>';
+        echo '<td>'.$total_task.'</td>';
+        echo '</tr>';
+        echo '</table>';
+        echo '<br/>';
+
+        echo '<table class="data_table">';
+        echo '<thead>';
+        echo '<tr>';
+        echo '<th colspan="3">'.get_lang('ContentPagesInfo').'</th>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td></td>';
+        echo '<td>'.get_lang('InTheLastVersion').'</td>';
+        echo '<td>'.get_lang('InAllVersions').'</td>';
+        echo '</tr>';
+        echo '</thead>';
+        echo '<tr>';
+        echo '<td>'.get_lang('NumWords').'</td>';
+        echo '<td>'.$total_words_lv.'</td>';
+        echo '<td>'.$total_words.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('NumlinksHtmlImagMedia').'</td>';
+        echo '<td>'.$total_links_lv.' ('.get_lang('Anchors').':'.$total_links_anchors_lv.', Mail:'.$total_links_mail_lv.', FTP:'.$total_links_ftp_lv.' IRC:'.$total_links_irc_lv.', News:'.$total_links_news_lv.', ... ) </td>';
+        echo '<td>'.$total_links.' ('.get_lang('Anchors').':'.$total_links_anchors.', Mail:'.$total_links_mail.', FTP:'.$total_links_ftp.', IRC:'.$total_links_irc.', News:'.$total_links_news.', ... ) </td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('NumWikilinks').'</td>';
+        echo '<td>'.$total_wlinks_lv.'</td>';
+        echo '<td>'.$total_wlinks.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('NumImages').'</td>';
+        echo '<td>'.$total_images_lv.'</td>';
+        echo '<td>'.$total_images.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('NumFlash').'</td>';
+        echo '<td>'.$total_flash_lv.'</td>';
+        echo '<td>'.$total_flash.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('NumMp3').'</td>';
+        echo '<td>'.$total_mp3_lv.'</td>';
+        echo '<td>'.$total_mp3.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('NumFlvVideo').'</td>';
+        echo '<td>'.$total_flv_lv.'</td>';
+        echo '<td>'.$total_flv.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('NumYoutubeVideo').'</td>';
+        echo '<td>'.$total_youtube_lv.'</td>';
+        echo '<td>'.$total_youtube.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('NumOtherAudioVideo').'</td>';
+        echo '<td>'.$total_multimedia_lv.'</td>';
+        echo '<td>'.$total_multimedia.'</td>';
+        echo '</tr>';
+        echo '<tr>';
+        echo '<td>'.get_lang('NumTables').'</td>';
+        echo '<td>'.$total_tables_lv.'</td>';
+        echo '<td>'.$total_tables.'</td>';
+        echo '</tr>';
+        echo '</table>';
+    }
+
+    function getActiveUsers($action)
+    {
+        $tbl_wiki = $this->tbl_wiki;
+        $course_id = $this->course_id;
+        $condition_session = $this->condition_session;
+        $groupfilter = $this->groupfilter;
+        $_course = $this->courseInfo;
+
+        echo '<div class="actions">'.get_lang('MostActiveUsers').'</div>';
+        $sql='SELECT *, COUNT(*) AS NUM_EDIT FROM '.$tbl_wiki.'  WHERE  c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' GROUP BY user_id';
+        $allpages = Database::query($sql);
+
+        //show table
+        if (Database::num_rows($allpages) > 0) {
+            while ($obj = Database::fetch_object($allpages)) {
+                $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) {
+                    $row[] = '<a href="../user/userInfo.php?uInfo='.$userinfo['user_id'].'">'.
+                        Display::tag('span', api_htmlentities(api_get_person_name($userinfo['firstname'], $userinfo['lastname'])), array('title'=>$username)).
+                        '</a><a href="'.api_get_self().'?cidReq='.$_course['id'].'&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['id'].'&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->set_additional_parameters(array('cidReq' =>Security::remove_XSS($_GET['cidReq']),'action'=>Security::remove_XSS($action),'session_id'=>Security::remove_XSS($_GET['session_id']),'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->display();
+        }
+    }
+
+    public function getDiscuss($page)
+    {
+        $tbl_wiki = $this->tbl_wiki;
+        $course_id = $this->course_id;
+        $condition_session = $this->condition_session;
+        $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) {
+            api_not_allowed();
+        }
+
+        if (!$_GET['title']) {
+            Display::display_error_message(get_lang("MustSelectPage"));
+            exit;
+        }
+
+        //first extract the date of last version
+        $sql = 'SELECT * FROM '.$tbl_wiki.'
+                WHERE c_id = '.$course_id.' AND reflink="'.Database::escape_string($page).'" AND '.$groupfilter.$condition_session.'
+                ORDER BY id DESC';
+        $result=Database::query($sql);
+        $row=Database::fetch_array($result);
+        $lastversiondate=api_get_local_time($row['dtime'], null, date_default_timezone_get());
+        $lastuserinfo = api_get_user_info($row['user_id']);
+        $username = api_htmlentities(sprintf(get_lang('LoginX'), $lastuserinfo['username']), ENT_QUOTES);
+
+        //select page to discuss
+        $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);
+        $id=$row['id'];
+        $firstuserid=$row['user_id'];
+
+        //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);
+        } elseif($row['assignment']==2) {
+            $icon_assignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'),'',ICON_SIZE_SMALL);
+        }
+
+        $countWPost = null;
+        $avg_WPost_score = null;
+
+        //Show title and form to discuss if page exist
+        if ($id!='') {
+            //Show discussion to students if isn't hidden. Show page to all teachers if is hidden. Mode assignments: If is hidden, show pages to student only if student is the author
+            if ($row['visibility_disc']==1 || api_is_allowed_to_edit(false,true) || api_is_platform_admin() || ($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 (self::check_addlock_discuss() == 1) {
+                        $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';
+                    }
+                }
+                echo '<span style="float:right">';
+                echo '<a href="index.php?action=discuss&amp;actionpage='.$lock_unlock_disc.'&amp;title='.api_htmlentities(urlencode($page)).'">'.$addlock_disc.'</a>';
+                echo '</span>';
+
+                // discussion action: visibility.  Show discussion to students if isn't hidden. Show page to all teachers if is hidden.
+                $visibility_disc = null;
+                $hide_show_disc = null;
+                if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                    if (self::check_visibility_discuss()==1) {
+                        /// 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);
+                        $hide_show_disc = 'hidedisc';
+                    } else {
+                        $visibility_disc = Display::return_icon('invisible.png', get_lang('HideDiscussExtra'),'',ICON_SIZE_SMALL);
+                        $hide_show_disc = 'showdisc';
+                    }
+                }
+                echo '<span style="float:right">';
+                echo '<a href="index.php?action=discuss&amp;actionpage='.$hide_show_disc.'&amp;title='.api_htmlentities(urlencode($page)).'">'.$visibility_disc.'</a>';
+                echo '</span>';
+
+                //discussion action: check add rating lock. Show/Hide list to rating for all student
+                $lock_unlock_rating_disc = null;
+                $ratinglock_disc = null;
+                if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+                    if (self::check_ratinglock_discuss() == 1) {
+                        $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);
+                        $lock_unlock_rating_disc = 'lockrating';
+                    }
+                }
+
+                echo '<span style="float:right">';
+                echo '<a href="index.php?action=discuss&amp;actionpage='.$lock_unlock_rating_disc.'&amp;title='.api_htmlentities(urlencode($page)).'">'.$ratinglock_disc.'</a>';
+                echo '</span>';
+
+                //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';
+                } else {
+                    $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>';
+                echo '</span>';
+
+                echo $icon_assignment.'&nbsp;&nbsp;&nbsp;'.api_htmlentities($row['title']);
+
+                echo ' ('.get_lang('MostRecentVersionBy').' <a href="../user/userInfo.php?uInfo='.$lastuserinfo['user_id'].'">'.
+                    Display::tag('span', api_htmlentities(api_get_person_name($lastuserinfo['firstname'], $lastuserinfo['lastname'])), array('title'=>$username)).
+                    '</a> '.$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()) {
+                //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><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()) {
+                                ?>
+                                <td><?php echo get_lang('Rating');?>: </td>
+                                <td valign="top"><select name="rating" id="rating">
+                                        <option value="-" selected>-</option>
+                                        <option value="0">0</option>
+                                        <option value="1">1</option>
+                                        <option value="2">2</option>
+                                        <option value="3">3</option>
+                                        <option value="4">4</option>
+                                        <option value="5">5</option>
+                                        <option value="6">6</option>
+                                        <option value="7">7</option>
+                                        <option value="8">8</option>
+                                        <option value="9">9</option>
+                                        <option value="10">10</option>
+                                    </select></td>
+                            <?php
+                            } else {
+                                echo '<input type=hidden name="rating" value="-">';// must pass a default value to avoid rate automatically
+                            }
+                            ?>
+                        </tr>
+                        <tr>
+                            <td>&nbsp;</td>
+                            <td> <?php  echo '<button class="save" type="submit" name="Submit"> '.get_lang('Send').'</button>'; ?></td>
+                        </tr>
+                    </table>
+                    </form>
+
+                    <?php
+                    if (isset($_POST['Submit']) && self::double_post($_POST['wpost_id'])) {
+                        $dtime = date( "Y-m-d H:i:s" );
+                        $message_author = api_get_user_id();
+                        $sql="INSERT INTO $tbl_wiki_discuss (c_id, publication_id, userc_id, comment, p_score, dtime) VALUES
+                    	($course_id, '".$id."','".$message_author."','".Database::escape_string($_POST['comment'])."','".Database::escape_string($_POST['rating'])."','".$dtime."')";
+                        $result=Database::query($sql) or die(Database::error());
+                        self::check_emailcue($id, 'D', $dtime, $message_author);
+                    }
+                }//end discuss lock
+
+                echo '<hr noshade size="1">';
+                $user_table = Database :: get_main_table(TABLE_MAIN_USER);
+
+                $sql="SELECT * FROM $tbl_wiki_discuss reviews, $user_table user
+                  WHERE reviews.c_id = $course_id AND reviews.publication_id='".$id."' AND user.user_id='".$firstuserid."'
+                  ORDER BY id DESC";
+                $result=Database::query($sql) or die(Database::error());
+
+                $countWPost = Database::num_rows($result);
+                echo get_lang('NumComments').": ".$countWPost; //comment's numbers
+
+                $sql = "SELECT SUM(p_score) as sumWPost
+                        FROM $tbl_wiki_discuss
+                        WHERE c_id = $course_id AND publication_id = '".$id."' AND NOT p_score='-'
+                        ORDER BY id DESC";
+                $result2=Database::query($sql) or die(Database::error());
+                $row2=Database::fetch_array($result2);
+
+                $sql = "SELECT * FROM $tbl_wiki_discuss
+                        WHERE c_id = $course_id AND publication_id='".$id."' AND NOT p_score='-'";
+                $result3=Database::query($sql) or die(Database::error());
+                $countWPost_score= Database::num_rows($result3);
+
+                echo ' - '.get_lang('NumCommentsScore').': '.$countWPost_score;//
+
+                if ($countWPost_score!=0) {
+                    $avg_WPost_score = round($row2['sumWPost'] / $countWPost_score,2).' / 10';
+                } else {
+                    $avg_WPost_score = $countWPost_score;
+                }
+
+                echo ' - '.get_lang('RatingMedia').': '.$avg_WPost_score; // average rating
+
+                $sql = 'UPDATE '.$tbl_wiki.' SET score="'.Database::escape_string($avg_WPost_score).'"
+                    WHERE c_id = '.$course_id.' AND reflink="'.Database::escape_string($page).'" AND '.$groupfilter.$condition_session;
+                // check if work ok. TODO:
+                Database::query($sql);
+
+                echo '<hr noshade size="1">';
+                //echo '<div style="overflow:auto; height:170px;">';
+
+                while ($row=Database::fetch_array($result)) {
+                    $userinfo = api_get_user_info($row['userc_id']);
+                    $username = api_htmlentities(sprintf(get_lang('LoginX'), $userinfo['username']), ENT_QUOTES);
+
+                    if (($userinfo['status'])=="5") {
+                        $author_status=get_lang('Student');
+                    } else {
+                        $author_status=get_lang('Teacher');
+                    }
+
+                    $user_id=$row['userc_id'];
+                    $name = api_get_person_name($userinfo['firstname'], $userinfo['lastname']);
+                    if ($user_id<>0) {
+                        $image_path = UserManager::get_user_picture_path_by_id($user_id,'web',false, true);
+                        $image_repository = $image_path['dir'];
+                        $existing_image = $image_path['file'];
+                        $author_photo= '<img src="'.$image_repository.$existing_image.'" alt="'.api_htmlentities($name).'"  width="40" height="50" align="top" title="'.api_htmlentities($name).'"  />';
+                    } else {
+                        $author_photo= '<img src="'.api_get_path(WEB_CODE_PATH)."img/unknown.jpg".'" alt="'.api_htmlentities($name).'"  width="40" height="50" align="top"  title="'.api_htmlentities($name).'"  />';
+                    }
+
+                    //stars
+                    $p_score=$row['p_score'];
+                    switch ($p_score) {
+                        case  0:
+                            $imagerating='<img src="../img/rating/stars_0.gif"/>';
+                            break;
+                        case  1:
+                            $imagerating='<img src="../img/rating/stars_5.gif"/>';
+                            break;
+                        case  2:
+                            $imagerating='<img src="../img/rating/stars_10.gif"/>';
+                            break;
+                        case  3:
+                            $imagerating='<img src="../img/rating/stars_15.gif"/>';
+                            break;
+                        case  4:
+                            $imagerating='<img src="../img/rating/stars_20.gif"/>';
+                            break;
+                        case  5:
+                            $imagerating='<img src="../img/rating/stars_25.gif"/>';
+                            break;
+                        case  6:
+                            $imagerating='<img src="../img/rating/stars_30.gif"/>';
+                            break;
+                        case  7:
+                            $imagerating='<img src="../img/rating/stars_35.gif"/>';
+                            break;
+                        case  8:
+                            $imagerating='<img src="../img/rating/stars_40.gif"/>';
+                            break;
+                        case  9:
+                            $imagerating='<img src="../img/rating/stars_45.gif"/>';
+                            break;
+                        case  10:
+                            $imagerating='<img src="../img/rating/stars_50.gif"/>';
+                            break;
+                    }
+                    echo '<p><table>';
+                    echo '<tr>';
+                    echo '<td rowspan="2">'.$author_photo.'</td>';
+                    echo '<td style=" color:#999999"><a href="../user/userInfo.php?uInfo='.$userinfo['user_id'].'">'.
+                        Display::tag('span', api_htmlentities(api_get_person_name($userinfo['firstname'], $userinfo['lastname'])), array('title'=>$username)).
+                        '</a> ('.$author_status.') '.api_get_local_time($row['dtime'], null, date_default_timezone_get()).' - '.get_lang('Rating').': '.$row['p_score'].' '.$imagerating.' </td>';
+                    echo '</tr>';
+                    echo '<tr>';
+                    echo '<td>'.api_htmlentities($row['comment']).'</td>';
+                    echo '</tr>';
+                    echo "</table>";
+                }
+            } else {
+                Display::display_warning_message(get_lang('LockByTeacher'),false);
+            }
+        } else {
+            Display::display_normal_message(get_lang('DiscussNotAvailable'));
+        }
+    }
+
+    /**
+     * Show all pages
+     */
+    function allPages($action)
+    {
+        $tbl_wiki = $this->tbl_wiki;
+        $course_id = $this->course_id;
+        $session_id = $this->session_id;
+        $groupfilter = $this->groupfilter;
+        $_course = $this->courseInfo;
+
+        echo '<div class="actions">'.get_lang('AllPages').'</div>';
+
+        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=(
+                    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.')'; // warning don't use group by reflink because does not return the last version
+
+        } else {
+            $sql = 'SELECT  *  FROM   '.$tbl_wiki.' s1
+				WHERE visibility=1 AND s1.c_id = '.$course_id.' 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.')'; // warning don't use group by reflink because does not return the last version
+        }
+
+        $allpages = Database::query($sql);
+
+        //show table
+        if (Database::num_rows($allpages) > 0) {
+            while ($obj = Database::fetch_object($allpages)) {
+                //get author
+                $userinfo = api_get_user_info($obj->user_id);
+                $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) {
+                    $ShowAssignment='<img src="../img/px_transparent.gif" />';
+                }
+
+                //get icon task
+                if (!empty($obj->task)) {
+                    $icon_task=Display::return_icon('wiki_task.png', get_lang('StandardTask'),'',ICON_SIZE_SMALL);
+                } else {
+                    $icon_task='<img src="../img/px_transparent.gif" />';
+                }
+
+                $row = array();
+                $row[] =$ShowAssignment.$icon_task;
+                $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['id'].'&action=showpage&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.api_htmlentities($obj->title).'</a>';
+                if ($obj->user_id <>0) {
+                    $row[] =  '<a href="../user/userInfo.php?uInfo='.$userinfo['user_id'].'">'.
+                        Display::tag('span', api_htmlentities(api_get_person_name($userinfo['firstname'], $userinfo['lastname'])), array('title'=>$username)).
+                        '</a>';
+                }
+                else {
+                    $row[] =  get_lang('Anonymous').' ('.api_htmlentities($obj->user_ip).')';
+                }
+                $row[] = api_get_local_time($obj->dtime, null, date_default_timezone_get());
+
+                if (api_is_allowed_to_edit(false,true)|| api_is_platform_admin()) {
+                    $showdelete=' <a href="'.api_get_self().'?cidReq='.$_course['id'].'&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) ) {
+                    $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['id'].'&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['id'].'&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['id'].'&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['id'].'&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;
+                }
+                $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->display();
+        }
+    }
+
+    /**
+     * Get recent changes
+     * @param string $page
+     */
+    public function recentChanges($page, $action)
+    {
+        $tbl_wiki = $this->tbl_wiki;
+        $course_id = $this->course_id;
+        $condition_session = $this->condition_session;
+        $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';
+            } else {
+                $notify_all=Display::return_icon('mail.png', get_lang('CancelNotifyByEmail'),'',ICON_SIZE_SMALL).' '.get_lang('NotifyChanges');
+                $lock_unlock_notify_all='locknotifyall';
+            }
+        }
+
+        echo '<div class="actions"><span style="float: right;">';
+        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
+            $sql = 'SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.'
+        		WHERE 	'.$tbl_wiki_conf.'.c_id= '.$course_id.' AND
+        				'.$tbl_wiki.'.c_id= '.$course_id.' AND
+        				'.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND
+        				'.$tbl_wiki.'.'.$groupfilter.$condition_session.'
+        		ORDER BY dtime DESC'; // new version
+        } else {
+            $sql = 'SELECT *
+                FROM '.$tbl_wiki.'
+                WHERE
+                    c_id = '.$course_id.' AND
+                    '.$groupfilter.$condition_session.' AND
+                    visibility=1
+                ORDER BY dtime DESC';
+            // old version TODO: Replace by the bottom line
+        }
+
+        $allpages = Database::query($sql);
+
+        //show table
+        if (Database::num_rows($allpages) > 0) {
+            $rows = array();
+            while ($obj = Database::fetch_object($allpages)) {
+                //get author
+                $userinfo = api_get_user_info($obj->user_id);
+                $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) {
+                    $ShowAssignment='<img src="../img/px_transparent.gif" />';
+                }
+
+                // Get icon task
+                if (!empty($obj->task)) {
+                    $icon_task=Display::return_icon('wiki_task.png', get_lang('StandardTask'),'',ICON_SIZE_SMALL);
+                } else {
+                    $icon_task='<img src="../img/px_transparent.gif" />';
+                }
+
+                $row = array();
+                $row[] = api_get_local_time($obj->dtime, null, date_default_timezone_get());
+                $row[] = $ShowAssignment.$icon_task;
+                $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['id'].'&action=showpage&title='.api_htmlentities(urlencode($obj->reflink)).'&amp;view='.$obj->id.'&session_id='.api_get_session_id().'&group_id='.api_get_group_id().'">'.api_htmlentities($obj->title).'</a>';
+                $row[] = $obj->version>1 ? get_lang('EditedBy') : get_lang('AddedBy');
+                if ($obj->user_id <> 0 ) {
+                    $row[] = '<a href="../user/userInfo.php?uInfo='.$userinfo['user_id'].'">'.
+                        Display::tag('span', api_htmlentities(api_get_person_name($userinfo['firstname'], $userinfo['lastname'])), array('title'=>$username)).
+                        '</a>';
+                } else {
+                    $row[] = get_lang('Anonymous').' ('.api_htmlentities($obj->user_ip).')';
+                }
+                $rows[] = $row;
+            }
+
+            $table = new SortableTableFromArrayConfig($rows,0,10,'RecentPages_table','','','DESC');
+            $table->set_additional_parameters(
+                array(
+                    'cidReq' =>api_get_course_id(),
+                    'action'=>Security::remove_XSS($action),
+                    'session_id' => api_get_session_id(),
+                    '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->display();
+        }
+    }
 }