mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-21 07:28:31 +01:00
Code Issues Projects Releases Wiki Activity

Merged updates from stable

Browse Source
This commit is contained in:
moodler 2004-08-26 13:01:36 +00:00
parent 76201e6648
commit 3fbffafb8b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mod/resource/type/file/resource.class.php
View File

@ -42,6 +42,8 @@ function set_parameters() {
'value' => $USER->id),
'userusername' => array('langstr' => get_string('username'),
'value' => $USER->username),
'userpassword' => array('langstr' => get_string('password'),
'value' => $USER->password),
'useridnumber' => array('langstr' => get_string('idnumber'),
'value' => $USER->idnumber),
'userfirstname' => array('langstr' => get_string('firstname'),
@ -54,8 +56,10 @@ function set_parameters() {
'value' => $USER->email),
'usericq' => array('langstr' => get_string('icqnumber'),
'value' => $USER->icq),
'userphone1' => array('langstr' => get_string('phone'),
'userphone1' => array('langstr' => get_string('phone').' 1',
'value' => $USER->phone1),
'userphone2' => array('langstr' => get_string('phone').' 2',
'value' => $USER->phone2),
'userinstitution' => array('langstr' => get_string('institution'),
'value' => $USER->institution),
'userdepartment' => array('langstr' => get_string('department'),
@ -504,7 +508,7 @@ function setup($form) {
}
$windowtype = ($CFG->resource_popup) ? 'popup' : 'page';
if (!isset($form->options)) {
if (empty($form->options)) {
$form->options = 'frame';
$form->reference = $CFG->resource_defaulturl;
}