Get Bible (v.2.0.19)
Welcome to the next level of scripture engagement - The Bible for Joomla! Our purpose is to bring the Word of God to every person, in their native language, entirely free. This isn't just a typical extension; it's a groundbreaking tool developed to span language divides and deliver a rich, customizable Bible study experience to users worldwide. diff --git a/libraries/jcb_powers/VDM.Joomla.GetBible/src/Abstraction/Watcher.php b/libraries/jcb_powers/VDM.Joomla.GetBible/src/Abstraction/Watcher.php index 2496e2f..d37c895 100644 --- a/libraries/jcb_powers/VDM.Joomla.GetBible/src/Abstraction/Watcher.php +++ b/libraries/jcb_powers/VDM.Joomla.GetBible/src/Abstraction/Watcher.php @@ -73,6 +73,22 @@ abstract class Watcher */ protected ?object $target; + /** + * The today's date + * + * @var string + * @since 2.0.1 + */ + protected string $today; + + /** + * The two months in the past date + * + * @var string + * @since 2.0.1 + */ + protected string $past; + /** * The target table * @@ -99,8 +115,10 @@ abstract class Watcher $this->insert = $insert; $this->update = $update; - // just in-case we set a date + // just in-case we set some dates $this->today = (new Date())->toSql(); + $this->past = (new Date())->modify('-2 months')->toSql(); + } /** diff --git a/libraries/jcb_powers/VDM.Joomla.GetBible/src/Watcher/Chapter.php b/libraries/jcb_powers/VDM.Joomla.GetBible/src/Watcher/Chapter.php index 7e8e3e2..c38f519 100644 --- a/libraries/jcb_powers/VDM.Joomla.GetBible/src/Watcher/Chapter.php +++ b/libraries/jcb_powers/VDM.Joomla.GetBible/src/Watcher/Chapter.php @@ -137,6 +137,41 @@ final class Chapter extends Watcher return true; } + /** + * Force book chapter sync + * + * @param array $books The books ids. + * + * @return bool True on success + * @since 2.0.1 + */ + public function force(array $books): bool + { + foreach ($books as $book) + { + if (($_book = $this->load->item(['id' => $book], 'book')) === null) + { + return false; + } + + if (($chapters = $this->load->items( + ['abbreviation' => $_book->abbreviation, 'book_nr' => $_book->nr], + 'chapter' + )) !== null) + { + foreach ($chapters as $chapter) + { + $this->update->row([ + 'id' => $chapter->id, + 'created' => $this->past + ], 'id', 'chapter'); + } + } + } + + return true; + } + /** * Load the chapter numbers * diff --git a/libraries/jcb_powers/VDM.Joomla/src/Utilities/FileHelper.php b/libraries/jcb_powers/VDM.Joomla/src/Utilities/FileHelper.php index 7bbc782..0dd04d8 100644 --- a/libraries/jcb_powers/VDM.Joomla/src/Utilities/FileHelper.php +++ b/libraries/jcb_powers/VDM.Joomla/src/Utilities/FileHelper.php @@ -132,7 +132,7 @@ abstract class FileHelper elseif (!self::$curlError) { // set the notice - Factory::getApplication()->enqueueMessage(Text::_('COM_GETBIBLE_HTWOCURL_NOT_FOUNDHTWOPPLEASE_SETUP_CURL_ON_YOUR_SYSTEM_OR_BGETBIBLEB_WILL_NOT_FUNCTION_CORRECTLYP'), 'Error'); + Factory::getApplication()->enqueueMessage('
Curl Not Found!
Please setup curl on your system, or the Joomla Component will not function correctly!
', 'Error'); // load this notice only once self::$curlError = true; } diff --git a/script.php b/script.php index 4caabe9..52a745a 100644 --- a/script.php +++ b/script.php @@ -1125,7 +1125,7 @@ class com_getbibleInstallerScript { $rule_length = $db->loadResult(); // Check the size of the rules column - if ($rule_length <= 44320) + if ($rule_length <= 44480) { // Fix the assets table rules column size $fix_rules_size = "ALTER TABLE `#__assets` CHANGE `rules` `rules` TEXT NOT NULL COMMENT 'JSON encoded access control. Enlarged to TEXT by JCB';"; @@ -1539,7 +1539,7 @@ class com_getbibleInstallerScript echo '
- Upgrade to Version 2.0.18 Was Successful! Let us know if anything is not working as expected.
'; +Upgrade to Version 2.0.19 Was Successful! Let us know if anything is not working as expected.
'; // Set db if not set already. if (!isset($db)) diff --git a/site/language/en-GB/en-GB.com_getbible.ini b/site/language/en-GB/en-GB.com_getbible.ini index 23f448f..3e305fa 100644 --- a/site/language/en-GB/en-GB.com_getbible.ini +++ b/site/language/en-GB/en-GB.com_getbible.ini @@ -23,6 +23,7 @@ COM_GETBIBLE_APP_DESC="App" COM_GETBIBLE_AUTO_GENERATED="auto generated" COM_GETBIBLE_AVAILABLE_TAGS="Available Tags" COM_GETBIBLE_A_BOOK="A Book" +COM_GETBIBLE_BACK_TO_BIBLE="Back to Bible" COM_GETBIBLE_BASIC_HASH_USAGE_EXPLAINED="Basic Hash Usage Explained" COM_GETBIBLE_BIBLE="Bible" COM_GETBIBLE_BOOKS="Books" @@ -75,7 +76,6 @@ COM_GETBIBLE_HELLO_S="Hello %s" COM_GETBIBLE_HIDE="Hide" COM_GETBIBLE_HOWEVER_TO_MODIFY_YOUR_SPAN_CLASSGETBIBLEACTIVITYNOTESANDTAGSNOTES_AND_TAGSSPAN_YOU_NEED_BOTH_THE_PERSISTENT_SESSION_KEY_AND_YOUR_FAVOURITE_VERSE="However, to modify your , you need both the persistent session key and your favourite verse." COM_GETBIBLE_HOW_THIS_ALL_WORKS="How This All Works" -COM_GETBIBLE_HTWOCURL_NOT_FOUNDHTWOPPLEASE_SETUP_CURL_ON_YOUR_SYSTEM_OR_BGETBIBLEB_WILL_NOT_FUNCTION_CORRECTLYP="Curl Not Found!
Please setup curl on your system, or getbible will not function correctly!
" COM_GETBIBLE_IF_YOU_SWITCH_FROM_YOUR_ACTIVE_SESSION_TO_A_SHARED_ONE_YOUR_ORIGINAL_SESSION_WILL_BE_PRESERVED_HERE_FOR_EASY_ACCESS="If you switch from your active session to a shared one, your original session will be preserved here for easy access." COM_GETBIBLE_INCORRECT_FAVOURITE_VERSE_SELECTED="Incorrect favourite verse selected." COM_GETBIBLE_INSENSITIVE="Insensitive" @@ -137,6 +137,7 @@ COM_GETBIBLE_PROMPT_SETTINGS="Prompt Settings" COM_GETBIBLE_PROMPT_TOKENS="Prompt Tokens" COM_GETBIBLE_PROMPT_USED="Prompt Used" COM_GETBIBLE_QUERY="Query" +COM_GETBIBLE_READ_S_CHAPTER_S_IN_THE_S="Read %s chapter %s in the %s" COM_GETBIBLE_REDIRECTING_TO="Redirecting to" COM_GETBIBLE_REFERENCE="Reference" COM_GETBIBLE_REMOVE="Remove" @@ -169,6 +170,8 @@ COM_GETBIBLE_SHOW="Show" COM_GETBIBLE_SOURCE="Source" COM_GETBIBLE_STYLE="Style" COM_GETBIBLE_STYLE_GO_HERE="Style go here" +COM_GETBIBLE_S_CHAPTER_S_S_S="%s: Chapter %s (%s) - %s" +COM_GETBIBLE_S_CHAPTER_S_S_S_S_S_BIBLE_S_SCRIPTURE_GETBIBLE="%s, chapter %s, %s, %s, %s, %s Bible, %s, scripture, getBible" COM_GETBIBLE_TAB_NAME_PLACEHOLDERS="Tab Name Placeholders" COM_GETBIBLE_TAG="Tag" COM_GETBIBLE_TAGGED_VERSES="Tagged Verses" @@ -206,6 +209,7 @@ COM_GETBIBLE_THE_TAG_WAS_SUCCESSFULLY_REMOVED_FROM_THE_VERSE="The tag was succes COM_GETBIBLE_THE_TAG_WAS_SUCCESSFULLY_UPDATED="The tag was successfully updated." COM_GETBIBLE_THE_VERSE_WAS_SUCCESSFULLY_TAGGED="The verse was successfully tagged." COM_GETBIBLE_THE_WORDS_OF_ETERNAL_LIFE="The words of eternal life!" +COM_GETBIBLE_THE_WORD_OF_GOD="The Word of God" COM_GETBIBLE_THIS_AREA_DISPLAYS_YOUR_RECENTLY_ACCESSED_SESSIONS="This area displays your recently accessed sessions." COM_GETBIBLE_THIS_INSTALLATION_PROCESS_IS_A_ONETIME_OPERATION_FOR_EACH_TRANSLATION_HOWEVER_YOU_ARE_WELCOME_TO_RUN_THE_PROCESS_A_SECOND_TIME_OR_AS_OFTEN_AS_YOUD_LIKE_TO_VALIDATE_AND_ENSURE_THAT_ALL_CONTENT_WAS_PROPERLY_LOADED_AND_IS_UPTODATE="This installation process is a one-time operation for each translation. However, you are welcome to run the process a second time or as often as you'd like to validate and ensure that all content was properly loaded and is up-to-date." COM_GETBIBLE_THIS_IS_A_GLOBAL_TAG_SET_BY_US_AT_BSB_FOR_YOUR_CONVENIENCE_WE_HOLD_THE_PRIVILEGE_TO_MODIFY_THESE_TAGS_IF_YOU_BELIEVE_ITS_SET_IN_ERROR_KINDLY_INFORM_US="This is a global tag, set by us at %s for your convenience. We hold the privilege to modify these tags. If you believe it's set in error, kindly inform us." diff --git a/site/models/app.php b/site/models/app.php index 6499fb7..8ab0b64 100644 --- a/site/models/app.php +++ b/site/models/app.php @@ -198,7 +198,7 @@ class GetbibleModelApp extends ItemModel Factory::_('GetBible.Watcher')->sync($this->translation, $this->book, $chapter_previous); } - $data = [ + $data = (object) [ 'translation' => $this->translation, 'book' => $this->book, 'chapter' => $this->chapter, diff --git a/site/views/app/tmpl/default_getbibleapp.php b/site/views/app/tmpl/default_getbibleapp.php index ef3775a..0d96c2a 100644 --- a/site/views/app/tmpl/default_getbibleapp.php +++ b/site/views/app/tmpl/default_getbibleapp.php @@ -25,7 +25,7 @@ const getbible_active_translation = 'chapter->abbreviation; ?> const getbible_verses = chapter->verses); ?>; const getbible_book_nr = chapter->book_nr; ?>; const getbible_chapter_nr = chapter->chapter; ?>; -const getbible_page_url = 'chapter->abbreviation . '&ref=' . $this->chapter->book_name . '&c=' . $this->chapter->chapter); ?>/'; +const getbible_page_url = 'url_base; ?>/'; var triggerGetBibleReload = false;