fix for MDL-7487, addin guser setting for screen reader, MDL-7435, add new field...

diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index 102162033bdc05728e5dd5ea2fe0fd8b7a6aea4e..36c01abe0005eb3044e034475c6e815bdcc0ff19 100644 (file)
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -695,6 +695,7 @@ $string['htmlformat'] = 'Pretty HTML format';
 $string['icqnumber'] = 'ICQ number';
 $string['idnumber'] = 'ID number';
 $string['idnumbercourse'] = 'Course ID number';
+$string['imagealt'] = 'Picture description';
 $string['import'] = 'Import';
 $string['importactivities'] = 'Import activities from another course';
 $string['importdata'] = 'Import course data';
@@ -1053,6 +1054,7 @@ $string['paymentthanks'] = 'Thank you for your payment!  You are now enrolled in
 $string['people'] = 'People';
 $string['periodending'] = 'Period ending ($a)';
 $string['personalprofile'] = 'Personal profile';
+$string['pictureof'] = 'Picture of $a';
 $string['phone'] = 'Phone';
 $string['phpinfo'] = 'PHP info';
 $string['pleaseclose'] = 'Please close this window now.';
@@ -1160,6 +1162,9 @@ $string['scalesstandard'] = 'Standard scales';
 $string['scalestip'] = 'To create custom scales, use the \'Scales...\' link in your course administration menu.';
 $string['schedule'] = 'Schedule';
 $string['scheduledbackupstatus'] = 'Scheduled backup status';
+$string['screenreaderuse'] = 'Screen reader';
+$string['screenreaderno'] = 'No';
+$string['screenreaderyes'] = 'Yes';
 $string['screenshot'] = 'Screenshot';
 $string['search'] = 'Search';
 $string['searchagain'] = 'Search again';

diff --git a/lib/weblib.php b/lib/weblib.php
index 7cfca9d38ca3331ba08f5c7f75f8f7b7b8b6ac62..c74f4c4f1ff480a638a35b8646091cad7a84a1c4 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -3041,13 +3041,15 @@ function print_user_picture($userid, $courseid, $picture, $size=0, $return=false
         $class .= " defaultuserpic";
         $src =  "$CFG->pixpath/u/$file.png\"";
     }
-    if ($user = get_record('user', 'username', 'guest')) {
-        $username = fullname($user);
-    } else {
-        $username = get_string('none');
+    if ($user = get_record('user','id',$userid)) {
+        if (!empty($user->imagealt)) {
+            $imagealt = $user->imagealt;
+        } else {
+            $imagealt = get_string('pictureof','',fullname($user));
+        }    
     }
     $output .= "<img class=\"$class\" align=\"middle\" src=\"$src".
-                   " border=\"0\" width=\"$size\" height=\"$size\" alt=\"".s(get_string('user').' '.$username)."\" />";
+                   " border=\"0\" width=\"$size\" height=\"$size\" alt=\"".$imagealt."\" />";
     if ($link) {
         $output .= '</a>';
     }

diff --git a/user/edit.html b/user/edit.html
index 60f9c0f55731deb43e307692049fe5375766553a..26a731aec8abae288e0c1267eb4bc0a9a6a51658 100644 (file)
--- a/user/edit.html
+++ b/user/edit.html
@@ -278,11 +278,18 @@ if (has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SI
     ?>
     </td>
 </tr>
+<tr>
+    <th><?php print_string("screenreaderuse") ?>:</th>
+    <td><?php
+    unset($choices);
+    $choices["0"] = get_string("screenreaderno");
+    $choices["1"] = get_string("screenreaderyes");
+    choose_from_menu ($choices, 'screenreader', $user->screenreader, '', '', 0, false) ?>
+    </td>
+</tr>
 <tr>
     <td colspan="2" style="text-align: center;"><input type="submit" value="<?php print_string("updatemyprofile") ?>" /></td>
 </tr>
-
-
 <tr>
     <td colspan="2" align="center"> <br /><b><?php print_string("followingoptional") ?>:</b></td>
 </tr>
@@ -327,7 +334,12 @@ if (has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SI
     </td>
 </tr>
 <?php } ?>
-
+<tr>
+    <th><?php print_string("imagealt") ?>:</th>
+    <td>
+    <input type="text" name="imagealt" size="30" alt="<?php print_string("imagealt") ?>" maxlength="100" value="<?php p($user->imagealt) ?>" />
+    </td>
+</tr>
 <tr>
     <th><?php print_string("webpage") ?>:</th>
     <td><input type="text" name="url" size="50" alt="<?php print_string("webpage") ?>" maxlength="255" value="<?php p($user->url) ?>" />