diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c163b1..c3c64aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# v5.0.3 + +- Fix canDelete to correctly use published. +- Add default 1 to version field to make sure the versioning feature works as expected. + # v5.0.2 - Fix Daily Light Deprecated code. diff --git a/GetbibleInstallerScript.php b/GetbibleInstallerScript.php index f7aa67f..104b059 100644 --- a/GetbibleInstallerScript.php +++ b/GetbibleInstallerScript.php @@ -346,7 +346,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface // router '', // contentHistoryOptions - '{"formFile": "administrator/components/com_getbible/forms/note.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","book_nr","access","verse","chapter"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "linker","targetTable": "#__getbible_linker","targetColumn": "guid","displayColumn": "name"}]}' + '{"formFile": "administrator/components/com_getbible/forms/note.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","book_nr","access","verse","chapter"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "linker","targetTable": "#__getbible_linker","targetColumn": "guid","displayColumn": "name"}]}' ); // Install Tagged verse Content Types. $this->setContentType( @@ -363,7 +363,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface // router '', // contentHistoryOptions - '{"formFile": "administrator/components/com_getbible/forms/tagged_verse.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","book_nr","access","verse","chapter"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "abbreviation","targetTable": "#__getbible_translation","targetColumn": "abbreviation","displayColumn": "translation"},{"sourceColumn": "linker","targetTable": "#__getbible_linker","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "tag","targetTable": "#__getbible_tag","targetColumn": "guid","displayColumn": "name"}]}' + '{"formFile": "administrator/components/com_getbible/forms/tagged_verse.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","book_nr","access","verse","chapter"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "abbreviation","targetTable": "#__getbible_translation","targetColumn": "abbreviation","displayColumn": "translation"},{"sourceColumn": "linker","targetTable": "#__getbible_linker","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "tag","targetTable": "#__getbible_tag","targetColumn": "guid","displayColumn": "name"}]}' ); // Install Prompt Content Types. $this->setContentType( @@ -380,7 +380,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface // router '', // contentHistoryOptions - '{"formFile": "administrator/components/com_getbible/forms/prompt.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","integration","cache_behaviour","n_override","cache_capacity","response_retrieval","frequency_penalty_override","n","max_tokens_override","token_override","max_tokens","ai_org_token_override","temperature_override","presence_penalty_override","top_p_override"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "abbreviation","targetTable": "#__getbible_translation","targetColumn": "abbreviation","displayColumn": "translation"}]}' + '{"formFile": "administrator/components/com_getbible/forms/prompt.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","integration","cache_behaviour","n_override","cache_capacity","response_retrieval","frequency_penalty_override","n","max_tokens_override","token_override","max_tokens","ai_org_token_override","temperature_override","presence_penalty_override","top_p_override"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "abbreviation","targetTable": "#__getbible_translation","targetColumn": "abbreviation","displayColumn": "translation"}]}' ); // Install Open ai response Content Types. $this->setContentType( @@ -397,7 +397,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface // router '', // contentHistoryOptions - '{"formFile": "administrator/components/com_getbible/forms/open_ai_response.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","total_tokens","n","chapter","completion_tokens","prompt_tokens","max_tokens","book"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "prompt","targetTable": "#__getbible_prompt","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "abbreviation","targetTable": "#__getbible_translation","targetColumn": "abbreviation","displayColumn": "translation"}]}' + '{"formFile": "administrator/components/com_getbible/forms/open_ai_response.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","total_tokens","n","chapter","completion_tokens","prompt_tokens","max_tokens","book"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "prompt","targetTable": "#__getbible_prompt","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "abbreviation","targetTable": "#__getbible_translation","targetColumn": "abbreviation","displayColumn": "translation"}]}' ); // Install Open ai message Content Types. $this->setContentType( @@ -414,7 +414,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface // router '', // contentHistoryOptions - '{"formFile": "administrator/components/com_getbible/forms/open_ai_message.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","source","index"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "open_ai_response","targetTable": "#__getbible_open_ai_response","targetColumn": "response_id","displayColumn": "response_id"},{"sourceColumn": "prompt","targetTable": "#__getbible_prompt","targetColumn": "guid","displayColumn": "name"}]}' + '{"formFile": "administrator/components/com_getbible/forms/open_ai_message.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","source","index"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "open_ai_response","targetTable": "#__getbible_open_ai_response","targetColumn": "response_id","displayColumn": "response_id"},{"sourceColumn": "prompt","targetTable": "#__getbible_prompt","targetColumn": "guid","displayColumn": "name"}]}' ); // Install Tag Content Types. $this->setContentType( @@ -431,7 +431,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface // router '', // contentHistoryOptions - '{"formFile": "administrator/components/com_getbible/forms/tag.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","access"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "linker","targetTable": "#__getbible_linker","targetColumn": "guid","displayColumn": "name"}]}' + '{"formFile": "administrator/components/com_getbible/forms/tag.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","access"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "linker","targetTable": "#__getbible_linker","targetColumn": "guid","displayColumn": "name"}]}' ); @@ -662,7 +662,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface // router '', // contentHistoryOptions - '{"formFile": "administrator/components/com_getbible/forms/note.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","book_nr","access","verse","chapter"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "linker","targetTable": "#__getbible_linker","targetColumn": "guid","displayColumn": "name"}]}' + '{"formFile": "administrator/components/com_getbible/forms/note.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","book_nr","access","verse","chapter"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "linker","targetTable": "#__getbible_linker","targetColumn": "guid","displayColumn": "name"}]}' ); // Update Tagged verse Content Types. $this->setContentType( @@ -679,7 +679,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface // router '', // contentHistoryOptions - '{"formFile": "administrator/components/com_getbible/forms/tagged_verse.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","book_nr","access","verse","chapter"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "abbreviation","targetTable": "#__getbible_translation","targetColumn": "abbreviation","displayColumn": "translation"},{"sourceColumn": "linker","targetTable": "#__getbible_linker","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "tag","targetTable": "#__getbible_tag","targetColumn": "guid","displayColumn": "name"}]}' + '{"formFile": "administrator/components/com_getbible/forms/tagged_verse.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","book_nr","access","verse","chapter"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "abbreviation","targetTable": "#__getbible_translation","targetColumn": "abbreviation","displayColumn": "translation"},{"sourceColumn": "linker","targetTable": "#__getbible_linker","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "tag","targetTable": "#__getbible_tag","targetColumn": "guid","displayColumn": "name"}]}' ); // Update Prompt Content Types. $this->setContentType( @@ -696,7 +696,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface // router '', // contentHistoryOptions - '{"formFile": "administrator/components/com_getbible/forms/prompt.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","integration","cache_behaviour","n_override","cache_capacity","response_retrieval","frequency_penalty_override","n","max_tokens_override","token_override","max_tokens","ai_org_token_override","temperature_override","presence_penalty_override","top_p_override"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "abbreviation","targetTable": "#__getbible_translation","targetColumn": "abbreviation","displayColumn": "translation"}]}' + '{"formFile": "administrator/components/com_getbible/forms/prompt.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","integration","cache_behaviour","n_override","cache_capacity","response_retrieval","frequency_penalty_override","n","max_tokens_override","token_override","max_tokens","ai_org_token_override","temperature_override","presence_penalty_override","top_p_override"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "abbreviation","targetTable": "#__getbible_translation","targetColumn": "abbreviation","displayColumn": "translation"}]}' ); // Update Open ai response Content Types. $this->setContentType( @@ -713,7 +713,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface // router '', // contentHistoryOptions - '{"formFile": "administrator/components/com_getbible/forms/open_ai_response.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","total_tokens","n","chapter","completion_tokens","prompt_tokens","max_tokens","book"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "prompt","targetTable": "#__getbible_prompt","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "abbreviation","targetTable": "#__getbible_translation","targetColumn": "abbreviation","displayColumn": "translation"}]}' + '{"formFile": "administrator/components/com_getbible/forms/open_ai_response.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","total_tokens","n","chapter","completion_tokens","prompt_tokens","max_tokens","book"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "prompt","targetTable": "#__getbible_prompt","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "abbreviation","targetTable": "#__getbible_translation","targetColumn": "abbreviation","displayColumn": "translation"}]}' ); // Update Open ai message Content Types. $this->setContentType( @@ -730,7 +730,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface // router '', // contentHistoryOptions - '{"formFile": "administrator/components/com_getbible/forms/open_ai_message.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","source","index"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "open_ai_response","targetTable": "#__getbible_open_ai_response","targetColumn": "response_id","displayColumn": "response_id"},{"sourceColumn": "prompt","targetTable": "#__getbible_prompt","targetColumn": "guid","displayColumn": "name"}]}' + '{"formFile": "administrator/components/com_getbible/forms/open_ai_message.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","source","index"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "open_ai_response","targetTable": "#__getbible_open_ai_response","targetColumn": "response_id","displayColumn": "response_id"},{"sourceColumn": "prompt","targetTable": "#__getbible_prompt","targetColumn": "guid","displayColumn": "name"}]}' ); // Update Tag Content Types. $this->setContentType( @@ -747,7 +747,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface // router '', // contentHistoryOptions - '{"formFile": "administrator/components/com_getbible/forms/tag.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","access"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "linker","targetTable": "#__getbible_linker","targetColumn": "guid","displayColumn": "name"}]}' + '{"formFile": "administrator/components/com_getbible/forms/tag.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","access"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "linker","targetTable": "#__getbible_linker","targetColumn": "guid","displayColumn": "name"}]}' ); @@ -755,7 +755,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface echo '
-

Upgrade to Version 5.0.2 Was Successful! Let us know if anything is not working as expected.

'; +

Upgrade to Version 5.0.3 Was Successful! Let us know if anything is not working as expected.

