Permalink
Browse files

MDL-33173 Filepicker: renamed private files edit page to main page

  • Loading branch information...
1 parent 5a5cdaf commit 4c88645920fab4e76fd265174843b4c1bcf022c5 @FMCorz FMCorz committed May 24, 2012
@@ -62,7 +62,7 @@ function get_content() {
$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 = '';
View
@@ -2324,7 +2324,7 @@ protected function load_for_user($user=null, $forceforcontext=false) {
$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);
}
View
@@ -16,22 +16,33 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * 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_pagelayout('mydashboard');
$PAGE->set_pagetype('user-files');
-echo $OUTPUT->header();
-echo $OUTPUT->box_start('generalbox');
+$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);
-$renderer = $PAGE->get_renderer('core', 'user');
-echo $renderer->user_files_tree();
+$mform = new user_files_form(null, array('data'=>$data, 'options'=>$options, 'cancelbutton'=>$returnbutton));
-echo $OUTPUT->single_button(new moodle_url('/user/filesedit.php'), get_string('myfilesmanage'), 'get');
+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();
@@ -27,7 +27,7 @@
require_once("$CFG->libdir/formslib.php");
-class user_filesedit_form extends moodleform {
+class user_files_form extends moodleform {
function definition() {
$mform = $this->_form;
View
@@ -1,74 +0,0 @@
-<?php
-
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * 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();

0 comments on commit 4c88645

Please sign in to comment.