';
+ $subscribe .= '
' . $podcast->title . '
';
$subscribe .= $this->buildStandardPodcast($podcast);
- $subscribe .= '
';
+ $subscribe .= '
';
$subscribe .= $this->buildAlternatePodcast($podcast);
$subscribe .= '
';
break;
diff --git a/com_biblestudy/site/helpers/relatedstudies.php b/com_biblestudy/site/helpers/relatedstudies.php
index 3cd76fbdd7..8a1d0a1539 100644
--- a/com_biblestudy/site/helpers/relatedstudies.php
+++ b/com_biblestudy/site/helpers/relatedstudies.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/helpers/route.php b/com_biblestudy/site/helpers/route.php
index 77b929f456..6f363a56f4 100644
--- a/com_biblestudy/site/helpers/route.php
+++ b/com_biblestudy/site/helpers/route.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/helpers/serieslist.php b/com_biblestudy/site/helpers/serieslist.php
index fd60c40c1e..b72b148d1a 100644
--- a/com_biblestudy/site/helpers/serieslist.php
+++ b/com_biblestudy/site/helpers/serieslist.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/helpers/showscripture.php b/com_biblestudy/site/helpers/showscripture.php
index 542d114a63..99b68127db 100644
--- a/com_biblestudy/site/helpers/showscripture.php
+++ b/com_biblestudy/site/helpers/showscripture.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/helpers/teacher.php b/com_biblestudy/site/helpers/teacher.php
index 191f0be88e..1b52f8e804 100644
--- a/com_biblestudy/site/helpers/teacher.php
+++ b/com_biblestudy/site/helpers/teacher.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2013 Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/helpers/upload.php b/com_biblestudy/site/helpers/upload.php
index ceedb7f57f..121f4b867e 100644
--- a/com_biblestudy/site/helpers/upload.php
+++ b/com_biblestudy/site/helpers/upload.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/lib/download.php b/com_biblestudy/site/lib/download.php
index e6a26cb71f..4340e40bb1 100644
--- a/com_biblestudy/site/lib/download.php
+++ b/com_biblestudy/site/lib/download.php
@@ -3,7 +3,7 @@
* BibleStudy Download Class
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/lib/images.php b/com_biblestudy/site/lib/images.php
index c8be83e16d..54e0e9640b 100644
--- a/com_biblestudy/site/lib/images.php
+++ b/com_biblestudy/site/lib/images.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/lib/listing.php b/com_biblestudy/site/lib/listing.php
index 781ab2b25c..c7dfb7c7f5 100644
--- a/com_biblestudy/site/lib/listing.php
+++ b/com_biblestudy/site/lib/listing.php
@@ -3,15 +3,21 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2014 Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
// No Direct Access
defined('_JEXEC') or die;
-require_once JPATH_ADMINISTRATOR . '/components/com_biblestudy/lib/defines.php';
-require_once JPATH_ADMINISTRATOR . '/components/com_biblestudy/tables/template.php';
+// Always load JBSM API if it exists.
+$api = JPATH_ADMINISTRATOR . '/components/com_biblestudy/api.php';
+
+if (file_exists($api))
+{
+ require_once $api;
+}
+
use Joomla\Registry\Registry;
/**
diff --git a/com_biblestudy/site/lib/pagebuilder.php b/com_biblestudy/site/lib/pagebuilder.php
index d6ed59616f..836e342b22 100644
--- a/com_biblestudy/site/lib/pagebuilder.php
+++ b/com_biblestudy/site/lib/pagebuilder.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
@@ -401,6 +401,8 @@ public function studyBuilder($whereitem = null, $wherefield = null, $params = nu
->join('LEFT', '#__users AS uam ON uam.id = study.modified_by');
$query->group('study.id');
+
+ // Select only published studies
$query->where('study.published = 1');
$query->where('series.published = 1 OR study.series_id <= 0');
if ($wherefield && $whereitem)
@@ -408,21 +410,26 @@ public function studyBuilder($whereitem = null, $wherefield = null, $params = nu
$query->where($wherefield . ' = ' . $whereitem);
}
+ // Filter by language
+ $language = $params->get('language', '*');
+
+ if ($language == '*')
+ {
+ $query->where('study.language in (' . $db->Quote($language) . ',' . $db->Quote('*') . ')');
+ }
+ elseif ($language != '*')
+ {
+ $query->where('study.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->Quote('*') . ')');
+ }
$query->order('studydate ' . $order);
// Filter only for authorized view
- $query->where('(series.access IN (' . $groups . ') AND study.series_id <= 0)');
+ $query->where('(series.access IN (' . $groups . ') or study.series_id <= 0)');
$query->where('study.access IN (' . $groups . ')');
+
$db->setQuery($query, 0, $limit);
$studies = $db->loadObjectList();
- // Get media files for each study
- for ($i = 0, $n = count($studies); $i < $n; $i++)
- {
- $study = &$studies[$i];
- $study->media = $this->mediaBuilder($study->mids, $params, $template, $study);
- }
-
return $studies;
}
}
diff --git a/com_biblestudy/site/lib/podcast.php b/com_biblestudy/site/lib/podcast.php
index 3ff60cf3b5..f1ee9c89dd 100644
--- a/com_biblestudy/site/lib/podcast.php
+++ b/com_biblestudy/site/lib/podcast.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
@@ -103,6 +103,11 @@ public function makePodcasts()
{
$detailstemplateid = 1;
}
+ if ((int) $podcastimage[0] < "144")
+ {
+ $podcastimage[0] = 144;
+ $podcastimage[1] = (int) $podcastimage[1] - ((int) $podcastimage[0] - 144);
+ }
$detailstemplateid = '&t=' . $detailstemplateid;
$podhead = '
' . $this->escapeHTML($podinfo->title) . '
http://' . $podinfo->website . '
' . $description . '
- ' . $description . '
+ ' . strip_tags($podinfo->description) . '
' . $this->escapeHTML($podinfo->title) . '
' . $this->escapeHTML($podinfo->editor_name) . '
http://' . $podinfo->website . '
http://' . $podinfo->website . '/' . $podinfo->image . '
' . $this->escapeHTML($podinfo->title) . '
- ' . $podcastimage[1] . '
- ' . $podcastimage[0] . '
Religion & Spirituality
@@ -377,7 +380,7 @@ public function makePodcasts()
' . $description . '
' . $episodedate . '
' . $this->escapeHTML($subtitle) . '
- ' . $description . '
+ ' . strip_tags($podinfo->description) . '
' . $podinfo->podcastsearch . '
' . $hours . ':' . sprintf(
"%02d",
@@ -388,10 +391,11 @@ public function makePodcasts()
if ($episode->params->get('article_id') > 1)
{
$episodedetailtemp .=
- 'srparams->get('path') .
'/index.php?option=com_content&view=article&id=' .
- $episode->params->get('article_id') . '" length="' . $episode->params->get('size') . '" type="' .
- $episode->params->get('mimetype') . '" />
+ $episode->params->get('article_id') . '" length="' . $episode->params->get('size', '100') . '" type="' .
+ $episode->params->get('mimetype', 'application/octet-stream') . '" />
http://' . $episode->srparams->get('path') .
'/index.php?option=com_content&view=article&id=' .
$episode->params->get('article_id') . '';
@@ -399,7 +403,8 @@ public function makePodcasts()
if ($episode->params->get('docMan_id') > 1)
{
$episodedetailtemp .=
- 'srparams->get('path') .
'/index.php?option=com_docman&task=doc_download&gid=' .
$episode->params->get('docMan_id') . '" length="' . $episode->params->get('size') . '" type="' .
$episode->params->get('mimetype') . '" />
@@ -410,13 +415,14 @@ public function makePodcasts()
else
{
$episodedetailtemp .=
- 'srparams->get('path') . str_replace(
' ',
"%20",
$episode->params->get('filename')
- ) . '" length="' . $episode->params->get('size') . '" type="'
- . $episode->params->get('mimetype') . '" />
- http://' . str_replace(
+ ) . '" length="' . $episode->params->get('size', '100') . '" type="'
+ . $episode->params->get('mimetype', 'audio/mpeg3') . '" />
+ http://' . $episode->srparams->get('path') . str_replace(
' ',
"%20",
$episode->params->get('filename')
diff --git a/com_biblestudy/site/models/commentform.php b/com_biblestudy/site/models/commentform.php
index f925465636..d7f9deb420 100644
--- a/com_biblestudy/site/models/commentform.php
+++ b/com_biblestudy/site/models/commentform.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/models/commentlist.php b/com_biblestudy/site/models/commentlist.php
index 4977c4f480..8f07607476 100644
--- a/com_biblestudy/site/models/commentlist.php
+++ b/com_biblestudy/site/models/commentlist.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/models/landingpage.php b/com_biblestudy/site/models/landingpage.php
index 16dc015b21..bcb9b9b67a 100644
--- a/com_biblestudy/site/models/landingpage.php
+++ b/com_biblestudy/site/models/landingpage.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/models/mediafileform.php b/com_biblestudy/site/models/mediafileform.php
index 7735b50b35..7f84f780e8 100644
--- a/com_biblestudy/site/models/mediafileform.php
+++ b/com_biblestudy/site/models/mediafileform.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/models/mediafilelist.php b/com_biblestudy/site/models/mediafilelist.php
index 481235d777..6e92c203a0 100644
--- a/com_biblestudy/site/models/mediafilelist.php
+++ b/com_biblestudy/site/models/mediafilelist.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/models/messageform.php b/com_biblestudy/site/models/messageform.php
index 7a6dc10228..482596c327 100644
--- a/com_biblestudy/site/models/messageform.php
+++ b/com_biblestudy/site/models/messageform.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/models/messagelist.php b/com_biblestudy/site/models/messagelist.php
index 9c808a42a9..7239ef9b99 100644
--- a/com_biblestudy/site/models/messagelist.php
+++ b/com_biblestudy/site/models/messagelist.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/models/popup.php b/com_biblestudy/site/models/popup.php
index b09000e3de..b4508e7a73 100644
--- a/com_biblestudy/site/models/popup.php
+++ b/com_biblestudy/site/models/popup.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/models/seriesdisplay.php b/com_biblestudy/site/models/seriesdisplay.php
index 8e02c8f498..f22d765fad 100644
--- a/com_biblestudy/site/models/seriesdisplay.php
+++ b/com_biblestudy/site/models/seriesdisplay.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2013 Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/models/seriesdisplays.php b/com_biblestudy/site/models/seriesdisplays.php
index 0fffaf8e96..244fb5bc3b 100644
--- a/com_biblestudy/site/models/seriesdisplays.php
+++ b/com_biblestudy/site/models/seriesdisplays.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2013 Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/models/sermon.php b/com_biblestudy/site/models/sermon.php
index 74dd44e636..09152ae26e 100644
--- a/com_biblestudy/site/models/sermon.php
+++ b/com_biblestudy/site/models/sermon.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/models/sermons.php b/com_biblestudy/site/models/sermons.php
index 6ab1555d88..90573e1840 100644
--- a/com_biblestudy/site/models/sermons.php
+++ b/com_biblestudy/site/models/sermons.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/models/serverslist.php b/com_biblestudy/site/models/serverslist.php
index b7996a1587..a4f50a84fa 100644
--- a/com_biblestudy/site/models/serverslist.php
+++ b/com_biblestudy/site/models/serverslist.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/models/teacher.php b/com_biblestudy/site/models/teacher.php
index b3a1b6aa0a..33c3f4aec7 100644
--- a/com_biblestudy/site/models/teacher.php
+++ b/com_biblestudy/site/models/teacher.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2013 Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/models/teachers.php b/com_biblestudy/site/models/teachers.php
index 2604377d92..5e1e6f59e0 100644
--- a/com_biblestudy/site/models/teachers.php
+++ b/com_biblestudy/site/models/teachers.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/router.php b/com_biblestudy/site/router.php
index d38683ac8a..4a855e2f40 100644
--- a/com_biblestudy/site/router.php
+++ b/com_biblestudy/site/router.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/sef_ext/com_biblestudy.php b/com_biblestudy/site/sef_ext/com_biblestudy.php
index b284623591..bfc21e14ed 100644
--- a/com_biblestudy/site/sef_ext/com_biblestudy.php
+++ b/com_biblestudy/site/sef_ext/com_biblestudy.php
@@ -5,7 +5,7 @@
* @package BibleStudy.Site
* @subpackage sh404SEF.BibleStudy
* @author Nick Fossen
- * @copyright 2015 (C) Joomla Bible Study
+ * @copyright 2016 (C) Joomla Bible Study
* @url http://www.newhorizoncf.org
* @license GPL v2
* {shSourceVersionTag: Version 6.2 - 2010-07-06}
diff --git a/com_biblestudy/site/views/commentform/tmpl/edit.php b/com_biblestudy/site/views/commentform/tmpl/edit.php
index c4bdc089bf..b74d723a1d 100644
--- a/com_biblestudy/site/views/commentform/tmpl/edit.php
+++ b/com_biblestudy/site/views/commentform/tmpl/edit.php
@@ -3,7 +3,7 @@
* Form
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/commentform/view.html.php b/com_biblestudy/site/views/commentform/view.html.php
index 17204c1e5e..e0ca1d4ff9 100644
--- a/com_biblestudy/site/views/commentform/view.html.php
+++ b/com_biblestudy/site/views/commentform/view.html.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/commentlist/tmpl/default.php b/com_biblestudy/site/views/commentlist/tmpl/default.php
index 03117b3b17..95bcaee635 100644
--- a/com_biblestudy/site/views/commentlist/tmpl/default.php
+++ b/com_biblestudy/site/views/commentlist/tmpl/default.php
@@ -3,7 +3,7 @@
* Default
*
* @package BibleStudy.Admin
- * @copyright (C) 2007 - 2011 Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/commentlist/tmpl/default_batch.php b/com_biblestudy/site/views/commentlist/tmpl/default_batch.php
index a0082011ce..ec6ecb2f0c 100644
--- a/com_biblestudy/site/views/commentlist/tmpl/default_batch.php
+++ b/com_biblestudy/site/views/commentlist/tmpl/default_batch.php
@@ -3,7 +3,7 @@
* Batch Template
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/commentlist/view.html.php b/com_biblestudy/site/views/commentlist/view.html.php
index b6f50da3c7..e0b2528500 100644
--- a/com_biblestudy/site/views/commentlist/view.html.php
+++ b/com_biblestudy/site/views/commentlist/view.html.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/landingpage/tmpl/default.php b/com_biblestudy/site/views/landingpage/tmpl/default.php
index 2c652b72dd..a12d6fa721 100644
--- a/com_biblestudy/site/views/landingpage/tmpl/default.php
+++ b/com_biblestudy/site/views/landingpage/tmpl/default.php
@@ -3,7 +3,7 @@
* Default
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/landingpage/view.html.php b/com_biblestudy/site/views/landingpage/view.html.php
index f52cc3ee02..26ae5095bf 100644
--- a/com_biblestudy/site/views/landingpage/view.html.php
+++ b/com_biblestudy/site/views/landingpage/view.html.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/latest/tmpl/default.php b/com_biblestudy/site/views/latest/tmpl/default.php
index 0394febc92..e7cc99b6dd 100644
--- a/com_biblestudy/site/views/latest/tmpl/default.php
+++ b/com_biblestudy/site/views/latest/tmpl/default.php
@@ -3,7 +3,7 @@
* Default
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/latest/view.html.php b/com_biblestudy/site/views/latest/view.html.php
index f31b8a51d4..6f2fe0fa22 100644
--- a/com_biblestudy/site/views/latest/view.html.php
+++ b/com_biblestudy/site/views/latest/view.html.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/mediafileform/tmpl/edit.php b/com_biblestudy/site/views/mediafileform/tmpl/edit.php
index afb5c7bcd1..a0ff5379e9 100644
--- a/com_biblestudy/site/views/mediafileform/tmpl/edit.php
+++ b/com_biblestudy/site/views/mediafileform/tmpl/edit.php
@@ -3,7 +3,7 @@
* Edit
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/mediafileform/view.html.php b/com_biblestudy/site/views/mediafileform/view.html.php
index 1f8b5d1c3f..552315fe4f 100644
--- a/com_biblestudy/site/views/mediafileform/view.html.php
+++ b/com_biblestudy/site/views/mediafileform/view.html.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/mediafilelist/tmpl/default.php b/com_biblestudy/site/views/mediafilelist/tmpl/default.php
index 807d13ad6c..df44d3ba43 100644
--- a/com_biblestudy/site/views/mediafilelist/tmpl/default.php
+++ b/com_biblestudy/site/views/mediafilelist/tmpl/default.php
@@ -3,7 +3,7 @@
* Default
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/mediafilelist/view.html.php b/com_biblestudy/site/views/mediafilelist/view.html.php
index 1927ff2edf..519d222506 100644
--- a/com_biblestudy/site/views/mediafilelist/view.html.php
+++ b/com_biblestudy/site/views/mediafilelist/view.html.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/messageform/tmpl/edit.php b/com_biblestudy/site/views/messageform/tmpl/edit.php
index cca5b6c76b..da9d76aea4 100644
--- a/com_biblestudy/site/views/messageform/tmpl/edit.php
+++ b/com_biblestudy/site/views/messageform/tmpl/edit.php
@@ -3,7 +3,7 @@
* Form
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/messageform/view.html.php b/com_biblestudy/site/views/messageform/view.html.php
index 00efe6de3a..8d55f856a4 100644
--- a/com_biblestudy/site/views/messageform/view.html.php
+++ b/com_biblestudy/site/views/messageform/view.html.php
@@ -3,7 +3,7 @@
* Message JViewLegacy
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/messagelist/tmpl/default.php b/com_biblestudy/site/views/messagelist/tmpl/default.php
index e5a2c80331..f35cf89cfd 100644
--- a/com_biblestudy/site/views/messagelist/tmpl/default.php
+++ b/com_biblestudy/site/views/messagelist/tmpl/default.php
@@ -3,7 +3,7 @@
* Default
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/messagelist/tmpl/modal.php b/com_biblestudy/site/views/messagelist/tmpl/modal.php
index 3382ecc057..99d3a508ac 100644
--- a/com_biblestudy/site/views/messagelist/tmpl/modal.php
+++ b/com_biblestudy/site/views/messagelist/tmpl/modal.php
@@ -3,7 +3,7 @@
* Modal
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/messagelist/view.html.php b/com_biblestudy/site/views/messagelist/view.html.php
index f3d56c93d6..225745697d 100644
--- a/com_biblestudy/site/views/messagelist/view.html.php
+++ b/com_biblestudy/site/views/messagelist/view.html.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/popup/tmpl/default.php b/com_biblestudy/site/views/popup/tmpl/default.php
index e2427a3833..19c156eced 100644
--- a/com_biblestudy/site/views/popup/tmpl/default.php
+++ b/com_biblestudy/site/views/popup/tmpl/default.php
@@ -3,7 +3,7 @@
* Default
*
* @package BibleStudy.Site
- * @copyright 2007 - 2013 Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/popup/view.html.php b/com_biblestudy/site/views/popup/view.html.php
index bb42e15560..826d183ba7 100644
--- a/com_biblestudy/site/views/popup/view.html.php
+++ b/com_biblestudy/site/views/popup/view.html.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/seriesdisplay/tmpl/default.php b/com_biblestudy/site/views/seriesdisplay/tmpl/default.php
index 60b87bde27..5c528ae59f 100644
--- a/com_biblestudy/site/views/seriesdisplay/tmpl/default.php
+++ b/com_biblestudy/site/views/seriesdisplay/tmpl/default.php
@@ -3,7 +3,7 @@
* Default
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/seriesdisplay/tmpl/default_custom.php b/com_biblestudy/site/views/seriesdisplay/tmpl/default_custom.php
index df8bdc84cb..9d094d9907 100644
--- a/com_biblestudy/site/views/seriesdisplay/tmpl/default_custom.php
+++ b/com_biblestudy/site/views/seriesdisplay/tmpl/default_custom.php
@@ -3,7 +3,7 @@
* Default Custom
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/seriesdisplay/tmpl/default_main.php b/com_biblestudy/site/views/seriesdisplay/tmpl/default_main.php
index 42e1364808..7e1bbf1a52 100644
--- a/com_biblestudy/site/views/seriesdisplay/tmpl/default_main.php
+++ b/com_biblestudy/site/views/seriesdisplay/tmpl/default_main.php
@@ -3,7 +3,7 @@
* Default Main
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/seriesdisplay/view.html.php b/com_biblestudy/site/views/seriesdisplay/view.html.php
index 0b240fe34b..0ce934c98d 100644
--- a/com_biblestudy/site/views/seriesdisplay/view.html.php
+++ b/com_biblestudy/site/views/seriesdisplay/view.html.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/seriesdisplays/tmpl/default.php b/com_biblestudy/site/views/seriesdisplays/tmpl/default.php
index 90ac49655a..23a6ebb262 100644
--- a/com_biblestudy/site/views/seriesdisplays/tmpl/default.php
+++ b/com_biblestudy/site/views/seriesdisplays/tmpl/default.php
@@ -3,7 +3,7 @@
* Default
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/seriesdisplays/tmpl/default_custom.php b/com_biblestudy/site/views/seriesdisplays/tmpl/default_custom.php
index f8657c4291..6a08c04a04 100644
--- a/com_biblestudy/site/views/seriesdisplays/tmpl/default_custom.php
+++ b/com_biblestudy/site/views/seriesdisplays/tmpl/default_custom.php
@@ -3,7 +3,7 @@
* Default Custom
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/seriesdisplays/tmpl/default_main.php b/com_biblestudy/site/views/seriesdisplays/tmpl/default_main.php
index 308af62fb3..7133c76bee 100644
--- a/com_biblestudy/site/views/seriesdisplays/tmpl/default_main.php
+++ b/com_biblestudy/site/views/seriesdisplays/tmpl/default_main.php
@@ -3,7 +3,7 @@
* Default Main
*
* @package BibleStudy.Site
- * @copyright 2007 - 2013 Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/seriesdisplays/view.html.php b/com_biblestudy/site/views/seriesdisplays/view.html.php
index fd57e24df0..04bb98136e 100644
--- a/com_biblestudy/site/views/seriesdisplays/view.html.php
+++ b/com_biblestudy/site/views/seriesdisplays/view.html.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2013 Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/sermon/tmpl/default.php b/com_biblestudy/site/views/sermon/tmpl/default.php
index 11d71ad667..1e99fcce77 100644
--- a/com_biblestudy/site/views/sermon/tmpl/default.php
+++ b/com_biblestudy/site/views/sermon/tmpl/default.php
@@ -3,7 +3,7 @@
* Default
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/sermon/tmpl/default_commentsform.php b/com_biblestudy/site/views/sermon/tmpl/default_commentsform.php
index 9b1ad5fe31..7e1649c324 100644
--- a/com_biblestudy/site/views/sermon/tmpl/default_commentsform.php
+++ b/com_biblestudy/site/views/sermon/tmpl/default_commentsform.php
@@ -3,7 +3,7 @@
* Default CommonetForm
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/sermon/tmpl/default_custom.php b/com_biblestudy/site/views/sermon/tmpl/default_custom.php
index 41787124f2..7555441bdf 100644
--- a/com_biblestudy/site/views/sermon/tmpl/default_custom.php
+++ b/com_biblestudy/site/views/sermon/tmpl/default_custom.php
@@ -3,7 +3,7 @@
* Default Custom
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/sermon/tmpl/default_footer.php b/com_biblestudy/site/views/sermon/tmpl/default_footer.php
index 183bb54ff1..46aa8af706 100644
--- a/com_biblestudy/site/views/sermon/tmpl/default_footer.php
+++ b/com_biblestudy/site/views/sermon/tmpl/default_footer.php
@@ -3,7 +3,7 @@
* Default footer
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/sermon/tmpl/default_footerlink.php b/com_biblestudy/site/views/sermon/tmpl/default_footerlink.php
index 4c599ea72e..21c7153d56 100644
--- a/com_biblestudy/site/views/sermon/tmpl/default_footerlink.php
+++ b/com_biblestudy/site/views/sermon/tmpl/default_footerlink.php
@@ -3,7 +3,7 @@
* Default FooterLink
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/sermon/tmpl/default_header.php b/com_biblestudy/site/views/sermon/tmpl/default_header.php
index 099e562813..e53ae4cb1b 100644
--- a/com_biblestudy/site/views/sermon/tmpl/default_header.php
+++ b/com_biblestudy/site/views/sermon/tmpl/default_header.php
@@ -3,7 +3,7 @@
* Default Header
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* @desc this is the main div for the page. default_footer has the closing div
diff --git a/com_biblestudy/site/views/sermon/tmpl/default_main.php b/com_biblestudy/site/views/sermon/tmpl/default_main.php
index 252a2d2117..ee28d3f89c 100644
--- a/com_biblestudy/site/views/sermon/tmpl/default_main.php
+++ b/com_biblestudy/site/views/sermon/tmpl/default_main.php
@@ -3,7 +3,7 @@
* Default Main
*
* @package BibleStudy.Site
- * @copyright 2007 - 2013 Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/sermon/view.html.php b/com_biblestudy/site/views/sermon/view.html.php
index 839d041fca..07b8d0af13 100644
--- a/com_biblestudy/site/views/sermon/view.html.php
+++ b/com_biblestudy/site/views/sermon/view.html.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/sermons/tmpl/default.php b/com_biblestudy/site/views/sermons/tmpl/default.php
index 03bdfac0da..cca1aed8ab 100644
--- a/com_biblestudy/site/views/sermons/tmpl/default.php
+++ b/com_biblestudy/site/views/sermons/tmpl/default.php
@@ -3,7 +3,7 @@
* Default for sermons
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/sermons/tmpl/default_custom.php b/com_biblestudy/site/views/sermons/tmpl/default_custom.php
index 5e4dfbafc9..0f4e0417b4 100644
--- a/com_biblestudy/site/views/sermons/tmpl/default_custom.php
+++ b/com_biblestudy/site/views/sermons/tmpl/default_custom.php
@@ -3,7 +3,7 @@
* Default Custom
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/sermons/tmpl/default_formfooter.php b/com_biblestudy/site/views/sermons/tmpl/default_formfooter.php
index 83a018b7ae..7f0aa99a70 100644
--- a/com_biblestudy/site/views/sermons/tmpl/default_formfooter.php
+++ b/com_biblestudy/site/views/sermons/tmpl/default_formfooter.php
@@ -3,7 +3,7 @@
* Default FormFooter
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* @since 7.1.0
diff --git a/com_biblestudy/site/views/sermons/tmpl/default_formheader.php b/com_biblestudy/site/views/sermons/tmpl/default_formheader.php
index 2a925a985c..03e0d373fc 100644
--- a/com_biblestudy/site/views/sermons/tmpl/default_formheader.php
+++ b/com_biblestudy/site/views/sermons/tmpl/default_formheader.php
@@ -3,7 +3,7 @@
* Default FormHeader
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/sermons/tmpl/default_main.php b/com_biblestudy/site/views/sermons/tmpl/default_main.php
index a2ab272c32..a8dfecb250 100644
--- a/com_biblestudy/site/views/sermons/tmpl/default_main.php
+++ b/com_biblestudy/site/views/sermons/tmpl/default_main.php
@@ -3,7 +3,7 @@
* Default for sermons
*
* @package BibleStudy.Site
- * @copyright 2007 - 2013 Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/sermons/view.html.php b/com_biblestudy/site/views/sermons/view.html.php
index add48a16df..3ceb2e5c87 100644
--- a/com_biblestudy/site/views/sermons/view.html.php
+++ b/com_biblestudy/site/views/sermons/view.html.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/serverslist/tmpl/modal.php b/com_biblestudy/site/views/serverslist/tmpl/modal.php
index 29c59075f2..cd36eab5e9 100644
--- a/com_biblestudy/site/views/serverslist/tmpl/modal.php
+++ b/com_biblestudy/site/views/serverslist/tmpl/modal.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/serverslist/view.html.php b/com_biblestudy/site/views/serverslist/view.html.php
index 493929b33e..f2510c1152 100644
--- a/com_biblestudy/site/views/serverslist/view.html.php
+++ b/com_biblestudy/site/views/serverslist/view.html.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/squeezeBox/tmpl/default.php b/com_biblestudy/site/views/squeezeBox/tmpl/default.php
index 3b0ddf50e6..808b8b4b63 100644
--- a/com_biblestudy/site/views/squeezeBox/tmpl/default.php
+++ b/com_biblestudy/site/views/squeezeBox/tmpl/default.php
@@ -3,7 +3,7 @@
* Default view for Squeezebox
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/squeezeBox/view.html.php b/com_biblestudy/site/views/squeezeBox/view.html.php
index a1cf06f9bd..6746058566 100644
--- a/com_biblestudy/site/views/squeezeBox/view.html.php
+++ b/com_biblestudy/site/views/squeezeBox/view.html.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/teacher/tmpl/default.php b/com_biblestudy/site/views/teacher/tmpl/default.php
index 602b0f8627..fb515dfd9c 100644
--- a/com_biblestudy/site/views/teacher/tmpl/default.php
+++ b/com_biblestudy/site/views/teacher/tmpl/default.php
@@ -3,7 +3,7 @@
* Default
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/teacher/tmpl/default_custom.php b/com_biblestudy/site/views/teacher/tmpl/default_custom.php
index a6902b762e..5c29d6a79c 100644
--- a/com_biblestudy/site/views/teacher/tmpl/default_custom.php
+++ b/com_biblestudy/site/views/teacher/tmpl/default_custom.php
@@ -3,7 +3,7 @@
* Default Custom
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/teacher/tmpl/default_main.php b/com_biblestudy/site/views/teacher/tmpl/default_main.php
index 83ac6b4a0e..fee16eddbf 100644
--- a/com_biblestudy/site/views/teacher/tmpl/default_main.php
+++ b/com_biblestudy/site/views/teacher/tmpl/default_main.php
@@ -3,7 +3,7 @@
* Teacher view subset main
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/teacher/view.html.php b/com_biblestudy/site/views/teacher/view.html.php
index 220c4a58e7..8bdc8be6ed 100644
--- a/com_biblestudy/site/views/teacher/view.html.php
+++ b/com_biblestudy/site/views/teacher/view.html.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/teachers/tmpl/default.php b/com_biblestudy/site/views/teachers/tmpl/default.php
index 1746099ef3..da34f2656a 100644
--- a/com_biblestudy/site/views/teachers/tmpl/default.php
+++ b/com_biblestudy/site/views/teachers/tmpl/default.php
@@ -3,7 +3,7 @@
* Default
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/teachers/tmpl/default_custom.php b/com_biblestudy/site/views/teachers/tmpl/default_custom.php
index 88936ea473..0601ce38c4 100644
--- a/com_biblestudy/site/views/teachers/tmpl/default_custom.php
+++ b/com_biblestudy/site/views/teachers/tmpl/default_custom.php
@@ -3,7 +3,7 @@
* Default Custom
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/teachers/tmpl/default_main.php b/com_biblestudy/site/views/teachers/tmpl/default_main.php
index ee3ea2c424..5d62c229d1 100644
--- a/com_biblestudy/site/views/teachers/tmpl/default_main.php
+++ b/com_biblestudy/site/views/teachers/tmpl/default_main.php
@@ -3,7 +3,7 @@
* Teachers view subset main
*
* @package BibleStudy.Site
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/teachers/view.html.php b/com_biblestudy/site/views/teachers/view.html.php
index 9f1c24cb3a..0b13fa6a91 100644
--- a/com_biblestudy/site/views/teachers/view.html.php
+++ b/com_biblestudy/site/views/teachers/view.html.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/com_biblestudy/site/views/terms/view.html.php b/com_biblestudy/site/views/terms/view.html.php
index 3c80b6899a..dc0d6499d2 100644
--- a/com_biblestudy/site/views/terms/view.html.php
+++ b/com_biblestudy/site/views/terms/view.html.php
@@ -3,7 +3,7 @@
* Part of Joomla BibleStudy Package
*
* @package BibleStudy.Admin
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
diff --git a/mod_biblestudy/helper.php b/mod_biblestudy/helper.php
index a18868cfd3..8343e01b2d 100644
--- a/mod_biblestudy/helper.php
+++ b/mod_biblestudy/helper.php
@@ -5,12 +5,14 @@
*
* @package BibleStudy
* @subpackage Model.BibleStudy
- * @copyright 2007 - 2015 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
defined('_JEXEC') or die;
+use Joomla\Registry\Registry;
+
/**
* BibleStudy mod helper
*
@@ -20,4 +22,317 @@
*/
class ModJBSMHelper
{
+
+ /**
+ * Get Latest
+ *
+ * @param Registry $params Item Params
+ *
+ * @return array
+ */
+ public static function getLatest($params)
+ {
+ $user = JFactory::getUser();
+ $groups = implode(',', $user->getAuthorisedViewLevels());
+
+ $db = JFactory::getDbo();
+ $db->setQuery('SET SQL_BIG_SELECTS=1');
+ $db->execute();
+ $query = $db->getQuery(true);
+ $teacher = $params->get('teacher_id');
+ $topic = $params->get('topic_id');
+ $book = $params->get('booknumber');
+ $series = $params->get('series_id');
+ $locations = $params->get('locations');
+ $condition = $params->get('condition');
+ $messagetype_menu = $params->get('messagetype');
+ $year = $params->get('year');
+ $orderparam = $params->get('order', '1');
+ $language = $params->get('language', '*');
+
+ if ($orderparam == 2)
+ {
+ $order = "ASC";
+ }
+ else
+ {
+ $order = "DESC";
+ }
+ if ($condition > 0)
+ {
+ $condition = ' AND ';
+ }
+ else
+ {
+ $condition = ' OR ';
+ }
+
+ $query->from('#__bsms_studies AS study');
+
+ $query->select('study.id, study.published, study.studydate, study.studytitle, study.booknumber, study.chapter_begin,
+ study.verse_begin, study.chapter_end, study.verse_end, study.hits, study.alias, study.studyintro,
+ study.teacher_id, study.secondary_reference, study.booknumber2, study.location_id, study.media_hours, study.media_minutes,
+ study.media_seconds, study.series_id, study.chapter_begin2, study.chapter_end2, study.verse_begin2,
+ study.verse_end2, study.thumbnailm, study.thumbhm, study.thumbwm, study.access, study.user_name,
+ study.user_id, study.studynumber,'
+ . ' CASE WHEN CHAR_LENGTH(study.alias) THEN CONCAT_WS(\':\', study.id, study.alias) ELSE study.id END as slug ');
+
+ // Join over mediafile ids
+ $query->select('GROUP_CONCAT(DISTINCT m.id) as mids');
+ $query->join('LEFT', '#__bsms_mediafiles as m ON study.id = m.study_id');
+
+ // Join over Message Types
+ $query->select('messageType.message_type AS messageType');
+ $query->join('LEFT', '#__bsms_message_type AS messageType ON messageType.id = study.messagetype');
+
+ // Join over Teachers
+ $query->select('teacher.teachername AS teachername, teacher.id AS tid');
+ $query->join('LEFT', '#__bsms_teachers AS teacher ON teacher.id = study.teacher_id');
+
+ // Join over Series
+ $query->select('series.series_text, series.series_thumbnail, series.description as sdescription');
+ $query->join('LEFT', '#__bsms_series AS series ON series.id = study.series_id');
+
+ // Join over Books
+ $query->select('book.bookname');
+ $query->join('LEFT', '#__bsms_books AS book ON book.booknumber = study.booknumber');
+
+ // Join over Plays/Downloads
+ $query->select('SUM(mediafile.plays) AS totalplays, SUM(mediafile.downloads) as totaldownloads, mediafile.study_id');
+ $query->join('LEFT', '#__bsms_mediafiles AS mediafile ON mediafile.study_id = study.id');
+ $query->group('study.id');
+
+ // Join over topics
+ $query->select('GROUP_CONCAT(DISTINCT st.topic_id)');
+ $query->join('LEFT', '#__bsms_studytopics AS st ON study.id = st.study_id');
+ $query->select('GROUP_CONCAT(DISTINCT t.id), GROUP_CONCAT(DISTINCT t.topic_text) as topics_text, GROUP_CONCAT(DISTINCT t.params)');
+ $query->join('LEFT', '#__bsms_topics AS t ON t.id = st.topic_id');
+
+ // Join over the users for the author and modified_by names.
+ $query->select("CASE WHEN study.user_name > ' ' THEN study.user_name ELSE users.name END AS submitted")
+ ->select("users.email AS author_email")
+ ->join('LEFT', '#__users AS users ON study.user_id = users.id')
+ ->join('LEFT', '#__users AS uam ON uam.id = study.modified_by');
+
+ $query->group('study.id');
+
+ // Filter only for authorized view
+ $query->where('(series.access IN (' . $groups . ') or study.series_id <= 0)');
+ $query->where('study.access IN (' . $groups . ')');
+
+ // Select only published studies
+ $query->where('study.published = 1');
+ $query->where('(series.published = 1 or study.series_id <= 0)');
+
+ // Filter over teachers
+ $filters = $teacher;
+
+ if (count($filters) > 1)
+ {
+ $where2 = array();
+ $subquery = '(';
+
+ foreach ($filters as $filter)
+ {
+ $where2[] = 'study.teacher_id = ' . (int) $filter;
+ }
+ $subquery .= implode(' OR ', $where2);
+ $subquery .= ')';
+
+ $query->where($subquery);
+ }
+ else
+ {
+ foreach ($filters as $filter)
+ {
+ if ($filter != -1)
+ {
+ $query->where('study.teacher_id = ' . (int) $filter, $condition);
+ }
+ }
+ }
+
+ // Filter locations
+ $filters = $locations;
+
+ if (count($filters) > 1)
+ {
+ $where2 = array();
+ $subquery = '(';
+
+ foreach ($filters as $filter)
+ {
+ $where2[] = 'study.location_id = ' . (int) $filter;
+ }
+ $subquery .= implode(' OR ', $where2);
+ $subquery .= ')';
+
+ $query->where($subquery);
+ }
+ else
+ {
+ foreach ($filters AS $filter)
+ {
+ if ($filter != -1)
+ {
+ $query->where('study.location_id = ' . (int) $filter, $condition);
+ }
+ }
+ }
+
+ // Filter over books
+ $filters = $book;
+
+ if (count($filters) > 1)
+ {
+ $where2 = array();
+ $subquery = '(';
+
+ foreach ($filters as $filter)
+ {
+ $where2[] = 'study.booknumber = ' . (int) $filter;
+ }
+ $subquery .= implode(' OR ', $where2);
+ $subquery .= ')';
+
+ $query->where($subquery);
+ }
+ else
+ {
+ foreach ($filters AS $filter)
+ {
+ if ($filter != -1)
+ {
+ $query->where('study.booknumber = ' . (int) $filter, $condition);
+ }
+ }
+ }
+ $filters = $series;
+
+ if (count($filters) > 1)
+ {
+ $where2 = array();
+ $subquery = '(';
+
+ foreach ($filters as $filter)
+ {
+ $where2[] = 'study.series_id = ' . (int) $filter;
+ }
+ $subquery .= implode(' OR ', $where2);
+ $subquery .= ')';
+
+ $query->where($subquery);
+ }
+ else
+ {
+ foreach ($filters AS $filter)
+ {
+ if ($filter != -1)
+ {
+ $query->where('study.series_id = ' . (int) $filter, $condition);
+ }
+ }
+ }
+ $filters = $topic;
+
+ if (count($filters) > 1)
+ {
+ $where2 = array();
+ $subquery = '(';
+
+ foreach ($filters as $filter)
+ {
+ $where2[] = 'study.topics_id = ' . (int) $filter;
+ }
+ $subquery .= implode(' OR ', $where2);
+ $subquery .= ')';
+
+ $query->where($subquery);
+ }
+ else
+ {
+ foreach ($filters AS $filter)
+ {
+ if ($filter != -1)
+ {
+ $query->where('study.topics_id = ' . (int) $filter, $condition);
+ }
+ }
+ }
+
+ // Filter by language
+ $lang = JFactory::getLanguage();
+
+ if ($lang || $language != '*')
+ {
+ $query->where('study.language in (' . $db->Quote(JFactory::getLanguage()->getTag()) . ',' . $db->Quote('*') . ')');
+ }
+
+ $filters = $messagetype_menu;
+
+ if (count($filters) > 1)
+ {
+ $where2 = array();
+ $subquery = '(';
+
+ foreach ($filters as $filter)
+ {
+ $where2[] = 'study.messagetype = ' . (int) $filter;
+ }
+ $subquery .= implode(' OR ', $where2);
+ $subquery .= ')';
+
+ $query->where($subquery);
+ }
+ else
+ {
+ foreach ($filters AS $filter)
+ {
+ if ($filter != -1)
+ {
+ $query->where('study.messagetype = ' . (int) $filter, $condition);
+ }
+ }
+ }
+ $filters = $year;
+
+ if (count($filters) > 1)
+ {
+ $where2 = array();
+ $subquery = '(';
+
+ foreach ($filters as $filter)
+ {
+ $where2[] = 'YEAR(study.studydate) = ' . (int) $filter;
+ }
+ $subquery .= implode(' OR ', $where2);
+ $subquery .= ')';
+
+ $query->where($subquery);
+ }
+ else
+ {
+ if ($filters !== null)
+ {
+ foreach ($filters AS $filter)
+ {
+ if ($filter != -1)
+ {
+ $query->where('YEAR(study.studydate) = ' . (int) $filter, $condition);
+ }
+ }
+ }
+ }
+
+ // Select only published studies
+ $query->where('study.published = 1');
+ $query->where('(series.published = 1 or study.series_id <= 0)');
+
+ $query->order('studydate ' . $order);
+ $db->setQuery((string) $query, 0, $params->get('moduleitems', '5'));
+ $rows = $db->loadObjectList();
+
+ return $rows;
+ }
+
}
diff --git a/mod_biblestudy/mod_biblestudy.php b/mod_biblestudy/mod_biblestudy.php
index cd194d15a3..345d9185a9 100644
--- a/mod_biblestudy/mod_biblestudy.php
+++ b/mod_biblestudy/mod_biblestudy.php
@@ -4,7 +4,7 @@
*
* @package BibleStudy
* @subpackage Model.BibleStudy
- * @copyright 2007 - 2011 Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2016 (C) Joomla Bible Study Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
* @link http://www.JoomlaBibleStudy.org
* */
@@ -33,22 +33,24 @@
$params->merge($admin_params);
$template->params->merge($params);
$params = $template->params;
-$items = $pagebuilder->studyBuilder(null, null, $params);
+require_once dirname(__FILE__) . '/helper.php';
+
+$items = ModJBSMHelper::getLatest($params);
// Check permissions for this view by running through the records and removing those the user doesn't have permission to see
$user = JFactory::getUser();
$groups = $user->getAuthorisedViewLevels();
$count = count($items);
-if ($params->get('useexpert_module') > 0 || is_string($params->get('moduletemplate')))
+if ($params->get('useexpert_module') > 0 || is_string($params->get('moduletemplate')) == true)
{
foreach ($items AS $item)
{
$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id . ':'
. str_replace(' ', '-', htmlspecialchars_decode($item->studytitle, ENT_QUOTES));
- $pelements = $pagebuilder->buildPage($item, $params, $admin_params);
+ $pelements = $pagebuilder->buildPage($item, $params, $template);
$item->scripture1 = $pelements->scripture1;
$item->scripture2 = $pelements->scripture2;
$item->media = $pelements->media;
@@ -117,9 +119,7 @@
$document->addStyleSheet($url);
}
$pageclass_sfx = $params->get('pageclass_sfx');
-/**
- * @todo fork the layout based on params to other custom template files, Tom can you see if this to do is still needed. TOM
- */
+
if ($params->get('useexpert_module') > 0)
{
$template = 'default_custom';
diff --git a/mod_biblestudy/mod_biblestudy.xml b/mod_biblestudy/mod_biblestudy.xml
index 430c666024..84b5f43134 100644
--- a/mod_biblestudy/mod_biblestudy.xml
+++ b/mod_biblestudy/mod_biblestudy.xml
@@ -5,8 +5,8 @@
info@joomlabiblestudy.org
http://www.joomlabiblestudy.org
(C) 2007 - 2016 Joomla Bible Study All rights reserved.
- 9.0.0-beta2
- Feb 26, 2016
+ 9.0.0-beta3
+ March 4, 2016
http://www.gnu.org/licenses/gpl.html
JBS_MDL_DESCRIPTION
@@ -34,19 +34,19 @@
-
-
-
@@ -54,8 +54,9 @@
@@ -71,40 +73,47 @@
label="JFIELD_LANGUAGE_LABEL" description="JBS_MDL_LANGUAGE_DESC">
-
+
-
+
+ default="">
+
+ default="">
+
+ default="">
+
+ default="">
+
-
+
