From 2bb01d13cbd6ce2607cd90e842349c8b17a86b39 Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Wed, 9 Apr 2014 11:47:45 +0200
Subject: [PATCH] MDL-44342 airnotifier: Change default Airnotifier url to use
 SSL

This commit include also a fix for checking forced settings
---
 .../output/airnotifier/classes/manager.php    |  4 ---
 message/output/airnotifier/externallib.php    | 32 ++++++++++---------
 .../output/airnotifier/requestaccesskey.php   |  2 +-
 message/output/airnotifier/settings.php       |  2 +-
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/message/output/airnotifier/classes/manager.php b/message/output/airnotifier/classes/manager.php
index e08b5cfdef3..f395c288ffa 100755
--- a/message/output/airnotifier/classes/manager.php
+++ b/message/output/airnotifier/classes/manager.php
@@ -43,10 +43,6 @@ class message_airnotifier_manager {
     public function include_device_ajax() {
         global $PAGE, $CFG;
 
-        if (!$CFG->enableajax) {
-            return false;
-        }
-
         $config = new stdClass();
         $config->resturl = '/message/output/airnotifier/rest.php';
         $config->pageparams = array();
diff --git a/message/output/airnotifier/externallib.php b/message/output/airnotifier/externallib.php
index dbe89d59eb9..56a23a9b56b 100755
--- a/message/output/airnotifier/externallib.php
+++ b/message/output/airnotifier/externallib.php
@@ -150,24 +150,26 @@ class message_airnotifier_external extends external_api {
                     }
 
                     foreach (array('loggedin', 'loggedoff') as $state) {
-                        if ($configured) {
+
+                        $prefstocheck = array();
+                        $prefname = 'message_provider_'.$provider->component.'_'.$provider->name.'_'.$state;
+
+                        // First get forced settings.
+                        if ($forcedpref = get_config('message', $prefname)) {
+                            $prefstocheck = explode(',', $forcedpref);
+                        }
+
+                        // Then get user settings.
+                        if ($userpref = get_user_preferences($prefname, '', $user->id)) {
+                            $prefstocheck += explode(',', $userpref);
+                        }
+
+                        if (in_array('airnotifier', $prefstocheck)) {
+                            $preferences['configured'] = 1;
+                            $configured = true;
                             break;
                         }
 
-                        $prefname = 'message_provider_'.$provider->component.'_'.$provider->name.'_'.$state;
-                        $linepref = get_user_preferences($prefname, '', $user->id);
-                        if ($linepref == '') {
-                            continue;
-                        }
-                        $lineprefarray = explode(',', $linepref);
-
-                        foreach ($lineprefarray as $pref) {
-                            if ($pref == 'airnotifier') {
-                                $preferences['configured'] = 1;
-                                $configured = true;
-                                break;
-                            }
-                        }
                     }
                 }
 
diff --git a/message/output/airnotifier/requestaccesskey.php b/message/output/airnotifier/requestaccesskey.php
index 457832d97cc..0b5ff281b6f 100755
--- a/message/output/airnotifier/requestaccesskey.php
+++ b/message/output/airnotifier/requestaccesskey.php
@@ -25,7 +25,7 @@
 require('../../../config.php');
 require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
 
-define('AIRNOTIFIER_PUBLICURL', 'http://messages.moodle.net');
+define('AIRNOTIFIER_PUBLICURL', 'https://messages.moodle.net');
 
 $PAGE->set_url(new moodle_url('/message/output/airnotifier/requestaccesskey.php'));
 $PAGE->set_context(context_system::instance());
diff --git a/message/output/airnotifier/settings.php b/message/output/airnotifier/settings.php
index d788f75371c..5eaed4a5777 100755
--- a/message/output/airnotifier/settings.php
+++ b/message/output/airnotifier/settings.php
@@ -27,7 +27,7 @@ if ($ADMIN->fulltree) {
     // The processor should be enabled by the same enable mobile setting.
     $settings->add(new admin_setting_configtext('airnotifierurl',
                     get_string('airnotifierurl', 'message_airnotifier'),
-                    get_string('configairnotifierurl', 'message_airnotifier'), 'http://messages.moodle.net', PARAM_URL));
+                    get_string('configairnotifierurl', 'message_airnotifier'), 'https://messages.moodle.net', PARAM_URL));
     $settings->add(new admin_setting_configtext('airnotifierport',
                     get_string('airnotifierport', 'message_airnotifier'),
                     get_string('configairnotifierport', 'message_airnotifier'), '80', PARAM_INT));