--- loncom/interface/lonpreferences.pm 2005/12/19 21:39:37 1.70
+++ loncom/interface/lonpreferences.pm 2006/03/21 21:06:35 1.78
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Preferences
#
-# $Id: lonpreferences.pm,v 1.70 2005/12/19 21:39:37 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.78 2006/03/21 21:06:35 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -98,16 +98,16 @@ sub wysiwygchanger {
my $r = shift;
my %userenv = &Apache::lonnet::get
('environment',['wysiwygeditor']);
+ my $onselect='checked="checked"';
my $offselect='';
- my $onselect='checked="1"';
- if ($userenv{'wysiwygeditor'}) {
+ if ($userenv{'wysiwygeditor'} eq 'on') {
$onselect='';
- $offselect='checked="1"';
+ $offselect='checked="checked"';
}
my $switchoff=&mt('Disable WYSIWYG editor');
my $switchon=&mt('Enable WYSIWYG editor');
$r->print(<<ENDLSCREEN);
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
<input type="hidden" name="action" value="set_wysiwyg" />
<br />
<label><input type="radio" name="wysiwyg" value="off" $onselect /> $switchoff</label><br />
@@ -147,7 +147,7 @@ sub languagechanger {
my $selectionbox=&Apache::loncommon::select_form($language,'language',
%langchoices);
$r->print(<<ENDLSCREEN);
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
<input type="hidden" name="action" value="verify_and_change_languages" />
<br />$pref: $selectionbox
ENDLSCREEN
@@ -201,7 +201,7 @@ sub texenginechanger {
$r->print(<<ENDLSCREEN);
<br />
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
<input type="hidden" name="action" value="verify_and_change_texengine" />
<p>$pref: $selectionbox</p>
<p><input type="submit" value="$change" /></p>
@@ -304,7 +304,7 @@ visited and places a table of these at t
People with very few roles should leave this feature disabled.
</p>
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
<input type="hidden" name="action" value="verify_and_change_rolespref" />
<br />Enable Recent Roles Hotlist:
<input type="checkbox" $checked name="recentroles" value="true" />
@@ -362,7 +362,7 @@ sub screennamechanger {
my $screenname=$userenv{'screenname'};
my $nickname=$userenv{'nickname'};
$r->print(<<ENDSCREEN);
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
<input type="hidden" name="action" value="verify_and_change_screenname" />
<br />New screenname (shown if you post anonymously):
<input type="text" size="20" value="$screenname" name="screenname" />
@@ -430,7 +430,7 @@ sub msgforwardchanger {
$r->print(<<ENDMSG);
$forwardingHelp <br />
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
<input type="hidden" name="action" value="verify_and_change_msgforward" />
New Forwarding Address(es) (<tt>user:domain,user:domain,...</tt>):
<input type="text" size="40" value="$msgforward" name="msgforward" /><hr />
@@ -550,7 +550,7 @@ sub colorschanger {
pclose();
if (document.parmform.pres_marker.value!='') {
if (document.parmform.pres_type.value!='') {
- eval('document.server.'+
+ eval('document.prefs.'+
document.parmform.pres_marker.value+
'.value=document.parmform.pres_value.value;');
}
@@ -567,7 +567,7 @@ sub colorschanger {
<input type="hidden" name="pres_type" />
<input type="hidden" name="pres_value" />
</form>
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
<input type="hidden" name="action" value="verify_and_change_colors" />
<table border="2">
$chtable
@@ -617,7 +617,7 @@ sub verify_and_change_colors {
}
$r->print(<<ENDVCCOL);
$message
-<form name="client" action="/adm/preferences" method="post">
+<form name="client" action="/adm/preferences" method="POST">
<input type="hidden" name="action" value="changecolors" />
</form>
ENDVCCOL
@@ -659,8 +659,6 @@ sub passwordchanger {
$lkey_npass2= hex($lkey_npass2);
# Output javascript to deal with passwords
# Output DES javascript
- my $html=&Apache::lonxml::xmlbegin();
- $r->print($html."<head>");
{
my $include = $r->dir_config('lonIncludes');
my $jsh=Apache::File->new($include."/londes.js");
@@ -700,7 +698,7 @@ $errormessage
ensure that unencrypted passwords will not be sent out by a
crappy browser -->
-<form name="pserver" action="/adm/preferences" method="post">
+<form name="pserver" action="/adm/preferences" method="POST">
<input type="hidden" name="logtoken" value="$logtoken" />
<input type="hidden" name="action" value="verify_and_change_pass" />
<input type="hidden" name="currentpass" value="" />
@@ -741,14 +739,6 @@ sub verify_and_change_password {
# Check for authentication types that allow changing of the password.
return if ($currentauth !~ /^(unix|internal):/);
#
- my $html=&Apache::lonxml::xmlbegin();
- $r->print(<<ENDHEADER);
-$html
-<head>
-<title>LON-CAPA Preferences: Change password for $user</title>
-</head>
-ENDHEADER
- #
my $currentpass = $env{'form.currentpass'};
my $newpass1 = $env{'form.newpass_1'};
my $newpass2 = $env{'form.newpass_2'};
@@ -773,7 +763,7 @@ password decryption. Please log out and
</p>
ENDERROR
# Probably should log an error here
- return;
+ return 1;
}
my ($ckey,$n1key,$n2key)=split(/&/,$tmpinfo);
#
@@ -786,14 +776,14 @@ ENDERROR
'<font color="#ff0000">ERROR:</font>'.
'The new passwords you entered do not match. '.
'Please try again.');
- return;
+ return 1;
}
if (length($newpass1) < 7) {
&passwordchanger($r,
'<font color="#ff0000">ERROR:</font>'.
'Passwords must be a minimum of 7 characters long. '.
'Please try again.');
- return;
+ return 1;
}
#
# Check for bad characters
@@ -828,6 +818,7 @@ ENDTEXT
<h2><font color="#ff0000">The password for $user was not changed</font></h2>
Please make sure your old password was entered correctly.
ENDERROR
+ return 1;
}
return;
}
@@ -896,7 +887,7 @@ sub discussionchanger {
}
$r->print(<<"END");
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
<input type="hidden" name="action" value="verify_and_change_discussion" />
<br />
$lt{'sdpf'}<br/> $lt{'prca'} <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li></ol>
@@ -982,20 +973,28 @@ sub coursedisplaychanger {
my $user = $env{'user.name'};
my $domain = $env{'user.domain'};
my %userenv = &Apache::lonnet::get('environment',['course_init_display']);
-
- my $firstselect='checked="checked"';
- my $whatsnewselect='';
- if ($userenv{'course_init_display'} ne 'firstres') {
- $firstselect='';
- $whatsnewselect='checked="checked"';
+ my $currvalue = 'whatsnew';
+ my $firstselect = '';
+ my $whatsnewselect = 'checked="checked"';
+ if (exists($userenv{'course_init_display'})) {
+ if ($userenv{'course_init_display'} eq 'firstres') {
+ $currvalue = 'firstres';
+ $firstselect = 'checked="checked"';
+ $whatsnewselect = '';
+ }
}
+ my %pagenames = (
+ firstres => 'First resource',
+ whatsnew => "What's new page",
+ );
my $whatsnew_off=&mt('Display the [_1] in the course.','<b>first resource</b>');
my $whatsnew_on=&mt('Display the "[_1]" page - a summary of items in the course which require attention.',"<b>What's New</b>");
- $r->print('<br /><b>'.&mt('Set the default page to be displayed when you select a course role other than student or TA').':</b><br />'.&mt('The global user preference you set for your courses can be overridden in an individual course by setting a course specific setting via the "[_1]" page in the course',"<i>What's New</i>").'<br /><br />');
+ $r->print('<br /><b>'.&mt('Set the default page to be displayed when you select a course role').'</b> '.&mt('(Currently: [_1])',$pagenames{$currvalue}).'<br />'.&mt('The global user preference you set for your courses can be overridden in an individual course by setting a course specific setting via the "[_1]" page in the course',"<i>What's New</i>").'<br /><br />');
$r->print(<<ENDLSCREEN);
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
<input type="hidden" name="action" value="verify_and_change_coursepage" />
+<br />
<label><input type="radio" name="newdisp" value="firstres" $firstselect /> $whatsnew_off</label><br />
<label><input type="radio" name="newdisp" value="whatsnew" $whatsnewselect /> $whatsnew_on</label><input type="hidden" name="refpage" value="$env{'form.refpage'}" />
ENDLSCREEN
@@ -1008,7 +1007,7 @@ sub verify_and_change_coursepage {
my $message='';
my %lt = &Apache::lonlocal::texthash(
'defs' => 'Default now set',
- 'when' => 'when selecting a course role other than student or TA from the roles screen',
+ 'when' => 'when you select a course role from the roles screen',
'ywbt' => 'you will be taken to the start of the course.',
'apwb' => 'a page will be displayed that lists items in the course that may require action from you.',
'gtts' => 'Go to the start of the course',
@@ -1088,7 +1087,7 @@ sub handler {
breadcrumb =>
{ href =>'/adm/preferences?action=changepass',
text => 'Change Password'},
- printmenu => 'yes',
+ printmenu => 'not_on_error',
}));
}
push (@Options,({ action => 'changescreenname',
@@ -1225,7 +1224,9 @@ sub handler {
text => 'Change Math Preferences'},
printmenu => 'yes',
}));
- if($env{'request.role'} =~ /^cc\.\//) {
+ if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
+ || &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
+ .$env{'request.course.sec'})) {
push (@Options,({ action => 'changecourseinit',
linktext => 'Change Course Initialization Preference',
href => '/adm/preferences',
@@ -1248,13 +1249,9 @@ sub handler {
subroutine => \&toggle_debug,
}));
}
- my $html=&Apache::lonxml::xmlbegin();
- $r->print(<<ENDHEADER);
-$html
-<head>
-<title>LON-CAPA Preferences</title>
-</head>
-ENDHEADER
+
+ $r->print(&Apache::loncommon::start_page('Change Preferences'));
+
my $call = undef;
my $help = undef;
my $printmenu = 'yes';
@@ -1269,13 +1266,15 @@ ENDHEADER
$help=$option->{'help'};
}
}
- $r->print(&Apache::loncommon::bodytag('Change Preferences'));
$r->print(&Apache::lonhtmlcommon::breadcrumbs
(undef,'Change Preferences',$help));
+ my $error;
if (defined($call)) {
- $call->($r);
+ $error = $call->($r);
}
- if (($printmenu eq 'yes') && (!$env{'form.returnurl'})) {
+ if ( ( ($printmenu eq 'yes')
+ || ($printmenu eq 'not_on_error' && !$error) )
+ && (!$env{'form.returnurl'})) {
my $optionlist = '<table cellpadding="5">';
if ($env{'user.name'} =~
/^(albertel|kortemey|fox|foxr|korte|hallmat3|turtle|raeburn)$/
@@ -1319,7 +1318,7 @@ ENDHEADER
$r->print('<br /><a href="'.$env{'form.returnurl'}.'"><font size="+1">'.
&mt('Return').'</font></a>');
}
- $r->print(&Apache::loncommon::endbodytag().'</html>');
+ $r->print(&Apache::loncommon::end_page());
return OK;
}