Merge pull request #660 from Joomla-Bible-Study/development

9.0.2 Bug Release

README.md

@@ -14,15 +14,15 @@ Status
     <tr>
         <td><a href="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study" target="_blank"><img src="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study.png?branch=development"/></a></td>
         <td>Development</td>
-        <td>9.0.2</td>
-        <td>June 29, 2016</td>
+        <td>9.0.3</td>
+        <td>July 29, 2016</td>
         <td align="center">3.4+</td>
     </tr>
     <tr>
         <td><a href="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study" target="_blank"><img src="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study.png?branch=master"/></a></td>
         <td>Master</td>
-        <td>9.0.1</td>
-        <td>June 19, 2016</td>
+        <td>9.0.2</td>
+        <td>July 8, 2016</td>
         <td align="center">3.4+</td>
     </tr>
 </table>

build/pkg_biblestudy_package.xml

@@ -8,7 +8,7 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>http://www.joomlabiblestudy.org</authorUrl>
 	<copyright>(C) 2007 - 2016 Joomla Bible Study All rights reserved.</copyright>
-	<version>9.0.1</version>
+	<version>9.0.2</version>
 	<creationDate>April 8, 2016</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<packager>Tom Fuller</packager>

build/script.php

@@ -15,7 +15,7 @@
  *
  * @package     BibleStudy
  * @subpackage  Package.JBSPodcast
- * @since       9.0.1
+ * @since       9.0.2
  */
 class Pkg_Biblestudy_PackageInstallerScript
 {

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;

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.
 */
 
 /**

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 = '<iframe id="' + uid + '_iframe" name="' + uid + '_iframe" src="javascript:&quot;&quot;" style="display:none"></iframe>';
+					temp.innerHTML = '<iframe id="' + uid + '_iframe" name="' + uid + '_iframe" src="javascript:&quot;&quot;" style="display:none;"></iframe>';
 					_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 {

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);
 

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;

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

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

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);

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())

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();
 

com_biblestudy/admin/views/dir/tmpl/default_footer.php

@@ -23,6 +23,4 @@
 <?php var_dump($this->folders); ?>
 Files
 <?php var_dump($this->files); ?>
-<?php endif; ?>
-
-
+<?php endif;

com_biblestudy/admin/views/install/view.html.php

@@ -263,7 +263,7 @@ protected function installsetup()
 					{
 						// Was the module already installed?
 						$sql = $db->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(

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();

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'))

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');
 

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');
 

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();

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');
 

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();

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');
 

com_biblestudy/admin/views/teachers/tmpl/default_batch.php

@@ -13,10 +13,7 @@
 ?>
 <div class="modal hide fade" id="collapseModal">
 	<div class="modal-header">
-		<?php if (BIBLESTUDY_CHECKREL)
-		{
-			?>
-			<button type="button" role="presentation" class="close" data-dismiss="modal">x</button><?php } ?>
+			<button type="button" role="presentation" class="close" data-dismiss="modal">x</button>
 		<h3><?php echo JText::_('JBS_CMN_BATCH_OPTIONS'); ?></h3>
 	</div>
 	<div class="modal-body">

com_biblestudy/admin/views/teachers/view.html.php

@@ -121,7 +121,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_TEACHERS'), 'users users');
 

com_biblestudy/admin/views/templatecode/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();

com_biblestudy/admin/views/templates/view.html.php

@@ -113,7 +113,7 @@ public function display($tpl = null)
 			$this->sidebar = JHtmlSidebar::render();
 		}
 
-		$bar = JToolBar::getInstance('toolbar');
+		$bar = JToolbar::getInstance('toolbar');
 		$url = JRoute::_('index.php?option=com_biblestudy&view=templates&layout=default_export');
 		$bar->appendButton('Link', 'export', 'JBS_TPL_IMPORT_EXPORT_TEMPLATE', $url);
 

com_biblestudy/admin/views/topic/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();

com_biblestudy/admin/views/upload/view.html.php

@@ -21,6 +21,12 @@
  */
 class BiblestudyViewUpload extends JViewLegacy
 {
+	public $enableLog;
+
+	public $runtime;
+
+	public $currentDir;
+
 	/**
 	 * Form
 	 *

com_biblestudy/biblestudy.script.php

@@ -327,15 +327,15 @@ protected function checkJBSM($version)
 
 		// Check if JBSM can be found from the database
 		$table = $db->getPrefix() . 'bsms_update';
-		$db->setQuery("SHOW TABLES LIKE {$db->quote($table)}");
+		$db->setQuery("SHOW TABLES LIKE {$db->q($table)}");
 
 		if ($db->loadResult() != $table)
 		{
 			return true;
 		}
 
 		// Get installed JBSM version
-		$db->setQuery("SELECT version FROM {$db->quoteName($table)} ORDER BY `id` DESC", 0, 1);
+		$db->setQuery("SELECT version FROM {$db->qn($table)} ORDER BY `id` DESC", 0, 1);
 		$installed = $db->loadResult();
 
 		if (!$installed)

com_biblestudy/biblestudy.xml

@@ -6,8 +6,8 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>http://www.joomlabiblestudy.org</authorUrl>
 	<copyright>(C) 2007 - 2016 Joomla Bible Study All rights reserved.</copyright>
-	<version>9.0.1</version>
-	<creationDate>June 19, 2016</creationDate>
+	<version>9.0.2</version>
+	<creationDate>July 8, 2016</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<description>JBS_INS_XML_DESCRIPTION</description>
 

com_biblestudy/media/css/podcast.css

@@ -35,7 +35,6 @@
     margin-right: 5px;
 }
 .podcastheader h3{
-    display:table-header;
     text-align:center;
 }
 

com_biblestudy/media/js/assat.js

@@ -31,7 +31,7 @@ function assetinstall(event) {
         }
     }).request();
 
-};
+}
 
 /**
  * Show done message
@@ -51,4 +51,4 @@ function done(event) {
         }
     }).request();
 
-};
+}