From a7d8a8405a12969850a1a3a98b4ad3f15324dbb2 Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Mon, 15 Apr 2024 18:05:19 +0200 Subject: [PATCH 01/21] add important files --- .gitignore | 0 README.md | 43 +++++++++++++++++++++++++++++++++++++++++++ version.php | 30 ++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 .gitignore create mode 100644 README.md create mode 100644 version.php diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/README.md b/README.md new file mode 100644 index 0000000..2b99ada --- /dev/null +++ b/README.md @@ -0,0 +1,43 @@ +# Townsquare Support # + +A moodle local plugin that manages the subplugins for the moodle townsquare block. +Documentation of the townsquare block: https://github.com/learnweb/moodle-block_townsquare + +## Installing via uploaded ZIP file ## + +1. Log in to your Moodle site as an admin and go to _Site administration > + Plugins > Install plugins_. +2. Upload the ZIP file with the plugin code. You should only be prompted to add + extra details if your plugin type is not automatically detected. +3. Check the plugin validation report and finish the installation. + +## Installing manually ## + +The plugin can be also installed by putting the contents of this directory to + + {your/moodle/dirroot}/local/townsquaresupport + +Afterwards, log in to your Moodle site as an admin and go to _Site administration > +Notifications_ to complete the installation. + +Alternatively, you can run + + $ php admin/cli/upgrade.php + +to complete the installation from the command line. + +## License ## + +2024 Tamaro Walter + +This program 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. + +This program 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 +this program. If not, see . diff --git a/version.php b/version.php new file mode 100644 index 0000000..1d613dd --- /dev/null +++ b/version.php @@ -0,0 +1,30 @@ +. + +/** + * Plugin version and other meta-data are defined here. + * + * @package block_townsquare + * @copyright 2023 Tamaro Walter + * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); +$plugin->component = 'local_townsquaresupport'; +$plugin->release = '0.1.0'; +$plugin->version = 2024041500; +$plugin->requires = 2022041900; +$plugin->maturity = MATURITY_ALPHA; From e882210574e2d9400f91835332b1fe232e9038f4 Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Mon, 15 Apr 2024 18:13:13 +0200 Subject: [PATCH 02/21] init plugin structure --- classes/townsquaresupportinterface.php | 50 ++++++++++++++++++++++++++ db/access.php | 24 +++++++++++++ db/subplugins.json | 5 +++ db/subplugins.php | 27 ++++++++++++++ lang/en/local_townsquaresupport.php | 30 ++++++++++++++++ 5 files changed, 136 insertions(+) create mode 100644 classes/townsquaresupportinterface.php create mode 100644 db/access.php create mode 100644 db/subplugins.json create mode 100644 db/subplugins.php create mode 100644 lang/en/local_townsquaresupport.php diff --git a/classes/townsquaresupportinterface.php b/classes/townsquaresupportinterface.php new file mode 100644 index 0000000..bbe39c8 --- /dev/null +++ b/classes/townsquaresupportinterface.php @@ -0,0 +1,50 @@ +. + +/** + * Interface for all subplugins that improve the townsquare block content. + * + * The Plugins of the type townsquaresupport are used to increase the content of the townsquare block. + * Every module that wants to show content on townsquare can implement this interface. + * Every module must: + * - gather "events" for a user that can be transformed into letters. + * - provide php_unit test to ensure the correct behaviour. + * local_townsquaresupport will call this function of each subplugin. The townsquare block will then gather all events from local_townsquaresupport + * + * @package local_townsquaresupport + * @copyright 2024 Tamaro Walter + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +namespace local_townsquaresupport; + +interface townsquaresupportinterface { + + /** + * Function to gather the events + * Every event must gain sufficient data so that townsquare can build a letter from it. + * The array should contain following information: + * [courseid] => int Course ID from where the content comes from. + * [modulename] => string Name of the activity module. + * [instancename] => string Name of the instance that shows the notification. + * [content] => string The content that will be showed in the letter. + * [timestart] => int Timestamp that represents the deadline/creation of a notification. Is important to sort events. + * [coursemoduleid] => int Course module id of the content module. + * [eventtype] => string Type of the event. + * + * @return array of events that can be transformed into letters + */ + public function get_events(): array; +} diff --git a/db/access.php b/db/access.php new file mode 100644 index 0000000..cc13aef --- /dev/null +++ b/db/access.php @@ -0,0 +1,24 @@ +. + +/** + * Plugin capabilities for the block_townsquare plugin. + * + * @package block_townsquare + * @copyright 2023 Tamaro Walter + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +defined('MOODLE_INTERNAL') || die(); diff --git a/db/subplugins.json b/db/subplugins.json new file mode 100644 index 0000000..a38f543 --- /dev/null +++ b/db/subplugins.json @@ -0,0 +1,5 @@ +{ + "plugintypes": { + "supportedmodules": "local/townsquaresupport/supportedmodules" + } +} diff --git a/db/subplugins.php b/db/subplugins.php new file mode 100644 index 0000000..8dfe460 --- /dev/null +++ b/db/subplugins.php @@ -0,0 +1,27 @@ +. + +/** + * This file defines the sub-plugins for the townsquare block. + * + * @package blocks_townsquare + * @copyright 2023 Tamaro Walter + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +$subplugins = ['supportedmodules' => 'local/townsquaresupport/supportedmodules']; diff --git a/lang/en/local_townsquaresupport.php b/lang/en/local_townsquaresupport.php new file mode 100644 index 0000000..93efb1a --- /dev/null +++ b/lang/en/local_townsquaresupport.php @@ -0,0 +1,30 @@ +. + +/** + * Plugin strings are defined here. + * + * @package local_townsquaresupport + * @category string + * @copyright 2024 Tamaro Walter + * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +// Subplugin strings +$string['subplugintype_townsquaresupport'] = 'Supported module'; +$string['subplugintype_townsquaresupport_plural'] = 'Supported modules'; \ No newline at end of file From e5734a5084c4955d20af88f45f78c514a7bd5607 Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Mon, 15 Apr 2024 18:17:38 +0200 Subject: [PATCH 03/21] add github workflows and lib.php --- .github/workflows/moodle-ci.yml | 180 +++++++++++++++++++++++++++ .github/workflows/moodle-release.yml | 54 ++++++++ lib.php | 15 +++ 3 files changed, 249 insertions(+) create mode 100644 .github/workflows/moodle-ci.yml create mode 100644 .github/workflows/moodle-release.yml create mode 100644 lib.php diff --git a/.github/workflows/moodle-ci.yml b/.github/workflows/moodle-ci.yml new file mode 100644 index 0000000..a2eae8d --- /dev/null +++ b/.github/workflows/moodle-ci.yml @@ -0,0 +1,180 @@ +name: Moodle Plugin CI + +on: [push, pull_request] + +jobs: + static: + runs-on: ubuntu-latest + + strategy: + matrix: + php: ['8.2'] + moodle-branch: ['MOODLE_403_STABLE'] + database: ['pgsql'] + + steps: + - name: Start PostgreSQL + run: docker run -p 5432:5432 -e POSTGRES_USER=postgres -e POSTGRES_HOST_AUTH_METHOD=trust -d postgres:14 + + - name: Check out repository code + uses: actions/checkout@v3 + with: + path: plugin + + - name: Setup PHP ${{ matrix.php }} + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + ini-values: max_input_vars=5000 + coverage: none + + - name: Get composer cache directory + id: composer-cache + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + + - name: Composer cache + uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: | + ${{ runner.os }}-composer- + + - name: npm cache + uses: actions/cache@v3 + with: + path: ~/.npm + key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-node- + + - name: Initialise moodle-plugin-ci + run: | + composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3 + echo $(cd ci/bin; pwd) >> $GITHUB_PATH + echo $(cd ci/vendor/bin; pwd) >> $GITHUB_PATH + sudo locale-gen en_AU.UTF-8 + echo "NVM_DIR=$HOME/.nvm" >> $GITHUB_ENV + + - name: Install mod plugin + run: moodle-plugin-ci add-plugin learnweb/moodle-mod_moodleoverflow + + - name: Install moodle-plugin-ci + run: | + moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1 --no-init + env: + DB: ${{ matrix.database }} + MOODLE_BRANCH: ${{ matrix.moodle-branch }} + + - name: PHP Lint + if: ${{ always() }} + run: moodle-plugin-ci phplint + + - name: PHP Copy/Paste Detector + if: ${{ always() }} + run: moodle-plugin-ci phpcpd + continue-on-error: true + + - name: PHP Mess Detector + if: ${{ always() }} + run: moodle-plugin-ci phpmd + + - name: Moodle Code Checker + if: ${{ always() }} + run: moodle-plugin-ci codechecker + + - name: Moodle PHPDoc Checker + if: ${{ always() }} + run: moodle-plugin-ci phpdoc + continue-on-error: true + + - name: Validating + if: ${{ always() }} + run: moodle-plugin-ci validate + + - name: Check upgrade savepoints + if: ${{ always() }} + run: moodle-plugin-ci savepoints + + - name: Mustache Lint + if: ${{ always() }} + run: moodle-plugin-ci mustache + continue-on-error: true + + - name: Grunt + if: ${{ always() }} + run: moodle-plugin-ci grunt + continue-on-error: true + + test: + runs-on: ubuntu-latest + needs: static + + strategy: + fail-fast: false + matrix: + php: ['8.0', '8.1'] + moodle-branch: ['MOODLE_401_STABLE', 'MOODLE_402_STABLE', 'MOODLE_403_STABLE'] + database: ['mariadb', 'pgsql'] + + steps: + - name: Start MariaDB + if: matrix.database == 'mariadb' + run: docker run -p 3306:3306 -e MYSQL_USER=root -e MYSQL_ALLOW_EMPTY_PASSWORD=true -d mariadb:10 + + - name: Start PostgreSQL + if: matrix.database == 'pgsql' + run: docker run -p 5432:5432 -e POSTGRES_USER=postgres -e POSTGRES_HOST_AUTH_METHOD=trust -d postgres:14 + + - name: Check out repository code + uses: actions/checkout@v3 + with: + path: plugin + + - name: Setup PHP ${{ matrix.php }} + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + ini-values: max_input_vars=5000 + coverage: none + + - name: Get composer cache directory + id: composer-cache + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + - name: Composer cache + uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: | + ${{ runner.os }}-composer- + - name: npm cache + uses: actions/cache@v3 + with: + path: ~/.npm + key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-node- + + - name: Initialise moodle-plugin-ci + run: | + composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3 + echo $(cd ci/bin; pwd) >> $GITHUB_PATH + echo $(cd ci/vendor/bin; pwd) >> $GITHUB_PATH + sudo locale-gen en_AU.UTF-8 + echo "NVM_DIR=$HOME/.nvm" >> $GITHUB_ENV + + - name: Install moodle-plugin-ci + run: | + moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1 + env: + DB: ${{ matrix.database }} + MOODLE_BRANCH: ${{ matrix.moodle-branch }} + + - name: PHPUnit tests + if: ${{ always() }} + run: moodle-plugin-ci phpunit + + - name: Behat features + if: ${{ always() }} + run: moodle-plugin-ci behat --auto-rerun 0 diff --git a/.github/workflows/moodle-release.yml b/.github/workflows/moodle-release.yml new file mode 100644 index 0000000..85b1273 --- /dev/null +++ b/.github/workflows/moodle-release.yml @@ -0,0 +1,54 @@ +# +# Whenever a new tag starting with "v" is pushed, add the tagged version +# to the Moodle Plugins directory at https://moodle.org/plugins +# +# revision: 2021070201 +# Changed to be released on Github release with the release notes. +# +name: Releasing in the Plugins directory + +on: + release: + types: [published] + +defaults: + run: + shell: bash + +jobs: + release-at-moodle-org: + runs-on: ubuntu-latest + env: + PLUGIN: local_townsquaresupport + CURL: curl -s + ENDPOINT: https://moodle.org/webservice/rest/server.php + TOKEN: ${{ secrets.MOODLE_ORG_TOKEN }} + FUNCTION: local_plugins_add_version + + steps: + - name: Call the service function + id: add-version + run: | + TAGNAME="${{ github.event.release.tag_name }}" + BODY="${{ github.event.release.body }}" + ZIPURL="${{ github.event.release.zipball_url }}" + RESPONSE=$(${CURL} ${ENDPOINT} --data-urlencode "wstoken=${TOKEN}" \ + --data-urlencode "wsfunction=${FUNCTION}" \ + --data-urlencode "moodlewsrestformat=json" \ + --data-urlencode "frankenstyle=${PLUGIN}" \ + --data-urlencode "zipurl=${ZIPURL}" \ + --data-urlencode "vcssystem=git" \ + --data-urlencode "vcsrepositoryurl=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" \ + --data-urlencode "vcstag=${TAGNAME}" \ + --data-urlencode "changelogurl=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/commits/${TAGNAME}" \ + --data-urlencode "altdownloadurl=${ZIPURL}" \ + --data-urlencode "releasenotes=${BODY}" \ + --data-urlencode "releasenotesformat=4") + echo "response=${RESPONSE}" >> $GITHUB_OUTPUT + - name: Evaluate the response + id: evaluate-response + env: + RESPONSE: ${{ steps.add-version.outputs.response }} + run: | + jq <<< ${RESPONSE} + jq --exit-status ".id" <<< ${RESPONSE} > /dev/null diff --git a/lib.php b/lib.php new file mode 100644 index 0000000..1bf541d --- /dev/null +++ b/lib.php @@ -0,0 +1,15 @@ +. From e1bfc9563fdc1604b7c8595b2c2716ad0cae7714 Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Mon, 15 Apr 2024 18:28:39 +0200 Subject: [PATCH 04/21] codeclean --- classes/townsquaresupportinterface.php | 3 ++- db/access.php | 2 +- lang/en/local_townsquaresupport.php | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/classes/townsquaresupportinterface.php b/classes/townsquaresupportinterface.php index bbe39c8..c8bae91 100644 --- a/classes/townsquaresupportinterface.php +++ b/classes/townsquaresupportinterface.php @@ -22,7 +22,8 @@ * Every module must: * - gather "events" for a user that can be transformed into letters. * - provide php_unit test to ensure the correct behaviour. - * local_townsquaresupport will call this function of each subplugin. The townsquare block will then gather all events from local_townsquaresupport + * local_townsquaresupport will call this function of each subplugin. + * The townsquare block will then gather all events from local_townsquaresupport * * @package local_townsquaresupport * @copyright 2024 Tamaro Walter diff --git a/db/access.php b/db/access.php index cc13aef..e755df4 100644 --- a/db/access.php +++ b/db/access.php @@ -21,4 +21,4 @@ * @copyright 2023 Tamaro Walter * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -defined('MOODLE_INTERNAL') || die(); + diff --git a/lang/en/local_townsquaresupport.php b/lang/en/local_townsquaresupport.php index 93efb1a..86a4850 100644 --- a/lang/en/local_townsquaresupport.php +++ b/lang/en/local_townsquaresupport.php @@ -25,6 +25,6 @@ defined('MOODLE_INTERNAL') || die(); -// Subplugin strings +// Subplugin strings. $string['subplugintype_townsquaresupport'] = 'Supported module'; -$string['subplugintype_townsquaresupport_plural'] = 'Supported modules'; \ No newline at end of file +$string['subplugintype_townsquaresupport_plural'] = 'Supported modules'; From 67633530399b6b673191664c8399d33b05a6a4f7 Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Mon, 15 Apr 2024 18:48:40 +0200 Subject: [PATCH 05/21] add db files and add pluginname string --- db/install.php | 32 +++++++++++++++++++++ db/upgrade.php | 43 +++++++++++++++++++++++++++++ lang/en/local_townsquaresupport.php | 4 +++ 3 files changed, 79 insertions(+) create mode 100644 db/install.php create mode 100644 db/upgrade.php diff --git a/db/install.php b/db/install.php new file mode 100644 index 0000000..911c7c5 --- /dev/null +++ b/db/install.php @@ -0,0 +1,32 @@ +. + +/** + * Code to be executed after the plugin's database scheme has been installed is defined here. + * + * @package local_townsquaresupport + * @category upgrade + * @copyright 2024 Tamaro Walter + * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +/** + * Custom code to be run on installing the plugin. + */ +function xmldb_local_townsquaresupport_install() { + + return true; +} diff --git a/db/upgrade.php b/db/upgrade.php new file mode 100644 index 0000000..5970b05 --- /dev/null +++ b/db/upgrade.php @@ -0,0 +1,43 @@ +. + +/** + * Plugin upgrade steps are defined here. + * + * @package local_townsquaresupport + * @category upgrade + * @copyright 2024 Tamaro Walter + * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +/** + * Execute block_townsquare upgrade from the given old version. + * + * @param int $oldversion + * @return bool + */ +function xmldb_local_townsquaresupport_upgrade($oldversion) { + global $DB; + + $dbman = $DB->get_manager(); + + // For further information please read {@link https://docs.moodle.org/dev/Upgrade_API}. + // + // You will also have to create the db/install.xml file by using the XMLDB Editor. + // Documentation for the XMLDB Editor can be found at {@link https://docs.moodle.org/dev/XMLDB_editor}. + + return true; +} diff --git a/lang/en/local_townsquaresupport.php b/lang/en/local_townsquaresupport.php index 86a4850..6b22cc7 100644 --- a/lang/en/local_townsquaresupport.php +++ b/lang/en/local_townsquaresupport.php @@ -25,6 +25,10 @@ defined('MOODLE_INTERNAL') || die(); +// Core strings for the installation. +$string['pluginname'] = 'Townsquare support plugin'; +$string['pluginname'] = 'Townsquare support'; + // Subplugin strings. $string['subplugintype_townsquaresupport'] = 'Supported module'; $string['subplugintype_townsquaresupport_plural'] = 'Supported modules'; From a6f418f27a50c1e18ff909aabab70d5d8f593df0 Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Wed, 17 Apr 2024 07:56:48 +0200 Subject: [PATCH 06/21] add plugininfo and first subplugin --- lib.php | 23 ++++ locallib.php | 118 ++++++++++++++++++ plugininfo/supportedmodules.php | 22 ++++ .../lang/en/tsmoodleoverflow.php | 29 +++++ supportedmodules/tsmoodleoverflow/lib.php | 96 ++++++++++++++ .../tsmoodleoverflow/tsmoodleoverflow.php | 43 +++++++ supportedmodules/tsmoodleoverflow/version.php | 31 +++++ 7 files changed, 362 insertions(+) create mode 100644 locallib.php create mode 100644 plugininfo/supportedmodules.php create mode 100644 supportedmodules/tsmoodleoverflow/lang/en/tsmoodleoverflow.php create mode 100644 supportedmodules/tsmoodleoverflow/lib.php create mode 100644 supportedmodules/tsmoodleoverflow/tsmoodleoverflow.php create mode 100644 supportedmodules/tsmoodleoverflow/version.php diff --git a/lib.php b/lib.php index 1bf541d..d98eb48 100644 --- a/lib.php +++ b/lib.php @@ -13,3 +13,26 @@ // // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . + +namespace local_townsquaresupport; + +defined('MOODLE_INTERNAL') || die(); + +use context_module; +use dml_exception; + +global $CFG; +require_once($CFG->dirroot . '/calendar/lib.php'); +require_once($CFG->dirroot . '/blocks/townsquare/locallib.php'); +/** + * + */ +function townsquaresupport_get_subplugin_events() { + // Get all available subplugins. + $events = []; + $subplugins = \core_plugin_manager::instance()->get_plugins_of_type('supportedmodules'); + var_dump($subplugins); + foreach ($subplugins as $subplugin) { + $events += $subplugin->get_events(); + } +} diff --git a/locallib.php b/locallib.php new file mode 100644 index 0000000..59c13e7 --- /dev/null +++ b/locallib.php @@ -0,0 +1,118 @@ +. + +/** + * Internal library of functions for the townsquare block + * + * @package block_townsquare + * @copyright 2024 Tamaro Walter + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +/** + * Gets the id of all courses where the current user is enrolled + * @return array + */ +function townsquaresupport_get_courses(): array { + global $USER; + + $enrolledcourses = enrol_get_all_users_courses($USER->id, true); + $courses = []; + foreach ($enrolledcourses as $enrolledcourse) { + $courses[] = $enrolledcourse->id; + } + + return $courses; +} + +/** + * Function for subplugins to get the start time of the search. + * @return int + */ +function townsquaresupport_get_timestart(): int { + return time() - 15768000; +} + +/** + * Function for subplugins to get the end time of the search. + * @return int + */ +function townsquaresupport_get_timeend(): int { + return time() + 15768000; +} + +/** + * Merge sort function for townsquare events. + * @param $events + * @return array + */ +function townsquaresupport_mergesort($events): array { + $length = count($events); + if ($length <= 1) { + return $events; + } + $mid = (int) ($length / 2); + $left = townsquare_mergesort(array_slice($events, 0, $mid)); + $right = townsquare_mergesort(array_slice($events, $mid)); + return townsquare_merge($left, $right); +} + +/** + * Function that sorts events in descending order by time created (newest event first) + * @param array $left + * @param array $right + * @return array + */ +function townsquaresupport_merge(array $left, array $right): array { + $result = []; + reset($left); + reset($right); + $numberofelements = count($left) + count($right); + for ($i = 0; $i < $numberofelements; $i++) { + if (current($left) && current($right)) { + if (current($left)->timestart > current($right)->timestart) { + $result[$i] = current($left); + next($left); + } else { + $result[$i] = current($right); + next($right); + } + } else if (current($left)) { + $result[$i] = current($left); + next($left); + } else { + $result[$i] = current($right); + next($right); + } + } + return $result; +} + +function townsquaresupport_filter_availability($event): bool { + // If there is no restriction defined, the event is available. + if ($event->availability == null) { + return false; + } + + // If there is a restriction, check if it applies to the user. + $modinfo = get_fast_modinfo($event->courseid); + $moduleinfo = $modinfo->get_cm($event->coursemoduleid); + if ($moduleinfo->uservisible) { + return false; + } + + return true; +} diff --git a/plugininfo/supportedmodules.php b/plugininfo/supportedmodules.php new file mode 100644 index 0000000..1b56820 --- /dev/null +++ b/plugininfo/supportedmodules.php @@ -0,0 +1,22 @@ +. + + +namespace local_townsquaresupport\plugininfo; + +class supportedmodules extends \core\plugininfo\base { + +} \ No newline at end of file diff --git a/supportedmodules/tsmoodleoverflow/lang/en/tsmoodleoverflow.php b/supportedmodules/tsmoodleoverflow/lang/en/tsmoodleoverflow.php new file mode 100644 index 0000000..511feac --- /dev/null +++ b/supportedmodules/tsmoodleoverflow/lang/en/tsmoodleoverflow.php @@ -0,0 +1,29 @@ +. + +/** + * Plugin strings for the townsquare subplugin for moodleoverflow support. + * + * @package block_ts_moodleoverflow + * @category string + * @copyright 2024 Tamaro Walter + * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +$string['pluginname'] = 'Moodleoverflow support for townsquare block'; +$string['pluginnameadding'] = "Adding a Moodleoverflow support subplugin"; +$string['pluginnameediting'] = "Editing a Moodleoverflow support subplugin"; +$string['pluginnamesummary'] = "This subplugin allows the townsquare block to show new posts from moodleoverflow."; +$string['pluginname_help'] = 'This subplugin allows the townsquare block to show posts from moodleoverflow.'; diff --git a/supportedmodules/tsmoodleoverflow/lib.php b/supportedmodules/tsmoodleoverflow/lib.php new file mode 100644 index 0000000..75d7ed6 --- /dev/null +++ b/supportedmodules/tsmoodleoverflow/lib.php @@ -0,0 +1,96 @@ +. + +/** + * Internal library of functions for the ts_moodleoverflow subplugin + * + * @package block_townsquare + * @copyright 2024 Tamaro Walter + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die; + +global $CFG; +require_once($CFG->dirroot . '/local/townsquaresupport/locallib.php'); + +/** + * Function to get the newest post from the moodleoverflow module. + * @param array $courses The courses that will searched. + * @param int $timestart The start time of the search. + * @param int $timeend The end time of the search. + * @return array + */ +function ts_moodleoverflow_get_events($courses, $timestart): array { + global $DB; + + // If moodleoverflow is not installed or not activated, return empty array. + if (!$DB->get_record('modules', ['name' => 'forum', 'visible' => 1])) { + return []; + } + + // Get posts from the database. + $posts = ts_moodleoverflow_get_post_from_db($courses, $timestart); + + // Filter posts by availability. + foreach ($posts as $post) { + if (townsquaresupport_filter_availability($post)) { + unset($posts[$post->row_num]); + } + } + return $posts; +} + +function ts_moodleoverflow_get_post_from_db($courses, $timestart): array { + global $DB; + // Prepare params for sql statement. + list($insqlcourses, $inparamscourses) = $DB->get_in_or_equal($courses, SQL_PARAMS_NAMED); + $params = ['courses' => $courses, 'timestart' => $timestart] + $inparamscourses; + + $sql = "SELECT (ROW_NUMBER() OVER (ORDER BY posts.id)) AS row_num, + 'moodleoverflow' AS modulename, + module.id AS instanceid, + module.anonymous AS anonymoussetting, + 'post' AS eventtype, + cm.id AS coursemoduleid, + cm.availability AS availability, + module.name AS instancename, + discuss.course AS courseid, + discuss.userid AS discussionuserid, + discuss.name AS discussionsubject, + u.firstname AS postuserfirstname, + u.lastname AS postuserlastname, + posts.id AS postid, + posts.discussion AS postdiscussion, + posts.parent AS postparentid, + posts.userid AS postuserid, + posts.created AS timestart, + posts.message AS postmessage + FROM {moodleoverflow_posts} posts + JOIN {moodleoverflow_discussions} discuss ON discuss.id = posts.discussion + JOIN {moodleoverflow} module ON module.id = discuss.moodleoverflow + JOIN {modules} modules ON modules.name = 'moodleoverflow' + JOIN {user} u ON u.id = posts.userid + JOIN {course_modules} cm ON (cm.course = module.course AND cm.module = modules.id AND cm.instance = module.id) + WHERE discuss.course $insqlcourses + AND posts.created > :timestart + AND cm.visible = 1 + AND modules.visible = 1 + ORDER BY posts.created DESC;"; + + return $DB->get_records_sql($sql, $params); +} + diff --git a/supportedmodules/tsmoodleoverflow/tsmoodleoverflow.php b/supportedmodules/tsmoodleoverflow/tsmoodleoverflow.php new file mode 100644 index 0000000..3f45983 --- /dev/null +++ b/supportedmodules/tsmoodleoverflow/tsmoodleoverflow.php @@ -0,0 +1,43 @@ +. + +defined('MOODLE_INTERNAL') || die; + +use local_townsquaresupport\townsquaresupportinterface; + +global $CFG; +require_once($CFG->dirroot . '/blocks/townsquare/supportedmodules/block_ts_moodleoverflow/locallib.php'); + +/** + * Plugin strings are defined here. + * + * @package block_townsquare + * @copyright 2023 Tamaro Walter + * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +class tsmoodleoverflow implements townsquaresupportinterface { + + /** + * Function from the interface. + * @return array + */ + public function get_events(): array { + $courses = townsquaresupport_get_courses(); + $timestart = townsquaresupport_get_timestart(); + return ts_moodleoverflow_get_events($courses, $timestart); + } + +} diff --git a/supportedmodules/tsmoodleoverflow/version.php b/supportedmodules/tsmoodleoverflow/version.php new file mode 100644 index 0000000..b82b83e --- /dev/null +++ b/supportedmodules/tsmoodleoverflow/version.php @@ -0,0 +1,31 @@ +. + +/** + * Plugin version and other meta-data are defined here. + * + * @package supportedmodules_tsmoodleoverflow + * @copyright 2023 Tamaro Walter + * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); +$plugin->component = 'supportedmodules_tsmoodleoverflow'; +$plugin->dependencies = ['block_townsquare' => ANY_VERSION]; +$plugin->release = '0.1.0'; +$plugin->version = 2024011503; +$plugin->requires = 2022041900; +$plugin->maturity = MATURITY_ALPHA; From 05c7b201e20f3b42f454eaf5cfac6cf80e8f2d4b Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Tue, 7 May 2024 15:32:46 +0200 Subject: [PATCH 07/21] subplugins are recognized by the local plugin --- .github/workflows/moodle-ci.yml | 6 +- classes/plugininfo/townsquareexpansion.php | 70 +++++++++++ classes/townsquaresupportinterface.php | 1 - db/subplugins.json | 2 +- db/subplugins.php | 4 +- lang/en/local_townsquaresupport.php | 4 +- lib.php | 41 ++++-- locallib.php | 118 ------------------ plugininfo/supportedmodules.php | 22 ---- supportedmodules/tsmoodleoverflow/lib.php | 96 -------------- .../lang/en/tsmoodleoverflow.php | 2 +- .../tsmoodleoverflow/tsmoodleoverflow.php | 10 +- .../tsmoodleoverflow/version.php | 6 +- 13 files changed, 115 insertions(+), 267 deletions(-) create mode 100644 classes/plugininfo/townsquareexpansion.php delete mode 100644 locallib.php delete mode 100644 plugininfo/supportedmodules.php delete mode 100644 supportedmodules/tsmoodleoverflow/lib.php rename {supportedmodules => townsquareexpansion}/tsmoodleoverflow/lang/en/tsmoodleoverflow.php (96%) rename {supportedmodules => townsquareexpansion}/tsmoodleoverflow/tsmoodleoverflow.php (76%) rename {supportedmodules => townsquareexpansion}/tsmoodleoverflow/version.php (87%) diff --git a/.github/workflows/moodle-ci.yml b/.github/workflows/moodle-ci.yml index a2eae8d..5c192a2 100644 --- a/.github/workflows/moodle-ci.yml +++ b/.github/workflows/moodle-ci.yml @@ -8,8 +8,8 @@ jobs: strategy: matrix: - php: ['8.2'] - moodle-branch: ['MOODLE_403_STABLE'] + php: ['8.3'] + moodle-branch: ['MOODLE_404_STABLE'] database: ['pgsql'] steps: @@ -113,7 +113,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['8.0', '8.1'] + php: ['8.1'] moodle-branch: ['MOODLE_401_STABLE', 'MOODLE_402_STABLE', 'MOODLE_403_STABLE'] database: ['mariadb', 'pgsql'] diff --git a/classes/plugininfo/townsquareexpansion.php b/classes/plugininfo/townsquareexpansion.php new file mode 100644 index 0000000..c0101e7 --- /dev/null +++ b/classes/plugininfo/townsquareexpansion.php @@ -0,0 +1,70 @@ +. + +/** + * TODO: Add description. + * + * @package block_townsquare + * @copyright 2023 Tamaro Walter + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +namespace local_townsquaresupport\plugininfo; + +use core\plugininfo\base; +/** + * The functions for all sub-plugins of type townsquaresupport. + */ +class townsquareexpansion extends base { + + /** + * Return if a subplugin is allowed to be deleted. + * + * @return bool + */ + public function is_uninstall_allowed(): bool { + return true; + } + + /** + * Checks whether sub-plugins have settings.php and adds them to the admin menu. + * In Case a sub-plugin is added the settings.php has to include all global variables it needs. + * + * @param \part_of_admin_tree $adminroot + * @param string $parentnodename + * @param bool $hassiteconfig + */ + public function load_settings(\part_of_admin_tree $adminroot, $parentnodename, $hassiteconfig) { + $ADMIN = $adminroot; // May be used in settings.php. + + if (!$this->is_installed_and_upgraded()) { + return; + } + + if (!$hassiteconfig || !file_exists($this->full_path('settings.php'))) { + return; + } + + $section = $this->get_settings_section_name(); + $settings = new admin_settingpage($section, $this->displayname, 'moodle/site:config', $this->is_enabled() === false); + include($this->full_path('settings.php')); // This may also set $settings to null. + + if ($settings) { + $ADMIN->add($parentnodename, $settings); + } + } +} + diff --git a/classes/townsquaresupportinterface.php b/classes/townsquaresupportinterface.php index c8bae91..514789f 100644 --- a/classes/townsquaresupportinterface.php +++ b/classes/townsquaresupportinterface.php @@ -32,7 +32,6 @@ namespace local_townsquaresupport; interface townsquaresupportinterface { - /** * Function to gather the events * Every event must gain sufficient data so that townsquare can build a letter from it. diff --git a/db/subplugins.json b/db/subplugins.json index a38f543..c7326e5 100644 --- a/db/subplugins.json +++ b/db/subplugins.json @@ -1,5 +1,5 @@ { "plugintypes": { - "supportedmodules": "local/townsquaresupport/supportedmodules" + "townsquareexpansion": "local\/townsquaresupport\/townsquareexpansion" } } diff --git a/db/subplugins.php b/db/subplugins.php index 8dfe460..f96e31a 100644 --- a/db/subplugins.php +++ b/db/subplugins.php @@ -24,4 +24,6 @@ defined('MOODLE_INTERNAL') || die(); -$subplugins = ['supportedmodules' => 'local/townsquaresupport/supportedmodules']; +$subplugins = [ + 'townsquareexpantion' => 'local/townsquaresupport/townsquareexpansion' +]; diff --git a/lang/en/local_townsquaresupport.php b/lang/en/local_townsquaresupport.php index 6b22cc7..99f4aa3 100644 --- a/lang/en/local_townsquaresupport.php +++ b/lang/en/local_townsquaresupport.php @@ -30,5 +30,5 @@ $string['pluginname'] = 'Townsquare support'; // Subplugin strings. -$string['subplugintype_townsquaresupport'] = 'Supported module'; -$string['subplugintype_townsquaresupport_plural'] = 'Supported modules'; +$string['subplugintype_townsquareexpansion'] = 'Townsquare event expansion'; +$string['subplugintype_townsquareexpansion_plural'] = 'Townsquare event expansions'; diff --git a/lib.php b/lib.php index d98eb48..a2892c8 100644 --- a/lib.php +++ b/lib.php @@ -18,21 +18,36 @@ defined('MOODLE_INTERNAL') || die(); -use context_module; -use dml_exception; - -global $CFG; -require_once($CFG->dirroot . '/calendar/lib.php'); -require_once($CFG->dirroot . '/blocks/townsquare/locallib.php'); /** * */ function townsquaresupport_get_subplugin_events() { - // Get all available subplugins. - $events = []; - $subplugins = \core_plugin_manager::instance()->get_plugins_of_type('supportedmodules'); - var_dump($subplugins); - foreach ($subplugins as $subplugin) { - $events += $subplugin->get_events(); - } + // Get all available event from townsquaresupport subplugins. + /*$event = [ + 'courseid' => 2, + 'modulename' => 'modulename', + 'instancename' => 'instancename', + 'content' => 'HALLO HALLO', + 'timestart' => time(), + 'coursemoduleid' => 1, + 'eventtype' => 'eventtype' + ]; + $event2 = [ + 'courseid' => 2, + 'modulename' => 'modulename', + 'instancename' => 'instancename', + 'content' => 'HALLO TSCHAUUU', + 'timestart' => time(), + 'coursemoduleid' => 1, + 'eventtype' => 'eventtype' + ]; + $events = [$event, $event2]; + //$subplugins = \core_plugin_manager::instance()->get_plugins_of_type('supportedmodules'); + //var_dump($subplugins); + //foreach ($subplugins as $subplugin) { + // $events += $subplugin->get_events(); + //} + return $events;*/ + $subplugins = \core_plugin_manager::instance()->get_plugins_of_type('townsquareexpansion'); + return $subplugins; } diff --git a/locallib.php b/locallib.php deleted file mode 100644 index 59c13e7..0000000 --- a/locallib.php +++ /dev/null @@ -1,118 +0,0 @@ -. - -/** - * Internal library of functions for the townsquare block - * - * @package block_townsquare - * @copyright 2024 Tamaro Walter - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - -/** - * Gets the id of all courses where the current user is enrolled - * @return array - */ -function townsquaresupport_get_courses(): array { - global $USER; - - $enrolledcourses = enrol_get_all_users_courses($USER->id, true); - $courses = []; - foreach ($enrolledcourses as $enrolledcourse) { - $courses[] = $enrolledcourse->id; - } - - return $courses; -} - -/** - * Function for subplugins to get the start time of the search. - * @return int - */ -function townsquaresupport_get_timestart(): int { - return time() - 15768000; -} - -/** - * Function for subplugins to get the end time of the search. - * @return int - */ -function townsquaresupport_get_timeend(): int { - return time() + 15768000; -} - -/** - * Merge sort function for townsquare events. - * @param $events - * @return array - */ -function townsquaresupport_mergesort($events): array { - $length = count($events); - if ($length <= 1) { - return $events; - } - $mid = (int) ($length / 2); - $left = townsquare_mergesort(array_slice($events, 0, $mid)); - $right = townsquare_mergesort(array_slice($events, $mid)); - return townsquare_merge($left, $right); -} - -/** - * Function that sorts events in descending order by time created (newest event first) - * @param array $left - * @param array $right - * @return array - */ -function townsquaresupport_merge(array $left, array $right): array { - $result = []; - reset($left); - reset($right); - $numberofelements = count($left) + count($right); - for ($i = 0; $i < $numberofelements; $i++) { - if (current($left) && current($right)) { - if (current($left)->timestart > current($right)->timestart) { - $result[$i] = current($left); - next($left); - } else { - $result[$i] = current($right); - next($right); - } - } else if (current($left)) { - $result[$i] = current($left); - next($left); - } else { - $result[$i] = current($right); - next($right); - } - } - return $result; -} - -function townsquaresupport_filter_availability($event): bool { - // If there is no restriction defined, the event is available. - if ($event->availability == null) { - return false; - } - - // If there is a restriction, check if it applies to the user. - $modinfo = get_fast_modinfo($event->courseid); - $moduleinfo = $modinfo->get_cm($event->coursemoduleid); - if ($moduleinfo->uservisible) { - return false; - } - - return true; -} diff --git a/plugininfo/supportedmodules.php b/plugininfo/supportedmodules.php deleted file mode 100644 index 1b56820..0000000 --- a/plugininfo/supportedmodules.php +++ /dev/null @@ -1,22 +0,0 @@ -. - - -namespace local_townsquaresupport\plugininfo; - -class supportedmodules extends \core\plugininfo\base { - -} \ No newline at end of file diff --git a/supportedmodules/tsmoodleoverflow/lib.php b/supportedmodules/tsmoodleoverflow/lib.php deleted file mode 100644 index 75d7ed6..0000000 --- a/supportedmodules/tsmoodleoverflow/lib.php +++ /dev/null @@ -1,96 +0,0 @@ -. - -/** - * Internal library of functions for the ts_moodleoverflow subplugin - * - * @package block_townsquare - * @copyright 2024 Tamaro Walter - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - -defined('MOODLE_INTERNAL') || die; - -global $CFG; -require_once($CFG->dirroot . '/local/townsquaresupport/locallib.php'); - -/** - * Function to get the newest post from the moodleoverflow module. - * @param array $courses The courses that will searched. - * @param int $timestart The start time of the search. - * @param int $timeend The end time of the search. - * @return array - */ -function ts_moodleoverflow_get_events($courses, $timestart): array { - global $DB; - - // If moodleoverflow is not installed or not activated, return empty array. - if (!$DB->get_record('modules', ['name' => 'forum', 'visible' => 1])) { - return []; - } - - // Get posts from the database. - $posts = ts_moodleoverflow_get_post_from_db($courses, $timestart); - - // Filter posts by availability. - foreach ($posts as $post) { - if (townsquaresupport_filter_availability($post)) { - unset($posts[$post->row_num]); - } - } - return $posts; -} - -function ts_moodleoverflow_get_post_from_db($courses, $timestart): array { - global $DB; - // Prepare params for sql statement. - list($insqlcourses, $inparamscourses) = $DB->get_in_or_equal($courses, SQL_PARAMS_NAMED); - $params = ['courses' => $courses, 'timestart' => $timestart] + $inparamscourses; - - $sql = "SELECT (ROW_NUMBER() OVER (ORDER BY posts.id)) AS row_num, - 'moodleoverflow' AS modulename, - module.id AS instanceid, - module.anonymous AS anonymoussetting, - 'post' AS eventtype, - cm.id AS coursemoduleid, - cm.availability AS availability, - module.name AS instancename, - discuss.course AS courseid, - discuss.userid AS discussionuserid, - discuss.name AS discussionsubject, - u.firstname AS postuserfirstname, - u.lastname AS postuserlastname, - posts.id AS postid, - posts.discussion AS postdiscussion, - posts.parent AS postparentid, - posts.userid AS postuserid, - posts.created AS timestart, - posts.message AS postmessage - FROM {moodleoverflow_posts} posts - JOIN {moodleoverflow_discussions} discuss ON discuss.id = posts.discussion - JOIN {moodleoverflow} module ON module.id = discuss.moodleoverflow - JOIN {modules} modules ON modules.name = 'moodleoverflow' - JOIN {user} u ON u.id = posts.userid - JOIN {course_modules} cm ON (cm.course = module.course AND cm.module = modules.id AND cm.instance = module.id) - WHERE discuss.course $insqlcourses - AND posts.created > :timestart - AND cm.visible = 1 - AND modules.visible = 1 - ORDER BY posts.created DESC;"; - - return $DB->get_records_sql($sql, $params); -} - diff --git a/supportedmodules/tsmoodleoverflow/lang/en/tsmoodleoverflow.php b/townsquareexpansion/tsmoodleoverflow/lang/en/tsmoodleoverflow.php similarity index 96% rename from supportedmodules/tsmoodleoverflow/lang/en/tsmoodleoverflow.php rename to townsquareexpansion/tsmoodleoverflow/lang/en/tsmoodleoverflow.php index 511feac..092a75b 100644 --- a/supportedmodules/tsmoodleoverflow/lang/en/tsmoodleoverflow.php +++ b/townsquareexpansion/tsmoodleoverflow/lang/en/tsmoodleoverflow.php @@ -17,7 +17,7 @@ /** * Plugin strings for the townsquare subplugin for moodleoverflow support. * - * @package block_ts_moodleoverflow + * @package townsquareexpansion_tsmoodleoverflow * @category string * @copyright 2024 Tamaro Walter * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later diff --git a/supportedmodules/tsmoodleoverflow/tsmoodleoverflow.php b/townsquareexpansion/tsmoodleoverflow/tsmoodleoverflow.php similarity index 76% rename from supportedmodules/tsmoodleoverflow/tsmoodleoverflow.php rename to townsquareexpansion/tsmoodleoverflow/tsmoodleoverflow.php index 3f45983..1a50829 100644 --- a/supportedmodules/tsmoodleoverflow/tsmoodleoverflow.php +++ b/townsquareexpansion/tsmoodleoverflow/tsmoodleoverflow.php @@ -19,13 +19,13 @@ use local_townsquaresupport\townsquaresupportinterface; global $CFG; -require_once($CFG->dirroot . '/blocks/townsquare/supportedmodules/block_ts_moodleoverflow/locallib.php'); + /** * Plugin strings are defined here. * - * @package block_townsquare - * @copyright 2023 Tamaro Walter + * @package townsquareexpansion_tsmoodleoverflow + * @copyright 2024 Tamaro Walter * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ class tsmoodleoverflow implements townsquaresupportinterface { @@ -35,9 +35,7 @@ class tsmoodleoverflow implements townsquaresupportinterface { * @return array */ public function get_events(): array { - $courses = townsquaresupport_get_courses(); - $timestart = townsquaresupport_get_timestart(); - return ts_moodleoverflow_get_events($courses, $timestart); + return []; } } diff --git a/supportedmodules/tsmoodleoverflow/version.php b/townsquareexpansion/tsmoodleoverflow/version.php similarity index 87% rename from supportedmodules/tsmoodleoverflow/version.php rename to townsquareexpansion/tsmoodleoverflow/version.php index b82b83e..dbe436a 100644 --- a/supportedmodules/tsmoodleoverflow/version.php +++ b/townsquareexpansion/tsmoodleoverflow/version.php @@ -17,13 +17,13 @@ /** * Plugin version and other meta-data are defined here. * - * @package supportedmodules_tsmoodleoverflow - * @copyright 2023 Tamaro Walter + * @package townsquareexpansion_tsmoodleoverflow + * @copyright 2024 Tamaro Walter * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ defined('MOODLE_INTERNAL') || die(); -$plugin->component = 'supportedmodules_tsmoodleoverflow'; +$plugin->component = 'townsquareexpansion_tsmoodleoverflow'; $plugin->dependencies = ['block_townsquare' => ANY_VERSION]; $plugin->release = '0.1.0'; $plugin->version = 2024011503; From 38538f22a35ae9f5f1afd781a01ebe5bc6153146 Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Tue, 7 May 2024 17:48:38 +0200 Subject: [PATCH 08/21] moodleoverflow subplugin successfully implemented --- classes/townsquaresupportinterface.php | 2 +- lib.php | 46 +++----- .../classes/tsmoodleoverflow.php | 109 ++++++++++++++++++ .../tsmoodleoverflow/tsmoodleoverflow.php | 41 ------- 4 files changed, 129 insertions(+), 69 deletions(-) create mode 100644 townsquareexpansion/tsmoodleoverflow/classes/tsmoodleoverflow.php delete mode 100644 townsquareexpansion/tsmoodleoverflow/tsmoodleoverflow.php diff --git a/classes/townsquaresupportinterface.php b/classes/townsquaresupportinterface.php index 514789f..50ad503 100644 --- a/classes/townsquaresupportinterface.php +++ b/classes/townsquaresupportinterface.php @@ -46,5 +46,5 @@ interface townsquaresupportinterface { * * @return array of events that can be transformed into letters */ - public function get_events(): array; + public static function get_events(): array; } diff --git a/lib.php b/lib.php index a2892c8..ad4078a 100644 --- a/lib.php +++ b/lib.php @@ -19,35 +19,27 @@ defined('MOODLE_INTERNAL') || die(); /** + * Function to get the events from every subplugin that extends the town square. * + * As every subplugin from townsquaresupport follows the same structure and has the get_event method located in the same + * place, this function can access it directly. */ function townsquaresupport_get_subplugin_events() { - // Get all available event from townsquaresupport subplugins. - /*$event = [ - 'courseid' => 2, - 'modulename' => 'modulename', - 'instancename' => 'instancename', - 'content' => 'HALLO HALLO', - 'timestart' => time(), - 'coursemoduleid' => 1, - 'eventtype' => 'eventtype' - ]; - $event2 = [ - 'courseid' => 2, - 'modulename' => 'modulename', - 'instancename' => 'instancename', - 'content' => 'HALLO TSCHAUUU', - 'timestart' => time(), - 'coursemoduleid' => 1, - 'eventtype' => 'eventtype' - ]; - $events = [$event, $event2]; - //$subplugins = \core_plugin_manager::instance()->get_plugins_of_type('supportedmodules'); - //var_dump($subplugins); - //foreach ($subplugins as $subplugin) { - // $events += $subplugin->get_events(); - //} - return $events;*/ + + // Get all subplugins. $subplugins = \core_plugin_manager::instance()->get_plugins_of_type('townsquareexpansion'); - return $subplugins; + $events = []; + + foreach ($subplugins as $subplugin) { + + // Get the class where the get_events method of the subplugin is located. + $expansionname = $subplugin->name; + $classstring = "\\townsquareexpansion_" . $expansionname . "\\" . $expansionname; + $expansionclass = new $classstring(); + + // Get the events from the subplugin and add it to the events array. + $events = array_merge($events, $expansionclass->get_events()); + + } + return $events; } diff --git a/townsquareexpansion/tsmoodleoverflow/classes/tsmoodleoverflow.php b/townsquareexpansion/tsmoodleoverflow/classes/tsmoodleoverflow.php new file mode 100644 index 0000000..5006822 --- /dev/null +++ b/townsquareexpansion/tsmoodleoverflow/classes/tsmoodleoverflow.php @@ -0,0 +1,109 @@ +. + +/** + * Core class of the subplugin. This class is accessed by townsquaresupport. + * + * @package townsquareexpansion_tsmoodleoverflow + * @copyright 2024 Tamaro Walter + * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +namespace townsquareexpansion_tsmoodleoverflow; + +defined('MOODLE_INTERNAL') || die; + +use local_townsquaresupport\townsquaresupportinterface; + +global $CFG; +require_once($CFG->dirroot . '/blocks/townsquare/locallib.php'); + +/** + * Class that implements the townsquaresupportinterface with the function to get the events from the plugin. + * + * @package townsquareexpansion_tsmoodleoverflow + * @copyright 2024 Tamaro Walter + * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +class tsmoodleoverflow implements townsquaresupportinterface { + + /** + * Function from the interface. + * @return array + */ + public static function get_events(): array { + global $DB; + + $courses = townsquare_get_courses(); + $timestart = townsquare_get_timestart(); + + // If moodleoverflow is not installed or not activated, return empty array. + if (!$DB->get_record('modules', ['name' => 'forum', 'visible' => 1])) { + return []; + } + + // Get posts from the database. + $moodleoverflowposts = self::get_moodleoverflowposts_from_db($courses, $timestart); + + // Filter posts by availability. + foreach ($moodleoverflowposts as $post) { + if (townsquare_filter_availability($post)) { + unset($moodleoverflowposts[$post->row_num]); + } + } + return $moodleoverflowposts; + } + + private static function get_moodleoverflowposts_from_db($courses, $timestart): array { + global $DB; + // Prepare params for sql statement. + list($insqlcourses, $inparamscourses) = $DB->get_in_or_equal($courses, SQL_PARAMS_NAMED); + $params = ['courses' => $courses, 'timestart' => $timestart] + $inparamscourses; + + $sql = "SELECT (ROW_NUMBER() OVER (ORDER BY posts.id)) AS row_num, + 'moodleoverflow' AS modulename, + module.id AS instanceid, + module.anonymous AS anonymoussetting, + 'post' AS eventtype, + cm.id AS coursemoduleid, + cm.availability AS availability, + module.name AS instancename, + discuss.course AS courseid, + discuss.userid AS discussionuserid, + discuss.name AS discussionsubject, + u.firstname AS postuserfirstname, + u.lastname AS postuserlastname, + posts.id AS postid, + posts.discussion AS postdiscussion, + posts.parent AS postparentid, + posts.userid AS postuserid, + posts.created AS timestart, + posts.message AS postmessage + FROM {moodleoverflow_posts} posts + JOIN {moodleoverflow_discussions} discuss ON discuss.id = posts.discussion + JOIN {moodleoverflow} module ON module.id = discuss.moodleoverflow + JOIN {modules} modules ON modules.name = 'moodleoverflow' + JOIN {user} u ON u.id = posts.userid + JOIN {course_modules} cm ON (cm.course = module.course AND cm.module = modules.id AND cm.instance = module.id) + WHERE discuss.course $insqlcourses + AND posts.created > :timestart + AND cm.visible = 1 + AND modules.visible = 1 + ORDER BY posts.created DESC;"; + + return $DB->get_records_sql($sql, $params); + } + +} diff --git a/townsquareexpansion/tsmoodleoverflow/tsmoodleoverflow.php b/townsquareexpansion/tsmoodleoverflow/tsmoodleoverflow.php deleted file mode 100644 index 1a50829..0000000 --- a/townsquareexpansion/tsmoodleoverflow/tsmoodleoverflow.php +++ /dev/null @@ -1,41 +0,0 @@ -. - -defined('MOODLE_INTERNAL') || die; - -use local_townsquaresupport\townsquaresupportinterface; - -global $CFG; - - -/** - * Plugin strings are defined here. - * - * @package townsquareexpansion_tsmoodleoverflow - * @copyright 2024 Tamaro Walter - * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ -class tsmoodleoverflow implements townsquaresupportinterface { - - /** - * Function from the interface. - * @return array - */ - public function get_events(): array { - return []; - } - -} From ea8ec15e9a8f49eac63f3009c7e8e70e48f29f90 Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Tue, 7 May 2024 18:08:26 +0200 Subject: [PATCH 09/21] code cleaning --- db/subplugins.php | 4 +--- lib.php | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/db/subplugins.php b/db/subplugins.php index f96e31a..7fbaa1e 100644 --- a/db/subplugins.php +++ b/db/subplugins.php @@ -24,6 +24,4 @@ defined('MOODLE_INTERNAL') || die(); -$subplugins = [ - 'townsquareexpantion' => 'local/townsquaresupport/townsquareexpansion' -]; +$subplugins = ['townsquareexpantion' => 'local/townsquaresupport/townsquareexpansion']; diff --git a/lib.php b/lib.php index ad4078a..a0b9a54 100644 --- a/lib.php +++ b/lib.php @@ -16,8 +16,6 @@ namespace local_townsquaresupport; -defined('MOODLE_INTERNAL') || die(); - /** * Function to get the events from every subplugin that extends the town square. * From e727ce51caed39a40d680bcd2a7b41c7474a7cd3 Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Wed, 8 May 2024 16:22:04 +0200 Subject: [PATCH 10/21] add dependency and little comment adaptations --- README.md | 2 +- classes/plugininfo/townsquareexpansion.php | 4 ++-- db/access.php | 6 +++--- db/subplugins.php | 4 ++-- db/upgrade.php | 2 +- version.php | 5 +++-- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 2b99ada..3bc6594 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Townsquare Support # A moodle local plugin that manages the subplugins for the moodle townsquare block. -Documentation of the townsquare block: https://github.com/learnweb/moodle-block_townsquare +Documentation of the townsquare block: https://github.com/learnweb/moodle-local_townsquare ## Installing via uploaded ZIP file ## diff --git a/classes/plugininfo/townsquareexpansion.php b/classes/plugininfo/townsquareexpansion.php index c0101e7..497d699 100644 --- a/classes/plugininfo/townsquareexpansion.php +++ b/classes/plugininfo/townsquareexpansion.php @@ -17,8 +17,8 @@ /** * TODO: Add description. * - * @package block_townsquare - * @copyright 2023 Tamaro Walter + * @package local_townsquaresupport + * @copyright 2024 Tamaro Walter * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/db/access.php b/db/access.php index e755df4..430804c 100644 --- a/db/access.php +++ b/db/access.php @@ -15,10 +15,10 @@ // along with Moodle. If not, see . /** - * Plugin capabilities for the block_townsquare plugin. + * Plugin capabilities for the local_townsquaresupport plugin. * - * @package block_townsquare - * @copyright 2023 Tamaro Walter + * @package local_townsquaresupport + * @copyright 2024 Tamaro Walter * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/db/subplugins.php b/db/subplugins.php index 7fbaa1e..46f5980 100644 --- a/db/subplugins.php +++ b/db/subplugins.php @@ -17,8 +17,8 @@ /** * This file defines the sub-plugins for the townsquare block. * - * @package blocks_townsquare - * @copyright 2023 Tamaro Walter + * @package local_townsquaresupport + * @copyright 2024 Tamaro Walter * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/db/upgrade.php b/db/upgrade.php index 5970b05..31606b0 100644 --- a/db/upgrade.php +++ b/db/upgrade.php @@ -24,7 +24,7 @@ */ /** - * Execute block_townsquare upgrade from the given old version. + * Execute local_townsquare upgrade from the given old version. * * @param int $oldversion * @return bool diff --git a/version.php b/version.php index 1d613dd..e0c7b23 100644 --- a/version.php +++ b/version.php @@ -17,13 +17,14 @@ /** * Plugin version and other meta-data are defined here. * - * @package block_townsquare - * @copyright 2023 Tamaro Walter + * @package local_townsquaresupport + * @copyright 2024 Tamaro Walter * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ defined('MOODLE_INTERNAL') || die(); $plugin->component = 'local_townsquaresupport'; +$plugin->dependencies = ['block_townsquare' => ANY_VERSION]; $plugin->release = '0.1.0'; $plugin->version = 2024041500; $plugin->requires = 2022041900; From 5d01a3eff1a83ca419548faeb7638c4082bc9c31 Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Wed, 8 May 2024 16:38:17 +0200 Subject: [PATCH 11/21] update github workflow matrix and rename subplugin --- .github/workflows/moodle-ci.yml | 18 +++++++++++++++--- .../classes/moodleoverflow.php} | 8 ++++---- .../lang/en/moodleoverflow.php} | 2 +- .../version.php | 4 ++-- 4 files changed, 22 insertions(+), 10 deletions(-) rename townsquareexpansion/{tsmoodleoverflow/classes/tsmoodleoverflow.php => moodleoverflow/classes/moodleoverflow.php} (94%) rename townsquareexpansion/{tsmoodleoverflow/lang/en/tsmoodleoverflow.php => moodleoverflow/lang/en/moodleoverflow.php} (96%) rename townsquareexpansion/{tsmoodleoverflow => moodleoverflow}/version.php (90%) diff --git a/.github/workflows/moodle-ci.yml b/.github/workflows/moodle-ci.yml index 5c192a2..2b7195f 100644 --- a/.github/workflows/moodle-ci.yml +++ b/.github/workflows/moodle-ci.yml @@ -113,9 +113,21 @@ jobs: strategy: fail-fast: false matrix: - php: ['8.1'] - moodle-branch: ['MOODLE_401_STABLE', 'MOODLE_402_STABLE', 'MOODLE_403_STABLE'] - database: ['mariadb', 'pgsql'] + + php: ['8.0', '8.1', '8.2', '8.3'] + moodle-branch: ['MOODLE_401_STABLE', 'MOODLE_402_STABLE', 'MOODLE_403_STABLE', 'MOODLE_404_STABLE'] + database: [ 'mariadb', 'pgsql' ] + exclude: + - php: '8.0' + moodle-branch: 'MOODLE_404_STABLE' + - php: '8.2' + moodle-branch: 'MOODLE_401_STABLE' + - php: '8.3' + moodle-branch: 'MOODLE_401_STABLE' + - php: '8.3' + moodle-branch: 'MOODLE_402_STABLE' + - php: '8.3' + moodle-branch: 'MOODLE_403_STABLE' steps: - name: Start MariaDB diff --git a/townsquareexpansion/tsmoodleoverflow/classes/tsmoodleoverflow.php b/townsquareexpansion/moodleoverflow/classes/moodleoverflow.php similarity index 94% rename from townsquareexpansion/tsmoodleoverflow/classes/tsmoodleoverflow.php rename to townsquareexpansion/moodleoverflow/classes/moodleoverflow.php index 5006822..957243e 100644 --- a/townsquareexpansion/tsmoodleoverflow/classes/tsmoodleoverflow.php +++ b/townsquareexpansion/moodleoverflow/classes/moodleoverflow.php @@ -17,11 +17,11 @@ /** * Core class of the subplugin. This class is accessed by townsquaresupport. * - * @package townsquareexpansion_tsmoodleoverflow + * @package townsquareexpansion_moodleoverflow * @copyright 2024 Tamaro Walter * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace townsquareexpansion_tsmoodleoverflow; +namespace townsquareexpansion_moodleoverflow; defined('MOODLE_INTERNAL') || die; @@ -33,11 +33,11 @@ /** * Class that implements the townsquaresupportinterface with the function to get the events from the plugin. * - * @package townsquareexpansion_tsmoodleoverflow + * @package townsquareexpansion_moodleoverflow * @copyright 2024 Tamaro Walter * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class tsmoodleoverflow implements townsquaresupportinterface { +class moodleoverflow implements townsquaresupportinterface { /** * Function from the interface. diff --git a/townsquareexpansion/tsmoodleoverflow/lang/en/tsmoodleoverflow.php b/townsquareexpansion/moodleoverflow/lang/en/moodleoverflow.php similarity index 96% rename from townsquareexpansion/tsmoodleoverflow/lang/en/tsmoodleoverflow.php rename to townsquareexpansion/moodleoverflow/lang/en/moodleoverflow.php index 092a75b..a46b96c 100644 --- a/townsquareexpansion/tsmoodleoverflow/lang/en/tsmoodleoverflow.php +++ b/townsquareexpansion/moodleoverflow/lang/en/moodleoverflow.php @@ -17,7 +17,7 @@ /** * Plugin strings for the townsquare subplugin for moodleoverflow support. * - * @package townsquareexpansion_tsmoodleoverflow + * @package townsquareexpansion_moodleoverflow * @category string * @copyright 2024 Tamaro Walter * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later diff --git a/townsquareexpansion/tsmoodleoverflow/version.php b/townsquareexpansion/moodleoverflow/version.php similarity index 90% rename from townsquareexpansion/tsmoodleoverflow/version.php rename to townsquareexpansion/moodleoverflow/version.php index dbe436a..7cd87e0 100644 --- a/townsquareexpansion/tsmoodleoverflow/version.php +++ b/townsquareexpansion/moodleoverflow/version.php @@ -17,13 +17,13 @@ /** * Plugin version and other meta-data are defined here. * - * @package townsquareexpansion_tsmoodleoverflow + * @package townsquareexpansion_moodleoverflow * @copyright 2024 Tamaro Walter * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ defined('MOODLE_INTERNAL') || die(); -$plugin->component = 'townsquareexpansion_tsmoodleoverflow'; +$plugin->component = 'townsquareexpansion_moodleoverflow'; $plugin->dependencies = ['block_townsquare' => ANY_VERSION]; $plugin->release = '0.1.0'; $plugin->version = 2024011503; From cdb9ead7b2de5f21cad3edebd6cbb32e15eadc76 Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Wed, 8 May 2024 16:40:06 +0200 Subject: [PATCH 12/21] add support for php 7.4 --- .github/workflows/moodle-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/moodle-ci.yml b/.github/workflows/moodle-ci.yml index 2b7195f..7993f5e 100644 --- a/.github/workflows/moodle-ci.yml +++ b/.github/workflows/moodle-ci.yml @@ -128,6 +128,13 @@ jobs: moodle-branch: 'MOODLE_402_STABLE' - php: '8.3' moodle-branch: 'MOODLE_403_STABLE' + include: + - php: '7.4' + moodle-branch: 'MOODLE_401_STABLE' + database: 'pgsql' + - php: '7.4' + moodle-branch: 'MOODLE_401_STABLE' + database: 'mariadb' steps: - name: Start MariaDB From 461110a84150e9be07ab763a4697f14f45a3e591 Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Wed, 8 May 2024 16:47:55 +0200 Subject: [PATCH 13/21] little beauty fix --- .github/workflows/moodle-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/moodle-ci.yml b/.github/workflows/moodle-ci.yml index 7993f5e..c2f90ac 100644 --- a/.github/workflows/moodle-ci.yml +++ b/.github/workflows/moodle-ci.yml @@ -113,10 +113,9 @@ jobs: strategy: fail-fast: false matrix: - php: ['8.0', '8.1', '8.2', '8.3'] moodle-branch: ['MOODLE_401_STABLE', 'MOODLE_402_STABLE', 'MOODLE_403_STABLE', 'MOODLE_404_STABLE'] - database: [ 'mariadb', 'pgsql' ] + database: ['mariadb', 'pgsql'] exclude: - php: '8.0' moodle-branch: 'MOODLE_404_STABLE' From ae269396b1786f740fb8eea101d8b786b4d3d81c Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Wed, 8 May 2024 17:07:22 +0200 Subject: [PATCH 14/21] move subplugin to own repository --- .../moodleoverflow/classes/moodleoverflow.php | 109 ------------------ .../moodleoverflow/lang/en/moodleoverflow.php | 29 ----- .../moodleoverflow/version.php | 31 ----- 3 files changed, 169 deletions(-) delete mode 100644 townsquareexpansion/moodleoverflow/classes/moodleoverflow.php delete mode 100644 townsquareexpansion/moodleoverflow/lang/en/moodleoverflow.php delete mode 100644 townsquareexpansion/moodleoverflow/version.php diff --git a/townsquareexpansion/moodleoverflow/classes/moodleoverflow.php b/townsquareexpansion/moodleoverflow/classes/moodleoverflow.php deleted file mode 100644 index 957243e..0000000 --- a/townsquareexpansion/moodleoverflow/classes/moodleoverflow.php +++ /dev/null @@ -1,109 +0,0 @@ -. - -/** - * Core class of the subplugin. This class is accessed by townsquaresupport. - * - * @package townsquareexpansion_moodleoverflow - * @copyright 2024 Tamaro Walter - * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ -namespace townsquareexpansion_moodleoverflow; - -defined('MOODLE_INTERNAL') || die; - -use local_townsquaresupport\townsquaresupportinterface; - -global $CFG; -require_once($CFG->dirroot . '/blocks/townsquare/locallib.php'); - -/** - * Class that implements the townsquaresupportinterface with the function to get the events from the plugin. - * - * @package townsquareexpansion_moodleoverflow - * @copyright 2024 Tamaro Walter - * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ -class moodleoverflow implements townsquaresupportinterface { - - /** - * Function from the interface. - * @return array - */ - public static function get_events(): array { - global $DB; - - $courses = townsquare_get_courses(); - $timestart = townsquare_get_timestart(); - - // If moodleoverflow is not installed or not activated, return empty array. - if (!$DB->get_record('modules', ['name' => 'forum', 'visible' => 1])) { - return []; - } - - // Get posts from the database. - $moodleoverflowposts = self::get_moodleoverflowposts_from_db($courses, $timestart); - - // Filter posts by availability. - foreach ($moodleoverflowposts as $post) { - if (townsquare_filter_availability($post)) { - unset($moodleoverflowposts[$post->row_num]); - } - } - return $moodleoverflowposts; - } - - private static function get_moodleoverflowposts_from_db($courses, $timestart): array { - global $DB; - // Prepare params for sql statement. - list($insqlcourses, $inparamscourses) = $DB->get_in_or_equal($courses, SQL_PARAMS_NAMED); - $params = ['courses' => $courses, 'timestart' => $timestart] + $inparamscourses; - - $sql = "SELECT (ROW_NUMBER() OVER (ORDER BY posts.id)) AS row_num, - 'moodleoverflow' AS modulename, - module.id AS instanceid, - module.anonymous AS anonymoussetting, - 'post' AS eventtype, - cm.id AS coursemoduleid, - cm.availability AS availability, - module.name AS instancename, - discuss.course AS courseid, - discuss.userid AS discussionuserid, - discuss.name AS discussionsubject, - u.firstname AS postuserfirstname, - u.lastname AS postuserlastname, - posts.id AS postid, - posts.discussion AS postdiscussion, - posts.parent AS postparentid, - posts.userid AS postuserid, - posts.created AS timestart, - posts.message AS postmessage - FROM {moodleoverflow_posts} posts - JOIN {moodleoverflow_discussions} discuss ON discuss.id = posts.discussion - JOIN {moodleoverflow} module ON module.id = discuss.moodleoverflow - JOIN {modules} modules ON modules.name = 'moodleoverflow' - JOIN {user} u ON u.id = posts.userid - JOIN {course_modules} cm ON (cm.course = module.course AND cm.module = modules.id AND cm.instance = module.id) - WHERE discuss.course $insqlcourses - AND posts.created > :timestart - AND cm.visible = 1 - AND modules.visible = 1 - ORDER BY posts.created DESC;"; - - return $DB->get_records_sql($sql, $params); - } - -} diff --git a/townsquareexpansion/moodleoverflow/lang/en/moodleoverflow.php b/townsquareexpansion/moodleoverflow/lang/en/moodleoverflow.php deleted file mode 100644 index a46b96c..0000000 --- a/townsquareexpansion/moodleoverflow/lang/en/moodleoverflow.php +++ /dev/null @@ -1,29 +0,0 @@ -. - -/** - * Plugin strings for the townsquare subplugin for moodleoverflow support. - * - * @package townsquareexpansion_moodleoverflow - * @category string - * @copyright 2024 Tamaro Walter - * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ -$string['pluginname'] = 'Moodleoverflow support for townsquare block'; -$string['pluginnameadding'] = "Adding a Moodleoverflow support subplugin"; -$string['pluginnameediting'] = "Editing a Moodleoverflow support subplugin"; -$string['pluginnamesummary'] = "This subplugin allows the townsquare block to show new posts from moodleoverflow."; -$string['pluginname_help'] = 'This subplugin allows the townsquare block to show posts from moodleoverflow.'; diff --git a/townsquareexpansion/moodleoverflow/version.php b/townsquareexpansion/moodleoverflow/version.php deleted file mode 100644 index 7cd87e0..0000000 --- a/townsquareexpansion/moodleoverflow/version.php +++ /dev/null @@ -1,31 +0,0 @@ -. - -/** - * Plugin version and other meta-data are defined here. - * - * @package townsquareexpansion_moodleoverflow - * @copyright 2024 Tamaro Walter - * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - -defined('MOODLE_INTERNAL') || die(); -$plugin->component = 'townsquareexpansion_moodleoverflow'; -$plugin->dependencies = ['block_townsquare' => ANY_VERSION]; -$plugin->release = '0.1.0'; -$plugin->version = 2024011503; -$plugin->requires = 2022041900; -$plugin->maturity = MATURITY_ALPHA; From 0640041a5c91462aae84475571be21e1c146ee9b Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Wed, 8 May 2024 17:08:18 +0200 Subject: [PATCH 15/21] add subplugin folder to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e69de29..90c2577 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +townsquareexpansion/ From 6cae6e192f9435c0918e182dc9d19cd3b9df6a62 Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Wed, 8 May 2024 17:18:47 +0200 Subject: [PATCH 16/21] add townsquareexpansion folder --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 90c2577..cb76871 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -townsquareexpansion/ +townsquareexpansion/* From 18a47b7f14bd6923e5baa6664204ae73217fb21f Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Thu, 9 May 2024 16:17:24 +0200 Subject: [PATCH 17/21] update gitignore and add readme to townsquareexpansion --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index cb76871..c08f264 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ townsquareexpansion/* +!townsquareexpansion/readme.md From dcb4c9d007f47ea86adbf8a4ee62f65d9b1fb5bb Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Thu, 9 May 2024 16:19:36 +0200 Subject: [PATCH 18/21] add readme --- townsquareexpansion/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 townsquareexpansion/README.md diff --git a/townsquareexpansion/README.md b/townsquareexpansion/README.md new file mode 100644 index 0000000..1f3368c --- /dev/null +++ b/townsquareexpansion/README.md @@ -0,0 +1 @@ +# Townsquare Expansion Readme From dd788e345386e01661d5f124b74cb0062267ee86 Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Thu, 9 May 2024 18:01:38 +0200 Subject: [PATCH 19/21] add license file --- LICENSE.md | 596 ++++++++++++++++++++++++++++++++++ townsquareexpansion/README.md | 1 - 2 files changed, 596 insertions(+), 1 deletion(-) create mode 100644 LICENSE.md delete mode 100644 townsquareexpansion/README.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..16d89e0 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,596 @@ +GNU GENERAL PUBLIC LICENSE +========================== + +Version 3, 29 June 2007 + +Copyright © 2007 Free Software Foundation, Inc. <> + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + +## Preamble + +The GNU General Public License is a free, copyleft license for software and other +kinds of works. + +The licenses for most software and other practical works are designed to take away +your freedom to share and change the works. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change all versions of a +program--to make sure it remains free software for all its users. We, the Free +Software Foundation, use the GNU General Public License for most of our software; it +applies also to any other work released this way by its authors. You can apply it to +your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General +Public Licenses are designed to make sure that you have the freedom to distribute +copies of free software (and charge for them if you wish), that you receive source +code or can get it if you want it, that you can change the software or use pieces of +it in new free programs, and that you know you can do these things. + +To protect your rights, we need to prevent others from denying you these rights or +asking you to surrender the rights. Therefore, you have certain responsibilities if +you distribute copies of the software, or if you modify it: responsibilities to +respect the freedom of others. + +For example, if you distribute copies of such a program, whether gratis or for a fee, +you must pass on to the recipients the same freedoms that you received. You must make +sure that they, too, receive or can get the source code. And you must show them these +terms so they know their rights. + +Developers that use the GNU GPL protect your rights with two steps: (1) assert +copyright on the software, and (2) offer you this License giving you legal permission +to copy, distribute and/or modify it. + +For the developers' and authors' protection, the GPL clearly explains that there is +no warranty for this free software. For both users' and authors' sake, the GPL +requires that modified versions be marked as changed, so that their problems will not +be attributed erroneously to authors of previous versions. + +Some devices are designed to deny users access to install or run modified versions of +the software inside them, although the manufacturer can do so. This is fundamentally +incompatible with the aim of protecting users' freedom to change the software. The +systematic pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we have designed +this version of the GPL to prohibit the practice for those products. If such problems +arise substantially in other domains, we stand ready to extend this provision to +those domains in future versions of the GPL, as needed to protect the freedom of +users. + +Finally, every program is threatened constantly by software patents. States should +not allow patents to restrict development and use of software on general-purpose +computers, but in those that do, we wish to avoid the special danger that patents +applied to a free program could make it effectively proprietary. To prevent this, the +GPL assures that patents cannot be used to render the program non-free. + +The precise terms and conditions for copying, distribution and modification follow. + +## TERMS AND CONDITIONS + +### 0. Definitions. + +“This License” refers to version 3 of the GNU General Public License. + +“Copyright” also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + +“The Program” refers to any copyrightable work licensed under this +License. Each licensee is addressed as “you”. “Licensees” and +“recipients” may be individuals or organizations. + +To “modify” a work means to copy from or adapt all or part of the work in +a fashion requiring copyright permission, other than the making of an exact copy. The +resulting work is called a “modified version” of the earlier work or a +work “based on” the earlier work. + +A “covered work” means either the unmodified Program or a work based on +the Program. + +To “propagate” a work means to do anything with it that, without +permission, would make you directly or secondarily liable for infringement under +applicable copyright law, except executing it on a computer or modifying a private +copy. Propagation includes copying, distribution (with or without modification), +making available to the public, and in some countries other activities as well. + +To “convey” a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through a computer +network, with no transfer of a copy, is not conveying. + +An interactive user interface displays “Appropriate Legal Notices” to the +extent that it includes a convenient and prominently visible feature that (1) +displays an appropriate copyright notice, and (2) tells the user that there is no +warranty for the work (except to the extent that warranties are provided), that +licensees may convey the work under this License, and how to view a copy of this +License. If the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + +### 1. Source Code. + +The “source code” for a work means the preferred form of the work for +making modifications to it. “Object code” means any non-source form of a +work. + +A “Standard Interface” means an interface that either is an official +standard defined by a recognized standards body, or, in the case of interfaces +specified for a particular programming language, one that is widely used among +developers working in that language. + +The “System Libraries” of an executable work include anything, other than +the work as a whole, that (a) is included in the normal form of packaging a Major +Component, but which is not part of that Major Component, and (b) serves only to +enable use of the work with that Major Component, or to implement a Standard +Interface for which an implementation is available to the public in source code form. +A “Major Component”, in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system (if any) on which +the executable work runs, or a compiler used to produce the work, or an object code +interpreter used to run it. + +The “Corresponding Source” for a work in object code form means all the +source code needed to generate, install, and (for an executable work) run the object +code and to modify the work, including scripts to control those activities. However, +it does not include the work's System Libraries, or general-purpose tools or +generally available free programs which are used unmodified in performing those +activities but which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for the work, and +the source code for shared libraries and dynamically linked subprograms that the work +is specifically designed to require, such as by intimate data communication or +control flow between those subprograms and other parts of the work. + +The Corresponding Source need not include anything that users can regenerate +automatically from other parts of the Corresponding Source. + +The Corresponding Source for a work in source code form is that same work. + +### 2. Basic Permissions. + +All rights granted under this License are granted for the term of copyright on the +Program, and are irrevocable provided the stated conditions are met. This License +explicitly affirms your unlimited permission to run the unmodified Program. The +output from running a covered work is covered by this License only if the output, +given its content, constitutes a covered work. This License acknowledges your rights +of fair use or other equivalent, as provided by copyright law. + +You may make, run and propagate covered works that you do not convey, without +conditions so long as your license otherwise remains in force. You may convey covered +works to others for the sole purpose of having them make modifications exclusively +for you, or provide you with facilities for running those works, provided that you +comply with the terms of this License in conveying all material for which you do not +control copyright. Those thus making or running the covered works for you must do so +exclusively on your behalf, under your direction and control, on terms that prohibit +them from making any copies of your copyrighted material outside their relationship +with you. + +Conveying under any other circumstances is permitted solely under the conditions +stated below. Sublicensing is not allowed; section 10 makes it unnecessary. + +### 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + +No covered work shall be deemed part of an effective technological measure under any +applicable law fulfilling obligations under article 11 of the WIPO copyright treaty +adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention +of such measures. + +When you convey a covered work, you waive any legal power to forbid circumvention of +technological measures to the extent such circumvention is effected by exercising +rights under this License with respect to the covered work, and you disclaim any +intention to limit operation or modification of the work as a means of enforcing, +against the work's users, your or third parties' legal rights to forbid circumvention +of technological measures. + +### 4. Conveying Verbatim Copies. + +You may convey verbatim copies of the Program's source code as you receive it, in any +medium, provided that you conspicuously and appropriately publish on each copy an +appropriate copyright notice; keep intact all notices stating that this License and +any non-permissive terms added in accord with section 7 apply to the code; keep +intact all notices of the absence of any warranty; and give all recipients a copy of +this License along with the Program. + +You may charge any price or no price for each copy that you convey, and you may offer +support or warranty protection for a fee. + +### 5. Conveying Modified Source Versions. + +You may convey a work based on the Program, or the modifications to produce it from +the Program, in the form of source code under the terms of section 4, provided that +you also meet all of these conditions: + +* **a)** The work must carry prominent notices stating that you modified it, and giving a +relevant date. +* **b)** The work must carry prominent notices stating that it is released under this +License and any conditions added under section 7. This requirement modifies the +requirement in section 4 to “keep intact all notices”. +* **c)** You must license the entire work, as a whole, under this License to anyone who +comes into possession of a copy. This License will therefore apply, along with any +applicable section 7 additional terms, to the whole of the work, and all its parts, +regardless of how they are packaged. This License gives no permission to license the +work in any other way, but it does not invalidate such permission if you have +separately received it. +* **d)** If the work has interactive user interfaces, each must display Appropriate Legal +Notices; however, if the Program has interactive interfaces that do not display +Appropriate Legal Notices, your work need not make them do so. + +A compilation of a covered work with other separate and independent works, which are +not by their nature extensions of the covered work, and which are not combined with +it such as to form a larger program, in or on a volume of a storage or distribution +medium, is called an “aggregate” if the compilation and its resulting +copyright are not used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work in an aggregate +does not cause this License to apply to the other parts of the aggregate. + +### 6. Conveying Non-Source Forms. + +You may convey a covered work in object code form under the terms of sections 4 and +5, provided that you also convey the machine-readable Corresponding Source under the +terms of this License, in one of these ways: + +* **a)** Convey the object code in, or embodied in, a physical product (including a +physical distribution medium), accompanied by the Corresponding Source fixed on a +durable physical medium customarily used for software interchange. +* **b)** Convey the object code in, or embodied in, a physical product (including a +physical distribution medium), accompanied by a written offer, valid for at least +three years and valid for as long as you offer spare parts or customer support for +that product model, to give anyone who possesses the object code either (1) a copy of +the Corresponding Source for all the software in the product that is covered by this +License, on a durable physical medium customarily used for software interchange, for +a price no more than your reasonable cost of physically performing this conveying of +source, or (2) access to copy the Corresponding Source from a network server at no +charge. +* **c)** Convey individual copies of the object code with a copy of the written offer to +provide the Corresponding Source. This alternative is allowed only occasionally and +noncommercially, and only if you received the object code with such an offer, in +accord with subsection 6b. +* **d)** Convey the object code by offering access from a designated place (gratis or for +a charge), and offer equivalent access to the Corresponding Source in the same way +through the same place at no further charge. You need not require recipients to copy +the Corresponding Source along with the object code. If the place to copy the object +code is a network server, the Corresponding Source may be on a different server +(operated by you or a third party) that supports equivalent copying facilities, +provided you maintain clear directions next to the object code saying where to find +the Corresponding Source. Regardless of what server hosts the Corresponding Source, +you remain obligated to ensure that it is available for as long as needed to satisfy +these requirements. +* **e)** Convey the object code using peer-to-peer transmission, provided you inform +other peers where the object code and Corresponding Source of the work are being +offered to the general public at no charge under subsection 6d. + +A separable portion of the object code, whose source code is excluded from the +Corresponding Source as a System Library, need not be included in conveying the +object code work. + +A “User Product” is either (1) a “consumer product”, which +means any tangible personal property which is normally used for personal, family, or +household purposes, or (2) anything designed or sold for incorporation into a +dwelling. In determining whether a product is a consumer product, doubtful cases +shall be resolved in favor of coverage. For a particular product received by a +particular user, “normally used” refers to a typical or common use of +that class of product, regardless of the status of the particular user or of the way +in which the particular user actually uses, or expects or is expected to use, the +product. A product is a consumer product regardless of whether the product has +substantial commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + +“Installation Information” for a User Product means any methods, +procedures, authorization keys, or other information required to install and execute +modified versions of a covered work in that User Product from a modified version of +its Corresponding Source. The information must suffice to ensure that the continued +functioning of the modified object code is in no case prevented or interfered with +solely because modification has been made. + +If you convey an object code work under this section in, or with, or specifically for +use in, a User Product, and the conveying occurs as part of a transaction in which +the right of possession and use of the User Product is transferred to the recipient +in perpetuity or for a fixed term (regardless of how the transaction is +characterized), the Corresponding Source conveyed under this section must be +accompanied by the Installation Information. But this requirement does not apply if +neither you nor any third party retains the ability to install modified object code +on the User Product (for example, the work has been installed in ROM). + +The requirement to provide Installation Information does not include a requirement to +continue to provide support service, warranty, or updates for a work that has been +modified or installed by the recipient, or for the User Product in which it has been +modified or installed. Access to a network may be denied when the modification itself +materially and adversely affects the operation of the network or violates the rules +and protocols for communication across the network. + +Corresponding Source conveyed, and Installation Information provided, in accord with +this section must be in a format that is publicly documented (and with an +implementation available to the public in source code form), and must require no +special password or key for unpacking, reading or copying. + +### 7. Additional Terms. + +“Additional permissions” are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. Additional +permissions that are applicable to the entire Program shall be treated as though they +were included in this License, to the extent that they are valid under applicable +law. If additional permissions apply only to part of the Program, that part may be +used separately under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option remove any +additional permissions from that copy, or from any part of it. (Additional +permissions may be written to require their own removal in certain cases when you +modify the work.) You may place additional permissions on material, added by you to a +covered work, for which you have or can give appropriate copyright permission. + +Notwithstanding any other provision of this License, for material you add to a +covered work, you may (if authorized by the copyright holders of that material) +supplement the terms of this License with terms: + +* **a)** Disclaiming warranty or limiting liability differently from the terms of +sections 15 and 16 of this License; or +* **b)** Requiring preservation of specified reasonable legal notices or author +attributions in that material or in the Appropriate Legal Notices displayed by works +containing it; or +* **c)** Prohibiting misrepresentation of the origin of that material, or requiring that +modified versions of such material be marked in reasonable ways as different from the +original version; or +* **d)** Limiting the use for publicity purposes of names of licensors or authors of the +material; or +* **e)** Declining to grant rights under trademark law for use of some trade names, +trademarks, or service marks; or +* **f)** Requiring indemnification of licensors and authors of that material by anyone +who conveys the material (or modified versions of it) with contractual assumptions of +liability to the recipient, for any liability that these contractual assumptions +directly impose on those licensors and authors. + +All other non-permissive additional terms are considered “further +restrictions” within the meaning of section 10. If the Program as you received +it, or any part of it, contains a notice stating that it is governed by this License +along with a term that is a further restriction, you may remove that term. If a +license document contains a further restriction but permits relicensing or conveying +under this License, you may add to a covered work material governed by the terms of +that license document, provided that the further restriction does not survive such +relicensing or conveying. + +If you add terms to a covered work in accord with this section, you must place, in +the relevant source files, a statement of the additional terms that apply to those +files, or a notice indicating where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the form of a +separately written license, or stated as exceptions; the above requirements apply +either way. + +### 8. Termination. + +You may not propagate or modify a covered work except as expressly provided under +this License. Any attempt otherwise to propagate or modify it is void, and will +automatically terminate your rights under this License (including any patent licenses +granted under the third paragraph of section 11). + +However, if you cease all violation of this License, then your license from a +particular copyright holder is reinstated (a) provisionally, unless and until the +copyright holder explicitly and finally terminates your license, and (b) permanently, +if the copyright holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + +Moreover, your license from a particular copyright holder is reinstated permanently +if the copyright holder notifies you of the violation by some reasonable means, this +is the first time you have received notice of violation of this License (for any +work) from that copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + +Termination of your rights under this section does not terminate the licenses of +parties who have received copies or rights from you under this License. If your +rights have been terminated and not permanently reinstated, you do not qualify to +receive new licenses for the same material under section 10. + +### 9. Acceptance Not Required for Having Copies. + +You are not required to accept this License in order to receive or run a copy of the +Program. Ancillary propagation of a covered work occurring solely as a consequence of +using peer-to-peer transmission to receive a copy likewise does not require +acceptance. However, nothing other than this License grants you permission to +propagate or modify any covered work. These actions infringe copyright if you do not +accept this License. Therefore, by modifying or propagating a covered work, you +indicate your acceptance of this License to do so. + +### 10. Automatic Licensing of Downstream Recipients. + +Each time you convey a covered work, the recipient automatically receives a license +from the original licensors, to run, modify and propagate that work, subject to this +License. You are not responsible for enforcing compliance by third parties with this +License. + +An “entity transaction” is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an organization, or +merging organizations. If propagation of a covered work results from an entity +transaction, each party to that transaction who receives a copy of the work also +receives whatever licenses to the work the party's predecessor in interest had or +could give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if the predecessor +has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the rights granted or +affirmed under this License. For example, you may not impose a license fee, royalty, +or other charge for exercise of rights granted under this License, and you may not +initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging +that any patent claim is infringed by making, using, selling, offering for sale, or +importing the Program or any portion of it. + +### 11. Patents. + +A “contributor” is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The work thus +licensed is called the contributor's “contributor version”. + +A contributor's “essential patent claims” are all patent claims owned or +controlled by the contributor, whether already acquired or hereafter acquired, that +would be infringed by some manner, permitted by this License, of making, using, or +selling its contributor version, but do not include claims that would be infringed +only as a consequence of further modification of the contributor version. For +purposes of this definition, “control” includes the right to grant patent +sublicenses in a manner consistent with the requirements of this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free patent license +under the contributor's essential patent claims, to make, use, sell, offer for sale, +import and otherwise run, modify and propagate the contents of its contributor +version. + +In the following three paragraphs, a “patent license” is any express +agreement or commitment, however denominated, not to enforce a patent (such as an +express permission to practice a patent or covenant not to sue for patent +infringement). To “grant” such a patent license to a party means to make +such an agreement or commitment not to enforce a patent against the party. + +If you convey a covered work, knowingly relying on a patent license, and the +Corresponding Source of the work is not available for anyone to copy, free of charge +and under the terms of this License, through a publicly available network server or +other readily accessible means, then you must either (1) cause the Corresponding +Source to be so available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner consistent with +the requirements of this License, to extend the patent license to downstream +recipients. “Knowingly relying” means you have actual knowledge that, but +for the patent license, your conveying the covered work in a country, or your +recipient's use of the covered work in a country, would infringe one or more +identifiable patents in that country that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or arrangement, you +convey, or propagate by procuring conveyance of, a covered work, and grant a patent +license to some of the parties receiving the covered work authorizing them to use, +propagate, modify or convey a specific copy of the covered work, then the patent +license you grant is automatically extended to all recipients of the covered work and +works based on it. + +A patent license is “discriminatory” if it does not include within the +scope of its coverage, prohibits the exercise of, or is conditioned on the +non-exercise of one or more of the rights that are specifically granted under this +License. You may not convey a covered work if you are a party to an arrangement with +a third party that is in the business of distributing software, under which you make +payment to the third party based on the extent of your activity of conveying the +work, and under which the third party grants, to any of the parties who would receive +the covered work from you, a discriminatory patent license (a) in connection with +copies of the covered work conveyed by you (or copies made from those copies), or (b) +primarily for and in connection with specific products or compilations that contain +the covered work, unless you entered into that arrangement, or that patent license +was granted, prior to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting any implied +license or other defenses to infringement that may otherwise be available to you +under applicable patent law. + +### 12. No Surrender of Others' Freedom. + +If conditions are imposed on you (whether by court order, agreement or otherwise) +that contradict the conditions of this License, they do not excuse you from the +conditions of this License. If you cannot convey a covered work so as to satisfy +simultaneously your obligations under this License and any other pertinent +obligations, then as a consequence you may not convey it at all. For example, if you +agree to terms that obligate you to collect a royalty for further conveying from +those to whom you convey the Program, the only way you could satisfy both those terms +and this License would be to refrain entirely from conveying the Program. + +### 13. Use with the GNU Affero General Public License. + +Notwithstanding any other provision of this License, you have permission to link or +combine any covered work with a work licensed under version 3 of the GNU Affero +General Public License into a single combined work, and to convey the resulting work. +The terms of this License will continue to apply to the part which is the covered +work, but the special requirements of the GNU Affero General Public License, section +13, concerning interaction through a network will apply to the combination as such. + +### 14. Revised Versions of this License. + +The Free Software Foundation may publish revised and/or new versions of the GNU +General Public License from time to time. Such new versions will be similar in spirit +to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies that +a certain numbered version of the GNU General Public License “or any later +version” applies to it, you have the option of following the terms and +conditions either of that numbered version or of any later version published by the +Free Software Foundation. If the Program does not specify a version number of the GNU +General Public License, you may choose any version ever published by the Free +Software Foundation. + +If the Program specifies that a proxy can decide which future versions of the GNU +General Public License can be used, that proxy's public statement of acceptance of a +version permanently authorizes you to choose that version for the Program. + +Later license versions may give you additional or different permissions. However, no +additional obligations are imposed on any author or copyright holder as a result of +your choosing to follow a later version. + +### 15. Disclaimer of Warranty. + +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER +EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE +QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE +DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +### 16. Limitation of Liability. + +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY +COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS +PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, +INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE +OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE +WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + +### 17. Interpretation of Sections 15 and 16. + +If the disclaimer of warranty and limitation of liability provided above cannot be +given local legal effect according to their terms, reviewing courts shall apply local +law that most closely approximates an absolute waiver of all civil liability in +connection with the Program, unless a warranty or assumption of liability accompanies +a copy of the Program in return for a fee. + +END OF TERMS AND CONDITIONS + +## How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to +the public, the best way to achieve this is to make it free software which everyone +can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them +to the start of each source file to most effectively state the exclusion of warranty; +and each file should have at least the “copyright” line and a pointer to +where the full notice is found. + + + Copyright (C) + + This program 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. + + This program 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 this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + +If the program does terminal interaction, make it output a short notice like this +when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type 'show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type 'show c' for details. + +The hypothetical commands 'show w' and 'show c' should show the appropriate parts of +the General Public License. Of course, your program's commands might be different; +for a GUI interface, you would use an “about box”. + +You should also get your employer (if you work as a programmer) or school, if any, to +sign a “copyright disclaimer” for the program, if necessary. For more +information on this, and how to apply and follow the GNU GPL, see +<>. + +The GNU General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may consider it +more useful to permit linking proprietary applications with the library. If this is +what you want to do, use the GNU Lesser General Public License instead of this +License. But first, please read +<>. \ No newline at end of file diff --git a/townsquareexpansion/README.md b/townsquareexpansion/README.md deleted file mode 100644 index 1f3368c..0000000 --- a/townsquareexpansion/README.md +++ /dev/null @@ -1 +0,0 @@ -# Townsquare Expansion Readme From 8752a59d7f6ca36a55362959b8436c1dd75f01b2 Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Thu, 9 May 2024 19:04:34 +0200 Subject: [PATCH 20/21] update readme --- README.md | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/README.md b/README.md index 3bc6594..1f95b71 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,39 @@ A moodle local plugin that manages the subplugins for the moodle townsquare block. Documentation of the townsquare block: https://github.com/learnweb/moodle-local_townsquare +## How to install a subplugin ## + +To install a townsquare subplugin, clone the repository of the subplugin into the + +`{your/moodle/dirroot}/local/townsquaresupport/townsquareexpansion/{pluginname} +` + +directory. + +Afterwards, log in to your Moodle site as an admin and go to _Site administration > +Notifications_ to complete the installation. + +Alternatively, you can run + + $ php admin/cli/upgrade.php + +to complete the installation from the command line. + +## How to implement a subplugin ## + +To implement a subplugin for townsquare, the subplugins needs to meet the following requirements: + +1. The plugin type must be`townsquareexpansion_{pluginname}`. +2. The plugins must have at least the following files: + + - `version.php` + - `lang/en/{pluginname}.php ` + - `classes/{pluginname}.php ` + + The most important file is the `{pluginname}` class. This class needs to implement the `townsquaresupportinterface` located in + `{your/moodle/dirroot}/local/townsquaresupport/classes/townsquaresupportinterface.php.`. By implementing the interface, the + subplugin can make notifications available for the townsquare block. + ## Installing via uploaded ZIP file ## 1. Log in to your Moodle site as an admin and go to _Site administration > From 45e8c7e461d13926df4668c4be6067661d1d04db Mon Sep 17 00:00:00 2001 From: TamaroWalter Date: Tue, 14 May 2024 14:29:30 +0200 Subject: [PATCH 21/21] add readme of townsquareexpansion folder --- .gitignore | 1 + townsquareexpansion/README.md | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 townsquareexpansion/README.md diff --git a/.gitignore b/.gitignore index c08f264..4865013 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ townsquareexpansion/* !townsquareexpansion/readme.md +!townsquareexpansion/README.md diff --git a/townsquareexpansion/README.md b/townsquareexpansion/README.md new file mode 100644 index 0000000..558b669 --- /dev/null +++ b/townsquareexpansion/README.md @@ -0,0 +1,3 @@ +# Important: + +This is the folder where all subplugins are installed and located. Do not delete this folder or modify it!