From: tjhunt <tjhunt>
Date: Thu, 2 Jul 2009 11:23:47 +0000 (+0000)
Subject: MDL-19690 - eliminate the $OUTPUT->initialise_deprecated_cfg_pixpath horrible hack.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=c8873c496b61f011555693d27c82a3b850813ecc;p=moodle.git

MDL-19690 - eliminate the $OUTPUT->initialise_deprecated_cfg_pixpath horrible hack.

Replace $CFG->pixpath with $OUPTUT->old_icon_url(...) instead.
---

diff --git a/lib/formslib.php b/lib/formslib.php
index 92e0abbd98..06e5c0fc0b 100644
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -1063,7 +1063,6 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
      */
     function MoodleQuickForm($formName, $method, $action, $target='', $attributes=null){
         global $CFG, $OUTPUT;
-        $OUTPUT->initialise_deprecated_cfg_pixpath();
 
         static $formcounter = 1;
 
diff --git a/lib/outputlib.php b/lib/outputlib.php
index 1c65c1909b..a9a2e3765f 100644
--- a/lib/outputlib.php
+++ b/lib/outputlib.php
@@ -1932,21 +1932,6 @@ class moodle_core_renderer extends moodle_renderer_base {
     public function container_end() {
         return $this->opencontainers->pop('container');
     }
-
-    /**
-     * At the moment we frequently have a problem with $CFG->pixpath not being
-     * initialised when it is needed. Unfortunately, there is no nice way to handle
-     * this. I think we need to replace $CFG->pixpath with something like $OUTPUT->icon(...).
-     * However, until then, we need a way to force $CFG->pixpath to be initialised,
-     * to fix the error messages, and that is what this function if for.
-     */
-    public function initialise_deprecated_cfg_pixpath() {
-        // Actually, we don't have to do anything here. Just calling any method
-        // of $OBJECT  is enough. However, if the only reason you are calling
-        // an $OUTPUT method is to get $CFG->pixpath initialised, please use this
-        // method, so we can find them and clean them up later once we have
-        // found a better replacement for $CFG->pixpath.
-    }
 }
 
 
diff --git a/lib/weblib.php b/lib/weblib.php
index 56c52ea156..f7c6c469e5 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -4652,7 +4652,6 @@ function editorhelpbutton(){
 function helpbutton($page, $title, $module='moodle', $image=true, $linktext=false, $text='', $return=false,
                      $imagetext='') {
     global $CFG, $COURSE, $OUTPUT;
-    $OUTPUT->initialise_deprecated_cfg_pixpath();
 
     //warning if ever $text parameter is used
     //$text option won't work properly because the text needs to be always cleaned and,
@@ -4694,7 +4693,7 @@ function helpbutton($page, $title, $module='moodle', $image=true, $linktext=fals
             $linkobject .= $imagetext;
         } else {
             $linkobject .= '<img class="iconhelp" alt="'.s(strip_tags($tooltip)).'" src="'.
-                $CFG->pixpath .'/help.gif" />';
+                $OUTPUT->old_icon_url('help') . '" />';
         }
     } else {
         $linkobject .= $tooltip;
diff --git a/mod/chat/gui_ajax/update.php b/mod/chat/gui_ajax/update.php
index 8c1276847c..26442f9e92 100755
--- a/mod/chat/gui_ajax/update.php
+++ b/mod/chat/gui_ajax/update.php
@@ -54,8 +54,6 @@ if (!$cm = get_coursemodule_from_instance('chat', $chatuser->chatid, $course->id
 // setup $PAGE so that format_text will work properly
 $PAGE->set_cm($cm, $course, $chat);
 
-$OUTPUT->initialise_deprecated_cfg_pixpath();
-
 if($CFG->chat_use_cache){
     $cache = new file_cache();
     $users = $cache->get('user');
diff --git a/question/category_class.php b/question/category_class.php
index 3d783b8b80..5bfca76f24 100644
--- a/question/category_class.php
+++ b/question/category_class.php
@@ -173,7 +173,6 @@ class question_category_object {
         $this->str->cancel         = get_string('cancel');
         $this->str->editcategories = get_string('editcategories', 'quiz');
         $this->str->page           = get_string('page');
-        $OUTPUT->initialise_deprecated_cfg_pixpath();
         $this->pixpath = $CFG->pixpath;
 
         $this->pageurl = $pageurl;
diff --git a/repository/alfresco/repository.class.php b/repository/alfresco/repository.class.php
index 4399649751..2e19ffa513 100755
--- a/repository/alfresco/repository.class.php
+++ b/repository/alfresco/repository.class.php
@@ -100,7 +100,6 @@ class repository_alfresco extends repository {
 
     public function get_listing($uuid = '', $path = '') {
         global $CFG, $SESSION, $OUTPUT;
-        $OUTPUT->initialise_deprecated_cfg_pixpath();
         $ret = array();
         $ret['dynload'] = true;
         $ret['list'] = array();
@@ -129,7 +128,7 @@ class repository_alfresco extends repository {
                         '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' => $OUTPUT->old_icon_url('f/'. str_replace(array('.png', '.gif'), '', 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 d43f57dd15..5e04cb13ca 100755
--- a/repository/boxnet/repository.class.php
+++ b/repository/boxnet/repository.class.php
@@ -138,7 +138,6 @@ class repository_boxnet extends repository {
      */
     public function search($search_text) {
         global $CFG, $OUTPUT;
-        $OUTPUT->initialise_deprecated_cfg_pixpath();
         $list = array();
         $ret  = array();
         $tree = $this->box->getAccountTree();
@@ -155,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->pixpath.'/f/'.mimeinfo('icon32', $v));
+                            'thumbnail'=>$OUTPUT->old_icon_url('f/'. str_replace(array('.png', '.gif'), '', mimeinfo('icon32', $v))));
                 }
             }
         }
diff --git a/repository/draft/repository.class.php b/repository/draft/repository.class.php
index 87b0506170..f04b1cc35d 100755
--- a/repository/draft/repository.class.php
+++ b/repository/draft/repository.class.php
@@ -33,7 +33,6 @@ class repository_draft extends repository {
      */
     public function get_listing($path = '', $page = '') {
         global $CFG, $USER, $itemid, $OUTPUT;
-        $OUTPUT->initialise_deprecated_cfg_pixpath();
         $ret = array();
         $ret['dynload'] = true;
         $ret['nosearch'] = true;
diff --git a/repository/filepicker.php b/repository/filepicker.php
index 49220a103a..d8f0633b1e 100755
--- a/repository/filepicker.php
+++ b/repository/filepicker.php
@@ -22,7 +22,6 @@ require_once('lib.php');
 set_time_limit(0);
 
 require_login();
-$OUTPUT->initialise_deprecated_cfg_pixpath();
 
 $page        = optional_param('page', '',          PARAM_RAW);    // page
 $client_id   = optional_param('client_id', SITEID, PARAM_RAW);    // client ID
diff --git a/repository/filesystem/repository.class.php b/repository/filesystem/repository.class.php
index bda865687f..25f2bea382 100644
--- a/repository/filesystem/repository.class.php
+++ b/repository/filesystem/repository.class.php
@@ -30,8 +30,6 @@ class repository_filesystem extends repository {
     }
     public function get_listing($path = '', $page = '') {
         global $CFG, $OUTPUT;
-        $OUTPUT->initialise_deprecated_cfg_pixpath();
-
         $list = array();
         $list['list'] = array();
         // process breacrumb trail
@@ -66,7 +64,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' => $OUTPUT->old_icon_url('f/'. str_replace(array('.png', '.gif'), '', mimeinfo('icon32', $this->root_path.$file)))
                         );
                     } else {
                         if (!empty($path)) {
diff --git a/repository/lib.php b/repository/lib.php
index d46b70a4b3..1a07ae0849 100644
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -737,7 +737,6 @@ abstract class repository {
      */
     public static function move_to_filepool($path, $name, $itemid, $filearea = 'user_draft') {
         global $DB, $CFG, $USER, $OUTPUT;
-        $OUTPUT->initialise_deprecated_cfg_pixpath();
         $context = get_context_instance(CONTEXT_USER, $USER->id);
         $now = time();
         $entry = new object();
@@ -770,7 +769,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'=>$OUTPUT->old_icon_url('f/'. str_replace(array('.png', '.gif'), '', mimeinfo('icon32', $path)))
                 );
             } else {
                 return null;
@@ -897,7 +896,6 @@ abstract class repository {
      */
     public static function build_tree($fileinfo, $search, $dynamicmode, &$list) {
         global $CFG, $OUTPUT;
-        $OUTPUT->initialise_deprecated_cfg_pixpath();
 
         $filecount = 0;
         $children = $fileinfo->get_children();
diff --git a/repository/local/repository.class.php b/repository/local/repository.class.php
index 63a858cd55..3e6fd5ab39 100755
--- a/repository/local/repository.class.php
+++ b/repository/local/repository.class.php
@@ -47,7 +47,6 @@ class repository_local extends repository {
      */
     public function get_listing($encodedpath = '', $page = '', $search = '') {
         global $CFG, $USER, $OUTPUT;
-        $OUTPUT->initialise_deprecated_cfg_pixpath();
         $ret = array();
         $ret['dynload'] = true;
         $ret['nosearch'] = true;
diff --git a/repository/mahara/repository.class.php b/repository/mahara/repository.class.php
index a2d341ab82..10dc68372e 100644
--- a/repository/mahara/repository.class.php
+++ b/repository/mahara/repository.class.php
@@ -129,7 +129,6 @@ class repository_mahara extends repository {
      */
     public function get_listing($path = null, $page = 1, $search = '') {
         global $CFG, $DB, $USER, $OUTPUT;
-        $OUTPUT->initialise_deprecated_cfg_pixpath();
 
         ///check that Mahara has a good version
         ///We also check that the "get file list" method has been activated (if it is not
@@ -215,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 = $OUTPUT->old_icon_url('f/'. str_replace(array('.png', '.gif'), '', 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 69aa46e52e..aaf9b3879a 100644
--- a/repository/s3/repository.class.php
+++ b/repository/s3/repository.class.php
@@ -13,7 +13,6 @@ class repository_s3 extends repository {
     }
     public function get_listing($path = '', $page = '') {
         global $CFG, $OUTPUT;
-        $OUTPUT->initialise_deprecated_cfg_pixpath();
         $list = array();
         $list['list'] = array();
         // the management interface url
@@ -46,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'=>$OUTPUT->old_icon_url('f/'. str_replace(array('.png', '.gif'), '', mimeinfo('icon32', $file['name'])))
                     );
             }
         }
diff --git a/repository/url/repository.class.php b/repository/url/repository.class.php
index 01d89a2e6c..4a99f1368f 100755
--- a/repository/url/repository.class.php
+++ b/repository/url/repository.class.php
@@ -80,7 +80,6 @@ EOD;
      */
     public function get_listing($path='', $page='') {
         global $CFG, $OUTPUT;
-        $OUTPUT->initialise_deprecated_cfg_pixpath();
         $ret = array();
         $curl = new curl;
         $msg = $curl->head($this->file_url);
@@ -102,7 +101,7 @@ EOD;
                 $ret['list'][] = array(
                     'title'=>$filename,
                     'source'=>$this->file_url,
-                    'thumbnail' => $CFG->pixpath .'/f/'. mimeinfo('icon32', $filename)
+                    'thumbnail' => $OUTPUT->old_icon_url('f/'. str_replace(array('.png', '.gif'), '', mimeinfo('icon32', $filename)))
                     );
             }
         }
@@ -110,7 +109,6 @@ EOD;
     }
     public function analyse_page($baseurl, $content, &$list) {
         global $CFG, $OUTPUT;
-        $OUTPUT->initialise_deprecated_cfg_pixpath();
         $urls = extract_html_urls($content);
         $images = $urls['img']['src'];
         $pattern = '#img(.+)src="?\'?([[:alnum:]:?=&@/._+-]+)"?\'?#i';
@@ -122,8 +120,7 @@ EOD;
                     'thumbnail'=>url_to_absolute($baseurl, $url),
                     'thumbnail_height'=>84,
                     'thumbnail_width'=>84
-                    //'thumbnail' => $CFG->pixpath .'/f/'. mimeinfo('icon32', $url)
-                    );
+                );
             }
         }
     }
diff --git a/repository/webdav/repository.class.php b/repository/webdav/repository.class.php
index 0706dca6b7..c6755877f4 100644
--- a/repository/webdav/repository.class.php
+++ b/repository/webdav/repository.class.php
@@ -64,7 +64,6 @@ class repository_webdav extends repository {
     }
     public function get_listing($path='', $page = '') {
         global $CFG, $OUTPUT;
-        $OUTPUT->initialise_deprecated_cfg_pixpath();
         $list = array();
         $ret  = array();
         $ret['dynload'] = true;
@@ -122,7 +121,7 @@ class repository_webdav extends repository {
                 $size = !empty($v['getcontentlength'])? $v['getcontentlength']:'';
                 $ret['list'][] = array(
                     'title'=>$title,
-                    'thumbnail' => $CFG->pixpath .'/f/'. mimeinfo('icon32', $title),
+                    'thumbnail' => $OUTPUT->old_icon_url('f/'. str_replace(array('.png', '.gif'), '', mimeinfo('icon32', $title))),
                     'size'=>$size,
                     'date'=>$filedate,
                     'source'=>$v['href']