From 26d2887fde8258ff67355fb558a9fcfda8e771ed Mon Sep 17 00:00:00 2001 From: tenzap Date: Tue, 28 Nov 2023 13:32:35 +0100 Subject: [PATCH] change kalkun license to GPL-2.0-or-later Currently kalkun is licensed under `GPL-3-or-later`. However, kalkun is closely bound to Gammu which is `GPL-2-only`. Moreover, some of the code/files in kalkun is also under GPL2 license. For example: application/plugins/sms_to_twitter/libraries/Epi.php application/plugins/sms_to_twitter/libraries/Twitter.php application/sql/mysql/pbk_gammu.sql application/sql/pgsql/pbk_gammu.sql application/sql/sqlite/pbk_gammu.sql The problem is that these licenses (`GPL-3-or-later` & `GPL-2-only`) are actually not compatible as per https://www.gnu.org/licenses/gpl-faq.en.html#AllCompatibility Closes: #505 --- application/controllers/Daemon.php | 2 +- application/controllers/Install.php | 2 +- application/controllers/Kalkun.php | 2 +- application/controllers/Login.php | 2 +- application/controllers/Messages.php | 2 +- application/controllers/Phonebook.php | 2 +- application/controllers/Pluginss.php | 2 +- application/controllers/Users.php | 2 +- application/core/MY_Controller.php | 2 +- application/core/MY_Lang.php | 2 +- application/core/MY_Model.php | 2 +- application/helpers/i18n_helper.php | 2 +- application/helpers/kalkun_helper.php | 2 +- application/libraries/MY_Pagination.php | 2 +- application/models/Kalkun_model.php | 2 +- application/models/Message_model.php | 2 +- application/models/Phonebook_model.php | 2 +- application/models/Plugin_model.php | 2 +- application/models/Spam_model.php | 2 +- application/models/User_model.php | 2 +- application/models/gateway/Clickatell_model.php | 2 +- application/models/gateway/Connekt_model.php | 2 +- application/models/gateway/Gammu_model.php | 2 +- application/models/gateway/Kannel_model.php | 2 +- application/models/gateway/Nongammu_model.php | 2 +- application/models/gateway/Nowsms_model.php | 2 +- application/models/gateway/Ozeking_model.php | 2 +- application/models/gateway/Panacea_model.php | 2 +- application/models/gateway/Tmobilecz_model.php | 2 +- application/models/gateway/Way2sms_model.php | 2 +- application/plugins/Plugin_controller.php | 2 +- application/plugins/Plugin_helper.php | 2 +- .../plugins/blacklist_number/controllers/Blacklist_number.php | 2 +- .../plugins/blacklist_number/models/Blacklist_number_model.php | 2 +- application/plugins/jsonrpc/controllers/Jsonrpc.php | 2 +- application/plugins/jsonrpc/libraries/Evaluator.php | 2 +- application/plugins/rest_api/controllers/Rest_api.php | 2 +- application/plugins/server_alert/controllers/Server_alert.php | 2 +- application/plugins/server_alert/models/Server_alert_model.php | 2 +- application/plugins/sms_credit/controllers/Sms_credit.php | 2 +- application/plugins/sms_credit/models/Sms_credit_model.php | 2 +- application/plugins/sms_member/controllers/Sms_member.php | 2 +- application/plugins/sms_member/models/Sms_member_model.php | 2 +- application/plugins/sms_to_email/controllers/Sms_to_email.php | 2 +- application/plugins/sms_to_email/models/Sms_to_email_model.php | 2 +- .../plugins/sms_to_twitter/controllers/Sms_to_twitter.php | 2 +- .../plugins/sms_to_twitter/models/Sms_to_twitter_model.php | 2 +- .../plugins/sms_to_wordpress/controllers/Sms_to_wordpress.php | 2 +- .../plugins/sms_to_wordpress/models/Sms_to_wordpress_model.php | 2 +- application/plugins/sms_to_xmpp/controllers/Sms_to_xmpp.php | 2 +- application/plugins/sms_to_xmpp/models/Sms_to_xmpp_model.php | 2 +- application/plugins/soap/controllers/Soap.php | 2 +- application/plugins/stop_manager/controllers/Stop_manager.php | 2 +- application/plugins/stop_manager/libraries/Config.php | 2 +- application/plugins/stop_manager/libraries/MsgIncoming.php | 2 +- application/plugins/stop_manager/libraries/MsgOutgoing.php | 2 +- application/plugins/stop_manager/models/Stop_manager_model.php | 2 +- .../plugins/whitelist_number/controllers/Whitelist_number.php | 2 +- .../plugins/whitelist_number/models/Whitelist_number_model.php | 2 +- application/plugins/xmlrpc/controllers/Xmlrpc.php | 2 +- application/views/main/base.php | 2 +- composer.json | 2 +- docs/README.md | 2 +- utils/check_translation.php | 2 +- 64 files changed, 64 insertions(+), 64 deletions(-) diff --git a/application/controllers/Daemon.php b/application/controllers/Daemon.php index 12266c30e..9c41d0f1f 100644 --- a/application/controllers/Daemon.php +++ b/application/controllers/Daemon.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/controllers/Install.php b/application/controllers/Install.php index 17dbbdacd..0eac1cb94 100644 --- a/application/controllers/Install.php +++ b/application/controllers/Install.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/controllers/Kalkun.php b/application/controllers/Kalkun.php index 51f62b5e9..8f29f03a2 100644 --- a/application/controllers/Kalkun.php +++ b/application/controllers/Kalkun.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/controllers/Login.php b/application/controllers/Login.php index dce1179c2..bb93c5e5f 100644 --- a/application/controllers/Login.php +++ b/application/controllers/Login.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/controllers/Messages.php b/application/controllers/Messages.php index 4d82829fc..c5f03745f 100644 --- a/application/controllers/Messages.php +++ b/application/controllers/Messages.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/controllers/Phonebook.php b/application/controllers/Phonebook.php index 2f21fccfd..5bf70e996 100644 --- a/application/controllers/Phonebook.php +++ b/application/controllers/Phonebook.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/controllers/Pluginss.php b/application/controllers/Pluginss.php index 7df2cb857..1e0b5e405 100644 --- a/application/controllers/Pluginss.php +++ b/application/controllers/Pluginss.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/controllers/Users.php b/application/controllers/Users.php index 833993ff7..3cdaae1d5 100644 --- a/application/controllers/Users.php +++ b/application/controllers/Users.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 8849bf61f..f63bcba7d 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/core/MY_Lang.php b/application/core/MY_Lang.php index b9ca9f7b1..2d12c2472 100644 --- a/application/core/MY_Lang.php +++ b/application/core/MY_Lang.php @@ -7,7 +7,7 @@ * * @copyright 2021 Fab Stz * @author Fab Stz - * @license GPL-3.0-or-later + * @license GPL-2.0-or-later * @link https://kalkun.sourceforge.io/ */ diff --git a/application/core/MY_Model.php b/application/core/MY_Model.php index 37ee4a533..7ca06d816 100644 --- a/application/core/MY_Model.php +++ b/application/core/MY_Model.php @@ -7,7 +7,7 @@ * * @copyright 2021 Fab Stz * @author Fab Stz - * @license GPL-3.0-or-later + * @license GPL-2.0-or-later * @link https://kalkun.sourceforge.io/ */ diff --git a/application/helpers/i18n_helper.php b/application/helpers/i18n_helper.php index 48f331d26..28521bcc8 100644 --- a/application/helpers/i18n_helper.php +++ b/application/helpers/i18n_helper.php @@ -7,7 +7,7 @@ * * @copyright 2021 Fab Stz * @author Fab Stz - * @license GPL-3.0-or-later + * @license GPL-2.0-or-later * @link https://kalkun.sourceforge.io/ */ diff --git a/application/helpers/kalkun_helper.php b/application/helpers/kalkun_helper.php index 7d2288a2f..069ccabea 100644 --- a/application/helpers/kalkun_helper.php +++ b/application/helpers/kalkun_helper.php @@ -8,7 +8,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license GPL-3.0-or-later + * @license GPL-2.0-or-later * @link https://kalkun.sourceforge.io/ */ diff --git a/application/libraries/MY_Pagination.php b/application/libraries/MY_Pagination.php index 81c4948e9..c0bd05c5c 100644 --- a/application/libraries/MY_Pagination.php +++ b/application/libraries/MY_Pagination.php @@ -7,7 +7,7 @@ * * @copyright 2022 Fab Stz * @author Fab Stz - * @license GPL-3.0-or-later + * @license GPL-2.0-or-later * @link https://kalkun.sourceforge.io/ */ diff --git a/application/models/Kalkun_model.php b/application/models/Kalkun_model.php index 388dd8209..334cdcfff 100644 --- a/application/models/Kalkun_model.php +++ b/application/models/Kalkun_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/models/Message_model.php b/application/models/Message_model.php index 683d88637..d2f874b43 100644 --- a/application/models/Message_model.php +++ b/application/models/Message_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/models/Phonebook_model.php b/application/models/Phonebook_model.php index d1f0e91ff..748aa0fb8 100644 --- a/application/models/Phonebook_model.php +++ b/application/models/Phonebook_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/models/Plugin_model.php b/application/models/Plugin_model.php index ca62016ee..698ecdd9e 100644 --- a/application/models/Plugin_model.php +++ b/application/models/Plugin_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/models/Spam_model.php b/application/models/Spam_model.php index 432bfcda0..7df2fcc36 100644 --- a/application/models/Spam_model.php +++ b/application/models/Spam_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/models/User_model.php b/application/models/User_model.php index 7fc7fa146..764586600 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/models/gateway/Clickatell_model.php b/application/models/gateway/Clickatell_model.php index b39c88864..1c636a63c 100644 --- a/application/models/gateway/Clickatell_model.php +++ b/application/models/gateway/Clickatell_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/models/gateway/Connekt_model.php b/application/models/gateway/Connekt_model.php index 71bb51e41..65a0f307b 100644 --- a/application/models/gateway/Connekt_model.php +++ b/application/models/gateway/Connekt_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/models/gateway/Gammu_model.php b/application/models/gateway/Gammu_model.php index 5cbc4ad5f..896c374b7 100644 --- a/application/models/gateway/Gammu_model.php +++ b/application/models/gateway/Gammu_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/models/gateway/Kannel_model.php b/application/models/gateway/Kannel_model.php index 0cde5c44d..94f7cb432 100644 --- a/application/models/gateway/Kannel_model.php +++ b/application/models/gateway/Kannel_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/models/gateway/Nongammu_model.php b/application/models/gateway/Nongammu_model.php index 71b2bd6e3..142f4fea6 100644 --- a/application/models/gateway/Nongammu_model.php +++ b/application/models/gateway/Nongammu_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/models/gateway/Nowsms_model.php b/application/models/gateway/Nowsms_model.php index b28d0595b..0152109ba 100644 --- a/application/models/gateway/Nowsms_model.php +++ b/application/models/gateway/Nowsms_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/models/gateway/Ozeking_model.php b/application/models/gateway/Ozeking_model.php index 49c75d0a5..58b5b6244 100644 --- a/application/models/gateway/Ozeking_model.php +++ b/application/models/gateway/Ozeking_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/models/gateway/Panacea_model.php b/application/models/gateway/Panacea_model.php index 9a0ccf2dc..e7ed3f5f1 100644 --- a/application/models/gateway/Panacea_model.php +++ b/application/models/gateway/Panacea_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author joseph mazigo - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ * @link http://josephmazigo.com */ diff --git a/application/models/gateway/Tmobilecz_model.php b/application/models/gateway/Tmobilecz_model.php index 2ea2f4e4b..7c6ce92cb 100644 --- a/application/models/gateway/Tmobilecz_model.php +++ b/application/models/gateway/Tmobilecz_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/models/gateway/Way2sms_model.php b/application/models/gateway/Way2sms_model.php index bad88bcf9..aaea80053 100644 --- a/application/models/gateway/Way2sms_model.php +++ b/application/models/gateway/Way2sms_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/Plugin_controller.php b/application/plugins/Plugin_controller.php index 95817b2bf..95fcb720a 100644 --- a/application/plugins/Plugin_controller.php +++ b/application/plugins/Plugin_controller.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/Plugin_helper.php b/application/plugins/Plugin_helper.php index cd7bb0df3..08fd84fb1 100644 --- a/application/plugins/Plugin_helper.php +++ b/application/plugins/Plugin_helper.php @@ -7,7 +7,7 @@ * * @copyright 2021 Kalkun Dev Team * @author Kalkun Dev Team - * @license GPL-3.0-or-later + * @license GPL-2.0-or-later * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/blacklist_number/controllers/Blacklist_number.php b/application/plugins/blacklist_number/controllers/Blacklist_number.php index 0424bfb04..d752618db 100644 --- a/application/plugins/blacklist_number/controllers/Blacklist_number.php +++ b/application/plugins/blacklist_number/controllers/Blacklist_number.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/blacklist_number/models/Blacklist_number_model.php b/application/plugins/blacklist_number/models/Blacklist_number_model.php index 92156763a..8dcb067bc 100644 --- a/application/plugins/blacklist_number/models/Blacklist_number_model.php +++ b/application/plugins/blacklist_number/models/Blacklist_number_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/jsonrpc/controllers/Jsonrpc.php b/application/plugins/jsonrpc/controllers/Jsonrpc.php index 505a7ca9f..87da1a5d3 100644 --- a/application/plugins/jsonrpc/controllers/Jsonrpc.php +++ b/application/plugins/jsonrpc/controllers/Jsonrpc.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/jsonrpc/libraries/Evaluator.php b/application/plugins/jsonrpc/libraries/Evaluator.php index d0c768a70..cd0ca63eb 100644 --- a/application/plugins/jsonrpc/libraries/Evaluator.php +++ b/application/plugins/jsonrpc/libraries/Evaluator.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/rest_api/controllers/Rest_api.php b/application/plugins/rest_api/controllers/Rest_api.php index 6878f6cf2..670214632 100644 --- a/application/plugins/rest_api/controllers/Rest_api.php +++ b/application/plugins/rest_api/controllers/Rest_api.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/server_alert/controllers/Server_alert.php b/application/plugins/server_alert/controllers/Server_alert.php index b7be21578..d740a64b9 100644 --- a/application/plugins/server_alert/controllers/Server_alert.php +++ b/application/plugins/server_alert/controllers/Server_alert.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/server_alert/models/Server_alert_model.php b/application/plugins/server_alert/models/Server_alert_model.php index 12bc71eb5..dffae5617 100644 --- a/application/plugins/server_alert/models/Server_alert_model.php +++ b/application/plugins/server_alert/models/Server_alert_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/sms_credit/controllers/Sms_credit.php b/application/plugins/sms_credit/controllers/Sms_credit.php index 69f834901..09dba54b8 100644 --- a/application/plugins/sms_credit/controllers/Sms_credit.php +++ b/application/plugins/sms_credit/controllers/Sms_credit.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/sms_credit/models/Sms_credit_model.php b/application/plugins/sms_credit/models/Sms_credit_model.php index e8fe190e3..5cbf6db7a 100644 --- a/application/plugins/sms_credit/models/Sms_credit_model.php +++ b/application/plugins/sms_credit/models/Sms_credit_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/sms_member/controllers/Sms_member.php b/application/plugins/sms_member/controllers/Sms_member.php index 2a433b1cb..d3c6a5d1e 100644 --- a/application/plugins/sms_member/controllers/Sms_member.php +++ b/application/plugins/sms_member/controllers/Sms_member.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/sms_member/models/Sms_member_model.php b/application/plugins/sms_member/models/Sms_member_model.php index 5b9de7aa8..7d7abf8b1 100644 --- a/application/plugins/sms_member/models/Sms_member_model.php +++ b/application/plugins/sms_member/models/Sms_member_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/sms_to_email/controllers/Sms_to_email.php b/application/plugins/sms_to_email/controllers/Sms_to_email.php index 5d640d136..8fc57f759 100644 --- a/application/plugins/sms_to_email/controllers/Sms_to_email.php +++ b/application/plugins/sms_to_email/controllers/Sms_to_email.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/sms_to_email/models/Sms_to_email_model.php b/application/plugins/sms_to_email/models/Sms_to_email_model.php index afca4af81..6a4a914bc 100644 --- a/application/plugins/sms_to_email/models/Sms_to_email_model.php +++ b/application/plugins/sms_to_email/models/Sms_to_email_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/sms_to_twitter/controllers/Sms_to_twitter.php b/application/plugins/sms_to_twitter/controllers/Sms_to_twitter.php index ff6c2359e..2e604f163 100644 --- a/application/plugins/sms_to_twitter/controllers/Sms_to_twitter.php +++ b/application/plugins/sms_to_twitter/controllers/Sms_to_twitter.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/sms_to_twitter/models/Sms_to_twitter_model.php b/application/plugins/sms_to_twitter/models/Sms_to_twitter_model.php index 0b3b13c1b..f506d6a0c 100644 --- a/application/plugins/sms_to_twitter/models/Sms_to_twitter_model.php +++ b/application/plugins/sms_to_twitter/models/Sms_to_twitter_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/sms_to_wordpress/controllers/Sms_to_wordpress.php b/application/plugins/sms_to_wordpress/controllers/Sms_to_wordpress.php index fbb15b9f6..6e76e16e7 100644 --- a/application/plugins/sms_to_wordpress/controllers/Sms_to_wordpress.php +++ b/application/plugins/sms_to_wordpress/controllers/Sms_to_wordpress.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/sms_to_wordpress/models/Sms_to_wordpress_model.php b/application/plugins/sms_to_wordpress/models/Sms_to_wordpress_model.php index 089745a20..7b8a8536b 100644 --- a/application/plugins/sms_to_wordpress/models/Sms_to_wordpress_model.php +++ b/application/plugins/sms_to_wordpress/models/Sms_to_wordpress_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/sms_to_xmpp/controllers/Sms_to_xmpp.php b/application/plugins/sms_to_xmpp/controllers/Sms_to_xmpp.php index f1de7655e..470706a96 100644 --- a/application/plugins/sms_to_xmpp/controllers/Sms_to_xmpp.php +++ b/application/plugins/sms_to_xmpp/controllers/Sms_to_xmpp.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/sms_to_xmpp/models/Sms_to_xmpp_model.php b/application/plugins/sms_to_xmpp/models/Sms_to_xmpp_model.php index 80b458f7f..70df701ac 100644 --- a/application/plugins/sms_to_xmpp/models/Sms_to_xmpp_model.php +++ b/application/plugins/sms_to_xmpp/models/Sms_to_xmpp_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/soap/controllers/Soap.php b/application/plugins/soap/controllers/Soap.php index 1a58cbfcd..e394fe314 100644 --- a/application/plugins/soap/controllers/Soap.php +++ b/application/plugins/soap/controllers/Soap.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/stop_manager/controllers/Stop_manager.php b/application/plugins/stop_manager/controllers/Stop_manager.php index 83e149132..30dbd659a 100644 --- a/application/plugins/stop_manager/controllers/Stop_manager.php +++ b/application/plugins/stop_manager/controllers/Stop_manager.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/stop_manager/libraries/Config.php b/application/plugins/stop_manager/libraries/Config.php index f3cded0a9..cf3e8341f 100644 --- a/application/plugins/stop_manager/libraries/Config.php +++ b/application/plugins/stop_manager/libraries/Config.php @@ -6,7 +6,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ // ------------------------------------------------------------------------ diff --git a/application/plugins/stop_manager/libraries/MsgIncoming.php b/application/plugins/stop_manager/libraries/MsgIncoming.php index 1b7d7cf66..ff84006e3 100644 --- a/application/plugins/stop_manager/libraries/MsgIncoming.php +++ b/application/plugins/stop_manager/libraries/MsgIncoming.php @@ -6,7 +6,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ // ------------------------------------------------------------------------ diff --git a/application/plugins/stop_manager/libraries/MsgOutgoing.php b/application/plugins/stop_manager/libraries/MsgOutgoing.php index acf5ed6a8..5eb78c04a 100644 --- a/application/plugins/stop_manager/libraries/MsgOutgoing.php +++ b/application/plugins/stop_manager/libraries/MsgOutgoing.php @@ -6,7 +6,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ // ------------------------------------------------------------------------ diff --git a/application/plugins/stop_manager/models/Stop_manager_model.php b/application/plugins/stop_manager/models/Stop_manager_model.php index b83a296e6..5569e2694 100644 --- a/application/plugins/stop_manager/models/Stop_manager_model.php +++ b/application/plugins/stop_manager/models/Stop_manager_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/whitelist_number/controllers/Whitelist_number.php b/application/plugins/whitelist_number/controllers/Whitelist_number.php index 46539ab32..a05959754 100644 --- a/application/plugins/whitelist_number/controllers/Whitelist_number.php +++ b/application/plugins/whitelist_number/controllers/Whitelist_number.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/whitelist_number/models/Whitelist_number_model.php b/application/plugins/whitelist_number/models/Whitelist_number_model.php index e388ae48c..f83838574 100644 --- a/application/plugins/whitelist_number/models/Whitelist_number_model.php +++ b/application/plugins/whitelist_number/models/Whitelist_number_model.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/plugins/xmlrpc/controllers/Xmlrpc.php b/application/plugins/xmlrpc/controllers/Xmlrpc.php index 296aca6eb..403d3f73e 100644 --- a/application/plugins/xmlrpc/controllers/Xmlrpc.php +++ b/application/plugins/xmlrpc/controllers/Xmlrpc.php @@ -5,7 +5,7 @@ * * @package Kalkun * @author Kalkun Dev Team - * @license https://spdx.org/licenses/GPL-3.0-or-later.html + * @license https://spdx.org/licenses/GPL-2.0-or-later.html * @link https://kalkun.sourceforge.io/ */ diff --git a/application/views/main/base.php b/application/views/main/base.php index 5165342f5..c993879fc 100644 --- a/application/views/main/base.php +++ b/application/views/main/base.php @@ -27,7 +27,7 @@ :   - GPL-3.0-or-later + GPL-2.0-or-later :   diff --git a/composer.json b/composer.json index 2da8b4bf3..2874ba47c 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "kalkun-sms/kalkun", "description": "Kalkun SMS Manager", "type": "project", - "license": "GPL-3.0-or-later", + "license": "GPL-2.0-or-later", "require": { "php": ">=5.6", "ext-ctype": "*", diff --git a/docs/README.md b/docs/README.md index f1a2593ec..8b1f4df39 100644 --- a/docs/README.md +++ b/docs/README.md @@ -72,4 +72,4 @@ Please check the wiki [contribution suggestions](https://github.com/kalkun-sms/K See the [documentation on the Wiki](https://github.com/kalkun-sms/Kalkun/wiki) ### License -Kalkun is licensed under GPL-3-or-later. +Kalkun is licensed under [GPL-2.0-or-later](https://spdx.org/licenses/GPL-2.0-or-later.html). diff --git a/utils/check_translation.php b/utils/check_translation.php index 8aed2b014..830b21a32 100755 --- a/utils/check_translation.php +++ b/utils/check_translation.php @@ -5,7 +5,7 @@ /** * This is part of kalkun - a web based SMS manager * Copyright: 2021 Fab Stz - * License: GPL-3-or-later + * License: GPL-2.0-or-later * * This script will recursively check the PHP files in a directory for * translation inconsistencies