Further little fixes to user image displaying

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 5d872d5341594e0347e0921594631345ac884e06..e1e45c690cb9f652518e890faf944f8ce74a64fc 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -1585,7 +1585,7 @@ function iswindows() {
 
    global $WINDIR;
 
-   return empty($WINDIR);
+   return isset($WINDIR);
 }
 
 

diff --git a/user/lib.php b/user/lib.php
index 42c0c00557af5824b7dad3f0090a205cfbfb6a7c..540b766b24d9fed0fbd31431aadf2591ab5e4345 100644 (file)
--- a/user/lib.php
+++ b/user/lib.php
@@ -50,14 +50,9 @@ function print_user($user, $course, $string) {
     global $USER, $COUNTRIES;
     
     echo "<TABLE WIDTH=80% ALIGN=CENTER BORDER=0 CELLPADDING=1 CELLSPACING=1><TR><TD BGCOLOR=#888888>";
-    echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=0 CELLSPACING=0><TR>";
+    echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=5 CELLSPACING=0><TR>";
     echo "<TD WIDTH=100 BGCOLOR=#FFFFFF VALIGN=top>";
-    echo "<A HREF=\"view.php?id=$user->id&course=$course->id\">";
-    if ($user->picture) {
-        echo "<IMG BORDER=0 ALIGN=left WIDTH=100 SRC=\"pix.php/$user->id/f1.jpg\">";
-    } else {
-        echo "<IMG BORDER=0 ALIGN=left WIDTH=100 SRC=\"default/f1.jpg\">";
-    }
+    print_user_picture($user->id, $course->id, $user->picture, true);
     echo "</A>";
     echo "</TD><TD WIDTH=100% BGCOLOR=#FFFFFF VALIGN=top>";
     echo "<FONT SIZE=-1>";

diff --git a/user/view.php b/user/view.php
index 30268f476942e51a804b0e6817b03c84f3720f63..0a390e0be610b42879d79cfb0bc499bd5758c9f7 100644 (file)
--- a/user/view.php
+++ b/user/view.php
@@ -48,11 +48,7 @@
     echo "<TABLE WIDTH=80% ALIGN=CENTER BORDER=0 CELLPADDING=1 CELLSPACING=1><TR><TD BGCOLOR=#888888>";
     echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=3 CELLSPACING=0><TR>";
     echo "<TD WIDTH=100 BGCOLOR=\"$THEME->body\" VALIGN=top>";
-    if ($user->picture) {
-        echo "<IMG BORDER=0 ALIGN=left WIDTH=100 SRC=\"pix.php/$user->id/f1.jpg\">";
-    } else {
-        echo "<IMG BORDER=0 ALIGN=left WIDTH=100 SRC=\"default/f1.jpg\">";
-    }
+    print_user_picture($user->id, $course->id, $user->picture, true);
     echo "</TD><TD WIDTH=100% BGCOLOR=#FFFFFF>";