chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - Change all display_x_message() calls to return_message() calls

Browse Source
pull/2487/head
Yannick Warnier 9 years ago
parent abeffdd8e4
commit e7cc120970
1 changed files with 42 additions and 42 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 84
      main/wiki/wiki.inc.php

84
main/wiki/wiki.inc.php
Unescape View File

@ -649,7 +649,7 @@ class Wiki
// Filter no _uass // Filter no _uass
if (api_strtoupper(trim($values['title'])) === 'INDEX') { if (api_strtoupper(trim($values['title'])) === 'INDEX') {
Display::addFlash(Display::display_warning_message(get_lang('GoAndEditMainPage'), false, true)); Display::addFlash(Display::return_message(get_lang('GoAndEditMainPage'), 'warning', false));
} else { } else {
$var = $_clean['reflink']; $var = $_clean['reflink'];
$group_id = intval($_GET['group_id']); $group_id = intval($_GET['group_id']);
@ -835,10 +835,10 @@ class Wiki
strtotime($values['startdate_assig']) > strtotime($values['enddate_assig']) strtotime($values['startdate_assig']) > strtotime($values['enddate_assig'])
) { ) {
Display::addFlash( Display::addFlash(
Display::display_error_message( Display::return_message(
get_lang("EndDateCannotBeBeforeTheStartDate"), get_lang("EndDateCannotBeBeforeTheStartDate"),
false, 'error',
true false
) )
); );
} elseif (!self::double_post($_POST['wpost_id'])) { } elseif (!self::double_post($_POST['wpost_id'])) {
@ -852,9 +852,9 @@ class Wiki
$return_message = self::save_new_wiki($values); $return_message = self::save_new_wiki($values);
if ($return_message == false) { if ($return_message == false) {
Display::addFlash(Display::display_error_message(get_lang('NoWikiPageTitle'), false, true)); Display::addFlash(Display::return_message(get_lang('NoWikiPageTitle'), 'error', false));
} else { } else {
Display::addFlash(Display::display_confirmation_message($return_message, false, true)); Display::addFlash(Display::return_message($return_message, 'confirmation', false));
} }
$wikiData = self::getWikiData(); $wikiData = self::getWikiData();
@ -951,7 +951,7 @@ class Wiki
$default_table_for_content_End; $default_table_for_content_End;
$title = get_lang('DefaultTitle'); $title = get_lang('DefaultTitle');
} else { } else {
return Display::addFlash(Display::display_normal_message(get_lang('WikiStandBy'), false, true)); return Display::addFlash(Display::return_message(get_lang('WikiStandBy'), 'normal', false));
} }
} else { } else {
$content = Security::remove_XSS($row['content']); $content = Security::remove_XSS($row['content']);
@ -2030,10 +2030,10 @@ class Wiki
if (!api_is_platform_admin()) { if (!api_is_platform_admin()) {
if (api_get_setting('students_export2pdf') !== 'true') { if (api_get_setting('students_export2pdf') !== 'true') {
Display::addFlash( Display::addFlash(
Display::display_error_message( Display::return_message(
get_lang('PDFDownloadNotAllowedForStudents'), get_lang('PDFDownloadNotAllowedForStudents'),
false, 'error',
true false
) )
); );
return false; return false;
@ -3348,7 +3348,7 @@ class Wiki
} }
if (!$_GET['title']) { if (!$_GET['title']) {
Display::addFlash(Display::display_error_message(get_lang("MustSelectPage"), false, true)); Display::addFlash(Display::return_message(get_lang("MustSelectPage"), 'error', false));
return; return;
} }
@ -3652,10 +3652,10 @@ class Wiki
echo "</table>"; echo "</table>";
} }
} else { } else {
Display::addFlash(Display::display_warning_message(get_lang('LockByTeacher'), false, true)); Display::addFlash(Display::return_message(get_lang('LockByTeacher'), 'warning', false));
} }
} else { } else {
Display::addFlash(Display::display_normal_message(get_lang('DiscussNotAvailable'), false, true)); Display::addFlash(Display::return_message(get_lang('DiscussNotAvailable'), 'normal', false));
} }
} }
@ -3878,13 +3878,13 @@ class Wiki
$action = $this->action; $action = $this->action;
if (!$_GET['title']) { if (!$_GET['title']) {
Display::addFlash(Display::display_error_message(get_lang("MustSelectPage"), false, true)); Display::addFlash(Display::return_message(get_lang("MustSelectPage"), 'error', false));
} else { } else {
$sql = 'SELECT * FROM '.$tbl_wiki.' $sql = 'SELECT * FROM '.$tbl_wiki.'
WHERE WHERE
c_id = '.$course_id.' AND c_id = '.$course_id.' AND
reflink="'.Database::escape_string($page).'" AND reflink="'.Database::escape_string($page).'" AND
'.$groupfilter.$condition_session.''; '.$groupfilter.$condition_session;
$result = Database::query($sql); $result = Database::query($sql);
$row = Database::fetch_array($result); $row = Database::fetch_array($result);
@ -4238,7 +4238,7 @@ class Wiki
(!api_is_allowed_to_edit(false,true) && $this->group_id == 0) (!api_is_allowed_to_edit(false,true) && $this->group_id == 0)
) { ) {
Display::addFlash( Display::addFlash(
Display::display_normal_message(get_lang('OnlyEditPagesCourseManager'), false, true) Display::return_message(get_lang('OnlyEditPagesCourseManager'), 'normal', false)
); );
} else { } else {
@ -4254,7 +4254,7 @@ class Wiki
$PassEdit = true; $PassEdit = true;
} else { } else {
Display::addFlash( Display::addFlash(
Display::display_normal_message(get_lang('OnlyEditPagesGroupMembers'), false, true) Display::return_message(get_lang('OnlyEditPagesGroupMembers'), 'normal', false)
); );
} }
} else { } else {
@ -4264,13 +4264,13 @@ class Wiki
// check if is an assignment // check if is an assignment
//$icon_assignment = null; //$icon_assignment = null;
if ($current_row['assignment'] == 1) { if ($current_row['assignment'] == 1) {
Display::addFlash(Display::display_normal_message(get_lang('EditAssignmentWarning'), false, true)); Display::addFlash(Display::return_message(get_lang('EditAssignmentWarning'), 'normal', false));
} elseif($current_row['assignment']==2) { } elseif($current_row['assignment']==2) {
if (($userId == $current_row['user_id'])==false) { if (($userId == $current_row['user_id'])==false) {
if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
$PassEdit = true; $PassEdit = true;
} else { } else {
Display::addFlash(Display::display_warning_message(get_lang('LockByTeacher'), false, true)); Display::addFlash(Display::return_message(get_lang('LockByTeacher'), 'normal', false));
$PassEdit = false; $PassEdit = false;
} }
} else { } else {
@ -4283,7 +4283,7 @@ class Wiki
if ($current_row['editlock'] == 1 && if ($current_row['editlock'] == 1 &&
(api_is_allowed_to_edit(false,true)==false || api_is_platform_admin()==false) (api_is_allowed_to_edit(false,true)==false || api_is_platform_admin()==false)
) { ) {
Display::addFlash(Display::display_normal_message(get_lang('PageLockedExtra'), false, true)); Display::addFlash(Display::return_message(get_lang('PageLockedExtra'), 'normal', false));
} else { } else {
if ($last_row['is_editing']!=0 && $last_row['is_editing'] != $userId) { if ($last_row['is_editing']!=0 && $last_row['is_editing'] != $userId) {
// Checking for concurrent users // Checking for concurrent users
@ -4295,9 +4295,9 @@ class Wiki
$is_being_edited = get_lang('ThisPageisBeginEditedBy').' <a href='.$userinfo['profile_url'].'>'. $is_being_edited = get_lang('ThisPageisBeginEditedBy').' <a href='.$userinfo['profile_url'].'>'.
Display::tag('span', $userinfo['complete_name_with_username']). Display::tag('span', $userinfo['complete_name_with_username']).
get_lang('ThisPageisBeginEditedTryLater').' '.date( "i",$rest_time).' '.get_lang('MinMinutes'); get_lang('ThisPageisBeginEditedTryLater').' '.date( "i",$rest_time).' '.get_lang('MinMinutes');
Display::addFlash(Display::display_normal_message($is_being_edited, false, true)); Display::addFlash(Display::return_message($is_being_edited, 'normal', false));
} else { } else {
Display::addFlash(Display::display_confirmation_message( Display::addFlash(Display::return_message(
self::restore_wikipage( self::restore_wikipage(
$current_row['page_id'], $current_row['page_id'],
$current_row['reflink'], $current_row['reflink'],
@ -4311,8 +4311,8 @@ class Wiki
$current_row['linksto'] $current_row['linksto']
).': <a href="index.php?cidReq='.$_course['code'].'&action=showpage&amp;title='.api_htmlentities(urlencode($last_row['reflink'])).'&session_id='.$last_row['session_id'].'&group_id='.$last_row['group_id'].'">'. ).': <a href="index.php?cidReq='.$_course['code'].'&action=showpage&amp;title='.api_htmlentities(urlencode($last_row['reflink'])).'&session_id='.$last_row['session_id'].'&group_id='.$last_row['group_id'].'">'.
api_htmlentities($last_row['title']).'</a>', api_htmlentities($last_row['title']).'</a>',
false, 'confirmation',
true false
)); ));
} }
} }
@ -4377,7 +4377,7 @@ class Wiki
</a>) <br />'.get_lang("ConvertToLastVersion").': </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']).'">'. <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>'; get_lang("Restore").'</a></center>';
Display::addFlash(Display::display_warning_message($message, false, true)); Display::addFlash(Display::return_message($message, 'warning', false));
} }
} }
@ -4777,7 +4777,7 @@ class Wiki
$condition_session = $this->condition_session; $condition_session = $this->condition_session;
if (!$_GET['title']) { if (!$_GET['title']) {
Display::addFlash(Display::display_error_message(get_lang('MustSelectPage'), false, true)); Display::addFlash(Display::return_message(get_lang('MustSelectPage'), 'error', false));
return; return;
} }
@ -4785,7 +4785,7 @@ class Wiki
Display::addFlash('<div id="wikititle">'.get_lang('DeletePageHistory').'</div>'); Display::addFlash('<div id="wikititle">'.get_lang('DeletePageHistory').'</div>');
if ($page == "index") { if ($page == "index") {
Display::addFlash(Display::display_warning_message(get_lang('WarningDeleteMainPage'), false, true)); Display::addFlash(Display::return_message(get_lang('WarningDeleteMainPage'), 'warning', false));
} }
$message = get_lang('ConfirmDeletePage')." $message = get_lang('ConfirmDeletePage')."
@ -4794,17 +4794,17 @@ class Wiki
get_lang("Yes")."</a>"; get_lang("Yes")."</a>";
if (!isset($_GET['delete'])) { if (!isset($_GET['delete'])) {
Display::addFlash(Display::display_warning_message($message, false, true)); Display::addFlash(Display::return_message($message, 'warning', false));
} }
if (isset($_GET['delete']) && $_GET['delete'] == 'yes') { if (isset($_GET['delete']) && $_GET['delete'] == 'yes') {
$result = self::deletePage($page, $course_id, $groupfilter, $condition_session); $result = self::deletePage($page, $course_id, $groupfilter, $condition_session);
if ($result) { if ($result) {
Display::addFlash(Display::display_confirmation_message(get_lang('WikiPageDeleted'), false, true)); Display::addFlash(Display::return_message(get_lang('WikiPageDeleted'), 'confirmation', false));
} }
} }
} else { } else {
Display::addFlash(Display::display_normal_message(get_lang("OnlyAdminDeletePageWiki"), false, true)); Display::addFlash(Display::return_message(get_lang("OnlyAdminDeletePageWiki"), 'normal', false));
} }
} }
@ -4843,7 +4843,7 @@ class Wiki
if ($row['content'] == '' && $row['title'] == '' && $page == '') { if ($row['content'] == '' && $row['title'] == '' && $page == '') {
Display::addFlash( Display::addFlash(
Display::display_error_message(get_lang('MustSelectPage'), false, true) Display::return_message(get_lang('MustSelectPage'), 'error', false)
); );
return; return;
} elseif ($row['content']=='' && $row['title']=='' && $page=='index') { } elseif ($row['content']=='' && $row['title']=='' && $page=='index') {
@ -5160,7 +5160,7 @@ class Wiki
$userId = api_get_user_id(); $userId = api_get_user_id();
if (!$_GET['title']) { if (!$_GET['title']) {
Display::addFlash(Display::display_error_message(get_lang("MustSelectPage"), false, true)); Display::addFlash(Display::return_message(get_lang("MustSelectPage"), 'error', false));
return; return;
} }
@ -5415,10 +5415,10 @@ class Wiki
$export2doc = self::export2doc($_GET['wiki_id']); $export2doc = self::export2doc($_GET['wiki_id']);
if ($export2doc) { if ($export2doc) {
Display::addFlash( Display::addFlash(
Display::display_confirmation_message( Display::return_message(
get_lang('ThePageHasBeenExportedToDocArea'), get_lang('ThePageHasBeenExportedToDocArea'),
false, 'confirmation',
true false
) )
); );
} }
@ -5469,16 +5469,16 @@ class Wiki
</p>'; </p>';
if (!isset($_GET['delete'])) { if (!isset($_GET['delete'])) {
Display::addFlash($title.Display::display_warning_message($message, false, true)); Display::addFlash($title.Display::return_message($message, 'warning', false));
} }
} else { } else {
Display::addFlash(Display::display_normal_message(get_lang("OnlyAdminDeleteWiki"), false, true)); Display::addFlash(Display::return_message(get_lang("OnlyAdminDeleteWiki"), 'normal', false));
} }
if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
if (isset($_GET['delete']) && $_GET['delete'] == 'yes') { if (isset($_GET['delete']) && $_GET['delete'] == 'yes') {
$return_message = self::delete_wiki(); $return_message = self::delete_wiki();
Display::addFlash(Display::display_confirmation_message($return_message, false, true)); Display::addFlash(Display::return_message($return_message, 'confirmation', false));
$this->redirectHome(); $this->redirectHome();
} }
} }
@ -5503,12 +5503,12 @@ class Wiki
GroupManager::is_user_in_group(api_get_user_id(), $groupInfo['iid']) || GroupManager::is_user_in_group(api_get_user_id(), $groupInfo['iid']) ||
api_is_allowed_in_course() api_is_allowed_in_course()
) { ) {
Display::addFlash(Display::display_normal_message(get_lang('GoAndEditMainPage'), false, true)); Display::addFlash(Display::return_message(get_lang('GoAndEditMainPage'), 'normal', false));
} else { } else {
Display::addFlash(Display::display_normal_message(get_lang('WikiStandBy'), false, true)); Display::addFlash(Display::return_message(get_lang('WikiStandBy'), 'normal', false));
} }
} elseif (self::check_addnewpagelock()==0 && (api_is_allowed_to_edit(false, true)==false || api_is_platform_admin()==false)) { } elseif (self::check_addnewpagelock()==0 && (api_is_allowed_to_edit(false, true)==false || api_is_platform_admin()==false)) {
Display::addFlash(Display::display_error_message(get_lang('AddPagesLocked'), false, true)); Display::addFlash(Display::return_message(get_lang('AddPagesLocked'), 'error', false));
} else { } else {
$groupInfo = GroupManager::get_group_properties(api_get_group_id()); $groupInfo = GroupManager::get_group_properties(api_get_group_id());
if (api_is_allowed_to_edit(false,true) || if (api_is_allowed_to_edit(false,true) ||
@ -5518,7 +5518,7 @@ class Wiki
) { ) {
self::display_new_wiki_form(); self::display_new_wiki_form();
} else { } else {
Display::addFlash(Display::display_normal_message(get_lang('OnlyAddPagesGroupMembers'), false, true)); Display::addFlash(Display::return_message(get_lang('OnlyAddPagesGroupMembers'), 'normal', false));
} }
} }
break; break;

Write Preview
Loading…
Cancel
Save