repository MDL-16909 add manage functionality to Mahara repository plugin + display...

diff --git a/repository/mahara/repository.class.php b/repository/mahara/repository.class.php
index 736f074ffec61f940175605812ee5a40c50bc48e..77039784fcf8c8ddf7670ff1d108eea9e835d052 100644 (file)
--- a/repository/mahara/repository.class.php
+++ b/repository/mahara/repository.class.php
@@ -127,7 +127,7 @@ class repository_mahara extends repository {
      * @param <type> $search
      * @return <type>
      */
-    public function get_listing($path = null, $page = '', $search = '') {
+    public function get_listing($path = null, $page = 1, $search = '') {
         global $CFG, $DB, $USER;
 
         ///check that Mahara has a good version
@@ -204,6 +204,11 @@ class repository_mahara extends repository {
 
 
         $list = array();
+         if (!empty($filesandfolders['folders'])) {
+            foreach ($filesandfolders['folders'] as $folder) {
+                $list[] =  array('path'=>$folder['id'], 'title'=>$folder['title'], 'date'=>$folder['mtime'], 'size'=>'0', 'children'=>array(), 'thumbnail' => $CFG->pixpath .'/f/folder.gif');
+            }
+        }
         if (!empty($filesandfolders['files'])) {
             foreach ($filesandfolders['files'] as $file) {
                 if ($file['artefacttype'] == 'image') {
@@ -211,20 +216,17 @@ class repository_mahara extends repository {
                 } else {
                     $thumbnail = $CFG->pixpath .'/f/'. mimeinfo('icon32', $file['title']);
                 }
-                $list[] = array( 'title'=>$file['title'], 'date'=>$file['mtime'], 'size'=>'10MB', 'source'=>$file['id'], 'thumbnail' => $thumbnail);
-            }
-        }
-        if (!empty($filesandfolders['folders'])) {
-            foreach ($filesandfolders['folders'] as $folder) {
-                $list[] =  array('path'=>$folder['id'], 'title'=>$folder['title'], 'date'=>$folder['mtime'], 'size'=>'0', 'children'=>array(), 'thumbnail' => $CFG->pixpath .'/f/folder.gif');
+                $list[] = array( 'title'=>$file['title'], 'date'=>$file['mtime'], 'source'=>$file['id'], 'thumbnail' => $thumbnail);
             }
         }
+       
 
         $filepickerlisting = array(
             'path' => $newpath,
             'dynload' => 1,
             'nosearch' => 0,
             'list'=> $list,
+            'manage'=> $host->wwwroot.'/artefact/file/'
         );
 
         return $filepickerlisting;