'; // Add/Update component in the action logs extensions table. $this->setActionLogsExtensions(); diff --git a/README.md b/README.md index b74ddfd..fe211b6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Get Bible (5.0.2) +# Get Bible (5.0.3) ![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/5.0/admin/assets/images/vdm-component.jpg "GetBible") @@ -18,38 +18,38 @@ In essence, The Bible for Joomla is designed to transform how the Word of God is + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Get Bible](https://getbible.net) + *First Build*: 3rd December, 2015 -+ *Last Build*: 29th January, 2024 -+ *Version*: 5.0.2 ++ *Last Build*: 10th February, 2024 ++ *Version*: 5.0.3 + *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 -**566 Hours** or **71 Eight Hour Days** (actual time the author saved - +**574 Hours** or **72 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*: **202824** -+ *File count*: **1715** ++ *Line count*: **205544** ++ *File count*: **1722** + *Folder count*: **189** -**373 Hours** or **46 Eight Hour Days** (the actual time the author spent) +**378 Hours** or **47 Eight Hour Days** (the actual time the author spent) > (with the following break down: -> **debugging @142hours** = codingtime / 4; -> **planning @81hours** = codingtime / 7; +> **debugging @143hours** = codingtime / 4; +> **planning @82hours** = codingtime / 7; > **mapping @57hours** = codingtime / 10; -> **office @94hours** = codingtime / 6;) +> **office @96hours** = codingtime / 6;) -**939 Hours** or **117 Eight Hour Days** +**952 Hours** or **119 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: **23.4 weeks** or **4.9 months** +Project duration: **23.8 weeks** or **5 months** > This **component** was build with a Joomla [Automated Component Builder](https://www.joomlacomponentbuilder.com). > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io) diff --git a/admin/README.txt b/admin/README.txt index b74ddfd..fe211b6 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -1,4 +1,4 @@ -# Get Bible (5.0.2) +# Get Bible (5.0.3) ![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/5.0/admin/assets/images/vdm-component.jpg "GetBible") @@ -18,38 +18,38 @@ In essence, The Bible for Joomla is designed to transform how the Word of God is + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Get Bible](https://getbible.net) + *First Build*: 3rd December, 2015 -+ *Last Build*: 29th January, 2024 -+ *Version*: 5.0.2 ++ *Last Build*: 10th February, 2024 ++ *Version*: 5.0.3 + *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 -**566 Hours** or **71 Eight Hour Days** (actual time the author saved - +**574 Hours** or **72 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*: **202824** -+ *File count*: **1715** ++ *Line count*: **205544** ++ *File count*: **1722** + *Folder count*: **189** -**373 Hours** or **46 Eight Hour Days** (the actual time the author spent) +**378 Hours** or **47 Eight Hour Days** (the actual time the author spent) > (with the following break down: -> **debugging @142hours** = codingtime / 4; -> **planning @81hours** = codingtime / 7; +> **debugging @143hours** = codingtime / 4; +> **planning @82hours** = codingtime / 7; > **mapping @57hours** = codingtime / 10; -> **office @94hours** = codingtime / 6;) +> **office @96hours** = codingtime / 6;) -**939 Hours** or **117 Eight Hour Days** +**952 Hours** or **119 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: **23.4 weeks** or **4.9 months** +Project duration: **23.8 weeks** or **5 months** > This **component** was build with a Joomla [Automated Component Builder](https://www.joomlacomponentbuilder.com). > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io) diff --git a/admin/forms/book.xml b/admin/forms/book.xml index a9fbedd..c3a7272 100644 --- a/admin/forms/book.xml +++ b/admin/forms/book.xml @@ -94,6 +94,7 @@ label="COM_GETBIBLE_BOOK_VERSION_LABEL" description="COM_GETBIBLE_BOOK_VERSION_DESC" size="6" + default="1" readonly="true" filter="unset" /> diff --git a/admin/forms/chapter.xml b/admin/forms/chapter.xml index e335572..af1b253 100644 --- a/admin/forms/chapter.xml +++ b/admin/forms/chapter.xml @@ -94,6 +94,7 @@ label="COM_GETBIBLE_CHAPTER_VERSION_LABEL" description="COM_GETBIBLE_CHAPTER_VERSION_DESC" size="6" + default="1" readonly="true" filter="unset" /> diff --git a/admin/forms/linker.xml b/admin/forms/linker.xml index e8e7109..ca5713a 100644 --- a/admin/forms/linker.xml +++ b/admin/forms/linker.xml @@ -84,6 +84,7 @@ label="COM_GETBIBLE_LINKER_VERSION_LABEL" description="COM_GETBIBLE_LINKER_VERSION_DESC" size="6" + default="1" readonly="true" filter="unset" /> diff --git a/admin/forms/note.xml b/admin/forms/note.xml index df3ea58..e6467fa 100644 --- a/admin/forms/note.xml +++ b/admin/forms/note.xml @@ -76,6 +76,7 @@ label="COM_GETBIBLE_NOTE_VERSION_LABEL" description="COM_GETBIBLE_NOTE_VERSION_DESC" size="6" + default="1" readonly="true" filter="unset" /> diff --git a/admin/forms/open_ai_message.xml b/admin/forms/open_ai_message.xml index bc690c2..38cd6b7 100644 --- a/admin/forms/open_ai_message.xml +++ b/admin/forms/open_ai_message.xml @@ -84,6 +84,7 @@ label="COM_GETBIBLE_OPEN_AI_MESSAGE_VERSION_LABEL" description="COM_GETBIBLE_OPEN_AI_MESSAGE_VERSION_DESC" size="6" + default="1" readonly="true" filter="unset" /> diff --git a/admin/forms/open_ai_response.xml b/admin/forms/open_ai_response.xml index 3f6f132..a730c45 100644 --- a/admin/forms/open_ai_response.xml +++ b/admin/forms/open_ai_response.xml @@ -84,6 +84,7 @@ label="COM_GETBIBLE_OPEN_AI_RESPONSE_VERSION_LABEL" description="COM_GETBIBLE_OPEN_AI_RESPONSE_VERSION_DESC" size="6" + default="1" readonly="true" filter="unset" /> diff --git a/admin/forms/password.xml b/admin/forms/password.xml index f9b46a8..6693fa2 100644 --- a/admin/forms/password.xml +++ b/admin/forms/password.xml @@ -84,6 +84,7 @@ label="COM_GETBIBLE_PASSWORD_VERSION_LABEL" description="COM_GETBIBLE_PASSWORD_VERSION_DESC" size="6" + default="1" readonly="true" filter="unset" /> diff --git a/admin/forms/prompt.xml b/admin/forms/prompt.xml index 416288d..9b8a09e 100644 --- a/admin/forms/prompt.xml +++ b/admin/forms/prompt.xml @@ -84,6 +84,7 @@ label="COM_GETBIBLE_PROMPT_VERSION_LABEL" description="COM_GETBIBLE_PROMPT_VERSION_DESC" size="6" + default="1" readonly="true" filter="unset" /> diff --git a/admin/forms/tag.xml b/admin/forms/tag.xml index 9e478ba..6194de2 100644 --- a/admin/forms/tag.xml +++ b/admin/forms/tag.xml @@ -76,6 +76,7 @@ label="COM_GETBIBLE_TAG_VERSION_LABEL" description="COM_GETBIBLE_TAG_VERSION_DESC" size="6" + default="1" readonly="true" filter="unset" /> diff --git a/admin/forms/tagged_verse.xml b/admin/forms/tagged_verse.xml index d4aa5ec..397680d 100644 --- a/admin/forms/tagged_verse.xml +++ b/admin/forms/tagged_verse.xml @@ -76,6 +76,7 @@ label="COM_GETBIBLE_TAGGED_VERSE_VERSION_LABEL" description="COM_GETBIBLE_TAGGED_VERSE_VERSION_DESC" size="6" + default="1" readonly="true" filter="unset" /> diff --git a/admin/forms/translation.xml b/admin/forms/translation.xml index cbb20f3..0cb754b 100644 --- a/admin/forms/translation.xml +++ b/admin/forms/translation.xml @@ -94,6 +94,7 @@ label="COM_GETBIBLE_TRANSLATION_VERSION_LABEL" description="COM_GETBIBLE_TRANSLATION_VERSION_DESC" size="6" + default="1" readonly="true" filter="unset" /> diff --git a/admin/forms/verse.xml b/admin/forms/verse.xml index 743540c..b99cd58 100644 --- a/admin/forms/verse.xml +++ b/admin/forms/verse.xml @@ -94,6 +94,7 @@ label="COM_GETBIBLE_VERSE_VERSION_LABEL" description="COM_GETBIBLE_VERSE_VERSION_DESC" size="6" + default="1" readonly="true" filter="unset" /> diff --git a/admin/services/provider.php b/admin/services/provider.php index c492720..a5aa051 100644 --- a/admin/services/provider.php +++ b/admin/services/provider.php @@ -21,9 +21,6 @@ \spl_autoload_register(function ($class) { // project-specific base directories and namespace prefix $search = [ - 'libraries/jcb_powers/VDM.Joomla.GetBible' => 'VDM\\Joomla\\GetBible', - 'libraries/jcb_powers/VDM.Joomla.Openai' => 'VDM\\Joomla\\Openai', - 'libraries/jcb_powers/VDM.Joomla.Gitea' => 'VDM\\Joomla\\Gitea', 'libraries/jcb_powers/VDM.Joomla' => 'VDM\\Joomla' ]; // Start the search and load if found diff --git a/admin/sql/updates/mysql/5.0.2.sql b/admin/sql/updates/mysql/5.0.2.sql new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/admin/sql/updates/mysql/5.0.2.sql @@ -0,0 +1 @@ + diff --git a/admin/src/Controller/AjaxController.php b/admin/src/Controller/AjaxController.php index ecb5201..570ad43 100644 --- a/admin/src/Controller/AjaxController.php +++ b/admin/src/Controller/AjaxController.php @@ -29,6 +29,8 @@ use Joomla\Utilities\ArrayHelper; /** * Getbible Ajax Base Controller + * + * @since 1.6 */ class AjaxController extends BaseController { diff --git a/admin/src/Controller/BookController.php b/admin/src/Controller/BookController.php index 247d740..13af812 100644 --- a/admin/src/Controller/BookController.php +++ b/admin/src/Controller/BookController.php @@ -36,6 +36,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Book Form Controller + * + * @since 1.6 */ class BookController extends FormController { diff --git a/admin/src/Controller/BooksController.php b/admin/src/Controller/BooksController.php index 3b408f8..56a6e79 100644 --- a/admin/src/Controller/BooksController.php +++ b/admin/src/Controller/BooksController.php @@ -31,6 +31,8 @@ use VDM\Joomla\GetBible\Factory as GetBibleFactory; /** * Books Admin Controller + * + * @since 1.6 */ class BooksController extends AdminController { diff --git a/admin/src/Controller/ChapterController.php b/admin/src/Controller/ChapterController.php index 7e34faa..8c58cb5 100644 --- a/admin/src/Controller/ChapterController.php +++ b/admin/src/Controller/ChapterController.php @@ -36,6 +36,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Chapter Form Controller + * + * @since 1.6 */ class ChapterController extends FormController { diff --git a/admin/src/Controller/ChaptersController.php b/admin/src/Controller/ChaptersController.php index 4b5fbab..aa8dd4d 100644 --- a/admin/src/Controller/ChaptersController.php +++ b/admin/src/Controller/ChaptersController.php @@ -29,6 +29,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Chapters Admin Controller + * + * @since 1.6 */ class ChaptersController extends AdminController { diff --git a/admin/src/Controller/DisplayController.php b/admin/src/Controller/DisplayController.php index d4acbf1..6c3a3d5 100644 --- a/admin/src/Controller/DisplayController.php +++ b/admin/src/Controller/DisplayController.php @@ -27,7 +27,7 @@ use Joomla\CMS\Router\Route; /** * Getbible master admin display controller. * - * @since 4.0 + * @since 4.0 */ class DisplayController extends BaseController { diff --git a/admin/src/Controller/GetbibleController.php b/admin/src/Controller/GetbibleController.php index e1ab5b1..faaa640 100644 --- a/admin/src/Controller/GetbibleController.php +++ b/admin/src/Controller/GetbibleController.php @@ -29,6 +29,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Getbible Admin Controller + * + * @since 1.6 */ class GetbibleController extends AdminController { diff --git a/admin/src/Controller/LinkerController.php b/admin/src/Controller/LinkerController.php index 475b72d..f5020ff 100644 --- a/admin/src/Controller/LinkerController.php +++ b/admin/src/Controller/LinkerController.php @@ -36,6 +36,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Linker Form Controller + * + * @since 1.6 */ class LinkerController extends FormController { diff --git a/admin/src/Controller/LinkersController.php b/admin/src/Controller/LinkersController.php index d19b38b..68dd84f 100644 --- a/admin/src/Controller/LinkersController.php +++ b/admin/src/Controller/LinkersController.php @@ -29,6 +29,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Linkers Admin Controller + * + * @since 1.6 */ class LinkersController extends AdminController { diff --git a/admin/src/Controller/NoteController.php b/admin/src/Controller/NoteController.php index bfee37d..19d38b2 100644 --- a/admin/src/Controller/NoteController.php +++ b/admin/src/Controller/NoteController.php @@ -36,6 +36,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Note Form Controller + * + * @since 1.6 */ class NoteController extends FormController { diff --git a/admin/src/Controller/NotesController.php b/admin/src/Controller/NotesController.php index d3ab36e..6f0bf86 100644 --- a/admin/src/Controller/NotesController.php +++ b/admin/src/Controller/NotesController.php @@ -29,6 +29,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Notes Admin Controller + * + * @since 1.6 */ class NotesController extends AdminController { diff --git a/admin/src/Controller/Open_ai_messageController.php b/admin/src/Controller/Open_ai_messageController.php index 1913454..a4b0c04 100644 --- a/admin/src/Controller/Open_ai_messageController.php +++ b/admin/src/Controller/Open_ai_messageController.php @@ -36,6 +36,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Open_ai_message Form Controller + * + * @since 1.6 */ class Open_ai_messageController extends FormController { diff --git a/admin/src/Controller/Open_ai_messagesController.php b/admin/src/Controller/Open_ai_messagesController.php index 0bd279a..8ffcbf1 100644 --- a/admin/src/Controller/Open_ai_messagesController.php +++ b/admin/src/Controller/Open_ai_messagesController.php @@ -29,6 +29,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Open_ai_messages Admin Controller + * + * @since 1.6 */ class Open_ai_messagesController extends AdminController { diff --git a/admin/src/Controller/Open_ai_responseController.php b/admin/src/Controller/Open_ai_responseController.php index 954c463..e524150 100644 --- a/admin/src/Controller/Open_ai_responseController.php +++ b/admin/src/Controller/Open_ai_responseController.php @@ -36,6 +36,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Open_ai_response Form Controller + * + * @since 1.6 */ class Open_ai_responseController extends FormController { diff --git a/admin/src/Controller/Open_ai_responsesController.php b/admin/src/Controller/Open_ai_responsesController.php index 761d9b6..5ca8f45 100644 --- a/admin/src/Controller/Open_ai_responsesController.php +++ b/admin/src/Controller/Open_ai_responsesController.php @@ -29,6 +29,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Open_ai_responses Admin Controller + * + * @since 1.6 */ class Open_ai_responsesController extends AdminController { diff --git a/admin/src/Controller/PasswordController.php b/admin/src/Controller/PasswordController.php index 5c9c5f8..4a8838c 100644 --- a/admin/src/Controller/PasswordController.php +++ b/admin/src/Controller/PasswordController.php @@ -36,6 +36,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Password Form Controller + * + * @since 1.6 */ class PasswordController extends FormController { diff --git a/admin/src/Controller/PasswordsController.php b/admin/src/Controller/PasswordsController.php index 03f6a0e..d075081 100644 --- a/admin/src/Controller/PasswordsController.php +++ b/admin/src/Controller/PasswordsController.php @@ -29,6 +29,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Passwords Admin Controller + * + * @since 1.6 */ class PasswordsController extends AdminController { diff --git a/admin/src/Controller/PromptController.php b/admin/src/Controller/PromptController.php index 1ea9678..5d38e5a 100644 --- a/admin/src/Controller/PromptController.php +++ b/admin/src/Controller/PromptController.php @@ -36,6 +36,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Prompt Form Controller + * + * @since 1.6 */ class PromptController extends FormController { diff --git a/admin/src/Controller/PromptsController.php b/admin/src/Controller/PromptsController.php index 68be112..5b36a7b 100644 --- a/admin/src/Controller/PromptsController.php +++ b/admin/src/Controller/PromptsController.php @@ -29,6 +29,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Prompts Admin Controller + * + * @since 1.6 */ class PromptsController extends AdminController { diff --git a/admin/src/Controller/TagController.php b/admin/src/Controller/TagController.php index 6564631..a68beca 100644 --- a/admin/src/Controller/TagController.php +++ b/admin/src/Controller/TagController.php @@ -36,6 +36,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Tag Form Controller + * + * @since 1.6 */ class TagController extends FormController { diff --git a/admin/src/Controller/Tagged_verseController.php b/admin/src/Controller/Tagged_verseController.php index ae3d329..721398d 100644 --- a/admin/src/Controller/Tagged_verseController.php +++ b/admin/src/Controller/Tagged_verseController.php @@ -36,6 +36,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Tagged_verse Form Controller + * + * @since 1.6 */ class Tagged_verseController extends FormController { diff --git a/admin/src/Controller/Tagged_versesController.php b/admin/src/Controller/Tagged_versesController.php index c07985e..715e8d0 100644 --- a/admin/src/Controller/Tagged_versesController.php +++ b/admin/src/Controller/Tagged_versesController.php @@ -29,6 +29,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Tagged_verses Admin Controller + * + * @since 1.6 */ class Tagged_versesController extends AdminController { diff --git a/admin/src/Controller/TagsController.php b/admin/src/Controller/TagsController.php index dd5dc9d..bd0b340 100644 --- a/admin/src/Controller/TagsController.php +++ b/admin/src/Controller/TagsController.php @@ -29,6 +29,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Tags Admin Controller + * + * @since 1.6 */ class TagsController extends AdminController { diff --git a/admin/src/Controller/TranslationController.php b/admin/src/Controller/TranslationController.php index cabe0d6..294f5aa 100644 --- a/admin/src/Controller/TranslationController.php +++ b/admin/src/Controller/TranslationController.php @@ -36,6 +36,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Translation Form Controller + * + * @since 1.6 */ class TranslationController extends FormController { diff --git a/admin/src/Controller/TranslationsController.php b/admin/src/Controller/TranslationsController.php index 4028f48..6b6648b 100644 --- a/admin/src/Controller/TranslationsController.php +++ b/admin/src/Controller/TranslationsController.php @@ -31,6 +31,8 @@ use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper; /** * Translations Admin Controller + * + * @since 1.6 */ class TranslationsController extends AdminController { diff --git a/admin/src/Controller/VerseController.php b/admin/src/Controller/VerseController.php index 4763578..83f15fc 100644 --- a/admin/src/Controller/VerseController.php +++ b/admin/src/Controller/VerseController.php @@ -36,6 +36,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Verse Form Controller + * + * @since 1.6 */ class VerseController extends FormController { diff --git a/admin/src/Controller/VersesController.php b/admin/src/Controller/VersesController.php index 8be0bb6..ff3aedd 100644 --- a/admin/src/Controller/VersesController.php +++ b/admin/src/Controller/VersesController.php @@ -29,6 +29,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Verses Admin Controller + * + * @since 1.6 */ class VersesController extends AdminController { diff --git a/admin/src/Extension/GetbibleComponent.php b/admin/src/Extension/GetbibleComponent.php index 27ebe4d..9f6b329 100644 --- a/admin/src/Extension/GetbibleComponent.php +++ b/admin/src/Extension/GetbibleComponent.php @@ -41,7 +41,7 @@ use Psr\Container\ContainerInterface; /** * Component class for com_getbible * - * @since 4.0.0 + * @since 4.0 */ class GetbibleComponent extends MVCComponent implements BootableExtensionInterface, diff --git a/admin/src/Field/BooksfilternameField.php b/admin/src/Field/BooksfilternameField.php index 20fd9b2..f283c65 100644 --- a/admin/src/Field/BooksfilternameField.php +++ b/admin/src/Field/BooksfilternameField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Booksfiltername Form Field class for the Getbible component + * + * @since 1.6 */ class BooksfilternameField extends ListField { diff --git a/admin/src/Field/BooksfilternrField.php b/admin/src/Field/BooksfilternrField.php index 3d936f2..bbb6f2d 100644 --- a/admin/src/Field/BooksfilternrField.php +++ b/admin/src/Field/BooksfilternrField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Booksfilternr Form Field class for the Getbible component + * + * @since 1.6 */ class BooksfilternrField extends ListField { diff --git a/admin/src/Field/ChaptersfilterbooknrField.php b/admin/src/Field/ChaptersfilterbooknrField.php index 158480f..6e6173a 100644 --- a/admin/src/Field/ChaptersfilterbooknrField.php +++ b/admin/src/Field/ChaptersfilterbooknrField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Chaptersfilterbooknr Form Field class for the Getbible component + * + * @since 1.6 */ class ChaptersfilterbooknrField extends ListField { diff --git a/admin/src/Field/ChaptersfilterchapterField.php b/admin/src/Field/ChaptersfilterchapterField.php index 9c4c39f..2adcbf5 100644 --- a/admin/src/Field/ChaptersfilterchapterField.php +++ b/admin/src/Field/ChaptersfilterchapterField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Chaptersfilterchapter Form Field class for the Getbible component + * + * @since 1.6 */ class ChaptersfilterchapterField extends ListField { diff --git a/admin/src/Field/LinkersField.php b/admin/src/Field/LinkersField.php index e59ff9f..ed12471 100644 --- a/admin/src/Field/LinkersField.php +++ b/admin/src/Field/LinkersField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Linkers Form Field class for the Getbible component + * + * @since 1.6 */ class LinkersField extends ListField { diff --git a/admin/src/Field/LinkersfilternameField.php b/admin/src/Field/LinkersfilternameField.php index 1c4c3da..2e16cb9 100644 --- a/admin/src/Field/LinkersfilternameField.php +++ b/admin/src/Field/LinkersfilternameField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Linkersfiltername Form Field class for the Getbible component + * + * @since 1.6 */ class LinkersfilternameField extends ListField { diff --git a/admin/src/Field/LinkersfilterpublicnotesField.php b/admin/src/Field/LinkersfilterpublicnotesField.php index d7c03fa..d6d5198 100644 --- a/admin/src/Field/LinkersfilterpublicnotesField.php +++ b/admin/src/Field/LinkersfilterpublicnotesField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Linkersfilterpublicnotes Form Field class for the Getbible component + * + * @since 1.6 */ class LinkersfilterpublicnotesField extends ListField { diff --git a/admin/src/Field/LinkersfilterpublictaggedversesField.php b/admin/src/Field/LinkersfilterpublictaggedversesField.php index d506a60..5a3e208 100644 --- a/admin/src/Field/LinkersfilterpublictaggedversesField.php +++ b/admin/src/Field/LinkersfilterpublictaggedversesField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Linkersfilterpublictaggedverses Form Field class for the Getbible component + * + * @since 1.6 */ class LinkersfilterpublictaggedversesField extends ListField { diff --git a/admin/src/Field/NotesfilteraccessField.php b/admin/src/Field/NotesfilteraccessField.php index 660b793..fb69324 100644 --- a/admin/src/Field/NotesfilteraccessField.php +++ b/admin/src/Field/NotesfilteraccessField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Notesfilteraccess Form Field class for the Getbible component + * + * @since 1.6 */ class NotesfilteraccessField extends ListField { diff --git a/admin/src/Field/NotesfilterbooknrField.php b/admin/src/Field/NotesfilterbooknrField.php index a8eb172..f0dbb47 100644 --- a/admin/src/Field/NotesfilterbooknrField.php +++ b/admin/src/Field/NotesfilterbooknrField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Notesfilterbooknr Form Field class for the Getbible component + * + * @since 1.6 */ class NotesfilterbooknrField extends ListField { diff --git a/admin/src/Field/NotesfilterchapterField.php b/admin/src/Field/NotesfilterchapterField.php index bc67200..6c89db1 100644 --- a/admin/src/Field/NotesfilterchapterField.php +++ b/admin/src/Field/NotesfilterchapterField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Notesfilterchapter Form Field class for the Getbible component + * + * @since 1.6 */ class NotesfilterchapterField extends ListField { diff --git a/admin/src/Field/NotesfilterverseField.php b/admin/src/Field/NotesfilterverseField.php index c930f62..987ea69 100644 --- a/admin/src/Field/NotesfilterverseField.php +++ b/admin/src/Field/NotesfilterverseField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Notesfilterverse Form Field class for the Getbible component + * + * @since 1.6 */ class NotesfilterverseField extends ListField { diff --git a/admin/src/Field/OpenaimessagesfilterroleField.php b/admin/src/Field/OpenaimessagesfilterroleField.php index 4f37608..ee1944f 100644 --- a/admin/src/Field/OpenaimessagesfilterroleField.php +++ b/admin/src/Field/OpenaimessagesfilterroleField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Openaimessagesfilterrole Form Field class for the Getbible component + * + * @since 1.6 */ class OpenaimessagesfilterroleField extends ListField { diff --git a/admin/src/Field/OpenaimessagesfiltersourceField.php b/admin/src/Field/OpenaimessagesfiltersourceField.php index 9dd0426..37e0629 100644 --- a/admin/src/Field/OpenaimessagesfiltersourceField.php +++ b/admin/src/Field/OpenaimessagesfiltersourceField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Openaimessagesfiltersource Form Field class for the Getbible component + * + * @since 1.6 */ class OpenaimessagesfiltersourceField extends ListField { diff --git a/admin/src/Field/OpenairesponsesField.php b/admin/src/Field/OpenairesponsesField.php index f6949c7..79fe6bc 100644 --- a/admin/src/Field/OpenairesponsesField.php +++ b/admin/src/Field/OpenairesponsesField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Openairesponses Form Field class for the Getbible component + * + * @since 1.6 */ class OpenairesponsesField extends ListField { diff --git a/admin/src/Field/OpenairesponsesfilterresponseidField.php b/admin/src/Field/OpenairesponsesfilterresponseidField.php index fae31bc..8f9831e 100644 --- a/admin/src/Field/OpenairesponsesfilterresponseidField.php +++ b/admin/src/Field/OpenairesponsesfilterresponseidField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Openairesponsesfilterresponseid Form Field class for the Getbible component + * + * @since 1.6 */ class OpenairesponsesfilterresponseidField extends ListField { diff --git a/admin/src/Field/OpenairesponsesfilterresponsemodelField.php b/admin/src/Field/OpenairesponsesfilterresponsemodelField.php index 90b2ac3..5a9c761 100644 --- a/admin/src/Field/OpenairesponsesfilterresponsemodelField.php +++ b/admin/src/Field/OpenairesponsesfilterresponsemodelField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Openairesponsesfilterresponsemodel Form Field class for the Getbible component + * + * @since 1.6 */ class OpenairesponsesfilterresponsemodelField extends ListField { diff --git a/admin/src/Field/PasswordsfilternameField.php b/admin/src/Field/PasswordsfilternameField.php index 474537a..4fdf722 100644 --- a/admin/src/Field/PasswordsfilternameField.php +++ b/admin/src/Field/PasswordsfilternameField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Passwordsfiltername Form Field class for the Getbible component + * + * @since 1.6 */ class PasswordsfilternameField extends ListField { diff --git a/admin/src/Field/PromptsField.php b/admin/src/Field/PromptsField.php index 98b06d1..e51f627 100644 --- a/admin/src/Field/PromptsField.php +++ b/admin/src/Field/PromptsField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Prompts Form Field class for the Getbible component + * + * @since 1.6 */ class PromptsField extends ListField { diff --git a/admin/src/Field/PromptsfiltercachebehaviourField.php b/admin/src/Field/PromptsfiltercachebehaviourField.php index 15f1a0a..57dd15c 100644 --- a/admin/src/Field/PromptsfiltercachebehaviourField.php +++ b/admin/src/Field/PromptsfiltercachebehaviourField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Promptsfiltercachebehaviour Form Field class for the Getbible component + * + * @since 1.6 */ class PromptsfiltercachebehaviourField extends ListField { diff --git a/admin/src/Field/PromptsfiltermodelField.php b/admin/src/Field/PromptsfiltermodelField.php index 4558c0c..c814d8c 100644 --- a/admin/src/Field/PromptsfiltermodelField.php +++ b/admin/src/Field/PromptsfiltermodelField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Promptsfiltermodel Form Field class for the Getbible component + * + * @since 1.6 */ class PromptsfiltermodelField extends ListField { diff --git a/admin/src/Field/PromptsfilternameField.php b/admin/src/Field/PromptsfilternameField.php index 74ace5e..8a274cd 100644 --- a/admin/src/Field/PromptsfilternameField.php +++ b/admin/src/Field/PromptsfilternameField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Promptsfiltername Form Field class for the Getbible component + * + * @since 1.6 */ class PromptsfilternameField extends ListField { diff --git a/admin/src/Field/TagersField.php b/admin/src/Field/TagersField.php index dca99d4..9d820bf 100644 --- a/admin/src/Field/TagersField.php +++ b/admin/src/Field/TagersField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Tagers Form Field class for the Getbible component + * + * @since 1.6 */ class TagersField extends ListField { diff --git a/admin/src/Field/TaggedversesfilteraccessField.php b/admin/src/Field/TaggedversesfilteraccessField.php index c045fd2..2652da8 100644 --- a/admin/src/Field/TaggedversesfilteraccessField.php +++ b/admin/src/Field/TaggedversesfilteraccessField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Taggedversesfilteraccess Form Field class for the Getbible component + * + * @since 1.6 */ class TaggedversesfilteraccessField extends ListField { diff --git a/admin/src/Field/TaggedversesfilterbooknrField.php b/admin/src/Field/TaggedversesfilterbooknrField.php index 7865fde..6dc6f6b 100644 --- a/admin/src/Field/TaggedversesfilterbooknrField.php +++ b/admin/src/Field/TaggedversesfilterbooknrField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Taggedversesfilterbooknr Form Field class for the Getbible component + * + * @since 1.6 */ class TaggedversesfilterbooknrField extends ListField { diff --git a/admin/src/Field/TaggedversesfilterchapterField.php b/admin/src/Field/TaggedversesfilterchapterField.php index 3c3e2b2..4fdb577 100644 --- a/admin/src/Field/TaggedversesfilterchapterField.php +++ b/admin/src/Field/TaggedversesfilterchapterField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Taggedversesfilterchapter Form Field class for the Getbible component + * + * @since 1.6 */ class TaggedversesfilterchapterField extends ListField { diff --git a/admin/src/Field/TaggedversesfilterverseField.php b/admin/src/Field/TaggedversesfilterverseField.php index f0a245e..0a7fc91 100644 --- a/admin/src/Field/TaggedversesfilterverseField.php +++ b/admin/src/Field/TaggedversesfilterverseField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Taggedversesfilterverse Form Field class for the Getbible component + * + * @since 1.6 */ class TaggedversesfilterverseField extends ListField { diff --git a/admin/src/Field/TagsfilteraccessField.php b/admin/src/Field/TagsfilteraccessField.php index 10fbcd9..c3db948 100644 --- a/admin/src/Field/TagsfilteraccessField.php +++ b/admin/src/Field/TagsfilteraccessField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Tagsfilteraccess Form Field class for the Getbible component + * + * @since 1.6 */ class TagsfilteraccessField extends ListField { diff --git a/admin/src/Field/TargettranslationsField.php b/admin/src/Field/TargettranslationsField.php index 641aaea..e4c81a7 100644 --- a/admin/src/Field/TargettranslationsField.php +++ b/admin/src/Field/TargettranslationsField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Targettranslations Form Field class for the Getbible component + * + * @since 1.6 */ class TargettranslationsField extends ListField { diff --git a/admin/src/Field/TranslationsField.php b/admin/src/Field/TranslationsField.php index 1ebb9cb..afa3668 100644 --- a/admin/src/Field/TranslationsField.php +++ b/admin/src/Field/TranslationsField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Translations Form Field class for the Getbible component + * + * @since 1.6 */ class TranslationsField extends ListField { diff --git a/admin/src/Field/TranslationsfilterdirectionField.php b/admin/src/Field/TranslationsfilterdirectionField.php index d386874..ed9e94b 100644 --- a/admin/src/Field/TranslationsfilterdirectionField.php +++ b/admin/src/Field/TranslationsfilterdirectionField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Translationsfilterdirection Form Field class for the Getbible component + * + * @since 1.6 */ class TranslationsfilterdirectionField extends ListField { diff --git a/admin/src/Field/VersesfilterbooknrField.php b/admin/src/Field/VersesfilterbooknrField.php index 52c19b7..1b16cb9 100644 --- a/admin/src/Field/VersesfilterbooknrField.php +++ b/admin/src/Field/VersesfilterbooknrField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Versesfilterbooknr Form Field class for the Getbible component + * + * @since 1.6 */ class VersesfilterbooknrField extends ListField { diff --git a/admin/src/Field/VersesfilterchapterField.php b/admin/src/Field/VersesfilterchapterField.php index 10ffdff..c2dc2fb 100644 --- a/admin/src/Field/VersesfilterchapterField.php +++ b/admin/src/Field/VersesfilterchapterField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Versesfilterchapter Form Field class for the Getbible component + * + * @since 1.6 */ class VersesfilterchapterField extends ListField { diff --git a/admin/src/Field/VersesfilterverseField.php b/admin/src/Field/VersesfilterverseField.php index eabcccd..de1e871 100644 --- a/admin/src/Field/VersesfilterverseField.php +++ b/admin/src/Field/VersesfilterverseField.php @@ -28,6 +28,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Versesfilterverse Form Field class for the Getbible component + * + * @since 1.6 */ class VersesfilterverseField extends ListField { diff --git a/admin/src/Helper/GetbibleHelper.php b/admin/src/Helper/GetbibleHelper.php index 4e33fbf..132cdfa 100644 --- a/admin/src/Helper/GetbibleHelper.php +++ b/admin/src/Helper/GetbibleHelper.php @@ -22,9 +22,6 @@ namespace TrueChristianChurch\Component\Getbible\Administrator\Helper; \spl_autoload_register(function ($class) { // project-specific base directories and namespace prefix $search = [ - 'libraries/jcb_powers/VDM.Joomla.GetBible' => 'VDM\\Joomla\\GetBible', - 'libraries/jcb_powers/VDM.Joomla.Openai' => 'VDM\\Joomla\\Openai', - 'libraries/jcb_powers/VDM.Joomla.Gitea' => 'VDM\\Joomla\\Gitea', 'libraries/jcb_powers/VDM.Joomla' => 'VDM\\Joomla' ]; // Start the search and load if found @@ -94,6 +91,8 @@ use VDM\Joomla\Utilities\FormHelper; /** * Getbible component helper. + * + * @since 3.0 */ abstract class GetbibleHelper { diff --git a/admin/src/Model/AjaxModel.php b/admin/src/Model/AjaxModel.php index 163be8a..b24ac3e 100644 --- a/admin/src/Model/AjaxModel.php +++ b/admin/src/Model/AjaxModel.php @@ -41,6 +41,8 @@ use VDM\Joomla\Gitea\Factory as GiteaFactory; /** * Getbible Ajax List Model + * + * @since 1.6 */ class AjaxModel extends ListModel { diff --git a/admin/src/Model/BookModel.php b/admin/src/Model/BookModel.php index ca4698f..d18f20b 100644 --- a/admin/src/Model/BookModel.php +++ b/admin/src/Model/BookModel.php @@ -43,6 +43,8 @@ use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper; /** * Getbible Book Admin Model + * + * @since 1.6 */ class BookModel extends AdminModel { @@ -331,7 +333,7 @@ class BookModel extends AdminModel */ protected function canDelete($record) { - if (empty($record->id) || ($record->state != -2)) + if (empty($record->id) || ($record->published != -2)) { return false; } diff --git a/admin/src/Model/BooksModel.php b/admin/src/Model/BooksModel.php index 30e378f..ad0da9c 100644 --- a/admin/src/Model/BooksModel.php +++ b/admin/src/Model/BooksModel.php @@ -37,6 +37,8 @@ use VDM\Joomla\Utilities\StringHelper; /** * Books List Model + * + * @since 1.6 */ class BooksModel extends ListModel { diff --git a/admin/src/Model/ChapterModel.php b/admin/src/Model/ChapterModel.php index ab4529f..144532c 100644 --- a/admin/src/Model/ChapterModel.php +++ b/admin/src/Model/ChapterModel.php @@ -43,6 +43,8 @@ use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper; /** * Getbible Chapter Admin Model + * + * @since 1.6 */ class ChapterModel extends AdminModel { @@ -349,7 +351,7 @@ class ChapterModel extends AdminModel */ protected function canDelete($record) { - if (empty($record->id) || ($record->state != -2)) + if (empty($record->id) || ($record->published != -2)) { return false; } diff --git a/admin/src/Model/ChaptersModel.php b/admin/src/Model/ChaptersModel.php index c39727a..8c3fb9b 100644 --- a/admin/src/Model/ChaptersModel.php +++ b/admin/src/Model/ChaptersModel.php @@ -37,6 +37,8 @@ use VDM\Joomla\Utilities\StringHelper; /** * Chapters List Model + * + * @since 1.6 */ class ChaptersModel extends ListModel { diff --git a/admin/src/Model/GetbibleModel.php b/admin/src/Model/GetbibleModel.php index ea39c69..0419785 100644 --- a/admin/src/Model/GetbibleModel.php +++ b/admin/src/Model/GetbibleModel.php @@ -39,6 +39,8 @@ use VDM\Joomla\Utilities\StringHelper; /** * Getbible List Model + * + * @since 1.6 */ class GetbibleModel extends ListModel { diff --git a/admin/src/Model/LinkerModel.php b/admin/src/Model/LinkerModel.php index d2d9874..5f721b5 100644 --- a/admin/src/Model/LinkerModel.php +++ b/admin/src/Model/LinkerModel.php @@ -46,6 +46,8 @@ use VDM\Joomla\Utilities\GetHelper; /** * Getbible Linker Admin Model + * + * @since 1.6 */ class LinkerModel extends AdminModel { @@ -692,7 +694,7 @@ class LinkerModel extends AdminModel */ protected function canDelete($record) { - if (empty($record->id) || ($record->state != -2)) + if (empty($record->id) || ($record->published != -2)) { return false; } diff --git a/admin/src/Model/LinkersModel.php b/admin/src/Model/LinkersModel.php index a8b0bea..a5016c9 100644 --- a/admin/src/Model/LinkersModel.php +++ b/admin/src/Model/LinkersModel.php @@ -37,6 +37,8 @@ use VDM\Joomla\Utilities\StringHelper; /** * Linkers List Model + * + * @since 1.6 */ class LinkersModel extends ListModel { diff --git a/admin/src/Model/NoteModel.php b/admin/src/Model/NoteModel.php index 76ac129..9bb847b 100644 --- a/admin/src/Model/NoteModel.php +++ b/admin/src/Model/NoteModel.php @@ -44,6 +44,8 @@ use VDM\Joomla\Utilities\GetHelper; /** * Getbible Note Admin Model + * + * @since 1.6 */ class NoteModel extends AdminModel { @@ -384,7 +386,7 @@ class NoteModel extends AdminModel */ protected function canDelete($record) { - if (empty($record->id) || ($record->state != -2)) + if (empty($record->id) || ($record->published != -2)) { return false; } diff --git a/admin/src/Model/NotesModel.php b/admin/src/Model/NotesModel.php index fd553aa..a0af5b9 100644 --- a/admin/src/Model/NotesModel.php +++ b/admin/src/Model/NotesModel.php @@ -37,6 +37,8 @@ use VDM\Joomla\Utilities\StringHelper; /** * Notes List Model + * + * @since 1.6 */ class NotesModel extends ListModel { diff --git a/admin/src/Model/Open_ai_messageModel.php b/admin/src/Model/Open_ai_messageModel.php index 8859032..f4b6a05 100644 --- a/admin/src/Model/Open_ai_messageModel.php +++ b/admin/src/Model/Open_ai_messageModel.php @@ -43,6 +43,8 @@ use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper; /** * Getbible Open_ai_message Admin Model + * + * @since 1.6 */ class Open_ai_messageModel extends AdminModel { @@ -390,7 +392,7 @@ class Open_ai_messageModel extends AdminModel */ protected function canDelete($record) { - if (empty($record->id) || ($record->state != -2)) + if (empty($record->id) || ($record->published != -2)) { return false; } diff --git a/admin/src/Model/Open_ai_messagesModel.php b/admin/src/Model/Open_ai_messagesModel.php index 80228f7..043183f 100644 --- a/admin/src/Model/Open_ai_messagesModel.php +++ b/admin/src/Model/Open_ai_messagesModel.php @@ -37,6 +37,8 @@ use VDM\Joomla\Utilities\StringHelper; /** * Open_ai_messages List Model + * + * @since 1.6 */ class Open_ai_messagesModel extends ListModel { diff --git a/admin/src/Model/Open_ai_responseModel.php b/admin/src/Model/Open_ai_responseModel.php index 71ebe83..18bd217 100644 --- a/admin/src/Model/Open_ai_responseModel.php +++ b/admin/src/Model/Open_ai_responseModel.php @@ -44,6 +44,8 @@ use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; /** * Getbible Open_ai_response Admin Model + * + * @since 1.6 */ class Open_ai_responseModel extends AdminModel { @@ -839,7 +841,7 @@ class Open_ai_responseModel extends AdminModel */ protected function canDelete($record) { - if (empty($record->id) || ($record->state != -2)) + if (empty($record->id) || ($record->published != -2)) { return false; } diff --git a/admin/src/Model/Open_ai_responsesModel.php b/admin/src/Model/Open_ai_responsesModel.php index 9e99a11..f3f3b57 100644 --- a/admin/src/Model/Open_ai_responsesModel.php +++ b/admin/src/Model/Open_ai_responsesModel.php @@ -37,6 +37,8 @@ use VDM\Joomla\Utilities\StringHelper; /** * Open_ai_responses List Model + * + * @since 1.6 */ class Open_ai_responsesModel extends ListModel { diff --git a/admin/src/Model/PasswordModel.php b/admin/src/Model/PasswordModel.php index be696d2..ef61db4 100644 --- a/admin/src/Model/PasswordModel.php +++ b/admin/src/Model/PasswordModel.php @@ -45,6 +45,8 @@ use VDM\Joomla\Utilities\GetHelper; /** * Getbible Password Admin Model + * + * @since 1.6 */ class PasswordModel extends AdminModel { @@ -370,7 +372,7 @@ class PasswordModel extends AdminModel */ protected function canDelete($record) { - if (empty($record->id) || ($record->state != -2)) + if (empty($record->id) || ($record->published != -2)) { return false; } diff --git a/admin/src/Model/PasswordsModel.php b/admin/src/Model/PasswordsModel.php index d114560..bd4eacc 100644 --- a/admin/src/Model/PasswordsModel.php +++ b/admin/src/Model/PasswordsModel.php @@ -37,6 +37,8 @@ use VDM\Joomla\Utilities\StringHelper; /** * Passwords List Model + * + * @since 1.6 */ class PasswordsModel extends ListModel { diff --git a/admin/src/Model/PromptModel.php b/admin/src/Model/PromptModel.php index b3569b8..5975cc1 100644 --- a/admin/src/Model/PromptModel.php +++ b/admin/src/Model/PromptModel.php @@ -45,6 +45,8 @@ use VDM\Joomla\Utilities\GetHelper; /** * Getbible Prompt Admin Model + * + * @since 1.6 */ class PromptModel extends AdminModel { @@ -746,7 +748,7 @@ class PromptModel extends AdminModel */ protected function canDelete($record) { - if (empty($record->id) || ($record->state != -2)) + if (empty($record->id) || ($record->published != -2)) { return false; } diff --git a/admin/src/Model/PromptsModel.php b/admin/src/Model/PromptsModel.php index 708d706..61c256c 100644 --- a/admin/src/Model/PromptsModel.php +++ b/admin/src/Model/PromptsModel.php @@ -37,6 +37,8 @@ use VDM\Joomla\Utilities\StringHelper; /** * Prompts List Model + * + * @since 1.6 */ class PromptsModel extends ListModel { diff --git a/admin/src/Model/TagModel.php b/admin/src/Model/TagModel.php index 843aae2..ddd99ef 100644 --- a/admin/src/Model/TagModel.php +++ b/admin/src/Model/TagModel.php @@ -45,6 +45,8 @@ use VDM\Joomla\Utilities\GetHelper; /** * Getbible Tag Admin Model + * + * @since 1.6 */ class TagModel extends AdminModel { @@ -349,7 +351,7 @@ class TagModel extends AdminModel */ protected function canDelete($record) { - if (empty($record->id) || ($record->state != -2)) + if (empty($record->id) || ($record->published != -2)) { return false; } diff --git a/admin/src/Model/Tagged_verseModel.php b/admin/src/Model/Tagged_verseModel.php index 82aeeb3..ac2f604 100644 --- a/admin/src/Model/Tagged_verseModel.php +++ b/admin/src/Model/Tagged_verseModel.php @@ -44,6 +44,8 @@ use VDM\Joomla\Utilities\GetHelper; /** * Getbible Tagged_verse Admin Model + * + * @since 1.6 */ class Tagged_verseModel extends AdminModel { @@ -402,7 +404,7 @@ class Tagged_verseModel extends AdminModel */ protected function canDelete($record) { - if (empty($record->id) || ($record->state != -2)) + if (empty($record->id) || ($record->published != -2)) { return false; } diff --git a/admin/src/Model/Tagged_versesModel.php b/admin/src/Model/Tagged_versesModel.php index f35f4a8..c4b8a32 100644 --- a/admin/src/Model/Tagged_versesModel.php +++ b/admin/src/Model/Tagged_versesModel.php @@ -37,6 +37,8 @@ use VDM\Joomla\Utilities\StringHelper; /** * Tagged_verses List Model + * + * @since 1.6 */ class Tagged_versesModel extends ListModel { diff --git a/admin/src/Model/TagsModel.php b/admin/src/Model/TagsModel.php index 518f0a0..373f8e4 100644 --- a/admin/src/Model/TagsModel.php +++ b/admin/src/Model/TagsModel.php @@ -37,6 +37,8 @@ use VDM\Joomla\Utilities\StringHelper; /** * Tags List Model + * + * @since 1.6 */ class TagsModel extends ListModel { diff --git a/admin/src/Model/TranslationModel.php b/admin/src/Model/TranslationModel.php index d52d727..96d3f4f 100644 --- a/admin/src/Model/TranslationModel.php +++ b/admin/src/Model/TranslationModel.php @@ -43,6 +43,8 @@ use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper; /** * Getbible Translation Admin Model + * + * @since 1.6 */ class TranslationModel extends AdminModel { @@ -578,7 +580,7 @@ class TranslationModel extends AdminModel */ protected function canDelete($record) { - if (empty($record->id) || ($record->state != -2)) + if (empty($record->id) || ($record->published != -2)) { return false; } diff --git a/admin/src/Model/TranslationsModel.php b/admin/src/Model/TranslationsModel.php index 43e21e0..5d684bc 100644 --- a/admin/src/Model/TranslationsModel.php +++ b/admin/src/Model/TranslationsModel.php @@ -37,6 +37,8 @@ use VDM\Joomla\Utilities\StringHelper; /** * Translations List Model + * + * @since 1.6 */ class TranslationsModel extends ListModel { diff --git a/admin/src/Model/VerseModel.php b/admin/src/Model/VerseModel.php index 2bf9e5f..8c1d777 100644 --- a/admin/src/Model/VerseModel.php +++ b/admin/src/Model/VerseModel.php @@ -43,6 +43,8 @@ use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper; /** * Getbible Verse Admin Model + * + * @since 1.6 */ class VerseModel extends AdminModel { @@ -369,7 +371,7 @@ class VerseModel extends AdminModel */ protected function canDelete($record) { - if (empty($record->id) || ($record->state != -2)) + if (empty($record->id) || ($record->published != -2)) { return false; } diff --git a/admin/src/Model/VersesModel.php b/admin/src/Model/VersesModel.php index 3f36f93..8e9aeab 100644 --- a/admin/src/Model/VersesModel.php +++ b/admin/src/Model/VersesModel.php @@ -37,6 +37,8 @@ use VDM\Joomla\Utilities\StringHelper; /** * Verses List Model + * + * @since 1.6 */ class VersesModel extends ListModel { diff --git a/admin/src/Rule/GuidRule.php b/admin/src/Rule/GuidRule.php index b6d21d4..fb9e5b6 100644 --- a/admin/src/Rule/GuidRule.php +++ b/admin/src/Rule/GuidRule.php @@ -30,6 +30,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Form Rule (Guid) class for the Joomla Platform. + * + * @since 3.5 */ class GuidRule extends FormRule { diff --git a/admin/src/Rule/IntRule.php b/admin/src/Rule/IntRule.php index e4ce0d6..19396ef 100644 --- a/admin/src/Rule/IntRule.php +++ b/admin/src/Rule/IntRule.php @@ -30,6 +30,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Form Rule (Int) class for the Joomla Platform. + * + * @since 3.5 */ class IntRule extends FormRule { diff --git a/admin/src/Rule/NumbershyphensRule.php b/admin/src/Rule/NumbershyphensRule.php index f1fd5a9..8f7e3b3 100644 --- a/admin/src/Rule/NumbershyphensRule.php +++ b/admin/src/Rule/NumbershyphensRule.php @@ -30,6 +30,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Form Rule (Numbershyphens) class for the Joomla Platform. + * + * @since 3.5 */ class NumbershyphensRule extends FormRule { diff --git a/admin/src/Table/BookTable.php b/admin/src/Table/BookTable.php index e37ea63..3df9305 100644 --- a/admin/src/Table/BookTable.php +++ b/admin/src/Table/BookTable.php @@ -41,6 +41,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Books Table class + * + * @since 1.6 */ class BookTable extends Table implements VersionableTableInterface, TaggableTableInterface, CurrentUserInterface { diff --git a/admin/src/Table/ChapterTable.php b/admin/src/Table/ChapterTable.php index 3db9821..74cb966 100644 --- a/admin/src/Table/ChapterTable.php +++ b/admin/src/Table/ChapterTable.php @@ -41,6 +41,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Chapters Table class + * + * @since 1.6 */ class ChapterTable extends Table implements VersionableTableInterface, TaggableTableInterface, CurrentUserInterface { diff --git a/admin/src/Table/LinkerTable.php b/admin/src/Table/LinkerTable.php index 8eb6853..e295c77 100644 --- a/admin/src/Table/LinkerTable.php +++ b/admin/src/Table/LinkerTable.php @@ -41,6 +41,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Linkers Table class + * + * @since 1.6 */ class LinkerTable extends Table implements VersionableTableInterface, TaggableTableInterface, CurrentUserInterface { diff --git a/admin/src/Table/NoteTable.php b/admin/src/Table/NoteTable.php index 781f015..3d63543 100644 --- a/admin/src/Table/NoteTable.php +++ b/admin/src/Table/NoteTable.php @@ -41,6 +41,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Notes Table class + * + * @since 1.6 */ class NoteTable extends Table implements VersionableTableInterface, TaggableTableInterface, CurrentUserInterface { diff --git a/admin/src/Table/Open_ai_messageTable.php b/admin/src/Table/Open_ai_messageTable.php index 9ef2f76..22985ec 100644 --- a/admin/src/Table/Open_ai_messageTable.php +++ b/admin/src/Table/Open_ai_messageTable.php @@ -41,6 +41,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Open_ai_messages Table class + * + * @since 1.6 */ class Open_ai_messageTable extends Table implements VersionableTableInterface, TaggableTableInterface, CurrentUserInterface { diff --git a/admin/src/Table/Open_ai_responseTable.php b/admin/src/Table/Open_ai_responseTable.php index 36370d5..e8a2af8 100644 --- a/admin/src/Table/Open_ai_responseTable.php +++ b/admin/src/Table/Open_ai_responseTable.php @@ -41,6 +41,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Open_ai_responses Table class + * + * @since 1.6 */ class Open_ai_responseTable extends Table implements VersionableTableInterface, TaggableTableInterface, CurrentUserInterface { diff --git a/admin/src/Table/PasswordTable.php b/admin/src/Table/PasswordTable.php index dbe600e..fa71896 100644 --- a/admin/src/Table/PasswordTable.php +++ b/admin/src/Table/PasswordTable.php @@ -41,6 +41,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Passwords Table class + * + * @since 1.6 */ class PasswordTable extends Table implements VersionableTableInterface, TaggableTableInterface, CurrentUserInterface { diff --git a/admin/src/Table/PromptTable.php b/admin/src/Table/PromptTable.php index 0ae169f..84b763b 100644 --- a/admin/src/Table/PromptTable.php +++ b/admin/src/Table/PromptTable.php @@ -41,6 +41,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Prompts Table class + * + * @since 1.6 */ class PromptTable extends Table implements VersionableTableInterface, TaggableTableInterface, CurrentUserInterface { diff --git a/admin/src/Table/TagTable.php b/admin/src/Table/TagTable.php index 0028657..9dc37aa 100644 --- a/admin/src/Table/TagTable.php +++ b/admin/src/Table/TagTable.php @@ -41,6 +41,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Tags Table class + * + * @since 1.6 */ class TagTable extends Table implements VersionableTableInterface, TaggableTableInterface, CurrentUserInterface { diff --git a/admin/src/Table/Tagged_verseTable.php b/admin/src/Table/Tagged_verseTable.php index 9529b55..5f89828 100644 --- a/admin/src/Table/Tagged_verseTable.php +++ b/admin/src/Table/Tagged_verseTable.php @@ -41,6 +41,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Tagged_verses Table class + * + * @since 1.6 */ class Tagged_verseTable extends Table implements VersionableTableInterface, TaggableTableInterface, CurrentUserInterface { diff --git a/admin/src/Table/TranslationTable.php b/admin/src/Table/TranslationTable.php index 2851366..ede7c14 100644 --- a/admin/src/Table/TranslationTable.php +++ b/admin/src/Table/TranslationTable.php @@ -41,6 +41,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Translations Table class + * + * @since 1.6 */ class TranslationTable extends Table implements VersionableTableInterface, TaggableTableInterface, CurrentUserInterface { diff --git a/admin/src/Table/VerseTable.php b/admin/src/Table/VerseTable.php index 6c9ec1c..ae20915 100644 --- a/admin/src/Table/VerseTable.php +++ b/admin/src/Table/VerseTable.php @@ -41,6 +41,8 @@ use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; /** * Verses Table class + * + * @since 1.6 */ class VerseTable extends Table implements VersionableTableInterface, TaggableTableInterface, CurrentUserInterface { diff --git a/admin/tmpl/books/default.php b/admin/tmpl/books/default.php index 599f8bd..7b6e56e 100644 --- a/admin/tmpl/books/default.php +++ b/admin/tmpl/books/default.php @@ -20,8 +20,6 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper as Html; use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; -Html::_('formbehavior.chosen', '.multiple', null, ['placeholder_text_multiple' => '- ' . Text::_('COM_GETBIBLE_FILTER_SELECT_TRANSLATION') . ' -']); -Html::_('formbehavior.chosen', '.multipleAccessLevels', null, ['placeholder_text_multiple' => '- ' . Text::_('COM_GETBIBLE_FILTER_SELECT_ACCESS') . ' -']); use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; // No direct access to this file diff --git a/admin/tmpl/chapters/default.php b/admin/tmpl/chapters/default.php index 900d283..9cc5ed7 100644 --- a/admin/tmpl/chapters/default.php +++ b/admin/tmpl/chapters/default.php @@ -20,9 +20,6 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper as Html; use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; -Html::_('formbehavior.chosen', '.multiple', null, ['placeholder_text_multiple' => '- ' . Text::_('COM_GETBIBLE_FILTER_SELECT_CHAPTER') . ' -']); -Html::_('formbehavior.chosen', '.multiple', null, ['placeholder_text_multiple' => '- ' . Text::_('COM_GETBIBLE_FILTER_SELECT_BOOK_NUMBER') . ' -']); -Html::_('formbehavior.chosen', '.multipleAccessLevels', null, ['placeholder_text_multiple' => '- ' . Text::_('COM_GETBIBLE_FILTER_SELECT_ACCESS') . ' -']); use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; // No direct access to this file diff --git a/admin/tmpl/linkers/default.php b/admin/tmpl/linkers/default.php index 3b0d2cd..936cb94 100644 --- a/admin/tmpl/linkers/default.php +++ b/admin/tmpl/linkers/default.php @@ -20,7 +20,6 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper as Html; use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; -Html::_('formbehavior.chosen', '.multipleAccessLevels', null, ['placeholder_text_multiple' => '- ' . Text::_('COM_GETBIBLE_FILTER_SELECT_ACCESS') . ' -']); use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; // No direct access to this file diff --git a/admin/tmpl/notes/default.php b/admin/tmpl/notes/default.php index cdaf1ac..c492a8f 100644 --- a/admin/tmpl/notes/default.php +++ b/admin/tmpl/notes/default.php @@ -20,7 +20,6 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper as Html; use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; -Html::_('formbehavior.chosen', '.multipleAccessLevels', null, ['placeholder_text_multiple' => '- ' . Text::_('COM_GETBIBLE_FILTER_SELECT_ACCESS') . ' -']); use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; // No direct access to this file diff --git a/admin/tmpl/open_ai_messages/default.php b/admin/tmpl/open_ai_messages/default.php index dd9420b..69e7127 100644 --- a/admin/tmpl/open_ai_messages/default.php +++ b/admin/tmpl/open_ai_messages/default.php @@ -20,7 +20,6 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper as Html; use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; -Html::_('formbehavior.chosen', '.multipleAccessLevels', null, ['placeholder_text_multiple' => '- ' . Text::_('COM_GETBIBLE_FILTER_SELECT_ACCESS') . ' -']); use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; // No direct access to this file diff --git a/admin/tmpl/open_ai_responses/default.php b/admin/tmpl/open_ai_responses/default.php index 112ea82..62e87f8 100644 --- a/admin/tmpl/open_ai_responses/default.php +++ b/admin/tmpl/open_ai_responses/default.php @@ -20,7 +20,6 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper as Html; use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; -Html::_('formbehavior.chosen', '.multipleAccessLevels', null, ['placeholder_text_multiple' => '- ' . Text::_('COM_GETBIBLE_FILTER_SELECT_ACCESS') . ' -']); use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; // No direct access to this file diff --git a/admin/tmpl/passwords/default.php b/admin/tmpl/passwords/default.php index de65d3d..5c16c8e 100644 --- a/admin/tmpl/passwords/default.php +++ b/admin/tmpl/passwords/default.php @@ -20,7 +20,6 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper as Html; use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; -Html::_('formbehavior.chosen', '.multipleAccessLevels', null, ['placeholder_text_multiple' => '- ' . Text::_('COM_GETBIBLE_FILTER_SELECT_ACCESS') . ' -']); use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; // No direct access to this file diff --git a/admin/tmpl/prompts/default.php b/admin/tmpl/prompts/default.php index c243a76..5080831 100644 --- a/admin/tmpl/prompts/default.php +++ b/admin/tmpl/prompts/default.php @@ -20,7 +20,6 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper as Html; use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; -Html::_('formbehavior.chosen', '.multipleAccessLevels', null, ['placeholder_text_multiple' => '- ' . Text::_('COM_GETBIBLE_FILTER_SELECT_ACCESS') . ' -']); use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; // No direct access to this file diff --git a/admin/tmpl/tagged_verses/default.php b/admin/tmpl/tagged_verses/default.php index 6649ffb..4c031b5 100644 --- a/admin/tmpl/tagged_verses/default.php +++ b/admin/tmpl/tagged_verses/default.php @@ -20,11 +20,6 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper as Html; use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; -Html::_('formbehavior.chosen', '.multiple', null, ['placeholder_text_multiple' => '- ' . Text::_('COM_GETBIBLE_FILTER_SELECT_BOOK_NUMBER') . ' -']); -Html::_('formbehavior.chosen', '.multiple', null, ['placeholder_text_multiple' => '- ' . Text::_('COM_GETBIBLE_FILTER_SELECT_TRANSLATION') . ' -']); -Html::_('formbehavior.chosen', '.multiple', null, ['placeholder_text_multiple' => '- ' . Text::_('COM_GETBIBLE_FILTER_SELECT_VERSE') . ' -']); -Html::_('formbehavior.chosen', '.multiple', null, ['placeholder_text_multiple' => '- ' . Text::_('COM_GETBIBLE_FILTER_SELECT_CHAPTER') . ' -']); -Html::_('formbehavior.chosen', '.multipleAccessLevels', null, ['placeholder_text_multiple' => '- ' . Text::_('COM_GETBIBLE_FILTER_SELECT_ACCESS') . ' -']); use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; // No direct access to this file diff --git a/admin/tmpl/tags/default.php b/admin/tmpl/tags/default.php index f11d88e..58b48bd 100644 --- a/admin/tmpl/tags/default.php +++ b/admin/tmpl/tags/default.php @@ -20,7 +20,6 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper as Html; use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; -Html::_('formbehavior.chosen', '.multipleAccessLevels', null, ['placeholder_text_multiple' => '- ' . Text::_('COM_GETBIBLE_FILTER_SELECT_ACCESS') . ' -']); use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; // No direct access to this file diff --git a/admin/tmpl/translations/default.php b/admin/tmpl/translations/default.php index 019f656..58d5df3 100644 --- a/admin/tmpl/translations/default.php +++ b/admin/tmpl/translations/default.php @@ -20,7 +20,6 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper as Html; use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; -Html::_('formbehavior.chosen', '.multipleAccessLevels', null, ['placeholder_text_multiple' => '- ' . Text::_('COM_GETBIBLE_FILTER_SELECT_ACCESS') . ' -']); use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; // No direct access to this file diff --git a/admin/tmpl/verses/default.php b/admin/tmpl/verses/default.php index ebb897f..8e068f1 100644 --- a/admin/tmpl/verses/default.php +++ b/admin/tmpl/verses/default.php @@ -20,7 +20,6 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper as Html; use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; -Html::_('formbehavior.chosen', '.multipleAccessLevels', null, ['placeholder_text_multiple' => '- ' . Text::_('COM_GETBIBLE_FILTER_SELECT_ACCESS') . ' -']); use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper; // No direct access to this file diff --git a/getbible.xml b/getbible.xml index 182a3bb..dacb104 100644 --- a/getbible.xml +++ b/getbible.xml @@ -1,15 +1,15 @@ COM_GETBIBLE - 29th January, 2024 + 10th February, 2024 Llewellyn van der Merwe joomla@vdm.io https://getbible.net Copyright (C) 2015. All Rights Reserved GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - 5.0.2 + 5.0.3 Get Bible (v.5.0.2) +

