From 422325e44f7ec20b216f325510d2a26ef8eb2106 Mon Sep 17 00:00:00 2001 From: Brent Cordis Date: Thu, 7 Jul 2016 19:55:20 -0500 Subject: [PATCH 1/2] Change of Release Date and Code check. --- README.md | 8 +- build/pkg_biblestudy_package.xml | 2 +- build/script.php | 2 +- .../css/jquery.ui.plupload.css | 2 +- .../jquery.ui.plupload/jquery.ui.plupload.js | 2 +- .../servers/legacy/includes/js/moxie.js | 4 +- com_biblestudy/admin/api.php | 2 +- .../admin/helpers/biblestudyhelper.php | 2 +- com_biblestudy/admin/helpers/dbhelper.php | 2 +- .../admin/install/updates/7.1.0.php | 2 +- com_biblestudy/admin/lib/defines.php | 4 +- com_biblestudy/admin/models/mediafile.php | 2 + .../admin/views/comment/tmpl/edit.php | 2 + .../admin/views/dir/tmpl/default_footer.php | 4 +- .../admin/views/install/view.html.php | 2 +- .../admin/views/location/tmpl/edit.php | 2 + .../admin/views/locations/view.html.php | 2 +- .../admin/views/mediafiles/view.html.php | 2 +- .../admin/views/messages/view.html.php | 2 +- .../admin/views/messagetype/tmpl/edit.php | 2 + .../admin/views/messagetypes/view.html.php | 2 +- .../admin/views/podcast/tmpl/edit.php | 2 + .../admin/views/series/view.html.php | 2 +- .../views/teachers/tmpl/default_batch.php | 5 +- .../admin/views/teachers/view.html.php | 2 +- .../admin/views/templatecode/tmpl/edit.php | 2 + .../admin/views/templates/view.html.php | 2 +- .../admin/views/topic/tmpl/edit.php | 2 + .../admin/views/upload/view.html.php | 6 ++ com_biblestudy/biblestudy.script.php | 4 +- com_biblestudy/biblestudy.xml | 4 +- com_biblestudy/media/css/podcast.css | 1 - com_biblestudy/media/js/assat.js | 4 +- com_biblestudy/media/plupload/upload.php | 76 +++++++++++-------- .../site/views/mediafileform/tmpl/edit.php | 1 + .../site/views/mediafileform/view.html.php | 2 + .../site/views/messagelist/view.html.php | 4 + .../seriesdisplays/tmpl/default_main.php | 1 + .../site/views/sermon/tmpl/default_main.php | 2 + .../site/views/serverslist/view.html.php | 5 ++ mod_biblestudy/mod_biblestudy.xml | 4 +- .../mod_biblestudy_podcast.xml | 4 +- plg_biblestudy_backup/jbsbackup.xml | 4 +- plg_biblestudy_finder/biblestudy.xml | 4 +- plg_biblestudy_podcast/jbspodcast.xml | 4 +- plg_biblestudy_search/biblestudysearch.xml | 4 +- 46 files changed, 123 insertions(+), 82 deletions(-) diff --git a/README.md b/README.md index 1d478a140e..072f22eba5 100644 --- a/README.md +++ b/README.md @@ -14,15 +14,15 @@ Status Development - 9.0.2 - June 29, 2016 + 9.0.3 + July 29, 2016 3.4+ Master - 9.0.1 - June 19, 2016 + 9.0.2 + July 8, 2016 3.4+ diff --git a/build/pkg_biblestudy_package.xml b/build/pkg_biblestudy_package.xml index e56896799c..57fb610e8b 100644 --- a/build/pkg_biblestudy_package.xml +++ b/build/pkg_biblestudy_package.xml @@ -8,7 +8,7 @@ info@joomlabiblestudy.org http://www.joomlabiblestudy.org (C) 2007 - 2016 Joomla Bible Study All rights reserved. - 9.0.1 + 9.0.2 April 8, 2016 http://www.gnu.org/licenses/gpl.html Tom Fuller diff --git a/build/script.php b/build/script.php index b8a72440c5..209ffbb19d 100644 --- a/build/script.php +++ b/build/script.php @@ -15,7 +15,7 @@ * * @package BibleStudy * @subpackage Package.JBSPodcast - * @since 9.0.1 + * @since 9.0.2 */ class Pkg_Biblestudy_PackageInstallerScript { diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/css/jquery.ui.plupload.css b/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/css/jquery.ui.plupload.css index 2e946249a9..7b2a10c8c2 100755 --- a/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/css/jquery.ui.plupload.css +++ b/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/css/jquery.ui.plupload.css @@ -330,7 +330,7 @@ display: block; } -.plupload_buttons, .plupload_upload_status {float: left} +.plupload_buttons, .plupload_upload_status {float: left;} .plupload_message { position: absolute; diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/jquery.ui.plupload.js b/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/jquery.ui.plupload.js index 97b29cf022..c1fdd70540 100755 --- a/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/jquery.ui.plupload.js +++ b/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/jquery.ui.plupload.js @@ -169,7 +169,7 @@ Dispatched when file is uploaded. @event uploaded @param {plupload.Uploader} uploader Uploader instance sending the event. @param {plupload.File} file File that was uploaded. - @param {Enum} status Status constant matching the plupload states QUEUED, UPLOADING, FAILED, DONE. + @param {Enum} status Status constant matching the plupload states QUEUED, UPLOADING, FAILED, DONE. */ /** diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/moxie.js b/com_biblestudy/admin/addons/servers/legacy/includes/js/moxie.js index 2a8e000141..97dcd6e574 100755 --- a/com_biblestudy/admin/addons/servers/legacy/includes/js/moxie.js +++ b/com_biblestudy/admin/addons/servers/legacy/includes/js/moxie.js @@ -10922,7 +10922,7 @@ define("moxie/runtime/html4/xhr/XMLHttpRequest", [ ; // IE 6 won't be able to set the name using setAttribute or iframe.name - temp.innerHTML = ''; + temp.innerHTML = ''; _iframe = temp.firstChild; container.appendChild(_iframe); @@ -10961,7 +10961,7 @@ define("moxie/runtime/html4/xhr/XMLHttpRequest", [ } } catch (ex) { if (Url.hasSameOrigin(meta.url)) { - // if response is sent with error code, iframe in IE gets redirected to res://ieframe.dll/http_x.htm + // if response is sent with error code, iframe in IE gets redirected to res://iframe.dll/http_x.htm // which obviously results to cross domain error (wtf?) _status = 404; } else { diff --git a/com_biblestudy/admin/api.php b/com_biblestudy/admin/api.php index f6c594d183..a39fd3292d 100644 --- a/com_biblestudy/admin/api.php +++ b/com_biblestudy/admin/api.php @@ -19,7 +19,7 @@ define('JBSM_PROFILER', 0); // Version information -define('BIBLESTUDY_VERSION', '9.0.1'); +define('BIBLESTUDY_VERSION', '9.0.2'); define('BIBLESTUDY_VERSION_DATE', '2016-05-23'); define('BIBLESTUDY_VERSION_UPDATEFILE', 'JBS Version ' . BIBLESTUDY_VERSION); diff --git a/com_biblestudy/admin/helpers/biblestudyhelper.php b/com_biblestudy/admin/helpers/biblestudyhelper.php index 5d38374362..b2dcb2a9c0 100644 --- a/com_biblestudy/admin/helpers/biblestudyhelper.php +++ b/com_biblestudy/admin/helpers/biblestudyhelper.php @@ -371,7 +371,7 @@ public static function debug() if (!isset(self::$admin_params->debug)) { self::$admin_params = new stdClass; - self::$admin_paramss->debug = 1; + self::$admin_params->debug = 1; } return self::$admin_params->debug; diff --git a/com_biblestudy/admin/helpers/dbhelper.php b/com_biblestudy/admin/helpers/dbhelper.php index ac36a05d2a..e3039ee223 100644 --- a/com_biblestudy/admin/helpers/dbhelper.php +++ b/com_biblestudy/admin/helpers/dbhelper.php @@ -9,7 +9,7 @@ * */ defined('_JEXEC') or die; -use \Joomla\Registry\Registry; +use Joomla\Registry\Registry; /** * Database Helper class for version 7.1.0 diff --git a/com_biblestudy/admin/install/updates/7.1.0.php b/com_biblestudy/admin/install/updates/7.1.0.php index 676e73ffdd..31e4bf1d92 100644 --- a/com_biblestudy/admin/install/updates/7.1.0.php +++ b/com_biblestudy/admin/install/updates/7.1.0.php @@ -10,7 +10,7 @@ // No Direct Access defined('_JEXEC') or die; -use \Joomla\Registry\Registry; +use Joomla\Registry\Registry; /** * Update for 7.1.0 class diff --git a/com_biblestudy/admin/lib/defines.php b/com_biblestudy/admin/lib/defines.php index 5d694c450f..6c415d8f8d 100644 --- a/com_biblestudy/admin/lib/defines.php +++ b/com_biblestudy/admin/lib/defines.php @@ -63,8 +63,8 @@ define('BIBLESTUDY_PATH_MOD', BIBLESTUDY_ROOT_PATH . DIRECTORY_SEPARATOR . 'modules' . DIRECTORY_SEPARATOR . 'mod_biblestudy'); // Minimum version requirements -DEFINE('BIBLESTUDY_MIN_PHP', '5.3.10'); -DEFINE('BIBLESTUDY_MIN_MYSQL', '5.1'); +define('BIBLESTUDY_MIN_PHP', '5.3.10'); +define('BIBLESTUDY_MIN_MYSQL', '5.1'); // Time related define('BIBLESTUDY_SECONDS_IN_HOUR', 3600); diff --git a/com_biblestudy/admin/models/mediafile.php b/com_biblestudy/admin/models/mediafile.php index 720cfd0bf0..89c7d5c43f 100644 --- a/com_biblestudy/admin/models/mediafile.php +++ b/com_biblestudy/admin/models/mediafile.php @@ -437,6 +437,8 @@ protected function batchPlayer($value, $pks, $contexts) { $table->reset(); $table->load($pk); + + // Todo Need to move to params BCC $table->player = (int) $value; if (!$table->store()) diff --git a/com_biblestudy/admin/views/comment/tmpl/edit.php b/com_biblestudy/admin/views/comment/tmpl/edit.php index 63e8ba30a2..d9cc080204 100644 --- a/com_biblestudy/admin/views/comment/tmpl/edit.php +++ b/com_biblestudy/admin/views/comment/tmpl/edit.php @@ -20,6 +20,8 @@ JHtml::_('formbehavior.chosen', 'select'); // Create shortcut to parameters. + +/** @type Joomla\Registry\Registry $params */ $params = $this->state->get('params'); $params = $params->toArray(); diff --git a/com_biblestudy/admin/views/dir/tmpl/default_footer.php b/com_biblestudy/admin/views/dir/tmpl/default_footer.php index 0fdc36064b..7c9bcd09c5 100644 --- a/com_biblestudy/admin/views/dir/tmpl/default_footer.php +++ b/com_biblestudy/admin/views/dir/tmpl/default_footer.php @@ -23,6 +23,4 @@ folders); ?> Files files); ?> - - - +getQuery(true); - $sql->select('COUNT(*)')->from('#__modules')->where('module=' . $db->Quote('mod_' . $module)); + $sql->select('COUNT(*)')->from('#__modules')->where('module=' . $db->q('mod_' . $module)); $db->setQuery($sql); $result = $db->loadResult(); $this->status->modules[] = array( diff --git a/com_biblestudy/admin/views/location/tmpl/edit.php b/com_biblestudy/admin/views/location/tmpl/edit.php index 860c80329b..f46782054b 100644 --- a/com_biblestudy/admin/views/location/tmpl/edit.php +++ b/com_biblestudy/admin/views/location/tmpl/edit.php @@ -17,6 +17,8 @@ JHtml::_('formbehavior.chosen', 'select'); // Create shortcut to parameters. + +/** @type Joomla\Registry\Registry $params */ $params = $this->state->get('params'); $params = $params->toArray(); $app = JFactory::getApplication(); diff --git a/com_biblestudy/admin/views/locations/view.html.php b/com_biblestudy/admin/views/locations/view.html.php index 39fe098a4c..fa0d05bc2f 100644 --- a/com_biblestudy/admin/views/locations/view.html.php +++ b/com_biblestudy/admin/views/locations/view.html.php @@ -129,7 +129,7 @@ protected function addToolbar() $user = JFactory::getUser(); // Get the toolbar object instance - $bar = JToolBar::getInstance('toolbar'); + $bar = JToolbar::getInstance('toolbar'); JToolbarHelper::title(JText::_('JBS_CMN_LOCATIONS'), 'home home'); if ($this->canDo->get('core.create')) diff --git a/com_biblestudy/admin/views/mediafiles/view.html.php b/com_biblestudy/admin/views/mediafiles/view.html.php index 97171ec848..d0e86a5009 100644 --- a/com_biblestudy/admin/views/mediafiles/view.html.php +++ b/com_biblestudy/admin/views/mediafiles/view.html.php @@ -144,7 +144,7 @@ protected function addToolbar() $user = JFactory::getUser(); // Get the toolbar object instance - $bar = JToolBar::getInstance('toolbar'); + $bar = JToolbar::getInstance('toolbar'); JToolbarHelper::title(JText::_('JBS_CMN_MEDIA_FILES'), 'video video'); diff --git a/com_biblestudy/admin/views/messages/view.html.php b/com_biblestudy/admin/views/messages/view.html.php index b1a57af5b6..6c58935a6a 100644 --- a/com_biblestudy/admin/views/messages/view.html.php +++ b/com_biblestudy/admin/views/messages/view.html.php @@ -168,7 +168,7 @@ protected function addToolbar() $user = JFactory::getUser(); // Get the toolbar object instance - $bar = JToolBar::getInstance('toolbar'); + $bar = JToolbar::getInstance('toolbar'); JToolbarHelper::title(JText::_('JBS_CMN_STUDIES'), 'book book'); diff --git a/com_biblestudy/admin/views/messagetype/tmpl/edit.php b/com_biblestudy/admin/views/messagetype/tmpl/edit.php index 5765d38c8e..4a4c8c4c9a 100644 --- a/com_biblestudy/admin/views/messagetype/tmpl/edit.php +++ b/com_biblestudy/admin/views/messagetype/tmpl/edit.php @@ -17,6 +17,8 @@ JHtml::_('formbehavior.chosen', 'select'); // Create shortcut to parameters. + +/** @type Joomla\Registry\Registry $params */ $params = $this->state->get('params'); $params = $params->toArray(); $app = JFactory::getApplication(); diff --git a/com_biblestudy/admin/views/messagetypes/view.html.php b/com_biblestudy/admin/views/messagetypes/view.html.php index 6afa8f6cd3..04f5983612 100644 --- a/com_biblestudy/admin/views/messagetypes/view.html.php +++ b/com_biblestudy/admin/views/messagetypes/view.html.php @@ -129,7 +129,7 @@ protected function addToolbar() $user = JFactory::getUser(); // Get the toolbar object instance - $bar = JToolBar::getInstance('toolbar'); + $bar = JToolbar::getInstance('toolbar'); JToolbarHelper::title(JText::_('JBS_CMN_MESSAGETYPES'), 'list-2 list-2'); diff --git a/com_biblestudy/admin/views/podcast/tmpl/edit.php b/com_biblestudy/admin/views/podcast/tmpl/edit.php index 0e9dcac16f..2efdc4d49b 100644 --- a/com_biblestudy/admin/views/podcast/tmpl/edit.php +++ b/com_biblestudy/admin/views/podcast/tmpl/edit.php @@ -17,6 +17,8 @@ JHtml::_('formbehavior.chosen', 'select'); // Create shortcut to parameters. + +/** @type Joomla\Registry\Registry $params */ $params = $this->state->get('params'); $params = $params->toArray(); $app = JFactory::getApplication(); diff --git a/com_biblestudy/admin/views/series/view.html.php b/com_biblestudy/admin/views/series/view.html.php index 586289ccbe..c9d78530c4 100644 --- a/com_biblestudy/admin/views/series/view.html.php +++ b/com_biblestudy/admin/views/series/view.html.php @@ -130,7 +130,7 @@ protected function addToolbar() $user = JFactory::getUser(); // Get the toolbar object instance - $bar = JToolBar::getInstance('toolbar'); + $bar = JToolbar::getInstance('toolbar'); JToolbarHelper::title(JText::_('JBS_CMN_SERIES'), 'tree-2 tree-2'); diff --git a/com_biblestudy/admin/views/teachers/tmpl/default_batch.php b/com_biblestudy/admin/views/teachers/tmpl/default_batch.php index f07592a45e..9d12d11f0c 100644 --- a/com_biblestudy/admin/views/teachers/tmpl/default_batch.php +++ b/com_biblestudy/admin/views/teachers/tmpl/default_batch.php @@ -13,10 +13,7 @@ ?>