Get Bible (v.2.0.5)
Welcome to the next level of scripture engagement - The Bible for Joomla! Our purpose is to bring the Word of God to every person, in their native language, entirely free. This isn't just a typical extension; it's a groundbreaking tool developed to span language divides and deliver a rich, customizable Bible study experience to users worldwide.
diff --git a/libraries/jcb_powers/VDM.Joomla.GetBible/src/Linker.php b/libraries/jcb_powers/VDM.Joomla.GetBible/src/Linker.php
index ec68777..719fdc8 100644
--- a/libraries/jcb_powers/VDM.Joomla.GetBible/src/Linker.php
+++ b/libraries/jcb_powers/VDM.Joomla.GetBible/src/Linker.php
@@ -149,6 +149,33 @@ final class Linker
return null;
}
+ /**
+ * Get active Linker details
+ *
+ * @param bool $setup The setup switch
+ *
+ * @return array|null Linker details
+ * @since 2.0.1
+ **/
+ public function activeDetails(bool $setup = true): ?array
+ {
+ if (($linker = $this->active($setup)) !== null)
+ {
+ // check if this is a valid linker (already set)
+ if (($name = $this->load->value(
+ ['guid' => $linker, 'published' => 1],
+ 'name', 'linker'
+ )) !== null)
+ {
+ return ['guid' => $linker, 'name' => $name, 'share' => $this->share()];
+ }
+
+ return ['guid' => $linker, 'name' => null, 'share' => null];
+ }
+
+ return null;
+ }
+
/**
* Check if a Linker is valid active linker
*
@@ -211,6 +238,75 @@ final class Linker
return true;
}
+ /**
+ * Revoke Linker Session
+ *
+ * @param string $linker The linker GUID value
+ *
+ * @return array|null The success or error details
+ * @since 2.0.1
+ **/
+ public function revokeSession(string $linker): ?array
+ {
+ // linker not valid GUID
+ if (!GuidHelper::valid($linker))
+ {
+ // hmm we can log this
+ return [
+ 'error' => Text::_('COM_GETBIBLE_ACCESS_REVOKED')
+ ];
+ }
+
+ if (($access = $this->session->get('getbible_active_linker_guid', null)) === null
+ || $access !== $linker)
+ {
+ // hmm we can log this
+ return [
+ 'success' => Text::_('COM_GETBIBLE_ACCESS_REVOKED')
+ ];
+ }
+
+ $this->session->set('getbible_active_linker_guid', null);
+
+ return [
+ 'success' => Text::_('COM_GETBIBLE_ACCESS_REVOKED')
+ ];
+ }
+
+ /**
+ * Set a linker name
+ *
+ * @param string $name The linker name
+ *
+ * @return array|null Array on success
+ * @since 2.0.1
+ **/
+ public function setName(string $name): ?array
+ {
+ // make sure the linker has access
+ if (($linker = $this->get()) === null)
+ {
+ return [
+ 'error' => Text::_("COM_GETBIBLE_WITHOUT_SELECTING_THE_CORRECT_FAVOURITE_VERSEBR_YOU_CANT_PERFORM_THE_INITIAL_ACTION"),
+ 'access_required' => true
+ ];
+ }
+
+ // set the name of this linker
+ if (!$this->update->value($name, 'name', $linker, 'guid', 'linker'))
+ {
+ return [
+ 'error' => Text::_('COM_GETBIBLE_THE_NAME_COULD_NOT_BE_UPDATED')
+ ];
+ }
+
+ return [
+ 'guid' => $linker,
+ 'name' => $name,
+ 'success' => Text::_('COM_GETBIBLE_THE_NAME_HAS_BEEN_UPDATED')
+ ];
+ }
+
/**
* Set Access
*
@@ -308,6 +404,41 @@ final class Linker
return (array) $_linker;
}
+ /**
+ * Revoke Access
+ *
+ * @param string $linker The linker GUID value
+ *
+ * @return array|null The success or error details
+ * @since 2.0.1
+ **/
+ public function revoke(string $linker): ?array
+ {
+ // linker not valid GUID
+ if (!GuidHelper::valid($linker))
+ {
+ // hmm we can log this
+ return [
+ 'success' => Text::_('COM_GETBIBLE_ACCESS_REVOKED')
+ ];
+ }
+
+ if (($access = $this->session->get("getbible_active_{$linker}", null)) === null
+ || $access !== 'valid_access')
+ {
+ // hmm we can log this
+ return [
+ 'success' => Text::_('COM_GETBIBLE_ACCESS_REVOKED')
+ ];
+ }
+
+ $this->session->set("getbible_active_{$linker}", null);
+
+ return [
+ 'success' => Text::_('COM_GETBIBLE_ACCESS_REVOKED')
+ ];
+ }
+
/**
* Has Access
*
diff --git a/libraries/jcb_powers/VDM.Joomla.GetBible/src/Note.php b/libraries/jcb_powers/VDM.Joomla.GetBible/src/Note.php
index b51a050..c2932dd 100644
--- a/libraries/jcb_powers/VDM.Joomla.GetBible/src/Note.php
+++ b/libraries/jcb_powers/VDM.Joomla.GetBible/src/Note.php
@@ -103,7 +103,7 @@ final class Note
if (($linker = $this->linker->get()) === null)
{
return [
- 'error' => Text::_("COM_GETBIBLE_WITHOUT_SELECTING_THE_CORRECT_FAVOURITE_VERSE_YOU_CANT_PERFORM_THE_INITIAL_ACTION"),
+ 'error' => Text::_("COM_GETBIBLE_WITHOUT_SELECTING_THE_CORRECT_FAVOURITE_VERSEBR_YOU_CANT_PERFORM_THE_INITIAL_ACTION"),
'access_required' => true
];
}
diff --git a/libraries/jcb_powers/VDM.Joomla.GetBible/src/Tag.php b/libraries/jcb_powers/VDM.Joomla.GetBible/src/Tag.php
index b2fb49a..61e343a 100644
--- a/libraries/jcb_powers/VDM.Joomla.GetBible/src/Tag.php
+++ b/libraries/jcb_powers/VDM.Joomla.GetBible/src/Tag.php
@@ -95,7 +95,7 @@ final class Tag
if (($linker = $this->linker->get()) === null)
{
return [
- 'error' => Text::_("COM_GETBIBLE_WITHOUT_SELECTING_THE_CORRECT_FAVOURITE_VERSE_YOU_CANT_PERFORM_THE_INITIAL_ACTION"),
+ 'error' => Text::_("COM_GETBIBLE_WITHOUT_SELECTING_THE_CORRECT_FAVOURITE_VERSEBR_YOU_CANT_PERFORM_THE_INITIAL_ACTION"),
'access_required' => true
];
}
diff --git a/libraries/jcb_powers/VDM.Joomla.GetBible/src/Tagged.php b/libraries/jcb_powers/VDM.Joomla.GetBible/src/Tagged.php
index 41f9deb..64416ea 100644
--- a/libraries/jcb_powers/VDM.Joomla.GetBible/src/Tagged.php
+++ b/libraries/jcb_powers/VDM.Joomla.GetBible/src/Tagged.php
@@ -131,7 +131,7 @@ final class Tagged
if (($linker = $this->linker->get()) === null)
{
return [
- 'error' => Text::_("COM_GETBIBLE_WITHOUT_SELECTING_THE_CORRECT_FAVOURITE_VERSE_YOU_CANT_PERFORM_THE_INITIAL_ACTION"),
+ 'error' => Text::_("COM_GETBIBLE_WITHOUT_SELECTING_THE_CORRECT_FAVOURITE_VERSEBR_YOU_CANT_PERFORM_THE_INITIAL_ACTION"),
'access_required' => true
];
}
@@ -187,7 +187,7 @@ final class Tagged
if (($linker = $this->linker->get()) === null)
{
return [
- 'error' => Text::_("COM_GETBIBLE_WITHOUT_SELECTING_THE_CORRECT_FAVOURITE_VERSE_YOU_CANT_PERFORM_THE_INITIAL_ACTION"),
+ 'error' => Text::_("COM_GETBIBLE_WITHOUT_SELECTING_THE_CORRECT_FAVOURITE_VERSEBR_YOU_CANT_PERFORM_THE_INITIAL_ACTION"),
'access_required' => true
];
}
diff --git a/script.php b/script.php
index 3dc4dc4..731e09f 100644
--- a/script.php
+++ b/script.php
@@ -1539,7 +1539,7 @@ class com_getbibleInstallerScript
echo '
-
Upgrade to Version 2.0.4 Was Successful! Let us know if anything is not working as expected.
'; +Upgrade to Version 2.0.5 Was Successful! Let us know if anything is not working as expected.
'; // Set db if not set already. if (!isset($db)) diff --git a/site/assets/js/app.js b/site/assets/js/app.js index a925fe7..f9ee252 100644 --- a/site/assets/js/app.js +++ b/site/assets/js/app.js @@ -116,31 +116,285 @@ class ScrollMemory { this.div.addEventListener('scroll', () => this.saveScrollPosition()); } } + +class DatabaseManager { + #dbName; + #storeName; + #fields; + #db; + #uniqueFields; + #isReady = false; + #readyPromise = null; + #data = JSON.parse(localStorage.getItem(this.#storeName)) || []; + constructor(dbName, storeName, fields) { + this.#dbName = dbName; + this.#storeName = storeName; + this.#fields = fields; + this.#uniqueFields = fields.filter((field) => field[1]).map((field) => field[0]); + + if (window.indexedDB) { + this.#readyPromise = this.#openDB().then(() => { + this.#isReady = true; + }); + } else { + this.#isReady = true; + } + } + #openDB = () => { + return new Promise((resolve, reject) => { + const request = window.indexedDB.open(this.#dbName); + request.onerror = (e) => { + console.log('Error opening db', e); + reject('Error'); + }; + request.onsuccess = (e) => { + this.#db = e.target.result; + resolve(); + }; + request.onupgradeneeded = (e) => { + let db = e.target.result; + let store = db.createObjectStore(this.#storeName, { autoIncrement: true, keyPath: 'id' }); + this.#uniqueFields.forEach((field) => { + store.createIndex(field, field, { unique: true }); + }); + }; + }); + } + #waitUntilReady = () => { + return this.#isReady ? Promise.resolve() : this.#readyPromise; + } + #saveToLocalStorage = () => { + localStorage.setItem(this.#storeName, JSON.stringify(this.#data)); + } + async set(data) { + return this.#waitUntilReady().then(() => { + if (!this.#db) { + let existingItem = this.#data.find((item) => this.#uniqueFields.some((field) => item[field] === data[field])); + if (existingItem) { + Object.assign(existingItem, data); + } else { + this.#data.push(data); + } + this.#saveToLocalStorage(); + } else { + const transaction = this.#db.transaction([this.#storeName], 'readwrite'); + const store = transaction.objectStore(this.#storeName); + this.#uniqueFields.forEach((field) => { + const index = store.index(field); + const getRequest = index.get(data[field]); + getRequest.onsuccess = () => { + const existingItem = getRequest.result; + if (existingItem) { + Object.assign(existingItem, data); + store.put(existingItem); + } else { + store.add(data); + } + }; + getRequest.onerror = (error) => { + console.log('Error getting data', error); + }; + }); + } + }); + } + async get(value, key, field = 'guid') { + return this.#waitUntilReady().then(() => { + if (!this.db) { + // If IndexedDB is not available, get value from local storage + const item = this.data.find(item => item[field] === value); + return item ? item[key] : undefined; + } else { + // If IndexedDB is available, get value from the database + return new Promise((resolve, reject) => { + let transaction = this.db.transaction([this.storeName], "readonly"); + let store = transaction.objectStore(this.storeName); + let request = store.index(field).get(value); + request.onsuccess = e => { + const item = e.target.result; + resolve(item ? item[key] : undefined); + }; + request.onerror = e => { + reject("Error", e.target.error); + }; + }); + } + }); + } + async item(value, field = 'guid') { + return this.#waitUntilReady().then(() => { + if (!this.#db) { + return this.#data.find((item) => item[field] === value); + } else { + return new Promise((resolve, reject) => { + const transaction = this.#db.transaction([this.#storeName], 'readonly'); + const store = transaction.objectStore(this.#storeName); + const index = store.index(field); + const getRequest = index.get(value); + getRequest.onsuccess = () => { + resolve(getRequest.result); + }; + getRequest.onerror = (error) => { + reject('Error', error.target.error); + }; + }); + } + }); + } + async all() { + return this.#waitUntilReady().then(() => { + if (!this.#db) { + return this.#data; + } else { + return new Promise((resolve, reject) => { + const transaction = this.#db.transaction([this.#storeName], 'readonly'); + const store = transaction.objectStore(this.#storeName); + const getAllRequest = store.getAll(); + getAllRequest.onsuccess = () => { + resolve(getAllRequest.result); + }; + getAllRequest.onerror = (error) => { + reject('Error', error.target.error); + }; + }); + } + }); + } + async remove(value, field = 'guid') { + return this.#waitUntilReady().then(() => { + if (!this.#db) { + // Handle removal from localStorage + this.#data = this.#data.filter(item => item[field] !== value); + this.#saveToLocalStorage(); + return Promise.resolve(); + } else { + // Handle removal from IndexedDB + return new Promise((resolve, reject) => { + const transaction = this.#db.transaction([this.#storeName], 'readwrite'); + const store = transaction.objectStore(this.#storeName); + let index = store.index(field); + let request = index.openCursor(IDBKeyRange.only(value)); + request.onsuccess = e => { + let cursor = e.target.result; + if (cursor) { + cursor.delete(); // delete the record + resolve(); + } else { + reject("Error: No record found for the provided field and value"); + } + }; + request.onerror = e => { + reject("Error", e.target.error); + }; + }); + } + }); + } +} +/** + * JS to setup the Linker DB + */ +const linkerManager = new DatabaseManager( + 'getBible', + 'linkers', + [['name', false], ['guid', true], ['password', false], ['share', false]] +); +/** + * JS to setup the Settings DB + */ +const settingsManager = new DatabaseManager( + 'getBible', + 'settings', + [['feature', true], ['value', false], ['default', false]] +); /** * JS Function to set Share His Word url */ const setShareHisWordUrl = async (linker, translation, book, chapter) => { // Make a request to your endpoint const response = await fetch(getShareHisWordUrl(linker, translation, book, chapter)); - // Wait for the server to return the response, then parse it as JSON. const data = await response.json(); - if (data.url || data.error) { return data; // return the data object on success } else { throw new Error(data); // throw an error if the request was not successful } }; +/** + * JS Function get the linker ul list display + */ +const getLinkersDisplay = async (linkers) => { + try { + // Convert linkers data to a JSON string + let linkersJson = JSON.stringify(linkers); + // build form + const formData = new FormData(); + // add the form data + formData.set('linkers', linkersJson); + let options = { + method: 'POST', + body: formData + } + // Make a request to your endpoint + const response = await fetch(getLinkersDisplayURL(), options); + // Wait for the server to return the response, then parse it as JSON. + const data = await response.json(); + // Call another function after the response has been received + if (data.display) { + // Show success message + document.getElementById('getbible-sessions-linker-details').innerHTML = data.display; + } else { + // Handle any errors + console.error("Error occurred: ", data); + } + } catch (error) { + // Handle any errors + console.error("Error occurred: ", error); + } +}; /** * JS Function to check if we have a valid linker key */ const checkValidLinker = async (linker, oldLinker) => { // Make a request to your endpoint const response = await fetch(getCheckValidLinkerUrl(linker, oldLinker)); - // Wait for the server to return the response, then parse it as JSON. const data = await response.json(); + if (data.success || data.error) { + return data; // return the data object on success + } else { + throw new Error(data); // throw an error if the request was not successful + } +}; +/** + * JS Function to set the linker session value + */ +const setLinker = async (linker) => { + // Make a request to your endpoint + const response = await fetch(getSetLinkerURL(linker)); + // Wait for the server to return the response, then parse it as JSON. + const data = await response.json(); + if (data.success || data.error) { + return data; // return the data object on success + } else { + throw new Error(data); // throw an error if the request was not successful + } +}; +/** + * JS Function to revoke linker session + */ +const revokeLinkerSession = async (linker) => { + // build form + const formData = new FormData(); + // add the form data + formData.set('linker', linker); + let options = { + method: 'POST', + body: formData + } + const response = await fetch(revokeLinkerSessionURL(), options); + const data = await response.json(); if (data.success || data.error) { return data; // return the data object on success @@ -148,6 +402,114 @@ const checkValidLinker = async (linker, oldLinker) => { throw new Error(data); // throw an error if the request was not successful } }; +/** + * JS Function to set the linker pass value + */ +const setLinkerAccess = async (linker, pass, oldPass = '') => { + // build form + const formData = new FormData(); + // add the form data + formData.set('linker', linker); + formData.set('pass', pass); + formData.set('old', oldPass); + let options = { + method: 'POST', + body: formData + } + const response = await fetch(getSetLinkerAccessURL(), options); + const data = await response.json(); + + if (data.success || data.error) { + return data; // return the data object on success + } else { + throw new Error(data); // throw an error if the request was not successful + } +}; +/** + * JS Function to revoke linker access + */ +const revokeLinkerAccess = async (linker) => { + // build form + const formData = new FormData(); + // add the form data + formData.set('linker', linker); + let options = { + method: 'POST', + body: formData + } + const response = await fetch(revokeLinkerAccessURL(), options); + const data = await response.json(); + + if (data.success || data.error) { + return data; // return the data object on success + } else { + throw new Error(data); // throw an error if the request was not successful + } +}; +/** + * JS Function to set the linker pass value + */ +const setLinkerName = async (name) => { + try { + // build form + const formData = new FormData(); + // add the form data + formData.set('name', name); + let options = { + method: 'POST', + body: formData + } + const response = await fetch(setLinkerNameURL(), options); + // Wait for the server to return the response, then parse it as JSON. + const data = await response.json(); + // Call another function after the response has been received + if (data.success) { + // Show success message + UIkit.notification({ + message: data.success, + status: 'success', + timeout: 5000 + }); + let linker = getLocalMemory('getbible_active_linker_guid', null); + if (linker) { + let fieldName = document.getElementById('get-session-name-' + linker); + if (fieldName) { + fieldName.value = name; + } + } + } else if (data.access_required && data.error) { + setupGetBibleAccess( + null, + data.error, + setLinkerName, + [name] + ); + } else { + // Handle any errors + console.error("Error occurred: ", data); + } + } catch (error) { + // Handle any errors + console.error("Error occurred: ", error); + } +}; +/** + * JS Function to set the active linker on the page + */ +const setActiveLinkerOnPage = async (guid) => { + // Get all elements with the class name 'getbible-linker-guid-value' + let values = document.getElementsByClassName('getbible-linker-guid-value'); + let inputs = document.getElementsByClassName('getbible-linker-guid-input'); + // Update the 'textContent' of each value display + for (let i = 0; i < values.length; i++) { + values[i].textContent = guid; + } + // Update the 'value' of each input area + for (let i = 0; i < inputs.length; i++) { + inputs[i].value = guid; + } +} + /** * JS Function to set the search url */ @@ -198,7 +560,6 @@ const setOpenaiUrl = async (ids, guid, words, verse, chapter, book, translation) console.error("Error occurred: ", error); } }; - /** * JS Function to update the url */ @@ -208,75 +569,6 @@ const updateUrl = (id, url) => { button.href = url; } } - -/** - * JS Function to set the linker session value - */ -const setLinker = async (linker) => { - try { - // Make a request to your endpoint - const response = await fetch(getSetLinkerURL(linker)); - - // Wait for the server to return the response, then parse it as JSON. - const data = await response.json(); - - // Call another function after the response has been received - if (data.success) { - console.log(linker, data.success); - } else { - // Handle any errors - console.error("Error occurred: ", data); - } - } catch (error) { - // Handle any errors - console.error("Error occurred: ", error); - } -}; - -/** - * JS Function to set the linker pass value - */ -const setLinkerAccess = async (linker, pass, oldPass = '') => { - // build form - const formData = new FormData(); - - // add the form data - formData.set('linker', linker); - formData.set('pass', pass); - formData.set('old', oldPass); - - let options = { - method: 'POST', - body: formData - } - - const response = await fetch(getSetLinkerAccessURL(), options); - const data = await response.json(); - - if (data.success || data.error) { - return data; // return the data object on success - } else { - throw new Error(data); // throw an error if the request was not successful - } -}; - -/** - * JS Function to set the active linker on the page - */ -const setActiveLinkerOnPage = async (guid) => { - // Get all elements with the class name 'getbible-linker-guid-value' - let values = document.getElementsByClassName('getbible-linker-guid-value'); - let inputs = document.getElementsByClassName('getbible-linker-guid-input'); - // Update the 'textContent' of each value display - for (let i = 0; i < values.length; i++) { - values[i].textContent = guid; - } - // Update the 'value' of each input area - for (let i = 0; i < inputs.length; i++) { - inputs[i].value = guid; - } -} - /** * JS Function to set a note */ @@ -284,24 +576,19 @@ const setNote = async (book, chapter, verse, note) => { try { // build form const formData = new FormData(); - // add the form data formData.set('book', book); formData.set('chapter', chapter); formData.set('verse', verse); formData.set('note', note); - let options = { method: 'POST', body: formData } - // Make a request to your endpoint const response = await fetch(getSetNoteURL(), options); - // Wait for the server to return the response, then parse it as JSON. const data = await response.json(); - // Call another function after the response has been received if (data.success) { // Show success message @@ -332,7 +619,6 @@ const setNote = async (book, chapter, verse, note) => { console.error("Error occurred: ", error); } }; - /** * JS Function to set a tag */ @@ -340,10 +626,8 @@ const setTag = async (name) => { try { // Make a request to your endpoint const response = await fetch(getSetTagURL(name)); - // Wait for the server to return the response, then parse it as JSON. const data = await response.json(); - // Call another function after the response has been received if (data.success) { // Show success message @@ -375,7 +659,6 @@ const setTag = async (name) => { console.error("Error occurred: ", error); } }; - /** * JS Function to set a tag to a verse */ @@ -383,10 +666,8 @@ const tagVerse = async (translation, book, chapter, verse, tag) => { try { // Make a request to your endpoint const response = await fetch(getTagVerseURL(translation, book, chapter, verse, tag)); - // Wait for the server to return the response, then parse it as JSON. const data = await response.json(); - // Call another function after the response has been received if (data.success) { // So success message @@ -428,10 +709,8 @@ const removeTagFromVerse = async (tag, verse) => { try { // Make a request to your endpoint const response = await fetch(getRemoveTagFromVerseURL(tag)); - // Wait for the server to return the response, then parse it as JSON. const data = await response.json(); - // Call another function after the response has been received if (data.success) { // Show success message @@ -476,31 +755,27 @@ const removeTagFromVerse = async (tag, verse) => { console.error("Error occurred: ", error); } }; - /** * JS Function to set get Bible access */ const setupGetBibleAccess = async (active_modal, error_message, callback, args) => { // close the active modal - UIkit.modal('#' + active_modal).hide(); + if (active_modal !== null) { + UIkit.modal('#' + active_modal).hide(); + } try { - let modal = UIkit.modal('#getbible_favourite_verse_selector'); - modal.show(); - // get linker + // get old linker let linker_old = getLocalMemory('getbible_active_linker_guid'); // Wait for the modal to be closed - await new Promise(resolve => { - // The 'hidden' event is triggered when the modal is closed - UIkit.util.on(modal.$el, 'hidden', function() { - resolve(); - }); - }); - // get linker + await setGetBibleFavouriteVerse(); + // get new linker let linker = getLocalMemory('getbible_active_linker_guid'); - let pass = getLocalMemory(linker); + let pass = getLocalMemory(linker + '-validated'); // check if access was set if (pass) { - UIkit.modal('#' + active_modal).show(); + if (active_modal !== null) { + UIkit.modal('#' + active_modal).show(); + } // we should reload the page if a new linker was set if (linker_old !== linker) { triggerGetBibleReload = true; @@ -515,11 +790,14 @@ const setupGetBibleAccess = async (active_modal, error_message, callback, args) }); } } catch (error) { - // Handle any errors - console.error("Error occurred: ", error); + // Show message + UIkit.notification({ + message: error_message, + status: 'warning', + timeout: 5000 + }); } }; - /** * JS Function to create an tag div item */ @@ -531,19 +809,15 @@ const createGetbileTagDivItem = (id, verse, name, url, tagged = null, ) => { if (tagged !== null) { itemElement.dataset.tagged = tagged; } - let marginDiv = document.createElement('div'); marginDiv.className = 'uk-margin'; - let cardDiv = document.createElement('div'); cardDiv.className = 'uk-card uk-card-default uk-card-body uk-card-small'; - // Create handle span let handleSpan = document.createElement('span'); handleSpan.className = 'uk-sortable-handle uk-margin-small-right uk-text-center'; handleSpan.setAttribute('uk-icon', 'move'); handleSpan.insertAdjacentText('beforeend', name + ' '); - // Create view icon let viewIcon = document.createElement('a'); viewIcon.href = url; @@ -553,17 +827,13 @@ const createGetbileTagDivItem = (id, verse, name, url, tagged = null, ) => { viewIcon.onclick = (event) => { event.stopPropagation(); }; - // Append view icon and name to cardDiv cardDiv.appendChild(handleSpan); cardDiv.appendChild(viewIcon); - marginDiv.appendChild(cardDiv); itemElement.appendChild(marginDiv); - return itemElement; }; - /** * JS Function to clear content from its parent div */ diff --git a/site/controllers/ajax.json.php b/site/controllers/ajax.json.php index f308bfe..de2c5f3 100644 --- a/site/controllers/ajax.json.php +++ b/site/controllers/ajax.json.php @@ -42,11 +42,15 @@ class GetbibleControllerAjax extends BaseController $this->registerTask('getAppUrl', 'ajax'); $this->registerTask('setLinker', 'ajax'); $this->registerTask('setLinkerAccess', 'ajax'); + $this->registerTask('revokeLinkerSession', 'ajax'); + $this->registerTask('revokeLinkerAccess', 'ajax'); + $this->registerTask('setLinkerName', 'ajax'); $this->registerTask('setNote', 'ajax'); $this->registerTask('tagVerse', 'ajax'); $this->registerTask('removeTagFromVerse', 'ajax'); $this->registerTask('setTag', 'ajax'); $this->registerTask('removeTag', 'ajax'); + $this->registerTask('getLinkersDisplay', 'ajax'); $this->registerTask('getSearchUrl', 'ajax'); $this->registerTask('getOpenaiURL', 'ajax'); } @@ -327,6 +331,129 @@ class GetbibleControllerAjax extends BaseController } } break; + case 'revokeLinkerSession': + try + { + $linkerValue = $jinput->get('linker', NULL, 'STRING'); + if($linkerValue) + { + $result = $this->getModel('ajax')->revokeLinkerSession($linkerValue); + } + else + { + $result = false; + } + if($callback) + { + echo $callback . "(".json_encode($result).");"; + } + elseif($returnRaw) + { + echo json_encode($result); + } + else + { + echo "(".json_encode($result).");"; + } + } + catch(Exception $e) + { + if($callback) + { + echo $callback."(".json_encode($e).");"; + } + elseif($returnRaw) + { + echo json_encode($e); + } + else + { + echo "(".json_encode($e).");"; + } + } + break; + case 'revokeLinkerAccess': + try + { + $linkerValue = $jinput->get('linker', NULL, 'STRING'); + if($linkerValue) + { + $result = $this->getModel('ajax')->revokeLinkerAccess($linkerValue); + } + else + { + $result = false; + } + if($callback) + { + echo $callback . "(".json_encode($result).");"; + } + elseif($returnRaw) + { + echo json_encode($result); + } + else + { + echo "(".json_encode($result).");"; + } + } + catch(Exception $e) + { + if($callback) + { + echo $callback."(".json_encode($e).");"; + } + elseif($returnRaw) + { + echo json_encode($e); + } + else + { + echo "(".json_encode($e).");"; + } + } + break; + case 'setLinkerName': + try + { + $nameValue = $jinput->get('name', NULL, 'STRING'); + if($nameValue) + { + $result = $this->getModel('ajax')->setLinkerName($nameValue); + } + else + { + $result = false; + } + if($callback) + { + echo $callback . "(".json_encode($result).");"; + } + elseif($returnRaw) + { + echo json_encode($result); + } + else + { + echo "(".json_encode($result).");"; + } + } + catch(Exception $e) + { + if($callback) + { + echo $callback."(".json_encode($e).");"; + } + elseif($returnRaw) + { + echo json_encode($e); + } + else + { + echo "(".json_encode($e).");"; + } + } + break; case 'setNote': try { @@ -539,6 +666,47 @@ class GetbibleControllerAjax extends BaseController } } break; + case 'getLinkersDisplay': + try + { + $linkersValue = $jinput->get('linkers', NULL, 'STRING'); + if($linkersValue) + { + $result = $this->getModel('ajax')->getLinkersDisplay($linkersValue); + } + else + { + $result = false; + } + if($callback) + { + echo $callback . "(".json_encode($result).");"; + } + elseif($returnRaw) + { + echo json_encode($result); + } + else + { + echo "(".json_encode($result).");"; + } + } + catch(Exception $e) + { + if($callback) + { + echo $callback."(".json_encode($e).");"; + } + elseif($returnRaw) + { + echo json_encode($e); + } + else + { + echo "(".json_encode($e).");"; + } + } + break; case 'getSearchUrl': try { diff --git a/site/language/en-GB/en-GB.com_getbible.ini b/site/language/en-GB/en-GB.com_getbible.ini index 12d4163..a073257 100644 --- a/site/language/en-GB/en-GB.com_getbible.ini +++ b/site/language/en-GB/en-GB.com_getbible.ini @@ -2,7 +2,11 @@ COM_CONTENT_FIELD_MODIFIED_DESC="The last date this item was modified." COM_GETBIBLE="Get Bible" COM_GETBIBLE_ABBREVIATION="Abbreviation" COM_GETBIBLE_ACCESS_ALREADY_EXIST_BUT_COULD_NOT_BE_REACTIVATED="Access already exist, but could not be reactivated." +COM_GETBIBLE_ACCESS_REVOKED="Access revoked." COM_GETBIBLE_ACTIVE="Active" +COM_GETBIBLE_ACTIVE_PERSISTENT_SESSION="Active Persistent Session:" +COM_GETBIBLE_ACTIVE_PERSISTENT_SESSION_WAS_NOT_REMOVED="Active persistent session was not removed." +COM_GETBIBLE_ACTIVE_PERSISTENT_SESSION_WAS_REMOVED="Active persistent session was removed." COM_GETBIBLE_ACTIVE_TAG="Active Tag" COM_GETBIBLE_ADD="Add" COM_GETBIBLE_ADD_YOUR_NOTES_HERE="add your notes here..." @@ -33,7 +37,6 @@ COM_GETBIBLE_CHAPTER="Chapter" COM_GETBIBLE_CHAPTERS="Chapters" COM_GETBIBLE_COMPLETION_TOKENS="Completion Tokens" COM_GETBIBLE_COPY="Copy" -COM_GETBIBLE_COPY_SESSION_LINK="Copy Session Link" COM_GETBIBLE_CREATED="Created" COM_GETBIBLE_CREATE_NEW_S="Create New %s" COM_GETBIBLE_DAILY_VERSE="Daily Verse" @@ -46,6 +49,7 @@ COM_GETBIBLE_DRAG_AND_DROP_THE_DESIRED_TAG_FROM_THE_AVAILABLE_ONES_TO_THE_ACTIVE COM_GETBIBLE_EDIT_NOTE="Edit note" COM_GETBIBLE_EDIT_S="Edit %s" COM_GETBIBLE_EMPTY="Empty" +COM_GETBIBLE_ENABLE_EXCLUSIVE_ACCESS_TO_EDIT_YOUR_NOTES_AND_TAGS="Enable exclusive access to edit your notes and tags." COM_GETBIBLE_ENCODING="Encoding" COM_GETBIBLE_EXACT="Exact" COM_GETBIBLE_EXACT_MATCH="Exact Match" @@ -63,9 +67,10 @@ COM_GETBIBLE_FREQUENCY_PENALTY="Frequency Penalty" COM_GETBIBLE_HEADERS="Headers" COM_GETBIBLE_HELLO_S="Hello %s" COM_GETBIBLE_HIDE="Hide" -COM_GETBIBLE_HOWEVER_TO_MODIFY_YOUR_SPAN_CLASSGETBIBLEACTIVITYNOTESANDTAGSNOTES_AND_TAGSSPAN_YOU_NEED_BOTH_THE_SESSION_KEY_AND_YOUR_FAVOURITE_VERSE="However, to modify your , you need both the session key and your favourite verse." +COM_GETBIBLE_HOWEVER_TO_MODIFY_YOUR_SPAN_CLASSGETBIBLEACTIVITYNOTESANDTAGSNOTES_AND_TAGSSPAN_YOU_NEED_BOTH_THE_PERSISTENT_SESSION_KEY_AND_YOUR_FAVOURITE_VERSE="However, to modify your , you need both the persistent session key and your favourite verse." COM_GETBIBLE_HOW_THIS_ALL_WORKS="How This All Works" COM_GETBIBLE_HTWOCURL_NOT_FOUNDHTWOPPLEASE_SETUP_CURL_ON_YOUR_SYSTEM_OR_BGETBIBLEB_WILL_NOT_FUNCTION_CORRECTLYP="Curl Not Found!
Please setup curl on your system, or getbible will not function correctly!
" +COM_GETBIBLE_IF_YOU_SWITCH_FROM_YOUR_ACTIVE_SESSION_TO_A_SHARED_ONE_YOUR_ORIGINAL_SESSION_WILL_BE_PRESERVED_HERE_FOR_EASY_ACCESS="If you switch from your active session to a shared one, your original session will be preserved here for easy access." COM_GETBIBLE_INCORRECT_FAVOURITE_VERSE_SELECTED="Incorrect favourite verse selected." COM_GETBIBLE_INSENSITIVE="Insensitive" COM_GETBIBLE_INSTALL="Install" @@ -76,7 +81,9 @@ COM_GETBIBLE_LABEL="Label" COM_GETBIBLE_LAYOUT="Layout" COM_GETBIBLE_LICENSE="License" COM_GETBIBLE_LINK="Link" -COM_GETBIBLE_LOAD_PREVIOUS_SESSION="Load Previous Session" +COM_GETBIBLE_LOAD="Load" +COM_GETBIBLE_LOADING="Loading" +COM_GETBIBLE_LOAD_PREVIOUS_PERSISTENT_SESSION="Load Previous Persistent Session" COM_GETBIBLE_MARKDOWN="Markdown" COM_GETBIBLE_MATCH="Match" COM_GETBIBLE_MAX_TOKENS="Max Tokens" @@ -111,6 +118,7 @@ COM_GETBIBLE_PARTIAL="Partial" COM_GETBIBLE_PARTIAL_MATCH="Partial Match" COM_GETBIBLE_PASSWORD_TO_SHORT_USE_A_LONGER_PASSWORD="Password to short, use a longer password." COM_GETBIBLE_PERFORMING_MULTIPLE_INSTALLATIONS_WILL_NOT_CAUSE_ANY_DUPLICATES_OR_DATA_CLUTTER_THE_SYSTEM_INTELLIGENTLY_RECOGNIZES_ALREADY_INSTALLED_PARTS_AND_MERELY_REFRESHES_THEM_TO_VERIFY_THAT_THEY_ARE_IN_SYNC_WITH_THE_ORIGINAL_SOURCE="Performing multiple installations will not cause any duplicates or data clutter. The system intelligently recognizes already installed parts and merely refreshes them to verify that they are in sync with the original source." +COM_GETBIBLE_PERSISTENT_SESSION_KEY="Persistent Session Key" COM_GETBIBLE_PER_LINE="Per Line" COM_GETBIBLE_PLAIN_TEXT="Plain Text" COM_GETBIBLE_PLEASE_KEEP_YOUR_FAVOURITE_VERSE_PRIVATE="Please Keep Your Favourite Verse Private" @@ -129,6 +137,7 @@ COM_GETBIBLE_REMOVE="Remove" COM_GETBIBLE_RESEARCH_THIS="Research this" COM_GETBIBLE_RESPONSE="Response" COM_GETBIBLE_RESPONSE_DETAILS="Response Details" +COM_GETBIBLE_REVOKE_EXCLUSIVE_ACCESS_TO_EDIT_YOUR_NOTES_AND_TAGS="Revoke exclusive access to edit your notes and tags." COM_GETBIBLE_SAVE="Save" COM_GETBIBLE_SCRIPTURE="Scripture" COM_GETBIBLE_SEARCH="Search" @@ -137,16 +146,21 @@ COM_GETBIBLE_SEARCH_OPTIONS="Search Options" COM_GETBIBLE_SEARCH_RESULTS="Search Results" COM_GETBIBLE_SELECT="Select" COM_GETBIBLE_SENSITIVE="Sensitive" +COM_GETBIBLE_SESSIONS="Sessions" COM_GETBIBLE_SESSION_KEY="Session Key" COM_GETBIBLE_SESSION_KEY_COULD_NOT_BE_STORED="Session key could not be stored." +COM_GETBIBLE_SESSION_NAME="Session Name" COM_GETBIBLE_SETTINGS="Settings" COM_GETBIBLE_SHARE="Share" COM_GETBIBLE_SHARE_LINK="Share Link" COM_GETBIBLE_SHARE_TEXT="Share Text" +COM_GETBIBLE_SHARE_YOUR_SESSION="Share Your Session" COM_GETBIBLE_SHARING_THE_WORD_OF_GOD_WITH_THE_WORLD="Sharing the Word of God with the world." COM_GETBIBLE_SHOULD_YOU_HAVE_BANOTHER_SESSION_KEYB_FROM_A_PREVIOUS_SESSION="Should you have another session key from a previous session." COM_GETBIBLE_SHOW="Show" COM_GETBIBLE_SOURCE="Source" +COM_GETBIBLE_STYLE="Style" +COM_GETBIBLE_STYLE_GO_HERE="Style go here" COM_GETBIBLE_TAB_NAME_PLACEHOLDERS="Tab Name Placeholders" COM_GETBIBLE_TAG="Tag" COM_GETBIBLE_TAGGED_VERSES="Tagged Verses" @@ -164,24 +178,27 @@ COM_GETBIBLE_THERE_WAS_AN_ERROR_PLEASE_RELOAD_YOUR_PAGE_AND_TRY_AGAIN="There was COM_GETBIBLE_THE_ACTIVE_VERSE_SELECTED_TEXT_SHOULD_LOAD_HERE="The active verse selected text should load here." COM_GETBIBLE_THE_CHAPTERS_OF_BOOKS_WAS_SUCCESSFULLY_INSTALLED_FOR_S_TRANSLATION="The chapter:%s of book:%s was successfully installed for %s translation." COM_GETBIBLE_THE_LINK_WAS_COPIED_TO_YOUR_CLIPBOARD="The link was copied to your clipboard!" +COM_GETBIBLE_THE_NAME_COULD_NOT_BE_UPDATED="The name could not be updated." +COM_GETBIBLE_THE_NAME_HAS_BEEN_UPDATED="The name has been updated." COM_GETBIBLE_THE_NOTE_WAS_SUCCESSFULLY_CREATED="The note was successfully created." COM_GETBIBLE_THE_NOTE_WAS_SUCCESSFULLY_UPDATED="The note was successfully updated." +COM_GETBIBLE_THE_PERSISTENT_SESSION_KEY_ALLOWS_VIEWING_WHILE_EDITING_IS_ONLY_POSSIBLE_WHEN_THE_CORRECT_FAVOURITE_VERSE_IS_PROVIDED="The persistent session key allows viewing, while editing is only possible when the correct favourite verse is provided." COM_GETBIBLE_THE_SCRIPTURE_WAS_COPIED_TO_YOUR_CLIPBOARD="The scripture was copied to your clipboard!" COM_GETBIBLE_THE_SEARCH_FEATURE_HAS_NOT_BEEN_ACTIVATED_PLEASE_CONTACT_THE_SYSTEM_ADMINISTRATOR_OF_THIS_WEBSITE_TO_RESOLVE_THIS="The search feature has not been activated. Please contact the system administrator of this website to resolve this." COM_GETBIBLE_THE_SESSION_IS_SET="The session is set." -COM_GETBIBLE_THE_SESSION_KEY_ALLOWS_VIEWING_WHILE_EDITING_IS_ONLY_POSSIBLE_WHEN_THE_CORRECT_FAVOURITE_VERSE_IS_PROVIDED="The session key allows viewing, while editing is only possible when the correct favourite verse is provided." COM_GETBIBLE_THE_TAG_SELECTED_IS_NOT_ACTIVE_PLEASE_SELECT_AN_ACTIVE_TAG="The tag selected is not active, please select an active tag." COM_GETBIBLE_THE_TAG_WAS_SUCCESSFULLY_REMOVED="The tag was successfully removed." COM_GETBIBLE_THE_TAG_WAS_SUCCESSFULLY_REMOVED_FROM_THE_VERSE="The tag was successfully removed from the verse." COM_GETBIBLE_THE_TAG_WAS_SUCCESSFULLY_SET="The tag was successfully set." COM_GETBIBLE_THE_VERSE_WAS_SUCCESSFULLY_TAGGED="The verse was successfully tagged." COM_GETBIBLE_THE_WORDS_OF_ETERNAL_LIFE="The words of eternal life!" +COM_GETBIBLE_THIS_AREA_DISPLAYS_YOUR_RECENTLY_ACCESSED_SESSIONS="This area displays your recently accessed sessions." COM_GETBIBLE_THIS_INSTALLATION_PROCESS_IS_A_ONETIME_OPERATION_FOR_EACH_TRANSLATION_HOWEVER_YOU_ARE_WELCOME_TO_RUN_THE_PROCESS_A_SECOND_TIME_OR_AS_OFTEN_AS_YOUD_LIKE_TO_VALIDATE_AND_ENSURE_THAT_ALL_CONTENT_WAS_PROPERLY_LOADED_AND_IS_UPTODATE="This installation process is a one-time operation for each translation. However, you are welcome to run the process a second time or as often as you'd like to validate and ensure that all content was properly loaded and is up-to-date." COM_GETBIBLE_THIS_IS_A_GLOBAL_TAG_SET_BY_US_AT_BSB_FOR_YOUR_CONVENIENCE_WE_HOLD_THE_PRIVILEGE_TO_MODIFY_THESE_TAGS_IF_YOU_BELIEVE_ITS_SET_IN_ERROR_KINDLY_INFORM_US="This is a global tag, set by us at %s for your convenience. We hold the privilege to modify these tags. If you believe it's set in error, kindly inform us." COM_GETBIBLE_THIS_IS_CURRENTLY_THE_ACTIVE_SESSION_KEY="This is currently the active session key." COM_GETBIBLE_THIS_IS_NOT_A_VALID_SESSION_KEY="This is not a valid session key." -COM_GETBIBLE_THIS_SESSION_IS_ALREADY_ACTIVE="This session is already active." -COM_GETBIBLE_THIS_SESSION_KEY_DOES_NOT_QUALIFY_FOR_SHARING="This session key does not qualify for sharing." +COM_GETBIBLE_THIS_PERSISTENT_SESSION_IS_ALREADY_ACTIVE="This persistent session is already active." +COM_GETBIBLE_THIS_SESSION_KEY_IS_NOT_YET_ELIGIBLE_FOR_SHARING_AS_NO_ACTIONS_HAVE_BEEN_PERFORMED_WITHIN_IT="This session key is not yet eligible for sharing, as no actions have been performed within it." COM_GETBIBLE_THIS_TAG_COULD_NOT_BE_REMOVED="This tag could not be removed." COM_GETBIBLE_THIS_TAG_CURRENTLY_DOESNT_HAVE_ANY_VERSES_LINKED_TO_IT_PLEASE_SELECT_ANOTHER_TAG_OR_ATTACH_SOME_VERSES_TO_THIS_ONE="This tag currently doesn't have any verses linked to it. Please select another tag, or attach some verses to this one." COM_GETBIBLE_THIS_VERSE_IN_COMBINATION_WITH_YOUR_ISESSION_KEYI_WILL_BE_USED_TO_AUTHENTICATE_YOU_IN_THE_FUTURE="This verse in combination with your session key will be used to authenticate you in the future." @@ -190,10 +207,11 @@ COM_GETBIBLE_TOP_P="Top P" COM_GETBIBLE_TOTALTOKENS="TotalTokens" COM_GETBIBLE_TO_PERFORM_THIS_OPEN_THE_GLOBAL_OPTIONS_SECTION_OF_THE_GETBIBLE_BACKEND_LOCATE_THE_GLOBAL_TAB_AND_SWITCH_SHOW_INSTALL_BUTTON_TO_NO_THIS_STEP_ENSURES_THAT_YOUR_SYSTEM_RESOURCES_ARE_NOT_UTILIZED_UNNECESSARILY_ONCE_YOU_HAVE_SUCCESSFULLY_INSTALLED_ALL_YOUR_DESIRED_BIBLE_TRANSLATIONS="To perform this, open the 'Global Options' section of the getBible backend, locate the 'Global' Tab, and switch 'Show Install Button' to [No]. This step ensures that your system resources are not utilized unnecessarily once you have successfully installed all your desired Bible translations." COM_GETBIBLE_TO_UNTAG_A_VERSE_DRAG_AND_DROP_THE_DESIRED_TAG_FROM_ACTIVE_TO_THE_AVAILABLE_TAGS_AREA="To un-tag a verse, drag and drop the desired tag from active to the available tags area." -COM_GETBIBLE_TO_USE_A_DIFFERENT_SESSION_KEY_SIMPLY_ADD_IT_HERE="To use a different session key, simply add it here." +COM_GETBIBLE_TO_USE_A_DIFFERENT_PERSISTENT_SESSION_KEY_SIMPLY_ADD_IT_ABOVE_AND_CLICK_LOAD="To use a different persistent session key, simply add it above, and click load." COM_GETBIBLE_TRANSLATION="Translation" COM_GETBIBLE_TRANSLATIONS="Translations" COM_GETBIBLE_TYPE_YOUR_SEARCH_PHRASE_INTO_THE_SEARCH_BOX_AND_PRESS_ENTER_TO_SEARCH_THE_BSCRIPTURESB_DAILY="Type your search phrase into the search box and press [ENTER] to search the Scriptures daily!" +COM_GETBIBLE_UPDATE_PERSISTENT_SESSION_NAME="Update Persistent Session Name" COM_GETBIBLE_VALIDATION_HASH_OF_THIS_CHAPTER="Validation Hash of this Chapter" COM_GETBIBLE_VERSE="Verse" COM_GETBIBLE_VERSES="Verses" @@ -202,15 +220,18 @@ COM_GETBIBLE_VIEW_ALL_VERSES_TAGGED="View all verses tagged." COM_GETBIBLE_WERE_SORRY_THE_TRANSLATION_YOU_SELECTED_DOES_NOT_INCLUDE_THE_BOOK_YOU_WERE_IN_PREVIOUSLY_HOWEVER_WE_HAVE_LOCATED_BSB_WHICH_MIGHT_BE_OF_INTEREST_TO_YOU="We're sorry, the translation you selected does not include the book you were in previously. However, we have located %s which might be of interest to you." COM_GETBIBLE_WE_CURRENTLY_HAVE_BSB_VERSES_STORED_IN_THE_DATABASE_FOR_THIS_PARTICULAR_TRANSLATION="We currently have %s verses stored in the database for this particular translation." COM_GETBIBLE_WHAT_IS_THIS_HASH_ALL_ABOUT_CLICK_HERE_TO_READ_MORE="What is this Hash all about? Click here to read more..." -COM_GETBIBLE_WITHOUT_SELECTING_THE_CORRECT_FAVOURITE_VERSE_YOU_CANT_PERFORM_THE_INITIAL_ACTION="Without selecting the correct favourite verse, you can't perform the initial action." +COM_GETBIBLE_WITHOUT_SELECTING_THE_CORRECT_FAVOURITE_VERSEBR_YOU_CANT_PERFORM_THE_INITIAL_ACTION="Without selecting the correct favourite verse,you can't perform the initial action." COM_GETBIBLE_WORDS="Words" -COM_GETBIBLE_YOUR_ACTIVE_SESSION_KEY="Your Active Session Key:" +COM_GETBIBLE_YOUR_ACTIVE_PERSISTENT_SESSION="Your Active Persistent Session:" +COM_GETBIBLE_YOUR_PERSISTENT_SESSION_KEY_AND_FAVOURITE_VERSE_PROVIDE_YOU_EXCLUSIVE_ACCESS_TO_EDIT_YOUR_SPAN_CLASSGETBIBLEACTIVITYNOTESANDTAGSNOTES_AND_TAGSSPAN_THINK_OF_YOUR_PERSISTENT_SESSION_KEY_AS_A_USERNAME_AND_YOUR_FAVOURITE_VERSE_AS_A_PASSWORD_THEREFORE_ENSURE_YOUR_FAVOURITE_VERSE_IS_KEPT_PRIVATE="Your persistent session key and favourite verse provide you exclusive access to edit your . Think of your persistent session key as a username and your favourite verse as a password. Therefore, ensure your favourite verse is kept private." +COM_GETBIBLE_YOUR_PERSISTENT_SESSION_KEY_TOGETHER_WITH_YOUR_FAVOURITE_VERSE_AUTHENTICATES_YOU_IT_LINKS_TO_ALL_YOUR_SPAN_CLASSGETBIBLEACTIVITYNOTESANDTAGSNOTES_AND_TAGSSPAN_IN_THE_BIBLE_YOU_CAN_SHARE_IT_WITH_LOVED_ONES_SO_THEY_CAN_SEE_YOUR_SPAN_CLASSGETBIBLEACTIVITYNOTESANDTAGSNOTES_AND_TAGSSPAN="Your persistent session key, together with your favourite verse, authenticates you. It links to all your in the Bible. You can share it with loved ones so they can see your ." COM_GETBIBLE_YOUR_SEARCH_DIDNT_YIELD_ANY_RESULTS_PLEASE_TYPE_A_DIFFERENT_KEYWORD_OR_PHRASE_INTO_THE_SEARCH_BOX_AND_PRESS_ENTER_TO_TRY_AGAIN="Your search didn't yield any results. Please type a different keyword or phrase into the search box and press [ENTER] to try again!" -COM_GETBIBLE_YOUR_SESSION_KEY_AND_FAVOURITE_VERSE_PROVIDE_YOU_EXCLUSIVE_ACCESS_TO_EDIT_YOUR_SPAN_CLASSGETBIBLEACTIVITYNOTESANDTAGSNOTES_AND_TAGSSPAN_THINK_OF_YOUR_SESSION_KEY_AS_A_USERNAME_AND_YOUR_FAVOURITE_VERSE_AS_A_PASSWORD_THEREFORE_ENSURE_YOUR_FAVOURITE_VERSE_IS_KEPT_PRIVATE="Your session key and favourite verse provide you exclusive access to edit your . Think of your session key as a username and your favourite verse as a password. Therefore, ensure your favourite verse is kept private." -COM_GETBIBLE_YOUR_SESSION_KEY_TOGETHER_WITH_YOUR_FAVOURITE_VERSE_AUTHENTICATES_YOU_IT_LINKS_TO_ALL_YOUR_SPAN_CLASSGETBIBLEACTIVITYNOTESANDTAGSNOTES_AND_TAGSSPAN_IN_THE_BIBLE_YOU_CAN_SHARE_IT_WITH_LOVED_ONES_SO_THEY_CAN_SEE_YOUR_SPAN_CLASSGETBIBLEACTIVITYNOTESANDTAGSNOTES_AND_TAGSSPAN="Your session key, together with your favourite verse, authenticates you. It links to all your in the Bible. You can share it with loved ones so they can see your ." COM_GETBIBLE_YOU_ARE_ABOUT_TO_INITIATE_THE_INSTALLATION_PROCESS_FOR_THIS_TRANSLATION_PLEASE_NOTE_THIS_PROCEDURE_IS_QUITE_EXTENSIVE_AND_MAY_TAKE_A_SIGNIFICANT_AMOUNT_OF_TIME_TO_COMPLETE_DEPENDING_ON_YOUR_NETWORK_SPEED_IT_COULD_RANGE_FROM_SEVERAL_MINUTES_TO_A_FEW_HOURS_DURING_THIS_PERIOD_IT_IS_ESSENTIAL_THAT_YOU_DO_NOT_NAVIGATE_AWAY_FROM_THIS_PAGE_CLOSE_THE_BROWSER_OR_SHUT_DOWN_YOUR_COMPUTER_AS_THIS_COULD_INTERRUPT_THE_INSTALLATION_PROCESS_PLEASE_ENSURE_YOU_HAVE_A_STABLE_INTERNET_CONNECTION_AND_SUFFICIENT_TIME_BEFORE_PROCEEDING_WE_RECOMMEND_INITIATING_THIS_WHEN_YOU_DO_NOT_REQUIRE_IMMEDIATE_USE_OF_YOUR_DEVICE_ARE_YOU_SURE_YOU_WANT_TO_START_THE_INSTALLATION_NOW="You are about to initiate the installation process for this translation. Please note, this procedure is quite extensive and may take a significant amount of time to complete, depending on your network speed. It could range from several minutes to a few hours. During this period, it is essential that you do not navigate away from this page, close the browser or shut down your computer as this could interrupt the installation process. Please ensure you have a stable internet connection and sufficient time before proceeding. We recommend initiating this when you do not require immediate use of your device. Are you sure you want to start the installation now?" -COM_GETBIBLE_YOU_ARE_ABOUT_TO_LOAD_ANOTHER_SESSION_KEY_ARE_YOU_SURE_YOU_WOULD_LIKE_TO_CONTINUE="You are about to load another session key, are you sure you would like to continue?" +COM_GETBIBLE_YOU_ARE_ABOUT_TO_LOAD_ANOTHER_PERSISTENT_SESSION_KEY_ARE_YOU_SURE_YOU_WOULD_LIKE_TO_CONTINUE="You are about to load another persistent session key, are you sure you would like to continue?" +COM_GETBIBLE_YOU_ARE_ABOUT_TO_REMOVE_THE_ACTIVE_PERSISTENT_SESSION="You are about to remove the active persistent session." COM_GETBIBLE_YOU_CAN_ADD_IT_HERE_TO_LOAD_YOUR_PREVIOUS_SESSION="You can add it here to load your previous session." +COM_GETBIBLE_YOU_CAN_CHANGE_YOUR_SESSION_NAME_TO_SOMETHING_MORE_RECOGNIZABLE="You can change your session name to something more recognizable." +COM_GETBIBLE_YOU_CAN_SHARE_YOUR_SESSION_WITH_LOVED_ONES_SO_THEY_CAN_SEE_YOUR_NOTES_AND_TAGS="You can share your session with loved ones so they can see your notes and tags." COM_GETBIBLE_YOU_HAVE_ENTERED_A_VALID_SESSION_KEY="You have entered a valid session key." COM_GETBIBLE_YOU_SHOULD_SELECT_ONE_OF_BYOUR_FAVOURITEB_VERSES="You should select one of your favourite verses." JGLOBAL_FIELD_ID_DESC="Record number in the database." diff --git a/site/layouts/getbiblelinkers.php b/site/layouts/getbiblelinkers.php new file mode 100644 index 0000000..3c8d42f --- /dev/null +++ b/site/layouts/getbiblelinkers.php @@ -0,0 +1,57 @@ + + @git Get Bible
-
+
+ name !== null): ?>
+
- + 'get-session-name-' . $linker->guid, 'label' => JText::_('COM_GETBIBLE_SESSION_NAME'), 'value' => $linker->name, 'readonly' => true]); ?> + 'get-session-key-' . $linker->guid, 'label' => JText::_('COM_GETBIBLE_SESSION_KEY'), 'value' => $linker->guid, 'readonly' => true]); ?> + + + + +
- uk-switcher="connect: #get-bible-app-body; animation: uk-animation-scale-up;">
+
- + loadTemplate('getbibleappactivesession'); ?> + +
-
+ ...+
+
+
+
+
- uk-switcher="connect: #get-bible-app-body; animation: uk-animation-scale-up;">
- - -
--
+
- uk-switcher="connect: #get-bible-app-body; animation: uk-animation-scale-up;">
+
- uk-switcher="connect: #get-bible-app-body; animation: uk-animation-scale-up;">
' . JText::_('COM_GETBIBLE_SHOULD_YOU_HAVE
// set buttons
$buttons = [
- ['name' => JText::_('COM_GETBIBLE_SELECT'), 'onclick' => "activeLinkerAccess();", 'class' => 'uk-button uk-button-default uk-width-2-3'],
- ['close' => true, 'name' => JText::_('COM_GETBIBLE_CANCEL'), 'class' => 'uk-button uk-button-danger uk-width-1-3']
+ ['id' => 'getbible-select-favourite-verse', 'name' => JText::_('COM_GETBIBLE_SELECT'), 'class' => 'uk-button uk-button-default uk-width-2-3'],
+ ['id' => 'getbible-cancel-favourite-verse', 'close' => true, 'name' => JText::_('COM_GETBIBLE_CANCEL'), 'class' => 'uk-button uk-button-danger uk-width-1-3']
];
@@ -74,37 +74,142 @@ const favouriteBook = document.getElementById('getbible_favourite_book');
const favouriteChapter = document.getElementById('getbible_favourite_chapter');
const favouriteVerse = document.getElementById('getbible_favourite_verse');
const favouriteLinker = document.getElementById('getbible_favourite_linker');
-
+const favouriteSelection = document.getElementById('getbible-select-favourite-verse');
+const cancelFavouriteSelection = document.getElementById('getbible-cancel-favourite-verse');
+params->get('show_settings') == 1): ?>
+const sessionAccessStatusSwitch = document.getElementById('getbible-session-status-switch');
+
+// Helper function to update the UI
+const updateUIAfterSettingFavourite = (linker, pass) => {
+ favouriteError.style.display = 'none';
+ setActiveLinkerOnPage(linker);
+ setLocalMemory('getbible_active_linker_guid', linker);
+ setLocalMemory(linker + '-validated', true);params->get('show_settings') == 1): ?>
+ setSessionStatusAccess();
+ UIkit.modal('#getbible_favourite_verse_selector').hide();
+};
+// Helper function to handle errors
+const handleFavouriteError = (errorMessage) => {
+ favouriteError.style.display = '';
+ favouriteErrorMessage.textContent = errorMessage;
+};
+// two variables to hold the resolve and reject functions of our Promise
+let resolveFavouriteVerseSelection, rejectFavouriteVerseSelection;
// function to try and set the linker access
-const activeLinkerAccess = async () => {
+const setGetBibleFavouriteVerse = () => {
+ UIkit.modal('#getbible_favourite_verse_selector').show();
+ return new Promise((resolve, reject) => {
+ resolveFavouriteVerse = resolve;
+ rejectFavouriteVerse = reject;
+ });
+};
+favouriteSelection.addEventListener('click', async () => {
try {
- // create the pass key
favouriteError.style.display = 'none';
let pass = favouriteBook.value + '_' + favouriteChapter.value + '_' + favouriteVerse.value;
let linker = favouriteLinker.value;
- // Wait for the server to return the response, then parse it as JSON.
const data = await setLinkerAccess(linker, pass);
- // Call another function after the response has been received
if (data.success) {
- // set the linker global
- favouriteError.style.display = 'none';
- setActiveLinkerOnPage(linker);
- setLocalMemory('getbible_active_linker_guid', linker);
- setLocalMemory(linker, pass);
+ updateUIAfterSettingFavourite(linker, pass);
+ resolveFavouriteVerse();
UIkit.modal('#getbible_favourite_verse_selector').hide();
} else if (data.error) {
- // show the error
- favouriteError.style.display = '';
- favouriteErrorMessage.textContent = data.error;
+ handleFavouriteError(data.error);
+ rejectFavouriteVerse(data.error);
} else {
- // Handle any errors
- console.error("Error occurred: ", data);
+ let error = "Unknown error occurred: " + JSON.stringify(data);
+ console.error(error);
+ rejectFavouriteVerse(error);
}
} catch (error) {
- // Handle any errors
console.error("Error occurred: ", error);
+ rejectFavouriteVerse(error);
}
-}
+});
+cancelFavouriteSelection.addEventListener('click', () => {
+ rejectFavouriteVerse('User cancelled the operation');
+ UIkit.modal('#getbible_favourite_verse_selector').hide();
+});
+const setFavouriteVerseForBrowser = async () => {
+ return new Promise(async (resolve, reject) => {
+ try {
+ await setGetBibleFavouriteVerse();
+ resolve();
+ } catch (err) {
+ reject(err);
+ }
+ });
+};
+params->get('show_settings') == 1): ?>
+const removeFavouriteVerseFromBrowser = () => {
+ return new Promise(async (resolve, reject) => {
+ try {
+ let linker = getLocalMemory('getbible_active_linker_guid');
+ if (linker) {
+ let revoked = await revokeLinkerAccess(linker);
+ if (revoked.success) {
+ setLocalMemory(linker + '-validated', false);
+ resolve();
+ } else if (revoked.error) {
+ reject(revoked.error);
+ } else {
+ reject("Unexpected response");
+ }
+ } else {
+ reject("Linker is undefined");
+ }
+ } catch (err) {
+ reject(err);
+ }
+ });
+};
+const lockSessionStatusAccess = async () => {
+ sessionAccessStatusSwitch.setAttribute('uk-icon', 'icon: lock; ratio: 5');
+ sessionAccessStatusSwitch.classList.remove('uk-text-success');
+ sessionAccessStatusSwitch.setAttribute('uk-tooltip', '');
+};
+const unlockSessionStatusAccess = async () => {
+ sessionAccessStatusSwitch.setAttribute('uk-icon', 'icon: unlock; ratio: 6');
+ sessionAccessStatusSwitch.classList.add('uk-text-success');
+ sessionAccessStatusSwitch.setAttribute('uk-tooltip', '');
+};
+const changeSessionStatusSwitch = async () => {
+ var isLocked = sessionAccessStatusSwitch.getAttribute('uk-icon') === "icon: lock; ratio: 5";
+ if(isLocked) {
+ setFavouriteVerseForBrowser().then(() => {
+ unlockSessionStatusAccess();
+ }).catch((error) => {
+ console.error("An error occurred:", error);
+ });
+ } else {
+ removeFavouriteVerseFromBrowser().then(() => {
+ lockSessionStatusAccess()
+ }).catch((error) => {
+ console.error("An error occurred:", error);
+ });
+ }
+};
+const setSessionStatusAccess = async () => {
+ // check if we have an open or closed session
+ let linker = getLocalMemory('getbible_active_linker_guid');
+ if (linker) {
+ let pass = getLocalMemory(linker + '-validated');
+ if (pass) {
+ unlockSessionStatusAccess();
+ } else {
+ lockSessionStatusAccess();
+ }
+ } else {
+ lockSessionStatusAccess();
+ }
+};
+document.addEventListener('DOMContentLoaded', function() {
+ setSessionStatusAccess();
+ sessionAccessStatusSwitch.addEventListener('click', function() {
+ changeSessionStatusSwitch();
+ });
+});
+
diff --git a/site/views/app/tmpl/default_getbiblelinkermanager.php b/site/views/app/tmpl/default_getbiblelinkermanager.php
new file mode 100644
index 0000000..7c11db2
--- /dev/null
+++ b/site/views/app/tmpl/default_getbiblelinkermanager.php
@@ -0,0 +1,61 @@
+
+ @git Get Bible