moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

"MDL-17316, fix upload form in non-js file picker"

Browse source
This commit is contained in:
dongsheng 2009-06-18 06:31:51 +00:00
parent b556308033
commit ab9cdbb976
6 changed files with 41 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

29
repository/filepicker.php
View file

@ -62,6 +62,9 @@ if (file_exists($CFG->dirroot.'/repository/'.$type.'/repository.class.php')) {
//$PAGE->set_course($context);
switch ($action) {
case 'upload':
redirect($url, get_string('uploadsucc','repository'));
break;
case 'deletedraft':
if (!$context = get_context_instance(CONTEXT_USER, $USER->id)) {
print_error('wrongcontextid', 'error');
@ -85,9 +88,11 @@ case 'sign':
$list = $repo->get_listing($req_path);
$dynload = !empty($list['dynload'])?true:false;
if (!empty($list['upload'])) {
echo '<form method="post" style="display:inline">';
echo '<label>'.$list['upload']['label'].'</label>';
echo '<form action="'.$url.'" method="post" enctype="multipart/form-data" style="display:inline">';
echo '<label>'.$list['upload']['label'].': </label>';
echo '<input type="file" name="repo_upload_file" /><br />';
echo '<input type="hidden" name="action" value="upload" /><br />';
echo '<input type="hidden" name="repo_id" value="'.$repo_id.'" /><br />';
echo '<input type="submit" value="'.get_string('upload', 'repository').'" />';
echo '</form>';
} else {
@ -194,6 +199,17 @@ case 'confirm':
echo '</form>';
print_footer('empty');
break;
case 'plugins':
$user_context = get_context_instance(CONTEXT_USER, $USER->id);
$repos = repository::get_instances(array($user_context, get_system_context()), null, true, null, '*', 'ref_id');
print_header();
echo '<div><ul>';
foreach($repos as $repo) {
$info = $repo->get_meta();
echo '<li><img src="'.$info->icon.'" width="16px" height="16px"/> <a href="'.$url.'&action=list&repo_id='.$info->id.'">'.$info->name.'</a></li>';
}
echo '</ul></div>';
break;
default:
$user_context = get_context_instance(CONTEXT_USER, $USER->id);
$repos = repository::get_instances(array($user_context, get_system_context()), null, true, null, '*', 'ref_id');
@ -201,7 +217,6 @@ default:
$fs = get_file_storage();
$context = get_context_instance(CONTEXT_USER, $USER->id);
$files = $fs->get_area_files($context->id, 'user_draft', $itemid);
echo '<h2>'.get_string('attachedfiles', 'repository').'</h2>';
if (empty($files)) {
echo get_string('nofilesattached', 'repository');
} else {
@ -215,13 +230,7 @@ default:
}
echo '</ul>';
}
echo '<h2>'.get_string('plugin', 'repository').'</h2>';
echo '<div><ul>';
foreach($repos as $repo) {
$info = $repo->get_meta();
echo '<li><img src="'.$info->icon.'" width="16px" height="16px"/> <a href="'.$url.'&action=list&repo_id='.$info->id.'">'.$info->name.'</a></li>';
}
echo '</ul></div>';
echo '<div><a href="'.$url.'&action=plugins">'.get_string('add', 'repository').'</a></div>';
print_footer('empty');
break;
}

3
repository/repository.src.js
View file

@ -571,7 +571,8 @@ repository_client.select_file = function(oldname, url, icon, client_id, repo_id)
if (repository_client.files[client_id] == undefined) {
repository_client.files[client_id] = 0;
}
if (repository_client.files[client_id] >= repository_client.fp[client_id].maxfiles)
if (repository_client.files[client_id] >= repository_client.fp[client_id].maxfiles &&
repository_client.fp[client_id].maxfiles != -1)
{
alert('Only '+repository_client.fp[client_id].maxfiles+' files are allowed!');
return false;

2
repository/upload/repository.class.php
View file

@ -19,7 +19,7 @@ class repository_upload extends repository {
* @param array $options
*/
public function __construct($repositoryid, $context = SITEID, $options = array()){
global $SESSION, $action, $CFG;
global $_FILES, $SESSION, $action, $CFG;
parent::__construct($repositoryid, $context, $options);
$itemid = optional_param('itemid', '', PARAM_INT);
if($action=='upload'){