version 1.369.2.52, 2014/06/22 19:48:05
|
version 1.369.2.55, 2015/05/28 12:49:30
|
Line 813 sub innerregister {
|
Line 813 sub innerregister {
|
my $currdir = '/priv/'.$udom.'/'.$uname.'/'.$thisdisfn; |
my $currdir = '/priv/'.$udom.'/'.$uname.'/'.$thisdisfn; |
if ($currdir =~ m-/$-) { |
if ($currdir =~ m-/$-) { |
$is_const_dir = 1; |
$is_const_dir = 1; |
|
if ($thisdisfn eq '') { |
|
$is_const_dir = 2; |
|
} |
} else { |
} else { |
$currdir =~ s|[^/]+$||; |
$currdir =~ s|[^/]+$||; |
my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn); |
my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn); |
Line 860 ENDMENUITEMS
|
Line 863 ENDMENUITEMS
|
# wishlist is only available for users with access to resource-pool |
# wishlist is only available for users with access to resource-pool |
# and links can only be set for resources within the resource-pool |
# and links can only be set for resources within the resource-pool |
$menuitems .= (<<ENDMENUITEMS); |
$menuitems .= (<<ENDMENUITEMS); |
s&9&1&alnk.png&$swtext{'alnk'}&linkstor[_1]&set_wishlistlink()&Save a link for this resource in my personal Stored Links repository&&1 |
s&9&1&alnk.png&$swtext{'alnk'}&linkstor[_1]&set_wishlistlink('',currentURL)&Save a link for this resource in my personal Stored Links repository&&1 |
ENDMENUITEMS |
ENDMENUITEMS |
$got_wishlist = 1; |
$got_wishlist = 1; |
} |
} |
Line 911 ENDMENUITEMS
|
Line 914 ENDMENUITEMS
|
if (($env{'user.adv'}) && (!$env{'request.enc'})) { |
if (($env{'user.adv'}) && (!$env{'request.enc'})) { |
# wishlist is only available for users with access to resource-pool |
# wishlist is only available for users with access to resource-pool |
$menuitems .= (<<ENDMENUITEMS); |
$menuitems .= (<<ENDMENUITEMS); |
s&9&1&alnk.png&$swtext{'alnk'}&linkstor[_1]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1 |
s&9&1&alnk.png&$swtext{'alnk'}&linkstor[_1]&set_wishlistlink('',currentURL)&Save a link for this resource in your personal Stored Links repository&&1 |
ENDMENUITEMS |
ENDMENUITEMS |
$got_wishlist = 1; |
$got_wishlist = 1; |
} |
} |
Line 979 ENDMENUITEMS
|
Line 982 ENDMENUITEMS
|
&advtools_crumbs(@inlineremote); |
&advtools_crumbs(@inlineremote); |
} |
} |
} |
} |
|
my ($topic_help,$topic_help_text); |
|
if ($is_const_dir == 2) { |
|
if ((($ENV{'SERVER_PORT'} == 443) || |
|
($Apache::lonnet::protocol{$Apache::lonnet::perlvar{'lonHostID'}} eq 'https')) && |
|
(&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},'webdav'))) { |
|
$topic_help = 'Authoring_WebDAV,Authoring_WebDAV_Mac_10v6,Authoring_WebDAV_Mac_10v10,'. |
|
'Authoring_WebDAV_Windows_v7,Authoring_WebDAV_Linux_Centos'; |
|
$topic_help_text = 'About WebDAV access'; |
|
} |
|
} |
return &Apache::lonhtmlcommon::scripttag('', 'start') |
return &Apache::lonhtmlcommon::scripttag('', 'start') |
. &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0) |
. &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'','','','',$topic_help,$topic_help_text) |
. &Apache::lonhtmlcommon::scripttag('', 'end'); |
. &Apache::lonhtmlcommon::scripttag('', 'end'); |
|
|
} else { |
} else { |
Line 2017 sub utilityfunctions {
|
Line 2030 sub utilityfunctions {
|
|
|
my $countdown = &countdown_toggle_js(); |
my $countdown = &countdown_toggle_js(); |
|
|
|
my $hostvar = ' |
|
function setLCHost() { |
|
var lcHostname=""; |
|
'; |
|
if ($httphost =~ m{^https?\://}) { |
|
$hostvar .= ' var lcServer="'.$httphost.'";'."\n". |
|
' var hostReg = /^https?:\/\/([^\/]+)$/i;'."\n". |
|
' var match = hostReg.exec(lcServer);'."\n". |
|
' if (match.length) {'."\n". |
|
' if (match[1] == location.hostname) {'."\n". |
|
' lcHostname=lcServer;'."\n". |
|
' }'."\n". |
|
' }'."\n"; |
|
} |
|
|
|
$hostvar .= ' return lcHostname;'."\n". |
|
'}'."\n"; |
|
|
return (<<ENDUTILITY) |
return (<<ENDUTILITY) |
var host="$httphost"; |
$hostvar |
var currentURL=unescape("$esc_url"); |
var currentURL=unescape("$esc_url"); |
var reloadURL=unescape("$esc_url"); |
var reloadURL=unescape("$esc_url"); |
var currentSymb=unescape("$esc_symb"); |
var currentSymb=unescape("$esc_symb"); |
Line 2029 function go(url) {
|
Line 2060 function go(url) {
|
if (url!='' && url!= null) { |
if (url!='' && url!= null) { |
currentURL = null; |
currentURL = null; |
currentSymb= null; |
currentSymb= null; |
window.location.href=host+url; |
var lcHostname = setLCHost(); |
|
window.location.href=lcHostname+url; |
} |
} |
} |
} |
|
|
Line 2037 $jumptores
|
Line 2069 $jumptores
|
|
|
function gopost(url,postdata) { |
function gopost(url,postdata) { |
if (url!='') { |
if (url!='') { |
this.document.server.action=host+url; |
var lcHostname = setLCHost(); |
|
this.document.server.action=lcHostname+url; |
this.document.server.postdata.value=postdata; |
this.document.server.postdata.value=postdata; |
this.document.server.command.value=''; |
this.document.server.command.value=''; |
this.document.server.url.value=''; |
this.document.server.url.value=''; |
Line 2048 function gopost(url,postdata) {
|
Line 2081 function gopost(url,postdata) {
|
|
|
function gocmd(url,cmd) { |
function gocmd(url,cmd) { |
if (url!='') { |
if (url!='') { |
this.document.server.action=host+url; |
var lcHostname = setLCHost(); |
|
this.document.server.action=lcHostname+url; |
this.document.server.postdata.value=''; |
this.document.server.postdata.value=''; |
this.document.server.command.value=cmd; |
this.document.server.command.value=cmd; |
this.document.server.url.value=currentURL; |
this.document.server.url.value=currentURL; |
Line 2100 function golist(url) {
|
Line 2134 function golist(url) {
|
if (url!='' && url!= null) { |
if (url!='' && url!= null) { |
currentURL = null; |
currentURL = null; |
currentSymb= null; |
currentSymb= null; |
top.location.href=host+url; |
var lcHostname = setLCHost(); |
|
top.location.href=lcHostname+url; |
} |
} |
} |
} |
|
|
Line 2115 function catalog_info(isMobile) {
|
Line 2150 function catalog_info(isMobile) {
|
} |
} |
|
|
function chat_win() { |
function chat_win() { |
lonchat=window.open(host+'/res/adm/pages/chatroom.html',"LONchat",'height=320,width=480,resizable=yes,location=no,menubar=no,toolbar=no'); |
var lcHostname = setLCHost(); |
|
lonchat=window.open(lcHostname+'/res/adm/pages/chatroom.html',"LONchat",'height=320,width=480,resizable=yes,location=no,menubar=no,toolbar=no'); |
} |
} |
|
|
function group_chat(group) { |
function group_chat(group) { |
var url = host+'/adm/groupchat?group='+group; |
var lcHostname = setLCHost(); |
|
var url = lcHostname+'/adm/groupchat?group='+group; |
var winName = 'LONchat_'+group; |
var winName = 'LONchat_'+group; |
grpchat=window.open(url,winName,'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no'); |
grpchat=window.open(url,winName,'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no'); |
} |
} |
Line 2139 function annotate() {
|
Line 2176 function annotate() {
|
|
|
function open_StoredLinks_Import(rat) { |
function open_StoredLinks_Import(rat) { |
var newWin; |
var newWin; |
|
var lcHostname = setLCHost(); |
if (rat) { |
if (rat) { |
newWin = window.open(host+'/adm/wishlist?inhibitmenu=yes&mode=import&rat='+rat, |
newWin = window.open(lcHostname+'/adm/wishlist?inhibitmenu=yes&mode=import&rat='+rat, |
'wishlistImport','scrollbars=1,resizable=1,menubar=0'); |
'wishlistImport','scrollbars=1,resizable=1,menubar=0'); |
} |
} |
else { |
else { |
newWin = window.open(host+'/adm/wishlist?inhibitmenu=yes&mode=import', |
newWin = window.open(lcHostname+'/adm/wishlist?inhibitmenu=yes&mode=import', |
'wishlistImport','scrollbars=1,resizable=1,menubar=0'); |
'wishlistImport','scrollbars=1,resizable=1,menubar=0'); |
} |
} |
newWin.focus(); |
newWin.focus(); |