Lemuel/Joomla-Sermon-Distributor-Fork
1
0
Fork 0
forked from christian/Joomla-Sermon-Distributor
Code Pull Requests Activity

Update on v5.0.0-beta1 (beta for next version)

Browse Source 
Here's an update on the current version, which includes changes towards the next release still in beta.
This commit is contained in:
Robot 2024-03-07 19:23:52 +02:00
parent 806fedaee2
commit 907e9b8d8f
Signed by untrusted user: Robot
GPG Key ID: 14DECD44E7E1BB95
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,6 +1,6 @@
# v5.0.0-beta1 # v5.0.0-beta1
- First release of [[[Component]]] towards Joomla 5 - First release of Sermon Distributor towards Joomla 5
# v3.0.3 # v3.0.3

2
README.md
View File

@ -24,7 +24,7 @@ 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) + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
+ *Name*: [Sermon Distributor](https://www.vdm.io/) + *Name*: [Sermon Distributor](https://www.vdm.io/)
+ *First Build*: 22nd October, 2015 + *First Build*: 22nd October, 2015
+ *Last Build*: 2nd March, 2024 + *Last Build*: 7th March, 2024
+ *Version*: 5.0.x + *Version*: 5.0.x
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html

2
admin/README.txt
View File

@ -24,7 +24,7 @@ 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) + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
+ *Name*: [Sermon Distributor](https://www.vdm.io/) + *Name*: [Sermon Distributor](https://www.vdm.io/)
+ *First Build*: 22nd October, 2015 + *First Build*: 22nd October, 2015
+ *Last Build*: 2nd March, 2024 + *Last Build*: 7th March, 2024
+ *Version*: 5.0.x + *Version*: 5.0.x
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html

4
admin/src/Model/AjaxModel.php
View File

@ -282,11 +282,11 @@ class AjaxModel extends ListModel
$result['error'] = '<span style="color: red;">' . Text::sprintf('COM_SERMONDISTRIBUTOR_NO_CRONJOB_PATH_FOUND_FOR_S', $type) . '</span>'; $result['error'] = '<span style="color: red;">' . Text::sprintf('COM_SERMONDISTRIBUTOR_NO_CRONJOB_PATH_FOUND_FOR_S', $type) . '</span>';
if ($this->hasCurl()) if ($this->hasCurl())
{ {
$path = '*/15 * * * * curl -s "' .JURI::root() . 'index.php?option=com_sermondistributor&task=api.externalUpdate" >/dev/null 2>&1'; $path = '*/15 * * * * curl -s "' .\JUri::root() . 'index.php?option=com_sermondistributor&task=api.externalUpdate" >/dev/null 2>&1';
} }
else else
{ {
$path = '*/15 * * * * wget "' .JURI::root() . 'index.php?option=com_sermondistributor&task=api.externalUpdate" >/dev/null 2>&1'; $path = '*/15 * * * * wget "' .\JUri::root() . 'index.php?option=com_sermondistributor&task=api.externalUpdate" >/dev/null 2>&1';
} }
$result['path'] = '<code>' . $path . '</code>'; $result['path'] = '<code>' . $path . '</code>';
} }

2
admin/tmpl/manual_updater/default.php
View File

@ -130,7 +130,7 @@ jQuery(document).ready(function($) {
</div> </div>
<script> <script>
// token // token
var token = '<?php echo JSession::getFormToken(); ?>'; var token = '<?php echo \JSession::getFormToken(); ?>';
// nice little dot trick :) // nice little dot trick :)
jQuery(document).ready( function($) { jQuery(document).ready( function($) {
var x=0; var x=0;

10
libraries/jcb_powers/VDM.Joomla/src/Utilities/Component/Helper.php
View File

@ -79,12 +79,12 @@ abstract class Helper
/** /**
* Set the component option * Set the component option
* *
* @param string $option The option * @param string|null $option The option
* *
* @return void * @return void
* @since 3.2.0 * @since 3.2.0
*/ */
public static function setOption(string $option): void public static function setOption(?string $option): void
{ {
self::$option = $option; self::$option = $option;
} }
@ -97,7 +97,7 @@ abstract class Helper
* @return string|null A component option * @return string|null A component option
* @since 3.0.11 * @since 3.0.11
*/ */
public static function getOption(string $default = 'empty'): ?string public static function getOption(?string $default = 'empty'): ?string
{ {
if (empty(self::$option)) if (empty(self::$option))
{ {
@ -160,7 +160,7 @@ abstract class Helper
* *
* @since 3.0.11 * @since 3.0.11
*/ */
public static function get(string $option = null, string $default = null): ?string public static function get(?string $option = null, ?string $default = null): ?string
{ {
// check that we have an option // check that we have an option
// and get the code name from it // and get the code name from it
@ -260,7 +260,7 @@ abstract class Helper
* *
* @since 3.0.11 * @since 3.0.11
*/ */
public static function methodExists(string $method, string $option = null): bool public static function methodExists(string $method, ?string $option = null): bool
{ {
// get the helper class // get the helper class
return ($helper = self::get($option, null)) !== null && return ($helper = self::get($option, null)) !== null &&

6
sermondistributor.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<extension type="component" version="4.0" method="upgrade"> <extension type="component" version="5.0" method="upgrade">
<name>COM_SERMONDISTRIBUTOR</name> <name>COM_SERMONDISTRIBUTOR</name>
<creationDate>2nd March, 2024</creationDate> <creationDate>7th March, 2024</creationDate>
<author>Llewellyn van der Merwe</author> <author>Llewellyn van der Merwe</author>
<authorEmail>joomla@vdm.io</authorEmail> <authorEmail>joomla@vdm.io</authorEmail>
<authorUrl>https://www.vdm.io/</authorUrl> <authorUrl>https://www.vdm.io/</authorUrl>
@ -97,6 +97,6 @@
</administration> </administration>
<updateservers> <updateservers>
<server type="extension" enabled="1" element="com_sermondistributor" name="Sermon Distributor">https://git.vdm.dev/christian/Joomla-Sermon-Distributor/raw/branch/5.0/sermondistributor_update_server.xml</server> <server type="extension" enabled="1" element="com_sermondistributor" name="Sermon Distributor">https://git.vdm.dev/christian/Joomla-Sermon-Distributor/raw/branch/5.x/sermondistributor_update_server.xml</server>
</updateservers> </updateservers>
</extension> </extension>

2
site/src/Controller/ApiController.php
View File

@ -159,7 +159,7 @@ class ApiController extends FormController
protected function getApiUser() protected function getApiUser()
{ {
// get params // get params
$params = JComponentHelper::getParams('com_sermondistributor'); $params = \JComponentHelper::getParams('com_sermondistributor');
// return user object // return user object
return Factory::getUser($params->get('api', 0, 'INT')); return Factory::getUser($params->get('api', 0, 'INT'));
} }

2
site/tmpl/sermon/default.php
View File

@ -75,7 +75,7 @@ defined('_JEXEC') or die;
} }
<?php if (1 == $this->item->playerKey) : ?> <?php if (1 == $this->item->playerKey) : ?>
soundManager.setup({ soundManager.setup({
url: '<?php echo JURI::root(true); ?>/media/com_sermondistributor/soundmanager/swf', url: '<?php echo \JUri::root(true); ?>/media/com_sermondistributor/soundmanager/swf',
flashVersion: 9, flashVersion: 9,
onready: function() { onready: function() {
// Ready to use; soundManager.createSound() etc. can now be called. // Ready to use; soundManager.createSound() etc. can now be called.