Changeset 839

Timestamp:

01/19/07 15:15:17 (2 years ago)

Author:

ben

Message:

Folder editing fix.

Files:

• devel/mod/file/lib.php (modified) (1 diff)
• devel/units/files/files_actions.php (modified) (7 diffs)

devel/mod/file/lib.php

@@ -101 +101 @@
-                        $edit = __gettext("Edit"); // gettext variable
-                        $folder->identmenu = <<< END
-
+&amp;return_type=parent
-            [<a href="{$CFG->wwwroot}_files/action_redirection.php?action=delete_folder&amp;delete_folder_id={$folder->ident_details->ident}" onclick="return confirm('$areyouSure')">$delete</a>]
-        

devel/units/files/files_actions.php

@@ -46 +46 @@
-            $ul_username = user_info('username', $page_owner);
-            if (empty($copyright)) {
-url
+$CFG->wwwroot
-                if ($folderid > -1) {
-                    $redirect_url .= $folderid;
@@ -99 +99 @@
-            }
-            
-url
+$CFG->wwwroot
-            if ($folderid > -1) {
-                $redirect_url .= $folderid;
@@ -127 +127 @@
-                    insert_tags_from_string ($file_keywords, 'file', $f->ident, $f->access, $USER->ident);
-                    plugin_hook("file","republish",$file_info);
-url
+$CFG->wwwroot
-                    if ($f->folder != -1) {
-                        $redirect_url .= $f->folder;
@@ -143 +143 @@
-    case "edit_folder":
-        $f = new StdClass;
+        $return_type = trim(optional_param('return_type','same'));
-        $f->ident = optional_param('edit_folder_id',0,PARAM_INT);
-        $f->name = trim(optional_param('edit_folder_name'));
@@ -159 +160 @@
-                        plugin_hook("folder","updated",$f);
-                        $messages[] = __gettext("The folder was edited.");
+                        if ($return_type == "same") {
+                            $return_url = $CFG->wwwroot . user_info("username",$edit_owner) . "/files/" . $f->ident;
+                        } else {
+                            $return_url = $CFG->wwwroot . user_info("username",$edit_owner) . "/files/";
+                            if ($f->parent > -1) {
+                                $return_url .= $f->parent;
+                            }
+                        }
+                        $_SESSION['messages'] = $messages;
+                        header("Location: $return_url");
+                        exit;
-                    }
-                } else {
@@ -182 +194 @@
-                }
-                global $redirect_url;
-url
+$CFG->wwwroot
-                if ($folder->parent > -1) {
-                    $redirect_url .= $folder->parent;
@@ -205 +217 @@
-                    delete_records('tags','tagtype','file','ref',$id);
-                }
-url
+$CFG->wwwroot
-                if ($file->folder > -1) {
-                    $redirect_url .= $file->folder;