$this));
?>
diff --git a/admin/views/sermons/tmpl/default_batch_body.php b/admin/views/sermons/tmpl/default_batch_body.php
index 4963c29a..9f990631 100644
--- a/admin/views/sermons/tmpl/default_batch_body.php
+++ b/admin/views/sermons/tmpl/default_batch_body.php
@@ -23,7 +23,7 @@
/----------------------------------------------------------------------------------------------------------------------------------*/
// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die('Restricted access');
?>
diff --git a/admin/views/sermons/tmpl/default_batch_footer.php b/admin/views/sermons/tmpl/default_batch_footer.php
index 5d4c0bab..ed1ea16f 100644
--- a/admin/views/sermons/tmpl/default_batch_footer.php
+++ b/admin/views/sermons/tmpl/default_batch_footer.php
@@ -23,7 +23,7 @@
/----------------------------------------------------------------------------------------------------------------------------------*/
// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die('Restricted access');
?>
diff --git a/admin/views/sermons/tmpl/default_body.php b/admin/views/sermons/tmpl/default_body.php
index cc1094ee..58466eb1 100644
--- a/admin/views/sermons/tmpl/default_body.php
+++ b/admin/views/sermons/tmpl/default_body.php
@@ -23,7 +23,7 @@
/----------------------------------------------------------------------------------------------------------------------------------*/
// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die('Restricted access');
$edit = "index.php?option=com_sermondistributor&view=sermons&task=sermon.edit";
diff --git a/admin/views/statistics/tmpl/default.php b/admin/views/statistics/tmpl/default.php
index d10004da..1d9fb7c8 100644
--- a/admin/views/statistics/tmpl/default.php
+++ b/admin/views/statistics/tmpl/default.php
@@ -23,7 +23,7 @@
/----------------------------------------------------------------------------------------------------------------------------------*/
// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die('Restricted access');
JHtml::_('behavior.tooltip');
JHtml::_('behavior.multiselect');
@@ -46,6 +46,8 @@ if ($this->saveOrder)
$this));
?>
diff --git a/admin/views/statistics/tmpl/default_batch_body.php b/admin/views/statistics/tmpl/default_batch_body.php
index ecd403de..ba4dfb12 100644
--- a/admin/views/statistics/tmpl/default_batch_body.php
+++ b/admin/views/statistics/tmpl/default_batch_body.php
@@ -23,7 +23,7 @@
/----------------------------------------------------------------------------------------------------------------------------------*/
// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die('Restricted access');
?>
diff --git a/admin/views/statistics/tmpl/default_batch_footer.php b/admin/views/statistics/tmpl/default_batch_footer.php
index 4b20b8a8..27b0d36f 100644
--- a/admin/views/statistics/tmpl/default_batch_footer.php
+++ b/admin/views/statistics/tmpl/default_batch_footer.php
@@ -23,7 +23,7 @@
/----------------------------------------------------------------------------------------------------------------------------------*/
// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die('Restricted access');
?>
diff --git a/admin/views/statistics/tmpl/default_body.php b/admin/views/statistics/tmpl/default_body.php
index 7d365174..9dcde32d 100644
--- a/admin/views/statistics/tmpl/default_body.php
+++ b/admin/views/statistics/tmpl/default_body.php
@@ -23,7 +23,7 @@
/----------------------------------------------------------------------------------------------------------------------------------*/
// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die('Restricted access');
$edit = "index.php?option=com_sermondistributor&view=statistics&task=statistic.edit";
diff --git a/script.php b/script.php
index 9c7eda28..e5ded53f 100644
--- a/script.php
+++ b/script.php
@@ -88,7 +88,7 @@ class com_sermondistributorInstallerScript
$preacher_done = $db->execute();
if ($preacher_done)
{
- // If succesfully remove Preacher add queued success message.
+ // If successfully remove Preacher add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.preacher) type alias was removed from the
#__content_type table'));
}
@@ -103,7 +103,7 @@ class com_sermondistributorInstallerScript
$preacher_done = $db->execute();
if ($preacher_done)
{
- // If succesfully remove Preacher add queued success message.
+ // If successfully remove Preacher add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.preacher) type alias was removed from the
#__contentitem_tag_map table'));
}
@@ -118,7 +118,7 @@ class com_sermondistributorInstallerScript
$preacher_done = $db->execute();
if ($preacher_done)
{
- // If succesfully remove Preacher add queued success message.
+ // If successfully removed Preacher add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.preacher) type alias was removed from the
#__ucm_content table'));
}
@@ -174,7 +174,7 @@ class com_sermondistributorInstallerScript
$sermon_done = $db->execute();
if ($sermon_done)
{
- // If succesfully remove Sermon add queued success message.
+ // If successfully remove Sermon add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.sermon) type alias was removed from the
#__content_type table'));
}
@@ -189,7 +189,7 @@ class com_sermondistributorInstallerScript
$sermon_done = $db->execute();
if ($sermon_done)
{
- // If succesfully remove Sermon add queued success message.
+ // If successfully remove Sermon add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.sermon) type alias was removed from the
#__contentitem_tag_map table'));
}
@@ -204,7 +204,7 @@ class com_sermondistributorInstallerScript
$sermon_done = $db->execute();
if ($sermon_done)
{
- // If succesfully remove Sermon add queued success message.
+ // If successfully removed Sermon add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.sermon) type alias was removed from the
#__ucm_content table'));
}
@@ -260,7 +260,7 @@ class com_sermondistributorInstallerScript
$sermon_catid_done = $db->execute();
if ($sermon_catid_done)
{
- // If succesfully remove Sermon catid add queued success message.
+ // If successfully remove Sermon catid add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.sermon.category) type alias was removed from the
#__content_type table'));
}
@@ -275,7 +275,7 @@ class com_sermondistributorInstallerScript
$sermon_catid_done = $db->execute();
if ($sermon_catid_done)
{
- // If succesfully remove Sermon catid add queued success message.
+ // If successfully remove Sermon catid add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.sermon.category) type alias was removed from the
#__contentitem_tag_map table'));
}
@@ -290,7 +290,7 @@ class com_sermondistributorInstallerScript
$sermon_catid_done = $db->execute();
if ($sermon_catid_done)
{
- // If succesfully remove Sermon catid add queued success message.
+ // If successfully removed Sermon catid add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.sermon.category) type alias was removed from the
#__ucm_content table'));
}
@@ -346,7 +346,7 @@ class com_sermondistributorInstallerScript
$series_done = $db->execute();
if ($series_done)
{
- // If succesfully remove Series add queued success message.
+ // If successfully remove Series add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.series) type alias was removed from the
#__content_type table'));
}
@@ -361,7 +361,7 @@ class com_sermondistributorInstallerScript
$series_done = $db->execute();
if ($series_done)
{
- // If succesfully remove Series add queued success message.
+ // If successfully remove Series add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.series) type alias was removed from the
#__contentitem_tag_map table'));
}
@@ -376,7 +376,7 @@ class com_sermondistributorInstallerScript
$series_done = $db->execute();
if ($series_done)
{
- // If succesfully remove Series add queued success message.
+ // If successfully removed Series add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.series) type alias was removed from the
#__ucm_content table'));
}
@@ -432,7 +432,7 @@ class com_sermondistributorInstallerScript
$statistic_done = $db->execute();
if ($statistic_done)
{
- // If succesfully remove Statistic add queued success message.
+ // If successfully remove Statistic add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.statistic) type alias was removed from the
#__content_type table'));
}
@@ -447,7 +447,7 @@ class com_sermondistributorInstallerScript
$statistic_done = $db->execute();
if ($statistic_done)
{
- // If succesfully remove Statistic add queued success message.
+ // If successfully remove Statistic add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.statistic) type alias was removed from the
#__contentitem_tag_map table'));
}
@@ -462,7 +462,7 @@ class com_sermondistributorInstallerScript
$statistic_done = $db->execute();
if ($statistic_done)
{
- // If succesfully remove Statistic add queued success message.
+ // If successfully removed Statistic add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.statistic) type alias was removed from the
#__ucm_content table'));
}
@@ -518,7 +518,7 @@ class com_sermondistributorInstallerScript
$external_source_done = $db->execute();
if ($external_source_done)
{
- // If succesfully remove External_source add queued success message.
+ // If successfully remove External_source add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.external_source) type alias was removed from the
#__content_type table'));
}
@@ -533,7 +533,7 @@ class com_sermondistributorInstallerScript
$external_source_done = $db->execute();
if ($external_source_done)
{
- // If succesfully remove External_source add queued success message.
+ // If successfully remove External_source add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.external_source) type alias was removed from the
#__contentitem_tag_map table'));
}
@@ -548,7 +548,7 @@ class com_sermondistributorInstallerScript
$external_source_done = $db->execute();
if ($external_source_done)
{
- // If succesfully remove External_source add queued success message.
+ // If successfully removed External_source add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.external_source) type alias was removed from the
#__ucm_content table'));
}
@@ -604,7 +604,7 @@ class com_sermondistributorInstallerScript
$local_listing_done = $db->execute();
if ($local_listing_done)
{
- // If succesfully remove Local_listing add queued success message.
+ // If successfully remove Local_listing add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.local_listing) type alias was removed from the
#__content_type table'));
}
@@ -619,7 +619,7 @@ class com_sermondistributorInstallerScript
$local_listing_done = $db->execute();
if ($local_listing_done)
{
- // If succesfully remove Local_listing add queued success message.
+ // If successfully remove Local_listing add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.local_listing) type alias was removed from the
#__contentitem_tag_map table'));
}
@@ -634,7 +634,7 @@ class com_sermondistributorInstallerScript
$local_listing_done = $db->execute();
if ($local_listing_done)
{
- // If succesfully remove Local_listing add queued success message.
+ // If successfully removed Local_listing add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.local_listing) type alias was removed from the
#__ucm_content table'));
}
@@ -690,7 +690,7 @@ class com_sermondistributorInstallerScript
$help_document_done = $db->execute();
if ($help_document_done)
{
- // If succesfully remove Help_document add queued success message.
+ // If successfully remove Help_document add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.help_document) type alias was removed from the
#__content_type table'));
}
@@ -705,7 +705,7 @@ class com_sermondistributorInstallerScript
$help_document_done = $db->execute();
if ($help_document_done)
{
- // If succesfully remove Help_document add queued success message.
+ // If successfully remove Help_document add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.help_document) type alias was removed from the
#__contentitem_tag_map table'));
}
@@ -720,7 +720,7 @@ class com_sermondistributorInstallerScript
$help_document_done = $db->execute();
if ($help_document_done)
{
- // If succesfully remove Help_document add queued success message.
+ // If successfully removed Help_document add queued success message.
$app->enqueueMessage(JText::_('The (com_sermondistributor.help_document) type alias was removed from the
#__ucm_content table'));
}
@@ -764,10 +764,31 @@ class com_sermondistributorInstallerScript
$help_document_done = $db->execute();
if ($help_document_done)
{
- // If succesfully remove sermondistributor add queued success message.
+ // If successfully removed sermondistributor add queued success message.
$app->enqueueMessage(JText::_('All related items was removed from the
#__assets table'));
}
+ // Get the biggest rule column in the assets table at this point.
+ $get_rule_length = "SELECT CHAR_LENGTH(`rules`) as rule_size FROM #__assets ORDER BY rule_size DESC LIMIT 1";
+ $db->setQuery($get_rule_length);
+ if ($db->execute())
+ {
+ $rule_length = $db->loadResult();
+ // Check the size of the rules column
+ if ($rule_length < 5120)
+ {
+ // Revert the assets table rules column back to the default
+ $revert_rule = "ALTER TABLE `#__assets` CHANGE `rules` `rules` varchar(5120) NOT NULL COMMENT 'JSON encoded access control.';";
+ $db->setQuery($revert_rule);
+ $db->execute();
+ $app->enqueueMessage(JText::_('Reverted the
#__assets table rules column back to its default size of varchar(5120)'));
+ }
+ else
+ {
+
+ $app->enqueueMessage(JText::_('Could not revert the
#__assets table rules column back to its default size of varchar(5120), since there is still one or more components that still requires the column to be larger.'));
+ }
+ }
// Set db if not set already.
if (!isset($db))
@@ -1227,9 +1248,9 @@ class com_sermondistributorInstallerScript
$sermon->type_title = 'Sermondistributor Sermon';
$sermon->type_alias = 'com_sermondistributor.sermon';
$sermon->table = '{"special": {"dbtable": "#__sermondistributor_sermon","key": "id","type": "Sermon","prefix": "sermondistributorTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
- $sermon->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "description","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","preacher":"preacher","series":"series","short_description":"short_description","link_type":"link_type","source":"source","local_files":"local_files","alias":"alias","description":"description","tags":"tags","icon":"icon","build":"build","not_required":"not_required","manual_files":"manual_files","auto_sermons":"auto_sermons","url":"url","scripture":"scripture"}}';
+ $sermon->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "description","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","preacher":"preacher","series":"series","short_description":"short_description","link_type":"link_type","source":"source","local_files":"local_files","alias":"alias","description":"description","tags":"tags","icon":"icon","build":"build","manual_files":"manual_files","auto_sermons":"auto_sermons","url":"url","scripture":"scripture"}}';
$sermon->router = 'SermondistributorHelperRoute::getSermonRoute';
- $sermon->content_history_options = '{"formFile": "administrator/components/com_sermondistributor/models/forms/sermon.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required","auto_sermons"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","preacher","series","catid","link_type","source","build"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"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": "preacher","targetTable": "#__sermondistributor_preacher","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "series","targetTable": "#__sermondistributor_series","targetColumn": "id","displayColumn": "name"}]}';
+ $sermon->content_history_options = '{"formFile": "administrator/components/com_sermondistributor/models/forms/sermon.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","auto_sermons"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","preacher","series","catid","link_type","source","build"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"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": "preacher","targetTable": "#__sermondistributor_preacher","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "series","targetTable": "#__sermondistributor_series","targetColumn": "id","displayColumn": "name"}]}';
// Set the object into the content types table.
$sermon_Inserted = $db->insertObject('#__content_types', $sermon);
@@ -1299,9 +1320,9 @@ class com_sermondistributorInstallerScript
$help_document->type_title = 'Sermondistributor Help_document';
$help_document->type_alias = 'com_sermondistributor.help_document';
$help_document->table = '{"special": {"dbtable": "#__sermondistributor_help_document","key": "id","type": "Help_document","prefix": "sermondistributorTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
- $help_document->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "title","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "content","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"title":"title","type":"type","groups":"groups","location":"location","admin_view":"admin_view","site_view":"site_view","not_required":"not_required","alias":"alias","content":"content","article":"article","url":"url","target":"target"}}';
+ $help_document->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "title","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "content","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"title":"title","type":"type","groups":"groups","location":"location","admin_view":"admin_view","site_view":"site_view","alias":"alias","content":"content","article":"article","url":"url","target":"target"}}';
$help_document->router = 'SermondistributorHelperRoute::getHelp_documentRoute';
- $help_document->content_history_options = '{"formFile": "administrator/components/com_sermondistributor/models/forms/help_document.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","location","article","target"],"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": "article","targetTable": "#__content","targetColumn": "id","displayColumn": "title"}]}';
+ $help_document->content_history_options = '{"formFile": "administrator/components/com_sermondistributor/models/forms/help_document.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","location","article","target"],"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": "article","targetTable": "#__content","targetColumn": "id","displayColumn": "title"}]}';
// Set the object into the content types table.
$help_document_Inserted = $db->insertObject('#__content_types', $help_document);
@@ -1335,6 +1356,22 @@ class com_sermondistributorInstallerScript
$db->setQuery($query);
$allDone = $db->execute();
+ // Get the biggest rule column in the assets table at this point.
+ $get_rule_length = "SELECT CHAR_LENGTH(`rules`) as rule_size FROM #__assets ORDER BY rule_size DESC LIMIT 1";
+ $db->setQuery($get_rule_length);
+ if ($db->execute())
+ {
+ $rule_length = $db->loadResult();
+ // Check the size of the rules column
+ if ($rule_length <= 22240)
+ {
+ // Fix the assets table rules column size
+ $fix_rules_size = "ALTER TABLE `#__assets` CHANGE `rules` `rules` TEXT NOT NULL COMMENT 'JSON encoded access control. Enlarged to TEXT by JCB';";
+ $db->setQuery($fix_rules_size);
+ $db->execute();
+ $app->enqueueMessage(JText::_('The
#__assets table rules column was resized to the TEXT datatype for the components possible large permission rules.'));
+ }
+ }
echo '
';
@@ -1511,9 +1548,9 @@ class com_sermondistributorInstallerScript
$sermon->type_title = 'Sermondistributor Sermon';
$sermon->type_alias = 'com_sermondistributor.sermon';
$sermon->table = '{"special": {"dbtable": "#__sermondistributor_sermon","key": "id","type": "Sermon","prefix": "sermondistributorTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
- $sermon->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "description","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","preacher":"preacher","series":"series","short_description":"short_description","link_type":"link_type","source":"source","local_files":"local_files","alias":"alias","description":"description","tags":"tags","icon":"icon","build":"build","not_required":"not_required","manual_files":"manual_files","auto_sermons":"auto_sermons","url":"url","scripture":"scripture"}}';
+ $sermon->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "description","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","preacher":"preacher","series":"series","short_description":"short_description","link_type":"link_type","source":"source","local_files":"local_files","alias":"alias","description":"description","tags":"tags","icon":"icon","build":"build","manual_files":"manual_files","auto_sermons":"auto_sermons","url":"url","scripture":"scripture"}}';
$sermon->router = 'SermondistributorHelperRoute::getSermonRoute';
- $sermon->content_history_options = '{"formFile": "administrator/components/com_sermondistributor/models/forms/sermon.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required","auto_sermons"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","preacher","series","catid","link_type","source","build"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"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": "preacher","targetTable": "#__sermondistributor_preacher","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "series","targetTable": "#__sermondistributor_series","targetColumn": "id","displayColumn": "name"}]}';
+ $sermon->content_history_options = '{"formFile": "administrator/components/com_sermondistributor/models/forms/sermon.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","auto_sermons"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","preacher","series","catid","link_type","source","build"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"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": "preacher","targetTable": "#__sermondistributor_preacher","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "series","targetTable": "#__sermondistributor_series","targetColumn": "id","displayColumn": "name"}]}';
// Check if sermon type is already in content_type DB.
$sermon_id = null;
@@ -1685,9 +1722,9 @@ class com_sermondistributorInstallerScript
$help_document->type_title = 'Sermondistributor Help_document';
$help_document->type_alias = 'com_sermondistributor.help_document';
$help_document->table = '{"special": {"dbtable": "#__sermondistributor_help_document","key": "id","type": "Help_document","prefix": "sermondistributorTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
- $help_document->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "title","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "content","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"title":"title","type":"type","groups":"groups","location":"location","admin_view":"admin_view","site_view":"site_view","not_required":"not_required","alias":"alias","content":"content","article":"article","url":"url","target":"target"}}';
+ $help_document->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "title","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "content","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"title":"title","type":"type","groups":"groups","location":"location","admin_view":"admin_view","site_view":"site_view","alias":"alias","content":"content","article":"article","url":"url","target":"target"}}';
$help_document->router = 'SermondistributorHelperRoute::getHelp_documentRoute';
- $help_document->content_history_options = '{"formFile": "administrator/components/com_sermondistributor/models/forms/help_document.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","location","article","target"],"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": "article","targetTable": "#__content","targetColumn": "id","displayColumn": "title"}]}';
+ $help_document->content_history_options = '{"formFile": "administrator/components/com_sermondistributor/models/forms/help_document.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","location","article","target"],"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": "article","targetTable": "#__content","targetColumn": "id","displayColumn": "title"}]}';
// Check if help_document type is already in content_type DB.
$help_document_id = null;
diff --git a/sermondistributor.xml b/sermondistributor.xml
index 3557733f..58343bab 100644
--- a/sermondistributor.xml
+++ b/sermondistributor.xml
@@ -1,7 +1,7 @@
COM_SERMONDISTRIBUTOR
- 4th December, 2020
+ 31st December, 2020
Llewellyn van der Merwe
joomla@vdm.io
https://www.vdm.io/
diff --git a/site/helpers/sermondistributor.php b/site/helpers/sermondistributor.php
index 06db063b..20b38f12 100644
--- a/site/helpers/sermondistributor.php
+++ b/site/helpers/sermondistributor.php
@@ -25,9 +25,9 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
-use Joomla\CMS\Language\Language;
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\CMS\Language\Language;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
use Joomla\Utilities\ArrayHelper;
/**
diff --git a/site/sermondistributor.php b/site/sermondistributor.php
index c40bf64a..32aa4e95 100644
--- a/site/sermondistributor.php
+++ b/site/sermondistributor.php
@@ -24,6 +24,7 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
+
JHtml::_('behavior.tabstate');
// Set the component css/js
@@ -32,7 +33,7 @@ $document->addStyleSheet('components/com_sermondistributor/assets/css/site.css')
$document->addScript('components/com_sermondistributor/assets/js/site.js');
// Require helper files
-JLoader::register('SermondistributorHelper', __DIR__ . '/helpers/sermondistributor.php');
+JLoader::register('SermondistributorHelper', __DIR__ . '/helpers/sermondistributor.php');
JLoader::register('SermondistributorHelperRoute', __DIR__ . '/helpers/route.php');
// Get an instance of the controller prefixed by Sermondistributor