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

MDL-13481, Distinguish between course fullname and user fullname

Browse source
This commit is contained in:
dongsheng 2008-03-19 08:49:23 +00:00
parent 317f94b0a2
commit d6cc234114
12 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
course/edit_form.php
View file

@ -74,14 +74,14 @@ class course_edit_form extends moodleform {
$mform->setDefault('category', $category->id);
$mform->setType('category', PARAM_INT);
$mform->addElement('text','fullname', get_string('fullname'),'maxlength="254" size="50"');
$mform->setHelpButton('fullname', array('coursefullname', get_string('fullname')), true);
$mform->addElement('text','fullname', get_string('fullnamecourse'),'maxlength="254" size="50"');
$mform->setHelpButton('fullname', array('coursefullname', get_string('fullnamecourse')), true);
$mform->setDefault('fullname', get_string('defaultcoursefullname'));
$mform->addRule('fullname', get_string('missingfullname'), 'required', null, 'client');
$mform->setType('fullname', PARAM_MULTILANG);
$mform->addElement('text','shortname', get_string('shortname'),'maxlength="100" size="20"');
$mform->setHelpButton('shortname', array('courseshortname', get_string('shortname')), true);
$mform->addElement('text','shortname', get_string('shortnamecourse'),'maxlength="100" size="20"');
$mform->setHelpButton('shortname', array('courseshortname', get_string('shortnamecourse')), true);
$mform->setDefault('shortname', get_string('defaultcourseshortname'));
$mform->addRule('shortname', get_string('missingshortname'), 'required', null, 'client');
$mform->setType('shortname', PARAM_MULTILANG);

10
course/lib.php
View file

@ -263,7 +263,7 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per
}
echo "<th class=\"c1 header\" scope=\"col\">".get_string('time')."</th>\n";
echo "<th class=\"c2 header\" scope=\"col\">".get_string('ip_address')."</th>\n";
echo "<th class=\"c3 header\" scope=\"col\">".get_string('fullname')."</th>\n";
echo "<th class=\"c3 header\" scope=\"col\">".get_string('fullnamecourse')."</th>\n";
echo "<th class=\"c4 header\" scope=\"col\">".get_string('action')."</th>\n";
echo "<th class=\"c5 header\" scope=\"col\">".get_string('info')."</th>\n";
echo "</tr>\n";
@ -383,7 +383,7 @@ function print_mnet_log($hostid, $course, $user=0, $date=0, $order="l.time ASC",
}
echo "<th class=\"c1 header\">".get_string('time')."</th>\n";
echo "<th class=\"c2 header\">".get_string('ip_address')."</th>\n";
echo "<th class=\"c3 header\">".get_string('fullname')."</th>\n";
echo "<th class=\"c3 header\">".get_string('fullnamecourse')."</th>\n";
echo "<th class=\"c4 header\">".get_string('action')."</th>\n";
echo "<th class=\"c5 header\">".get_string('info')."</th>\n";
echo "</tr>\n";
@ -452,7 +452,7 @@ function print_log_csv($course, $user, $date, $order='l.time DESC', $modname,
$modid, $modaction, $groupid) {
$text = get_string('course')."\t".get_string('time')."\t".get_string('ip_address')."\t".
get_string('fullname')."\t".get_string('action')."\t".get_string('info');
get_string('fullnamecourse')."\t".get_string('action')."\t".get_string('info');
if (!$logs = build_logs_array($course, $user, $date, $order, '', '',
$modname, $modid, $modaction, $groupid)) {
@ -568,7 +568,7 @@ function print_log_xls($course, $user, $date, $order='l.time DESC', $modname,
$worksheet = array();
$headers = array(get_string('course'), get_string('time'), get_string('ip_address'),
get_string('fullname'), get_string('action'), get_string('info'));
get_string('fullnamecourse'), get_string('action'), get_string('info'));
// Creating worksheets
for ($wsnumber = 1; $wsnumber <= $nroPages; $wsnumber++) {
@ -681,7 +681,7 @@ function print_log_ods($course, $user, $date, $order='l.time DESC', $modname,
$worksheet = array();
$headers = array(get_string('course'), get_string('time'), get_string('ip_address'),
get_string('fullname'), get_string('action'), get_string('info'));
get_string('fullnamecourse'), get_string('action'), get_string('info'));
// Creating worksheets
for ($wsnumber = 1; $wsnumber <= $nroPages; $wsnumber++) {

2
course/pending.php
View file

@ -99,7 +99,7 @@
$table->cellpadding = 4;
$table->cellspacing = 3;
$table->align = array('center','center','center','center','center','center','center');
$table->head = array('&nbsp;',get_string('shortname'),get_string('fullname'),get_string('requestedby'),get_string('summary'),
$table->head = array('&nbsp;',get_string('shortnamecourse'),get_string('fullnamecourse'),get_string('requestedby'),get_string('summary'),
get_string('requestreason'),'');
$strrequireskey = get_string('requireskey');
foreach ($pending as $course) {

4
course/request_form.php
View file

@ -6,11 +6,11 @@ class course_request_form extends moodleform {
function definition() {
$mform =& $this->_form;
$mform->addElement('text', 'fullname', get_string('fullname'), 'maxlength="254" size="50"');
$mform->addElement('text', 'fullname', get_string('fullnamecourse'), 'maxlength="254" size="50"');
$mform->addRule('fullname', get_string('missingfullname'), 'required', null, 'client');
$mform->setType('fullname', PARAM_TEXT);
$mform->addElement('text', 'shortname', get_string('shortname'), 'maxlength="100" size="20"');
$mform->addElement('text', 'shortname', get_string('shortnamecourse'), 'maxlength="100" size="20"');
$mform->addRule('shortname', get_string('missingshortname'), 'required', null, 'client');
$mform->setType('shortname', PARAM_TEXT);

6
lang/en_utf8/moodle.php
View file

@ -671,6 +671,8 @@ $string['frontpagenews'] = 'News items';
$string['frontpagetopiconly'] = 'Topic section';
$string['fulllistofcourses'] = 'All courses';
$string['fullname'] = 'Full name';
$string['fullnamecourse'] = 'Course full name';
$string['fullnameuser'] = 'User full name';
$string['fullnamedisplay'] = '$a->firstname $a->lastname';
$string['fullprofile'] = 'Full profile';
$string['fullsitename'] = 'Full site name';
@ -1324,6 +1326,8 @@ $string['serverlocaltime'] = 'Server\'s local time';
$string['setcategorytheme'] = 'Set Category Theme';
$string['settings'] = 'Settings';
$string['shortname'] = 'Short name';
$string['shortnamecourse'] = 'Course short name';
$string['shortnameuser'] = 'User short name';
$string['shortnamecollisionwarning'] = '[*] = This shortname is already in use by a course and will need to be changed upon approval';
$string['shortnametaken'] = 'Short name is already used for another course ($a)';
$string['shortsitename'] = 'Short name for site (eg single word)';
@ -1644,4 +1648,4 @@ $string['zippingbackup'] = 'Zipping backup';
$string['authenticationplugins'] = 'Authentication Plugins';
$string['chooseauthmethod'] = 'Choose authentication plugin';
?>
?>

2
mod/assignment/lib.php
View file

@ -1081,7 +1081,7 @@ class assignment_base {
}
$tableheaders = array('',
get_string('fullname'),
get_string('fullnameuser'),
get_string('grade'),
get_string('comment', 'assignment'),
get_string('lastmodified').' ('.$course->student.')',

6
mod/resource/type/file/resource.class.php
View file

@ -33,9 +33,9 @@ class resource_file extends resource_base {
'courseid' => array('langstr' => 'id',
'value' => $this->course->id),
'coursefullname' => array('langstr' => get_string('fullname'),
'coursefullname' => array('langstr' => get_string('fullnamecourse'),
'value' => $this->course->fullname),
'courseshortname' => array('langstr' => get_string('shortname'),
'courseshortname' => array('langstr' => get_string('shortnamecourse'),
'value' => $this->course->shortname),
'courseidnumber' => array('langstr' => get_string('idnumbercourse'),
'value' => $this->course->idnumber),
@ -89,7 +89,7 @@ class resource_file extends resource_base {
'value' => $USER->firstname),
'userlastname' => array('langstr' => get_string('lastname'),
'value' => $USER->lastname),
'userfullname' => array('langstr' => get_string('fullname'),
'userfullname' => array('langstr' => get_string('fullnameuser'),
'value' => fullname($USER)),
'useremail' => array('langstr' => get_string('email'),
'value' => $USER->email),

6
mod/resource/type/repository/resource.class.php
View file

@ -42,9 +42,9 @@ function set_parameters() {
'courseid' => array('langstr' => 'id',
'value' => $this->course->id),
'coursefullname' => array('langstr' => get_string('fullname'),
'coursefullname' => array('langstr' => get_string('fullnamecourse'),
'value' => $this->course->fullname),
'courseshortname' => array('langstr' => get_string('shortname'),
'courseshortname' => array('langstr' => get_string('shortnamecourse'),
'value' => $this->course->shortname),
'courseidnumber' => array('langstr' => get_string('idnumbercourse'),
'value' => $this->course->idnumber),
@ -98,7 +98,7 @@ function set_parameters() {
'value' => $USER->firstname),
'userlastname' => array('langstr' => get_string('lastname'),
'value' => $USER->lastname),
'userfullname' => array('langstr' => get_string('fullname'),
'userfullname' => array('langstr' => get_string('fullnameuser'),
'value' => fullname($USER)),
'useremail' => array('langstr' => get_string('email'),
'value' => $USER->email),

2
user/extendenrol.php
View file

@ -116,7 +116,7 @@ print_heading($title . helpbutton('extendenrol', $title, 'moodle', true, false,
echo "<form method=\"post\" action=\"extendenrol.php\">\n";
echo '<input type="hidden" name="id" value="'.$course->id.'" />';
echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
$table->head = array (get_string('fullname'), get_string('enrolmentstart'), get_string('enrolmentend'), get_string('extendperiod'), get_string('startingfrom'));
$table->head = array (get_string('fullnameuser'), get_string('enrolmentstart'), get_string('enrolmentend'), get_string('extendperiod'), get_string('startingfrom'));
$table->align = array ('left', 'center', 'center', 'center');
$table->width = "600";
$nochange = get_string('nochange');

2
user/filters/lib.php
View file

@ -98,7 +98,7 @@ class user_filtering {
switch ($fieldname) {
case 'username': return new user_filter_text('username', get_string('username'), $advanced, 'username');
case 'realname': return new user_filter_text('realname', get_string('fullname'), $advanced, sql_fullname());
case 'realname': return new user_filter_text('realname', get_string('fullnameuser'), $advanced, sql_fullname());
case 'lastname': return new user_filter_text('lastname', get_string('lastname'), $advanced, 'lastname');
case 'firstname': return new user_filter_text('firstname', get_string('firstname'), $advanced, 'firstname');
case 'email': return new user_filter_text('email', get_string('email'), $advanced, 'email');

2
user/groupextendenrol.php
View file

@ -113,7 +113,7 @@ print_heading($title . helpbutton('groupextendenrol', $title, 'moodle', true, fa
echo '<form method="post" action="groupextendenrol.php">';
echo '<input type="hidden" name="id" value="'.$course->id.'" />';
echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
$table->head = array (get_string('fullname'), get_string('enrolmentstart'), get_string('enrolmentend'));
$table->head = array (get_string('fullnameuser'), get_string('enrolmentstart'), get_string('enrolmentend'));
$table->align = array ('left', 'center', 'center', 'center');
$table->width = "600";
$nochange = get_string('nochange');

2
user/index.php
View file

@ -290,7 +290,7 @@
/// Define a table showing a list of users in the current role selection
$tablecolumns = array('userpic', 'fullname');
$tableheaders = array(get_string('userpic'), get_string('fullname'));
$tableheaders = array(get_string('userpic'), get_string('fullnameuser'));
if ($mode === MODE_BRIEF && !isset($hiddenfields['city'])) {
$tablecolumns[] = 'city';
$tableheaders[] = get_string('city');