--- loncom/interface/lonwishlist.pm	2010/08/16 08:58:39	1.2
+++ loncom/interface/lonwishlist.pm	2010/08/20 10:38:41	1.7
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the wishlist
 #
-# $Id: lonwishlist.pm,v 1.2 2010/08/16 08:58:39 wenzelju Exp $
+# $Id: lonwishlist.pm,v 1.7 2010/08/20 10:38:41 wenzelju Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,7 +26,20 @@
 # http://www.lon-capa.org/
 #
 
+=pod
 
+=head1 NAME
+
+Apache::lonwishlist - Wishlist-Module
+  
+=head1 SYNOPSIS
+
+The wishlist offers a possibility to store links to resources from the resource-pool and external websites in a hierarchical list.
+It is only available for user with access to the resource-pool. The list can be structured by folders.
+
+The wishlist-module uses the CPAN-module "Tree" for easily handling the directory-structure of the wishlist. Each node in the tree has an index to be referenced by.
+
+=cut
 
 package Apache::lonwishlist;
 
@@ -49,6 +62,31 @@ my @allFolders;
 my @allNodes;
 my $indentConst = 20;
 
+=pod
+
+=head2 Routines for getting and putting the wishlist data from and accordingly to users data.
+
+=over 4
+
+=item * &getWishlist()
+
+     Get the wishlist-data via lonnet::dump() and returns the got data in a hash.
+
+
+=item * &putWishlist(wishlist)
+
+     Parameter is a reference to a hash. Puts the wishlist-data contained in the given hash via lonnet::put() to user-data.
+
+
+=item * &deleteWishlist()
+
+     Deletes all entries from the user-data for wishlist. Do this before putting in new data.
+
+
+=back
+
+=cut
+
 
 # Read wishlist from user-data
 sub getWishlist {
@@ -92,6 +130,57 @@ sub deleteWishlist {
 }
 
 
+=pod
+
+=head2 Routines for changing the directory struture of the wishlist.
+
+=over 4
+
+=item * &newEntry(title, path, note)
+
+     Creates a new entry in the wishlist containing the given informations. Additionally saves the date of creation in the entry.  
+
+
+=item * &deleteEntries(marked)
+
+     Parameter is a reference to an array containing the indices of all nodes that should be removed from the tree. 
+
+
+=item * &sortEntries(indexNode, at)
+
+     Changes the position of a node given by indexNode within its siblings. New position is given by at.
+
+
+=item * &moveEntries(indexNodesToMove, indexParent)
+
+     Parameter is a reference to an array containing the indices of all nodes that should be moved. indexParent specifies the node that will become the new Parent for these nodes. 
+
+
+=item * &setNewTitle(nodeindex, newTitle)
+
+     Sets the title for the node given by nodeindex to newTitle.
+
+
+=item * &setNewPath(nodeindex, newPath)
+
+     Sets the path for the node given by nodeindex to newPath.
+
+
+=item * &setNewNote(nodeindex, newNote)
+
+     Sets the note for the node given by nodeindex to newNote.     
+
+
+=item * &saveChanges()
+
+     Prepares the wishlist-hash to save it via &putWishlist(wishlist).   
+
+
+=back
+
+=cut
+
+
 # Create a new entry
 sub newEntry() {
     my ($title, $path, $note) = @_;
@@ -189,6 +278,20 @@ sub setNewTitle {
 }
 
 
+# Set a new path for an entry
+sub setNewPath {
+    my ($nodeindex, $newPath) = @_;
+    &getNodesToArray(\@childrenRt);
+    my $found = &Tree::getNodeByIndex($nodeindex, \@allNodes);
+    if ($found->value()->path()) {
+        $found->value()->path($newPath); 
+        return 1;
+    }
+    @allNodes = ();
+    return 0;
+}
+
+
 # Set a new note for an entry
 sub setNewNote {
     my ($nodeindex, $newNote) = @_;
@@ -212,6 +315,40 @@ sub saveChanges {
 }
 
 
+=pod
+
+=head2 Routines for handling the directory structure
+
+=over 4
+
+=item * &getFoldersForOption(nodes)
+
+     Return the titles for all exiting folders in an option-tag, used to offer the users a possibility to create a new link or folder in an existing folder.
+     Recursive call starting with all children of the root of the tree (parameter nodes is reference to an array containing the nodes of the current level). 
+
+
+=item * &getfoldersOption()
+
+     Returns the option-tag build by &getFoldersForOption(nodes). Use it to transfer this to other modules (e.g. lonmenu.pm). 
+
+
+=item * &getFoldersToArray(children)
+
+     Puts all nodes that represent folders in the wishlist into an array. 
+     Recursive call starting with all children of the root of the tree (parameter nodes is reference to an array containing the nodes of the current level).     
+
+
+=item * &getNodesToArray(children)
+
+     Puts all existing nodes into an array (apart from the root node, because this one does not represent an entry in the wishlist).
+     Recursive call starting with all children of the root of the tree (parameter nodes is reference to an array containing the nodes of the current level).     
+ 
+
+ =back
+
+=cut
+
+
 # Return the names for all exiting folders in option-tags, so
 # a new link or a new folder can be created in an existing folder
 my $indent = 0;
@@ -280,6 +417,67 @@ sub getNodesToArray {
 }
 
 
+=pod
+
+=head2 Routines for the user-interface of the wishlist
+
+=over 4
+
+=item * &JSforWishlist()
+
+     Returns JavaScript-functions needed for wishlist actions like open and close folders.
+
+
+=item * &wishlistView(nodes)
+
+     Returns the table-HTML-markup for the wishlist in mode "view".
+     Recursive call starting with all children of the root of the tree (parameter nodes is reference to an array containing the nodes of the current level).     
+
+
+=item * &wishlistEdit(nodes)
+
+     Returns the table-HTML-markup for the wishlist in mode "edit".
+     Recursive call starting with all children of the root of the tree (parameter nodes is reference to an array containing the nodes of the current level).     
+
+
+=item * &wishlistMove(nodes, marked)
+
+     Returns the table-HTML-markup for the wishlist in mode "move". Highlights all entry "selected to move" contained in marked (reference to array).
+     Recursive call starting with all children of the root of the tree (parameter nodes is reference to an array containing the nodes of the current level).     
+
+
+=item * &wishlistImport(nodes)
+
+     Returns the table-HTML-markup for the wishlist in mode "import".
+     Recursive call starting with all children of the root of the tree (parameter nodes is reference to an array containing the nodes of the current level).     
+ 
+
+=item * &makePage(mode, marked)
+
+     Returns the HTML-markup for the whole wishlist depending on mode. If mode is "move" we need the marked entries to be highlighted a "selected to move". 
+     Calls &wishlistView(nodes), &wishlistEdit(nodes) or &wishlistMove(nodes, marked).
+ 
+
+=item * &makePageSet()
+
+     Returns the HTML-Markup for the page shown when a link was set by using the icon when viewing a resource.
+
+
+=item * &makePageImport()
+
+     Returns the HTML-Markup for the page shown when links should be imported into courses.
+ 
+
+=item * &makeErrorPage ()
+
+     Returns the HTML-Markup for an error-page shown if the wishlist could not be loaded.
+ 
+
+=back
+
+=cut
+
+
 # Return a script-tag containing Javascript-function
 # needed for wishlist actions like 'new link' ect.
 sub JSforWishlist {
@@ -352,6 +550,17 @@ sub JSforWishlist {
     $inPageNewLink =~ s/\n//g;
     $inPageNewFolder =~ s/\n//g;
 
+    # it is checked, wether a path links to a LON-CAPA-resource or an external website. links to course-contents are not allowed
+    # because they probably will return a kind of 'no access' (unless the user is already in the course, the path links to).
+    # also importing these kind of links into a course does not make much sense.
+    # to find out if a path (not starting with /res/...) links to course-contents, the same filter as in lonwrapper is used,
+    # that means that it is checked wether a path contains .problem, .quiz, .exam etc.
+    # this is good for most cases but crashes as soon as a real external website contains one of this pattern in its URL.
+    # so maybe there's a better way to find out wether a given URL belongs to a LON-CAPA-server or not ...?
+    my $warningLinkNotAllowed1 = &mt('You can only insert links to LON-CAPA resources from the resource-pool '.
+                                    'or to external websites. Paths to LON-CAPA resources must be of the form /res/dom/usr... . '.
+                                    'Paths to external websites must contain the network protocol (e.g. http://...).');
+    my $warningLinkNotAllowed2 = &mt('The following link is not allowed: ');
     my $warningLink = &mt('You must insert a title and a path!');
     my $warningFolder = &mt('You must insert a title!');
     my $warningDelete = &mt('Are you sure you want to delete the selected entries? Deleting a folder also deletes all entries within this folder!');
@@ -370,6 +579,15 @@ sub JSforWishlist {
                               +'if (!path || !title) {'
                               +'alert("$warningLink");'
                               +'return false;}'
+                              +'var linkOK = (path.match(/^http:(\\\\/\\\\/)/) || path.match(/^https:(\\\\/\\\\/)/))'
+                              +'&& !(path.match(/\\.problem/) || path.match(/\\.exam/)'
+                              +'|| path.match(/\\.quiz/) || path.match(/\\.assess/)'
+                              +'|| path.match(/\\.survey/) || path.match(/\\.form/)'
+                              +'|| path.match(/\\.library/) || path.match(/\\.page/)'
+                              +'|| path.match(/\\.sequence/));'
+                              +'if (!path.match(/^(\\\\/res\\\\/)/) && !linkOK) {'
+                              +'alert("$warningLinkNotAllowed1");'
+                              +'return false;}'
                               +'else {'
                               +'window.close();'
                               +'return true;}}'
@@ -409,9 +627,18 @@ sub JSforWishlist {
             if (d) {
                 if (!confirm('$warningSave')) {
                     setAction('noSave');
+                    r = true;
+                }
+                else {
+                    r = linksOK();
                 }
             }
-            r = true;
+        }
+        else if (action == 'saveOK') {
+            r = linksOK();
+        }
+        else if (action == 'move') {
+            r = selectDestinationFolder();
         }
         document.getElementsByName('list')[0].setAttribute("action", "/adm/wishlist?mode="+mode); 
         if (r) {
@@ -433,6 +660,15 @@ sub JSforWishlist {
                 return true;
             }
         }
+        var newpath = document.getElementsByName('newpath');
+        var i = 0;
+        for (i=0;i<newpath.length;i++) {
+            var newp = newpath[i].value;
+            var oldp = newpath[i].alt;
+            if (newp != oldp) {
+                return true;
+            }
+        }
         var newnote = document.getElementsByName('newnote');
         var i = 0;
         for (i=0;i<newnote.length;i++) {
@@ -445,6 +681,25 @@ sub JSforWishlist {
         return false;
     }
 
+    function linksOK() {
+        var newpath = document.getElementsByName('newpath');
+        var i = 0;
+        for (i=0;i<newpath.length;i++) {
+            var path = newpath[i].value;
+            var linkOK = (path.match(/^http:\\/\\//) || path.match(/^https:\\/\\//))
+                         && !(path.match(/\\.problem/) || path.match(/\\.exam/)
+                         || path.match(/\\.quiz/) || path.match(/\\.assess/)
+                         || path.match(/\\.survey/) || path.match(/\\.form/)
+                         || path.match(/\\.library/) || path.match(/\\.page/)
+                         || path.match(/\\.sequence/));
+            if (!path.match(/^(\\/res\\/)/) && !linkOK) {
+                alert("$warningLinkNotAllowed1 $warningLinkNotAllowed2"+path);
+                return false;
+            }
+         }
+        return true;
+    }
+
     function onLoadAction(mode) {
         window.name = 'wishlist';
         if (mode == "edit") {
@@ -801,24 +1056,16 @@ sub JSforWishlist {
     }
 
     function preview(url) {
-       var newWin = window.open(url+'?inhibitmenu=yes','preview','width=560,height=350,scrollbars=yes');
+       var newWin;
+       if (!(url.match(/^http:\\/\\//) || url.match(/^https:\\/\\//))) {
+           newWin = window.open(url+'?inhibitmenu=yes','preview','width=560,height=350,scrollbars=yes');
+       }
+       else {
+           newWin = window.open(url,'preview','width=560,height=350,scrollbars=yes');
+       }
        newWin.focus();
     }
 
-    function finish_import() {
-        opener.document.forms.simpleedit.importdetail.value='';
-        for (var num = 0; num < document.forms.groupsort.fnum.value; num++) {
-            if (eval("document.forms.groupsort.check"+num+".checked") && eval("document.forms.groupsort.filelink"+num+".value") != '') {
-                opener.document.forms.simpleedit.importdetail.value+='&'+
-                eval("document.forms.groupsort.title"+num+".value")+'='+
-                eval("document.forms.groupsort.filelink"+num+".value")+'='+
-                eval("document.forms.groupsort.id"+num+".value");
-            }
-        }
-        opener.document.forms.simpleedit.submit();
-        self.close();
-    }
-
     function checkAll() {
         var checkboxes = document.getElementsByName('check');
         for (var i = 0; i < checkboxes.length; i++) {
@@ -837,6 +1084,68 @@ JAVASCRIPT
    return $js;
 }
 
+sub JSforImport{
+    my $rat = shift;
+
+    my $js;
+    if ($rat eq 'simple' || $rat eq '') {
+        $js = &Apache::lonhtmlcommon::scripttag(<<JAVASCRIPT);
+        function finish_import() {
+            opener.document.forms.simpleedit.importdetail.value='';
+            for (var num = 0; num < document.forms.groupsort.fnum.value; num++) {
+                if (eval("document.forms.groupsort.check"+num+".checked") && eval("document.forms.groupsort.filelink"+num+".value") != '') {
+                    opener.document.forms.simpleedit.importdetail.value+='&'+
+                    eval("document.forms.groupsort.title"+num+".value")+'='+
+                    eval("document.forms.groupsort.filelink"+num+".value")+'='+
+                    eval("document.forms.groupsort.id"+num+".value");
+                }
+            }
+            opener.document.forms.simpleedit.submit();
+            self.close();
+        }
+JAVASCRIPT
+    }
+    else {
+        $js = &Apache::lonhtmlcommon::scripttag(<<JAVASCRIPT);
+        function finish_import() {
+            var linkflag=false;
+            for (var num=0; num<document.forms.groupsort.fnum.value; num++) {
+                if (eval("document.forms.groupsort.check"+num+".checked") && eval("document.forms.groupsort.filelink"+num+".value") != '') {
+                    insertRowInLastRow();
+                    placeResourceInLastRow(
+                        eval("document.forms.groupsort.title"+num+".value"),
+                        eval("document.forms.groupsort.filelink"+num+".value"),
+                        eval("document.forms.groupsort.id"+num+".value"),
+                        linkflag
+                        );
+                    linkflag=true;
+                }
+            }
+            opener.editmode=0;
+            opener.notclear=0;
+            opener.linkmode=0;
+            opener.draw();
+            self.close();
+        }
+
+        function insertRowInLastRow() {
+            opener.insertrow(opener.maxrow);
+            opener.addobj(opener.maxrow,'e&2');
+        }
+
+        function placeResourceInLastRow (title,url,id,linkflag) {
+            opener.mostrecent=opener.newresource(opener.maxrow,2,opener.unescape(title),
+                              opener.unescape(url),'false','normal',id);
+            opener.save();
+            if (linkflag) {
+                opener.joinres(opener.linkmode,opener.mostrecent,0);
+            }
+            opener.linkmode=opener.mostrecent;
+        }
+JAVASCRIPT
+    }
+    return $js;
+}
 
 # HTML-Markup for table if in view-mode
 my $wishlistHTMLview;
@@ -945,7 +1254,9 @@ sub wishlistEdit {
                                  '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<0?0:($indent-$indentConst)).'px;">'.
                                  '<a href="javascript:;" onclick="folderAction('."'row".$index."'".')" style="vertical-align:top" >'.
                                  '<img src="/adm/lonIcons/arrow.closed.gif" id="img'.$index.'" alt = ""  class="LC_icon"/>'.
-                                 '<img src="/adm/lonIcons/navmap.folder.closed.gif" id="imgFolder'.$index.'" alt="folder"/></a>';
+                                 '<img src="/adm/lonIcons/navmap.folder.closed.gif" id="imgFolder'.$index.'" alt="folder"/></a>'.
+                                 '<input type="text" name="newtitle" value="'.$n->value()->title().'" alt = "'.$n->value()->title().'"/>'.
+                                 '</td><td></td>';
 
         }
         # entry is a link
@@ -953,12 +1264,11 @@ sub wishlistEdit {
             $wishlistHTMLedit .= '<td><select class="LC_hidden" name="sel" id="sel'.$index.'" onchange="submitSelect();">'.
                                  $options.'</select></td>'.
                                  '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<=0?$indentConst:$indent).'px;">'.
-                                 '<img src="/res/adm/pages/wishlist-link.png" id="img'.$index.'" alt="link"/>';
+                                 '<img src="/res/adm/pages/wishlist-link.png" id="img'.$index.'" alt="link"/>'.
+                                 '<input type="text" name="newtitle" value="'.$n->value()->title().'" alt = "'.$n->value()->title().'"/></td>'.
+                                 '<td><input type="text" name="newpath" value="'.$n->value()->path().'" alt = "'.$n->value()->path().'"/></td>';
         }
-
-        # input-field for title
-        $wishlistHTMLedit .= '<input type="text" name="newtitle" value="'.$n->value()->title().'" alt = "'.$n->value()->title().'"/></td>';
-
+        
         # note-icon, different icons for an entries with note and those without
         my $noteIMG = 'anot.png';
 
@@ -974,7 +1284,7 @@ sub wishlistEdit {
 
         # start row containing the textarea for the note
         $wishlistHTMLedit .= &Apache::loncommon::continue_data_table_row('LC_hidden','note'.$index).
-                             '<td></td><td></td><td>'.
+                             '<td></td><td></td><td colspan="2">'.
                              '<textarea id="noteText'.$index.'" cols="25" rows="3" style="width:100%" '.
                              'name="newnote">'.
                              $n->value()->note().'</textarea></td><td></td>';
@@ -1168,10 +1478,7 @@ sub makePage {
                                                         'onload' => 'javascript:onLoadAction('."'".$mode."'".');',
                                                         'onunload' => 'javascript:window.name = '."'loncapaclient'"}});
 
-    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Wishlist '.
-                           '<a title="Online-Hilfe" href="/adm/help/Wishlist.hlp" target="_top">'.
-                           '<img src="/adm/help/help.png" alt="'.&mt('Help').'" '.
-                           'title="'.&mt('Help').'" class="LC_icon" /></a>');
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(&mt('Wishlist').&Apache::loncommon::help_open_topic('Wishlist'));
 
     # get javascript-code for wishlist-interactions
     my $js = &JSforWishlist();
@@ -1192,7 +1499,7 @@ sub makePage {
     # icon for edit-mode, display when in view-mode
     if ($mode eq 'view') {
         $functions .= &Apache::lonhtmlcommon::add_item_funclist('<a href="javascript:;" '.
-                          'onclick="setFormAction('."'save','edit'".'); list.submit();" class="LC_menubuttons_link">'.
+                          'onclick="setFormAction('."'save','edit'".');" class="LC_menubuttons_link">'.
                           '<img src="/res/adm/pages/edit-mode-22x22.png" alt="'.$lt{'ed'}.'" '.
                           'title="'.$lt{'ed'}.'" class="LC_icon"/> '.
                           '<span class="LC_menubuttons_inline_text">'.$lt{'ed'}.'</span></a>');
@@ -1200,7 +1507,7 @@ sub makePage {
     # icon for view-mode, display when in edit-mode
     else {
         $functions .= &Apache::lonhtmlcommon::add_item_funclist('<a href="javascript:;" '.
-                          'onclick="setFormAction('."'save','view'".'); list.submit();" class="LC_menubuttons_link">'.
+                          'onclick="setFormAction('."'save','view'".');" class="LC_menubuttons_link">'.
                           '<img src="/res/adm/pages/view-mode-22x22.png" alt="'.$lt{'vw'}.'" '.
                           'title="'.$lt{'vw'}.'" class="LC_icon"/> '.
                           '<span class="LC_menubuttons_inline_text">'.$lt{'vw'}.'</span></a>');
@@ -1236,7 +1543,7 @@ sub makePage {
 
     # icon for saving changes
     $functions .= &Apache::lonhtmlcommon::add_item_funclist('<a href="javascript:;" '.
-                      'onclick="setFormAction('."'','".$mode."'".'); " class="LC_menubuttons_link">'.
+                      'onclick="setFormAction('."'saveOK','".$mode."'".'); " class="LC_menubuttons_link">'.
                       '<img src="/res/adm/pages/save-22x22.png" alt="'.$lt{'sv'}.'" '.
                       'title="'.$lt{'sv'}.'" class="LC_icon" />'.
                       '<span class="LC_menubuttons_inline_text">'.$lt{'sv'}.'</span></a>');
@@ -1289,7 +1596,7 @@ sub makePage {
                                                    'Now choose the new destination folder.').'</span></p>';
             &wishlistMove(\@childrenRt, $marked);
             $inner .= '<table class="LC_data_table LC_tableOfContent">'.$wishlistHTMLmove.'</table><br/><br/>';
-            $inner .= '<input type="button" value="'.&mt('Move').'" onclick="setFormAction('."'','view'".'); selectDestinationFolder()"/>'.
+            $inner .= '<input type="button" value="'.&mt('Move').'" onclick="setFormAction('."'move','view'".');"/>'.
                       '<input type="button" value="'.&mt('Cancel').'" onclick="go('."'/adm/wishlist'".')"/>';
 
             $wishlistHTMLmove ='<tr id="root" class="LC_odd_row"><td><input type="radio" name="mark" id="radioRoot" value="root" /></td>'.
@@ -1340,18 +1647,26 @@ sub makePageSet {
 
 # Returns the HTML-Markup for the page, shown when links should be imported into a course
 sub makePageImport {
+    my $rat = shift;
     # start_page 
     my $startPage = &Apache::loncommon::start_page('Wishlist',undef,
                                                    {'only_body' => 1});
     
     # get javascript-code for wishlist-interactions
     my $js = &JSforWishlist();
+    $js .= &JSforImport($rat);
 
     my $inner = '<h1>'.&mt('Import Resources from Wishlist').'</h1>';
-    $inner .= '<p><span class="LC_info">'.&mt("Please note that you  can use the checkboxes corresponding to a folder to ".
-                                              "easily check all links within this folder. The folder structure itself can't be imported. ".
-                                              "All checked links will be imported into the current folder of your course.").'</span></p>';
-
+    if (!$rat) {
+        $inner .= '<p><span class="LC_info">'.&mt("Please note that you  can use the checkboxes corresponding to a folder to ".
+                                                  "easily check all links within this folder. The folder structure itself can't be imported. ".
+                                                  "All checked links will be imported into the current folder of your course.").'</span></p>';
+    }
+    else {
+        $inner .= '<p><span class="LC_info">'.&mt("Please note that you  can use the checkboxes corresponding to a folder to ".
+                                                  "easily check all links within this folder. The folder structure itself can't be imported. ")
+                                                  .'</span></p>';
+    }
     my %wishlist = &getWishlist();
     my $fnum = (keys %wishlist)-1;
 
@@ -1393,10 +1708,7 @@ sub makeErrorPage {
                 text => 'Wishlist'});
     my $startPage = &Apache::loncommon::start_page('Wishlist');
     
-    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Wishlist '.
-                           '<a title="Online-Hilfe" href="/adm/help/Wishlist.hlp" target="_top">'.
-                           '<img src="/adm/help/help.png" alt="'.&mt('Help').'" '.
-                           'title="'.&mt('Help').'" class="LC_icon" /></a>');
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(&mt('Wishlist').&Apache::loncommon::help_open_topic('Wishlist'));
     &Apache::lonhtmlcommon::clear_breadcrumbs();
 
     # error-message
@@ -1429,7 +1741,7 @@ sub handler {
         }
 
         # get unprocessed_cgi (i.e. marked entries, mode ...) 
-        &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['action','mark','markedToMove','mode','newtitle','note']);
+        &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['action','mark','markedToMove','mode','newtitle','note','rat']);
 
         # change the order of entries within a level, that means sorting the entries
         my $changeOrder = 0;
@@ -1479,9 +1791,12 @@ sub handler {
         # only save, if user wants to save changes
         # do not save, when current action is 'delete' or 'sort' or 'move' 
         my @newTitles = ();
+        my @newPaths = ();
         my @newNotes = ();
-        if ((defined $env{'form.newtitle'} || defined $env{'form.newnote'}) && ($env{'form.action'} ne 'noSave') && ($env{'form.action'} ne 'delete') && !$changeOrder) {
+        if ((defined $env{'form.newtitle'} || defined $env{'form.newpath'} || defined $env{'form.newnote'})
+            && ($env{'form.action'} ne 'noSave') && ($env{'form.action'} ne 'delete') && !$changeOrder) {
             @newTitles = &Apache::loncommon::get_env_multiple('form.newtitle');
+            @newPaths = &Apache::loncommon::get_env_multiple('form.newpath');
             @newNotes = &Apache::loncommon::get_env_multiple('form.newnote');
             my $node = 0;
             foreach my $t (@newTitles) {
@@ -1489,6 +1804,14 @@ sub handler {
                $node++;
             }
             $node = 0;
+            my $path = 0;
+            for (my $i = 0; $i < ($#newTitles+1); $i++ ) {
+               if (&setNewPath($node, $newPaths[$path])) {
+                     $path++;
+               }
+               $node++;
+            }
+            $node = 0;
             foreach my $n (@newNotes) {
                &setNewNote($node, $n);
                $node++;
@@ -1505,7 +1828,7 @@ sub handler {
             $page = &makePage("move", \@marked);
         }
         elsif ($env{'form.mode'} eq 'import') {
-            $page = &makePageImport();
+            $page = &makePageImport($env{'form.rat'});
         }
         elsif ($env{'form.mode'} eq 'set') {
             $page = &makePageSet();
@@ -1528,6 +1851,65 @@ sub handler {
 # Extend CPAN-Module Tree by function like 'moveNode' or 'deleteNode'
 package Tree;
 
+=pod
+
+=head2 Routines from package Tree
+
+=over 4
+
+=item * &getNodeByIndex(index, nodes)
+
+     Searches for a node, specified by the index, in nodes (reference to array) and returns it. 
+ 
+
+=item * &moveNode(node, at, newParent)
+
+     Moves a given node to a new parent (if new parents is defined) or change the position from a node within its siblings (means sorting, at must be defined).
+
+
+=item * &removeNode(node)
+
+     Removes a node given by node from the tree.
+
+
+=item * &TreeIndex(children)
+
+     Sets an index for every node in the tree, beginning with 0.
+     Recursive call starting with all children of the root of the tree (parameter children is reference to an array containing the nodes of the current level).     
+
+
+=item * &setCountZero()
+
+     Resets index counter.
+
+
+=item * &RootToHash(childrenRt)
+
+     Converts the root-node to a hash-entry: the key is root and values are just the indices of root's children.
+   
+
+=item * &TreeToHash(childrenRt)
+
+     Converts all other nodes in the tree to hash. Each node is one hash-entry where the keys are the index of a node and the values are all other attributes (containing tile, path, note, date and indices for all direct children).
+     Recursive call starting with all children of the root of the tree (parameter childrenRT is reference to an array containing the nodes of the current level).     
+
+
+=item * &HashToTree()
+
+     Converts the hash to a tree. Builds a tree-object for each entry in the hash. Afterwards call &buildTree(node, childrenIn, TreeNodes, TreeHash) to connect the tree-objects.
+
+
+=item * &buildTree(node, childrenIn, TreeNodes, TreeHash)
+
+     Joins the nodes to a tree.
+     Recursive call starting with root and all children of root (parameter childrenIn is reference to an array containing the nodes indices of the current level).
+   
+
+=back
+
+=cut
+
+
 # returns the node with a given index from a list of nodes
 sub getNodeByIndex {
     my $index = shift;