mirror of
https://github.com/moodle/moodle.git
synced 2025-04-20 16:04:25 +02:00
MDL-8319 avatar image is now deleted from disk, user/pix.php redirects to default picture if user picture not present(===deleted)
This commit is contained in:
parent
77b09448b3
commit
9d85247dab
@ -20,8 +20,11 @@ function useredit_update_user_preference($usernew) {
|
||||
}
|
||||
|
||||
function useredit_update_picture(&$usernew, &$userform) {
|
||||
global $CFG;
|
||||
|
||||
if (isset($usernew->deletepicture) and $usernew->deletepicture) {
|
||||
//TODO - delete the file
|
||||
$location = $CFG->dataroot.'/users/'.$usernew->id;
|
||||
@remove_dir($location);
|
||||
set_field('user', 'picture', 0, 'id', $usernew->id);
|
||||
} else if ($usernew->picture = save_profile_image($usernew->id, $userform->get_um(), 'users')) {
|
||||
set_field('user', 'picture', 1, 'id', $usernew->id);
|
||||
|
14
user/pix.php
14
user/pix.php
@ -19,15 +19,11 @@
|
||||
$userid = (integer)$args[0];
|
||||
$image = $args[1];
|
||||
$pathname = $CFG->dataroot.'/users/'.$userid.'/'.$image;
|
||||
} else {
|
||||
$image = 'f1.png';
|
||||
$pathname = $CFG->dirroot.'/pix/u/f1.png';
|
||||
if (file_exists($pathname) and !is_dir($pathname)) {
|
||||
send_file($pathname, $image);
|
||||
}
|
||||
}
|
||||
|
||||
if (file_exists($pathname) and !is_dir($pathname)) {
|
||||
send_file($pathname, $image);
|
||||
} else {
|
||||
header('HTTP/1.0 404 not found');
|
||||
error(get_string('filenotfound', 'error')); //this is not displayed on IIS??
|
||||
}
|
||||
// picture was deleted - use default instead
|
||||
redirect($CFG->pixpath.'/u/f1.png');
|
||||
?>
|
||||
|
Loading…
x
Reference in New Issue
Block a user