MDL-13766, fix a not_logged_in bug

diff --git a/repository/boxnet/repository.class.php b/repository/boxnet/repository.class.php
index 9a2a36ebc880e7fe2fcdd53310b09a702657fe81..be37864164fb4ac4fceb1a2df3ef3309022eb101 100755 (executable)
--- a/repository/boxnet/repository.class.php
+++ b/repository/boxnet/repository.class.php
@@ -92,7 +92,7 @@ class repository_boxnet extends repository{
         return $ret;
     }
     public function get_listing($path = '/', $search = ''){
-        global $CFG;
+        global $CFG, $SESSION;
         $list = array();
         $ret  = array();
         $tree = $this->box->getAccountTree();
@@ -127,6 +127,8 @@ class repository_boxnet extends repository{
             $this->listing = $list;
             return $ret;
         } else {
+            $sess_name = 'box_token'.$this->id;
+            unset($SESSION->$sess_name);
             throw new repository_exception('nullfilelist', 'repository_boxnet');
         }
     }

diff --git a/repository/lib.php b/repository/lib.php
index 76eec575193b61b16d221c82e0b3f215debba5c4..253f157d422a19248bcdd99f832f2a75b20092ea 100644 (file)
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -1006,6 +1006,12 @@ _client.dynload = function (node, fnLoadComplete){
                     return;
                 }
                 _client.ds = ret;
+                var oDiv = document.getElementById('repo-opt-$suffix-'
+                    +_client.repositoryid);
+                oDiv.innerHTML = '';
+                var search = null;
+                var logout = null;
+                var mgr = null;
                 if(_client.ds.login){
                     _client.print_login();
                 } else if(_client.ds.list) {
@@ -1014,36 +1020,28 @@ _client.dynload = function (node, fnLoadComplete){
                     } else {
                         _client.viewlist();
                     }
-                    var oDiv = document.getElementById('repo-opt-$suffix-'
-                        +_client.repositoryid);
-                    oDiv.innerHTML = '';
-                    var search = null;
-                    var logout = null;
-                    var mgr = null;
-                    if(_client.ds.list) {
-                        var search = document.createElement('a');
-                        search.href = '###';
-                        search.innerHTML = '$strsearch ';
-                        search.id = 'repo-search-$suffix-'+_client.repositoryid;
-                        search.onclick = function() {
-                            var re = /repo-search-$suffix-(\d+)/i;
-                            var id = this.id.match(re);
-                            repository_client_$suffix.search(id[1]);
-                        }
-                        var logout = document.createElement('a');
-                        logout.href = '###';
-                        logout.innerHTML = '$strlogout';
-                        logout.id = 'repo-logout-$suffix-'+_client.repositoryid;
-                        logout.onclick = function() {
-                            var re = /repo-logout-$suffix-(\d+)/i;
-                            var id = this.id.match(re);
-                            var oDiv = document.getElementById('repo-opt-$suffix-'+id[1]);
-                            oDiv.innerHTML = '';
-                            repository_client_$suffix.req(id[1], 1, 1);
-                        }
+                    search = document.createElement('a');
+                    search.href = '###';
+                    search.innerHTML = '$strsearch ';
+                    search.id = 'repo-search-$suffix-'+_client.repositoryid;
+                    search.onclick = function() {
+                        var re = /repo-search-$suffix-(\d+)/i;
+                        var id = this.id.match(re);
+                        repository_client_$suffix.search(id[1]);
+                    }
+                    logout = document.createElement('a');
+                    logout.href = '###';
+                    logout.innerHTML = '$strlogout';
+                    logout.id = 'repo-logout-$suffix-'+_client.repositoryid;
+                    logout.onclick = function() {
+                        var re = /repo-logout-$suffix-(\d+)/i;
+                        var id = this.id.match(re);
+                        var oDiv = document.getElementById('repo-opt-$suffix-'+id[1]);
+                        oDiv.innerHTML = '';
+                        repository_client_$suffix.req(id[1], 1, 1);
                     }
                     if(_client.ds.manage){
-                        var mgr = document.createElement('A');
+                        mgr = document.createElement('A');
                         mgr.innerHTML = '$strmgr ';
                         mgr.href = _client.ds.manage;
                         mgr.id = 'repo-mgr-$suffix-'+_client.repositoryid;