diff --git a/main/dropbox/dropbox_functions.inc.php b/main/dropbox/dropbox_functions.inc.php index de67ab6775..5dfd1f829c 100644 --- a/main/dropbox/dropbox_functions.inc.php +++ b/main/dropbox/dropbox_functions.inc.php @@ -121,12 +121,14 @@ function delete_category($action, $id) $sentreceived='received'; $entries_table=$dropbox_cnf['tbl_post']; $id_field='file_id'; + $return_message = get_lang('ReceivedCatgoryDeleted'); } elseif ($action=='deletesentcategory') { $sentreceived='sent'; $entries_table=$dropbox_cnf['tbl_file']; $id_field='id'; + $return_message = get_lang('SentCatgoryDeleted'); } else { @@ -153,6 +155,7 @@ function delete_category($action, $id) $dropboxfile->deleteSentWork($row[$id_field]); } } + return $return_message; } /** @@ -372,7 +375,7 @@ function store_addcategory() // check if the category name is valid if ($_POST['category_name']=='') { - return get_lang('ErrorPleaseGiveCategoryName'); + return array('type' => 'error', 'message'=>get_lang('ErrorPleaseGiveCategoryName')); } if (!$_POST['edit_id']) @@ -388,11 +391,11 @@ function store_addcategory() $sql="INSERT INTO ".$dropbox_cnf['tbl_category']." (cat_name, received, sent, user_id) VALUES ('".Database::escape_string(Security::remove_XSS($_POST['category_name']))."', '".Database::escape_string($received)."', '".Database::escape_string($sent)."', '".Database::escape_string($_user['user_id'])."')"; api_sql_query($sql); - return get_lang('CategoryStored'); + return array('type' => 'confirmation', 'message'=>get_lang('CategoryStored')); } else { - return get_lang('CategoryAlreadyExistsEditIt'); + return array('type' => 'error', 'message'=>get_lang('CategoryAlreadyExistsEditIt')); } } else @@ -401,7 +404,7 @@ function store_addcategory() WHERE user_id='".Database::escape_string($_user['user_id'])."' AND cat_id='".Database::escape_string(Security::remove_XSS($_POST['edit_id']))."'"; api_sql_query($sql); - return get_lang('CategoryModified'); + return array('type' => 'confirmation', 'message'=>get_lang('CategoryModified')); } } @@ -414,7 +417,7 @@ function store_addcategory() * @author Patrick Cool , Ghent University * @version march 2006 */ -function display_addcategory_form($category_name='', $id='') +function display_addcategory_form($category_name='', $id='',$action) { global $dropbox_cnf; @@ -443,17 +446,17 @@ function display_addcategory_form($category_name='', $id='') } - if ($_GET['action']=='addreceivedcategory') { + if ($action=='addreceivedcategory') { $target='received'; } - if ($_GET['action']=='addsentcategory') { + if ($action=='addsentcategory') { $target='sent'; } - if ($_GET['action']=='editcategory') { + if ($action=='editcategory') { $text=get_lang('ModifyCategory'); $class='save'; - } else if ($_GET['action']=='addreceivedcategory' or $_GET['action']=='addsentcategory') { + } else if ($action=='addreceivedcategory' or $action=='addsentcategory') { $text=get_lang('CreateCategory'); $class='add'; } @@ -464,16 +467,25 @@ function display_addcategory_form($category_name='', $id='') { echo ''; } + echo ''; echo ''; echo '
'.$title.'
'; echo '
- *'.get_lang('CategoryName').' + * '.get_lang('CategoryName').'
-
- +
'; + if ($_POST AND empty($_POST['category_name'])) + { + echo ''.get_lang('ThisFieldIsRequired').'. '.get_lang('ErrorPleaseGiveCategoryName').'
'; + } + if ($_POST AND !empty($_POST['category_name'])) + { + echo ''.get_lang('CategoryAlreadyExistsEditIt').'
'; + } + echo '
'; @@ -484,6 +496,13 @@ function display_addcategory_form($category_name='', $id='')
'; + echo '
+
+
+
+ * '.get_lang('ThisFieldIsRequired').' +
+
'; echo ""; echo '
'; } diff --git a/main/dropbox/index.php b/main/dropbox/index.php index 921fe608f6..58c22a5f7c 100644 --- a/main/dropbox/index.php +++ b/main/dropbox/index.php @@ -149,19 +149,29 @@ if (isset($_POST['submitWork'])) { // *** display the form for adding a category *** if ($_GET['action']=="addreceivedcategory" or $_GET['action']=="addsentcategory") { - display_addcategory_form($_POST['category_name']); + display_addcategory_form($_POST['category_name'],'',$_GET['action']); } // *** editing a category: displaying the form *** if ($_GET['action']=='editcategory' and isset($_GET['id'])) { if (!$_POST) { - display_addcategory_form('',$_GET['id']); + display_addcategory_form('',$_GET['id'],'editcategory'); } } // *** storing a new or edited category *** if (isset($_POST['StoreCategory'])) { - Display :: display_confirmation_message(store_addcategory()); + $return_information = store_addcategory(); + if( $return_information['type'] == 'confirmation') + { + Display :: display_confirmation_message($return_information['message']); + } + if( $return_information['type'] == 'error') + { + Display :: display_error_message(get_lang('FormHasErrorsPleaseComplete').'
'.$return_information['message']); + display_addcategory_form($_POST['category_name'],$_POST['edit_id'],$_POST['action']); + } + } // *** Move a File *** @@ -189,6 +199,7 @@ if (($_GET['action']=='deletereceivedfile' OR $_GET['action']=='deletesentfile') // *** Delete a category *** if (($_GET['action']=='deletereceivedcategory' OR $_GET['action']=='deletesentcategory') AND isset($_GET['id']) AND is_numeric($_GET['id'])) { $message=delete_category($_GET['action'], $_GET['id']); + Display :: display_confirmation_message($message); } // *** Do an action on multiple files *** @@ -247,10 +258,10 @@ if ( $_GET['view']=='received' OR $dropbox_cnf['sent_received_tabs']==false) { echo '
'; if ($view_dropbox_category_received<>0) { echo get_lang('CurrentlySeeing').': '.$dropbox_categories[$view_dropbox_category_received]['cat_name'].' '; - echo ''.get_lang('Up').''.get_lang('Root')."\n"; + echo ''.Display::return_icon('folder_up.gif',get_lang('Up')).' '.get_lang('Root')."\n"; $movelist[0] = 'Root'; // move_received selectbox content } else { - echo ' '.get_lang('AddNewCategory').''; + echo ''.Display::return_icon('folder_new.gif').' '.get_lang('AddNewCategory').''; } echo '
'; @@ -269,12 +280,12 @@ if (!$_GET['view'] OR $_GET['view']=='sent' OR $dropbox_cnf['sent_received_tabs' echo '
'; if ($view_dropbox_category_sent<>0) { echo get_lang('CurrentlySeeing').': '.$dropbox_categories[$view_dropbox_category_sent]['cat_name'].' '; - echo ''.get_lang('Up').''.get_lang('Root')."\n"; + echo ''.Display::return_icon('folder_up.gif',get_lang('Up')).' '.get_lang('Root')."\n"; } else { - echo " ".get_lang('AddNewCategory')."\n"; + echo "".Display::return_icon('folder_new.gif')." ".get_lang('AddNewCategory')."\n"; } if (empty($_GET['view_sent_category'])) { - echo " ".get_lang('UploadNewFile')." \n"; + echo "".Display::return_icon('folder_new.gif').' '.get_lang('UploadNewFile')." \n"; } echo '
'; } @@ -371,12 +382,12 @@ if ($_GET['view']=='received' OR $dropbox_cnf['sent_received_tabs']==false) { // new icon $new_icon=''; if ($dropbox_file->last_upload_date > $last_access AND !in_array($dropbox_file->id,$_SESSION['_seen'][$_course['id']][TOOL_DROPBOX])) { - $new_icon=' '.get_lang('New').''; + $new_icon=' '.Display::return_icon('new.gif', get_lang('New')); } $dropbox_file_data[]=build_document_icon_tag('file',$dropbox_file->title); - $dropbox_file_data[]=''.get_lang('Download').''.$dropbox_file->title.''.$new_icon.'
'.$dropbox_file->description; + $dropbox_file_data[]=''.Display::return_icon('filesave.gif', get_lang('Download'), array('style'=>'float:right;')).''.$dropbox_file->title.''.$new_icon.'
'.$dropbox_file->description; $dropbox_file_data[]=ceil(($dropbox_file->filesize)/1024).' '.get_lang('kB'); $dropbox_file_data[]=$dropbox_file->author; //$dropbox_file_data[]=$dropbox_file->description; @@ -384,11 +395,11 @@ if ($_GET['view']=='received' OR $dropbox_cnf['sent_received_tabs']==false) { $dropbox_file_data[]=date_to_str_ago($dropbox_file->last_upload_date).'
'.$dropbox_file->last_upload_date.''; $action_icons=check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').' - '.get_lang('Comment').' - '.get_lang('Move').' - '.get_lang('Delete').''; - //$action_icons=' '.get_lang('Move').' - // '.get_lang('Delete').''; + '.Display::return_icon('comment_bubble.gif',get_lang('Comment')).' + '.Display::return_icon('deplacer_fichier.gif',get_lang('Move')).' + '.Display::return_icon('delete.gif',get_lang('Delete')).''; + //$action_icons=' '.Display::return_icon('deplacer.gif',get_lang('Move')).' + // '.Display::return_icon('delete.gif',get_lang('Delete')).''; // this is a hack to have an additional row in a sortable table if ($_GET['action']=='viewfeedback' AND isset($_GET['id']) and is_numeric($_GET['id']) AND $dropbox_file->id==$_GET['id']) { @@ -415,12 +426,12 @@ if ($_GET['view']=='received' OR $dropbox_cnf['sent_received_tabs']==false) { $dropbox_category_data[]=$category['cat_id']; // this is where the checkbox icon for the files appear // the icon of the category $dropbox_category_data[]=build_document_icon_tag('folder',$category['cat_name']); - $dropbox_category_data[]=''.get_lang('Save').''.$category['cat_name'].''; + $dropbox_category_data[]=''.Display::return_icon('folder_zip.gif',get_lang('Save'),array('width'=>'16px', 'height'=>'16px', 'style'=>'float:right;')).''.$category['cat_name'].''; $dropbox_category_data[]=''; $dropbox_category_data[]=''; $dropbox_category_data[]=''; - $dropbox_category_data[]=''.get_lang('Edit').' - '.get_lang('Delete').''; + $dropbox_category_data[]=''.Display::return_icon('edit.gif',get_lang('Edit')).' + '.Display::return_icon('delete.gif',get_lang('Delete')).''; } if (is_array($dropbox_category_data) && count($dropbox_category_data)>0) { $dropbox_data_recieved[]=$dropbox_category_data; @@ -509,7 +520,7 @@ if (!$_GET['view'] OR $_GET['view']=='sent' OR $dropbox_cnf['sent_received_tabs' if ($view_dropbox_category_sent==$dropbox_file->category) { $dropbox_file_data[]=$dropbox_file->id; $dropbox_file_data[]=build_document_icon_tag('file',$dropbox_file->title); - $dropbox_file_data[]=''.get_lang('Save').''.$dropbox_file->title.'
'.$dropbox_file->description; + $dropbox_file_data[]=''.Display::return_icon('filesave.gif',get_lang('Save'), array('style'=>'float:right;')).''.$dropbox_file->title.'
'.$dropbox_file->description; $dropbox_file_data[]=ceil(($dropbox_file->filesize)/1024).' '.get_lang('kB'); foreach ($dropbox_file->recipients as $recipient) { $receivers_celldata=display_user_link($recipient['user_id'], $recipient['name']).', '.$receivers_celldata; @@ -520,9 +531,9 @@ if (!$_GET['view'] OR $_GET['view']=='sent' OR $dropbox_cnf['sent_received_tabs' //$dropbox_file_data[]=$dropbox_file->author; $receivers_celldata=''; $action_icons=check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').' - '.get_lang('Comment').' - '.get_lang('Move').' - '.get_lang('Delete').''; + '.Display::return_icon('comment_bubble.gif',get_lang('Comment')).' + '.Display::return_icon('deplacer_fichier.gif',get_lang('Move')).' + '.Display::return_icon('delete.gif',get_lang('Delete')).''; // this is a hack to have an additional row in a sortable table if ($_GET['action']=='viewfeedback' AND isset($_GET['id']) and is_numeric($_GET['id']) AND $dropbox_file->id==$_GET['id']) { $action_icons.="\n"; // ending the normal row of the sortable table @@ -543,14 +554,14 @@ if (!$_GET['view'] OR $_GET['view']=='sent' OR $dropbox_cnf['sent_received_tabs' if ($category['sent']=='1') { $dropbox_category_data[]=$category['cat_id']; // this is where the checkbox icon for the files appear $dropbox_category_data[]=build_document_icon_tag('folder',$category['cat_name']); - $dropbox_category_data[]=''.get_lang('Save').''.$category['cat_name'].''; + $dropbox_category_data[]=''.Display::return_icon('folder_zip.gif',get_lang('Save'),array('width'=>'16px', 'height'=>'16px', 'style'=>'float:right;')).''.$category['cat_name'].''; //$dropbox_category_data[]=''; $dropbox_category_data[]=''; //$dropbox_category_data[]=''; $dropbox_category_data[]=''; $dropbox_category_data[]=''; - $dropbox_category_data[]=''.get_lang('Edit').' - '.get_lang('Delete').''; + $dropbox_category_data[]=''.Display::return_icon('edit.gif',get_lang('Edit')).' + '.Display::return_icon('delete.gif',get_lang('Delete')).''; } if (is_array($dropbox_category_data) && count($dropbox_category_data)>0) { $dropbox_data_sent[]=$dropbox_category_data;