diff --git a/.octojpack b/.octojpack new file mode 100644 index 00000000..99db9f33 --- /dev/null +++ b/.octojpack @@ -0,0 +1,69 @@ +{ + "global": { + "packager": "Vast Development Method", + "packager_url": "https://dev.vdm.io/", + "url": "git.vdm.dev", + "api": "https://git.vdm.dev/api/v1" + }, + "package": { + "name": "PKG_SERMONDISTRIBUTOR", + "code_name": "sermondistributor", + "package_name": "pkg_sermondistributor", + "min_joomla_version": "3.8", + "max_joomla_version": "3.10", + "copyright": "Copyright (C) 2015 Llewellyn van der Merwe. All rights reserved.", + "copyright_year": "2015", + "license": "GNU General Public License version 2; see LICENSE", + "license_file": "LICENSE", + "author": "Llewellyn van der Merwe", + "author_email": "joomla@vdm.io", + "author_url": "https://io.vdm.dev/", + "description": "The Sermon Distributor.", + "version_id": "com_sermondistributor", + "update_servers": "https://git.vdm.dev/christian/Joomla-Sermon-Distributor/raw/branch/master/sermondistributor_update_server.xml" + }, + "repository": { + "owner": "christian", + "repo": "pkg-sermondistributor" + }, + "files": [ + { + "owner": "christian", + "repo": "Joomla-Sermon-Distributor", + "id": "com_sermondistributor", + "type": "component", + "mode": "master" + }, + { + "owner": "christian", + "repo": "mod_dailylight", + "id": "mod_dailylight", + "type": "module", + "client": "site", + "mode": "master" + }, + { + "owner": "christian", + "repo": "mod_dailyscripture", + "id": "mod_dailyscripture", + "type": "module", + "client": "site", + "mode": "master" + } + ], + "languages": [ + { + "tag": "en-GB", + "ini": "sys.ini", + "key": "PKG_SERMONDISTRIBUTOR", + "value": "Sermon Distributor Package" + }, + { + "tag": "en-GB", + "ini": "ini", + "key": "PKG_SERMONDISTRIBUTOR", + "value": "Sermon Distributor Package" + } + ] +} + diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..93439eb3 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,3 @@ +# v2.1.1 + +- Moved over to a Joomla Package \ No newline at end of file diff --git a/README.md b/README.md index 0286478c..d5b2c31e 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # Sermon Distributor (2.1.x) - ![Sermon Distributor image](https://raw.githubusercontent.com/Llewellynvdm/Joomla-Sermon-Distributor/master/admin/assets/images/vdm-component.jpg "The Sermon Distributor") + ![Sermon Distributor image](https://git.vdm.dev/christian/Joomla-Sermon-Distributor/raw/branch/master/admin/assets/images/vdm-component.jpg "The Sermon Distributor") Distributor is a highly advanced sermon distributor that runs on the [Joomla 3.x](http://www.joomla.org) framework. You can link a shared folder from Dropbox to the component and use Dropbox as your file host, not to mention the advanced auto builder that gives you the ability to simply load sermons to your website by only adding them to Dropbox. -The best way to see all your options is to install this component on you Joomla website and test all features yourself. Here is a [direct download link](https://github.com/SermonDistributor/Joomla-3-Component/archive/master.zip) +The best way to see all your options is to install this component on you Joomla website and test all features yourself. Here is a [direct download link](https://git.vdm.dev/christian/Joomla-Sermon-Distributor/archive/master.zip) **If you like our component please rate it on the [Joomla Index](http://extensions.joomla.org/extensions/extension/living/religion/sermon-distributor)** @@ -24,74 +24,38 @@ The best way to see all your options is to install this component on you Joomla + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Sermon Distributor](https://www.vdm.io/) + *First Build*: 22nd October, 2015 -+ *Last Build*: 27th May, 2022 ++ *Last Build*: 29th May, 2023 + *Version*: 2.1.x + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html ## Build Time :hourglass: -**206 Hours** or **26 Eight Hour Days** (actual time the author saved - -due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder)) +**210 Hours** or **26 Eight Hour Days** (actual time the author saved - +due to [Automated Component Builder](https://www.joomlacomponentbuilder.com)) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > never making one mistake or taking any coffee break.) -+ *Line count*: **74036** -+ *File count*: **472** -+ *Folder count*: **99** ++ *Line count*: **75271** ++ *File count*: **486** ++ *Folder count*: **105** -**137 Hours** or **17 Eight Hour Days** (the actual time the author spent) +**138 Hours** or **18 Eight Hour Days** (the actual time the author spent) > (with the following break down: > **debugging @52hours** = codingtime / 4; -> **planning @29hours** = codingtime / 7; +> **planning @30hours** = codingtime / 7; > **mapping @21hours** = codingtime / 10; -> **office @34hours** = codingtime / 6;) +> **office @35hours** = codingtime / 6;) -**343 Hours** or **43 Eight Hour Days** +**348 Hours** or **44 Eight Hour Days** (a total of the realistic time frame for this project) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > with the normal everyday realities at the office, that includes the component planning, mapping & debugging.) -Project duration: **8.6 weeks** or **1.8 months** - -> This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). -> Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) - - -## Contributors -This project exists thanks to all the people who contribute to the [Joomla Component Builder Project](https://github.com/vdm-io/Joomla-Component-Builder). - -[![Contributors](https://opencollective.com/Joomla-Component-Builder/contributors.svg?width=890&button=false)](https://github.com/vdm-io/Joomla-Component-Builder/graphs/contributors) - -### Backers -Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/Joomla-Component-Builder#backer)] - -[![Our Backers on opencollective](https://opencollective.com/Joomla-Component-Builder/backers.svg?width=890)](https://opencollective.com/Joomla-Component-Builder#backers) - -### Sponsors -Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/Joomla-Component-Builder#sponsor)] - -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/0/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/0/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/1/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/1/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/2/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/2/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/3/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/3/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/4/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/4/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/5/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/5/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/6/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/6/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/7/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/7/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/8/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/8/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/9/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/9/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/10/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/10/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/11/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/11/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/12/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/12/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/13/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/13/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/14/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/14/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/15/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/15/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/16/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/16/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/17/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/17/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/18/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/18/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/19/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/19/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/20/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/20/website) \ No newline at end of file +Project duration: **8.8 weeks** or **1.8 months** + +> This **component** was build with a Joomla [Automated Component Builder](https://www.joomlacomponentbuilder.com). +> Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) \ No newline at end of file diff --git a/admin/README.txt b/admin/README.txt index 0286478c..d5b2c31e 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -1,10 +1,10 @@ # Sermon Distributor (2.1.x) - ![Sermon Distributor image](https://raw.githubusercontent.com/Llewellynvdm/Joomla-Sermon-Distributor/master/admin/assets/images/vdm-component.jpg "The Sermon Distributor") + ![Sermon Distributor image](https://git.vdm.dev/christian/Joomla-Sermon-Distributor/raw/branch/master/admin/assets/images/vdm-component.jpg "The Sermon Distributor") Distributor is a highly advanced sermon distributor that runs on the [Joomla 3.x](http://www.joomla.org) framework. You can link a shared folder from Dropbox to the component and use Dropbox as your file host, not to mention the advanced auto builder that gives you the ability to simply load sermons to your website by only adding them to Dropbox. -The best way to see all your options is to install this component on you Joomla website and test all features yourself. Here is a [direct download link](https://github.com/SermonDistributor/Joomla-3-Component/archive/master.zip) +The best way to see all your options is to install this component on you Joomla website and test all features yourself. Here is a [direct download link](https://git.vdm.dev/christian/Joomla-Sermon-Distributor/archive/master.zip) **If you like our component please rate it on the [Joomla Index](http://extensions.joomla.org/extensions/extension/living/religion/sermon-distributor)** @@ -24,74 +24,38 @@ The best way to see all your options is to install this component on you Joomla + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Sermon Distributor](https://www.vdm.io/) + *First Build*: 22nd October, 2015 -+ *Last Build*: 27th May, 2022 ++ *Last Build*: 29th May, 2023 + *Version*: 2.1.x + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html ## Build Time :hourglass: -**206 Hours** or **26 Eight Hour Days** (actual time the author saved - -due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder)) +**210 Hours** or **26 Eight Hour Days** (actual time the author saved - +due to [Automated Component Builder](https://www.joomlacomponentbuilder.com)) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > never making one mistake or taking any coffee break.) -+ *Line count*: **74036** -+ *File count*: **472** -+ *Folder count*: **99** ++ *Line count*: **75271** ++ *File count*: **486** ++ *Folder count*: **105** -**137 Hours** or **17 Eight Hour Days** (the actual time the author spent) +**138 Hours** or **18 Eight Hour Days** (the actual time the author spent) > (with the following break down: > **debugging @52hours** = codingtime / 4; -> **planning @29hours** = codingtime / 7; +> **planning @30hours** = codingtime / 7; > **mapping @21hours** = codingtime / 10; -> **office @34hours** = codingtime / 6;) +> **office @35hours** = codingtime / 6;) -**343 Hours** or **43 Eight Hour Days** +**348 Hours** or **44 Eight Hour Days** (a total of the realistic time frame for this project) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > with the normal everyday realities at the office, that includes the component planning, mapping & debugging.) -Project duration: **8.6 weeks** or **1.8 months** - -> This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). -> Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) - - -## Contributors -This project exists thanks to all the people who contribute to the [Joomla Component Builder Project](https://github.com/vdm-io/Joomla-Component-Builder). - -[![Contributors](https://opencollective.com/Joomla-Component-Builder/contributors.svg?width=890&button=false)](https://github.com/vdm-io/Joomla-Component-Builder/graphs/contributors) - -### Backers -Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/Joomla-Component-Builder#backer)] - -[![Our Backers on opencollective](https://opencollective.com/Joomla-Component-Builder/backers.svg?width=890)](https://opencollective.com/Joomla-Component-Builder#backers) - -### Sponsors -Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/Joomla-Component-Builder#sponsor)] - -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/0/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/0/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/1/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/1/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/2/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/2/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/3/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/3/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/4/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/4/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/5/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/5/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/6/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/6/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/7/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/7/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/8/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/8/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/9/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/9/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/10/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/10/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/11/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/11/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/12/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/12/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/13/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/13/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/14/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/14/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/15/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/15/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/16/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/16/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/17/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/17/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/18/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/18/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/19/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/19/website) -[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/20/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/20/website) \ No newline at end of file +Project duration: **8.8 weeks** or **1.8 months** + +> This **component** was build with a Joomla [Automated Component Builder](https://www.joomlacomponentbuilder.com). +> Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) \ No newline at end of file diff --git a/admin/helpers/sermondistributor.php b/admin/helpers/sermondistributor.php index 914fc851..beee197d 100644 --- a/admin/helpers/sermondistributor.php +++ b/admin/helpers/sermondistributor.php @@ -25,6 +25,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Filesystem\File; use Joomla\CMS\Language\Language; use Joomla\Registry\Registry; use Joomla\String\StringHelper; @@ -32,7 +33,6 @@ use PhpOffice\PhpSpreadsheet\IOFactory; use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Writer\Xlsx; -use Joomla\CMS\Filesystem\File; use Joomla\CMS\Filesystem\Folder; /** @@ -94,30 +94,34 @@ abstract class SermondistributorHelper **/ protected static $updateErrors = array(); - /** - * prepare base64 string for url - **/ - public static function base64_urlencode($string, $encode = false) - { - if ($encode) - { - $string = base64_encode($string); - } - return str_replace(array('+', '/'), array('-', '_'), $string); - } - - /** - * prepare base64 string form url - **/ - public static function base64_urldecode($string, $decode = false) - { - $string = str_replace(array('-', '_'), array('+', '/'), $string); - if ($decode) - { - $string = base64_decode($string); - } - return $string; - } + /** + * prepare base64 string for url + * + * @deprecate Use urlencode(); + */ + public static function base64_urlencode($string, $encode = false) + { + if ($encode) + { + $string = base64_encode($string); + } + return str_replace(array('+', '/'), array('-', '_'), $string); + } + + /** + * prepare base64 string form url + * + * @deprecate + */ + public static function base64_urldecode($string, $decode = false) + { + $string = str_replace(array('-', '_'), array('+', '/'), $string); + if ($decode) + { + $string = base64_decode($string); + } + return $string; + } /** * get Download links of a sermon diff --git a/admin/language/en-GB/en-GB.com_sermondistributor.ini b/admin/language/en-GB/en-GB.com_sermondistributor.ini index 03ce1b09..85b198d3 100644 --- a/admin/language/en-GB/en-GB.com_sermondistributor.ini +++ b/admin/language/en-GB/en-GB.com_sermondistributor.ini @@ -315,8 +315,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SPACED="Spaced" COM_SERMONDISTRIBUTOR_CONFIG_STRIPED="Striped" COM_SERMONDISTRIBUTOR_CONFIG_TABLE="Table" COM_SERMONDISTRIBUTOR_CONFIG_UIKIT="Uikit" -COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_DESC="The Parameters for the uikit are set here.
Uikit is a lightweight and modular front-end framework -for developing fast and powerful web interfaces. For more info visit version 2 or version 3" +COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_DESC="The Parameters for the uikit are set here.
Uikit is a lightweight and modular front-end frameworkfor developing fast and powerful web interfaces. For more info visit version 2 or version 3" COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_LABEL="Uikit2 and Uikit3 Settings" COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_LOAD_DESC="Set the uikit loading option." COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_LOAD_LABEL="Loading Options" @@ -417,58 +416,7 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_SUBMENU="External Sources Submenu" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_SUBMENU_DESC="Allows the users in this group to submenu of external source" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_3G2=".3g2" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_3GP=".3gp" -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_APICRONJOB_NOTE_DESCRIPTION="You must setup a cronjob that will update your local listing with the external sources.

