From 4c88645920fab4e76fd265174843b4c1bcf022c5 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Thu, 24 May 2012 16:05:30 +0800 Subject: [PATCH] MDL-33173 Filepicker: renamed private files edit page to main page --- blocks/private_files/block_private_files.php | 2 +- lib/navigationlib.php | 2 +- user/files.php | 36 +++++++--- user/{filesedit_form.php => files_form.php} | 2 +- user/filesedit.php | 74 -------------------- 5 files changed, 31 insertions(+), 85 deletions(-) rename user/{filesedit_form.php => files_form.php} (97%) delete mode 100644 user/filesedit.php diff --git a/blocks/private_files/block_private_files.php b/blocks/private_files/block_private_files.php index 594f27600f5..bf4cc89c10b 100644 --- a/blocks/private_files/block_private_files.php +++ b/blocks/private_files/block_private_files.php @@ -62,7 +62,7 @@ class block_private_files extends block_base { $renderer = $this->page->get_renderer('block_private_files'); $this->content->text = $renderer->private_files_tree(); if (has_capability('moodle/user:manageownfiles', $this->context)) { - $this->content->text .= $OUTPUT->single_button(new moodle_url('/user/filesedit.php', array('returnurl'=>$PAGE->url->out())), get_string('myfilesmanage'), 'get'); + $this->content->text .= $OUTPUT->single_button(new moodle_url('/user/files.php', array('returnurl'=>$PAGE->url->out())), get_string('myfilesmanage'), 'get'); } $this->content->footer = ''; diff --git a/lib/navigationlib.php b/lib/navigationlib.php index 059e3a4738a..d24b735436d 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -2324,7 +2324,7 @@ class global_navigation extends navigation_node { $context = get_context_instance(CONTEXT_USER, $USER->id); if ($iscurrentuser && has_capability('moodle/user:manageownfiles', $context)) { - $url = new moodle_url('/user/filesedit.php'); + $url = new moodle_url('/user/files.php'); $usernode->add(get_string('myfiles'), $url, self::TYPE_SETTING); } diff --git a/user/files.php b/user/files.php index 4bc2ba618ff..a5a49b9a124 100644 --- a/user/files.php +++ b/user/files.php @@ -16,22 +16,33 @@ // along with Moodle. If not, see . /** - * View private user files + * Manage files in folder in private area. * - * @package moodlecore + * @package moodle * @copyright 2010 Petr Skoda (http://skodak.org) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ require('../config.php'); +require_once("$CFG->dirroot/user/files_form.php"); +require_once("$CFG->dirroot/repository/lib.php"); require_login(); if (isguestuser()) { die(); } +$returnurl = optional_param('returnurl', '', PARAM_URL); +$returnbutton = true; + +if (empty($returnurl)) { + $returnbutton = false; + $returnurl = new moodle_url('/user/files.php'); +} + $context = get_context_instance(CONTEXT_USER, $USER->id); require_capability('moodle/user:manageownfiles', $context); + $title = get_string('myfiles'); $struser = get_string('user'); @@ -42,13 +53,22 @@ $PAGE->set_heading($title); $PAGE->set_pagelayout('mydashboard'); $PAGE->set_pagetype('user-files'); +$data = new stdClass(); +$data->returnurl = $returnurl; +$options = array('subdirs'=>1, 'maxbytes'=>$CFG->userquota, 'maxfiles'=>-1, 'accepted_types'=>'*'); +file_prepare_standard_filemanager($data, 'files', $options, $context, 'user', 'private', 0); + +$mform = new user_files_form(null, array('data'=>$data, 'options'=>$options, 'cancelbutton'=>$returnbutton)); + +if ($mform->is_cancelled()) { + redirect($returnurl); +} else if ($formdata = $mform->get_data()) { + $formdata = file_postupdate_standard_filemanager($formdata, 'files', $options, $context, 'user', 'private', 0); + redirect($returnurl); +} + echo $OUTPUT->header(); echo $OUTPUT->box_start('generalbox'); - -$renderer = $PAGE->get_renderer('core', 'user'); -echo $renderer->user_files_tree(); - -echo $OUTPUT->single_button(new moodle_url('/user/filesedit.php'), get_string('myfilesmanage'), 'get'); - +$mform->display(); echo $OUTPUT->box_end(); echo $OUTPUT->footer(); diff --git a/user/filesedit_form.php b/user/files_form.php similarity index 97% rename from user/filesedit_form.php rename to user/files_form.php index 13cc0418c3e..535105607c2 100644 --- a/user/filesedit_form.php +++ b/user/files_form.php @@ -27,7 +27,7 @@ defined('MOODLE_INTERNAL') || die(); require_once("$CFG->libdir/formslib.php"); -class user_filesedit_form extends moodleform { +class user_files_form extends moodleform { function definition() { $mform = $this->_form; diff --git a/user/filesedit.php b/user/filesedit.php deleted file mode 100644 index 22c61235f6b..00000000000 --- a/user/filesedit.php +++ /dev/null @@ -1,74 +0,0 @@ -. - -/** - * Manage files in folder in private area. - * - * @package moodle - * @copyright 2010 Petr Skoda (http://skodak.org) - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - -require('../config.php'); -require_once("$CFG->dirroot/user/filesedit_form.php"); -require_once("$CFG->dirroot/repository/lib.php"); - -require_login(); -if (isguestuser()) { - die(); -} - -$returnurl = optional_param('returnurl', '', PARAM_URL); -$returnbutton = true; - -if (empty($returnurl)) { - $returnbutton = false; - $returnurl = new moodle_url('/user/filesedit.php'); -} - -$context = get_context_instance(CONTEXT_USER, $USER->id); -require_capability('moodle/user:manageownfiles', $context); - -$title = get_string('myfiles'); -$struser = get_string('user'); - -$PAGE->set_url('/user/filesedit.php'); -$PAGE->set_context($context); -$PAGE->set_title($title); -$PAGE->set_heading($title); -$PAGE->set_pagelayout('mydashboard'); -$PAGE->set_pagetype('user-files'); - -$data = new stdClass(); -$data->returnurl = $returnurl; -$options = array('subdirs'=>1, 'maxbytes'=>$CFG->userquota, 'maxfiles'=>-1, 'accepted_types'=>'*'); -file_prepare_standard_filemanager($data, 'files', $options, $context, 'user', 'private', 0); - -$mform = new user_filesedit_form(null, array('data'=>$data, 'options'=>$options, 'cancelbutton'=>$returnbutton)); - -if ($mform->is_cancelled()) { - redirect($returnurl); -} else if ($formdata = $mform->get_data()) { - $formdata = file_postupdate_standard_filemanager($formdata, 'files', $options, $context, 'user', 'private', 0); - redirect($returnurl); -} - -echo $OUTPUT->header(); -echo $OUTPUT->box_start('generalbox'); -$mform->display(); -echo $OUTPUT->box_end(); -echo $OUTPUT->footer();