Merge branch 'MDL-33472-master' of git://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 3 Sep 2013 06:35:58 +0000 (14:35 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 3 Sep 2013 06:35:58 +0000 (14:35 +0800)
portfolio/googledocs/db/upgrade.php
portfolio/googledocs/db/upgradelib.php [new file with mode: 0644]
portfolio/picasa/db/upgrade.php
portfolio/picasa/db/upgradelib.php [new file with mode: 0644]
repository/googledocs/db/upgrade.php
repository/googledocs/db/upgradelib.php [new file with mode: 0644]
repository/picasa/db/upgrade.php
repository/picasa/db/upgradelib.php [new file with mode: 0644]

index 4d0a36a..cbb3671 100644 (file)
@@ -20,6 +20,7 @@
  */
 function xmldb_portfolio_googledocs_upgrade($oldversion) {
     global $CFG, $DB;
+    require_once(__DIR__.'/upgradelib.php');
 
     $dbman = $DB->get_manager();
 
@@ -53,28 +54,3 @@ function xmldb_portfolio_googledocs_upgrade($oldversion) {
 
     return true;
 }
-
-function portfolio_googledocs_admin_upgrade_notification() {
-    $admins = get_admins();
-
-    if (empty($admins)) {
-        return;
-    }
-    $a = new stdClass;
-    $a->docsurl = get_docs_url('Google_OAuth_2.0_setup');
-
-    foreach ($admins as $admin) {
-        $message = new stdClass();
-        $message->component         = 'moodle';
-        $message->name              = 'notices';
-        $message->userfrom          = get_admin();
-        $message->userto            = $admin;
-        $message->smallmessage      = get_string('oauth2upgrade_message_small', 'portfolio_googledocs');
-        $message->subject           = get_string('oauth2upgrade_message_subject', 'portfolio_googledocs');
-        $message->fullmessage       = get_string('oauth2upgrade_message_content', 'portfolio_googledocs', $a);
-        $message->fullmessagehtml   = get_string('oauth2upgrade_message_content', 'portfolio_googledocs', $a);
-        $message->fullmessageformat = FORMAT_PLAIN;
-        $message->notification      = 1;
-        message_send($message);
-    }
-}
diff --git a/portfolio/googledocs/db/upgradelib.php b/portfolio/googledocs/db/upgradelib.php
new file mode 100644 (file)
index 0000000..4658ed8
--- /dev/null
@@ -0,0 +1,53 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Googledocs portfolio upgrade script.
+ *
+ * @package   portfolio_googledocs
+ * @copyright 2013 Dan Poltawski <dan@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Inform admins about setup required for googledocs change.
+ */
+function portfolio_googledocs_admin_upgrade_notification() {
+    $admins = get_admins();
+
+    if (empty($admins)) {
+        return;
+    }
+    $a = new stdClass;
+    $a->docsurl = get_docs_url('Google_OAuth_2.0_setup');
+
+    foreach ($admins as $admin) {
+        $message = new stdClass();
+        $message->component         = 'moodle';
+        $message->name              = 'notices';
+        $message->userfrom          = get_admin();
+        $message->userto            = $admin;
+        $message->smallmessage      = get_string('oauth2upgrade_message_small', 'portfolio_googledocs');
+        $message->subject           = get_string('oauth2upgrade_message_subject', 'portfolio_googledocs');
+        $message->fullmessage       = get_string('oauth2upgrade_message_content', 'portfolio_googledocs', $a);
+        $message->fullmessagehtml   = get_string('oauth2upgrade_message_content', 'portfolio_googledocs', $a);
+        $message->fullmessageformat = FORMAT_PLAIN;
+        $message->notification      = 1;
+        message_send($message);
+    }
+}
index 2765e6e..4d0512f 100644 (file)
@@ -20,6 +20,7 @@
  */
 function xmldb_portfolio_picasa_upgrade($oldversion) {
     global $CFG, $DB;
+    require_once(__DIR__.'/upgradelib.php');
 
     $dbman = $DB->get_manager();
 
@@ -53,28 +54,3 @@ function xmldb_portfolio_picasa_upgrade($oldversion) {
 
     return true;
 }
-
-function portfolio_picasa_admin_upgrade_notification() {
-    $admins = get_admins();
-
-    if (empty($admins)) {
-        return;
-    }
-    $a = new stdClass;
-    $a->docsurl = get_docs_url('Google_OAuth_2.0_setup');
-
-    foreach ($admins as $admin) {
-        $message = new stdClass();
-        $message->component         = 'moodle';
-        $message->name              = 'notices';
-        $message->userfrom          = get_admin();
-        $message->userto            = $admin;
-        $message->smallmessage      = get_string('oauth2upgrade_message_small', 'portfolio_picasa');
-        $message->subject           = get_string('oauth2upgrade_message_subject', 'portfolio_picasa');
-        $message->fullmessage       = get_string('oauth2upgrade_message_content', 'portfolio_picasa', $a);
-        $message->fullmessagehtml   = get_string('oauth2upgrade_message_content', 'portfolio_picasa', $a);
-        $message->fullmessageformat = FORMAT_PLAIN;
-        $message->notification      = 1;
-        message_send($message);
-    }
-}
diff --git a/portfolio/picasa/db/upgradelib.php b/portfolio/picasa/db/upgradelib.php
new file mode 100644 (file)
index 0000000..a711cbf
--- /dev/null
@@ -0,0 +1,53 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Picasa portfolio upgrade script.
+ *
+ * @package   portfolio_picasa
+ * @copyright 2013 Dan Poltawski <dan@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Inform admins about setup required for picasa change.
+ */
+function portfolio_picasa_admin_upgrade_notification() {
+    $admins = get_admins();
+
+    if (empty($admins)) {
+        return;
+    }
+    $a = new stdClass;
+    $a->docsurl = get_docs_url('Google_OAuth_2.0_setup');
+
+    foreach ($admins as $admin) {
+        $message = new stdClass();
+        $message->component         = 'moodle';
+        $message->name              = 'notices';
+        $message->userfrom          = get_admin();
+        $message->userto            = $admin;
+        $message->smallmessage      = get_string('oauth2upgrade_message_small', 'portfolio_picasa');
+        $message->subject           = get_string('oauth2upgrade_message_subject', 'portfolio_picasa');
+        $message->fullmessage       = get_string('oauth2upgrade_message_content', 'portfolio_picasa', $a);
+        $message->fullmessagehtml   = get_string('oauth2upgrade_message_content', 'portfolio_picasa', $a);
+        $message->fullmessageformat = FORMAT_PLAIN;
+        $message->notification      = 1;
+        message_send($message);
+    }
+}
index 1ee121b..68cf16e 100644 (file)
@@ -20,6 +20,7 @@
  */
 function xmldb_repository_googledocs_upgrade($oldversion) {
     global $CFG, $DB;
+    require_once(__DIR__.'/upgradelib.php');
 
     $dbman = $DB->get_manager();
 
@@ -56,28 +57,3 @@ function xmldb_repository_googledocs_upgrade($oldversion) {
 
     return true;
 }
-
-function repository_googledocs_admin_upgrade_notification() {
-    $admins = get_admins();
-
-    if (empty($admins)) {
-        return;
-    }
-
-    $a = new stdClass;
-    $a->docsurl = get_docs_url('Google_OAuth_2.0_setup');
-    foreach ($admins as $admin) {
-        $message = new stdClass();
-        $message->component         = 'moodle';
-        $message->name              = 'notices';
-        $message->userfrom          = get_admin();
-        $message->userto            = $admin;
-        $message->smallmessage      = get_string('oauth2upgrade_message_small', 'repository_googledocs');
-        $message->subject           = get_string('oauth2upgrade_message_subject', 'repository_googledocs');
-        $message->fullmessage       = get_string('oauth2upgrade_message_content', 'repository_googledocs', $a);
-        $message->fullmessagehtml   = get_string('oauth2upgrade_message_content', 'repository_googledocs', $a);
-        $message->fullmessageformat = FORMAT_PLAIN;
-        $message->notification      = 1;
-        message_send($message);
-    }
-}
diff --git a/repository/googledocs/db/upgradelib.php b/repository/googledocs/db/upgradelib.php
new file mode 100644 (file)
index 0000000..c065bd0
--- /dev/null
@@ -0,0 +1,53 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Googledocs repository upgrade script.
+ *
+ * @package   repository_googledocs
+ * @copyright 2013 Dan Poltawski <dan@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Inform admins about setup required for googledocs change.
+ */
+function repository_googledocs_admin_upgrade_notification() {
+    $admins = get_admins();
+
+    if (empty($admins)) {
+        return;
+    }
+
+    $a = new stdClass;
+    $a->docsurl = get_docs_url('Google_OAuth_2.0_setup');
+    foreach ($admins as $admin) {
+        $message = new stdClass();
+        $message->component         = 'moodle';
+        $message->name              = 'notices';
+        $message->userfrom          = get_admin();
+        $message->userto            = $admin;
+        $message->smallmessage      = get_string('oauth2upgrade_message_small', 'repository_googledocs');
+        $message->subject           = get_string('oauth2upgrade_message_subject', 'repository_googledocs');
+        $message->fullmessage       = get_string('oauth2upgrade_message_content', 'repository_googledocs', $a);
+        $message->fullmessagehtml   = get_string('oauth2upgrade_message_content', 'repository_googledocs', $a);
+        $message->fullmessageformat = FORMAT_PLAIN;
+        $message->notification      = 1;
+        message_send($message);
+    }
+}
index b216937..7b691eb 100644 (file)
@@ -20,6 +20,7 @@
  */
 function xmldb_repository_picasa_upgrade($oldversion) {
     global $CFG, $DB;
+    require_once(__DIR__.'/upgradelib.php');
 
     $dbman = $DB->get_manager();
 
@@ -56,28 +57,3 @@ function xmldb_repository_picasa_upgrade($oldversion) {
 
     return true;
 }
-
-function repository_picasa_admin_upgrade_notification() {
-    $admins = get_admins();
-
-    if (empty($admins)) {
-        return;
-    }
-    $a = new stdClass;
-    $a->docsurl = get_docs_url('Google_OAuth_2.0_setup');
-
-    foreach ($admins as $admin) {
-        $message = new stdClass();
-        $message->component         = 'moodle';
-        $message->name              = 'notices';
-        $message->userfrom          = get_admin();
-        $message->userto            = $admin;
-        $message->smallmessage      = get_string('oauth2upgrade_message_small', 'repository_picasa');
-        $message->subject           = get_string('oauth2upgrade_message_subject', 'repository_picasa');
-        $message->fullmessage       = get_string('oauth2upgrade_message_content', 'repository_picasa', $a);
-        $message->fullmessagehtml   = get_string('oauth2upgrade_message_content', 'repository_picasa', $a);
-        $message->fullmessageformat = FORMAT_PLAIN;
-        $message->notification      = 1;
-        message_send($message);
-    }
-}
diff --git a/repository/picasa/db/upgradelib.php b/repository/picasa/db/upgradelib.php
new file mode 100644 (file)
index 0000000..4d76af5
--- /dev/null
@@ -0,0 +1,53 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Picasa repository upgrade script.
+ *
+ * @package   repository_picasa
+ * @copyright 2013 Dan Poltawski <dan@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Inform admins about setup required for google picasa change.
+ */
+function repository_picasa_admin_upgrade_notification() {
+    $admins = get_admins();
+
+    if (empty($admins)) {
+        return;
+    }
+    $a = new stdClass;
+    $a->docsurl = get_docs_url('Google_OAuth_2.0_setup');
+
+    foreach ($admins as $admin) {
+        $message = new stdClass();
+        $message->component         = 'moodle';
+        $message->name              = 'notices';
+        $message->userfrom          = get_admin();
+        $message->userto            = $admin;
+        $message->smallmessage      = get_string('oauth2upgrade_message_small', 'repository_picasa');
+        $message->subject           = get_string('oauth2upgrade_message_subject', 'repository_picasa');
+        $message->fullmessage       = get_string('oauth2upgrade_message_content', 'repository_picasa', $a);
+        $message->fullmessagehtml   = get_string('oauth2upgrade_message_content', 'repository_picasa', $a);
+        $message->fullmessageformat = FORMAT_PLAIN;
+        $message->notification      = 1;
+        message_send($message);
+    }
+}