From d436d197d1095944ab44fa6a0ce0f32a3e202832 Mon Sep 17 00:00:00 2001 From: tjhunt Date: Fri, 3 Jul 2009 07:55:30 +0000 Subject: [PATCH] MDL-19690 - the last lot of $CFG->pixpath to $OUTPUT->old_icon_url Including MDL-19693 RIP $CFG->pixpath --- lib/outputlib.php | 5 +++-- lib/pagelib.php | 4 ++-- mod/assignment/lib.php | 6 +++--- .../type/upload/assignment.class.php | 14 ++++++------- .../type/uploadsingle/assignment.class.php | 6 +++--- mod/data/field/file/field.class.php | 10 ++++----- mod/forum/lib.php | 11 +++++----- mod/forum/rate_ajax.js | 15 ++++--------- mod/glossary/lib.php | 6 +++--- mod/quiz/locallib.php | 4 ++-- mod/quiz/styles.php | 2 +- .../type/directory/resource.class.php | 12 +++++------ mod/scorm/datamodels/aicclib.php | 21 ++++++++++--------- mod/scorm/datamodels/scorm_12lib.php | 21 ++++++++++--------- mod/scorm/datamodels/scorm_13lib.php | 21 ++++++++++--------- mod/scorm/datamodels/scorm_datamodels.js | 4 ++-- mod/scorm/lib.php | 11 +++++----- mod/scorm/loadSCO.php | 4 +--- mod/scorm/report.php | 6 ++---- mod/wiki/ewiki/plugins/moodle/downloads.php | 8 +++---- 20 files changed, 91 insertions(+), 100 deletions(-) diff --git a/lib/outputlib.php b/lib/outputlib.php index a9a2e3765f..d44f374d27 100644 --- a/lib/outputlib.php +++ b/lib/outputlib.php @@ -479,9 +479,10 @@ class theme_config { /** * Set the variable $CFG->pixpath and $CFG->modpixpath to be the right - * ones for this theme. + * ones for this theme. These should no longer be used, but legacy code + * might still rely on them. */ - public function setup_cfg_paths() { + public function setup_legacy_pix_paths() { global $CFG; if (!empty($CFG->smartpix)) { if ($CFG->slasharguments) { diff --git a/lib/pagelib.php b/lib/pagelib.php index 1dab12fd9c..a57ae0f359 100644 --- a/lib/pagelib.php +++ b/lib/pagelib.php @@ -818,7 +818,7 @@ class moodle_page { if ($this === $PAGE) { $THEME = $this->_theme; // Support legacy code. - $this->_theme->setup_cfg_paths(); + $this->_theme->setup_legacy_pix_paths(); } } @@ -912,7 +912,7 @@ class moodle_page { $THEME = $this->_theme; $OUTPUT = $this->_theme->get_renderer('core', $this); // Support legacy code. - $this->_theme->setup_cfg_paths(); + $this->_theme->setup_legacy_pix_paths(); } $this->_wherethemewasinitialised = debug_backtrace(); diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index 4210bd3d87..3af7cfe7e1 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -1757,7 +1757,7 @@ class assignment_base { * @return string optional */ function print_user_files($userid=0, $return=false) { - global $CFG, $USER; + global $CFG, $USER, $OUTPUT; if (!$userid) { if (!isloggedin()) { @@ -1779,9 +1779,9 @@ class assignment_base { $filename = $file->get_filename(); $found = true; $mimetype = $file->get_mimetype(); - $icon = mimeinfo_from_type('icon', $mimetype); + $icon = str_replace(array('.gif', '.png'), '', mimeinfo_from_type('icon', $mimetype)); $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$userid.'/'.$filename); - $output .= ''.$icon.''.s($filename).''; + $output .= ''.$icon.''.s($filename).''; if ($this->portfolio_exportable() && has_capability('mod/assignment:exportownsubmission', $this->context)) { $button->set_callback_options('assignment_portfolio_caller', array('id' => $this->cm->id, 'fileid' => $file->get_id())); $button->set_formats(portfolio_format_from_file($file)); diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php index 57357f9a03..89847e58c7 100644 --- a/mod/assignment/type/upload/assignment.class.php +++ b/mod/assignment/type/upload/assignment.class.php @@ -261,7 +261,7 @@ class assignment_upload extends assignment_base { function print_student_answer($userid, $return=false){ - global $CFG; + global $CFG, $OUTPUT; $submission = $this->get_submission($userid); @@ -286,9 +286,9 @@ class assignment_upload extends assignment_base { $filename = $file->get_filename(); $found = true; $mimetype = $file->get_mimetype(); - $icon = mimeinfo_from_type('icon', $mimetype); + $icon = str_replace(array('.gif', '.png'), '', mimeinfo_from_type('icon', $mimetype)); $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$userid.'/'.$filename); - $output .= ''.$icon.''.s($filename).' '; + $output .= ''.$icon.''.s($filename).' '; } @@ -346,9 +346,9 @@ class assignment_upload extends assignment_base { foreach ($files as $file) { $filename = $file->get_filename(); $mimetype = $file->get_mimetype(); - $icon = mimeinfo_from_type('icon', $mimetype); + $icon = str_replace(array('.gif', '.png'), '', mimeinfo_from_type('icon', $mimetype)); $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$userid.'/'.$filename); - $output .= ''.$icon.''.s($filename).''; + $output .= ''.$icon.''.s($filename).''; if ($candelete) { $delurl = "$CFG->wwwroot/mod/assignment/delete.php?id={$this->cm->id}&file=".rawurlencode($filename)."&userid={$submission->userid}&mode=$mode&offset=$offset"; @@ -408,10 +408,10 @@ class assignment_upload extends assignment_base { $filename = $file->get_filename(); $found = true; $mimetype = $file->get_mimetype(); - $icon = mimeinfo_from_type('icon', $mimetype); + $icon = str_replace(array('.gif', '.png'), '', mimeinfo_from_type('icon', $mimetype)); $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_response/'.$userid.'/'.$filename); - $output .= ''.$icon.''.$filename.''; + $output .= ''.$icon.''.$filename.''; if ($candelete) { $delurl = "$CFG->wwwroot/mod/assignment/delete.php?id={$this->cm->id}&file=".rawurlencode($filename)."&userid=$userid&mode=$mode&offset=$offset&action=response"; diff --git a/mod/assignment/type/uploadsingle/assignment.class.php b/mod/assignment/type/uploadsingle/assignment.class.php index 70b8669ab0..116db58ab7 100644 --- a/mod/assignment/type/uploadsingle/assignment.class.php +++ b/mod/assignment/type/uploadsingle/assignment.class.php @@ -8,7 +8,7 @@ class assignment_uploadsingle extends assignment_base { function print_student_answer($userid, $return=false){ - global $CFG, $USER; + global $CFG, $USER, $OUTPUT; $fs = get_file_storage(); $browser = get_file_browser(); @@ -21,9 +21,9 @@ class assignment_uploadsingle extends assignment_base { $filename = $file->get_filename(); $found = true; $mimetype = $file->get_mimetype(); - $icon = mimeinfo_from_type('icon', $mimetype); + $icon = str_replace(array('.gif', '.png'), '', mimeinfo_from_type('icon', $mimetype)); $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$userid.'/'.$filename); - $output .= ''.$icon.''.s($filename).'
'; + $output .= ''.$icon.''.s($filename).'
'; } } diff --git a/mod/data/field/file/field.class.php b/mod/data/field/file/field.class.php index 261753f4d6..34d0af3e40 100755 --- a/mod/data/field/file/field.class.php +++ b/mod/data/field/file/field.class.php @@ -26,7 +26,7 @@ class data_field_file extends data_field_base { var $type = 'file'; function display_add_field($recordid=0) { - global $CFG, $DB; + global $CFG, $DB, $OUTPUT; $file = false; $content = false; @@ -59,9 +59,9 @@ class data_field_file extends data_field_base { if ($file) { // Print icon if file already exists $browser = get_file_browser(); - $icon = mimeinfo_from_type('icon', $file->get_mimetype()); + $icon = str_replace(array('.gif', '.png'), '', mimeinfo_from_type('icon', $file->get_mimetype())); $src = file_encode_url($CFG->wwwroot.'/pluginfile.php', $this->context->id.'/data_content/'.$content->id.'/'.$file->get_filename()); - $str .= ''.$icon.''. + $str .= ''.$icon.''. ''.s($file->get_filename()).''; } return $str; @@ -118,12 +118,12 @@ class data_field_file extends data_field_base { } $name = empty($content->content1) ? $file->get_filename() : $content->content1; - $icon = mimeinfo_from_type('icon', $file->get_mimetype()); + $icon = str_replace(array('.gif', '.png'), '', mimeinfo_from_type('icon', $file->get_mimetype())); $src = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/data_content/'.$content->id.'/'.$file->get_filename()); $width = $this->field->param1 ? ' width = "'.s($this->field->param1).'" ':' '; $height = $this->field->param2 ? ' height = "'.s($this->field->param2).'" ':' '; - $str = ''.$icon.' '. + $str = ''.$icon.' '. ''.s($name).''; return $str; } diff --git a/mod/forum/lib.php b/mod/forum/lib.php index c719ac4f7d..08498674ab 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -4268,7 +4268,7 @@ function forum_move_attachments($discussion, $forumfrom, $forumto) { * @return mixed string or array of (html text withouth images and image HTML) */ function forum_print_attachments($post, $cm, $type) { - global $CFG, $DB, $USER; + global $CFG, $DB, $USER, $OUTPUT; if (empty($post->attachment)) { return $type !== 'separateimages' ? '' : array('', ''); @@ -4296,8 +4296,8 @@ function forum_print_attachments($post, $cm, $type) { foreach ($files as $file) { $filename = $file->get_filename(); $mimetype = $file->get_mimetype(); - $icon = mimeinfo_from_type('icon', $mimetype); - $iconimage = ''.$icon.''; + $icon = str_replace(array('.gif', '.png'), '', mimeinfo_from_type('icon', $mimetype)); + $iconimage = ''.$icon.''; $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$context->id.'/forum_attachment/'.$post->id.'/'.$filename); if ($type == 'html') { @@ -5685,7 +5685,7 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=-1, $di */ function forum_print_discussion($course, $cm, $forum, $discussion, $post, $mode, $canreply=NULL, $canrate=false) { - global $USER, $CFG, $DB, $PAGE; + global $USER, $CFG, $DB, $PAGE, $OUTPUT; if (!empty($USER->id)) { $ownpost = ($USER->id == $post->userid); @@ -5806,7 +5806,7 @@ function forum_print_discussion($course, $cm, $forum, $discussion, $post, $mode, echo '
'; echo ''; if (ajaxenabled() && !empty($CFG->forum_ajaxrating)) { /// AJAX enabled, standard submission form - $PAGE->requires->js_function_call('init_rate_ajax'); + $PAGE->requires->js_function_call('add_menu_listeners', array($OUTPUT->old_icon_url('i/loading_small')))->on_dom_ready(); } if ($forum->scale < 0) { if ($scale = $DB->get_record("scale", array("id" => abs($forum->scale)))) { @@ -5815,7 +5815,6 @@ function forum_print_discussion($course, $cm, $forum, $discussion, $post, $mode, } echo '
'; } - echo ''; echo ''; } diff --git a/mod/forum/rate_ajax.js b/mod/forum/rate_ajax.js index 534067acb6..d252aa5755 100644 --- a/mod/forum/rate_ajax.js +++ b/mod/forum/rate_ajax.js @@ -26,21 +26,14 @@ /// Javascript used to handle AJAX forum ratings -/** - * This function initializes all the stuff needed to have forum ratings - * working under AJAX. Basically it adds one onload listener that triggers - * the add_menu_listeners() function to add menu listeners - */ -function init_rate_ajax () { - YAHOO.util.Event.onDOMReady(add_menu_listeners); -} - +var smallloadingicon; /** * This function adds event listeners to any rating * menu found in he page (class = forumpostratingmenu) * and prevents manual submission */ -function add_menu_listeners(e) { +function add_menu_listeners(loadingicon) { + smallloadingicon = loadingicon; /** hide the submit button */ var submitbutton = YAHOO.util.Dom.get('forumpostratingsubmit'); @@ -88,7 +81,7 @@ function perform_rate(e, menu) { /** Start animation **/ var animatedElement = YAHOO.util.Dom.getAncestorByTagName(menu, 'div'); - animatedElement.style.background = "url('" + moodle_cfg.pixpath + "/i/loading_small.gif') no-repeat top right"; + animatedElement.style.background = "url('" + smallloadingicon + "') no-repeat top right"; } diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index 383ff2912b..e626c37dc3 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -1228,7 +1228,7 @@ function glossary_search_entries($searchterms, $glossary, $extended) { * @return string image string or nothing depending on $type param */ function glossary_print_attachments($entry, $cm, $type=NULL, $align="left") { - global $CFG, $DB; + global $CFG, $DB, $OUTPUT; if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { return ''; @@ -1256,8 +1256,8 @@ function glossary_print_attachments($entry, $cm, $type=NULL, $align="left") { foreach ($files as $file) { $filename = $file->get_filename(); $mimetype = $file->get_mimetype(); - $icon = mimeinfo_from_type('icon', $mimetype); - $iconimage = ''.$icon.''; + $icon = str_replace(array('.gif', '.png'), '', mimeinfo_from_type('icon', $mimetype)); + $iconimage = ''.$icon.''; $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$context->id.'/glossary_attachment/'.$entry->id.'/'.$filename); if ($type == 'html') { diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php index 25fcb37dde..d5f7c5b49d 100644 --- a/mod/quiz/locallib.php +++ b/mod/quiz/locallib.php @@ -795,7 +795,7 @@ function quiz_question_action_icons($quiz, $cmid, $question, $returnurl) { * @return the HTML for an edit icon, view icon, or nothing for a question (depending on permissions). */ function quiz_question_edit_button($cmid, $question, $returnurl, $contentbeforeicon = '') { - global $CFG; + global $CFG, $OUTPUT; // Minor efficiency saving. Only get strings once, even if there are a lot of icons on one page. static $stredit = null; @@ -821,7 +821,7 @@ function quiz_question_edit_button($cmid, $question, $returnurl, $contentbeforei $questionparams = array('returnurl' => $returnurl, 'cmid' => $cmid, 'id' => $question->id); $questionurl = new moodle_url("$CFG->wwwroot/question/question.php", $questionparams); return '' . $contentbeforeicon . - '' . $action . ''; + '' . $action . ''; } else { return $contentbeforeicon; } diff --git a/mod/quiz/styles.php b/mod/quiz/styles.php index 2fde483ea2..f3acc20d1b 100644 --- a/mod/quiz/styles.php +++ b/mod/quiz/styles.php @@ -1,3 +1,3 @@ #quiznavigation .qnbutton.flagged { - background-image: url(pixpath ?>/i/ne_red_mark.png); + background-image: url('old_icon_url('i/ne_red_mark') ?>'); } diff --git a/mod/resource/type/directory/resource.class.php b/mod/resource/type/directory/resource.class.php index 3a3657c2b5..353cd50ddf 100644 --- a/mod/resource/type/directory/resource.class.php +++ b/mod/resource/type/directory/resource.class.php @@ -25,7 +25,7 @@ function _postprocess(&$resource) { } function display() { - global $CFG; + global $CFG, $OUTPUT; /// Set up generic stuff first, including checking for access parent::display(); @@ -116,25 +116,25 @@ function display() { ""; foreach ($files as $file) { if (is_dir("$CFG->dataroot/$relativepath/$file")) { // Must be a directory - $icon = "folder.gif"; + $icon = 'folder'; $relativeurl = "/view.php?blah"; $filesize = display_size(get_directory_size("$CFG->dataroot/$relativepath/$file")); } else { - $icon = mimeinfo("icon", $file); + $icon = str_replace(array('.gif', '.png'), '', mimeinfo("icon", $file)); $relativeurl = get_file_url("$relativepath/$file"); $filesize = display_size(filesize("$CFG->dataroot/$relativepath/$file")); } - if ($icon == 'folder.gif') { + if ($icon == 'folder') { echo ''; echo ''; echo "id}&subdir=$subdir/$file\">"; - echo "pixpath/f/$icon\" class=\"icon\" alt=\"$strfolder\" /> $file"; + echo "old_icon_url('f/' . $icon) . "\" class=\"icon\" alt=\"$strfolder\" /> $file"; } else { echo ''; echo ''; - link_to_popup_window($relativeurl, "resourcedirectory{$resource->id}", "pixpath/f/$icon\" class=\"icon\" alt=\"$strfile\" /> $file", 450, 600, ''); + link_to_popup_window($relativeurl, "resourcedirectory{$resource->id}", "old_icon_url('f/' . $icon) . "\" class=\"icon\" alt=\"$strfile\" /> $file", 450, 600, ''); } echo ''; echo ' '; diff --git a/mod/scorm/datamodels/aicclib.php b/mod/scorm/datamodels/aicclib.php index 9426c3f2dc..804f756742 100644 --- a/mod/scorm/datamodels/aicclib.php +++ b/mod/scorm/datamodels/aicclib.php @@ -329,14 +329,13 @@ function scorm_parse_aicc($scorm) { } function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='normal',$attempt='',$play=false) { - global $CFG, $DB, $PAGE; + global $CFG, $DB, $PAGE, $OUTPUT; $strexpand = get_string('expcoll','scorm'); $modestr = ''; if ($mode == 'browse') { $modestr = '&mode='.$mode; } - $scormpixdir = $CFG->modpixpath.'/scorm/pix'; $result = new stdClass(); $result->toc = "\n"; if ($scorm->hidetoc == 0) { - $result->toc .= $PAGE->requires->data_for_js('scormdata', Array('scormpixdir'=>$scormpixdir))->asap(); + $result->toc .= $PAGE->requires->data_for_js('scormdata', array( + 'plusicon' => $OUTPUT->mod_icon_url('pix/plus', 'scorm'), + 'minusicon' => $OUTPUT->mod_icon_url('pix/minus', 'scorm')))->asap(); $result->toc .= $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js')->asap(); } diff --git a/mod/scorm/datamodels/scorm_12lib.php b/mod/scorm/datamodels/scorm_12lib.php index 076e399c02..637f3b47bd 100644 --- a/mod/scorm/datamodels/scorm_12lib.php +++ b/mod/scorm/datamodels/scorm_12lib.php @@ -107,14 +107,13 @@ function scorm_eval_prerequisites($prerequisites, $usertracks) { } function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='normal',$attempt='',$play=false) { - global $CFG, $DB, $PAGE; + global $CFG, $DB, $PAGE, $OUTPUT; $strexpand = get_string('expcoll','scorm'); $modestr = ''; if ($mode == 'browse') { $modestr = '&mode='.$mode; } - $scormpixdir = $CFG->modpixpath.'/scorm/pix'; $result = new stdClass(); $result->toc = "\n"; if ($scorm->hidetoc == 0) { - $PAGE->requires->data_for_js('scormdata', Array('scormpixdir'=>$scormpixdir)); + $PAGE->requires->data_for_js('scormdata', array( + 'plusicon' => $OUTPUT->mod_icon_url('pix/plus', 'scorm'), + 'minusicon' => $OUTPUT->mod_icon_url('pix/minus', 'scorm'))); $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js'); } diff --git a/mod/scorm/datamodels/scorm_13lib.php b/mod/scorm/datamodels/scorm_13lib.php index 14dddb0390..95b3aed640 100644 --- a/mod/scorm/datamodels/scorm_13lib.php +++ b/mod/scorm/datamodels/scorm_13lib.php @@ -1,14 +1,13 @@ modpixpath.'/scorm/pix'; $result = new stdClass(); $result->toc = "\n"; if ($scorm->hidetoc == 0) { - $PAGE->requires->data_for_js('scormdata', Array('scormpixdir'=>$scormpixdir)); + $PAGE->requires->data_for_js('scormdata', array( + 'plusicon' => $OUTPUT->mod_icon_url('pix/plus', 'scorm'), + 'minusicon' => $OUTPUT->mod_icon_url('pix/minus', 'scorm'))); $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js'); } diff --git a/mod/scorm/datamodels/scorm_datamodels.js b/mod/scorm/datamodels/scorm_datamodels.js index 071c4c5e78..c199f8cfe9 100644 --- a/mod/scorm/datamodels/scorm_datamodels.js +++ b/mod/scorm/datamodels/scorm_datamodels.js @@ -3,11 +3,11 @@ function expandCollide(which,list,item) { which = which.substring(0,(which.length)); var el2 = document.ids ? document.ids[which] : document.getElementById ? document.getElementById(which) : document.all[which]; if (el.style.display != "none") { - el2.src = scormdata.scormpixdir+"/plus.gif"; + el2.src = scormdata.plusicon; el.style.display='none'; new cookie("hide:SCORMitem" + item, 1, 356, "/").set(); } else { - el2.src = scormdata.scormpixdir+"/minus.gif"; + el2.src = scormdata.minusicon; el.style.display='block'; new cookie("hide:SCORMitem" + item, 1, -1, "/").set(); } diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php index cd453caa5f..f1e1792d44 100755 --- a/mod/scorm/lib.php +++ b/mod/scorm/lib.php @@ -304,10 +304,9 @@ function scorm_user_outline($course, $user, $mod, $scorm) { * @return boolean */ function scorm_user_complete($course, $user, $mod, $scorm) { - global $CFG, $DB; + global $CFG, $DB, $OUTPUT; $liststyle = 'structlist'; - $scormpixdir = $CFG->modpixpath.'/scorm/pix'; $now = time(); $firstmodify = $now; $lastmodify = 0; @@ -367,7 +366,7 @@ function scorm_user_complete($course, $user, $mod, $scorm) { if (($nextsco !== false) && ($sco->parent != $nextsco->parent) && (($level==0) || (($level>0) && ($nextsco->parent == $sco->identifier)))) { $sublist++; } else { - $report .= ''; + $report .= ''; } if ($sco->launch) { @@ -379,7 +378,7 @@ function scorm_user_complete($course, $user, $mod, $scorm) { $usertrack->status = 'notattempted'; } $strstatus = get_string($usertrack->status,'scorm'); - $report .= "status.".gif' alt='$strstatus' title='$strstatus' />"; + $report .= "status, 'scorm')."' alt='$strstatus' title='$strstatus' />"; if ($usertrack->timemodified != 0) { if ($usertrack->timemodified > $lastmodify) { $lastmodify = $usertrack->timemodified; @@ -390,9 +389,9 @@ function scorm_user_complete($course, $user, $mod, $scorm) { } } else { if ($sco->scormtype == 'sco') { - $report .= ''.get_string('notattempted','scorm').''; + $report .= ''.get_string('notattempted','scorm').''; } else { - $report .= ''.get_string('asset','scorm').''; + $report .= ''.get_string('asset','scorm').''; } } $report .= " $sco->title $score$totaltime\n"; diff --git a/mod/scorm/loadSCO.php b/mod/scorm/loadSCO.php index 5cf4110d94..df4343ca73 100755 --- a/mod/scorm/loadSCO.php +++ b/mod/scorm/loadSCO.php @@ -122,8 +122,6 @@ $result = "$CFG->wwwroot/pluginfile.php/$context->id/scorm_content/$scorm->revision/$launcher"; } - $scormpixdir = $CFG->modpixpath.'/scorm/pix'; - // which API are we looking for $LMS_api = ($scorm->version == 'scorm_12' || $scorm->version == 'SCORM_1.2' || empty($scorm->version)) ? 'API' : 'API_1484_11'; ?> @@ -171,7 +169,7 @@ location = ""; } else { - document.body.innerHTML = "

.  

"; + document.body.innerHTML = "

.   '>

"; var e = document.getElementById("countdown"); var cSeconds = parseInt(e.innerHTML); var timer = setInterval(function() { diff --git a/mod/scorm/report.php b/mod/scorm/report.php index cb5ca372cd..c66f2d5ac3 100755 --- a/mod/scorm/report.php +++ b/mod/scorm/report.php @@ -101,8 +101,6 @@ } } - $scormpixdir = $CFG->modpixpath.'/scorm/pix'; - if (empty($b)) { if (empty($a)) { // No options, show the global scorm report @@ -258,7 +256,7 @@ $detailslink = ' '; } $strstatus = get_string($trackdata->status,'scorm'); - $row[] = ''.$strstatus.'mod_icon_url('pix/' . $trackdata->status, 'scorm').'" alt="'.$strstatus.'" title="'. $strstatus.'" /> '.format_string($sco->title); $row[] = get_string($trackdata->status,'scorm'); $row[] = $trackdata->total_time; @@ -299,7 +297,7 @@ $trackdata->total_time = ''; } $strstatus = get_string($trackdata->status,'scorm'); - echo ''.$strstatus.'mod_icon_url('pix/'.$trackdata->status, 'scorm').'" alt="'.$strstatus.'" title="'. $strstatus.'" /> '.$trackdata->total_time.'
'.$scoreview.'
'; echo ''."\n"; echo '

'.get_string('details','scorm').'

'; diff --git a/mod/wiki/ewiki/plugins/moodle/downloads.php b/mod/wiki/ewiki/plugins/moodle/downloads.php index 06504bd6fe..7da8c60440 100644 --- a/mod/wiki/ewiki/plugins/moodle/downloads.php +++ b/mod/wiki/ewiki/plugins/moodle/downloads.php @@ -294,7 +294,7 @@ function ewiki_page_filedownload($id, $data, $action, $def_sec="") { function ewiki_entry_downloads($row, $show_section=0, $fullinfo=false) { - global $ewiki_binary_icons, $ewiki_upload_sections, $DB; + global $ewiki_binary_icons, $ewiki_upload_sections, $DB, $OUTPUT; $meta = &$row["meta"]; @@ -329,9 +329,9 @@ function ewiki_entry_downloads($row, $show_section=0, $fullinfo=false) { /// Moodle Icon Handling global $CFG; - $icon = mimeinfo("icon", $id); - $p_icon="$CFG->pixpath/f/$icon"; - $p_icon_t=""; + $icon = str_replace(array('.gif', '.png'), '', mimeinfo("icon", $id)); + $p_icon = $OUTPUT->old_icon_url('f/' . $icon); + $p_icon_t = ''; $info->id = $id; $info->size = $p_size; -- 2.39.5