@ -46,7 +46,6 @@ class Wiki
$this->course_id = api_get_course_int_id(); $this->course_id = api_get_course_int_id();
$this->group_id = api_get_group_id(); $this->group_id = api_get_group_id();
if (!empty($this->group_id)) { if (!empty($this->group_id)) {
$this->groupfilter = ' group_id="'.$this->group_id.'"'; $this->groupfilter = ' group_id="'.$this->group_id.'"';
} }
@ -186,8 +185,10 @@ class Wiki
$irclink='href="irc'; $irclink='href="irc';
$irclinkStyle='class="wiki_irc_link" href="irc'; $irclinkStyle='class="wiki_irc_link" href="irc';
$output=str_replace($irclink, $irclinkStyle, $input); $output=str_replace($irclink, $irclinkStyle, $input);
return $output; return $output;
} }
/** /**
* This function allows users to have [link to a title]-style links like in most regular wikis. * This function allows users to have [link to a title]-style links like in most regular wikis.
* It is true that the adding of links is probably the most anoying part of Wiki for the people * It is true that the adding of links is probably the most anoying part of Wiki for the people
@ -277,8 +278,8 @@ class Wiki
$_clean['title'] = Database::escape_string(trim($values['title'])); $_clean['title'] = Database::escape_string(trim($values['title']));
$_clean['content'] = Database::escape_string($values['content']); $_clean['content'] = Database::escape_string($values['content']);
if (api_get_setting('htmlpurifier_wiki') == 'true'){ if (api_get_setting('htmlpurifier_wiki') == 'true'){
$purifier = new HTMLPurifier(); // $purifier = new HTMLPurifier();
$_clean['content'] = $purifier->purify ($_clean['content']); $_clean['content'] = Security::remove_XSS ($_clean['content']);
} }
$_clean['user_id'] = api_get_user_id(); $_clean['user_id'] = api_get_user_id();
$_clean['assignment']= Database::escape_string($values['assignment']); $_clean['assignment']= Database::escape_string($values['assignment']);
@ -704,7 +705,7 @@ class Wiki
} }
$wikiData = self::getWikiData(); $wikiData = self::getWikiData();
$redirectUrl = $this->url.'&action=showpage&title='.$wikiData['reflink']; $redirectUrl = $this->url.'&action=showpage&title='.$wikiData['reflink'].'&'.api_get_cidreq() ;
header('Location: '.$redirectUrl); header('Location: '.$redirectUrl);
exit; exit;
} }
@ -4320,17 +4321,18 @@ class Wiki
$page = $this->page; $page = $this->page;
echo '< div class = "actions" > '; echo '< div class = "actions" > ';
/* echo ' < a href = "index.php?cidReq='.$_course['id'].'&action=show&title=index&session_id='.$session_id.'&group_id='.$groupId.'" ' . self::is_active_navigation_tab ( ' show ' ) . ' > '.
Display::return_icon('wiki.png',get_lang('HomeWiki'),'',ICON_SIZE_MEDIUM).'< / a > ';*/
echo '< ul class = "nav" style = "margin-bottom:0px" > echo '< ul class = "nav" style = "margin-bottom:0px" >
< li class = "dropdown" > < li class = "dropdown" >
< a class = "dropdown-toggle" href = "javascript:void(0)" > '.Display::return_icon('menu.png', get_lang('Menu'), '', ICON_SIZE_MEDIUM).'< / a > '; < a class = "dropdown-toggle" href = "javascript:void(0)" > '.
Display::return_icon('menu.png', get_lang('Menu'), '', ICON_SIZE_MEDIUM).'< / a > ';
// menu home // menu home
echo '< ul class = "dropdown-menu" > '; echo '< ul class = "dropdown-menu" > ';
echo '< li > < a href = "index.php?action=showpage&title=index&cidReq='.$_course['id'].'&session_id='.$session_id.'&group_id='.$groupId.'" > '.get_lang('Home').'< / a > < / li > '; echo '< li > < a href = "index.php?action=showpage&title=index&cidReq='.$_course['id'].'&session_id='.$session_id.'&group_id='.$groupId.'" > '.
get_lang('Home').'< / a > < / li > ';
if (api_is_allowed_to_session_edit(false, true) & & api_is_allowed_to_edit()) { if (api_is_allowed_to_session_edit(false, true) & & api_is_allowed_to_edit()) {
// menu add page // menu add page
echo '< li > < a href = "index.php?cidReq=' . $_course['id'] . '&action=addnew&session_id=' . $session_id . '&group_id=' . $groupId . '" ' . self::is_active_navigation_tab ( ' addnew ' ) . ' > ' . get_lang('AddNew') . '< / a > '; echo '< li > < a href = "index.php?cidReq=' . $_course['id'] . '&action=addnew&session_id=' . $session_id . '&group_id=' . $groupId . '" ' . self::is_active_navigation_tab ( ' addnew ' ) . ' > '
. get_lang('AddNew') . '< / a > ';
} }
$lock_unlock_addnew = null; $lock_unlock_addnew = null;
@ -4347,16 +4349,21 @@ class Wiki
} }
} }
echo '< a href = "index.php?action=show&actionpage='.$lock_unlock_addnew.'&title='.api_htmlentities(urlencode($page)).'" > '.$protect_addnewpage.'< / a > < / li > '; echo '< a href = "index.php?action=show&actionpage='.$lock_unlock_addnew.'&title='.api_htmlentities(urlencode($page)).'" > '.
$protect_addnewpage.'< / a > < / li > ';
// menu find // menu find
echo '< li > < a href = "index.php?cidReq='.$_course['id'].'&action=searchpages&session_id='.$session_id.'&group_id='.$groupId.'" ' . self::is_active_navigation_tab ( ' searchpages ' ) . ' > '.get_lang('SearchPages').'< / a > < / li > '; echo '< li > < a href = "index.php?cidReq='.$_course['id'].'&action=searchpages&session_id='.$session_id.'&group_id='.$groupId.'" ' . self::is_active_navigation_tab ( ' searchpages ' ) . ' > '.
get_lang('SearchPages').'< / a > < / li > ';
// menu all pages // menu all pages
echo '< li > < a href = "index.php?cidReq='.$_course['id'].'&action=allpages&session_id='.$session_id.'&group_id='.$groupId.'" ' . self::is_active_navigation_tab ( ' allpages ' ) . ' > '.get_lang('AllPages').'< / a > < / li > '; echo '< li > < a href = "index.php?cidReq='.$_course['id'].'&action=allpages&session_id='.$session_id.'&group_id='.$groupId.'" ' . self::is_active_navigation_tab ( ' allpages ' ) . ' > '.
get_lang('AllPages').'< / a > < / li > ';
// menu recent changes // menu recent changes
echo '< li > < a href = "index.php?cidReq='.$_course['id'].'&action=recentchanges&session_id='.$session_id.'&group_id='.$groupId.'" ' . self::is_active_navigation_tab ( ' recentchanges ' ) . ' > '.get_lang('RecentChanges').'< / a > < / li > '; echo '< li > < a href = "index.php?cidReq='.$_course['id'].'&action=recentchanges&session_id='.$session_id.'&group_id='.$groupId.'" ' . self::is_active_navigation_tab ( ' recentchanges ' ) . ' > '.
get_lang('RecentChanges').'< / a > < / li > ';
// menu delete all wiki // menu delete all wiki
if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
echo '< li > < a href = "index.php?action=deletewiki&title='.api_htmlentities(urlencode($page)).'" ' . self::is_active_navigation_tab ( ' deletewiki ' ) . ' > '.get_lang('DeleteWiki').'< / a > < / li > '; echo '< li > < a href = "index.php?action=deletewiki&title='.api_htmlentities(urlencode($page)).'" ' . self::is_active_navigation_tab ( ' deletewiki ' ) . ' > '.
get_lang('DeleteWiki').'< / a > < / li > ';
} }
///menu more ///menu more
echo '< li > < a href = "index.php?action=more&title='.api_htmlentities(urlencode($page)).'" ' . self::is_active_navigation_tab ( ' more ' ) . ' > '.get_lang('Statistics').'< / a > < / li > '; echo '< li > < a href = "index.php?action=more&title='.api_htmlentities(urlencode($page)).'" ' . self::is_active_navigation_tab ( ' more ' ) . ' > '.get_lang('Statistics').'< / a > < / li > ';
@ -4395,7 +4402,7 @@ class Wiki
Display::return_icon('delete.png',get_lang('DeleteThisPage'),'',ICON_SIZE_MEDIUM).'< / a > '; Display::return_icon('delete.png',get_lang('DeleteThisPage'),'',ICON_SIZE_MEDIUM).'< / a > ';
} }
echo '< / ul > '; echo '< / ul > ';
echo '< / div > '; // End actions echo '< / div > ';
} }
/** /**
@ -4542,7 +4549,7 @@ class Wiki
$message=get_lang('TheTaskDoesNotBeginUntil').': '.api_get_local_time($row['startdate_assig'], null, date_default_timezone_get()); $message=get_lang('TheTaskDoesNotBeginUntil').': '.api_get_local_time($row['startdate_assig'], null, date_default_timezone_get());
self::setMessage(Display::display_warning_message($message, false, true)); self::setMessage(Display::display_warning_message($message, false, true));
if (!api_is_allowed_to_edit(false,true)) { if (!api_is_allowed_to_edit(false,true)) {
return ; $this->redirectHome() ;
} }
} }
@ -4555,7 +4562,7 @@ class Wiki
$message = get_lang('TheDeadlineHasBeenCompleted').': '.api_get_local_time($row['enddate_assig'], null, date_default_timezone_get()); $message = get_lang('TheDeadlineHasBeenCompleted').': '.api_get_local_time($row['enddate_assig'], null, date_default_timezone_get());
self::setMessage(Display::display_warning_message($message, false, true)); self::setMessage(Display::display_warning_message($message, false, true));
if (!api_is_allowed_to_edit(false,true)) { if (!api_is_allowed_to_edit(false,true)) {
return ; $this->redirectHome() ;
} }
} }
@ -4563,7 +4570,7 @@ class Wiki
$message=get_lang('HasReachedMaxiNumVersions'); $message=get_lang('HasReachedMaxiNumVersions');
self::setMessage(Display::display_warning_message($message, false, true)); self::setMessage(Display::display_warning_message($message, false, true));
if (!api_is_allowed_to_edit(false,true)) { if (!api_is_allowed_to_edit(false,true)) {
return ; $this->redirectHome() ;
} }
} }
@ -4571,7 +4578,7 @@ class Wiki
$message = get_lang('HasReachedMaxNumWords'); $message = get_lang('HasReachedMaxNumWords');
self::setMessage(Display::display_warning_message($message, false, true)); self::setMessage(Display::display_warning_message($message, false, true));
if (!api_is_allowed_to_edit(false,true)) { if (!api_is_allowed_to_edit(false,true)) {
return ; $this->redirectHome() ;
} }
} }
@ -4648,11 +4655,11 @@ class Wiki
Display::tag('span', api_htmlentities(api_get_person_name($userinfo['firstname'], $userinfo['lastname'])), array('title'=>$username)). Display::tag('span', api_htmlentities(api_get_person_name($userinfo['firstname'], $userinfo['lastname'])), array('title'=>$username)).
'< / a > . '.get_lang('ThisPageisBeginEditedTryLater').' '.date( "i",$rest_time).' '.get_lang('MinMinutes').''; '< / a > . '.get_lang('ThisPageisBeginEditedTryLater').' '.date( "i",$rest_time).' '.get_lang('MinMinutes').'';
self::setMessage(Display::display_normal_message($is_being_edited, false, true)); self::setMessage(Display::display_normal_message($is_being_edited, false, true));
return ; $this->redirectHome() ;
} }
// Form. // Form.
$url = api_get_self().'?action=edit&title='.urlencode($page).'&session_id='.api_get_session_id().'&group_id='.api_get_group_id(); $url = api_get_self().'?action=edit&title='.urlencode($page).'&session_id='.api_get_session_id().'&group_id='.api_get_group_id().'&'.api_get_cidreq() ;
$form = new FormValidator('wiki', 'post', $url); $form = new FormValidator('wiki', 'post', $url);
$form->addElement('header', $icon_assignment.str_repeat(' ',3).api_htmlentities($title)); $form->addElement('header', $icon_assignment.str_repeat(' ',3).api_htmlentities($title));
self::setForm($form, $row); self::setForm($form, $row);
@ -4682,7 +4689,7 @@ class Wiki
self::setMessage(Display::display_confirmation_message($return_message, false, true)); self::setMessage(Display::display_confirmation_message($return_message, false, true));
} }
$wikiData = self::getWikiData(); $wikiData = self::getWikiData();
$redirectUrl = $this->url.'&action=showpage&title='.$wikiData['reflink']; $redirectUrl = $this->url.'&action=showpage&title='.$wikiData['reflink'].'&'.api_get_cidreq() ;
header('Location: '.$redirectUrl); header('Location: '.$redirectUrl);
exit; exit;
} }
@ -5131,7 +5138,7 @@ class Wiki
public function redirectHome() public function redirectHome()
{ {
$redirectUrl = $this->url.'&action=showpage&title=index'; $redirectUrl = $this->url.'&action=showpage&title=index';
header('Location: '.$redirectUrl); header('Location: '.$redirectUrl.'&'.api_get_cidreq() );
exit; exit;
} }
@ -5155,4 +5162,3 @@ class Wiki
return false; return false;
} }
} }
Julio Montoya
11 years ago