'.$row['task'].'
'; - $message_task.='
'.get_lang('StartDate').': '.$message_task_startdate.'
'; - $message_task.=''.get_lang('EndDate').': '.$message_task_enddate; - $message_task.=' ('.get_lang('AllowLaterSends').') '.$message_task_delayedsubmit.'
'; - $message_task.=''.get_lang('OtherSettings').': '.get_lang('NMaxVersion').': '.$message_task_max_version; - $message_task.=' '.get_lang('NMaxWords').': '.$message_task_max_text; - //display message - Display::display_normal_message($message_task,false); - } - - if ($row['progress']==$row['fprogress1'] && !empty($row['fprogress1'])) { - $feedback_message=''.get_lang('Feedback').'
'.api_htmlentities($row['feedback1']).'
'; - Display::display_normal_message($feedback_message, false); - } elseif ($row['progress']==$row['fprogress2'] && !empty($row['fprogress2'])) { - $feedback_message=''.get_lang('Feedback').''.api_htmlentities($row['feedback2']).'
'; - Display::display_normal_message($feedback_message, false); - } elseif ($row['progress']==$row['fprogress3'] && !empty($row['fprogress3'])) { - $feedback_message=''.get_lang('Feedback').''.api_htmlentities($row['feedback3']).'
'; - Display::display_normal_message($feedback_message, false); - } - - //previous checking for concurrent editions - if ($row['is_editing']==0) { - Display::display_normal_message(get_lang('WarningMaxEditingTime')); - - $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'].'"'; - Database::query($sql); - } elseif ($row['is_editing']!=$_user['user_id']) { - $timestamp_edit=strtotime($row['time_edit']); - $time_editing=time()-$timestamp_edit; - $max_edit_time=1200; // 20 minutes - $rest_time=$max_edit_time-$time_editing; - - $userinfo = api_get_user_info($row['is_editing']); - $username = api_htmlentities(sprintf(get_lang('LoginX'), $userinfo['username']), ENT_QUOTES); - - $is_being_edited= get_lang('ThisPageisBeginEditedBy'). - ' '. - Display::tag('span', api_htmlentities(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); - exit; - } - - // Form. - echo ''.$icon_assignment.str_repeat(' ',3).api_htmlentities($title).'
';
- echo '';
- }
- }
- }
-}
-
-// Page history
-
-if ($action == 'history' or isset($_POST['HistoryDifferences'])) {
- if (!$_GET['title']) {
- Display::display_error_message(get_lang("MustSelectPage"));
- exit;
- }
-
- /* 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.'
- ORDER BY id DESC';
- $result=Database::query($sql);
-
- $KeyVisibility = null;
- $KeyAssignment = null;
- $KeyTitle = null;
- $KeyUserId = null;
- while ($row=Database::fetch_array($result)) {
- $KeyVisibility = $row['visibility'];
- $KeyAssignment = $row['assignment'];
- $KeyTitle = $row['title'];
- $KeyUserId = $row['user_id'];
- }
- $icon_assignment = null;
- if ($KeyAssignment == 1) {
- $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL);
- } elseif($KeyAssignment == 2) {
- $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'), '', ICON_SIZE_SMALL);
- }
-
- // Second, show
-
- //if the page is hidden and is a job only sees its author and professor
- if ($KeyVisibility == 1 ||
- api_is_allowed_to_edit(false,true) ||
- api_is_platform_admin() ||
- (
- $KeyAssignment==2 && $KeyVisibility==0 &&
- (api_get_user_id() == $KeyUserId)
- )
- ) {
- // 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.'
- ORDER BY id DESC';
- $result = Database::query($sql);
- $title = $_GET['title'];
- $group_id = $_GET['group_id'];
-
- echo '';
- echo $icon_assignment.' '.api_htmlentities($KeyTitle);
- echo '
';
-
- echo '';
- } else { // We show the differences between two versions
- $version_old = array();
- if (isset($_POST['old'])) {
- $sql_old= "SELECT * FROM $tbl_wiki
- WHERE c_id = $course_id AND id='".Database::escape_string($_POST['old'])."'";
- $result_old=Database::query($sql_old);
- $version_old=Database::fetch_array($result_old);
- }
-
- $sql_new="SELECT * FROM $tbl_wiki WHERE c_id = $course_id AND id='".Database::escape_string($_POST['new'])."'";
- $result_new=Database::query($sql_new);
- $version_new=Database::fetch_array($result_new);
- $oldTime = isset($version_old['dtime']) ? $version_old['dtime'] : null;
- $oldContent = isset($version_old['content']) ? $version_old['content'] : null;
-
- if (isset($_POST['HistoryDifferences'])) {
- include 'diff.inc.php';
- //title
- echo ''.api_htmlentities($version_new['title']).'
- ('.get_lang('DifferencesNew').'
- '.$version_new['dtime'].'
- '.get_lang('DifferencesOld').'
- '.$oldTime.'
- ) '.get_lang('Legend').': '.get_lang('WikiDiffAddedLine').'
- '.get_lang('WikiDiffDeletedLine').' '.get_lang('WikiDiffMovedLine').'
-
';
- }
- if (isset($_POST['HistoryDifferences2'])) {
- // including global PEAR diff libraries
- require_once 'Text/Diff.php';
- require_once 'Text/Diff/Renderer/inline.php';
- //title
- echo ''.api_htmlentities($version_new['title']).'
- ('.get_lang('DifferencesNew').' '.$version_new['dtime'].'
- '.get_lang('DifferencesOld').' '.$version_old['dtime'].')
- '.get_lang('Legend').': '.get_lang('WikiDiffAddedTex').'
- '.get_lang('WikiDiffDeletedTex').'
';
- }
-
-
- if (isset($_POST['HistoryDifferences'])) {
- echo ''; - echo ''.get_lang('Legend').'
' . "\n";
- echo '
';
- }
-
- if (isset($_POST['HistoryDifferences2'])) {
- $lines1 = array(strip_tags($version_old['content'])); //without <> tags
- $lines2 = array(strip_tags($version_new['content'])); //without <> tags
- $diff = new Text_Diff($lines1, $lines2);
- $renderer = new Text_Diff_Renderer_inline();
- echo ''.$renderer->render($diff); // Code inline
- echo '
'; - echo ''.get_lang('Legend').']*?>.*?@si',
@@ -979,7 +950,7 @@ class Wiki
/**
* This function checks if wiki title exist
*/
- function wiki_exist($title)
+ public function wiki_exist($title)
{
$tbl_wiki = $this->tbl_wiki;
$groupfilter = $this->groupfilter;
@@ -1007,7 +978,7 @@ class Wiki
* @author Patrick Cool , Ghent University
* @return html code
*/
- function is_active_navigation_tab($paramwk)
+ public function is_active_navigation_tab($paramwk)
{
if (isset($_GET['action']) && $_GET['action'] == $paramwk) {
return ' class="active"';
@@ -1019,7 +990,7 @@ class Wiki
* @author Juan Carlos Raña
* return current database status of protect page and change it if get action
*/
- function check_addnewpagelock()
+ public function check_addnewpagelock()
{
$tbl_wiki = $this->tbl_wiki;
$condition_session = $this->condition_session;
@@ -1054,7 +1025,7 @@ class Wiki
* @author Juan Carlos Raña
* return current database status of protect page and change it if get action
*/
- function check_protect_page()
+ public function check_protect_page()
{
$tbl_wiki = $this->tbl_wiki;
$condition_session = $this->condition_session;
@@ -1102,7 +1073,7 @@ class Wiki
* @author Juan Carlos Raña
* return current database status of visibility and change it if get action
*/
- function check_visibility_page()
+ public function check_visibility_page()
{
$tbl_wiki = $this->tbl_wiki;
$page = $this->page;
@@ -1151,7 +1122,7 @@ class Wiki
* @author Juan Carlos Raña
* @return int current database status of discuss visibility and change it if get action page
*/
- function check_visibility_discuss()
+ public function check_visibility_discuss()
{
$tbl_wiki = $this->tbl_wiki;
$page = $this->page;
@@ -1199,7 +1170,7 @@ class Wiki
* @author Juan Carlos Raña
* @return int current database status of lock dicuss and change if get action
*/
- function check_addlock_discuss()
+ public function check_addlock_discuss()
{
$tbl_wiki = $this->tbl_wiki;
$page = $this->page;
@@ -1237,7 +1208,6 @@ class Wiki
}
return $row['addlock_disc'];
-
}
/**
@@ -1245,7 +1215,7 @@ class Wiki
* @author Juan Carlos Raña
* @return int current database status of rating discuss and change it if get action
*/
- function check_ratinglock_discuss()
+ public function check_ratinglock_discuss()
{
$tbl_wiki = $this->tbl_wiki;
$page = $this->page;
@@ -1288,7 +1258,7 @@ class Wiki
* @author Juan Carlos Raña
* @return int the current notification status
*/
- function check_notify_page($reflink)
+ public function check_notify_page($reflink)
{
$tbl_wiki = $this->tbl_wiki;
$tbl_wiki_mailcue = $this->tbl_wiki_mailcue;
@@ -1330,26 +1300,26 @@ class Wiki
($course_id, '".$id."','".api_get_user_id()."','P','".$groupId."','".$session_id."')";
Database::query($sql);
}
-
$status_notify=1;
}
+
if (isset($_GET['actionpage']) && $_GET['actionpage'] =='unlocknotify' && $status_notify==1) {
$sql = 'DELETE FROM '.$tbl_wiki_mailcue.'
WHERE id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="P" AND c_id = '.$course_id;
Database::query($sql);
-
$status_notify=0;
}
- //show status
+
return $status_notify;
}
/**
* Notify discussion changes
* @author Juan Carlos Raña
+ * @param string $reflink
* @return int current database status of rating discuss and change it if get action
*/
- function check_notify_discuss($reflink)
+ public function check_notify_discuss($reflink)
{
$tbl_wiki_mailcue = $this->tbl_wiki_mailcue;
$tbl_wiki = $this->tbl_wiki;
@@ -1400,7 +1370,7 @@ class Wiki
* Notify all changes
* @author Juan Carlos Raña
*/
- function check_notify_all()
+ public function check_notify_all()
{
$tbl_wiki_mailcue = $this->tbl_wiki_mailcue;
$course_id = api_get_course_int_id();
@@ -1442,7 +1412,7 @@ class Wiki
/**
* Sends pending e-mails
*/
- function check_emailcue($id_or_ref, $type, $lastime='', $lastuser='')
+ public function check_emailcue($id_or_ref, $type, $lastime='', $lastuser='')
{
$tbl_wiki_mailcue = $this->tbl_wiki_mailcue;
$tbl_wiki = $this->tbl_wiki;
@@ -1610,11 +1580,11 @@ class Wiki
* Function export last wiki page version to document area
* @author Juan Carlos Raña
*/
- function export2doc($doc_id)
+ public function export2doc($doc_id)
{
$_course = $this->courseInfo;
- $groupId = api_get_group_id();
- $data = self::get_wiki_data($doc_id);
+ $groupId = api_get_group_id();
+ $data = self::get_wiki_data($doc_id);
if (empty($data)) {
return false;
@@ -1692,6 +1662,7 @@ class Wiki
$wikiFileName = $exportFile . '_' . $i . '.html';
$exportPath = $exportDir . '/' . $wikiFileName;
file_put_contents( $exportPath, $wikiContents );
+ require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
$doc_id = add_document($_course, $groupPath.'/'.$wikiFileName, 'file', filesize($exportPath), $wikiTitle);
api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', api_get_user_id(), $groupId);
@@ -1702,8 +1673,14 @@ class Wiki
/**
* Exports the wiki page to PDF
*/
- function export_to_pdf($id, $course_code)
+ public function export_to_pdf($id, $course_code)
{
+ if (!api_is_platform_admin()) {
+ if (api_get_setting('students_export2pdf') == 'true') {
+ return false;
+ }
+ }
+
require_once api_get_path(LIBRARY_PATH).'pdf.lib.php';
$data = self::get_wiki_data($id);
$content_pdf = api_html_entity_decode($data['content'], ENT_QUOTES, api_get_system_encoding());
@@ -1712,8 +1689,8 @@ class Wiki
$content_pdf=trim(preg_replace("/\[[\[]?([^\]|]*)[|]?([^|\]]*)\][\]]?/", "$1", $content_pdf));
//TODO: It should be better to display the link insted of the tile but it is hard for [[title]] links
- $title_pdf = api_html_entity_decode($data['title'], ENT_QUOTES, api_get_system_encoding());
- $title_pdf = api_utf8_encode($title_pdf, api_get_system_encoding());
+ $title_pdf = api_html_entity_decode($data['title'], ENT_QUOTES, api_get_system_encoding());
+ $title_pdf = api_utf8_encode($title_pdf, api_get_system_encoding());
$content_pdf = api_utf8_encode($content_pdf, api_get_system_encoding());
$html='
@@ -1730,7 +1707,6 @@ class Wiki
mpdf-->'.$content_pdf;
-
$css_file = api_get_path(TO_SYS, WEB_CSS_PATH).api_get_setting('stylesheets').'/print.css';
if (file_exists($css_file)) {
$css = @file_get_contents($css_file);
@@ -1747,7 +1723,7 @@ class Wiki
* Function prevent double post (reload or F5)
*
*/
- function double_post($wpost_id)
+ public function double_post($wpost_id)
{
if (isset($_SESSION['wpost_id'])) {
if ($wpost_id == $_SESSION['wpost_id']) {
@@ -1766,8 +1742,10 @@ class Wiki
* Function wizard individual assignment
* @author Juan Carlos Raña
*/
- function auto_add_page_users($assignment_type)
+ public function auto_add_page_users($values)
{
+ $assignment_type = $values['assignment'];
+
//$assig_user_id is need to identify end reflinks
$session_id = $this->session_id;
$groupId = api_get_group_id();
@@ -1775,9 +1753,9 @@ class Wiki
if ($groupId==0) {
//extract course members
if(!empty($session_id)) {
- $a_users_to_add = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], $session_id);
+ $a_users_to_add = CourseManager::get_user_list_from_course_code(api_get_course_id(), $session_id);
} else {
- $a_users_to_add = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], 0);
+ $a_users_to_add = CourseManager::get_user_list_from_course_code(api_get_course_id(), 0);
}
} else {
//extract group members
@@ -1808,20 +1786,24 @@ class Wiki
}
//teacher assignment title
- $title_orig=$_POST['title'];
+ $title_orig = $values['title'];
//teacher assignment reflink
- $link2teacher=$_POST['title']= $title_orig."_uass".api_get_user_id();
+ $link2teacher = $values['title'] = $title_orig."_uass".api_get_user_id();
//first: teacher name, photo, and assignment description (original content)
// $content_orig_A='
| '; - echo ' | ';
- echo ''.get_lang('WikiDiffUnchangedLine').' '; - echo ''.get_lang('WikiDiffAddedLine').' '; - echo ''.get_lang('WikiDiffDeletedLine').' '; - echo ''.get_lang('WikiDiffMovedLine').' '; - echo ' | ';
- echo '
'; - echo ''.get_lang('Legend').'
' . "\n";
- echo '
';
- }
- }
- }
-}
+Display::display_header($tool_name, 'Wiki');
-// Recent changes
-// @todo rss feed
-if ($action =='recentchanges') {
- $wiki->recentChanges($page, $action);
+// check last version
+if (!empty($view)) {
+ $wiki->setWikiData($view);
+ $wiki->checkLastVersion($view);
}
-// All pages
-if ($action == 'allpages') {
- $wiki->allPages($action);
-}
+// Tool introduction
+Display::display_introduction_section(TOOL_WIKI);
-// Discuss pages
-if ($action == 'discuss') {
- $wiki->getDiscuss($page);
-}
+$wiki->showActionBar();
+echo $wiki->getMessages();
+echo $content;
Display::display_footer();
diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php
index 1a67ab4302..98228a2085 100644
--- a/main/wiki/wiki.inc.php
+++ b/main/wiki/wiki.inc.php
@@ -8,6 +8,8 @@
* @package chamilo.wiki
*/
+use \ChamiloSession as Session;
+
class Wiki
{
public $tbl_wiki;
@@ -23,6 +25,9 @@ class Wiki
public $courseInfo;
public $charset;
public $page;
+ public $action;
+ public $wikiData = array();
+ public $url;
public function __construct()
{
@@ -40,6 +45,7 @@ class Wiki
$this->groupfilter = ' group_id="'.$this->group_id.'"';
}
$this->courseInfo = api_get_course_info();
+ $this->url = api_get_path(WEB_CODE_PATH).'wiki/index.php?'.api_get_cidreq();
}
/**
@@ -48,7 +54,7 @@ class Wiki
* @return bool False if title is already taken
* @author Patrick Cool , Ghent University
**/
- function checktitle($paramwk)
+ public function checktitle($paramwk)
{
$tbl_wiki = $this->tbl_wiki;
$condition_session = $this->condition_session;
@@ -60,10 +66,10 @@ class Wiki
c_id = '.$course_id.' AND
reflink="'.Database::escape_string($paramwk).'" AND
'.$groupfilter.$condition_session.'';
- $result=Database::query($sql);
- $numberofresults=Database::num_rows($result);
+ $result = Database::query($sql);
+ $numberofresults = Database::num_rows($result);
// the value has not been found and is this available
- if ($numberofresults==0) {
+ if ($numberofresults == 0) {
return true;
} else {
// the value has been found
@@ -74,8 +80,9 @@ class Wiki
/**
* check wikilinks that has a page
* @author Juan Carlos Raña
+ * @param string $input
**/
- function links_to($input)
+ public function links_to($input)
{
$input_array = preg_split("/(\[\[|\]\])/",$input,-1, PREG_SPLIT_DELIM_CAPTURE);
$all_links = array();
@@ -107,7 +114,7 @@ class Wiki
* detect and add style to external links
* @author Juan Carlos Raña Trabado
**/
- function detect_external_link($input)
+ public function detect_external_link($input)
{
$exlink='href=';
$exlinkStyle='class="wiki_link_ext" href=';
@@ -119,7 +126,7 @@ class Wiki
* detect and add style to anchor links
* @author Juan Carlos Raña Trabado
**/
- function detect_anchor_link($input)
+ public function detect_anchor_link($input)
{
$anchorlink = 'href="#';
$anchorlinkStyle='class="wiki_anchor_link" href="#';
@@ -132,7 +139,7 @@ class Wiki
* detect and add style to mail links
* author Juan Carlos Raña Trabado
**/
- function detect_mail_link($input)
+ public function detect_mail_link($input)
{
$maillink='href="mailto';
$maillinkStyle='class="wiki_mail_link" href="mailto';
@@ -144,7 +151,7 @@ class Wiki
* detect and add style to ftp links
* @author Juan Carlos Raña Trabado
**/
- function detect_ftp_link($input)
+ public function detect_ftp_link($input)
{
$ftplink='href="ftp';
$ftplinkStyle='class="wiki_ftp_link" href="ftp';
@@ -156,7 +163,7 @@ class Wiki
* detect and add style to news links
* @author Juan Carlos Raña Trabado
**/
- function detect_news_link($input)
+ public function detect_news_link($input)
{
$newslink='href="news';
$newslinkStyle='class="wiki_news_link" href="news';
@@ -168,7 +175,7 @@ class Wiki
* detect and add style to irc links
* @author Juan Carlos Raña Trabado
**/
- function detect_irc_link($input)
+ public function detect_irc_link($input)
{
$irclink='href="irc';
$irclinkStyle='class="wiki_irc_link" href="irc';
@@ -183,7 +190,7 @@ class Wiki
* Improvements [[]] and [[ | ]]by Juan Carlos Raña
* Improvements internal wiki style and mark group by Juan Carlos Raña
**/
- function make_wiki_link_clickable($input)
+ public function make_wiki_link_clickable($input)
{
$groupId = api_get_group_id();
//now doubles brackets
@@ -232,11 +239,15 @@ class Wiki
* @author Patrick Cool , Ghent University
* @return language string saying that the changes are stored
**/
- function save_wiki()
+ public function save_wiki($values)
{
$tbl_wiki = $this->tbl_wiki;
$tbl_wiki_conf = $this->tbl_wiki_conf;
$_course = $this->courseInfo;
+ $dtime = date( "Y-m-d H:i:s" );
+ $session_id = api_get_session_id();
+ $groupId = api_get_group_id();
+
$_clean = array(
'task' => null,
'feedback1' => null,
@@ -247,71 +258,68 @@ class Wiki
'fprogress3' => null,
'max_text' => null,
'max_version' => null,
- 'delayedsubmit' => null
+ 'delayedsubmit' => null,
+ 'assignment' => null
);
// NOTE: visibility, visibility_disc and ratinglock_disc changes are not made here, but through the interce buttons
// cleaning the variables
- $_clean['page_id'] = Database::escape_string($_POST['page_id']);
- $_clean['reflink'] = Database::escape_string(trim($_POST['reflink']));
- $_clean['title'] = Database::escape_string(trim($_POST['title']));
- $_clean['content'] = Database::escape_string($_POST['content']);
+ $_clean['page_id'] = Database::escape_string($values['page_id']);
+ $_clean['reflink'] = Database::escape_string(trim($values['reflink']));
+ $_clean['title'] = Database::escape_string(trim($values['title']));
+ $_clean['content'] = Database::escape_string($values['content']);
if (api_get_setting('htmlpurifier_wiki') == 'true'){
$purifier = new HTMLPurifier();
$_clean['content'] = $purifier->purify($_clean['content']);
}
$_clean['user_id'] = api_get_user_id();
- $_clean['assignment'] = Database::escape_string($_POST['assignment']);
- $_clean['comment'] = Database::escape_string($_POST['comment']);
- $_clean['progress'] = Database::escape_string($_POST['progress']);
- $_clean['version'] = intval($_POST['version']) + 1 ;
+ $_clean['assignment'] = Database::escape_string($values['assignment']);
+ $_clean['comment'] = Database::escape_string($values['comment']);
+ $_clean['progress'] = Database::escape_string($values['progress']);
+ $_clean['version'] = intval($values['version']) + 1 ;
$_clean['linksto'] = self::links_to($_clean['content']); //and check links content
- $dtime = date( "Y-m-d H:i:s" );
- $session_id = api_get_session_id();
- $groupId = api_get_group_id();
-
//cleaning config variables
- if (!empty($_POST['task'])) {
- $_clean['task'] = Database::escape_string($_POST['task']);
+ if (!empty($values['task'])) {
+ $_clean['task'] = Database::escape_string($values['task']);
}
- if (!empty($_POST['feedback1']) || !empty($_POST['feedback2']) || !empty($_POST['feedback3'])) {
- $_clean['feedback1']=Database::escape_string($_POST['feedback1']);
- $_clean['feedback2']=Database::escape_string($_POST['feedback2']);
- $_clean['feedback3']=Database::escape_string($_POST['feedback3']);
- $_clean['fprogress1']=Database::escape_string($_POST['fprogress1']);
- $_clean['fprogress2']=Database::escape_string($_POST['fprogress2']);
- $_clean['fprogress3']=Database::escape_string($_POST['fprogress3']);
+ if (!empty($values['feedback1']) || !empty($values['feedback2']) || !empty($values['feedback3'])) {
+ $_clean['feedback1']=Database::escape_string($values['feedback1']);
+ $_clean['feedback2']=Database::escape_string($values['feedback2']);
+ $_clean['feedback3']=Database::escape_string($values['feedback3']);
+ $_clean['fprogress1']=Database::escape_string($values['fprogress1']);
+ $_clean['fprogress2']=Database::escape_string($values['fprogress2']);
+ $_clean['fprogress3']=Database::escape_string($values['fprogress3']);
}
- if (isset($_POST['initstartdate']) && $_POST['initstartdate'] == 1) {
- $_clean['startdate_assig']=Database::escape_string(self::get_date_from_select('startdate_assig'));
+ if (isset($values['initstartdate']) && $values['initstartdate'] == 1) {
+ $_clean['startdate_assig'] = Database::escape_string($values['startdate_assig']);
} else {
- $_clean['startdate_assig']=Database::escape_string($_POST['startdate_assig']);
+ $_clean['startdate_assig'] = '0000-00-00 00:00:00';
}
- if (isset($_POST['initenddate']) && $_POST['initenddate']==1) {
- $_clean['enddate_assig'] = Database::escape_string(self::get_date_from_select('enddate_assig'));
+ if (isset($values['initenddate']) && $values['initenddate']==1) {
+ $_clean['enddate_assig'] = Database::escape_string($values['enddate_assig']);
} else {
- $_clean['enddate_assig'] = Database::escape_string($_POST['enddate_assig']);
+ $_clean['enddate_assig'] = '0000-00-00 00:00:00';
}
- if (isset($_POST['delayedsubmit'])) {
- $_clean['delayedsubmit']=Database::escape_string($_POST['delayedsubmit']);
+ if (isset($values['delayedsubmit'])) {
+ $_clean['delayedsubmit']=Database::escape_string($values['delayedsubmit']);
}
- if (!empty($_POST['max_text']) || !empty($_POST['max_version'])) {
- $_clean['max_text'] =Database::escape_string($_POST['max_text']);
- $_clean['max_version']=Database::escape_string($_POST['max_version']);
+ if (!empty($values['max_text']) || !empty($values['max_version'])) {
+ $_clean['max_text'] =Database::escape_string($values['max_text']);
+ $_clean['max_version']=Database::escape_string($values['max_version']);
}
$course_id = api_get_course_int_id();
$sql = "INSERT INTO ".$tbl_wiki." (c_id, page_id, reflink, title, content, user_id, group_id, dtime, assignment, comment, progress, version, linksto, user_ip, session_id)
VALUES ($course_id, '".$_clean['page_id']."','".$_clean['reflink']."','".$_clean['title']."','".$_clean['content']."','".$_clean['user_id']."','".$groupId."','".$dtime."','".$_clean['assignment']."','".$_clean['comment']."','".$_clean['progress']."','".$_clean['version']."','".$_clean['linksto']."','".Database::escape_string($_SERVER['REMOTE_ADDR'])."', '".Database::escape_string($session_id)."')";
Database::query($sql);
- $Id = Database::insert_id();
+ $Id = Database::insert_id();
if ($Id > 0) {
//insert into item_property
@@ -328,13 +336,29 @@ class Wiki
$sql="INSERT INTO ".$tbl_wiki_conf." (c_id, page_id, task, feedback1, feedback2, feedback3, fprogress1, fprogress2, fprogress3, max_text, max_version, startdate_assig, enddate_assig, delayedsubmit)
VALUES ($course_id, '".$Id."','".$_clean['task']."','".$_clean['feedback1']."','".$_clean['feedback2']."','".$_clean['feedback3']."','".$_clean['fprogress1']."','".$_clean['fprogress2']."','".$_clean['fprogress3']."','".$_clean['max_text']."','".$_clean['max_version']."','".$_clean['startdate_assig']."','".$_clean['enddate_assig']."','".$_clean['delayedsubmit']."')";
} else {
- $sql='UPDATE'.$tbl_wiki_conf.' SET task="'.$_clean['task'].'", feedback1="'.$_clean['feedback1'].'", feedback2="'.$_clean['feedback2'].'", feedback3="'.$_clean['feedback3'].'", fprogress1="'.$_clean['fprogress1'].'", fprogress2="'.$_clean['fprogress2'].'", fprogress3="'.$_clean['fprogress3'].'", max_text="'.$_clean['max_text'].'", max_version="'.$_clean['max_version'].'", startdate_assig="'.$_clean['startdate_assig'].'", enddate_assig="'.$_clean['enddate_assig'].'", delayedsubmit="'.$_clean['delayedsubmit'].'"
- WHERE page_id="'.$_clean['page_id'].'" AND c_id = '.$course_id;
+ $sql = 'UPDATE '.$tbl_wiki_conf.' SET
+ task="'.$_clean['task'].'",
+ feedback1="'.$_clean['feedback1'].'",
+ feedback2="'.$_clean['feedback2'].'",
+ feedback3="'.$_clean['feedback3'].'",
+ fprogress1="'.$_clean['fprogress1'].'",
+ fprogress2="'.$_clean['fprogress2'].'",
+ fprogress3="'.$_clean['fprogress3'].'",
+ max_text="'.$_clean['max_text'].'",
+ max_version="'.$_clean['max_version'].'",
+ startdate_assig="'.$_clean['startdate_assig'].'",
+ enddate_assig="'.$_clean['enddate_assig'].'",
+ delayedsubmit="'.$_clean['delayedsubmit'].'"
+ WHERE
+ page_id = "'.$_clean['page_id'].'" AND
+ c_id = '.$course_id;
}
Database::query($sql);
api_item_property_update($_course, 'wiki', $Id, 'WikiAdded', api_get_user_id(), $groupId);
self::check_emailcue($_clean['reflink'], 'P', $dtime, $_clean['user_id']);
- return get_lang('ChangesStored');
+ $this->setWikiData($Id);
+
+ return get_lang('Saved');
}
/**
@@ -342,7 +366,7 @@ class Wiki
* @author Juan Carlos Raña
* @return string Message of success (to be printed on screen)
**/
- function restore_wikipage($r_page_id, $r_reflink, $r_title, $r_content, $r_group_id, $r_assignment, $r_progress, $c_version, $r_version, $r_linksto)
+ public function restore_wikipage($r_page_id, $r_reflink, $r_title, $r_content, $r_group_id, $r_assignment, $r_progress, $c_version, $r_version, $r_linksto)
{
$tbl_wiki = $this->tbl_wiki;
$_course = $this->courseInfo;
@@ -370,7 +394,7 @@ class Wiki
* @author Juan Carlos Raña
* @return string Message of success (to be printed)
**/
- function delete_wiki()
+ public function delete_wiki()
{
$tbl_wiki = $this->tbl_wiki;
$tbl_wiki_discuss = $this->tbl_wiki_discuss;
@@ -401,14 +425,13 @@ class Wiki
return get_lang('WikiDeleted');
}
-
/**
* This function saves a new wiki page.
* @author Patrick Cool , Ghent University
* @todo consider merging this with the function save_wiki into one single function.
* @return string Message of success
**/
- function save_new_wiki()
+ public function save_new_wiki($values)
{
$tbl_wiki = $this->tbl_wiki;
$tbl_wiki_conf = $this->tbl_wiki_conf;
@@ -419,21 +442,21 @@ class Wiki
// cleaning the variables
$_clean['assignment'] = null;
- if (isset($_POST['assignment'])) {
- $_clean['assignment'] = Database::escape_string($_POST['assignment']);
+ if (isset($values['assignment'])) {
+ $_clean['assignment'] = Database::escape_string($values['assignment']);
}
// session_id
$session_id = api_get_session_id();
// Unlike ordinary pages of pages of assignments. Allow create a ordinary page although there is a assignment with the same name
if ($_clean['assignment']==2 || $_clean['assignment']==1) {
- $page = str_replace(' ','_',$_POST['title']."_uass".$assig_user_id);
+ $page = str_replace(' ','_',$values['title']."_uass".$assig_user_id);
} else {
- $page = str_replace(' ','_',$_POST['title']);
+ $page = str_replace(' ','_',$values['title']);
}
$_clean['reflink'] = Database::escape_string(strip_tags(api_htmlentities($page)));
- $_clean['title'] = Database::escape_string(strip_tags(trim($_POST['title'])));
- $_clean['content'] = Database::escape_string($_POST['content']);
+ $_clean['title'] = Database::escape_string(strip_tags(trim($values['title'])));
+ $_clean['content'] = Database::escape_string($values['content']);
if (api_get_setting('htmlpurifier_wiki') == 'true'){
$purifier = new HTMLPurifier();
@@ -458,8 +481,8 @@ class Wiki
$_clean['ratinglock_disc']=1;
}
- $_clean['comment']=Database::escape_string($_POST['comment']);
- $_clean['progress']=Database::escape_string($_POST['progress']);
+ $_clean['comment']=Database::escape_string($values['comment']);
+ $_clean['progress']=Database::escape_string($values['progress']);
$_clean['version']=1;
$groupId = api_get_group_id();
@@ -467,64 +490,146 @@ class Wiki
$_clean['linksto'] = self::links_to($_clean['content']); //check wikilinks
//cleaning config variables
- $_clean['task']= Database::escape_string($_POST['task']);
- $_clean['feedback1']=Database::escape_string($_POST['feedback1']);
- $_clean['feedback2']=Database::escape_string($_POST['feedback2']);
- $_clean['feedback3']=Database::escape_string($_POST['feedback3']);
- $_clean['fprogress1']=Database::escape_string($_POST['fprogress1']);
- $_clean['fprogress2']=Database::escape_string($_POST['fprogress2']);
- $_clean['fprogress3']=Database::escape_string($_POST['fprogress3']);
-
- if (isset($_POST['initstartdate']) && $_POST['initstartdate'] == 1) {
- $_clean['startdate_assig'] = Database::escape_string(self::get_date_from_select('startdate_assig'));
+ $_clean['task']= Database::escape_string($values['task']);
+ $_clean['feedback1']=Database::escape_string($values['feedback1']);
+ $_clean['feedback2']=Database::escape_string($values['feedback2']);
+ $_clean['feedback3']=Database::escape_string($values['feedback3']);
+ $_clean['fprogress1']=Database::escape_string($values['fprogress1']);
+ $_clean['fprogress2']=Database::escape_string($values['fprogress2']);
+ $_clean['fprogress3']=Database::escape_string($values['fprogress3']);
+
+ if (isset($values['initstartdate']) && $values['initstartdate'] == 1) {
+ $_clean['startdate_assig'] = Database::escape_string($values['startdate_assig']);
} else {
- $_clean['startdate_assig'] = Database::escape_string($_POST['startdate_assig']);
+ $_clean['startdate_assig'] = '0000-00-00 00:00:00';
}
- if (isset($_POST['initenddate']) && $_POST['initenddate']==1) {
- $_clean['enddate_assig']=Database::escape_string(self::get_date_from_select('enddate_assig'));
+ if (isset($values['initenddate']) && $values['initenddate']==1) {
+ $_clean['enddate_assig'] = Database::escape_string($values['enddate_assig']);
} else {
- $_clean['enddate_assig']=Database::escape_string($_POST['enddate_assig']);
+ $_clean['enddate_assig'] = '0000-00-00 00:00:00';
}
- $_clean['delayedsubmit']=Database::escape_string($_POST['delayedsubmit']);
- $_clean['max_text']=Database::escape_string($_POST['max_text']);
- $_clean['max_version']=Database::escape_string($_POST['max_version']);
+ $_clean['delayedsubmit']=Database::escape_string($values['delayedsubmit']);
+ $_clean['max_text']=Database::escape_string($values['max_text']);
+ $_clean['max_version']=Database::escape_string($values['max_version']);
$course_id = api_get_course_int_id();
- //filter no _uass
- if (api_eregi('_uass', $_POST['title']) || (api_strtoupper(trim($_POST['title'])) == 'INDEX' || api_strtoupper(trim(api_htmlentities($_POST['title'], ENT_QUOTES, $charset))) == api_strtoupper(api_htmlentities(get_lang('DefaultTitle'), ENT_QUOTES, $charset)))) {
- $message= get_lang('GoAndEditMainPage');
- Display::display_warning_message($message,false);
+ // Filter no _uass
+ if (api_eregi('_uass', $values['title']) ||
+ (api_strtoupper(trim($values['title'])) == 'INDEX' ||
+ api_strtoupper(trim(api_htmlentities($values['title'], ENT_QUOTES, $charset))) == api_strtoupper(api_htmlentities(get_lang('DefaultTitle'), ENT_QUOTES, $charset)))
+ ) {
+ self::setMessage(Display::display_warning_message(get_lang('GoAndEditMainPage'), false, true));
} else {
- $var=$_clean['reflink'];
- $group_id=Security::remove_XSS($_GET['group_id']);
- if(!self::checktitle($var)) {
- return get_lang('WikiPageTitleExist').''.$_POST['title'].'';
+ $var = $_clean['reflink'];
+ $group_id = Security::remove_XSS($_GET['group_id']);
+ if (!self::checktitle($var)) {
+ return get_lang('WikiPageTitleExist').''.$values['title'].'';
} else {
$dtime = date( "Y-m-d H:i:s" );
$sql = "INSERT INTO ".$tbl_wiki." (c_id, reflink, title, content, user_id, group_id, dtime, visibility, visibility_disc, ratinglock_disc, assignment, comment, progress, version, linksto, user_ip, session_id) VALUES
($course_id, '".$_clean['reflink']."','".$_clean['title']."','".$_clean['content']."','".$_clean['user_id']."','".$groupId."','".$dtime."','".$_clean['visibility']."','".$_clean['visibility_disc']."','".$_clean['ratinglock_disc']."','".$_clean['assignment']."','".$_clean['comment']."','".$_clean['progress']."','".$_clean['version']."','".$_clean['linksto']."','".Database::escape_string($_SERVER['REMOTE_ADDR'])."', '".Database::escape_string($session_id)."')";
- $result = Database::query($sql);
+ Database::query($sql);
$Id = Database::insert_id();
if ($Id > 0) {
//insert into item_property
api_item_property_update(api_get_course_info(), TOOL_WIKI, $Id, 'WikiAdded', api_get_user_id(), $groupId);
}
- $sql='UPDATE '.$tbl_wiki.' SET page_id="'.$Id.'" WHERE c_id = '.$course_id.' AND id="'.$Id.'"';
- Database::query($sql);
+ $sql = 'UPDATE '.$tbl_wiki.' SET page_id="'.$Id.'" WHERE c_id = '.$course_id.' AND id="'.$Id.'"';
+ Database::query($sql);
//insert wiki config
- $sql="INSERT INTO ".$tbl_wiki_conf." (c_id, page_id, task, feedback1, feedback2, feedback3, fprogress1, fprogress2, fprogress3, max_text, max_version, startdate_assig, enddate_assig, delayedsubmit) VALUES
- ($course_id, '".$Id."','".$_clean['task']."','".$_clean['feedback1']."','".$_clean['feedback2']."','".$_clean['feedback3']."','".$_clean['fprogress1']."','".$_clean['fprogress2']."','".$_clean['fprogress3']."','".$_clean['max_text']."','".$_clean['max_version']."','".$_clean['startdate_assig']."','".$_clean['enddate_assig']."','".$_clean['delayedsubmit']."')";
- Database::query($sql);
- self::check_emailcue(0, 'A');
+ $sql = " INSERT INTO ".$tbl_wiki_conf." (c_id, page_id, task, feedback1, feedback2, feedback3, fprogress1, fprogress2, fprogress3, max_text, max_version, startdate_assig, enddate_assig, delayedsubmit)
+ VALUES ($course_id, '".$Id."','".$_clean['task']."','".$_clean['feedback1']."','".$_clean['feedback2']."','".$_clean['feedback3']."','".$_clean['fprogress1']."','".$_clean['fprogress2']."','".$_clean['fprogress3']."','".$_clean['max_text']."','".$_clean['max_version']."','".$_clean['startdate_assig']."','".$_clean['enddate_assig']."','".$_clean['delayedsubmit']."')";
+ Database::query($sql);
+ $this->setWikiData($Id);
+ self::check_emailcue(0, 'A');
+ return get_lang('NewWikiSaved');
+ }
+ }
+ }
+
+ /**
+ * @param FormValidator $form
+ * @param array $row
+ */
+ public function setForm($form, $row = array())
+ {
+ $toolBar = api_is_allowed_to_edit(null,true)
+ ? array('ToolbarSet' => 'Wiki', 'Width' => '100%', 'Height' => '400')
+ : array('ToolbarSet' => 'WikiStudent', 'Width' => '100%', 'Height' => '400', 'UserStatus' => 'student');
+
+ $form->add_html_editor('content', get_lang('Content'), false, false, $toolBar);
+ //$content
+ $form->addElement('text', 'comment', get_lang('Comments'));
+ $progress = array('', 10, 20, 30, 40, 50, 60, 70, 80, 90, 100);
+
+ $form->addElement('select', 'progress', get_lang('Progress'), $progress);
+
+ if ((api_is_allowed_to_edit(false,true) || api_is_platform_admin()) && isset($row['reflink']) && $row['reflink'] != 'index') {
+
+ /* $advanced = '
+ , Ghent University
* @return html code
**/
- function display_new_wiki_form()
- {
- $page = $this->page;
- ?>
-
- ';
- echo ', Ghent University
* @author Juan Carlos Raña Trabado
- * @return html code
+ * @param string $newtitle
+ * @return string html code
**/
- function display_wiki_entry($newtitle)
+ public function display_wiki_entry($newtitle)
{
$tbl_wiki = $this->tbl_wiki;
$tbl_wiki_conf = $this->tbl_wiki_conf;
@@ -750,7 +714,7 @@ class Wiki
'.$groupfilter.$condition_session.'
ORDER BY id ASC';
$result=Database::query($sql);
- $row=Database::fetch_array($result);
+ $row = Database::fetch_array($result);
$KeyVisibility=$row['visibility'];
// second, show the last version
@@ -787,7 +751,7 @@ class Wiki
$content=$default_table_for_content_Start.sprintf(get_lang('DefaultContent'),api_get_path(WEB_IMG_PATH)).$default_table_for_content_End;
$title=get_lang('DefaultTitle');
} else {
- return Display::display_normal_message(get_lang('WikiStandBy'));
+ return self::setMessage(Display::display_normal_message(get_lang('WikiStandBy'), false, true));
}
} else {
$content = Security::remove_XSS(api_html_entity_decode($row['content']), COURSEMANAGERLOWSECURITY);
@@ -872,24 +836,31 @@ class Wiki
//ONly available if row['id'] is set
if ($row['id']) {
//page action: export to pdf
- echo '';
- echo '
';
- echo '';
+ echo '';
} //end filter visibility
}
@@ -941,7 +912,7 @@ class Wiki
* @param string Document's text
* @return int Number of words
*/
- function word_count($document)
+ public function word_count($document)
{
$search = array(
'@| '; - echo ' | ';
- echo ''.get_lang('WikiDiffAddedTex').' '; - echo ''.get_lang('WikiDiffDeletedTex').' '; - echo ' | ';
- echo '
'.
+ Display::return_icon(
+ 'div_show.gif',
+ get_lang('Show'),
+ array('style'=>'vertical-align:middle')
+ ).' '.get_lang('AdvancedParameters').'
';
+*/
+ $form->addElement('advanced_settings', 'settings', get_lang('AdvancedParameters'));
+
+ $form->addElement('html', '');
}
+
+ $form->addElement('hidden', 'page_id');
+ $form->addElement('hidden', 'reflink');
+// $form->addElement('hidden', 'assignment');
+ $form->addElement('hidden', 'version');
+ $form->addElement('hidden', 'wpost_id', api_get_unique_id());
}
/**
@@ -532,194 +637,53 @@ class Wiki
* @author Patrick Cool ';
- echo '
';
- echo '
- * '.get_lang('Title').':
';
-
- if(api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
- echo' '.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedParameters').'';
- echo '';
+ if ($return_message == false) {
+ self::setMessage(Display::display_error_message(get_lang('NoWikiPageTitle'), false, true));
+ } else {
+ self::setMessage(Display::display_confirmation_message($return_message, false, true));
+ }
+ $wikiData = self::getWikiData();
+ $redirectUrl = $this->url.'&action=showpage&title='.$wikiData['reflink'];
+ header('Location: '.$redirectUrl);
+ exit;
+ }
}
- echo '
'.get_lang('DefineAssignmentPage').': ';
- api_disp_html_area('content', '', '', '', null, api_is_allowed_to_edit(null,true)
- ? array('ToolbarSet' => 'Wiki', 'Width' => '100%', 'Height' => '400')
- : array('ToolbarSet' => 'WikiStudent', 'Width' => '100%', 'Height' => '400', 'UserStatus' => 'student')
- );
- echo '
'; - echo '
'; - echo get_lang('Comments').':
'; - echo get_lang('Progress').': %'; - echo '
'; - echo '';//prevent double post - echo '';//for button icon. Don't change name (see fckeditor/editor/plugins/customizations/fckplugin_compressed.js and fckplugin.js - echo '
';
- echo '';
}
/**
* This function displays a wiki entry
* @author Patrick Cool '; - echo '
'; - echo get_lang('Comments').':
'; - echo get_lang('Progress').': %'; - echo '
'; - echo '';//prevent double post - echo '';//for button icon. Don't change name (see fckeditor/editor/plugins/customizations/fckplugin_compressed.js and fckplugin.js - echo '
'.$photo.'
'.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).'
('.get_lang('Teacher').')
'.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).'
('.get_lang('Teacher').')
';
- $content_orig_A='
';
+ $content_orig_A='
'.$_POST['content']; //Second: student list (names, photo and links to their works). //Third: Create Students work pages. - foreach($a_users_to_add as $user_id=>$o_user_to_add) { - if($o_user_to_add['user_id'] != api_get_user_id()) { + foreach ($a_users_to_add as $o_user_to_add) { + if ($o_user_to_add['user_id'] != api_get_user_id()) { //except that puts the task $assig_user_id = $o_user_to_add['user_id']; //identifies each page as created by the student, not by teacher $image_path = UserManager::get_user_picture_path_by_id($assig_user_id,'web',false, true); @@ -1844,45 +1826,54 @@ class Wiki } } - if($assignment_type==1) { - $_POST['title']= $title_orig; - $_POST['comment']=get_lang('AssignmentFirstComToStudent'); - $_POST['content']='
[['.$link2teacher.' | '.get_lang('AssignmentLinktoTeacherPage').']] '; //If $content_orig_B is added here, the task written by the professor was copied to the page of each student. TODO: config options
-
- //AssignmentLinktoTeacherPage
+ if ($assignment_type==1) {
+ $values['title']= $title_orig;
+ //$values['comment'] = get_lang('AssignmentFirstComToStudent');
+ $values['content'] = ''.
- Display::tag('span', strtoupper($o_user_to_add['lastname']).', '.$o_user_to_add['firstname'], array('title'=>$username)).
- ' [['.$_POST['title']."_uass".$assig_user_id.' | '.$photo.']] '.$status_in_group.' '; //don't change this line without guaranteeing that users will be ordered by last names in the following format (surname, name)
- $_POST['assignment']=2;
+ Display::tag(
+ 'span',
+ strtoupper($o_user_to_add['lastname']).', '.$o_user_to_add['firstname'], array('title'=>$username)
+ ).
+ ' [['.$_POST['title']."_uass".$assig_user_id.' | '.$photo.']] '.$status_in_group.'';
+ //don't change this line without guaranteeing that users will be ordered by last names in the following format (surname, name)
+ $values['assignment']=2;
}
$this->assig_user_id = $assig_user_id;
- self::save_new_wiki();
+ self::save_new_wiki($values);
}
- }//end foreach for each user
+ }
- foreach ($a_users_to_add as $user_id=>$o_user_to_add) {
- if($o_user_to_add['user_id'] == api_get_user_id()) {
+ foreach ($a_users_to_add as $o_user_to_add) {
+ if ($o_user_to_add['user_id'] == api_get_user_id()) {
$assig_user_id=$o_user_to_add['user_id'];
- if($assignment_type==1) {
- $_POST['title']= $title_orig;
- $_POST['comment']=get_lang('AssignmentDesc');
+ if ($assignment_type == 1) {
+ $values['title']= $title_orig;
+ $values['comment']=get_lang('AssignmentDesc');
sort($all_students_pages);
- $_POST['content']=$content_orig_A.$content_orig_B.'
'; - $_POST['assignment']=1; + $values['content']=$content_orig_A.$content_orig_B.'
'; + $values['assignment']=1; } $this->assig_user_id = $assig_user_id; - self::save_new_wiki(); + self::save_new_wiki($values); } - } //end foreach to teacher + } } /** * Displays the results of a wiki search * @param string Search term * @param int Whether to search the contents (1) or just the titles (0) + * @param int */ - - function display_wiki_search_results($search_term, $search_content=0, $all_vers=0) + public function display_wiki_search_results($search_term, $search_content=0, $all_vers=0) { $tbl_wiki = $this->tbl_wiki; $condition_session = $this->condition_session; @@ -1959,7 +1950,7 @@ class Wiki } elseif ($obj->assignment==2) { $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL); } elseif ($obj->assignment==0) { - $ShowAssignment='
';
+ $ShowAssignment= Display::return_icon('px_transparent.gif');
}
$row = array();
$row[] =$ShowAssignment;
@@ -1970,7 +1961,8 @@ class Wiki
$row[] = ''.$obj->title.'';
}
- $row[] = $obj->user_id <>0 ? ''.api_htmlentities($userinfo['complete_name']).'' : get_lang('Anonymous').' ('.$obj->user_ip.')';
+ $row[] = $obj->user_id <>0 ? ''.
+ api_htmlentities($userinfo['complete_name']).'' : get_lang('Anonymous').' ('.$obj->user_ip.')';
$row[] = $year.'-'.$month.'-'.$day.' '.$hours.":".$minutes.":".$seconds;
if ($all_vers=='1') {
@@ -1979,7 +1971,13 @@ class Wiki
if (api_is_allowed_to_edit(false,true)|| api_is_platform_admin()) {
$showdelete=' '.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL);
}
- $row[] = ''.Display::return_icon('edit.png', get_lang('EditPage'),'',ICON_SIZE_SMALL).' '.Display::return_icon('discuss.png', get_lang('Discuss'),'',ICON_SIZE_SMALL).' '.Display::return_icon('history.png', get_lang('History'),'',ICON_SIZE_SMALL).' '.Display::return_icon('what_link_here.png', get_lang('LinksPages'),'',ICON_SIZE_SMALL).''.$showdelete;
+ $row[] = ''.
+ Display::return_icon('edit.png', get_lang('EditPage'),'',ICON_SIZE_SMALL).'
+ '.
+ Display::return_icon('discuss.png', get_lang('Discuss'),'',ICON_SIZE_SMALL).'
+ '.
+ Display::return_icon('history.png', get_lang('History'),'',ICON_SIZE_SMALL).' '.
+ Display::return_icon('what_link_here.png', get_lang('LinksPages'),'',ICON_SIZE_SMALL).''.$showdelete;
}
$rows[] = $row;
}
@@ -2008,7 +2006,7 @@ class Wiki
* @todo replace this function with the formvalidator datepicker
*
*/
- function draw_date_picker($prefix,$default='')
+ public function draw_date_picker($prefix,$default='')
{
if (empty($default)) {
$default = date('Y-m-d H:i:s');
@@ -2047,7 +2045,7 @@ class Wiki
* Draws an HTML form select with the given options
*
*/
- function make_select($name,$values,$checked='')
+ public function make_select($name,$values,$checked='')
{
$output = '
| '.get_lang('AssignmentDesc').' |
| '.$photo.' '.Display::tag('span', api_get_person_name($userinfo['firstname'], $userinfo['lastname']), array('title'=>$username)).' |
+
+
';
$content_orig_B='| '.get_lang('AssignmentDesc').' |
| '.$photo.' '.Display::tag('span', api_get_person_name($userinfo['firstname'], $userinfo['lastname']), array('title'=>$username)).' |
'.get_lang('AssignmentDescription').': '.$title_orig.'
'.$_POST['content']; //Second: student list (names, photo and links to their works). //Third: Create Students work pages. - foreach($a_users_to_add as $user_id=>$o_user_to_add) { - if($o_user_to_add['user_id'] != api_get_user_id()) { + foreach ($a_users_to_add as $o_user_to_add) { + if ($o_user_to_add['user_id'] != api_get_user_id()) { //except that puts the task $assig_user_id = $o_user_to_add['user_id']; //identifies each page as created by the student, not by teacher $image_path = UserManager::get_user_picture_path_by_id($assig_user_id,'web',false, true); @@ -1844,45 +1826,54 @@ class Wiki } } - if($assignment_type==1) { - $_POST['title']= $title_orig; - $_POST['comment']=get_lang('AssignmentFirstComToStudent'); - $_POST['content']='
| '.get_lang('AssignmentWork').' |
| '.$photo.' '.$name.' |
+
+
+
[['.$link2teacher.' | '.get_lang('AssignmentLinktoTeacherPage').']] ';
+ //If $content_orig_B is added here, the task written by the professor was copied to the page of each student. TODO: config options
+
+ // AssignmentLinktoTeacherPage
$all_students_pages[] = '| '.get_lang('AssignmentWork').' |
| '.$photo.' '.$name.' |
'.get_lang('AssignmentLinkstoStudentsPage').'
- '.implode($all_students_pages).'
'; - $_POST['assignment']=1; + $values['content']=$content_orig_A.$content_orig_B.'
'.get_lang('AssignmentLinkstoStudentsPage').'
- '.implode($all_students_pages).'
'; + $values['assignment']=1; } $this->assig_user_id = $assig_user_id; - self::save_new_wiki(); + self::save_new_wiki($values); } - } //end foreach to teacher + } } /** * Displays the results of a wiki search * @param string Search term * @param int Whether to search the contents (1) or just the titles (0) + * @param int */ - - function display_wiki_search_results($search_term, $search_content=0, $all_vers=0) + public function display_wiki_search_results($search_term, $search_content=0, $all_vers=0) { $tbl_wiki = $this->tbl_wiki; $condition_session = $this->condition_session; @@ -1959,7 +1950,7 @@ class Wiki } elseif ($obj->assignment==2) { $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL); } elseif ($obj->assignment==0) { - $ShowAssignment='
';
+ $ShowAssignment= Display::return_icon('px_transparent.gif');
}
$row = array();
$row[] =$ShowAssignment;
@@ -1970,7 +1961,8 @@ class Wiki
$row[] = ''.$obj->title.'';
}
- $row[] = $obj->user_id <>0 ? ''.api_htmlentities($userinfo['complete_name']).'' : get_lang('Anonymous').' ('.$obj->user_ip.')';
+ $row[] = $obj->user_id <>0 ? ''.
+ api_htmlentities($userinfo['complete_name']).'' : get_lang('Anonymous').' ('.$obj->user_ip.')';
$row[] = $year.'-'.$month.'-'.$day.' '.$hours.":".$minutes.":".$seconds;
if ($all_vers=='1') {
@@ -1979,7 +1971,13 @@ class Wiki
if (api_is_allowed_to_edit(false,true)|| api_is_platform_admin()) {
$showdelete=' '.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL);
}
- $row[] = ''.Display::return_icon('edit.png', get_lang('EditPage'),'',ICON_SIZE_SMALL).' '.Display::return_icon('discuss.png', get_lang('Discuss'),'',ICON_SIZE_SMALL).' '.Display::return_icon('history.png', get_lang('History'),'',ICON_SIZE_SMALL).' '.Display::return_icon('what_link_here.png', get_lang('LinksPages'),'',ICON_SIZE_SMALL).''.$showdelete;
+ $row[] = ''.
+ Display::return_icon('edit.png', get_lang('EditPage'),'',ICON_SIZE_SMALL).'
+ '.
+ Display::return_icon('discuss.png', get_lang('Discuss'),'',ICON_SIZE_SMALL).'
+ '.
+ Display::return_icon('history.png', get_lang('History'),'',ICON_SIZE_SMALL).' '.
+ Display::return_icon('what_link_here.png', get_lang('LinksPages'),'',ICON_SIZE_SMALL).''.$showdelete;
}
$rows[] = $row;
}
@@ -2008,7 +2006,7 @@ class Wiki
* @todo replace this function with the formvalidator datepicker
*
*/
- function draw_date_picker($prefix,$default='')
+ public function draw_date_picker($prefix,$default='')
{
if (empty($default)) {
$default = date('Y-m-d H:i:s');
@@ -2047,7 +2045,7 @@ class Wiki
* Draws an HTML form select with the given options
*
*/
- function make_select($name,$values,$checked='')
+ public function make_select($name,$values,$checked='')
{
$output = '