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

[svn r22536] implementation of on line tasks

Browse Source
skala
Juan Carlos Raña 16 years ago
parent 3d138eea6d
commit d0c4161c67
2 changed files with 371 additions and 113 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. 275
      main/wiki/index.php
  2. 209
      main/wiki/wiki.inc.php

275
main/wiki/index.php
Unescape View File

@ -195,9 +195,8 @@ $result=api_sql_query($sql,__LINE__,__FILE__);
while ($is_editing_block=Database::fetch_array($result)) while ($is_editing_block=Database::fetch_array($result))
{ {
$max_edit_time=1200; // 20 minutes $max_edit_time=1200; // 20 minutes
$timestamp_edit=convert_date_to_number($is_editing_block['time_edit']); $timestamp_edit=strtotime($is_editing_block['time_edit']);
$time_editing=time()-$timestamp_edit; $time_editing=time()-$timestamp_edit;
//first prevent concurrent users and double version //first prevent concurrent users and double version
if($is_editing_block['is_editing']==$_user['user_id']) if($is_editing_block['is_editing']==$_user['user_id'])
@ -234,8 +233,7 @@ if (isset($_POST['SaveWikiChange']) AND $_POST['title']<>'')
{ {
//prevent concurrent users and double version //prevent concurrent users and double version
Display::display_error_message(get_lang("EditedByAnotherUser")); Display::display_error_message(get_lang("EditedByAnotherUser"));
} }
else else
{ {
$return_message=save_wiki(); $return_message=save_wiki();
@ -360,7 +358,7 @@ if ($_GET['view'])
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 //checking for concurrent users
$timestamp_edit=convert_date_to_number($last_row['time_edit']); $timestamp_edit=strtotime($last_row['time_edit']);
$time_editing=time()-$timestamp_edit; $time_editing=time()-$timestamp_edit;
$max_edit_time=1200; // 20 minutes $max_edit_time=1200; // 20 minutes
$rest_time=$max_edit_time-$time_editing; $rest_time=$max_edit_time-$time_editing;
@ -1230,11 +1228,10 @@ if ($_GET['action']=='showpage' AND !isset($_POST['SaveWikiNew']))
if ($_GET['action']=='edit') if ($_GET['action']=='edit')
{ {
$_clean['group_id']=(int)$_SESSION['_gid']; $_clean['group_id']=(int)$_SESSION['_gid'];
$sql='SELECT * FROM '.$tbl_wiki.'WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter.' ORDER BY id DESC';
$result=api_sql_query($sql,__LINE__,__FILE__);
$row=Database::fetch_array($result); // we do not need a while loop since we are always displaying the last version
$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$tbl_wiki.'.'.$groupfilter.' ORDER BY id DESC';
$result=api_sql_query($sql,__LINE__,__FILE__);
$row=Database::fetch_array($result); // we do not need a while loop since we are always displaying the last version
if ($row['content']=='' AND $row['title']=='' AND $page=='') if ($row['content']=='' AND $row['title']=='' AND $page=='')
@ -1316,9 +1313,82 @@ if ($_GET['action']=='edit')
Display::display_normal_message(get_lang('PageLockedExtra')); Display::display_normal_message(get_lang('PageLockedExtra'));
} }
else else
{ {
//check tasks
//previous checking for concurrent editions if (!empty($row['startdate_assig']) && $row['startdate_assig']!='0000-00-00 00:00:00' && time()<strtotime($row['startdate_assig']))
{
$message=get_lang('TheTaskDoesNotBeginUntil').': '.$row['startdate_assig'];
Display::display_warning_message($message);
if(!api_is_allowed_to_edit())
{
exit;
}
}
//
if (!empty($row['enddate_assig']) && $row['enddate_assig']!='0000-00-00 00:00:00' && time()>strtotime($row['enddate_assig']) && $row['enddate_assig']!='0000-00-00 00:00:00' && $row['delayedsubmit']==0)
{
$message=get_lang('TheDeadlineHasBeenCompleted').': '.$row['enddate_assig'];
Display::display_warning_message($message);
if(!api_is_allowed_to_edit())
{
exit;
}
}
//
if(!empty($row['max_version']) && $row['version']>=$row['max_version'])
{
$message=get_lang('HasReachedMaxiNumVersions');
Display::display_warning_message($message);
if(!api_is_allowed_to_edit())
{
exit;
}
}
//
if (!empty($row['max_text']) && $row['max_text']>=word_count($row['content']))
{
$message=get_lang('HasReachedMaxNumWords');
Display::display_warning_message($message);
if(!api_is_allowed_to_edit())
{
exit;
}
}
////
if (!empty($row['task']))
{
$message_task='<b>'.get_lang('DescriptionOfTheTask').'</b><p>'.$row['task'].'</p><hr>';
$message_task.='<p>'.get_lang('StartDate').': '.$row['startdate_assig'].'</p>';
$message_task.='<p>'.get_lang('EndDate').': '.$row['enddate_assig'];
$message_task.=' ('.get_lang('AllowLaterSends').') '.$row['delayedsubmit'].'</p>';
$message_task.='<p>'.get_lang('OtherRequirements').': '.get_lang('NMaxVersion').': '.$row['max_version'];
$message_task.=' '.get_lang('NMaxWords').': '.$row['max_text'];
Display::display_normal_message($message_task);
}
if($row['progress']==$row['fprogress1'] && !empty($row['fprogress1']))
{
$feedback_message='<b>'.get_lang('Feedback').'</b><p>'.$row['feedback1'].'</p>';
Display::display_normal_message($feedback_message);
}
elseif($row['progress']==$row['fprogress2'] && !empty($row['fprogress2']))
{
$feedback_message='<b>'.get_lang('Feedback').'</b><p>'.$row['feedback2'].'</p>';
Display::display_normal_message($feedback_message);
}
elseif($row['progress']==$row['fprogress3'] && !empty($row['fprogress3']))
{
$feedback_message='<b>'.get_lang('Feedback').'</b><p>'.$row['feedback3'].'</p>';
Display::display_normal_message($feedback_message);
}
//previous checking for concurrent editions
if($row['is_editing']==0) if($row['is_editing']==0)
{ {
Display::display_normal_message(get_lang('WarningMaxEditingTime')); Display::display_normal_message(get_lang('WarningMaxEditingTime'));
@ -1329,7 +1399,7 @@ if ($_GET['action']=='edit')
} }
elseif($row['is_editing']!=$_user['user_id']) elseif($row['is_editing']!=$_user['user_id'])
{ {
$timestamp_edit=convert_date_to_number($row['time_edit']); $timestamp_edit=strtotime($row['time_edit']);
$time_editing=time()-$timestamp_edit; $time_editing=time()-$timestamp_edit;
$max_edit_time=1200; // 20 minutes $max_edit_time=1200; // 20 minutes
$rest_time=$max_edit_time-$time_editing; $rest_time=$max_edit_time-$time_editing;
@ -1339,12 +1409,155 @@ if ($_GET['action']=='edit')
$is_being_edited= get_lang('ThisPageisBeginEditedBy').' <a href=../user/userInfo.php?uInfo='.$userinfo['user_id'].'>'.$userinfo['lastname'].', '.$userinfo['firstname'].'</a>. '.get_lang('ThisPageisBeginEditedTryLater').' '.date( "i",$rest_time).' '.get_lang('MinMinutes').''; $is_being_edited= get_lang('ThisPageisBeginEditedBy').' <a href=../user/userInfo.php?uInfo='.$userinfo['user_id'].'>'.$userinfo['lastname'].', '.$userinfo['firstname'].'</a>. '.get_lang('ThisPageisBeginEditedTryLater').' '.date( "i",$rest_time).' '.get_lang('MinMinutes').'';
Display::display_normal_message($is_being_edited); Display::display_normal_message($is_being_edited);
exit; exit;
} }
//form
echo '<div id="wikititle">';
echo $icon_assignment.'&nbsp;&nbsp;&nbsp;'.$title.'</div>';
echo '<div id="wikicontent">';
echo '<form name="form1" method="post" action="'.api_get_self().'?action=showpage&amp;title='.$page.'&group_id='.Security::remove_XSS($_GET['group_id']).'">'; echo '<form name="form1" method="post" action="'.api_get_self().'?action=showpage&amp;title='.$page.'&group_id='.Security::remove_XSS($_GET['group_id']).'">';
echo '<div id="wikititle">';
echo $icon_assignment.'&nbsp;&nbsp;&nbsp;'.$title;
//
if((api_is_allowed_to_edit() || api_is_platform_admin()) && $_SESSION['_gid']!=0)
{
echo'<a href="javascript://" onclick="advanced_parameters()" ><span id="plus_minus" style="float:right">&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show')).'&nbsp;'.get_lang('AdvancedParameters').'</span></a>';
echo '<div id="options" style="display:none; margin: 20px;" >';
//task
echo '<div>&nbsp;</div><input type="checkbox" value="1" name="checktask" onclick="if(this.checked==true){document.getElementById(\'option4\').style.display=\'block\';}else{document.getElementById(\'option4\').style.display=\'none\';}"/>&nbsp;<img src="../img/wiki/task.gif" />'.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" align="center">';
echo '<tr>';
echo '<td>'.get_lang('DescriptionOfTheTask').'</td>';
echo '</tr>';
echo '<tr>';
echo '<td><textarea name="task" cols="60" rows="4" >'.stripslashes($row['task']).'</textarea></td>';
echo '</tr>';
echo '</table>';
echo '</div>';
//feedback
echo '<div>&nbsp;</div><input type="checkbox" value="1" name="checkfeedback" onclick="if(this.checked==true){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">';
echo '<tr>';
echo '<td colspan="2">'.get_lang('Feedback1').'</td>';
echo '<td colspan="2">'.get_lang('Feedback2').'</td>';
echo '<td colspan="2">'.get_lang('Feedback3').'</td>';
echo '</tr>';
echo '<tr>';
echo '<td colspan="2"><textarea name="feedback1" cols="23" rows="4" >'.stripslashes($row['feedback1']).'</textarea></td>';
echo '<td colspan="2"><textarea name="feedback2" cols="23" rows="4" >'.stripslashes($row['feedback2']).'</textarea></td>';
echo '<td colspan="2"><textarea name="feedback3" cols="23" rows="4" >'.stripslashes($row['feedback3']).'</textarea></td>';
echo '</tr>';
echo '<tr>';
echo '<td>'.get_lang('FProgress').':</td>';
echo '<td><select name="fprogress1">';
echo '<option value="'.stripslashes($row['fprogress1']).'" selected>'.stripslashes($row['fprogress1']).'</option>';
echo '<option value="10">10</option>
<option value="20">20</option>
<option value="30">30</option>
<option value="40">40</option>
<option value="50">50</option>
<option value="60">60</option>
<option value="70">70</option>
<option value="80">80</option>
<option value="90">90</option>
<option value="100">100</option>
</select> %</td>';
echo '<td>'.get_lang('FProgress').':</td>';
echo '<td><select name="fprogress2">';
echo '<option value="'.stripslashes($row['fprogress2']).'" selected>'.stripslashes($row['fprogress2']).'</option>';
echo '<option value="10">10</option>
<option value="20">20</option>
<option value="30">30</option>
<option value="40">40</option>
<option value="50">50</option>
<option value="60">60</option>
<option value="70">70</option>
<option value="80">80</option>
<option value="90">90</option>
<option value="100">100</option>
</select> %</td>';
echo '<td>'.get_lang('FProgress').':</td>';
echo '<td><select name="fprogress3">';
echo '<option value="'.stripslashes($row['fprogress3']).'" selected>'.stripslashes($row['fprogress3']).'</option>';
echo '<option value="10">10</option>
<option value="20">20</option>
<option value="30">30</option>
<option value="40">40</option>
<option value="50">50</option>
<option value="60">60</option>
<option value="70">70</option>
<option value="80">80</option>
<option value="90">90</option>
<option value="100">100</option>
</select> %</td>';
echo '</tr>';
echo '</table>';
echo '</div>';
//time limit
echo '<div>&nbsp;</div><input type="checkbox" value="1" name="checktimelimit" onclick="if(this.checked==true){document.getElementById(\'option1\').style.display=\'block\'; $pepe=\'a\';}else{document.getElementById(\'option1\').style.display=\'none\';}"/>&nbsp;'.get_lang('PutATimeLimit').'';
echo '&nbsp;&nbsp;&nbsp;<span id="msg_error1" style="display:none;color:red"></span>';
echo '<div id="option1" style="padding:4px; margin:5px; border:1px dotted; display:none;">';
echo '<table width="100%" border="0" style="font-weight:normal">';
echo '<tr>';
echo '<td align="right">'.get_lang("StartDate").':</td>';
echo '<td>';
if ($row['startdate_assig']=='0000-00-00 00:00:00')
{
echo draw_date_picker('startdate_assig').' <input type="checkbox" name="initstartdate" value="1"> '.get_lang('Yes').'/'.get_lang('No').'';
}
else
{
echo draw_date_picker('startdate_assig', $row['startdate_assig']).' <input type="checkbox" name="initstartdate" value="1"> '.get_lang('Yes').'/'.get_lang('No').'';
}
echo '</td>';
echo '</tr>';
echo '<tr>';
echo '<td align="right">'.get_lang("EndDate").':</td>';
echo '<td>';
if ($row['enddate_assig']=='0000-00-00 00:00:00')
{
echo draw_date_picker('enddate_assig').' <input type="checkbox" name="initenddate" value="1"> '.get_lang('Yes').'/'.get_lang('No').'';
}
else
{
echo draw_date_picker('enddate_assig', $row['enddate_assig']).' <input type="checkbox" name="initenddate" value="1"> '.get_lang('Yes').'/'.get_lang('No').'';
}
echo '</td>';
echo '</tr>';
echo '<tr>';
echo '<td align="right">'.get_lang('AllowLaterSends').':</td>';
if (stripslashes($row['delayedsubmit'])==1)
{
$check_uncheck='checked';
}
echo '<td><input type="checkbox" name="delayedsubmit" value="1" '.$check_uncheck.'></td>';
echo '</tr>';
echo'</table>';
echo '</div>';
//other limit
echo '<div>&nbsp;</div><input type="checkbox" value="1" name="checkotherlimit" onclick="if(this.checked==true){document.getElementById(\'option3\').style.display=\'block\';}else{document.getElementById(\'option3\').style.display=\'none\';}"/>&nbsp;'.get_lang('OtherSettings').'';
echo '&nbsp;&nbsp;&nbsp;<span id="msg_error3" style="display:none;color:red"></span>';
echo '<div id="option3" style="padding:4px; margin:5px; border:1px dotted; display:none;">';
echo '<div style="font-weight:normal"; align="center">'.get_lang('NMaxWords').':&nbsp;<input type="text" name="max_text" size="3" value="'.stripslashes($row['max_text']).'">&nbsp;&nbsp;'.get_lang('NMaxVersion').':&nbsp;<input type="text" name="max_version" size="3" value="'.stripslashes($row['max_version']).'"></div>';
echo '</div>';
//
echo '</div>';
}
echo '</div>';
echo '<div id="wikicontent">';
echo '<input type="hidden" name="page_id" value="'.$page_id.'">'; echo '<input type="hidden" name="page_id" value="'.$page_id.'">';
echo '<input type="hidden" name="reflink" value="'.$page.'">'; echo '<input type="hidden" name="reflink" value="'.$page.'">';
echo '<input type="hidden" name="title" value="'.stripslashes($title).'">'; echo '<input type="hidden" name="title" value="'.stripslashes($title).'">';
@ -1354,19 +1567,19 @@ if ($_GET['action']=='edit')
: array('ToolbarSet' => 'WikiStudent', 'Width' => '100%', 'Height' => '400', 'UserStatus' => 'student') : array('ToolbarSet' => 'WikiStudent', 'Width' => '100%', 'Height' => '400', 'UserStatus' => 'student')
); );
echo '<br/>'; echo '<br/>';
echo '<br/>'; echo '<br/>';
//if(api_is_allowed_to_edit() || api_is_platform_admin()) //off for now //if(api_is_allowed_to_edit() || api_is_platform_admin()) //off for now
//{ //{
echo get_lang('Comments').':&nbsp;&nbsp;<input type="text" name="comment">&nbsp;&nbsp;&nbsp;'; echo get_lang('Comments').':&nbsp;&nbsp;<input type="text" name="comment" size="40">&nbsp;&nbsp;&nbsp;';
//} //}
echo '<INPUT TYPE="hidden" NAME="assignment" VALUE="'.stripslashes($row['assignment']).'"/>'; echo '<INPUT TYPE="hidden" NAME="assignment" VALUE="'.stripslashes($row['assignment']).'"/>';
//echo '<INPUT TYPE="hidden" NAME="startdate_assig" VALUE="'.stripslashes($row['startdate_assig']).'"/>'; //off for now echo '<INPUT TYPE="hidden" NAME="version" VALUE="'.stripslashes($row['version']).'"/>';
//echo '<INPUT TYPE="hidden" NAME="enddate_assig" VALUE="'.stripslashes($row['enddate_assig']).'"/>'; //off for now
//echo '<INPUT TYPE="hidden" NAME="delayedsubmit" VALUE="'.stripslashes($row['delayedsubmit']).'"/>'; //off for now //hack date for edit
echo '<INPUT TYPE="hidden" NAME="startdate_assig" VALUE="'.stripslashes($row['startdate_assig']).'"/>';
echo '<INPUT TYPE="hidden" NAME="version" VALUE="'.stripslashes($row['version']).'"/>'; //get current version echo '<INPUT TYPE="hidden" NAME="enddate_assig" VALUE="'.stripslashes($row['enddate_assig']).'"/>';
//
echo get_lang('Progress').':&nbsp;&nbsp;<select name="progress" id="progress">'; echo get_lang('Progress').':&nbsp;&nbsp;<select name="progress" id="progress">';
echo '<option value="'.stripslashes($row['progress']).'" selected>'.stripslashes($row['progress']).'</option>'; echo '<option value="'.stripslashes($row['progress']).'" selected>'.stripslashes($row['progress']).'</option>';
echo '<option value="10">10</option> echo '<option value="10">10</option>
@ -1384,8 +1597,8 @@ if ($_GET['action']=='edit')
echo '<input type="hidden" name="wpost_id" value="'.md5(uniqid(rand(), true)).'">';//prevent double post echo '<input type="hidden" name="wpost_id" value="'.md5(uniqid(rand(), true)).'">';//prevent double post
echo '<input type="hidden" name="SaveWikiChange" value="'.get_lang('langSave').'">'; //for save icon echo '<input type="hidden" name="SaveWikiChange" value="'.get_lang('langSave').'">'; //for save icon
echo '<button class="save" type="submit" name="SaveWikiChange">'.get_lang('langSave').'</button>';//for save button echo '<button class="save" type="submit" name="SaveWikiChange">'.get_lang('langSave').'</button>';//for save button
echo '</form>'; echo '</div>';
echo '</div>'; echo '</form>';
} }
} }
} }

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

