Merge pull request #11 from kecherou/maj_3_4

MAJ Moodle 3.4
DigiDago · Oct 31, 2017 · 6c775ab · 6c775ab
2 parents 8dda71a + afa1cc2
commit 6c775ab
Showing 30 changed files with 612 additions and 98 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,28 +4,29 @@ notifications:
     on_failure: change
 language: php
 php:
-  - "5.6"
-env:
- - DB=pgsql
+  - "7.0"
+node_js:
+    - "iojs"
+    - "7"
+addons:
+  postgresql: "9.3"
 before_script:
  - "export DISPLAY=:99.0"
  - "sh -e /etc/init.d/xvfb start"
  - sleep 3 # give xvfb some time to start
  - git clone git://github.com/moodle/moodle ../moodle && cd ../moodle
- - git checkout $TRAVIS_BRANCH
  - sudo apt-get update > /dev/null
  - travis_retry composer install
  - mv ../moodle-block_admin_presets blocks/admin_presets
  - cp config-dist.php config.php
  - sh -c "sed -i -e s/'password'/''/ -e s/example.com/localhost/ -e s%192.168.1.250%localhost% -e s%127.0.0.1/moodle%localhost:8000% -e s%/home/example%$HOME% -e 's%\(\$CFG.*bht\)%\n\1%' -e 's%\(\$CFG.*behat_wwwroot.*http://localhost:8000\)%\n\1%' config.php"
- - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database moodle;' -U postgres; fi"
- - sh -c "if [ '$DB' = 'pgsql' ]; then sed -i s/\'username\'/\'postgres\'/ config.php; fi"
+ - psql -c 'create database moodle;' -U postgres
+ - sed -i s/\'username\'/\'postgres\'/ config.php
  - cat config.php
  - mkdir -m777 $HOME/moodledata
  - php -S localhost:8000 2> /dev/null > /dev/null &
- - sleep 3 # give the built-in server some time to start
- - "wget http://selenium-release.storage.googleapis.com/2.48/selenium-server-standalone-2.48.2.jar"
- - xvfb-run -a java -jar selenium-server-standalone-2.48.2.jar 2> /dev/null > /dev/null &
- - php admin/tool/behat/cli/init.php
+ - npm install -g grunt
+ - npm install -g grunt-cli
+ - npm install
 script:
- - vendor/bin/behat --config /home/travis/bht_moodledata/behat/behat.yml --tags @block_admin_presets
+ - grunt gherkinlint
diff --git a/README.md b/README.md
@@ -16,6 +16,4 @@ Block to export and import Moodle administration settings
 * Third parties plugins supported
 
 ## See also
-* Modules and Plugins entry: https://moodle.org/plugins/view.php?plugin=block_admin_presets
-* Forum discussion: http://moodle.org/mod/forum/discuss.php?d=171536
-* Tracker component for bugs and other issues: http://tracker.moodle.org/browse/CONTRIB/component/10914
+* Modules and Plugins entry: https://moodle.org/plugins/view.php?plugin=block_admin_presets
diff --git a/block_admin_presets.php b/block_admin_presets.php
@@ -1,4 +1,28 @@
 <?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/>.