USE THE FOLLOWING: loading...

Please note that if your Joomla website has a Firewall installed, it will not allow cronjob via direct URL (most of the time), you will then need to adapt the cornjob request to look like a browser. For more info please read https://stackoverflow.com/a/31597823/1429677 -" +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_APICRONJOB_NOTE_DESCRIPTION="You must setup a cronjob that will update your local listing with the external sources.

USE THE FOLLOWING: loading...

Please note that if your Joomla website has a Firewall installed, it will not allow cronjob via direct URL (most of the time), you will then need to adapt the cornjob request to look like a browser. For more info please read https://stackoverflow.com/a/31597823/1429677" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_APICRONJOB_NOTE_LABEL="API CronJob" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_APP_FOLDER="App folder" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_APP_LIMITATION_NOTE_DESCRIPTION="Please Note: There is a limitation of 3000 files per app/folder" @@ -524,84 +472,9 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_MP3=".mp3" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_MP4=".mp4" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_MPG=".mpg" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NEW="A New External Source" -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_AUTO_EXTERNALSOURCE_DESCRIPTION="To integrate auto External Source with your system you need to do the following: -" +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_AUTO_EXTERNALSOURCE_DESCRIPTION="To integrate auto External Source with your system you need to do the following: " COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_AUTO_EXTERNALSOURCE_LABEL="External Source Integration" -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_MANUAL_EXTERNALSOURCE_DESCRIPTION="To integrate manual External Source option with your system you need to do the following: - " +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_MANUAL_EXTERNALSOURCE_DESCRIPTION="To integrate manual External Source option with your system you need to do the following: " COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_MANUAL_EXTERNALSOURCE_LABEL="External Source Integration" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOT_REQUIRED="Not Required" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_OAUTHTOKEN_DESCRIPTION="By using an access token, the system will be able to make automatic API calls to your app without going through the authorization flow.
This field is being kept encrypted in the database.
Yet Joomla back-end must be access with SSL in-place when saving this page. This will help avoid a man in the middle attach on your access token." @@ -1311,89 +1184,13 @@ COM_SERMONDISTRIBUTOR_SERMON_NAME_HINT="Name Here" COM_SERMONDISTRIBUTOR_SERMON_NAME_LABEL="Name" COM_SERMONDISTRIBUTOR_SERMON_NAME_MESSAGE="Error! Please add name here." COM_SERMONDISTRIBUTOR_SERMON_NEW="A New Sermon" -COM_SERMONDISTRIBUTOR_SERMON_NOTE_AUTO_EXTERNALSOURCE_DESCRIPTION="To integrate auto External Source with your system you need to do the following: -Make sure you have at least one auto folder in External Source and have added the information in the Sermon Distributors " +COM_SERMONDISTRIBUTOR_SERMON_NOTE_AUTO_EXTERNALSOURCE_DESCRIPTION="To integrate auto External Source with your system you need to do the following: Make sure you have at least one auto folder in External Source and have added the information in the Sermon Distributors " COM_SERMONDISTRIBUTOR_SERMON_NOTE_AUTO_EXTERNALSOURCE_LABEL="External Source Integration" COM_SERMONDISTRIBUTOR_SERMON_NOTE_LINK_DIRECTED_DESCRIPTION="This link option does not allow counting of the downloads of this file, and does not secures the download location of this file. Other can reuse it by adding it to their own websites, this action is called hotlinking, leeching, piggy-backing." COM_SERMONDISTRIBUTOR_SERMON_NOTE_LINK_DIRECTED_LABEL="The Direct Link Option" COM_SERMONDISTRIBUTOR_SERMON_NOTE_LINK_ENCRYPTED_DESCRIPTION="This link option allows for counting of all downloads of this file, and secures the download location of this file. The download link also prevents other from reusing the link outside of your website if they are not in the same session." COM_SERMONDISTRIBUTOR_SERMON_NOTE_LINK_ENCRYPTED_LABEL="The Encrypted Link Option" -COM_SERMONDISTRIBUTOR_SERMON_NOTE_MANUAL_EXTERNALSOURCE_DESCRIPTION="To integrate manual External Source option with your system you need to do the following: - -Make sure you have at least one manual folder in External Source and have added the shared link in the Sermon Distributor " +COM_SERMONDISTRIBUTOR_SERMON_NOTE_MANUAL_EXTERNALSOURCE_DESCRIPTION="To integrate manual External Source option with your system you need to do the following: Make sure you have at least one manual folder in External Source and have added the shared link in the Sermon Distributor " COM_SERMONDISTRIBUTOR_SERMON_NOTE_MANUAL_EXTERNALSOURCE_LABEL="External Source Integration" COM_SERMONDISTRIBUTOR_SERMON_NOT_REQUIRED="Not Required" COM_SERMONDISTRIBUTOR_SERMON_ORDERING_LABEL="Ordering" diff --git a/admin/models/external_source.php b/admin/models/external_source.php index 218dc769..ed46cdc8 100644 --- a/admin/models/external_source.php +++ b/admin/models/external_source.php @@ -111,7 +111,7 @@ public function getTable($type = 'external_source', $prefix = 'Sermondistributor public function clearLocalListing($id) { - // clear local listing + // clear local listings if ($id > 0) { $db = JFactory::getDbo(); @@ -181,7 +181,8 @@ public function resetUpdateStatus($id) return array('error' => JText::_('COM_SERMONDISTRIBUTOR_THERE_IS_NO_TARGETS_SET_FOR_THIS_SOURCE_CAN_NOT_RESET_THE_UPDATE_STATUS')); } return array('error' => JText::_('COM_SERMONDISTRIBUTOR_NO_ID_FOUND_CAN_NOT_RESET_THE_UPDATE_STATUS')); - } + } + /** * Method to get a single record. diff --git a/admin/models/forms/help_document.xml b/admin/models/forms/help_document.xml index e386a6ac..0c309dc7 100644 --- a/admin/models/forms/help_document.xml +++ b/admin/models/forms/help_document.xml @@ -229,7 +229,6 @@ label="COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_URL_LABEL" size="60" maxlength="150" - default="" description="COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_URL_DESCRIPTION" class="text_area" required="true" diff --git a/admin/models/forms/preacher.xml b/admin/models/forms/preacher.xml index 92179475..14881dfe 100644 --- a/admin/models/forms/preacher.xml +++ b/admin/models/forms/preacher.xml @@ -120,6 +120,8 @@ maxlength="150" description="COM_SERMONDISTRIBUTOR_PREACHER_NAME_DESCRIPTION" class="text_area" + readonly="false" + disabled="false" required="true" filter="STRING" message="COM_SERMONDISTRIBUTOR_PREACHER_NAME_MESSAGE" diff --git a/admin/models/forms/series.xml b/admin/models/forms/series.xml index 7aad52ab..b88debda 100644 --- a/admin/models/forms/series.xml +++ b/admin/models/forms/series.xml @@ -120,6 +120,8 @@ maxlength="150" description="COM_SERMONDISTRIBUTOR_SERIES_NAME_DESCRIPTION" class="text_area" + readonly="false" + disabled="false" required="true" filter="STRING" message="COM_SERMONDISTRIBUTOR_SERIES_NAME_MESSAGE" diff --git a/admin/models/forms/sermon.xml b/admin/models/forms/sermon.xml index 7e522d32..44550ea6 100644 --- a/admin/models/forms/sermon.xml +++ b/admin/models/forms/sermon.xml @@ -120,6 +120,8 @@ maxlength="150" description="COM_SERMONDISTRIBUTOR_SERMON_NAME_DESCRIPTION" class="text_area" + readonly="false" + disabled="false" required="true" filter="STRING" message="COM_SERMONDISTRIBUTOR_SERMON_NAME_MESSAGE" diff --git a/admin/models/import.php b/admin/models/import.php index e1bc61a4..8171a98c 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -31,7 +31,7 @@ use Joomla\Utilities\ArrayHelper; use PhpOffice\PhpSpreadsheet\IOFactory; -/** +/*** * Sermondistributor Import Base Database Model */ class SermondistributorModelImport extends BaseDatabaseModel diff --git a/admin/sql/updates/mysql/2.1.0.sql b/admin/sql/updates/mysql/2.1.0.sql new file mode 100644 index 00000000..9470d3da --- /dev/null +++ b/admin/sql/updates/mysql/2.1.0.sql @@ -0,0 +1,3 @@ +ALTER TABLE `#__sermondistributor_external_source` ENGINE = InnoDB; + +ALTER TABLE `#__sermondistributor_external_source` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; diff --git a/admin/views/preachers/tmpl/default_body.php b/admin/views/preachers/tmpl/default_body.php index 071ae972..63478792 100644 --- a/admin/views/preachers/tmpl/default_body.php +++ b/admin/views/preachers/tmpl/default_body.php @@ -84,7 +84,7 @@
- escape($item->description); ?> + escape($item->description); ?>
escape($item->email); ?>
diff --git a/admin/views/sermondistributor/tmpl/default_vdm.php b/admin/views/sermondistributor/tmpl/default_vdm.php index 3b4a6a98..fded7c0a 100644 --- a/admin/views/sermondistributor/tmpl/default_vdm.php +++ b/admin/views/sermondistributor/tmpl/default_vdm.php @@ -28,7 +28,7 @@ ?> <?php echo JText::_('COM_SERMONDISTRIBUTOR'); ?>