@ -314,16 +314,46 @@ function save_wiki() {
} }
//cleaning config variables //cleaning config variables
$_clean['feedback1']=Database::escape_string(Security::remove_XSS($_POST['feedback1'])); if(!empty($_POST['task']))
$_clean['feedback2']=Database::escape_string(Security::remove_XSS($_POST['feedback2'])); {
$_clean['feedback3']=Database::escape_string(Security::remove_XSS($_POST['feedback3'])); $_clean['task']=Database::escape_string(Security::remove_XSS($_POST['task']));
$_clean['max_text']=Database::escape_string(Security::remove_XSS($_POST['max_text'])); }
$_clean['max_version']=Database::escape_string(Security::remove_XSS($_POST['max_version'])); if(!empty($_POST['feedback1']) || !empty($_POST['feedback2']) || !empty($_POST['feedback3']))
$_clean['startdate_assig']=Database::escape_string(Security::remove_XSS($_POST['startdate_assig'])); {
$_clean['enddate_assig']=Database::escape_string(Security::remove_XSS($_POST['enddate_assig'])); $_clean['feedback1']=Database::escape_string(Security::remove_XSS($_POST['feedback1']));
$_clean['delayedsubmit']=Database::escape_string(Security::remove_XSS($_POST['delayedsubmit'])); $_clean['feedback2']=Database::escape_string(Security::remove_XSS($_POST['feedback2']));
$_clean['feedback3']=Database::escape_string(Security::remove_XSS($_POST['feedback3']));
$_clean['fprogress1']=Database::escape_string(Security::remove_XSS($_POST['fprogress1']));
$_clean['fprogress2']=Database::escape_string(Security::remove_XSS($_POST['fprogress2']));
$_clean['fprogress3']=Database::escape_string(Security::remove_XSS($_POST['fprogress3']));
}
if(Security::remove_XSS($_POST['initstartdate']==1))
{
$_clean['startdate_assig']=Database::escape_string(Security::remove_XSS(get_date_from_select('startdate_assig')));
}
else
{
$_clean['startdate_assig']=Database::escape_string(Security::remove_XSS($_POST['startdate_assig']));
}
if(Security::remove_XSS($_POST['initenddate']==1))
{
$_clean['enddate_assig']=Database::escape_string(Security::remove_XSS(get_date_from_select('enddate_assig')));
}
else
{
$_clean['enddate_assig']=Database::escape_string(Security::remove_XSS($_POST['enddate_assig']));
}
$_clean['delayedsubmit']=Database::escape_string(Security::remove_XSS($_POST['delayedsubmit']));
if(!empty($_POST['max_text']) || !empty($_POST['max_version']))
{
$_clean['max_text']=Database::escape_string(Security::remove_XSS($_POST['max_text']));
$_clean['max_version']=Database::escape_string(Security::remove_XSS($_POST['max_version']));
}
$sql="INSERT INTO ".$tbl_wiki." (page_id, reflink, title, content, user_id, group_id, dtime, assignment, comment, progress, version, linksto, user_ip) VALUES ('".$_clean['page_id']."','".$_clean['reflink']."','".$_clean['title']."','".$_clean['content']."','".$_clean['user_id']."','".$_clean['group_id']."','".$dtime."','".$_clean['assignment']."','".$_clean['comment']."','".$_clean['progress']."','".$_clean['version']."','".$_clean['linksto']."','".Database::escape_string($_SERVER['REMOTE_ADDR'])."')"; $sql="INSERT INTO ".$tbl_wiki." (page_id, reflink, title, content, user_id, group_id, dtime, assignment, comment, progress, version, linksto, user_ip) VALUES ('".$_clean['page_id']."','".$_clean['reflink']."','".$_clean['title']."','".$_clean['content']."','".$_clean['user_id']."','".$_clean['group_id']."','".$dtime."','".$_clean['assignment']."','".$_clean['comment']."','".$_clean['progress']."','".$_clean['version']."','".$_clean['linksto']."','".Database::escape_string($_SERVER['REMOTE_ADDR'])."')";
@ -340,11 +370,11 @@ function save_wiki() {
if ($_clean['reflink']=='index' && $_clean['version']==1) if ($_clean['reflink']=='index' && $_clean['version']==1)
{ {
$sql="INSERT INTO ".$tbl_wiki_conf." (page_id, feedback1, feedback2, feedback3, fprogress1, fprogress2, fprogress3, max_text, max_version, startdate_assig, enddate_assig, delayedsubmit) VALUES ('".$Id."','".$_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']."')"; $sql="INSERT INTO ".$tbl_wiki_conf." (page_id, task, feedback1, feedback2, feedback3, fprogress1, fprogress2, fprogress3, max_text, max_version, startdate_assig, enddate_assig, delayedsubmit) VALUES ('".$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 else
{ {
$sql='UPDATE'.$tbl_wiki_conf.' SET page_id="'.$Id.'", feedback1="'.$_clean['feedback1'].'", feedback2="'.$_clean['feedback2'].'", feedback3="'.$_clean['feedback3'].'", 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="'.$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'].'"';
} }
api_sql_query($sql,__FILE__,__LINE__); api_sql_query($sql,__FILE__,__LINE__);
@ -463,27 +493,36 @@ function save_new_wiki() {
$_clean['linksto'] = links_to($_clean['content']); //check wikilinks $_clean['linksto'] = links_to($_clean['content']); //check wikilinks
//cleaning config variables //cleaning config variables
if(Security::remove_XSS($_POST['timelimit']==1)) $_clean['task']=Database::escape_string(Security::remove_XSS($_POST['task']));
$_clean['feedback1']=Database::escape_string(Security::remove_XSS($_POST['feedback1']));
$_clean['feedback2']=Database::escape_string(Security::remove_XSS($_POST['feedback2']));
$_clean['feedback3']=Database::escape_string(Security::remove_XSS($_POST['feedback3']));
$_clean['fprogress1']=Database::escape_string(Security::remove_XSS($_POST['fprogress1']));
$_clean['fprogress2']=Database::escape_string(Security::remove_XSS($_POST['fprogress2']));
$_clean['fprogress3']=Database::escape_string(Security::remove_XSS($_POST['fprogress3']));
if(Security::remove_XSS($_POST['initstartdate']==1))
{ {
$_clean['startdate_assig']=Database::escape_string(Security::remove_XSS(get_date_from_select('startdate_assig'))); $_clean['startdate_assig']=Database::escape_string(Security::remove_XSS(get_date_from_select('startdate_assig')));
$_clean['enddate_assig']=Database::escape_string(Security::remove_XSS(get_date_from_select('enddate_assig')));
$_clean['delayedsubmit']=Database::escape_string(Security::remove_XSS($_POST['delayedsubmit']));
} }
if(Security::remove_XSS($_POST['feedback']==1)) else
{ {
$_clean['feedback1']=Database::escape_string(Security::remove_XSS($_POST['feedback1'])); $_clean['startdate_assig']=Database::escape_string(Security::remove_XSS($_POST['startdate_assig']));
$_clean['feedback2']=Database::escape_string(Security::remove_XSS($_POST['feedback2']));
$_clean['feedback3']=Database::escape_string(Security::remove_XSS($_POST['feedback3']));
$_clean['fprogress1']=Database::escape_string(Security::remove_XSS($_POST['fprogress1']));
$_clean['fprogress2']=Database::escape_string(Security::remove_XSS($_POST['fprogress2']));
$_clean['fprogress3']=Database::escape_string(Security::remove_XSS($_POST['fprogress3']));
} }
if(Security::remove_XSS($_POST['otherlimit']==1))
if(Security::remove_XSS($_POST['initenddate']==1))
{ {
$_clean['max_text']=Database::escape_string(Security::remove_XSS($_POST['max_text'])); $_clean['enddate_assig']=Database::escape_string(Security::remove_XSS(get_date_from_select('enddate_assig')));
$_clean['max_version']=Database::escape_string(Security::remove_XSS($_POST['max_version'])); }
} else
{
$_clean['enddate_assig']=Database::escape_string(Security::remove_XSS($_POST['enddate_assig']));
}
$_clean['delayedsubmit']=Database::escape_string(Security::remove_XSS($_POST['delayedsubmit']));
$_clean['max_text']=Database::escape_string(Security::remove_XSS($_POST['max_text']));
$_clean['max_version']=Database::escape_string(Security::remove_XSS($_POST['max_version']));
//filter no _uass //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)))) { 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'); $message= get_lang('GoAndEditMainPage');
@ -505,7 +544,7 @@ function save_new_wiki() {
api_sql_query($sql,__FILE__,__LINE__); api_sql_query($sql,__FILE__,__LINE__);
//insert wiki config //insert wiki config
$sql="INSERT INTO ".$tbl_wiki_conf." (page_id, feedback1, feedback2, feedback3, fprogress1, fprogress2, fprogress3, max_text, max_version, startdate_assig, enddate_assig, delayedsubmit) VALUES ('".$Id."','".$_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']."')"; $sql="INSERT INTO ".$tbl_wiki_conf." (page_id, task, feedback1, feedback2, feedback3, fprogress1, fprogress2, fprogress3, max_text, max_version, startdate_assig, enddate_assig, delayedsubmit) VALUES ('".$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']."')";
api_sql_query($sql,__LINE__,__FILE__); api_sql_query($sql,__LINE__,__FILE__);
api_item_property_update($_course, 'wiki', $Id, 'WikiAdded', api_get_user_id(), $_clean['group_id']); api_item_property_update($_course, 'wiki', $Id, 'WikiAdded', api_get_user_id(), $_clean['group_id']);
@ -539,7 +578,7 @@ return true;
} }
</script> </script>
<?php <?php
//form
echo '<form name="form1" method="post" onsubmit="return CheckSend()" action="'.api_get_self().'?cidReq='.$_course[id].'&action=showpage&amp;title='.$page.'&group_id='.Security::remove_XSS($_GET['group_id']).'">'; echo '<form name="form1" method="post" onsubmit="return CheckSend()" action="'.api_get_self().'?cidReq='.$_course[id].'&action=showpage&amp;title='.$page.'&group_id='.Security::remove_XSS($_GET['group_id']).'">';
echo '<div id="wikititle">'; echo '<div id="wikititle">';
echo '<span class="form_required">*</span> '.get_lang(Title).': <input type="text" name="title" value="'.urldecode($_GET['title']).'" size="40">'; echo '<span class="form_required">*</span> '.get_lang(Title).': <input type="text" name="title" value="'.urldecode($_GET['title']).'" size="40">';
@ -548,39 +587,34 @@ return true;
{ {
$_clean['group_id']=(int)$_SESSION['_gid']; // TODO: check if delete ? $_clean['group_id']=(int)$_SESSION['_gid']; // TODO: check if delete ?
//echo'<a href="javascript://" onclick="advanced_parameters()" ><span id="plus_minus" style="float:right">&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show')).'&nbsp;'.get_lang('AdvancedParameters').'</span></a>'; // TODO: under develop, uncoment and activate later echo'<a href="javascript://" onclick="advanced_parameters()" ><span id="plus_minus" style="float:right">&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show')).'&nbsp;'.get_lang('AdvancedParameters').'</span></a>';
echo '<div id="options" style="display:none; margin: 20px;" >'; echo '<div id="options" style="display:none; margin: 20px;" >';
//time limit //task
echo '<input type="checkbox" value="1" name="timelimit" onclick="if(this.checked==true){document.getElementById(\'option1\').style.display=\'block\';}else{document.getElementById(\'option1\').style.display=\'none\';}"/>&nbsp;'.get_lang('PutATimeLimit').''; echo '<input type="checkbox" value="1" name="checktask" onclick="if(this.checked==true){document.getElementById(\'option4\').style.display=\'block\';}else{document.getElementById(\'option4\').style.display=\'none\';}"/>&nbsp;<img src="../img/wiki/task.gif" />'.get_lang('DescriptionOfTheTask').'';
echo '&nbsp;&nbsp;&nbsp;<span id="msg_error1" style="display:none;color:red"></span>'; echo '&nbsp;&nbsp;&nbsp;<span id="msg_error4" style="display:none;color:red"></span>';
echo '<div id="option1" style="padding:4px; margin:5px; border:1px dotted; display:none;">'; echo '<div id="option4" style="padding:4px; margin:5px; border:1px dotted; display:none;">';
echo '<table width="100%" border="0" style="font-weight:normal">';
echo '<tr>'; echo '<table border="0" style="font-weight:normal" align="center">';
echo '<td align="right">'.get_lang("StartDate").':</td>';
echo '<td>'.draw_date_picker('startdate_assig').'</td>';
echo '</tr>';
echo '<tr>'; echo '<tr>';
echo '<td align="right">'.get_lang("EndDate").':</td>'; echo '<td>'.get_lang('DescriptionOfTheTask').'</td>';
echo '<td>'.draw_date_picker('enddate_assig').'</td>';
echo '</tr>'; echo '</tr>';
echo '<tr>'; echo '<tr>';
echo '<td align="right">'.get_lang('AllowLaterSends').':</td>'; echo '<td><textarea name="task" cols="60" rows="4" >'.stripslashes($row['task']).'</textarea></td>';
echo '<td><input type="checkbox" name="delayedsubmit" value="1"></td>';
echo '</tr>'; echo '</tr>';
echo'</table>'; echo '</table>';
echo '</div>'; echo '</div>';
//feedback //feedback
echo '<div>&nbsp;</div><input type="checkbox" value="1" name="feedback" onclick="if(this.checked==true){document.getElementById(\'option2\').style.display=\'block\';}else{document.getElementById(\'option2\').style.display=\'none\';}"/>&nbsp;'.get_lang('AddFeedback').''; echo '<div>&nbsp;</div><input type="checkbox" value="1" name="checkfeedback" onclick="if(this.checked==true){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 '&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 '<div id="option2" style="padding:4px; margin:5px; border:1px dotted; display:none;">';
echo '<table border="0" style="font-weight:normal" align="center">'; echo '<table border="0" style="font-weight:normal" align="center">';
echo '<tr>'; echo '<tr>';
echo '<td colspan="2">'.get_lang('Feedback1').'</td>'; echo '<td colspan="2">'.get_lang('Feedback1').'</td>';
echo '<td colspan="2" >'.get_lang('Feedback2').'</td>'; echo '<td colspan="2">'.get_lang('Feedback2').'</td>';
echo '<td colspan="2">'.get_lang('Feedback3').'</td>'; echo '<td colspan="2">'.get_lang('Feedback3').'</td>';
echo '</tr>'; echo '</tr>';
echo '<tr>'; echo '<tr>';
@ -590,7 +624,7 @@ return true;
echo '</tr>'; echo '</tr>';
echo '<tr>'; echo '<tr>';
echo '<td>'.get_lang('FProgress').':</td>'; echo '<td>'.get_lang('FProgress').':</td>';
echo '<td><select name="fprogress3"> echo '<td><select name="fprogress1">
<option value="0" selected>0</option> <option value="0" selected>0</option>
<option value="10">10</option> <option value="10">10</option>
<option value="20">20</option> <option value="20">20</option>
@ -604,7 +638,7 @@ return true;
<option value="100">100</option> <option value="100">100</option>
</select> %</td>'; </select> %</td>';
echo '<td>'.get_lang('FProgress').':</td>'; echo '<td>'.get_lang('FProgress').':</td>';
echo '<td><select name="fprogress3"> echo '<td><select name="fprogress2">
<option value="0" selected>0</option> <option value="0" selected>0</option>
<option value="10">10</option> <option value="10">10</option>
<option value="20">20</option> <option value="20">20</option>
@ -635,20 +669,42 @@ return true;
echo '</table>'; echo '</table>';
echo '</div>'; echo '</div>';
//time limit
echo '<div>&nbsp;</div><input type="checkbox" value="1" name="checktimelimit" onclick="if(this.checked==true){document.getElementById(\'option1\').style.display=\'block\';}else{document.getElementById(\'option1\').style.display=\'none\';}"/>&nbsp;'.get_lang('PutATimeLimit').'';
echo '&nbsp;&nbsp;&nbsp;<span id="msg_error1" style="display:none;color:red"></span>';
echo '<div id="option1" style="padding:4px; margin:5px; border:1px dotted; display:none;">';
echo '<table width="100%" border="0" style="font-weight:normal">';
echo '<tr>';
echo '<td align="right">'.get_lang("StartDate").':</td>';
echo '<td>';
echo draw_date_picker('startdate_assig').' <input type="checkbox" name="initstartdate" value="1"> '.get_lang('Yes').'/'.get_lang('No').'';
echo '</td>';
echo '</tr>';
echo '<tr>';
echo '<td align="right">'.get_lang("EndDate").':</td>';
echo '<td>';
echo draw_date_picker('enddate_assig').' <input type="checkbox" name="initenddate" value="1"> '.get_lang('Yes').'/'.get_lang('No').'';
echo '</td>';
echo '</tr>';
echo '<tr>';
echo '<td align="right">'.get_lang('AllowLaterSends').':</td>';
echo '<td><input type="checkbox" name="delayedsubmit" value="1"></td>';
echo '</tr>';
echo'</table>';
echo '</div>';
//other limit //other limit
echo '<div>&nbsp;</div><input type="checkbox" value="1" name="otherlimit" onclick="if(this.checked==true){document.getElementById(\'option3\').style.display=\'block\';}else{document.getElementById(\'option3\').style.display=\'none\';}"/>&nbsp;'.get_lang('OtherSettings').''; echo '<div>&nbsp;</div><input type="checkbox" value="1" name="checkotherlimit" onclick="if(this.checked==true){document.getElementById(\'option3\').style.display=\'block\';}else{document.getElementById(\'option3\').style.display=\'none\';}"/>&nbsp;'.get_lang('OtherSettings').'';
echo '&nbsp;&nbsp;&nbsp;<span id="msg_error3" style="display:none;color:red"></span>'; echo '&nbsp;&nbsp;&nbsp;<span id="msg_error3" style="display:none;color:red"></span>';
echo '<div id="option3" style="padding:4px; margin:5px; border:1px dotted; display:none;">'; echo '<div id="option3" style="padding:4px; margin:5px; border:1px dotted; display:none;">';
echo '<div style="font-weight:normal"; align="center">'.get_lang('Max_text').':&nbsp;<input type="text" name="max_text" size="3">&nbsp;&nbsp;'.get_lang('Max_version').':&nbsp;<input type="text" name="max_version" size="3"></div>'; echo '<div style="font-weight:normal"; align="center">'.get_lang('Max_text').':&nbsp;<input type="text" name="max_text" size="3">&nbsp;&nbsp;'.get_lang('Max_version').':&nbsp;<input type="text" name="max_version" size="3"></div>';
echo '</div>'; echo '</div>';
//to define as an individual assignment //to define as an individual assignment
echo '<div style= "border : 1px dotted; padding:4px; margin-top:20px;"><img src="../img/wiki/assignment.gif" />&nbsp;'.get_lang('DefineAssignmentPage').': <input type="checkbox" name="assignment" value="1"></div>'; // 1= teacher 2 =student echo '<div style= "border : 1px dotted; padding:4px; margin-top:20px;"><img src="../img/wiki/assignment.gif" />&nbsp;'.get_lang('DefineAssignmentPage').': <input type="checkbox" name="assignment" value="1"></div>'; // 1= teacher 2 =student
//
echo'</div>'; echo'</div>';
echo '<div>&nbsp;</div>';
} }
echo '</div>'; echo '</div>';
echo '<div id="wikicontent">'; echo '<div id="wikicontent">';
@ -689,6 +745,7 @@ function display_wiki_entry()
{ {
global $charset; global $charset;
global $tbl_wiki; global $tbl_wiki;
global $tbl_wiki_conf;
global $groupfilter; global $groupfilter;
global $page; global $page;
@ -697,7 +754,8 @@ function display_wiki_entry()
if ($_GET['view']) if ($_GET['view'])
{ {
$_clean['view']=(int)Database::escape_string($_GET['view']); $_clean['view']=(int)Database::escape_string($_GET['view']);
$filter=" AND id='".$_clean['view']."'";
$filter=' AND '.$tbl_wiki.'.id="'.$_clean['view'].'"';
} }
//first, check page visibility in the first page version //first, check page visibility in the first page version
@ -707,9 +765,9 @@ function display_wiki_entry()
$KeyVisibility=$row['visibility']; $KeyVisibility=$row['visibility'];
// second, show the last version // second, show the last version
$sql="SELECT * FROM ".$tbl_wiki."WHERE reflink='".html_entity_decode(Database::escape_string(stripslashes(urldecode($page))))."' AND $groupfilter $filter ORDER BY id DESC"; $sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$tbl_wiki.'.'.$groupfilter.' '.$filter.' ORDER BY id DESC';
$result=api_sql_query($sql,__LINE__,__FILE__); $result=api_sql_query($sql,__LINE__,__FILE__);
$row=Database::fetch_array($result); // we do not need a while loop since we are always displaying the last version $row=Database::fetch_array($result); // we do not need a while loop since we are always displaying the last version
//update visits //update visits
@ -740,7 +798,7 @@ function display_wiki_entry()
} }
//assignment mode: for identify page type //assignment mode: identify page type
if(stripslashes($row['assignment'])==1) if(stripslashes($row['assignment'])==1)
{ {
$icon_assignment='<img src="../img/wiki/assignment.gif" title="'.get_lang('AssignmentDescExtra').'" alt="'.get_lang('AssignmentDescExtra').'" />'; $icon_assignment='<img src="../img/wiki/assignment.gif" title="'.get_lang('AssignmentDescExtra').'" alt="'.get_lang('AssignmentDescExtra').'" />';
@ -749,8 +807,13 @@ function display_wiki_entry()
{ {
$icon_assignment='<img src="../img/wiki/works.gif" title="'.get_lang('AssignmentWorkExtra').'" alt="'.get_lang('AssignmentWorkExtra').'" />'; $icon_assignment='<img src="../img/wiki/works.gif" title="'.get_lang('AssignmentWorkExtra').'" alt="'.get_lang('AssignmentWorkExtra').'" />';
} }
//task mode
if (!empty($row['task']))
{
$icon_task='<img src="../img/wiki/task.gif" title="'.get_lang('TaskExtra').'" alt="'.get_lang('TaskExtra').'" />';
}
//Show page. Show page to all users if isn't hide page. Mode assignments: if student is the author, can view //Show page. Show page to all users if isn't hide page. Mode assignments: if student is the author, can view
if($KeyVisibility=="1" || api_is_allowed_to_edit() || api_is_platform_admin() || ($row['assignment']==2 && $KeyVisibility=="0" && (api_get_user_id()==$row['user_id']))) if($KeyVisibility=="1" || api_is_allowed_to_edit() || api_is_platform_admin() || ($row['assignment']==2 && $KeyVisibility=="0" && (api_get_user_id()==$row['user_id'])))
@ -861,7 +924,7 @@ function display_wiki_entry()
if (wiki_exist($title)) if (wiki_exist($title))
{ {
echo $icon_assignment.'&nbsp;&nbsp;&nbsp;'.stripslashes($title); echo $icon_assignment.'&nbsp;'.$icon_task.'&nbsp;'.stripslashes($title);
} }
else else
{ {
@ -1751,17 +1814,6 @@ function double_post($wpost_id)
} }
} }
/**
* Function convert date to number
* 2008-10-12 00:00:00 ---to--> 12345672218 (timestamp)
*/
function convert_date_to_number($default)
{
$parts = split(' ',$default);
list($d_year,$d_month,$d_day) = split('-',$parts[0]);
list($d_hour,$d_minute,$d_second) = split(':',$parts[1]);
return mktime($d_hour, $d_minute, $d_second, $d_month, $d_day, $d_year);
}
/** /**
* Function wizard individual assignment * Function wizard individual assignment
@ -2008,7 +2060,7 @@ function display_wiki_search_results($search_term, $search_content=0)
* *
*/ */
function draw_date_picker($prefix,$default='') { function draw_date_picker($prefix,$default='') {
//$default = 2008-10-01 10:00:00
if(empty($default)) { if(empty($default)) {
$default = date('Y-m-d H:i:s'); $default = date('Y-m-d H:i:s');
} }
@ -2035,7 +2087,7 @@ function draw_date_picker($prefix,$default='') {
array_unshift($minute,'00','01','02','03','04','05','06','07','08','09'); array_unshift($minute,'00','01','02','03','04','05','06','07','08','09');
$date_form = make_select($prefix.'_day', array_combine(range(1,31),range(1,31)), $d_day); $date_form = make_select($prefix.'_day', array_combine(range(1,31),range(1,31)), $d_day);
$date_form .= make_select($prefix.'_month', $month_list, $d_month); $date_form .= make_select($prefix.'_month', $month_list, $d_month);
$date_form .= make_select($prefix.'_year', array( $d_year=> $d_year, $d_year+1=>$d_year+1), $d_year).'&nbsp;&nbsp;&nbsp;&nbsp;'; $date_form .= make_select($prefix.'_year', array($d_year-2=>$d_year-2, $d_year-1=>$d_year-1, $d_year=> $d_year, $d_year+1=>$d_year+1, $d_year+2=>$d_year+2), $d_year).'&nbsp;&nbsp;&nbsp;&nbsp;';
$date_form .= make_select($prefix.'_hour', array_combine(range(0,23),range(0,23)), $d_hour).' : '; $date_form .= make_select($prefix.'_hour', array_combine(range(0,23),range(0,23)), $d_hour).' : ';
$date_form .= make_select($prefix.'_minute', $minute, $d_minute); $date_form .= make_select($prefix.'_minute', $minute, $d_minute);
return $date_form; return $date_form;
@ -2054,14 +2106,6 @@ function make_select($name,$values,$checked='') {
return $output; return $output;
} }
/**
* Enter description here...
*
*/
function make_checkbox($name,$checked='') {
return '' .
'<input type="checkbox" value="1" name="'.$name.'" '.((!empty($checked))?'checked="checked"':'').'/>';
}
/** /**
* Enter description here... * Enter description here...
@ -2079,4 +2123,5 @@ function two_digits($number)
$number = (int)$number; $number = (int)$number;
return ($number < 10) ? '0'.$number : $number; return ($number < 10) ? '0'.$number : $number;
} }
?> ?>
Write Preview
Loading…
Cancel
Save