Release of v1.2.0

This commit is contained in:
Robot 2023-11-10 10:28:35 +02:00
parent a38986cd95
commit 95a8c1bdb8
Signed by: Robot
GPG Key ID: 14DECD44E7E1BB95
6 changed files with 64 additions and 11 deletions

View File

@ -1,4 +1,4 @@
# Dailyscripture (1.1.5) # Dailyscripture (1.2.0)
Display the daily scripture from [https://git.vdm.dev/christian/daily-scripture](https://git.vdm.dev/christian/daily-scripture). Display the daily scripture from [https://git.vdm.dev/christian/daily-scripture](https://git.vdm.dev/christian/daily-scripture).
@ -10,8 +10,8 @@ Display the daily scripture from [https://git.vdm.dev/christian/daily-scripture]
+ *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
+ *Name*: [Dailyscripture](https://getbible.net) + *Name*: [Dailyscripture](https://getbible.net)
+ *First Build*: 3rd December, 2015 + *First Build*: 3rd December, 2015
+ *Last Build*: 9th November, 2023 + *Last Build*: 10th November, 2023
+ *Version*: 1.1.5 + *Version*: 1.2.0
+ *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

View File

@ -147,6 +147,10 @@ class ModDailyScriptureHelper
{ {
return $this->scripture->{$key}; return $this->scripture->{$key};
} }
elseif ($this->type == 1 && $key === 'local_link')
{
return $this->getLocalLink();
}
elseif ($this->type == 2 && $key === 'telegram') elseif ($this->type == 2 && $key === 'telegram')
{ {
return $this->getTelegram(); return $this->getTelegram();
@ -159,6 +163,25 @@ class ModDailyScriptureHelper
return null; return null;
} }
/**
* get the local link
*
* @return string|null
*
* @since 1.2
*/
protected function getLocalLink(): ?string
{
if (($link = $this->params->get('local_link')) === null ||
empty($this->version) || empty($this->book) ||
empty($this->chapter) || empty($this->verse))
{
return null;
}
return "$link/{$this->version}/{$this->book}/{$this->chapter}/{$this->verse}";
}
/** /**
* get the Telegram script * get the Telegram script
* *

View File

@ -1,6 +1,6 @@
MOD_DAILYSCRIPTURE="Dailyscripture" MOD_DAILYSCRIPTURE="Dailyscripture"
MOD_DAILYSCRIPTURE_DESCRIPTION="A Joomla Module to Display the Daily Scripture." MOD_DAILYSCRIPTURE_DESCRIPTION="A Joomla Module to Display the Daily Scripture."
MOD_DAILYSCRIPTURE_XML_DESCRIPTION="<h1>Dailyscripture (v.1.1.5)</h1> <div style='clear: both;'></div><p>A Joomla Module to Display the Daily Scripture.</p><p>Created by <a href='https://getbible.net' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 1st January, 2022</small></p>" MOD_DAILYSCRIPTURE_XML_DESCRIPTION="<h1>Dailyscripture (v.1.2.0)</h1> <div style='clear: both;'></div><p>A Joomla Module to Display the Daily Scripture.</p><p>Created by <a href='https://getbible.net' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 1st January, 2022</small></p>"
MOD_DAILYSCRIPTURE_THERE_WAS_AN_ERROR_LOADING_THE_DAILY_SCRIPTURE_PLEASE_TRY_AGAIN_LATTER="There was an error loading the Daily Scripture, please try again latter." MOD_DAILYSCRIPTURE_THERE_WAS_AN_ERROR_LOADING_THE_DAILY_SCRIPTURE_PLEASE_TRY_AGAIN_LATTER="There was an error loading the Daily Scripture, please try again latter."
MOD_DAILYSCRIPTURE_DAILY_SCRIPTURE="Daily Scripture" MOD_DAILYSCRIPTURE_DAILY_SCRIPTURE="Daily Scripture"
MOD_DAILYSCRIPTURE_TYPE_LABEL="Implementation Type" MOD_DAILYSCRIPTURE_TYPE_LABEL="Implementation Type"
@ -18,8 +18,13 @@ MOD_DAILYSCRIPTURE_COMMENTS_HEIGHT_DESCRIPTION="Use 300 for auto height. Any hig
MOD_DAILYSCRIPTURE_LINK_LABEL="Show Link" MOD_DAILYSCRIPTURE_LINK_LABEL="Show Link"
MOD_DAILYSCRIPTURE_LINK_DESCRIPTION="Should we show a link." MOD_DAILYSCRIPTURE_LINK_DESCRIPTION="Should we show a link."
MOD_DAILYSCRIPTURE_GETBIBLE="GetBible" MOD_DAILYSCRIPTURE_GETBIBLE="GetBible"
MOD_DAILYSCRIPTURE_LOCAL_GETBIBLE="Local GetBible"
MOD_DAILYSCRIPTURE_TELEGRAM="Telegram" MOD_DAILYSCRIPTURE_TELEGRAM="Telegram"
MOD_DAILYSCRIPTURE_NONE="None" MOD_DAILYSCRIPTURE_NONE="None"
MOD_DAILYSCRIPTURE_LOCAL_LINK_LABEL="Local getBible Link"
MOD_DAILYSCRIPTURE_LOCAL_LINK_DESCRIPTION="The link to the local getBible app page."
MOD_DAILYSCRIPTURE_LOCAL_LINK_MESSAGE="Error! Please add some local getBible link here."
MOD_DAILYSCRIPTURE_LOCAL_LINK_HINT="https://truechristian.church/scriptures"
MOD_DAILYSCRIPTURE_WIDTH_LABEL="Width" MOD_DAILYSCRIPTURE_WIDTH_LABEL="Width"
MOD_DAILYSCRIPTURE_AUTHOR_PHOTO_LABEL="Author Photo" MOD_DAILYSCRIPTURE_AUTHOR_PHOTO_LABEL="Author Photo"
MOD_DAILYSCRIPTURE_AUTO="Auto" MOD_DAILYSCRIPTURE_AUTO="Auto"

View File

@ -1,6 +1,6 @@
MOD_DAILYSCRIPTURE="Dailyscripture" MOD_DAILYSCRIPTURE="Dailyscripture"
MOD_DAILYSCRIPTURE_DESCRIPTION="A Joomla Module to Display the Daily Scripture." MOD_DAILYSCRIPTURE_DESCRIPTION="A Joomla Module to Display the Daily Scripture."
MOD_DAILYSCRIPTURE_XML_DESCRIPTION="<h1>Dailyscripture (v.1.1.5)</h1> <div style='clear: both;'></div><p>A Joomla Module to Display the Daily Scripture.</p><p>Created by <a href='https://getbible.net' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 1st January, 2022</small></p>" MOD_DAILYSCRIPTURE_XML_DESCRIPTION="<h1>Dailyscripture (v.1.2.0)</h1> <div style='clear: both;'></div><p>A Joomla Module to Display the Daily Scripture.</p><p>Created by <a href='https://getbible.net' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 1st January, 2022</small></p>"
MOD_DAILYSCRIPTURE_THERE_WAS_AN_ERROR_LOADING_THE_DAILY_SCRIPTURE_PLEASE_TRY_AGAIN_LATTER="There was an error loading the Daily Scripture, please try again latter." MOD_DAILYSCRIPTURE_THERE_WAS_AN_ERROR_LOADING_THE_DAILY_SCRIPTURE_PLEASE_TRY_AGAIN_LATTER="There was an error loading the Daily Scripture, please try again latter."
MOD_DAILYSCRIPTURE_DAILY_SCRIPTURE="Daily Scripture" MOD_DAILYSCRIPTURE_DAILY_SCRIPTURE="Daily Scripture"
MOD_DAILYSCRIPTURE_TYPE_LABEL="Implementation Type" MOD_DAILYSCRIPTURE_TYPE_LABEL="Implementation Type"
@ -18,8 +18,13 @@ MOD_DAILYSCRIPTURE_COMMENTS_HEIGHT_DESCRIPTION="Use 300 for auto height. Any hig
MOD_DAILYSCRIPTURE_LINK_LABEL="Show Link" MOD_DAILYSCRIPTURE_LINK_LABEL="Show Link"
MOD_DAILYSCRIPTURE_LINK_DESCRIPTION="Should we show a link." MOD_DAILYSCRIPTURE_LINK_DESCRIPTION="Should we show a link."
MOD_DAILYSCRIPTURE_GETBIBLE="GetBible" MOD_DAILYSCRIPTURE_GETBIBLE="GetBible"
MOD_DAILYSCRIPTURE_LOCAL_GETBIBLE="Local GetBible"
MOD_DAILYSCRIPTURE_TELEGRAM="Telegram" MOD_DAILYSCRIPTURE_TELEGRAM="Telegram"
MOD_DAILYSCRIPTURE_NONE="None" MOD_DAILYSCRIPTURE_NONE="None"
MOD_DAILYSCRIPTURE_LOCAL_LINK_LABEL="Local getBible Link"
MOD_DAILYSCRIPTURE_LOCAL_LINK_DESCRIPTION="The link to the local getBible app page."
MOD_DAILYSCRIPTURE_LOCAL_LINK_MESSAGE="Error! Please add some local getBible link here."
MOD_DAILYSCRIPTURE_LOCAL_LINK_HINT="https://truechristian.church/scriptures"
MOD_DAILYSCRIPTURE_WIDTH_LABEL="Width" MOD_DAILYSCRIPTURE_WIDTH_LABEL="Width"
MOD_DAILYSCRIPTURE_AUTHOR_PHOTO_LABEL="Author Photo" MOD_DAILYSCRIPTURE_AUTHOR_PHOTO_LABEL="Author Photo"
MOD_DAILYSCRIPTURE_AUTO="Auto" MOD_DAILYSCRIPTURE_AUTO="Auto"

View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<extension type="module" version="4" client="site" method="upgrade"> <extension type="module" version="4" client="site" method="upgrade">
<name>MOD_DAILYSCRIPTURE</name> <name>MOD_DAILYSCRIPTURE</name>
<creationDate>9th November, 2023</creationDate> <creationDate>10th November, 2023</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://getbible.net</authorUrl> <authorUrl>https://getbible.net</authorUrl>
<copyright>Copyright (C) 2015. All Rights Reserved</copyright> <copyright>Copyright (C) 2015. All Rights Reserved</copyright>
<license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license> <license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license>
<version>1.1.5</version> <version>1.2.0</version>
<description>MOD_DAILYSCRIPTURE_XML_DESCRIPTION</description> <description>MOD_DAILYSCRIPTURE_XML_DESCRIPTION</description>
<!-- Scripts to run on installation --> <!-- Scripts to run on installation -->
@ -105,23 +105,41 @@
step="10" step="10"
showon="show_comments:1" showon="show_comments:1"
/> />
<!-- Link Field. Type: Radio. (joomla) --> <!-- Link Field. Type: List. (joomla) -->
<field <field
type="radio" type="list"
name="link" name="link"
label="MOD_DAILYSCRIPTURE_LINK_LABEL" label="MOD_DAILYSCRIPTURE_LINK_LABEL"
description="MOD_DAILYSCRIPTURE_LINK_DESCRIPTION" description="MOD_DAILYSCRIPTURE_LINK_DESCRIPTION"
class="btn-group btn-group-yesno" class="list_class"
multiple="false"
default="1" default="1"
showon="type:1"> showon="type:1">
<!-- Option Set. --> <!-- Option Set. -->
<option value="2"> <option value="2">
MOD_DAILYSCRIPTURE_GETBIBLE</option> MOD_DAILYSCRIPTURE_GETBIBLE</option>
<option value="3">
MOD_DAILYSCRIPTURE_LOCAL_GETBIBLE</option>
<option value="1"> <option value="1">
MOD_DAILYSCRIPTURE_TELEGRAM</option> MOD_DAILYSCRIPTURE_TELEGRAM</option>
<option value="0"> <option value="0">
MOD_DAILYSCRIPTURE_NONE</option> MOD_DAILYSCRIPTURE_NONE</option>
</field> </field>
<!-- Local_link Field. Type: Text. (joomla) -->
<field
type="text"
name="local_link"
label="MOD_DAILYSCRIPTURE_LOCAL_LINK_LABEL"
size="50"
maxlength="150"
description="MOD_DAILYSCRIPTURE_LOCAL_LINK_DESCRIPTION"
class="text_area"
filter="STRING"
message="MOD_DAILYSCRIPTURE_LOCAL_LINK_MESSAGE"
hint="MOD_DAILYSCRIPTURE_LOCAL_LINK_HINT"
autocomplete="on"
showon="type:1[AND]link:3"
/>
<!-- Width Field. Type: Number. (joomla) --> <!-- Width Field. Type: Number. (joomla) -->
<field <field
type="number" type="number"

View File

@ -27,7 +27,9 @@ defined('_JEXEC') or die('Restricted access');
<li><b><?php echo $scripture->nr; ?></b> <?php echo $scripture->text; ?></li> <li><b><?php echo $scripture->nr; ?></b> <?php echo $scripture->text; ?></li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
<?php if ($params->get('link', 2) == 2): ?> <?php if ($params->get('link', 3) == 2): ?>
<a href="<?php echo $today->local_link; ?>"><?php echo $today->date; ?></a>
<?php elseif ($params->get('link', 2) == 2): ?>
<a href="<?php echo $today->getbible; ?>" target="_blank"><?php echo $today->date; ?></a> <a href="<?php echo $today->getbible; ?>" target="_blank"><?php echo $today->date; ?></a>
<?php elseif ($params->get('link', 2) == 1): ?> <?php elseif ($params->get('link', 2) == 1): ?>
<a href="https://t.me/s/<?php echo $today->telegram; ?>" target="_blank"><?php echo $today->date; ?></a> <a href="https://t.me/s/<?php echo $today->telegram; ?>" target="_blank"><?php echo $today->date; ?></a>