"MDL-13766, ->pixpath doesn't work in web service, use ->httpswwwroot instead"

diff --git a/repository/alfresco/repository.class.php b/repository/alfresco/repository.class.php
index ced2e75cd39872bbf71971d5ae5674c0a923ef90..88b957c40f6460d0bfd88406fed4d27fb71e2923 100755 (executable)
--- a/repository/alfresco/repository.class.php
+++ b/repository/alfresco/repository.class.php
@@ -113,11 +113,11 @@ class repository_alfresco extends repository {
             {
                 $ret['list'][] = array('title'=>$child->child->cm_name,
                     'path'=>$child->child->id,
-                    'thumbnail'=>$CFG->pixpath.'/f/folder.gif',
+                    'thumbnail'=>$CFG->httpswwwroot.'/pix/f/folder.gif',
                     'children'=>array());
             } elseif ($child->child->type == $file_filter) {
                 $ret['list'][] = array('title'=>$child->child->cm_name,
-                    'thumbnail' => $CFG->pixpath .'/f/'. mimeinfo('icon32', $child->child->cm_name),
+                    'thumbnail' => $CFG->httpswwwroot .'/pix/f/'. mimeinfo('icon32', $child->child->cm_name),
                     'source'=>$child->child->id);
             }
         }

diff --git a/repository/boxnet/repository.class.php b/repository/boxnet/repository.class.php
index e83d5382339992caf8307a20fb25423faeac6125..c718dda493220e9de7fb69f150de48ca0d34ba2c 100755 (executable)
--- a/repository/boxnet/repository.class.php
+++ b/repository/boxnet/repository.class.php
@@ -154,7 +154,7 @@ class repository_boxnet extends repository {
                             'date'=>$filedates[$n],
                             'source'=>'http://box.net/api/1.0/download/'
                                 .$this->options['auth_token'].'/'.$fileids[$n],
-                            'thumbnail'=>$CFG->pixpath.'/f/'.mimeinfo('icon32', $v));
+                            'thumbnail'=>$CFG->httpswwwroot.'/pix/f/'.mimeinfo('icon32', $v));
                 }
             }
         }
@@ -208,6 +208,14 @@ class repository_boxnet extends repository {
             $ret = array();
             $ret['login'] = array($ticket_field, $user_field, $passwd_field);
             return $ret;
+        } else {
+            echo '<table>';
+            echo '<tr><td><label>'.get_string('username', 'repository_boxnet').'</label></td>';
+            echo '<td><input type="text" name="boxusername" /></td></tr>';
+            echo '<tr><td><label>'.get_string('password', 'repository_boxnet').'</label></td>';
+            echo '<td><input type="password" name="boxpassword" /></td></tr>';
+            echo '<input type="hidden" name="ticket" value="'.$t['ticket'].'" />';
+            echo '</table>';
         }
     }
 

