version 1.358.2.5, 2016/08/08 00:57:36
|
version 1.358.2.16, 2019/07/27 13:57:31
|
Line 92 sub raw_href_to_link {
|
Line 92 sub raw_href_to_link {
|
|
|
sub entity_encode { |
sub entity_encode { |
my ($text)=@_; |
my ($text)=@_; |
return &HTML::Entities::encode($text, '<>&"'); |
return &HTML::Entities::encode($text, '\'<>&"'); |
} |
} |
|
|
sub direct_parm_link { |
sub direct_parm_link { |
Line 407 sub textbox {
|
Line 407 sub textbox {
|
############################################## |
############################################## |
############################################## |
############################################## |
sub checkbox { |
sub checkbox { |
my ($name,$checked,$value) = @_; |
my ($name,$checked,$value,$special) = @_; |
my $Str = '<input type="checkbox" name="'.$name.'" '; |
my $Str = '<input type="checkbox" name="'.$name.'" '; |
if (defined($value)) { |
if (defined($value)) { |
$Str .= 'value="'.$value.'"'; |
$Str .= 'value="'.$value.'"'; |
Line 415 sub checkbox {
|
Line 415 sub checkbox {
|
if ($checked) { |
if ($checked) { |
$Str .= ' checked="checked"'; |
$Str .= ' checked="checked"'; |
} |
} |
$Str .= ' />'; |
$Str .= $special.' />'; |
return $Str; |
return $Str; |
} |
} |
|
|
Line 534 sub date_setter {
|
Line 534 sub date_setter {
|
|
|
if (! defined($state) || $state ne 'disabled') { |
if (! defined($state) || $state ne 'disabled') { |
$state = ''; |
$state = ''; |
|
} else { |
|
$state = 'disabled="disabled"'; |
} |
} |
if (! defined($no_hh_mm_ss)) { |
if (! defined($no_hh_mm_ss)) { |
$no_hh_mm_ss = 0; |
$no_hh_mm_ss = 0; |
Line 669 ENDJS
|
Line 671 ENDJS
|
my $minuteselector = qq{<input type="text" name="$dname\_minute" $special $state value="$min" size="3" />}; |
my $minuteselector = qq{<input type="text" name="$dname\_minute" $special $state value="$min" size="3" />}; |
my $secondselector= qq{<input type="text" name="$dname\_second" $special $state value="$sec" size="3" />}; |
my $secondselector= qq{<input type="text" name="$dname\_second" $special $state value="$sec" size="3" />}; |
my $cal_link; |
my $cal_link; |
if (!$nolink) { |
unless (($nolink) || ($state eq 'disabled')) { |
$cal_link = qq{<a href="javascript:$dname\_opencalendar()">}; |
$cal_link = qq{<a href="javascript:$dname\_opencalendar()">}; |
} |
} |
# |
# |
Line 694 ENDJS
|
Line 696 ENDJS
|
$hourselector,$minuteselector,$secondselector). |
$hourselector,$minuteselector,$secondselector). |
$tzone; |
$tzone; |
} |
} |
if (!$nolink) { |
unless (($nolink) || ($state eq 'disabled')) { |
$result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>'); |
$result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>'); |
} |
} |
$result .= "</span>\n<!-- end $dname date setting form -->\n"; |
$result .= "</span>\n<!-- end $dname date setting form -->\n"; |
Line 1007 Inputs
|
Line 1009 Inputs
|
|
|
=item $number_to_do The total number of items being processed. |
=item $number_to_do The total number of items being processed. |
|
|
|
=item $preamble Optional HTML to display before the progress bar. |
|
|
=back |
=back |
|
|
Returns a hash containing the progress state data structure. |
Returns a hash containing the progress state data structure. |
|
If $number_to_do is zero or null, an indeterminate progress bar will |
|
be used. |
|
|
=item &Update_PrgWin() |
=item &Update_PrgWin() |
|
|
Line 1080 Returns: none
|
Line 1085 Returns: none
|
|
|
# Create progress |
# Create progress |
sub Create_PrgWin { |
sub Create_PrgWin { |
my ($r,$number_to_do)=@_; |
my ($r,$number_to_do,$preamble)=@_; |
my %prog_state; |
my %prog_state; |
$prog_state{'done'}=0; |
$prog_state{'done'}=0; |
$prog_state{'firststart'}=&Time::HiRes::time(); |
$prog_state{'firststart'}=&Time::HiRes::time(); |
$prog_state{'laststart'}=&Time::HiRes::time(); |
$prog_state{'laststart'}=&Time::HiRes::time(); |
$prog_state{'max'}=$number_to_do; |
$prog_state{'max'}=$number_to_do; |
&Apache::loncommon::LCprogressbar($r); |
&Apache::loncommon::LCprogressbar($r,$prog_state{'max'},$preamble); |
return %prog_state; |
return %prog_state; |
} |
} |
|
|
# update progress |
# update progress |
sub Update_PrgWin { |
sub Update_PrgWin { |
my ($r,$prog_state,$displayString)=@_; |
my ($r,$prog_state,$displayString)=@_; |
&Apache::loncommon::LCprogressbarUpdate($r,undef,$displayString); |
&Apache::loncommon::LCprogressbarUpdate($r,undef,$displayString,$$prog_state{'max'}); |
$$prog_state{'laststart'}=&Time::HiRes::time(); |
$$prog_state{'laststart'}=&Time::HiRes::time(); |
} |
} |
|
|
Line 1143 sub Increment_PrgWin {
|
Line 1148 sub Increment_PrgWin {
|
if ($$prog_state{'max'}) { |
if ($$prog_state{'max'}) { |
$percent=int(100.*$current/$$prog_state{'max'}); |
$percent=int(100.*$current/$$prog_state{'max'}); |
} |
} |
&Apache::loncommon::LCprogressbarUpdate($r,$percent,$timeinfo); |
&Apache::loncommon::LCprogressbarUpdate($r,$percent,$timeinfo,$$prog_state{'max'}); |
$$prog_state{'laststart'}=&Time::HiRes::time(); |
$$prog_state{'laststart'}=&Time::HiRes::time(); |
} |
} |
|
|
Line 1160 sub Close_PrgWin {
|
Line 1165 sub Close_PrgWin {
|
sub crumbs { |
sub crumbs { |
my ($uri,$target,$prefix,$form,$skiplast,$onclick)=@_; |
my ($uri,$target,$prefix,$form,$skiplast,$onclick)=@_; |
# You cannot crumbnify uploaded or adm resources |
# You cannot crumbnify uploaded or adm resources |
if ($uri=~/^\/*(uploaded|adm)\//) { return &mt('(Internal Course/Group Content)'); } |
if ($uri=~/^\/*(uploaded|adm)\//) { return &mt('(Internal Course/Community Content)'); } |
if ($target) { |
if ($target) { |
$target = ' target="'. |
$target = ' target="'. |
&Apache::loncommon::escape_single($target).'"'; |
&Apache::loncommon::escape_single($target).'"'; |
Line 1180 sub crumbs {
|
Line 1185 sub crumbs {
|
} else { |
} else { |
$path.='/'; |
$path.='/'; |
} |
} |
|
if ($path eq '/res/') { |
|
unless (&Apache::lonnet::allowed('bre',$path)) { |
|
$output.="$dir/"; |
|
next; |
|
} |
|
} |
my $href_path = &HTML::Entities::encode($path,'<>&"'); |
my $href_path = &HTML::Entities::encode($path,'<>&"'); |
&Apache::loncommon::inhibit_menu_check(\$href_path); |
&Apache::loncommon::inhibit_menu_check(\$href_path); |
if ($form) { |
if ($form) { |
Line 1257 sub htmlareaheaders {
|
Line 1268 sub htmlareaheaders {
|
ENDEDITOR |
ENDEDITOR |
} |
} |
$s.=(<<ENDJQUERY); |
$s.=(<<ENDJQUERY); |
<script type="text/javascript" src="/adm/jQuery/js/jquery-1.11.3.min.js"></script> |
<script type="text/javascript" src="/adm/jQuery/js/jquery-3.2.1.min.js"></script> |
<script type="text/javascript" src="/adm/jQuery/js/jquery-ui-1.11.4.custom.min.js"></script> |
<script type="text/javascript" src="/adm/jQuery/js/jquery-ui-1.12.1.custom.min.js"></script> |
<link rel="stylesheet" type="text/css" href="/adm/jQuery/css/smoothness/jquery-ui-1.11.4.custom.css" /> |
<link rel="stylesheet" type="text/css" href="/adm/jQuery/css/smoothness/jquery-ui-1.12.1.custom.min.css" /> |
<script type="text/javascript" src="/adm/jpicker/js/jpicker-1.1.6.min.js" > |
<script type="text/javascript" src="/adm/jpicker/js/jpicker-1.1.6.min.js" > |
</script> |
</script> |
<link rel="stylesheet" type="text/css" href="/adm/jpicker/css/jPicker-1.1.6.min.css" /> |
<link rel="stylesheet" type="text/css" href="/adm/jpicker/css/jPicker-1.1.6.min.css" /> |
Line 1342 sub htmlareaselectactive {
|
Line 1353 sub htmlareaselectactive {
|
} |
} |
|
|
function startRichEditor(id) { |
function startRichEditor(id) { |
|
// fix character entities inside <m> |
|
// NOTE: this is not fixing characters inside <parse> |
|
// NOTE: < and > inside <chem> should fix automatically because there should not be a letter after <. |
|
var ta = document.getElementById(id); |
|
var value = ta.value; |
|
var in_m = false; // in the m element |
|
var in_text = false; // in the text inside the m element |
|
var im = -1; // position of <m> |
|
var it = -1; // position of the text inside |
|
for (var i=0; i<value.length; i++) { |
|
if (value.substr(i, 2) == "<m") { |
|
// ignore previous <m> if found twice |
|
in_m = true; |
|
in_text = false; |
|
im = i; |
|
it = -1; |
|
} else if (in_m) { |
|
if (!in_text) { |
|
if (value.charAt(i) == ">") { |
|
in_text = true; |
|
it = i+1; |
|
} |
|
} else if (value.substr(i, 4) == "</m>") { |
|
in_m = false; |
|
var text = value.substr(it, i-it); |
|
var l1 = text.length; |
|
text = text.replace(/</g, "<"); |
|
text = text.replace(/>/g, ">"); |
|
var l2 = text.length; |
|
value = value.substr(0, it) + text + "</m>" + value.substr(i+4); |
|
i = i + (l2-l1); |
|
} |
|
} |
|
} |
|
ta.value = value; |
CKEDITOR.replace(id, |
CKEDITOR.replace(id, |
{ |
{ |
customConfig: "/ckeditor/loncapaconfig.js", |
customConfig: "/ckeditor/loncapaconfig.js", |
Line 1353 sub htmlareaselectactive {
|
Line 1399 sub htmlareaselectactive {
|
|
|
function destroyRichEditor(id) { |
function destroyRichEditor(id) { |
CKEDITOR.instances[id].destroy(); |
CKEDITOR.instances[id].destroy(); |
|
// replace character entities < and > in <m> and <chem> |
|
// and "&fctname(" by "&fctname(" |
|
// and the quotes inside functions: "&fct(1, "a")" -> "&fct(1, "a")" |
|
var ta = document.getElementById(id); |
|
var value = ta.value; |
|
var in_element = false; // in the m or chem element |
|
var tagname = ""; // m or chem |
|
var in_text = false; // in the text inside the element |
|
var im = -1; // position of start tag |
|
var it = -1; // position of the text inside |
|
for (var i=0; i<value.length; i++) { |
|
if (value.substr(i, 2) == "<m" || value.substr(i, 5) == "<chem") { |
|
// ignore previous tags if found twice |
|
in_element = true; |
|
if (value.substr(i, 2) == "<m") |
|
tagname = "m"; |
|
else |
|
tagname = "chem"; |
|
in_text = false; |
|
im = i; |
|
it = -1; |
|
} else if (in_element) { |
|
if (!in_text) { |
|
if (value.charAt(i) == ">") { |
|
in_text = true; |
|
it = i+1; |
|
} |
|
} else if (value.substr(i, 3+tagname.length) == "</"+tagname+">") { |
|
in_element = false; |
|
var text = value.substr(it, i-it); |
|
var l1 = text.length; |
|
text = text.replace(/</g, "<"); |
|
text = text.replace(/>/g, ">"); |
|
var l2 = text.length; |
|
value = value.substr(0, it) + text + value.substr(i); |
|
i = i + (l2-l1); |
|
} |
|
} |
|
} |
|
// fix function names |
|
value = value.replace(/&([a-zA-Z_]+)\(/g, "&$1("); |
|
// fix quotes in functions |
|
var pos_next_fct = value.search(/&[a-zA-Z_]+\(/); |
|
var depth = 0; |
|
for (var i=0; i<value.length; i++) { |
|
if (i == pos_next_fct) { |
|
depth++; |
|
var sub = value.substring(i+1); |
|
var pos2 = sub.search(/&[a-zA-Z_]+\(/); |
|
if (pos2 == -1) |
|
pos_next_fct = -1; |
|
else |
|
pos_next_fct = i + 1 + pos2; |
|
} else if (depth > 0) { |
|
if (value.charAt(i) == ")") |
|
depth--; |
|
else if (value.substr(i, 6) == """) |
|
value = value.substr(0, i) + "\"" + value.substr(i+6); |
|
} |
|
} |
|
// replace the text value |
|
ta.value = value; |
} |
} |
|
|
function editorHandler(event) { |
function editorHandler(event) { |
Line 1725 returns: nothing
|
Line 1833 returns: nothing
|
$env{'course.'.$env{'request.course.id'}.'.description'}; |
$env{'course.'.$env{'request.course.id'}.'.description'}; |
$no_mt_descr = 1; |
$no_mt_descr = 1; |
if ($env{'request.noversionuri'} =~ |
if ($env{'request.noversionuri'} =~ |
m{^/public/($match_domain)/($match_courseid)/syllabus$}) { |
m{^/?public/($match_domain)/($match_courseid)/syllabus$}) { |
unless (($env{'course.'.$env{'request.course.id'}.'.domain'} eq $1) && |
unless (($env{'course.'.$env{'request.course.id'}.'.domain'} eq $1) && |
($env{'course.'.$env{'request.course.id'}.'.num'} eq $2)) { |
($env{'course.'.$env{'request.course.id'}.'.num'} eq $2)) { |
$description = 'Menu'; |
$description = 'Menu'; |
Line 1926 returns: nothing
|
Line 2034 returns: nothing
|
undef(%tools); |
undef(%tools); |
} |
} |
|
|
|
=item ¤t_breadcrumb_tools() |
|
|
|
returns: a hash containing the current breadcrumb tools. |
|
|
|
=cut |
|
|
|
sub current_breadcrumb_tools { |
|
return %tools; |
|
} |
|
|
=item &render_tools(\$breadcrumbs) |
=item &render_tools(\$breadcrumbs) |
|
|
Creates html for breadcrumb tools (categories navigation and tools) and inserts |
Creates html for breadcrumb tools (categories navigation and tools) and inserts |
Line 1992 sub docs_breadcrumbs {
|
Line 2110 sub docs_breadcrumbs {
|
my $foldername=shift(@folders); |
my $foldername=shift(@folders); |
if ($folderpath) {$folderpath.='&';} |
if ($folderpath) {$folderpath.='&';} |
$folderpath.=$folder.'&'.$foldername; |
$folderpath.=$folder.'&'.$foldername; |
my $url; |
my $url = $env{'request.use_absolute'}; |
if ($allowed) { |
if ($allowed) { |
$url = '/adm/coursedocs?folderpath='; |
$url .= '/adm/coursedocs?folderpath='; |
} else { |
} else { |
$url = '/adm/supplemental?folderpath='; |
$url .= '/adm/supplemental?folderpath='; |
} |
} |
$url .= &escape($folderpath); |
$url .= &escape($folderpath); |
my $name=&unescape($foldername); |
my $name=&unescape($foldername); |
Line 3268 function go(url) {
|
Line 3386 function go(url) {
|
if (url!='' && url!= null) { |
if (url!='' && url!= null) { |
currentURL = null; |
currentURL = null; |
currentSymb= null; |
currentSymb= null; |
window.location.href=url; |
var lcHostname = setLCHost(); |
|
if (lcHostname!='' && lcHostname!= null) { |
|
var RegExp = /^https?\:/; |
|
if (RegExp.test(url)) { |
|
window.location.href=url; |
|
} else { |
|
window.location.href=lcHostname+url; |
|
} |
|
} else { |
|
window.location.href=url; |
|
} |
} |
} |
} |
} |
|
|
Line 3287 ENDUTILITY
|
Line 3415 ENDUTILITY
|
|
|
sub jump_to_editres { |
sub jump_to_editres { |
my ($cfile,$home,$switchserver,$forceedit,$forcereg,$symb,$folderpath, |
my ($cfile,$home,$switchserver,$forceedit,$forcereg,$symb,$folderpath, |
$title,$idx,$suppurl,$todocs) = @_; |
$title,$hostname,$idx,$suppurl,$todocs,$suppanchor) = @_; |
my $jscall; |
my ($jscall,$anchor,$usehttp,$usehttps,$is_ext); |
if ($switchserver) { |
if ($switchserver) { |
if ($home) { |
if ($home) { |
$cfile = '/adm/switchserver?otherserver='.$home.'&role='. |
$cfile = '/adm/switchserver?otherserver='.$home.'&role='. |
Line 3308 sub jump_to_editres {
|
Line 3436 sub jump_to_editres {
|
} |
} |
} else { |
} else { |
unless ($cfile =~ m{^/priv/}) { |
unless ($cfile =~ m{^/priv/}) { |
|
if ($cfile =~ m{^(/adm/wrapper/ext/([^#]+))(?:|#([^#]+))$}) { |
|
$cfile = $1; |
|
my $extlink = $2; |
|
$anchor = $3; |
|
$is_ext = 1; |
|
if (($extlink !~ /^https:/) && ($ENV{'SERVER_PORT'} == 443)) { |
|
unless (&Apache::lonnet::uses_sts()) { |
|
$usehttp = 1; |
|
} |
|
} elsif ($env{'request.use_absolute'}) { |
|
if ($env{'request.use_absolute'} =~ m{^https://}) { |
|
$usehttps = 1; |
|
} |
|
} |
|
} elsif ($cfile =~ m{^/?public/($match_domain)/($match_courseid)/syllabus}) { |
|
if ($ENV{'SERVER_PORT'} == 443) { |
|
my ($cdom,$cnum) = ($1,$2); |
|
if (($env{'request.course.id'}) && |
|
($env{'course.'.$env{'request.course.id'}.'.num'} eq $cnum) && |
|
($env{'course.'.$env{'request.course.id'}.'.domain'} eq $cdom)) { |
|
if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://}) { |
|
unless (&Apache::lonnet::uses_sts()) { |
|
$usehttp = 1; |
|
} |
|
} |
|
} |
|
} elsif ($env{'request.use_absolute'}) { |
|
if ($env{'request.use_absolute'} =~ m{^https://}) { |
|
$usehttps = 1; |
|
} |
|
} |
|
} |
if ($symb) { |
if ($symb) { |
|
if ($anchor ne '') { |
|
if ($symb =~ m{^([^#]+)\Q#$anchor\E$}) { |
|
$symb = $1.&escape(&escape('#')).$anchor; |
|
} |
|
} |
$cfile .= (($cfile=~/\?/)?'&':'?')."symb=$symb"; |
$cfile .= (($cfile=~/\?/)?'&':'?')."symb=$symb"; |
} elsif ($folderpath) { |
} elsif ($folderpath) { |
$cfile .= (($cfile=~/\?/)?'&':'?'). |
$cfile .= (($cfile=~/\?/)?'&':'?'). |
Line 3327 sub jump_to_editres {
|
Line 3492 sub jump_to_editres {
|
} |
} |
if ($forceedit) { |
if ($forceedit) { |
$cfile .= (($cfile=~/\?/)?'&':'?').'forceedit=1'; |
$cfile .= (($cfile=~/\?/)?'&':'?').'forceedit=1'; |
|
if ($usehttps) { |
|
$cfile = $env{'request.use_absolute'}.(($cfile =~ /^\//)? '':'/').$cfile; |
|
} |
|
} elsif ($usehttp) { |
|
if ($hostname ne '') { |
|
$cfile = 'http://'.$hostname.(($cfile =~ /^\//)? '':'/').$cfile; |
|
} |
|
$cfile .= (($cfile=~/\?/)?'&':'?').'usehttp=1'; |
|
} elsif ($usehttps) { |
|
$cfile = $env{'request.use_absolute'}.(($cfile =~ /^\//)? '':'/').$cfile; |
} |
} |
if ($forcereg) { |
if ($forcereg) { |
$cfile .= (($cfile=~/\?/)?'&':'?').'register=1'; |
$cfile .= (($cfile=~/\?/)?'&':'?').'register=1'; |
} |
} |
if ($todocs) { |
if ($todocs) { |
$cfile .= (($cfile=~/\?/)?'&':'?').'todocs=1'; |
$cfile .= (($cfile=~/\?/)?'&':'?').'todocs=1'; |
} |
} |
|
if ($suppanchor ne '') { |
|
$cfile .= (($cfile=~/\?/)?'&':'?').'anchor='. |
|
&HTML::Entities::encode($suppanchor,'"<>&'); |
|
} |
|
} |
|
if ($anchor ne '') { |
|
$cfile .= '#'.$anchor; |
} |
} |
$jscall = "go('".&Apache::loncommon::escape_single($cfile)."')"; |
$jscall = "go('".&Apache::loncommon::escape_single($cfile)."')"; |
} |
} |