"MDL-13766, fixed image path"

diff --git a/repository/alfresco/repository.class.php b/repository/alfresco/repository.class.php
index bfdada5573567ef420430e6674740c2e30ec1279..6ec650f7fc6ea35860910c61ec907507e15520ef 100755 (executable)
--- a/repository/alfresco/repository.class.php
+++ b/repository/alfresco/repository.class.php
@@ -125,11 +125,11 @@ class repository_alfresco extends repository {
                 {
                     $ret['list'][] = array('title'=>$child->child->cm_name,
                         'path'=>$child->child->id,
-                        'thumbnail'=>$CFG->httpswwwroot.'/pix/f/folder-32.png',
+                        'thumbnail'=>$CFG->pixpath.'/f/folder-32.png',
                         'children'=>array());
                 } elseif ($child->child->type == $file_filter) {
                     $ret['list'][] = array('title'=>$child->child->cm_name,
-                        'thumbnail' => $CFG->httpswwwroot .'/pix/f/'. mimeinfo('icon32', $child->child->cm_name),
+                        'thumbnail' => $CFG->pixpath .'/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 9bcd65defdf8668b1a9aaba58c9cc360597b5b8a..537182419b5f4e367aaf9393c137d34b1e443b7f 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->auth_token.'/'.$fileids[$n],
-                            'thumbnail'=>$CFG->httpswwwroot.'/pix/f/'.mimeinfo('icon32', $v));
+                            'thumbnail'=>$CFG->pixpath.'/f/'.mimeinfo('icon32', $v));
                 }
             }
         }

diff --git a/repository/filepicker.php b/repository/filepicker.php
index b32a2f0b241f1977e0350270a8763c119949c32f..e136c694894f8b55406d84a3d281db40680b5efb 100755 (executable)
--- a/repository/filepicker.php
+++ b/repository/filepicker.php
@@ -245,7 +245,7 @@ default:
             if ($file->get_filename()!='.') {
                 $drafturl = $CFG->httpswwwroot.'/draftfile.php/'.$context->id.'/user_draft/'.$itemid.'/'.$file->get_filename();
                 echo '<li><a href="'.$drafturl.'">'.$file->get_filename().'</a> ';
-                echo '<a href="'.$CFG->httpswwwroot.'/repository/filepicker.php?action=deletedraft&amp;itemid='.$itemid.'&amp;ctx_id='.$ctx_id.'&amp;title='.$file->get_filename().'"><img src="'.$CFG->httpswwwroot.'/pix/t/delete.gif" class="iconsmall" /></a></li>';
+                echo '<a href="'.$CFG->httpswwwroot.'/repository/filepicker.php?action=deletedraft&amp;itemid='.$itemid.'&amp;ctx_id='.$ctx_id.'&amp;title='.$file->get_filename().'"><img src="'.$CFG->pixpath.'/t/delete.gif" class="iconsmall" /></a></li>';
             }
         }
         echo '</ul>';

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

diff --git a/repository/local/repository.class.php b/repository/local/repository.class.php
index 5461647c9bbdc852a5e2d1f35a1e6523171d670c..43aa600c7af0a225c09e00a555fcb943dfeadc61 100755 (executable)
--- a/repository/local/repository.class.php
+++ b/repository/local/repository.class.php
@@ -64,7 +64,7 @@ class repository_local extends repository {
                         'size' => 0,
                         'date' => '',
                         'source'=> $file->get_id(),
-                        'thumbnail' => $CFG->wwwroot .'/pix/f/text-32.png'
+                        'thumbnail' => $CFG->pixpath .'/f/text-32.png'
                     );
                     $list[] = $node;
                 }
@@ -95,7 +95,7 @@ class repository_local extends repository {
                 'date' => '',
                 'path' => 'draft',
                 'children'=>array(),
-                'thumbnail' => $CFG->wwwroot .'/pix/f/folder-32.png'
+                'thumbnail' => $CFG->pixpath .'/f/folder-32.png'
             );
             $list[] = $node;
         }
@@ -124,7 +124,7 @@ class repository_local extends repository {
                             'date' => '',
                             'path' => $params,
                             'children'=>array(),
-                            'thumbnail' => $CFG->wwwroot .'/pix/f/folder-32.png'
+                            'thumbnail' => $CFG->pixpath .'/f/folder-32.png'
                         );
                         $list[] = $node;
                     } else {
@@ -134,7 +134,7 @@ class repository_local extends repository {
                             'size' => 0,
                             'date' => '',
                             'source'=> $params,
-                            'thumbnail' => $CFG->wwwroot .'/pix/f/text-32.png'
+                            'thumbnail' => $CFG->pixpath .'/f/text-32.png'
                         );
                         $list[] = $node;
                     }

diff --git a/repository/mahara/repository.class.php b/repository/mahara/repository.class.php
index a5b764e6d6b784b782a43749381c8b67b28af5b1..77039784fcf8c8ddf7670ff1d108eea9e835d052 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->httpswwwroot .'/pix/f/folder.gif');
+                $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'])) {
@@ -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->httpswwwroot .'/pix/f/'. mimeinfo('icon32', $file['title']);
+                    $thumbnail = $CFG->pixpath .'/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 e99729775da1e66804f1d616d68b62af5afd399e..f0c9c761fd24a786f5ab1e3f14a6bfac86fbcee4 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->httpswwwroot.'/pix/f/folder-32.png',
+                    'thumbnail'=>$CFG->pixpath.'/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->httpswwwroot.'/pix/f/'.mimeinfo('icon32', $file['name'])
+                    'thumbnail'=>$CFG->pixpath.'/f/'.mimeinfo('icon32', $file['name'])
                     );
             }
         }