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

v9.0.17

README.md

@@ -21,7 +21,7 @@ Status
     <tr>
         <td align="center"><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 align="center">Master</td>
-        <td align="center">9.0.16</td>
+        <td align="center">9.0.17</td>
         <td align="center">May 11, 2017</td>
         <td align="center">3.4+</td>
     </tr>

build/pkg_biblestudy_package.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<extension type="package" version="3.3" method="upgrade">
+<extension type="package" version="3.4" method="upgrade">
 	<name>Package Joomla Bible Study</name>
 	<packagename>biblestudy_package</packagename>
 	<description>
@@ -8,18 +8,15 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
 	<copyright>(C) 2007 - 2017 Joomla Bible Study All rights reserved.</copyright>
-	<version>9.0.16</version>
+	<version>9.0.17</version>
 	<creationDate>May 11, 2017</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<packager>Tom Fuller</packager>
 	<packagerurl>https://www.joomlabiblestudy.org</packagerurl>
 
 	<!-- Runs on install/uninstall/update; New in 2.5 -->
 	<scriptfile>script.php</scriptfile>
-	<updateservers>
-		<server type="collection"><![CDATA[https://www.joomlabiblestudy.org/index.php?option=com_ars&view=update&task=all&format=xml]]></server>
-		<server type="extension" priority="2" name="Joomla Bible Study Package"><![CDATA[https://www.joomlabiblestudy.org/index.php?option=com_ars&view=update&task=stream&format=xml&id=12]]></server>
-	</updateservers>
+
 	<files folder="packages">
 		<file type="module" id="mod_biblestudy" client="site">mod_biblestudy.zip</file>
 		<file type="module" id="mod_biblestudy_podcast" client="site">mod_biblestudy_podcast.zip</file>

com_biblestudy/admin/api.php

@@ -19,7 +19,7 @@
 define('JBSM_PROFILER', 0);
 
 // Version information
-define('BIBLESTUDY_VERSION', '9.0.16');
+define('BIBLESTUDY_VERSION', '9.0.17');
 define('BIBLESTUDY_VERSION_UPDATEFILE', 'JBS Version ' . BIBLESTUDY_VERSION);
 
 // Default values

com_biblestudy/admin/install/sql/install.sql

@@ -11,7 +11,7 @@ CREATE TABLE `#__bsms_update` (
 
 INSERT INTO `#__bsms_update` (`id`, `version`)
 VALUES
-  (1, '9.0.16');
+  (1, '9.0.17');
 
 -- --------------------------------------------------------
 

com_biblestudy/admin/install/sql/updates/mysql/9.0.16.sql → com_biblestudy/admin/install/sql/updates/mysql/9.0.17.sql

@@ -4,5 +4,5 @@ CREATE TABLE IF NOT EXISTS `#__bsms_update` (
   PRIMARY KEY (id)
 ) DEFAULT CHARSET=utf8;
 
-INSERT INTO `#__bsms_update` (id, version) VALUES ('29', '9.0.16')
-ON DUPLICATE KEY UPDATE version = '9.0.16';
+INSERT INTO `#__bsms_update` (id, version) VALUES ('29', '9.0.17')
+ON DUPLICATE KEY UPDATE version = '9.0.17';

com_biblestudy/admin/models/install.php

@@ -1188,12 +1188,46 @@ private function finish($step)
 				$this->running = 'Remove Old Update URL\'s';
 				break;
 			case 'setupdateurl':
+				/* Find Extension ID of component */
+				$query = $this->_db->getQuery(true);
+				$query
+					->select($this->_db->q('extension_id'))
+					->from($this->_db->qn('#__extensions'))
+					->where($this->_db->qn('name') . ' = ' . $this->_db->q('com_biblestudy'));
+				$this->_db->setQuery($query);
+				$eid                   = $this->_db->loadResult();
+
+				$conditions = array(
+					$this->_db->qn('name') . ' = ' .
+					$this->_db->q('Joomla Bible Study Package'),
+				);
+				$query      = $this->_db->getQuery(true);
+				$query->delete($this->_db->qn('#__update_sites'));
+				$query->where($conditions, 'OR');
+				$this->_db->setQuery($query);
+				$this->_db->execute();
+
+				$conditions = array(
+					$this->_db->qn('extension_id') . ' = ' .
+					$this->_db->q($eid),
+				);
+				$query      = $this->_db->getQuery(true);
+				$query->delete($this->_db->qn('#__update_sites_extensions'));
+				$query->where($conditions, 'OR');
+				$this->_db->setQuery($query);
+				$this->_db->execute();
+
 				$updateurl           = new stdClass;
 				$updateurl->name     = 'Joomla Bible Study Package';
-				$updateurl->type     = 'collection';
-				$updateurl->location = 'https://www.joomlabiblestudy.org/index.php?option=com_ars&view=update&task=all&format=xml';
+				$updateurl->type     = 'extension';
+				$updateurl->location = 'https://www.joomlabiblestudy.org/index.php?option=com_ars&view=update&task=stream&id=2&format=xml';
 				$updateurl->enabled  = '1';
 				$this->_db->insertObject('#__update_sites', $updateurl);
+				$lastid = $this->_db->insertid();
+				$updateurl1 = new stdClass;
+				$updateurl1->update_site_id = $lastid;
+				$updateurl1->extension_id   = $eid;
+				$this->_db->insertObject('#__update_sites_extensions', $updateurl1);
 				$this->running = 'Set New Update URL';
 				break;
 			default:
@@ -1223,7 +1257,7 @@ public function postinstall_messages($message)
 			->where('`name` = "com_biblestudy"');
 		$this->_db->setQuery($query);
 		$eid                   = $this->_db->loadResult();
-		$this->biblestudyEid  = $eid;
+		$this->biblestudyEid   = $eid;
 		$message->extension_id = $this->biblestudyEid;
 		$this->_db->insertObject('#__postinstall_messages', $message);
 	}

com_biblestudy/biblestudy.xml

@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<extension type="component" version="3.3" method="upgrade">
+<extension type="component" version="3.4" method="upgrade">
 	<!-- Generic Metadata -->
 	<name>COM_BIBLESTUDY</name>
 	<author>Joomla Bible Study Team</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
 	<copyright>(C) 2007 - 2017 Joomla Bible Study All rights reserved.</copyright>
-	<version>9.0.16</version>
+	<version>9.0.17</version>
 	<creationDate>May 11, 2017</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<description>JBS_INS_XML_DESCRIPTION</description>
 
 	<!-- Installer Hooks -->
 	<scriptfile>biblestudy.script.php</scriptfile>
 
+	<updateservers>
+		<server type="extension" priority="1" name="Joomla Bible Study Package">https://www.joomlabiblestudy.org/index.php?option=com_ars&amp;view=update&amp;task=stream&amp;id=2&amp;format=xml</server>
+	</updateservers>
+
 	<files folder="site">
 		<filename>biblestudy.php</filename>
 		<filename>controller.php</filename>
@@ -81,7 +85,4 @@
 			<folder>views</folder>
 		</files>
 	</administration>
-	<updateservers>
-		<server type="extension" priority="1" name="Joomla Bible Study"><![CDATA[https://www.joomlabiblestudy.org/index.php?option=com_ars&view=update&task=stream&format=xml&id=2]]></server>
-	</updateservers>
 </extension>

mod_biblestudy/mod_biblestudy.xml

@@ -5,7 +5,7 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
 	<copyright>(C) 2007 - 2017 Joomla Bible Study All rights reserved.</copyright>
-	<version>9.0.16</version>
+	<version>9.0.17</version>
 	<creationDate>May 11, 2017</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<description>JBS_MDL_DESCRIPTION</description>

mod_biblestudy_podcast/mod_biblestudy_podcast.xml

@@ -5,7 +5,7 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
 	<copyright>(C) 2007 - 2017 Joomla Bible Study All rights reserved.</copyright>
-	<version>9.0.16</version>
+	<version>9.0.17</version>
 	<creationDate>May 11, 2017</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<description>JBS_MDL_PODCAST_XML_DESCRIPTION</description>

plg_biblestudy_backup/jbsbackup.xml

@@ -5,7 +5,7 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
 	<copyright>(C) 2007 - 2017 Joomla Bible Study All rights reserved.</copyright>
-	<version>9.0.16</version>
+	<version>9.0.17</version>
 	<creationDate>May 11, 2017</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<description>JBS_PLG_BACKUP_XML_DESCRIPTION</description>

plg_biblestudy_finder/biblestudy.xml

@@ -5,7 +5,7 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
 	<copyright>(C) 2007 - 2017 Joomla Bible Study All rights reserved.</copyright>
-	<version>9.0.16</version>
+	<version>9.0.17</version>
 	<creationDate>May 11, 2017</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<description>JBS_PLG_FINDER_XML_DESCRIPTION</description>

plg_biblestudy_podcast/jbspodcast.xml

@@ -5,7 +5,7 @@
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>https://www.joomlabiblestudy.org</authorUrl>
     <copyright>(C) 2007 - 2017 Joomla Bible Study All rights reserved.</copyright>
-    <version>9.0.16</version>
+    <version>9.0.17</version>
     <creationDate>May 11, 2017</creationDate>
     <license>http://www.gnu.org/licenses/gpl.html</license>
     <description>JBS_PLG_PODCAST_XML_DESCRIPTION</description>

plg_biblestudy_search/biblestudysearch.xml

@@ -5,7 +5,7 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
 	<copyright>(C) 2007 - 2017 Joomla Bible Study All rights reserved.</copyright>
-	<version>9.0.16</version>
+	<version>9.0.17</version>
 	<creationDate>May 11, 2017</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<description>JBS_PLG_SEARCH_XML_DESCRIPTION</description>