MDL-17203 new option for disabling of calendar export

diff --git a/admin/settings/appearance.php b/admin/settings/appearance.php
index f856a5298497c0d9028b282247795267143ae085..dbd36c45c4cc90ff343684bf865df8875d6650df 100644 (file)
--- a/admin/settings/appearance.php
+++ b/admin/settings/appearance.php
@@ -44,6 +44,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $temp->add(new admin_setting_special_calendar_weekend());
     $temp->add(new admin_setting_configtext('calendar_lookahead',get_string('configlookahead','admin'),get_string('helpupcominglookahead', 'admin'),21,PARAM_INT));
     $temp->add(new admin_setting_configtext('calendar_maxevents',get_string('configmaxevents','admin'),get_string('helpupcomingmaxevents', 'admin'),10,PARAM_INT));
+    $temp->add(new admin_setting_configcheckbox('enablecalendarexport', get_string('enablecalendarexport', 'admin'), get_string('configenablecalendarexport','admin'), 1));
     $ADMIN->add('appearance', $temp);
 
     // "htmleditor" settingpage

diff --git a/calendar/export.php b/calendar/export.php
index 1dccb7bdb83855f8a2da852f73a1cd2ff10070c1..e1a787a431f8feb0016fca603f71b848503303b2 100644 (file)
--- a/calendar/export.php
+++ b/calendar/export.php
@@ -15,6 +15,10 @@ if ($courseid = optional_param('course', 0, PARAM_INT)) {
 
 require_login();
 
+if (empty($CFG->enablecalendarexport)) {
+    die('no export');
+}
+
 if(!$site = get_site()) {
     redirect($CFG->wwwroot.'/'.$CFG->admin.'/index.php');
 }

diff --git a/calendar/export_execute.php b/calendar/export_execute.php
index 63d820704bea6db34786ed9da72ac71eabd057f5..73b4f71e866679f539882ff994c272edfb766761 100644 (file)
--- a/calendar/export_execute.php
+++ b/calendar/export_execute.php
@@ -8,6 +8,10 @@ require_once($CFG->libdir.'/bennu/bennu.inc.php');
 $username = required_param('username', PARAM_TEXT);
 $authtoken = required_param('authtoken', PARAM_ALPHANUM);
 
+if (empty($CFG->enablecalendarexport)) {
+    die('no export');
+}
+
 //Fetch user information
 if (!$user = get_complete_user_data('username', $username)) {
    //No such user

diff --git a/calendar/view.php b/calendar/view.php
index 827e63cea274b830c65e5ec5c8539ce5249fed3a..f8fd374195c860275ce5603a52aa5a4523609b31 100644 (file)
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -165,17 +165,19 @@
 
     //Link to calendar export page
     echo '<div class="bottom">';
-    print_single_button('export.php', array('course'=>$courseid), get_string('exportcalendar', 'calendar'));
-
-    if (!empty($USER->id)) {
-        $authtoken = sha1($USER->username . $USER->password);
-        $usernameencoded = urlencode($USER->username);
-
-        echo "<a href=\"export_execute.php?preset_what=all&amp;preset_time=recentupcoming&amp;username=$usernameencoded&amp;authtoken=$authtoken\">"
-             .'<img src="'.$CFG->pixpath.'/i/ical.gif" height="14" width="36" '
-             .'alt="'.get_string('ical', 'calendar').'" '
-             .'title="'.get_string('quickdownloadcalendar', 'calendar').'" />'
-             .'</a>';
+    if (!empty($CFG->enablecalendarexport)) {
+        print_single_button('export.php', array('course'=>$courseid), get_string('exportcalendar', 'calendar'));
+
+        if (!empty($USER->id)) {
+            $authtoken = sha1($USER->username . $USER->password);
+            $usernameencoded = urlencode($USER->username);
+
+            echo "<a href=\"export_execute.php?preset_what=all&amp;preset_time=recentupcoming&amp;username=$usernameencoded&amp;authtoken=$authtoken\">"
+                 .'<img src="'.$CFG->pixpath.'/i/ical.gif" height="14" width="36" '
+                 .'alt="'.get_string('ical', 'calendar').'" '
+                 .'title="'.get_string('quickdownloadcalendar', 'calendar').'" />'
+                 .'</a>';
+        }
     }
 
     echo '</div>';

diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index b45d33fc31d9a4371fc16387458dbb8a3f1af4c1..02716108ff6b98ecaf1f42a93fc2ceeda33dd3a4 100644 (file)
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -114,6 +114,7 @@ $string['configemailchangeconfirmation'] = 'Require an email confirmation step w
 $string['configemoticons'] = 'Change the code on the left that relates to the name of the emoticon on the right.  To add new emoticons, add a code and a name, then add an image as name.gif in /pix/s.';
 $string['configenableajax'] = 'This setting allows you to control the use of AJAX (advanced client/server interfaces using Javascript) across the whole site.  With this setting enabled users can still make a choice in their profile, otherwise AJAX is disabled for everybody.';
 $string['configdisablecourseajax'] = 'Do not use AJAX when editing main course pages.';
+$string['configenablecalendarexport'] = 'Enable exporting or subscribing to calendars.';
 $string['configenablecourserequests'] = 'This will allow any user to request a course be created.';
 $string['configenableglobalsearch'] = 'This setting enables global text searching in resources and activities, it is not compatible with PHP 4.';
 $string['configenablegroupings'] = 'This setting enables groupings of groups.';
@@ -354,6 +355,7 @@ $string['emailchangeconfirmation'] = 'Email change confirmation';
 $string['emoticons'] = 'Emoticons';
 $string['emptysettingvalue'] = 'Empty';
 $string['enableajax'] = 'Enable AJAX';
+$string['enablecalendarexport'] = 'Enable calendar export';
 $string['enablecourserequests'] = 'Enable course requests';
 $string['enableglobalsearch'] = 'Enable global search';
 $string['enablegroupings'] = 'Enable groupings';