diff --git a/main/forum/editpost.php b/main/forum/editpost.php index 1e78875541..1e933b85d1 100644 --- a/main/forum/editpost.php +++ b/main/forum/editpost.php @@ -231,11 +231,13 @@ if (!api_is_allowed_to_edit() AND $current_forum['allow_edit']==0) { // action links -echo '
'.get_lang("NewChapter").'';
- echo '
'.get_lang("NewStep").'';
+ echo ''.Display::return_icon('learnpath_organize.gif').' '.get_lang("BasicOverview").'';
+ echo ''.Display::return_icon('learnpath_view.gif').' '.get_lang('Display').'';
+ echo '
'.get_lang("NewChapter").'';
+ echo '
'.get_lang("NewStep").'';
echo '
'.get_lang('CreateAssignment').' ';
@@ -436,7 +436,7 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou
$form_folder -> addElement('html',' ');
@@ -614,7 +614,7 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou
$show_as_icon = get_work_id($mydir); //true or false
if ($show_as_icon) {
- $row[] = '
';
+ '&curdirpath='.$my_sub_dir.'&origin='.$origin.'&gradebook='.Security::remove_XSS($_GET['gradebook']).'&edit_dir='.$mydir.'">
';
$action .= '
';
$row[] = $action;
} else {
@@ -691,7 +691,7 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou
if( $is_allowed_to_edit) {
$action = '';
- $action .= '
';
+ $action .= '
';
$action .= '
';
$action .= '
';
if($work->accepted == '1') {
@@ -703,7 +703,7 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou
$row[] = $action;
} elseif($is_author) {
$action = '';
- $action .= '
';
+ $action .= '
';
$action .= '
';
$row[] = $action;
diff --git a/main/work/work.php b/main/work/work.php
index cbc11ceb9d..6f84fa2a41 100644
--- a/main/work/work.php
+++ b/main/work/work.php
@@ -1,4 +1,4 @@
-, 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 20124 2009-04-27 16:16:59Z juliomontoya $
+* @version $Id: work.php 20164 2009-04-28 21:02:46Z cvargas1 $
*
* @todo refactor more code into functions, use quickforms, coding standards, ...
*/
@@ -247,7 +247,7 @@ if(isset($_GET['action']) && $_GET['action']=="downloadfolder")
Header
-----------------------------------------------------------
*/
-isset($_GET['gradebook'])?$gradebook=$_GET['gradebook']:$gradebook='';
+isset($_GET['gradebook'])?$gradebook=Security::remove_XSS($_GET['gradebook']):$gradebook='';
if (!empty($_SESSION['toolgroup'])){
$_clean['toolgroup']=(int)$_SESSION['toolgroup'];
@@ -316,7 +316,6 @@ if (!empty($_SESSION['toolgroup'])){
}
$url_dir ='';
$interbreadcrumb[] = array ('url' => $url_dir,'name' => get_lang('StudentPublications'));
-
//if (!$display_tool_options && !$display_upload_form)
//{
//------interbreadcrumb for the current directory root path
@@ -1109,7 +1108,7 @@ if ($is_course_member) {
//require_once (api_get_path(LIBRARY_PATH) . 'formvalidator/FormValidator.class.php');
require_once (api_get_path(LIBRARY_PATH) . 'fileDisplay.lib.php');
- $form = new FormValidator('form', 'POST', api_get_self() . "?curdirpath=" . rtrim(Security :: remove_XSS($cur_dir_path),'/') . "&gradebook=".$_GET['gradebook']."&origin=$origin", '', 'enctype="multipart/form-data"');
+ $form = new FormValidator('form', 'POST', api_get_self() . "?curdirpath=" . rtrim(Security :: remove_XSS($cur_dir_path),'/') . "&gradebook=".Security::remove_XSS($_GET['gradebook'])."&origin=$origin", '', 'enctype="multipart/form-data"');
// form title
if ($edit)
@@ -1190,7 +1189,7 @@ if ($is_course_member) {
}
if (!empty($_POST['submitWork']) || $edit) {
- $form->addElement('submit', 'cancelForm', get_lang('Cancel'));
+ $form->addElement('style_submit_button', 'cancelForm', get_lang('Cancel'),'class="cancel"');
}
$form->add_real_progress_bar('uploadWork', 'DownloadFile');