diff --git a/repository/filesystem/repository.class.php b/repository/filesystem/repository.class.php
index 865066d92f3dfe0b91dcfd5142bd38e6115bc4ff..4eb6bdd711fd1a363370a549d51afb7ce0b7a0a6 100644 (file)
--- a/repository/filesystem/repository.class.php
+++ b/repository/filesystem/repository.class.php
@@ -97,7 +97,7 @@ class repository_filesystem extends repository {
                             'source' => $path.'/'.$file,
                             'size' => filesize($this->root_path.$file),
                             'date' => time(),
-                            'thumbnail' => $CFG->pixpath .'/f/'. mimeinfo('icon32', $this->root_path.$file)
+                            'thumbnail' => $CFG->httpswwwroot .'/pix/f/'. mimeinfo('icon32', $this->root_path.$file)
                         );
                     } else {
                         if (!empty($path)) {
@@ -108,7 +108,7 @@ class repository_filesystem extends repository {
                         $list['list'][] = array(
                             'title' => $file,
                             'children' => array(),
-                            'thumbnail' => $CFG->pixpath .'/f/folder-32.png',
+                            'thumbnail' => $CFG->httpswwwroot .'/pix/f/folder-32.png',
                             'path' => $current_path
                             );
                     }

diff --git a/repository/lib.php b/repository/lib.php
index 09e0792e4f86d3735cfd14496fed305db55e7eac..c02310fda12f36b6930b41deeafb6db0a0e932cf 100644 (file)
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -770,7 +770,7 @@ abstract class repository {
                 return array('url'=>$ret->get_url(),
                     'id'=>$file->get_itemid(),
                     'file'=>$file->get_filename(),
-                    'icon'=>$CFG->pixpath.'/f/'.mimeinfo('icon32', $path)
+                    'icon'=>$CFG->httpswwwroot.'/pix/f/'.mimeinfo('icon32', $path)
                 );
             } else {
                 return null;
@@ -923,7 +923,7 @@ abstract class repository {
                     'size' => 0,
                     'date' => $filedate,
                     'path' => array_reverse($path),
-                    'thumbnail' => $CFG->pixpath .'/f/folder-32.png'
+                    'thumbnail' => $CFG->httpswwwroot .'/pix/f/folder-32.png'
                 );
 
                 //if ($dynamicmode && $child->is_writable()) {
@@ -961,7 +961,7 @@ abstract class repository {
                     'date' => $filedate,
                     //'source' => $child->get_url(),
                     'source' => base64_encode($source),
-                    'thumbnail' => $CFG->pixpath .'/f/'. mimeinfo('icon32', $filename)
+                    'thumbnail' => $CFG->httpswwwroot .'/pix/f/'. mimeinfo('icon32', $filename)
                 );
                 $filecount++;
             }

diff --git a/repository/mahara/repository.class.php b/repository/mahara/repository.class.php
index 77039784fcf8c8ddf7670ff1d108eea9e835d052..a5b764e6d6b784b782a43749381c8b67b28af5b1 100644 (file)
--- a/repository/mahara/repository.class.php
+++ b/repository/mahara/repository.class.php
@@ -206,7 +206,7 @@ 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');
+                $list[] =  array('path'=>$folder['id'], 'title'=>$folder['title'], 'date'=>$folder['mtime'], 'size'=>'0', 'children'=>array(), 'thumbnail' => $CFG->httpswwwroot .'/pix/f/folder.gif');
             }
         }
         if (!empty($filesandfolders['files'])) {
@@ -214,7 +214,7 @@ class repository_mahara extends repository {
                 if ($file['artefacttype'] == 'image') {
                     $thumbnail = $host->wwwroot."/artefact/file/download.php?file=".$file['id']."&size=70x55";
                 } else {
-                    $thumbnail = $CFG->pixpath .'/f/'. mimeinfo('icon32', $file['title']);
+                    $thumbnail = $CFG->httpswwwroot .'/pix/f/'. mimeinfo('icon32', $file['title']);
                 }
                 $list[] = array( 'title'=>$file['title'], 'date'=>$file['mtime'], 'source'=>$file['id'], 'thumbnail' => $thumbnail);
             }

diff --git a/repository/s3/repository.class.php b/repository/s3/repository.class.php
index f0c9c761fd24a786f5ab1e3f14a6bfac86fbcee4..e99729775da1e66804f1d616d68b62af5afd399e 100644 (file)
--- a/repository/s3/repository.class.php
+++ b/repository/s3/repository.class.php
@@ -31,7 +31,7 @@ class repository_s3 extends repository {
                 $folder = array(
                     'title' => $bucket,
                     'children' => array(),
-                    'thumbnail'=>$CFG->pixpath.'/f/folder-32.png',
+                    'thumbnail'=>$CFG->httpswwwroot.'/pix/f/folder-32.png',
                     'path'=>$bucket
                     );
                 $tree[] = $folder;
@@ -45,7 +45,7 @@ class repository_s3 extends repository {
                     'size'=>$file['size'],
                     'date'=>userdate($file['time']),
                     'source'=>$path.'/'.$file['name'],
-                    'thumbnail'=>$CFG->pixpath.'/f/'.mimeinfo('icon32', $file['name'])
+                    'thumbnail'=>$CFG->httpswwwroot.'/pix/f/'.mimeinfo('icon32', $file['name'])
                     );
             }
         }