Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

MDL-41485 calendar: Replace value of action buttons on managesubscrip…

…tion page with int
  • Loading branch information...
commit 756a0bc3a14fdde92d1fb67ebba8458f93b47377 1 parent 0bd9f00
@ankitagarwal ankitagarwal authored
View
18 calendar/lib.php
@@ -111,6 +111,16 @@
define('CALENDAR_IMPORT_EVENT_INSERTED', 2);
/**
+ * CALENDAR_SUBSCRIPTION_UPDATE - Used to represent update action for subscriptions in various forms.
+ */
+define('CALENDAR_SUBSCRIPTION_UPDATE', 1);
+
+/**
+ * CALENDAR_SUBSCRIPTION_REMOVE - Used to represent remove action for subscriptions in various forms.
+ */
+define('CALENDAR_SUBSCRIPTION_REMOVE', 2);
+
+/**
* Return the days of the week
*
* @return array array of days
@@ -2894,17 +2904,13 @@ function calendar_add_icalendar_event($event, $courseid, $subscriptionid) {
* @return string A log of the import progress, including errors
*/
function calendar_process_subscription_row($subscriptionid, $pollinterval, $action) {
- global $DB;
// Fetch the subscription from the database making sure it exists.
$sub = calendar_get_subscription($subscriptionid);
- $strupdate = get_string('update');
- $strremove = get_string('remove');
-
// Update or remove the subscription, based on action.
switch ($action) {
- case $strupdate:
+ case CALENDAR_SUBSCRIPTION_UPDATE:
// Skip updating file subscriptions.
if (empty($sub->url)) {
break;
@@ -2915,7 +2921,7 @@ function calendar_process_subscription_row($subscriptionid, $pollinterval, $acti
// Update the events.
return "<p>".get_string('subscriptionupdated', 'calendar', $sub->name)."</p>" . calendar_update_subscription_events($subscriptionid);
- case $strremove:
+ case CALENDAR_SUBSCRIPTION_REMOVE:
calendar_delete_subscription($subscriptionid);
return get_string('subscriptionremoved', 'calendar', $sub->name);
break;
View
2  calendar/managesubscriptions.php
@@ -33,7 +33,7 @@
// Used for processing subscription actions.
$subscriptionid = optional_param('id', 0, PARAM_INT);
$pollinterval = optional_param('pollinterval', 0, PARAM_INT);
-$action = optional_param('action', '', PARAM_ALPHA);
+$action = optional_param('action', '', PARAM_INT);
$url = new moodle_url('/calendar/managesubscriptions.php');
if ($courseid != SITEID) {
View
6 calendar/renderer.php
@@ -836,9 +836,11 @@ protected function subscription_action_form($subscription, $courseid) {
$html .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'course', 'value' => $courseid));
$html .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'id', 'value' => $subscription->id));
if (!empty($subscription->url)) {
- $html .= html_writer::empty_tag('input', array('type' => 'submit', 'name' => 'action', 'value' => get_string('update')));
+ $html .= html_writer::tag('button', get_string('update'), array('type' => 'submit', 'name' => 'action',
+ 'value' => CALENDAR_SUBSCRIPTION_UPDATE));
}
- $html .= html_writer::empty_tag('input', array('type' => 'submit', 'name' => 'action', 'value' => get_string('remove')));
+ $html .= html_writer::tag('button', get_string('remove'), array('type' => 'submit', 'name' => 'action',
+ 'value' => CALENDAR_SUBSCRIPTION_REMOVE));
$html .= html_writer::end_tag('div');
$html .= html_writer::end_tag('form');
return $html;
Please sign in to comment.
Something went wrong with that request. Please try again.