+
+/**
+ * Admin presets block main controller
+ *
+ * @package          blocks/admin_presets
+ * @copyright        2017 Digidago <contact@digidago.com><www.digidago.com>
+ * @author           Jordan Kesraoui | DigiDago
+ * @orignalauthor    David Monllaó <david.monllao@urv.cat>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 class block_admin_presets extends block_list {
 

diff --git a/classes/event/preset_deleted.php b/classes/event/preset_deleted.php
@@ -1,4 +1,28 @@
 <?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/>.
+
+/**
+ * Admin presets block main controller
+ *
+ * @package          blocks/admin_presets
+ * @copyright        2017 Digidago <contact@digidago.com><www.digidago.com>
+ * @author           Jordan Kesraoui | DigiDago
+ * @orignalauthor    David Monllaó <david.monllao@urv.cat>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 namespace block_admin_presets\event;
 

diff --git a/classes/event/preset_downloaded.php b/classes/event/preset_downloaded.php
@@ -1,4 +1,28 @@
 <?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/>.
+
+/**
+ * Admin presets block main controller
+ *
+ * @package          blocks/admin_presets
+ * @copyright        2017 Digidago <contact@digidago.com><www.digidago.com>
+ * @author           Jordan Kesraoui | DigiDago
+ * @orignalauthor    David Monllaó <david.monllao@urv.cat>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 namespace block_admin_presets\event;
 

diff --git a/classes/event/preset_exported.php b/classes/event/preset_exported.php
@@ -1,4 +1,28 @@
 <?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/>.
+
+/**
+ * Admin presets block main controller
+ *
+ * @package          blocks/admin_presets
+ * @copyright        2017 Digidago <contact@digidago.com><www.digidago.com>
+ * @author           Jordan Kesraoui | DigiDago
+ * @orignalauthor    David Monllaó <david.monllao@urv.cat>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 namespace block_admin_presets\event;
 

diff --git a/classes/event/preset_imported.php b/classes/event/preset_imported.php
@@ -1,4 +1,28 @@
 <?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/>.
+
+/**
+ * Admin presets block main controller
+ *
+ * @package          blocks/admin_presets
+ * @copyright        2017 Digidago <contact@digidago.com><www.digidago.com>
+ * @author           Jordan Kesraoui | DigiDago
+ * @orignalauthor    David Monllaó <david.monllao@urv.cat>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 namespace block_admin_presets\event;
 

diff --git a/classes/event/preset_loaded.php b/classes/event/preset_loaded.php
@@ -1,4 +1,28 @@
 <?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/>.
+
+/**
+ * Admin presets block main controller
+ *
+ * @package          blocks/admin_presets
+ * @copyright        2017 Digidago <contact@digidago.com><www.digidago.com>
+ * @author           Jordan Kesraoui | DigiDago
+ * @orignalauthor    David Monllaó <david.monllao@urv.cat>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 namespace block_admin_presets\event;
 

diff --git a/classes/event/preset_previewed.php b/classes/event/preset_previewed.php
@@ -1,4 +1,28 @@
 <?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/>.
+
+/**
+ * Admin presets block main controller
+ *
+ * @package          blocks/admin_presets
+ * @copyright        2017 Digidago <contact@digidago.com><www.digidago.com>
+ * @author           Jordan Kesraoui | DigiDago
+ * @orignalauthor    David Monllaó <david.monllao@urv.cat>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 namespace block_admin_presets\event;
 

diff --git a/classes/event/preset_reverted.php b/classes/event/preset_reverted.php
@@ -1,4 +1,28 @@
 <?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/>.
+
+/**
+ * Admin presets block main controller
+ *
+ * @package          blocks/admin_presets
+ * @copyright        2017 Digidago <contact@digidago.com><www.digidago.com>
+ * @author           Jordan Kesraoui | DigiDago
+ * @orignalauthor    David Monllaó <david.monllao@urv.cat>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 namespace block_admin_presets\event;
 

diff --git a/classes/event/presets_listed.php b/classes/event/presets_listed.php
@@ -1,4 +1,28 @@
 <?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/>.
+
+/**
+ * Admin presets block main controller
+ *
+ * @package          blocks/admin_presets
+ * @copyright        2017 Digidago <contact@digidago.com><www.digidago.com>
+ * @author           Jordan Kesraoui | DigiDago
+ * @orignalauthor    David Monllaó <david.monllao@urv.cat>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 namespace block_admin_presets\event;
 

diff --git a/db/access.php b/db/access.php
@@ -15,10 +15,12 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Block presets capabilities.
+ * Admin presets block main controller
  *
- * @package    block_admin_presets
- * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @package          blocks/admin_presets
+ * @copyright        2017 Digidago <contact@digidago.com><www.digidago.com>
+ * @author           Jordan Kesraoui | DigiDago
+ * @orignalauthor    David Monllaó <david.monllao@urv.cat>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 

diff --git a/db/upgrade.php b/db/upgrade.php
@@ -1,4 +1,28 @@
 <?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/>.
+
+/**
+ * Admin presets block main controller
+ *
+ * @package          blocks/admin_presets
+ * @copyright        2017 Digidago <contact@digidago.com><www.digidago.com>
+ * @author           Jordan Kesraoui | DigiDago
+ * @orignalauthor    David Monllaó <david.monllao@urv.cat>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 /**
  * @global moodle_database $DB

diff --git a/forms/admin_presets_export_form.php b/forms/admin_presets_export_form.php
@@ -1,4 +1,28 @@
 <?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/>.
+
+/**
+ * Admin presets block main controller
+ *
+ * @package          blocks/admin_presets
+ * @copyright        2017 Digidago <contact@digidago.com><www.digidago.com>
+ * @author           Jordan Kesraoui | DigiDago
+ * @orignalauthor    David Monllaó <david.monllao@urv.cat>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 require_once($CFG->dirroot.'/lib/formslib.php');