Get Bible (v.5.0.3)

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/src/Utilities/GetHelper.php b/libraries/jcb_powers/VDM.Joomla/src/Utilities/GetHelper.php index f584097..1f89e7b 100644 --- a/libraries/jcb_powers/VDM.Joomla/src/Utilities/GetHelper.php +++ b/libraries/jcb_powers/VDM.Joomla/src/Utilities/GetHelper.php @@ -113,14 +113,14 @@ abstract class GetHelper $where = Factory::getUser()->id; } - if(is_null($main)) + if($main === null) { $main = Helper::getCode(); } if (!ArrayHelper::check($where) && $where > 0) { - $where = array($where); + $where = [$where]; } if (ArrayHelper::check($where)) diff --git a/site/src/Controller/AjaxController.php b/site/src/Controller/AjaxController.php index 9e96f40..e944641 100644 --- a/site/src/Controller/AjaxController.php +++ b/site/src/Controller/AjaxController.php @@ -29,6 +29,8 @@ use Joomla\Utilities\ArrayHelper; /** * Getbible Ajax Base Controller + * + * @since 1.6 */ class AjaxController extends BaseController { diff --git a/site/src/Controller/DisplayController.php b/site/src/Controller/DisplayController.php index 5dd4fe4..bc422e6 100644 --- a/site/src/Controller/DisplayController.php +++ b/site/src/Controller/DisplayController.php @@ -123,7 +123,8 @@ class DisplayController extends BaseController if (StringHelper::check($view)) { $views = [ -]; + + ]; // check if this is a edit view if (in_array($view,$views)) { diff --git a/site/src/Field/LinkersField.php b/site/src/Field/LinkersField.php new file mode 100644 index 0000000..f34c444 --- /dev/null +++ b/site/src/Field/LinkersField.php @@ -0,0 +1,192 @@ + + @git Get Bible + @github Get Bible + @support Get Bible + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + +/------------------------------------------------------------------------------------------------------*/ +namespace TrueChristianChurch\Component\Getbible\Site\Field; + +use Joomla\CMS\Factory; +use Joomla\CMS\Form\Field\ListField; +use Joomla\CMS\Language\Text; +use Joomla\CMS\HTML\HTMLHelper as Html; +use Joomla\CMS\Component\ComponentHelper; +use TrueChristianChurch\Component\Getbible\Site\Helper\GetbibleHelper; + +// No direct access to this file +\defined('_JEXEC') or die; + +/** + * Linkers Form Field class for the Getbible component + * + * @since 1.6 + */ +class LinkersField extends ListField +{ + /** + * The linkers field type. + * + * @var string + */ + public $type = 'Linkers'; + + /** + * Override to add new button + * + * @return string The field input markup. + * + * @since 3.2 + */ + protected function getInput() + { + // see if we should add buttons + $set_button = $this->getAttribute('button'); + // get html + $html = parent::getInput(); + // if true set button + if ($set_button === 'true') + { + $button = array(); + $script = array(); + $button_code_name = $this->getAttribute('name'); + // get the input from url + $app = Factory::getApplication(); + $jinput = $app->input; + // get the view name & id + $values = $jinput->getArray(array( + 'id' => 'int', + 'view' => 'word' + )); + // check if new item + $ref = ''; + $refJ = ''; + if (!is_null($values['id']) && strlen($values['view'])) + { + // only load referral if not new item. + $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; + $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + // get the return value. + $_uri = (string) \Joomla\CMS\Uri\Uri::getInstance(); + $_return = urlencode(base64_encode($_uri)); + // load return value. + $ref .= '&return=' . $_return; + $refJ .= '&return=' . $_return; + } + // get button label + $button_label = trim($button_code_name); + $button_label = preg_replace('/_+/', ' ', $button_label); + $button_label = preg_replace('/\s+/', ' ', $button_label); + $button_label = preg_replace("/[^A-Za-z ]/", '', $button_label); + $button_label = ucfirst(strtolower($button_label)); + // get user object + $user = Factory::getApplication()->getIdentity(); + // only add if user allowed to create linker + if ($user->authorise('linker.create', 'com_getbible') && $app->isClient('administrator')) // TODO for now only in admin area. + { + // build Create button + $button[] = ' + '; + } + // only add if user allowed to edit linker + if ($user->authorise('linker.edit', 'com_getbible') && $app->isClient('administrator')) // TODO for now only in admin area. + { + // build edit button + $button[] = ''; + // build script + $script[] = " + document.addEventListener('DOMContentLoaded', function() { + document.getElementById('jform_".$button_code_name."').addEventListener('change', function(e) { + e.preventDefault(); + let ".$button_code_name."Value = this.value; + ".$button_code_name."Button(".$button_code_name."Value); + }); + let ".$button_code_name."Value = document.getElementById('jform_".$button_code_name."').value; + ".$button_code_name."Button(".$button_code_name."Value); + }); + function ".$button_code_name."Button(value) { + var createButton = document.getElementById('".$button_code_name."Create'); + var editButton = document.getElementById('".$button_code_name."Edit'); + if (value > 0) { + // hide the create button + createButton.style.display = 'none'; + // show edit button + editButton.style.display = 'block'; + let url = 'index.php?option=com_getbible&view=linkers&task=linker.edit&id='+value+'".$refJ."'; + editButton.setAttribute('href', url); + } else { + // show the create button + createButton.style.display = 'block'; + // hide edit button + editButton.style.display = 'none'; + } + }"; + } + // check if button was created for linker field. + if (is_array($button) && count($button) > 0) + { + // Load the needed script. + $document = Factory::getApplication()->getDocument(); + $document->addScriptDeclaration(implode(' ',$script)); + // return the button attached to input field. + return '

' .$html . implode('',$button).'
'; + } + } + return $html; + } + + /** + * Method to get a list of options for a list input. + * + * @return array An array of Html options. + * @since 1.6 + */ + protected function getOptions() + { + // Get the user object. + $user = Factory::getApplication()->getIdentity(); + // Get the databse object. + $db = Factory::getDBO(); + $query = $db->getQuery(true); + $query->select($db->quoteName(array('a.guid','a.name'),array('guid','linker_name'))); + $query->from($db->quoteName('#__getbible_linker', 'a')); + $query->where($db->quoteName('a.published') . ' = 1'); + $query->order('a.name ASC'); + // Implement View Level Access (if set in table) + if (!$user->authorise('core.options', 'com_getbible')) + { + $columns = $db->getTableColumns('#__getbible_linker'); + if(isset($columns['access'])) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } + } + $db->setQuery((string)$query); + $items = $db->loadObjectList(); + $options = array(); + if ($items) + { + if ($this->multiple === false) + { + $options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION')); + } + foreach($items as $item) + { + $options[] = Html::_('select.option', $item->guid, $item->linker_name . ' (' . substr($item->guid, 0, 8) . ')'); + } + } + return $options; + } +} diff --git a/site/src/Field/OpenairesponsesField.php b/site/src/Field/OpenairesponsesField.php new file mode 100644 index 0000000..9aa8781 --- /dev/null +++ b/site/src/Field/OpenairesponsesField.php @@ -0,0 +1,85 @@ + + @git Get Bible + @github Get Bible + @support Get Bible + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + +/------------------------------------------------------------------------------------------------------*/ +namespace TrueChristianChurch\Component\Getbible\Site\Field; + +use Joomla\CMS\Factory; +use Joomla\CMS\Form\Field\ListField; +use Joomla\CMS\Language\Text; +use Joomla\CMS\HTML\HTMLHelper as Html; +use Joomla\CMS\Component\ComponentHelper; +use TrueChristianChurch\Component\Getbible\Site\Helper\GetbibleHelper; + +// No direct access to this file +\defined('_JEXEC') or die; + +/** + * Openairesponses Form Field class for the Getbible component + * + * @since 1.6 + */ +class OpenairesponsesField extends ListField +{ + /** + * The openairesponses field type. + * + * @var string + */ + public $type = 'Openairesponses'; + + /** + * Method to get a list of options for a list input. + * + * @return array An array of Html options. + * @since 1.6 + */ + protected function getOptions() + { + // Get the user object. + $user = Factory::getApplication()->getIdentity(); + // Get the databse object. + $db = Factory::getDBO(); + $query = $db->getQuery(true); + $query->select($db->quoteName(array('a.response_id','a.response_id'),array('response_id','open_ai_response_response_id'))); + $query->from($db->quoteName('#__getbible_open_ai_response', 'a')); + $query->order('a.response_id ASC'); + // Implement View Level Access (if set in table) + if (!$user->authorise('core.options', 'com_getbible')) + { + $columns = $db->getTableColumns('#__getbible_open_ai_response'); + if(isset($columns['access'])) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } + } + $db->setQuery((string)$query); + $items = $db->loadObjectList(); + $options = array(); + if ($items) + { + if ($this->multiple === false) + { + $options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION')); + } + foreach($items as $item) + { + $options[] = Html::_('select.option', $item->response_id, $item->open_ai_response_response_id); + } + } + return $options; + } +} diff --git a/site/src/Field/PromptsField.php b/site/src/Field/PromptsField.php new file mode 100644 index 0000000..736c44c --- /dev/null +++ b/site/src/Field/PromptsField.php @@ -0,0 +1,85 @@ + + @git Get Bible + @github Get Bible + @support Get Bible + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + +/------------------------------------------------------------------------------------------------------*/ +namespace TrueChristianChurch\Component\Getbible\Site\Field; + +use Joomla\CMS\Factory; +use Joomla\CMS\Form\Field\ListField; +use Joomla\CMS\Language\Text; +use Joomla\CMS\HTML\HTMLHelper as Html; +use Joomla\CMS\Component\ComponentHelper; +use TrueChristianChurch\Component\Getbible\Site\Helper\GetbibleHelper; + +// No direct access to this file +\defined('_JEXEC') or die; + +/** + * Prompts Form Field class for the Getbible component + * + * @since 1.6 + */ +class PromptsField extends ListField +{ + /** + * The prompts field type. + * + * @var string + */ + public $type = 'Prompts'; + + /** + * Method to get a list of options for a list input. + * + * @return array An array of Html options. + * @since 1.6 + */ + protected function getOptions() + { + // Get the user object. + $user = Factory::getApplication()->getIdentity(); + // Get the databse object. + $db = Factory::getDBO(); + $query = $db->getQuery(true); + $query->select($db->quoteName(array('a.guid','a.name'),array('guid','prompt_name'))); + $query->from($db->quoteName('#__getbible_prompt', 'a')); + $query->order('a.name ASC'); + // Implement View Level Access (if set in table) + if (!$user->authorise('core.options', 'com_getbible')) + { + $columns = $db->getTableColumns('#__getbible_prompt'); + if(isset($columns['access'])) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } + } + $db->setQuery((string)$query); + $items = $db->loadObjectList(); + $options = array(); + if ($items) + { + if ($this->multiple === false) + { + $options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION')); + } + foreach($items as $item) + { + $options[] = Html::_('select.option', $item->guid, $item->prompt_name . ' (' . $item->guid . ')'); + } + } + return $options; + } +} diff --git a/site/src/Field/TagersField.php b/site/src/Field/TagersField.php new file mode 100644 index 0000000..2d9d502 --- /dev/null +++ b/site/src/Field/TagersField.php @@ -0,0 +1,192 @@ + + @git Get Bible + @github Get Bible + @support Get Bible + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + +/------------------------------------------------------------------------------------------------------*/ +namespace TrueChristianChurch\Component\Getbible\Site\Field; + +use Joomla\CMS\Factory; +use Joomla\CMS\Form\Field\ListField; +use Joomla\CMS\Language\Text; +use Joomla\CMS\HTML\HTMLHelper as Html; +use Joomla\CMS\Component\ComponentHelper; +use TrueChristianChurch\Component\Getbible\Site\Helper\GetbibleHelper; + +// No direct access to this file +\defined('_JEXEC') or die; + +/** + * Tagers Form Field class for the Getbible component + * + * @since 1.6 + */ +class TagersField extends ListField +{ + /** + * The tagers field type. + * + * @var string + */ + public $type = 'Tagers'; + + /** + * Override to add new button + * + * @return string The field input markup. + * + * @since 3.2 + */ + protected function getInput() + { + // see if we should add buttons + $set_button = $this->getAttribute('button'); + // get html + $html = parent::getInput(); + // if true set button + if ($set_button === 'true') + { + $button = array(); + $script = array(); + $button_code_name = $this->getAttribute('name'); + // get the input from url + $app = Factory::getApplication(); + $jinput = $app->input; + // get the view name & id + $values = $jinput->getArray(array( + 'id' => 'int', + 'view' => 'word' + )); + // check if new item + $ref = ''; + $refJ = ''; + if (!is_null($values['id']) && strlen($values['view'])) + { + // only load referral if not new item. + $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; + $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + // get the return value. + $_uri = (string) \Joomla\CMS\Uri\Uri::getInstance(); + $_return = urlencode(base64_encode($_uri)); + // load return value. + $ref .= '&return=' . $_return; + $refJ .= '&return=' . $_return; + } + // get button label + $button_label = trim($button_code_name); + $button_label = preg_replace('/_+/', ' ', $button_label); + $button_label = preg_replace('/\s+/', ' ', $button_label); + $button_label = preg_replace("/[^A-Za-z ]/", '', $button_label); + $button_label = ucfirst(strtolower($button_label)); + // get user object + $user = Factory::getApplication()->getIdentity(); + // only add if user allowed to create tag + if ($user->authorise('tag.create', 'com_getbible') && $app->isClient('administrator')) // TODO for now only in admin area. + { + // build Create button + $button[] = ' + '; + } + // only add if user allowed to edit tag + if ($user->authorise('tag.edit', 'com_getbible') && $app->isClient('administrator')) // TODO for now only in admin area. + { + // build edit button + $button[] = ''; + // build script + $script[] = " + document.addEventListener('DOMContentLoaded', function() { + document.getElementById('jform_".$button_code_name."').addEventListener('change', function(e) { + e.preventDefault(); + let ".$button_code_name."Value = this.value; + ".$button_code_name."Button(".$button_code_name."Value); + }); + let ".$button_code_name."Value = document.getElementById('jform_".$button_code_name."').value; + ".$button_code_name."Button(".$button_code_name."Value); + }); + function ".$button_code_name."Button(value) { + var createButton = document.getElementById('".$button_code_name."Create'); + var editButton = document.getElementById('".$button_code_name."Edit'); + if (value > 0) { + // hide the create button + createButton.style.display = 'none'; + // show edit button + editButton.style.display = 'block'; + let url = 'index.php?option=com_getbible&view=tags&task=tag.edit&id='+value+'".$refJ."'; + editButton.setAttribute('href', url); + } else { + // show the create button + createButton.style.display = 'block'; + // hide edit button + editButton.style.display = 'none'; + } + }"; + } + // check if button was created for tag field. + if (is_array($button) && count($button) > 0) + { + // Load the needed script. + $document = Factory::getApplication()->getDocument(); + $document->addScriptDeclaration(implode(' ',$script)); + // return the button attached to input field. + return '
' .$html . implode('',$button).'
'; + } + } + return $html; + } + + /** + * Method to get a list of options for a list input. + * + * @return array An array of Html options. + * @since 1.6 + */ + protected function getOptions() + { + // Get the user object. + $user = Factory::getApplication()->getIdentity(); + // Get the databse object. + $db = Factory::getDBO(); + $query = $db->getQuery(true); + $query->select($db->quoteName(array('a.guid','a.name'),array('guid','tag_name'))); + $query->from($db->quoteName('#__getbible_tag', 'a')); + $query->where($db->quoteName('a.published') . ' = 1'); + $query->order('a.name ASC'); + // Implement View Level Access (if set in table) + if (!$user->authorise('core.options', 'com_getbible')) + { + $columns = $db->getTableColumns('#__getbible_tag'); + if(isset($columns['access'])) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } + } + $db->setQuery((string)$query); + $items = $db->loadObjectList(); + $options = array(); + if ($items) + { + if ($this->multiple === false) + { + $options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION')); + } + foreach($items as $item) + { + $options[] = Html::_('select.option', $item->guid, $item->tag_name . ' (' . substr($item->guid, 0, 8) . ')'); + } + } + return $options; + } +} diff --git a/site/src/Field/TargettranslationsField.php b/site/src/Field/TargettranslationsField.php new file mode 100644 index 0000000..051f81b --- /dev/null +++ b/site/src/Field/TargettranslationsField.php @@ -0,0 +1,87 @@ + + @git Get Bible + @github Get Bible + @support Get Bible + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + +/------------------------------------------------------------------------------------------------------*/ +namespace TrueChristianChurch\Component\Getbible\Site\Field; + +use Joomla\CMS\Factory; +use Joomla\CMS\Form\Field\ListField; +use Joomla\CMS\Language\Text; +use Joomla\CMS\HTML\HTMLHelper as Html; +use Joomla\CMS\Component\ComponentHelper; +use TrueChristianChurch\Component\Getbible\Site\Helper\GetbibleHelper; + +// No direct access to this file +\defined('_JEXEC') or die; + +/** + * Targettranslations Form Field class for the Getbible component + * + * @since 1.6 + */ +class TargettranslationsField extends ListField +{ + /** + * The targettranslations field type. + * + * @var string + */ + public $type = 'Targettranslations'; + + /** + * Method to get a list of options for a list input. + * + * @return array An array of Html options. + * @since 1.6 + */ + protected function getOptions() + { + // Get the user object. + $user = Factory::getApplication()->getIdentity(); + // Get the databse object. + $db = Factory::getDBO(); + $query = $db->getQuery(true); + $query->select($db->quoteName(array('a.abbreviation','a.translation'),array('abbreviation','abbreviation_translation'))); + $query->from($db->quoteName('#__getbible_translation', 'a')); + $query->where($db->quoteName('a.published') . ' = 1'); + $query->order('a.translation ASC'); + // Implement View Level Access (if set in table) + if (!$user->authorise('core.options', 'com_getbible')) + { + $columns = $db->getTableColumns('#__getbible_translation'); + if(isset($columns['access'])) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } + } + $db->setQuery((string)$query); + $items = $db->loadObjectList(); + $options = array(); + if ($items) + { + if ($this->multiple === false) + { + $options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION')); + } + $options[] = Html::_('select.option', 'all', Text::_('COM_GETBIBLE_ALL_TRANSLATIONS')); + foreach($items as $item) + { + $options[] = Html::_('select.option', $item->abbreviation, $item->abbreviation_translation.' (' .$item->abbreviation.')'); + } + } + return $options; + } +} diff --git a/site/src/Field/TranslationsField.php b/site/src/Field/TranslationsField.php new file mode 100644 index 0000000..a2b62f8 --- /dev/null +++ b/site/src/Field/TranslationsField.php @@ -0,0 +1,98 @@ + + @git Get Bible + @github Get Bible + @support Get Bible + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + +/------------------------------------------------------------------------------------------------------*/ +namespace TrueChristianChurch\Component\Getbible\Site\Field; + +use Joomla\CMS\Factory; +use Joomla\CMS\Form\Field\ListField; +use Joomla\CMS\Language\Text; +use Joomla\CMS\HTML\HTMLHelper as Html; +use Joomla\CMS\Component\ComponentHelper; +use TrueChristianChurch\Component\Getbible\Site\Helper\GetbibleHelper; + +// No direct access to this file +\defined('_JEXEC') or die; + +/** + * Translations Form Field class for the Getbible component + * + * @since 1.6 + */ +class TranslationsField extends ListField +{ + /** + * The translations field type. + * + * @var string + */ + public $type = 'Translations'; + + /** + * Method to get a list of options for a list input. + * + * @return array An array of Html options. + * @since 1.6 + */ + protected function getOptions() + { + // Get the user object. + $user = Factory::getApplication()->getIdentity(); + // Get the databse object. + $db = Factory::getDBO(); + $query = $db->getQuery(true); + $query->select($db->quoteName(array('a.abbreviation','a.translation'),array('abbreviation','abbreviation_translation'))); + $query->from($db->quoteName('#__getbible_translation', 'a')); + $query->where($db->quoteName('a.published') . ' = 1'); + $query->order('a.translation ASC'); + // Implement View Level Access (if set in table) + if (!$user->authorise('core.options', 'com_getbible')) + { + $columns = $db->getTableColumns('#__getbible_translation'); + if(isset($columns['access'])) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } + } + $db->setQuery((string)$query); + $items = $db->loadObjectList(); + $options = []; + if (!empty($items)) + { + if ($this->multiple === false) + { + $options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION')); + } + foreach($items as $item) + { + $options[] = Html::_('select.option', $item->abbreviation, $item->abbreviation_translation.' (' .$item->abbreviation.')'); + } + } + + // if none was found we load the KJV as the default + if (empty($options)) + { + $options = []; + if ($this->multiple === false) + { + $options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION')); + } + $options[] = Html::_('select.option', 'kjv', 'King James Version (kjv)'); // this is the default at all times. + } + + return $options; + } +} diff --git a/site/src/Helper/GetbibleHelper.php b/site/src/Helper/GetbibleHelper.php index e1e6843..fb882a8 100644 --- a/site/src/Helper/GetbibleHelper.php +++ b/site/src/Helper/GetbibleHelper.php @@ -22,9 +22,6 @@ namespace TrueChristianChurch\Component\Getbible\Site\Helper; \spl_autoload_register(function ($class) { // project-specific base directories and namespace prefix $search = [ - 'libraries/jcb_powers/VDM.Joomla.GetBible' => 'VDM\\Joomla\\GetBible', - 'libraries/jcb_powers/VDM.Joomla.Openai' => 'VDM\\Joomla\\Openai', - 'libraries/jcb_powers/VDM.Joomla.Gitea' => 'VDM\\Joomla\\Gitea', 'libraries/jcb_powers/VDM.Joomla' => 'VDM\\Joomla' ]; // Start the search and load if found @@ -94,6 +91,8 @@ use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper; /** * Getbible component helper + * + * @since 3.0 */ abstract class GetbibleHelper { diff --git a/site/src/Helper/RouteHelper.php b/site/src/Helper/RouteHelper.php index aab7537..a638934 100644 --- a/site/src/Helper/RouteHelper.php +++ b/site/src/Helper/RouteHelper.php @@ -30,7 +30,6 @@ use VDM\Joomla\Utilities\ArrayHelper; /** * Getbible Component Route Helper * - * @static * @since 1.5 */ abstract class RouteHelper diff --git a/site/src/Model/AjaxModel.php b/site/src/Model/AjaxModel.php index 1e7d536..ce3c9dd 100644 --- a/site/src/Model/AjaxModel.php +++ b/site/src/Model/AjaxModel.php @@ -42,6 +42,8 @@ use VDM\Joomla\Utilities\GuidHelper; /** * Getbible Ajax List Model + * + * @since 1.6 */ class AjaxModel extends ListModel { diff --git a/site/src/Model/AppModel.php b/site/src/Model/AppModel.php index f7b4137..4cea9ec 100644 --- a/site/src/Model/AppModel.php +++ b/site/src/Model/AppModel.php @@ -41,6 +41,8 @@ use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper; /** * Getbible App Item Model + * + * @since 1.6 */ class AppModel extends ItemModel { diff --git a/site/src/Model/OpenaiModel.php b/site/src/Model/OpenaiModel.php index c906351..8c97db9 100644 --- a/site/src/Model/OpenaiModel.php +++ b/site/src/Model/OpenaiModel.php @@ -41,6 +41,8 @@ use VDM\Joomla\Utilities\JsonHelper; /** * Getbible Openai Item Model + * + * @since 1.6 */ class OpenaiModel extends ItemModel { diff --git a/site/src/Model/SearchModel.php b/site/src/Model/SearchModel.php index dd6ea14..6c8731c 100644 --- a/site/src/Model/SearchModel.php +++ b/site/src/Model/SearchModel.php @@ -39,6 +39,8 @@ use VDM\Joomla\GetBible\Factory as GetBibleFactory; /** * Getbible List Model for Search + * + * @since 1.6 */ class SearchModel extends ListModel { diff --git a/site/src/Model/TagModel.php b/site/src/Model/TagModel.php index 927a39b..919b438 100644 --- a/site/src/Model/TagModel.php +++ b/site/src/Model/TagModel.php @@ -40,6 +40,8 @@ use VDM\Joomla\GetBible\Factory as GetBibleFactory; /** * Getbible List Model for Tag + * + * @since 1.6 */ class TagModel extends ListModel { diff --git a/update_server.xml b/update_server.xml index 9b07d2c..bcfa389 100644 --- a/update_server.xml +++ b/update_server.xml @@ -89,4 +89,22 @@ https://getbible.net + + Get Bible + The Bible for Joomla + pkg_getbible + package + site + 5.0.3 + https://getbible.net + + https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v5.0.3.zip + + + stable + + Llewellyn van der Merwe + https://getbible.net + + \ No newline at end of file