From 1c05907d076ea4c024637d01832ba70ccb4d0d4b Mon Sep 17 00:00:00 2001 From: dongsheng Date: Thu, 4 Jun 2009 09:33:25 +0000 Subject: [PATCH] "MDL-13766, ->pixpath doesn't work in web service, use ->httpswwwroot instead" --- repository/alfresco/repository.class.php | 4 ++-- repository/boxnet/repository.class.php | 10 +++++++++- repository/filesystem/repository.class.php | 4 ++-- repository/lib.php | 6 +++--- repository/mahara/repository.class.php | 4 ++-- repository/s3/repository.class.php | 4 ++-- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/repository/alfresco/repository.class.php b/repository/alfresco/repository.class.php index ced2e75cd3..88b957c40f 100755 --- 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 e83d538233..c718dda493 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->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 ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo '
'; } } diff --git a/repository/filesystem/repository.class.php b/repository/filesystem/repository.class.php index 865066d92f..4eb6bdd711 100644 --- 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 09e0792e4f..c02310fda1 100644 --- 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 77039784fc..a5b764e6d6 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->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 f0c9c761fd..e99729775d 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->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']) ); } } -- 2.39.5