From a4103e65fae836936bb7596f154b7f93786e5aa5 Mon Sep 17 00:00:00 2001 From: dongsheng Date: Mon, 29 Jun 2009 03:41:02 +0000 Subject: [PATCH] "MDL-13766, fixed image path" --- repository/alfresco/repository.class.php | 4 ++-- repository/boxnet/repository.class.php | 2 +- repository/filepicker.php | 2 +- repository/lib.php | 6 +++--- repository/local/repository.class.php | 8 ++++---- repository/mahara/repository.class.php | 4 ++-- repository/s3/repository.class.php | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/repository/alfresco/repository.class.php b/repository/alfresco/repository.class.php index bfdada5573..6ec650f7fc 100755 --- 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 9bcd65defd..537182419b 100755 --- 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 b32a2f0b24..e136c69489 100755 --- 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 '
  • '.$file->get_filename().' '; - echo '
    • '; + echo ''; } } echo ''; diff --git a/repository/lib.php b/repository/lib.php index 350941fb92..473ae39fb7 100644 --- 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 5461647c9b..43aa600c7a 100755 --- 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 a5b764e6d6..77039784fc 100644 --- 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 e99729775d..f0c9c761fd 100644 --- 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']) ); } } -- 2.39.5