Skip to content

Commit

Permalink
MDL-22991 improved copy_to_area api
Browse files Browse the repository at this point in the history
  • Loading branch information
@skodak
skodak committed Jul 26, 2010
1 parent 4277133 commit 3b61c7e
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions repository/local/lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,13 @@ public function supported_returntypes() {
*
* @global object $USER
* @global object $DB
* @param string $encoded The metainfo of file, it is base64 encoded php seriablized data
* @param string $encoded The metainfo of file, it is base64 encoded php serialized data
* @param string $draftitemid itemid
* @param string $new_filename The intended name of file
* @param string $new_itemid itemid
* @param string $new_filepath the new path in draft area
* @return array The information of file
*/
public function copy_to_area($encoded, $new_filearea='draft', $new_itemid = '', $new_filepath = '/', $new_filename = '') {
public function copy_to_area($encoded, $draftitemid, $new_filepath, $new_filename) {
global $USER, $DB;
$info = array();

Expand All @@ -201,9 +201,9 @@ public function copy_to_area($encoded, $new_filearea='draft', $new_itemid = '',
$context = get_context_instance_by_id($contextid);

$file_info = $browser->get_file_info($context, $component, $filearea, $fileitemid, $filepath, $filename);
$file_info->copy_to_storage($user_context->id, 'user', 'draft', $new_itemid, $new_filepath, $new_filename);
$file_info->copy_to_storage($user_context->id, 'user', 'draft', $draftitemid, $new_filepath, $new_filename);

$info['itemid'] = $new_itemid;
$info['itemid'] = $draftitemid;
$info['title'] = $new_filename;
$info['contextid'] = $user_context->id;
$info['filesize'] = $file_info->get_filesize();
Expand Down
12 changes: 6 additions & 6 deletions repository/recent/lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,13 @@ public function supported_returntypes() {
*
* @global object $USER
* @global object $DB
* @param string $encoded The information of file, it is base64 encoded php seriablized data
* @param string $encoded The information of file, it is base64 encoded php serialized data
* @param string $draftitemid itemid
* @param string $new_filename The intended name of file
* @param string $new_itemid itemid
* @param string $new_filepath the new path in draft area
* @return array The information of file
*/
public function copy_to_area($encoded, $new_filearea='draft', $new_itemid = '', $new_filepath = '/', $new_filename = '') {
public function copy_to_area($encoded, $draftitemid, $new_filepath, $new_filename) {
global $USER, $DB;

$user_context = get_context_instance(CONTEXT_USER, $USER->id);
Expand Down Expand Up @@ -186,16 +186,16 @@ public function copy_to_area($encoded, $new_filearea='draft', $new_itemid = '',
throw new moodle_exception('errornotyourfile', 'repository');
}
$file_record = array('contextid'=>$user_context->id, 'component'=>'user', 'filearea'=>'draft',
'itemid'=>$new_itemid, 'filepath'=>$new_filepath, 'filename'=>$new_filename);
if ($file = $fs->get_file($user_context->id, 'user', 'draft', $new_itemid, $new_filepath, $new_filename)) {
'itemid'=>$draftitemid, 'filepath'=>$new_filepath, 'filename'=>$new_filename);
if ($file = $fs->get_file($user_context->id, 'user', 'draft', $draftitemid, $new_filepath, $new_filename)) {
$file->delete();
}
$fs->create_file_from_storedfile($file_record, $stored_file);
}

$info = array();
$info['title'] = $new_filename;
$info['itemid'] = $new_itemid;
$info['itemid'] = $draftitemid;
$info['filesize'] = $stored_file->get_filesize();
$info['contextid'] = $user_context->id;

Expand Down
2 changes: 1 addition & 1 deletion repository/repository_ajax.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
// local and recent plugins don't added new files to moodle, just add new records to database
// so we don't check user quota and maxbytes here
if (in_array($repo->options['type'], array('local', 'recent', 'user'))) {
$fileinfo = $repo->copy_to_area($source, 'draft', $itemid, $saveas_path, $saveas_filename);
$fileinfo = $repo->copy_to_area($source, $itemid, $saveas_path, $saveas_filename);
$info = array();
$info['file'] = $fileinfo['title'];
$info['id'] = $itemid;
Expand Down
10 changes: 5 additions & 5 deletions repository/user/lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,13 @@ public function supported_returntypes() {
*
* @global object $USER
* @global object $DB
* @param string $encoded The metainfo of file, it is base64 encoded php seriablized data
* @param string $encoded The metainfo of file, it is base64 encoded php serialized data
* @param string $draftitemid itemid
* @param string $new_filename The intended name of file
* @param string $new_itemid itemid
* @param string $new_filepath the new path in draft area
* @return array The information of file
*/
public function copy_to_area($encoded, $new_filearea='draft', $new_itemid = '', $new_filepath = '/', $new_filename = '') {
public function copy_to_area($encoded, $draftitemid, $new_filepath, $new_filename) {
global $USER, $DB;

$browser = get_file_browser();
Expand All @@ -164,10 +164,10 @@ public function copy_to_area($encoded, $new_filearea='draft', $new_itemid = '',

$context = get_context_instance_by_id($contextid);
$file_info = $browser->get_file_info($context, $component, $filearea, $fileitemid, $filepath, $filename);
$file_info->copy_to_storage($user_context->id, 'user', 'draft', $new_itemid, $new_filepath, $new_filename);
$file_info->copy_to_storage($user_context->id, 'user', 'draft', $draftitemid, $new_filepath, $new_filename);

$info = array();
$info['itemid'] = $new_itemid;
$info['itemid'] = $draftitemid;
$info['title'] = $new_filename;
$info['contextid'] = $user_context->id;
$info['filesize'] = $file_info->get_filesize();
Expand Down

0 comments on commit 3b61c7e

Please sign in to comment.