Fixed some old pix paths

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 32a7585dd46df2474f15855b89d53b702a52d0bb..d91938bea509b2271c530e52624e3dbddeefdbc2 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -513,9 +513,9 @@ function assignment_print_user_files($assignment, $user) {
                     $ffurl = "file.php?file=/$filearea/$file";
                 }
 
-                echo "<IMG SRC=\"$CFG->wwwroot/files/pix/$icon\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"File\">";
-                echo "&nbsp;<A TARGET=\"uploadedfile\" HREF=\"$CFG->wwwroot/$ffurl\">$file</A>";
-                echo "<BR>";
+                echo "<img src=\"$CFG->pixpath/f/$icon\" height=16 width=16 border=0 alt=\"file\">";
+                echo "&nbsp;<a target=\"uploadedfile\" href=\"$CFG->wwwroot/$ffurl\">$file</a>";
+                echo "<br />";
             }
         }
     }

diff --git a/mod/exercise/lib.php b/mod/exercise/lib.php
index 05368cdcb147ad228d3be1d6e614a73a4030ca10..08ab30d7b008e064c15fdf6adbb61ddc5bbe6e15 100644 (file)
--- a/mod/exercise/lib.php
+++ b/mod/exercise/lib.php
@@ -2385,7 +2385,7 @@ function exercise_print_assessment_form($exercise, $assessment = false, $allowch
                        echo "</TD><TD>". get_string("suggestedgrade", "exercise")."</TD></TR>\n";
                        for ($i=0; $i<=$exercise->nelements; $i++) {
                                if ($i == intval($error + 0.5)) {
-                                       echo "<TR><TD ALIGN=\"CENTER\"><IMG SRC=\"../../pix/t/right.gif\"> $i</TD><TD ALIGN=\"CENTER\">{$elements[$i]->maxscore}</TD></TR>\n";
+                                       echo "<TR><TD ALIGN=\"CENTER\"><IMG SRC=\"$CFG->pixpath/t/right.gif\"> $i</TD><TD ALIGN=\"CENTER\">{$elements[$i]->maxscore}</TD></TR>\n";
                                        }
                                else {
                                        echo "<TR><TD ALIGN=\"CENTER\">$i</TD><TD ALIGN=\"CENTER\">{$elements[$i]->maxscore}</TD></TR>\n";
@@ -2981,7 +2981,7 @@ function exercise_print_dual_assessment_form($exercise, $assessment, $submission
                        echo "</TD><TD>". get_string("suggestedgrade", "exercise")."</TD></TR>\n";
                        for ($i=0; $i<=$exercise->nelements; $i++) {
                                if ($i == intval($error + 0.5)) {
-                                       echo "<TR><TD ALIGN=\"CENTER\"><IMG SRC=\"../../pix/t/right.gif\"> $i</TD><TD ALIGN=\"CENTER\">{$elements[$i]->maxscore}</TD></TR>\n";
+                                       echo "<TR><TD ALIGN=\"CENTER\"><IMG SRC=\"$CFG->pixpath/t/right.gif\"> $i</TD><TD ALIGN=\"CENTER\">{$elements[$i]->maxscore}</TD></TR>\n";
                                        }
                                else {
                                        echo "<TR><TD ALIGN=\"CENTER\">$i</TD><TD ALIGN=\"CENTER\">{$elements[$i]->maxscore}</TD></TR>\n";
@@ -3423,7 +3423,7 @@ function exercise_print_dual_assessment_form($exercise, $assessment, $submission
                        echo "</TD><TD>". get_string("suggestedgrade", "exercise")."</TD></TR>\n";
                        for ($i=0; $i<=$exercise->nelements; $i++) {
                                if ($i == intval($error + 0.5)) {
-                                       echo "<TR><TD ALIGN=\"CENTER\"><IMG SRC=\"../../pix/t/right.gif\"> $i</TD><TD ALIGN=\"CENTER\">{$elements[$i]->maxscore}</TD></TR>\n";
+                                       echo "<TR><TD ALIGN=\"CENTER\"><IMG SRC=\"$CFG->pixpath/t/right.gif\"> $i</TD><TD ALIGN=\"CENTER\">{$elements[$i]->maxscore}</TD></TR>\n";
                                        }
                                else {
                                        echo "<TR><TD ALIGN=\"CENTER\">$i</TD><TD ALIGN=\"CENTER\">{$elements[$i]->maxscore}</TD></TR>\n";
@@ -3727,7 +3727,7 @@ function exercise_print_submission_title($exercise, $submission) {
             } else {
                 $ffurl = "file.php?file=/$filearea/$file";
             }
-            return "<IMG SRC=\"$CFG->wwwroot/files/pix/$icon\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"File\">".
+            return "<IMG SRC=\"$CFG->pixpath/f/$icon\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"File\">".
                 "&nbsp;<A TARGET=\"uploadedfile\" HREF=\"$CFG->wwwroot/$ffurl\">$submission->title</A>";
         }
     }

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 5470668de8f9d592db6b0053d2e3f26bb4d8d22b..443612f001b6353e0764b63874c890f92668e9c1 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -1641,7 +1641,7 @@ function forum_print_attachments($post, $return=NULL) {
                 } else {
                     $ffurl = "file.php?file=/$filearea/$file";
                 }
-                $image = "<img border=0 src=\"$CFG->wwwroot/files/pix/$icon\" height=16 width=16 alt=\"$strpopupwindow\">";
+                $image = "<img border=\"0\" src=\"$CFG->pixpath/f/$icon\" height=\"16\" width=\"16\" alt=\"$strpopupwindow\">";
 
                 if ($return == "html") {
                     $output .= "<a href=\"$CFG->wwwroot/$ffurl\">$image</a> ";

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index a8b42340b5787ad8f5e5238b43d05e81033811f6..55465e2e9bd3d09e09121231ba3766924ee95b5d 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -568,7 +568,7 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry,$mode="",$ho
         if ( $entry->sourceglossaryid ) {
             $icon = "minus.gif";   // graphical metaphor (minus) for deleting an imported entry
         } else {
-            $icon = "../../pix/t/delete.gif";
+            $icon = "$CFG->pixpath/t/delete.gif";
         }
 
         // Exported entries can be updated/deleted only by teachers in the main glossary
@@ -577,7 +577,7 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry,$mode="",$ho
             $return .= $icon;
             $return .= "\" height=11 width=11 border=0></a> ";
             
-            $return .= " <a title=\"" . get_string("edit") . "\" href=\"edit.php?id=$cm->id&e=$entry->id&mode=$mode&hook=$hook\"><img src=\"../../pix/t/edit.gif\" height=11 width=11 border=0></a>";
+            $return .= " <a title=\"" . get_string("edit") . "\" href=\"edit.php?id=$cm->id&e=$entry->id&mode=$mode&hook=$hook\"><img src=\"$CFG->pixpath/t/edit.gif\" height=11 width=11 border=0></a>";
         } elseif ( $importedentry ) {
             $return .= " <font size=-1>" . get_string("exportedentry","glossary") . "</font>";
         }
@@ -981,7 +981,7 @@ function glossary_print_attachments($entry, $return=NULL, $align="left") {
                 } else {
                     $ffurl = "file.php?file=/$filearea/$file";
                 }
-                $image = "<img border=0 src=\"$CFG->wwwroot/files/pix/$icon\" height=16 width=16 alt=\"$strpopupwindow\">";
+                $image = "<img border=0 src=\"$CFG->pixpath/f/$icon\" height=16 width=16 alt=\"$strpopupwindow\">";
 
                 if ($return == "html") {
                     $output .= "<a target=_image href=\"$CFG->wwwroot/$ffurl\">$image</a> ";
@@ -1440,11 +1440,11 @@ function glossary_print_comment($course, $cm, $glossary, $entry, $comment) {
     echo "<div align=right><p align=right>";
     if ( (time() - $comment->timemodified <  $CFG->maxeditingtime and $USER->id == $comment->userid)  or isteacher($course->id) ) {
         echo "<a href=\"comment.php?id=$cm->id&eid=$entry->id&cid=$comment->id&action=edit\"><img  
-               alt=\"" . get_string("edit") . "\" src=\"../../pix/t/edit.gif\" height=11 width=11 border=0></a> ";
+               alt=\"" . get_string("edit") . "\" src=\"$CFG->pixpath/t/edit.gif\" height=11 width=11 border=0></a> ";
     }
     if ( $USER->id == $comment->userid or isteacher($course->id) ) {
         echo "<a href=\"comment.php?id=$cm->id&eid=$entry->id&cid=$comment->id&action=delete\"><img  
-               alt=\"" . get_string("delete") . "\" src=\"../../pix/t/delete.gif\" height=11 width=11 border=0></a>";
+               alt=\"" . get_string("delete") . "\" src=\"$CFG->pixpath/t/delete.gif\" height=11 width=11 border=0></a>";
     }
     
     echo "</p>";

diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index 851b46b10765906a24629195f5db6964e98dd269..5897942ca4527a90c98cbe50e4676818003dee17 100644 (file)
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -3033,7 +3033,7 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
                                }
                        for ($i=0; $i<=$workshop->nelements; $i++) {
                                if ($i == $negativecount) {
-                                       echo "<TR><TD ALIGN=\"CENTER\"><IMG SRC=\"../../pix/t/right.gif\"> $i</TD><TD ALIGN=\"CENTER\">{$elements[$i]->maxscore}</TD></TR>\n";
+                                       echo "<TR><TD ALIGN=\"CENTER\"><IMG SRC=\"$CFG->pixpath/t/right.gif\"> $i</TD><TD ALIGN=\"CENTER\">{$elements[$i]->maxscore}</TD></TR>\n";
                                        }
                                else {
                                        echo "<TR><TD ALIGN=\"CENTER\">$i</TD><TD ALIGN=\"CENTER\">{$elements[$i]->maxscore}</TD></TR>\n";
@@ -3489,7 +3489,7 @@ function workshop_print_submission_title($workshop, $submission) {
             } else {
                 $ffurl = "file.php?file=/$filearea/$file";
             }
-            return "<IMG SRC=\"$CFG->wwwroot/files/pix/$icon\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"File\">".
+            return "<IMG SRC=\"$CFG->pixpath/f/$icon\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"File\">".
                 "&nbsp;<A TARGET=\"uploadedfile$submission->id\" HREF=\"$CFG->wwwroot/$ffurl\">$submission->title</A>";
         }
     }