moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-29844 Administration: Added new config for users to login for viewing profile image

Browse source
This commit is contained in:
Eloy Lafuente 2011-12-12 12:33:54 +08:00 • committed by Rajesh Taneja
parent 929c26ccf1
commit e4b1208377
5 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
admin/settings/security.php
View file

@ -16,6 +16,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
$temp->add(new admin_setting_configcheckbox('protectusernames', get_string('protectusernames', 'admin'), get_string('configprotectusernames', 'admin'), 1)); $temp->add(new admin_setting_configcheckbox('protectusernames', get_string('protectusernames', 'admin'), get_string('configprotectusernames', 'admin'), 1));
$temp->add(new admin_setting_configcheckbox('forcelogin', get_string('forcelogin', 'admin'), get_string('configforcelogin', 'admin'), 0)); $temp->add(new admin_setting_configcheckbox('forcelogin', get_string('forcelogin', 'admin'), get_string('configforcelogin', 'admin'), 0));
$temp->add(new admin_setting_configcheckbox('forceloginforprofiles', get_string('forceloginforprofiles', 'admin'), get_string('configforceloginforprofiles', 'admin'), 1)); $temp->add(new admin_setting_configcheckbox('forceloginforprofiles', get_string('forceloginforprofiles', 'admin'), get_string('configforceloginforprofiles', 'admin'), 1));
$temp->add(new admin_setting_configcheckbox('forceloginforprofileimage', get_string('forceloginforprofileimage', 'admin'), get_string('forceloginforprofileimage_help', 'admin'), 0));
$temp->add(new admin_setting_configcheckbox('opentogoogle', get_string('opentogoogle', 'admin'), get_string('configopentogoogle', 'admin'), 0)); $temp->add(new admin_setting_configcheckbox('opentogoogle', get_string('opentogoogle', 'admin'), get_string('configopentogoogle', 'admin'), 0));
$temp->add(new admin_setting_pickroles('profileroles', $temp->add(new admin_setting_pickroles('profileroles',
get_string('profileroles','admin'), get_string('profileroles','admin'),

2
lang/en/admin.php
View file

@ -516,6 +516,8 @@ $string['filtersettings'] = 'Manage filters';
$string['filtersettingsgeneral'] = 'General filter settings'; $string['filtersettingsgeneral'] = 'General filter settings';
$string['filteruploadedfiles'] = 'Filter uploaded files'; $string['filteruploadedfiles'] = 'Filter uploaded files';
$string['forcelogin'] = 'Force users to login'; $string['forcelogin'] = 'Force users to login';
$string['forceloginforprofileimage'] = 'Force users to login to view user pictures';
$string['forceloginforprofileimage_help'] = 'If enabled, users must login in order to view user profile pictures and the default user picture will be used in all notification emails.';
$string['forceloginforprofiles'] = 'Force users to login for profiles'; $string['forceloginforprofiles'] = 'Force users to login for profiles';
$string['forcetimezone'] = 'Force default timezone'; $string['forcetimezone'] = 'Force default timezone';
$string['frontpage'] = 'Front page'; $string['frontpage'] = 'Front page';

4
lib/filelib.php
View file

@ -3404,8 +3404,10 @@ function file_pluginfile($relativepath, $forcedownload) {
$themename = array_shift($args); $themename = array_shift($args);
$filename = array_shift($args); $filename = array_shift($args);
} }
if ((!empty($CFG->forcelogin) and !isloggedin())) { if ((!empty($CFG->forcelogin) and !isloggedin()) ||
(!empty($CFG->forceloginforprofileimage) && (!isloggedin() || isguestuser()))) {
// protect images if login required and not logged in; // protect images if login required and not logged in;
// also if login is required for profile images and is not logged in or guest
// do not use require_login() because it is expensive and not suitable here anyway // do not use require_login() because it is expensive and not suitable here anyway
$redirect = true; $redirect = true;
} }

4
lib/outputcomponents.php
View file

@ -276,8 +276,10 @@ class user_picture implements renderable {
$renderer = $page->get_renderer('core'); $renderer = $page->get_renderer('core');
} }
if (!empty($CFG->forcelogin) and !isloggedin()) { if ((!empty($CFG->forcelogin) and !isloggedin()) ||
(!empty($CFG->forceloginforprofileimage) && (!isloggedin() || isguestuser()))) {
// protect images if login required and not logged in; // protect images if login required and not logged in;
// also if login is required for profile images and is not logged in or guest
// do not use require_login() because it is expensive and not suitable here anyway // do not use require_login() because it is expensive and not suitable here anyway
return $renderer->pix_url('u/f1'); return $renderer->pix_url('u/f1');
} }

2
version.php
View file

@ -30,7 +30,7 @@
defined('MOODLE_INTERNAL') || die(); defined('MOODLE_INTERNAL') || die();
$version = 2011120500.04; // 20111205 = branching date YYYYMMDD - do not modify! $version = 2011120500.05; // 20111205 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches // RR = release increments - 00 in DEV branches
// .XX = incremental changes // .XX = incremental changes