[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm doc/loncapafiles loncapafiles.lpml
raeburn
raeburn at source.lon-capa.org
Sat Nov 18 16:12:45 EST 2023
raeburn Sat Nov 18 21:12:45 2023 EDT
Modified files:
/doc/loncapafiles loncapafiles.lpml
/loncom/interface loncommon.pm
Log:
- Add pod for &nocodemirror() and &permitted_editors().
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.797.2.113.2.1 doc/loncapafiles/loncapafiles.lpml:1.797.2.113.2.2
--- doc/loncapafiles/loncapafiles.lpml:1.797.2.113.2.1 Mon Jan 20 23:50:17 2020
+++ doc/loncapafiles/loncapafiles.lpml Sun Jul 19 21:49:46 2020
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.797.2.113.2.1 2020/01/20 23:50:17 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.797.2.113.2.2 2020/07/19 21:49:46 raeburn Exp $ -->
<!--
@@ -3387,6 +3387,7 @@
Chart_Student_Data.tex;
Chatting.tex;
Clicker_Registration.tex;
+Clone_Tiny_URLs.tex;
Coauthor.tex;
Construction_Space_Overview.tex;
Content_Page_Overview.tex;
@@ -8367,7 +8368,7 @@
<source>loncom/init.d/loncontrol</source>
<target dist='default'>etc/rc.d/init.d/loncontrol</target>
<target dist='suse9.2 suse9.3 sles9 sles10 sles11 sles12 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16'>etc/init.d/loncontrol</target>
-<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 sles15 ubuntu18 ubuntu20 rhes8 centos8 oracle7 oracle8'>home/httpd/perl/loncontrol</target>
+<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 sles15 ubuntu18 ubuntu20 rhes8 centos8 oracle7 oracle8'>home/httpd/perl/loncontrol</target>
<categoryname>root script</categoryname>
<description>
Controls the launching/halting of lonc, lond, and lonsql processes.
@@ -8376,7 +8377,7 @@
<file>
<source>loncom/init.d/loncontrol.service</source>
<target dist='default'>home/httpd/perl/systemd/loncontrol.service</target>
-<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 sles15 ubuntu18 ubuntu20 rhes8 centos8 oracle7 oracle8'>etc/systemd/system/loncontrol.service</target>
+<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 sles15 ubuntu18 ubuntu20 rhes8 centos8 oracle7 oracle8'>etc/systemd/system/loncontrol.service</target>
<categoryname>static conf</categoryname>
<description>
Controls the launching/halting of lon-capa daemons by loncontrol in systemd
@@ -8429,13 +8430,13 @@
loncom/init.d/loncontrol
</dependencies>
</file>
-<file dist="fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 sles15 ubuntu18 ubuntu20 rhes8 centos8 oracle7 oracle8">
+<file dist="fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 sles15 ubuntu18 ubuntu20 rhes8 centos8 oracle7 oracle8">
<source>loncom/init.d/loncontrol.service</source>
<target>etc/systemd/system/loncontrol.service</target>
<description>
Controls the launching/halting of lon-capa daemons by loncontrol in systemd
</description>
- <installscript dist="fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 sles15 rhes8 centos8 oracle7 oracle8">
+ <installscript dist="fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 sles15 rhes8 centos8 oracle7 oracle8">
-c '/usr/bin/systemctl enable loncontrol.service'
</installscript>
<installscript dist="ubuntu18 ubuntu20">
@@ -8749,6 +8750,7 @@
stress.pl;
testkerberos.pl;
unescape.pl;
+unsubresources.pl;
user_login_count.pl;
</filenames>
</fileglob>
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1418 loncom/interface/loncommon.pm:1.1419
--- loncom/interface/loncommon.pm:1.1418 Fri Nov 17 17:02:20 2023
+++ loncom/interface/loncommon.pm Sat Nov 18 21:12:45 2023
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.1418 2023/11/17 17:02:20 raeburn Exp $
+# $Id: loncommon.pm,v 1.1419 2023/11/18 21:12:45 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -6461,6 +6461,19 @@
return $output;
}
+##############################################
+=pod
+
+=item * &nocodemirror()
+
+Input: None
+
+Returns: 1 if CodeMirror is deactivated based on
+ user's preference, or domain default,
+ if user indicated use of default.
+
+=cut
+
sub nocodemirror {
my $nocodem = $env{'environment.nocodemirror'};
unless ($nocodem) {
@@ -6475,6 +6488,25 @@
return;
}
+##############################################
+=pod
+
+=item * &permitted_editors()
+
+Input: None
+
+Returns: %editors hash in which keys are editors
+ permitted in current Authoring Space.
+ Value for each key is 1. Possible keys
+ are: edit, xml, and daxe. If no specific
+ set of editors has been set for the Author
+ who owns the Authoring Space, then the
+ domain default will be used. If no domain
+ default has been set, then the keys will be
+ edit and xml.
+
+=cut
+
sub permitted_editors {
my ($is_author,$is_coauthor,$auname,$audom,%editors);
if ($env{'request.role'} =~ m{^au\./}) {
More information about the LON-CAPA-cvs
mailing list