version 1.325, 2017/01/28 03:48:52
|
version 1.331, 2017/05/19 19:47:40
|
Line 674 ENDENTERKEY
|
Line 674 ENDENTERKEY
|
} |
} |
} |
} |
} |
} |
|
if (($dest =~ m{^\Q/public/$cdom/$cnum/syllabus\E.*(\?|\&)usehttp=1}) || |
|
($dest =~ m{^\Q/adm/wrapper/ext/\E(?!https:)})) { |
|
if ($ENV{'SERVER_PORT'} == 443) { |
|
my $hostname = $r->hostname(); |
|
if ($hostname ne '') { |
|
$dest = 'http://'.$hostname.$dest; |
|
} |
|
} |
|
} |
if ($dest =~ m{^/enc/}) { |
if ($dest =~ m{^/enc/}) { |
if ($env{'request.role.adv'}) { |
if ($env{'request.role.adv'}) { |
$dest = &Apache::lonenc::unencrypted($dest); |
$dest = &Apache::lonenc::unencrypted($dest); |
Line 706 ENDENTERKEY
|
Line 715 ENDENTERKEY
|
unless (($dest =~ m{^/enc/}) || ($dest =~ /(\?|\&)symb=.+___\d+___.+/)) { |
unless (($dest =~ m{^/enc/}) || ($dest =~ /(\?|\&)symb=.+___\d+___.+/)) { |
if (($destsymb ne '') && ($destsymb !~ m{^/enc/})) { |
if (($destsymb ne '') && ($destsymb !~ m{^/enc/})) { |
my $esc_symb = &escape($destsymb); |
my $esc_symb = &escape($destsymb); |
$dest .= '?symb='.$esc_symb; |
$dest .= (($dest =~/\?/)? '&':'?').'symb='.$esc_symb; |
} |
} |
} |
} |
&redirect_user($r, &mt('Entering [_1]', |
&redirect_user($r, &mt('Entering [_1]', |
Line 1088 ENDHEADER
|
Line 1097 ENDHEADER
|
# ----------------------------------------------------------------------- Table |
# ----------------------------------------------------------------------- Table |
|
|
if (($numdc > 0) || (($numhelpdesk > 0) && ($numadhoc > 0))) { |
if (($numdc > 0) || (($numhelpdesk > 0) && ($numadhoc > 0))) { |
$r->print(&coursepick_jscript()); |
$r->print(&coursepick_jscript(). |
$r->print(&Apache::loncommon::coursebrowser_javascript(). |
&Apache::loncommon::coursebrowser_javascript()); |
&Apache::loncommon::authorbrowser_javascript()); |
} |
|
if ($numdc > 0) { |
|
$r->print(&Apache::loncommon::authorbrowser_javascript()); |
} |
} |
|
|
unless ((!&Apache::loncommon::show_course()) || ($nochoose) || ($countactive==1)) { |
unless ((!&Apache::loncommon::show_course()) || ($nochoose) || ($countactive==1)) { |
Line 1726 sub privileges_info {
|
Line 1737 sub privileges_info {
|
sub build_roletext { |
sub build_roletext { |
my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$trole,$twhere, |
my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$trole,$twhere, |
$tpstart,$tpend,$nochoose,$button,$switchserver,$reinit,$switchwarning,$skipcal) = @_; |
$tpstart,$tpend,$nochoose,$button,$switchserver,$reinit,$switchwarning,$skipcal) = @_; |
my ($roletext,$roletext_end); |
my ($roletext,$roletext_end,$poss_adhoc); |
my $is_dc=($trolecode =~ m/^dc\./); |
if ($trolecode =~ m/^d(c|h|a)\./) { |
my $rowspan=($is_dc) ? '' |
$poss_adhoc = 1; |
|
} |
|
my $rowspan=($poss_adhoc) ? '' |
: ' rowspan="2" '; |
: ' rowspan="2" '; |
|
|
unless ($nochoose) { |
unless ($nochoose) { |
Line 1789 sub build_roletext {
|
Line 1802 sub build_roletext {
|
.'<td>'.$twhere.'</td>' |
.'<td>'.$twhere.'</td>' |
.'<td>'.$tpstart.'</td>' |
.'<td>'.$tpstart.'</td>' |
.'<td>'.$tpend.'</td>'; |
.'<td>'.$tpend.'</td>'; |
if (!$is_dc) { |
unless ($poss_adhoc) { |
$roletext_end = '<td colspan="4">'. |
$roletext_end = '<td colspan="4">'. |
$tremark.' '. |
$tremark.' '. |
'</td>'; |
'</td>'; |
Line 1820 sub check_for_adhoc {
|
Line 1833 sub check_for_adhoc {
|
my $numhelpdesk = 0; |
my $numhelpdesk = 0; |
my $numadhoc = 0; |
my $numadhoc = 0; |
my $num_custom_adhoc = 0; |
my $num_custom_adhoc = 0; |
if ($env{'user.adv'}) { |
if (($env{'user.adv'}) || ($env{'user.rar'})) { |
foreach my $envkey (sort(keys(%env))) { |
foreach my $envkey (sort(keys(%env))) { |
if ($envkey=~/^user\.role\.(dc|dh|da)\.\/($match_domain)\/$/) { |
if ($envkey=~/^user\.role\.(dc|dh|da)\.\/($match_domain)\/$/) { |
my $role = $1; |
my $role = $1; |
Line 2052 sub adhoc_roles_row {
|
Line 2065 sub adhoc_roles_row {
|
my ($dcdom,$rowtype) = @_; |
my ($dcdom,$rowtype) = @_; |
my $output = &Apache::loncommon::continue_data_table_row() |
my $output = &Apache::loncommon::continue_data_table_row() |
.' <td colspan="5" class="LC_textsize_mobile">' |
.' <td colspan="5" class="LC_textsize_mobile">' |
.&mt('[_1]Ad hoc[_2] roles in domain [_3] --' |
.&mt('[_1]Ad hoc[_2] roles in domain [_3]' |
,'<span class="LC_cusr_emph">','</span>',$dcdom) |
,'<span class="LC_cusr_emph">','</span>',$dcdom) |
.' '; |
.' -- '; |
my $role = 'cc'; |
my $role = 'cc'; |
my $selectcclink = &courselink($dcdom,$rowtype,$role); |
my $selectcclink = &courselink($dcdom,$rowtype,$role); |
my $ccrole = &Apache::lonnet::plaintext('co',undef,undef,1); |
my $ccrole = &Apache::lonnet::plaintext('co',undef,undef,1); |
Line 2082 sub adhoc_customroles_row {
|
Line 2095 sub adhoc_customroles_row {
|
if (scalar(keys(%{$domdefaults{'adhocroles'}})) > 0) { |
if (scalar(keys(%{$domdefaults{'adhocroles'}})) > 0) { |
return &Apache::loncommon::continue_data_table_row() |
return &Apache::loncommon::continue_data_table_row() |
.' <td colspan="5" class="LC_textsize_mobile">' |
.' <td colspan="5" class="LC_textsize_mobile">' |
.&mt('[_1]Ad hoc[_2] course/community roles in domain [_3] --', |
.&mt('[_1]Ad hoc[_2] course/community roles in domain [_3]', |
'<span class="LC_cusr_emph">','</span>',$dhdom) |
'<span class="LC_cusr_emph">','</span>',$dhdom) |
.' '.&courselink($dhdom,$rowtype,$role); |
.' -- '.&courselink($dhdom,$rowtype,$role); |
} |
} |
} |
} |
return; |
return; |