[svn r17182] minor - fixed notice - level log

skala
Cristian Fasanando 17 years ago
parent 1d9997f618
commit e2d69af729
  1. 22
      main/calendar/agenda.inc.php
  2. 10
      main/inc/lib/display.lib.php
  3. 1
      main/inc/lib/sortabletable.class.php
  4. 29
      main/work/work.lib.php
  5. 118
      main/work/work.php

@ -1,4 +1,4 @@
<?php //$Id: agenda.inc.php 17170 2008-12-09 16:38:45Z yannoo $
<?php //$Id: agenda.inc.php 17182 2008-12-09 17:57:05Z cfasanando $
/*
==============================================================================
@ -770,12 +770,12 @@ function separate_users_groups($to)
{
$grouplist = array();
$userlist = array();
$send_to = null;
if(is_array($to) && count($to)>0)
{
foreach($to as $to_item)
{
list($type, $id) = explode(':', $to_item);
list($type, $id) = explode(':', $to_item);
switch($type)
{
case 'GROUP':
@ -788,7 +788,7 @@ function separate_users_groups($to)
}
$send_to['groups']=$grouplist;
$send_to['users']=$userlist;
}
}
return $send_to;
}
@ -3871,7 +3871,7 @@ function add_year($timestamp,$num=1)
* @param int Parent id (optional)
* @return int The new item's DB ID
*/
function agenda_add_item($course_info, $title, $content, $db_start_date, $db_end_date,$group_id,$id_user,$to=array(), $parent_id=null,$file_comment)
function agenda_add_item($course_info, $title, $content, $db_start_date, $db_end_date,$group_id,$id_user,$to=array(), $parent_id=null,$file_comment='')
{
global $_course;
$user_id = api_get_user_id();
@ -3882,12 +3882,12 @@ function agenda_add_item($course_info, $title, $content, $db_start_date, $db_end
$content = Database::escape_string($content);
$start_date = Database::escape_string($db_start_date);
$end_date = Database::escape_string($db_end_date);
isset($_SESSION['id_session'])?$id_session=intval($_SESSION['id_session']):$id_session=null;
// store in the table calendar_event
$sql = "INSERT INTO ".$t_agenda."
(title,content, start_date, end_date".(!empty($parent_id)?',parent_event_id':'').", session_id)
VALUES
('".$title."','".$content."', '".$start_date."','".$end_date."'".(!empty($parent_id)?','.((int)$parent_id):'').", ".intval($_SESSION['id_session']).")";
('".$title."','".$content."', '".$start_date."','".$end_date."'".(!empty($parent_id)?','.((int)$parent_id):'').", '".$id_session."')";
$result = api_sql_query($sql,__FILE__,__LINE__) or die (Database::error());
$last_id=Database::insert_id();
@ -3898,7 +3898,7 @@ function agenda_add_item($course_info, $title, $content, $db_start_date, $db_end
$upload_ok = process_uploaded_file($_FILES['user_upload']);
}
if ($upload_ok) {
if (!empty($upload_ok)) {
$courseDir = $_course['path'].'/upload/calendar';
$sys_course_path = api_get_path(SYS_COURSE_PATH);
$updir = $sys_course_path.$courseDir;
@ -3962,7 +3962,9 @@ function agenda_add_item($course_info, $title, $content, $db_start_date, $db_end
api_item_property_update($course_info, TOOL_CALENDAR_EVENT, $last_id, "AgendaAdded", $user_id, $group_id,$id_user,$start_date,$end_date);
}
// storing the resources
store_resources($_SESSION['source_type'],$last_id);
if (!empty($_SESSION['source_type']) && !empty($last_id)) {
store_resources($_SESSION['source_type'],$last_id);
}
return $last_id;
}
/**
@ -3976,7 +3978,7 @@ function agenda_add_item($course_info, $title, $content, $db_start_date, $db_end
* @param int User ID
* @return boolean False if error, True otherwise
*/
function agenda_add_repeat_item($course_info,$orig_id,$type,$end,$orig_dest,$id_group=null,$id_user=null,$file_comment)
function agenda_add_repeat_item($course_info,$orig_id,$type,$end,$orig_dest,$id_group=null,$id_user=null,$file_comment='')
{
$t_agenda = Database::get_course_table(TABLE_AGENDA,$course_info['dbName']);
$t_agenda_r = Database::get_course_table(TABLE_AGENDA_REPEAT,$course_info['dbName']);

@ -339,9 +339,13 @@ class Display {
{
for ($i=0;$i<count($column_show);$i++)
{
if ($column_show[$i])
{
$table->set_header($i, $header[$i][0], $header[$i][1], $header[$i][2], $header[$i][3]);
if (!empty($column_show[$i]))
{
isset($header[$i][0])?$val0=$header[$i][0]:$val0=null;
isset($header[$i][1])?$val1=$header[$i][1]:$val1=null;
isset($header[$i][2])?$val2=$header[$i][2]:$val2=null;
isset($header[$i][3])?$val3=$header[$i][3]:$val3=null;
$table->set_header($i, $val0, $val1, $val2, $val3);
}
}
}

@ -196,6 +196,7 @@ class SortableTable extends HTML_Table
{
global $charset;
$empty_table = false;
$html = '';
if ($this->get_total_number_of_items() == 0)
{
$cols = $this->getColCount();

@ -41,24 +41,25 @@ require_once '../inc/lib/fileDisplay.lib.php';
function display_action_links($cur_dir_path, $always_show_tool_options, $always_show_upload_form) {
$display_output = "";
isset($_GET['origin'])?$origin = Security::remove_XSS($_GET['origin']):$origin='';
if (strlen($cur_dir_path) > 0 && $cur_dir_path != '/') {
$parent_dir = dirname($cur_dir_path);
$display_output .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&origin='.Security::remove_XSS($_GET['origin']).'&curdirpath='.$parent_dir.'">'.Display::return_icon('folder_up.gif').' '.get_lang('Up').'</a>&nbsp&nbsp';
$display_output .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&origin='.$origin.'&curdirpath='.$parent_dir.'">'.Display::return_icon('folder_up.gif').' '.get_lang('Up').'</a>&nbsp&nbsp';
}
if (! $always_show_upload_form ) {
$user_info = api_get_user_info();
$user_status = $user_info['status'];
if ($user_status != 1) {
$display_output .= "&nbsp&nbsp<a href=\"".api_get_self()."?".api_get_cidreq()."&curdirpath=".$cur_dir_path."&amp;display_upload_form=true&amp;origin=".Security::remove_XSS($_GET['origin'])."\">".Display::return_icon('submit_file.gif')." ". get_lang("UploadADocument") .'</a>&nbsp&nbsp&nbsp&nbsp';
$display_output .= "&nbsp&nbsp<a href=\"".api_get_self()."?".api_get_cidreq()."&curdirpath=".$cur_dir_path."&amp;display_upload_form=true&amp;origin=".$origin."\">".Display::return_icon('submit_file.gif')." ". get_lang("UploadADocument") .'</a>&nbsp&nbsp&nbsp&nbsp';
}
}
if (! $always_show_tool_options && api_is_allowed_to_edit()) {
// Create dir
$display_output .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;curdirpath='.$cur_dir_path.'&amp;createdir=1&origin='.Security::remove_XSS($_GET['origin']).'"><img src="../img/folder_new.gif" border="0"alt ="'.get_lang('CreateDir').'" /> '.get_lang('CreateDir').' </a>&nbsp&nbsp';
// Create dir
$display_output .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;curdirpath='.$cur_dir_path.'&amp;createdir=1&origin='.$origin.'"><img src="../img/folder_new.gif" border="0"alt ="'.get_lang('CreateDir').'" /> '.get_lang('CreateDir').' </a>&nbsp&nbsp';
// Options
$display_output .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&curdirpath=".$cur_dir_path."&amp;origin=".Security::remove_XSS($_GET['origin'])."&amp;display_tool_options=true&amp;origin=".Security::remove_XSS($_GET['origin'])."\">".Display::return_icon('acces_tool.gif').' ' . get_lang("EditToolOptions") . "</a>&nbsp&nbsp";
$display_output .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&curdirpath=".$cur_dir_path."&amp;origin=".$origin."&amp;display_tool_options=true&amp;origin=".$origin."\">".Display::return_icon('acces_tool.gif').' ' . get_lang("EditToolOptions") . "</a>&nbsp&nbsp";
}
if ($display_output != "") {
@ -269,7 +270,8 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou
if($sub_course_dir == '/') {
$sub_course_dir='';
}
$session_condition = intval($_SESSION['id_session'])!=0 ?"AND session_id IN (0,".intval($_SESSION['id_session']).")" : "";
isset($_SESSION['id_session'])?$id_session=$_SESSION['id_session']:$id_session=null;
$session_condition = intval($id_session)!=0 ?"AND session_id IN (0,".intval($id_session).")" : "";
//Get list from database
if($is_allowed_to_edit) {
$sql_get_publications_list = "SELECT * " .
@ -295,7 +297,7 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou
$subdirs_query = "WHERE url NOT LIKE '$sub_course_dir%/%' AND url LIKE '$sub_course_dir%'";
}
$sql_get_publications_list = "SELECT * FROM $work_table $group_query $subdirs_query ".$add_in_where_query." AND session_id IN (0,".intval($_SESSION['id_session']).") ORDER BY id";
$sql_get_publications_list = "SELECT * FROM $work_table $group_query $subdirs_query ".$add_in_where_query." AND session_id IN (0,".intval($id_session).") ORDER BY id";
$sql_get_publications_num = "SELECT count(url) " .
"FROM ".$work_table." " .
"WHERE url LIKE BINARY '$sub_course_dir%' " .
@ -375,7 +377,7 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou
$mydir_temp = '/'.$my_sub_dir.$dir;
}
$session_condition = intval($_SESSION['id_session'])!=0 ?"AND work.session_id IN (0,".intval($_SESSION['id_session']).")" : "";
$session_condition = intval($id_session)!=0 ?"AND work.session_id IN (0,".intval($id_session).")" : "";
$sql_select_directory= "SELECT prop.lastedit_date, id, author, has_properties, view_properties, description, qualification,id FROM ".$iprop_table." prop INNER JOIN ".$work_table." work ON (prop.ref=work.id) WHERE " .
"work.url LIKE BINARY '".$mydir_temp."' AND work.filetype = 'folder' AND prop.tool='work' $session_condition";
$result=api_sql_query($sql_select_directory,__FILE__,__LINE__);
@ -393,7 +395,7 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou
$mydir = $my_sub_dir.$dir;
if ($is_allowed_to_edit) {
$clean_edit_dir=Security :: remove_XSS(Database::escape_string($_GET['edit_dir']));
isset($_GET['edit_dir'])?$clean_edit_dir=Security :: remove_XSS(Database::escape_string($_GET['edit_dir'])):$clean_edit_dir='';
// form edit directory
if(isset($clean_edit_dir) && $clean_edit_dir==$mydir) {
@ -544,7 +546,7 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou
$dirtext='';
}
if($display_edit_form && isset($clean_edit_dir) && $clean_edit_dir==$mydir) {
if (!empty($display_edit_form) && isset($clean_edit_dir) && $clean_edit_dir==$mydir) {
$row[] = '<span class="invisible" style="display:none">'.$dir.'</span>'.$form_folder->toHtml(); // form to edit the directory's name
} else {
$tbl_gradebook_link = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
@ -603,10 +605,9 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou
$class='';
}
if(defined('IS_ASSIGNMENT')):
$add_string = '';
$qualification_string = '';
$add_string = '';
if(defined('IS_ASSIGNMENT')):
if($work->qualification=='') {
$qualification_string = ' / <b style="color:orange">'.get_lang('NotRevised').'<b>';
} else {

@ -27,7 +27,7 @@
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University - ability for course admins to specify wether uploaded documents are visible or invisible by default.
* @author Roan Embrechts, code refactoring and virtual course support
* @author Frederic Vauthier, directories management
* @version $Id: work.php 17113 2008-12-08 15:35:12Z yannoo $
* @version $Id: work.php 17182 2008-12-09 17:57:05Z cfasanando $
*
* @todo refactor more code into functions, use quickforms, coding standards, ...
*/
@ -95,7 +95,7 @@ $language_file = array (
if (isset ($_GET['id_session'])) {
$_SESSION['id_session'] = Database::escape_string($_GET['id_session']);
}
isset($_SESSION['id_session'])?$id_session=$_SESSION['id_session']:$id_session=null;
/*
-----------------------------------------------------------
Including necessary files
@ -137,19 +137,19 @@ $currentCourseRepositoryWeb = api_get_path(WEB_COURSE_PATH) . $_course["path"] .
$currentUserFirstName = $_user['firstName'];
$currentUserLastName = $_user['lastName'];
$authors = Database :: escape_string($_POST['authors']);
$delete = Database :: escape_string($_REQUEST['delete']);
$description = Database :: escape_string($_REQUEST['description']);
$display_tool_options = $_REQUEST['display_tool_options'];
$display_upload_form = $_REQUEST['display_upload_form'];
$edit = Database :: escape_string($_REQUEST['edit']);
$make_invisible = Database :: escape_string($_REQUEST['make_invisible']);
$make_visible = Database :: escape_string($_REQUEST['make_visible']);
$origin = Security :: remove_XSS($_REQUEST['origin']);
$submitGroupWorkUrl = Security :: remove_XSS($_REQUEST['submitGroupWorkUrl']);
$title = Database :: escape_string($_REQUEST['title']);
$uploadvisibledisabled = Database :: escape_string($_REQUEST['uploadvisibledisabled']);
$id = strval(intval($_REQUEST['id']));
isset($_POST['authors'])?$authors = Database :: escape_string($_POST['authors']):$authors='';
isset($_REQUEST['delete'])?$delete = Database :: escape_string($_REQUEST['delete']):$delete='';
isset($_REQUEST['description'])?$description = Database :: escape_string($_REQUEST['description']):$description='';
isset($_REQUEST['display_tool_options'])?$display_tool_options = $_REQUEST['display_tool_options']:$display_tool_options='';
isset($_REQUEST['display_upload_form'])?$display_upload_form = $_REQUEST['display_upload_form']:$display_upload_form='';
isset($_REQUEST['edit'])?$edit = Database :: escape_string($_REQUEST['edit']):$edit='';
isset($_REQUEST['make_invisible'])?$make_invisible = Database :: escape_string($_REQUEST['make_invisible']):$make_invisible='';
isset($_REQUEST['make_visible'])?$make_visible = Database :: escape_string($_REQUEST['make_visible']):$make_visible='';
isset($_REQUEST['origin'])?$origin = Security :: remove_XSS($_REQUEST['origin']):$origin='';
isset($_REQUEST['submitGroupWorkUrl'])?$submitGroupWorkUrl = Security :: remove_XSS($_REQUEST['submitGroupWorkUrl']):$submitGroupWorkUrl='';
isset($_REQUEST['title'])?$title = Database :: escape_string($_REQUEST['title']):$title='';
isset($_REQUEST['uploadvisibledisabled'])?$uploadvisibledisabled = Database :: escape_string($_REQUEST['uploadvisibledisabled']):$uploadvisibledisabled='';
isset($_REQUEST['id'])?$id = strval(intval($_REQUEST['id'])):$id='';
//directories management
$sys_course_path = api_get_path(SYS_COURSE_PATH);
@ -218,7 +218,7 @@ if (isset ($_POST['cancelForm']) && !empty ($_POST['cancelForm'])) {
exit ();
}
if ($_POST['submitWork'] || $submitGroupWorkUrl) {
if (!empty($_POST['submitWork']) || !empty($submitGroupWorkUrl)) {
// these libraries are only used for upload purpose
// so we only include them when necessary
include_once (api_get_path(INCLUDE_PATH) . "lib/fileUpload.lib.php");
@ -250,10 +250,9 @@ if (!api_is_course_admin()) {
-----------------------------------------------------------
*/
if ($origin != 'learnpath') {
$interbreadcrumb[] = array (
'url' => $url_dir,
'name' => get_lang('StudentPublications'));
if (isset($origin) && $origin != 'learnpath') {
$url_dir ='';
$interbreadcrumb[] = array ('url' => $url_dir,'name' => get_lang('StudentPublications'));
//if (!$display_tool_options && !$display_upload_form)
//{
@ -352,7 +351,7 @@ if (api_is_allowed_to_edit(false,true)) {
/*-------------------------------------------
EDIT COMMAND WORK COMMAND
-----------------------------------------*/
$qualification_number=0;
if ($edit) {
$sql = "SELECT * FROM " . $work_table . " WHERE id='" . $edit . "'";
$result = api_sql_query($sql, __FILE__, __LINE__);
@ -457,7 +456,7 @@ if (api_is_allowed_to_edit(false,true)) {
parent_id = '',
qualificator_id = '',
date_of_qualification = '0000-00-00 00:00:00',
session_id = ".intval($_SESSION['id_session']);
session_id = ".intval($id_session);
api_sql_query($sql_add_publication, __FILE__, __LINE__);
@ -476,12 +475,12 @@ if (api_is_allowed_to_edit(false,true)) {
$TSTDPUBASG=Database :: get_course_table(TABLE_STUDENT_PUBLICATION_ASSIGNMENT);
isset($_POST['enable_calification'])?$enable_calification = (int)$_POST['enable_calification']:$enable_calification=null;
$sql_add_homework = "INSERT INTO ".$TSTDPUBASG." SET " .
"expires_on = '".(($_POST['type1']==1) ? get_date_from_select('expires') : '0000-00-00 00:00:00'). "',
ends_on = '".(($_POST['type2']==1) ? get_date_from_select('ends') : '0000-00-00 00:00:00')."',
add_to_calendar = '".(int)$_POST['add_to_calendar']."',
enable_qualification = '".(int)$_POST['enable_calification']."',
enable_qualification = '".$enable_calification."',
publication_id = '".$id."'";
api_sql_query($sql_add_homework, __FILE__, __LINE__);
//api_sql_query($sql_add_publication, __FILE__, __LINE__);
@ -524,8 +523,9 @@ if (api_is_allowed_to_edit(false,true)) {
if(!empty($_POST['type1']) && $_POST['add_to_calendar']==1):
include_once('../calendar/agenda.inc.php');
include_once('../resourcelinker/resourcelinker.inc.php');
agenda_add_item($course_info,$_POST['new_dir'],$_POST['new_dir'],date('Y-m-d H:i:s'),get_date_from_select('expires'));
include_once('../resourcelinker/resourcelinker.inc.php');
isset($course_info)?$course=$course_info:$course=null;
agenda_add_item($course,$_POST['new_dir'],$_POST['new_dir'],date('Y-m-d H:i:s'),get_date_from_select('expires'),0,$user_id);
endif;
//-----------------end features---------------------------//
@ -661,7 +661,7 @@ else {
//we found the current user is the author
$sql = "SELECT * FROM " . $work_table . " WHERE id='" . $edit . "'";
$result = api_sql_query($sql, __FILE__, __LINE__);
if ($result) {
if ($result ) {
$row = mysql_fetch_array($result);
$workTitle = $row['title'];
$workAuthor = $row['author'];
@ -683,8 +683,8 @@ else {
$error_message = "";
$check = Security :: check_token('post'); //check the token inserted into the form
if ($_POST['submitWork'] && $is_course_member && $check) {
if ($_FILES['file']['size']) {
if (!empty($_POST['submitWork']) && !empty($is_course_member) && !empty($check)) {
if (!empty($_FILES['file']['size'])) {
$updir = $currentCourseRepositorySys . 'work/'; //directory path to upload
// Try to add an extension to the file if it has'nt one
@ -731,6 +731,7 @@ if ($_POST['submitWork'] && $is_course_member && $check) {
$current_date = date('Y-m-d H:i:s');
$parent_id = '';
$active = '';
$sql = api_sql_query('SELECT id FROM '.Database::get_course_table(TABLE_STUDENT_PUBLICATION).' WHERE url = '."'/".Database::escape_string($_GET['curdirpath'])."' AND filetype='folder' LIMIT 1");
if(Database::num_rows($sql) > 0 ) {
$dir_row = Database::fetch_array($sql);
@ -747,7 +748,7 @@ if ($_POST['submitWork'] && $is_course_member && $check) {
post_group_id = '" . $post_group_id . "',
sent_date = '".$current_date ."',
parent_id = '".$parent_id ."' ,
session_id = ".intval($_SESSION['id_session']);
session_id = ".intval($id_session);
api_sql_query($sql_add_publication, __FILE__, __LINE__);
@ -785,7 +786,7 @@ if ($_POST['submitWork'] && $is_course_member && $check) {
description = '" . $description . "',
author = '" . $authors . "',
sent_date = NOW(),
session_id = ".intval($_SESSION['id_session']);
session_id = ".intval($id_session);
api_sql_query($sql, __FILE__, __LINE__);
@ -845,7 +846,7 @@ if ($_POST['submitWork'] && $is_course_member && $check) {
Security :: clear_token(); //clear the token to prevent re-executing the request with back button
}
if ($_POST['submitWork'] && $succeed && !$id) {
if (!empty($_POST['submitWork']) && !empty($succeed) && !$id) {
//last value is to check this is not "just" an edit
//YW Tis part serve to send a e-mail to the tutors when a new file is sent
$send = api_get_course_setting('email_alert_manager_on_new_doc');
@ -858,7 +859,7 @@ if ($_POST['submitWork'] && $succeed && !$id) {
$table_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
$emailto = array ();
if (empty ($_SESSION['id_session'])) {
if (empty ($id_session)) {
$sql_resp = 'SELECT u.email as myemail FROM ' . $table_course_user . ' cu, ' . $table_user . ' u WHERE cu.course_code = ' . "'" . api_get_course_id() . "'" . ' AND cu.status = 1 AND u.user_id = cu.user_id';
$res_resp = api_sql_query($sql_resp, __FILE__, __LINE__);
while ($row_email = Database :: fetch_array($res_resp)) {
@ -872,7 +873,7 @@ if ($_POST['submitWork'] && $succeed && !$id) {
FROM ' . $table_session . ' session
INNER JOIN ' . $table_user . ' user
ON user.user_id = session.id_coach
WHERE session.id = ' . intval($_SESSION['id_session']);
WHERE session.id = ' . intval($id_session);
$res_resp = api_sql_query($sql_resp, __FILE__, __LINE__);
while ($row_email = Database :: fetch_array($res_resp)) {
if (!empty ($row_email['myemail'])) {
@ -885,7 +886,7 @@ if ($_POST['submitWork'] && $succeed && !$id) {
FROM ' . $table_session_course . ' session_course
INNER JOIN ' . $table_user . ' user
ON user.user_id = session_course.id_coach
WHERE session_course.id_session = ' . intval($_SESSION['id_session']);
WHERE session_course.id_session = ' . intval($id_session);
$res_resp = api_sql_query($sql_resp, __FILE__, __LINE__);
while ($row_email = Database :: fetch_array($res_resp)) {
if (!empty ($row_email['myemail'])) {
@ -934,7 +935,9 @@ if ($_POST['submitWork'] && $succeed && !$id) {
=======================================
*/
$has_expired = false;
$sql = api_sql_query('SELECT description,id FROM '.Database :: get_course_table(TABLE_STUDENT_PUBLICATION).' WHERE filetype = '."'folder'".' and has_properties != '."''".' and url = '."'/".Database::escape_string($_GET['curdirpath'])."'".' LIMIT 1',__FILE__,__LINE__);
$has_ended = false;
isset($_GET['curdirpath'])?$curdirpath=Database::escape_string($_GET['curdirpath']):$curdirpath='';
$sql = api_sql_query('SELECT description,id FROM '.Database :: get_course_table(TABLE_STUDENT_PUBLICATION).' WHERE filetype = '."'folder'".' and has_properties != '."''".' and url = '."'/".$curdirpath."'".' LIMIT 1',__FILE__,__LINE__);
$is_special = mysql_num_rows($sql);
if($is_special > 0):
$is_special = true;
@ -1056,7 +1059,7 @@ if ($is_course_member) {
$form->addElement('submit', 'submitWork', get_lang('Ok'));
}
if ($_POST['submitWork'] || $edit) {
if (!empty($_POST['submitWork']) || $edit) {
$form->addElement('submit', 'cancelForm', get_lang('Cancel'));
}
@ -1070,7 +1073,7 @@ if ($is_course_member) {
}
function make_select($name,$values,$checked='') {
$output .= '<select name="'.$name.'" id="'.$name.'">';
$output = '<select name="'.$name.'" id="'.$name.'">';
foreach($values as $key => $value) {
$output .= '<option value="'.$key.'" '.(($checked==$key)?'selected="selected"':'').'>'.$value.'</option>';
}
@ -1109,7 +1112,7 @@ function draw_date_picker($prefix,$default='') {
$minute = range(10,59);
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.'_year', array( $d_year=> $d_year, $d_year+1=>$d_year+1), $d_year).'&nbsp;&nbsp;&nbsp;&nbsp;';
$date_form .= make_select($prefix.'_hour', array_combine(range(1,24),range(1,24)), $d_hour).' : ';
@ -1128,7 +1131,7 @@ function draw_date_picker($prefix,$default='') {
$new_folder_text .= '<input type="button" name="create_dir" onClick="validate();" value="' . get_lang('Ok') . '"/>';
//new additional fields inside the "if condition" just to agroup
if(true):
$addtext .= '<div style="padding:10px">'.get_lang('Description').'<br /><textarea name="description" rows="4" cols="70"></textarea></div>';
$addtext = '<div style="padding:10px">'.get_lang('Description').'<br /><textarea name="description" rows="4" cols="70"></textarea></div>';
$addtext .= '<div style="padding:10px">';
$addtext .= '<fieldset style="padding:5px"><legend>'.get_lang('QualificationOfAssignment').'</legend>';
$addtext .= make_checkbox('make_calification').get_lang('MakeQualifiable').'<br />';
@ -1187,27 +1190,32 @@ if ($cur_dir_path == '/') {
}
if (!$display_upload_form && !$display_tool_options) {
$add_query = '';
if(!$is_allowed_to_edit && $is_special==true) {
$add_query = ' AND author = '."'".$_user['firstName'].' '.$_user['lastName']."' ";
}
if($is_allowed_to_edit && $is_special==true) {
switch($_REQUEST['filter']) {
case 1:
$add_query = ' AND qualification = '."''";
break;
case 2:
$add_query = ' AND qualification != '."''";
break;
case 3:
$add_query = ' AND sent_date < '."'".$homework['expires_on']."'";
break;
default:
$add_query = '';
if (isset($_REQUEST['filter'])) {
switch($_REQUEST['filter']) {
case 1:
$add_query = ' AND qualification = '."''";
break;
case 2:
$add_query = ' AND qualification != '."''";
break;
case 3:
$add_query = ' AND sent_date < '."'".$homework['expires_on']."'";
break;
default:
$add_query = '';
}
}
$form_filter = '<form method="post" action="'.api_get_self().'?cidReq='.Security::Remove_XSS($_GET['cidreq']).'&curdirpath='.Security::Remove_XSS($_GET['curdirpath']).'">';
$form_filter .= make_select('filter',array(0=>get_lang('SelectAFilter'),1=>get_lang('FilterByNotRevised'),2=>get_lang('FilterByRevised'),3=>get_lang('FilterByNotExpired')),(int)$_REQUEST['filter']);
isset($_GET['cidreq'])?$cidreq = Security::Remove_XSS($_GET['cidreq']):$cidreq='';
isset($_GET['curdirpath'])?$curdirpath = Security::Remove_XSS($_GET['curdirpath']):$curdirpath='';
isset($_REQUEST['filter'])?$filter = (int)$_REQUEST['filter']:$filter='';
$form_filter = '<form method="post" action="'.api_get_self().'?cidReq='.$cidreq.'&curdirpath='.$curdirpath.'">';
$form_filter .= make_select('filter',array(0=>get_lang('SelectAFilter'),1=>get_lang('FilterByNotRevised'),2=>get_lang('FilterByRevised'),3=>get_lang('FilterByNotExpired')),$filter);
$form_filter .= '<input type="submit" value="'.get_lang('FilterAssigments').'"</form>';
echo $form_filter;
}

Loading…
Cancel
Save