All help has been moved to our documentation site:
Find
diff --git a/com_biblestudy/admin/helpers/alias.php b/com_biblestudy/admin/helpers/alias.php
index 0984635f51..dc66c820bb 100644
--- a/com_biblestudy/admin/helpers/alias.php
+++ b/com_biblestudy/admin/helpers/alias.php
@@ -1,11 +1,11 @@
0)
+
+ if (substr_count($url, 'youtu.be') > 0)
{
return 0;
}
- elseif (substr_count($url, 'youtube.com') > 0)
+
+ if (substr_count($url, 'youtube.com') > 0)
{
return 0;
}
@@ -132,7 +134,14 @@ public static function getRemoteFileSize($url)
}
}
- $headers = get_headers($url, true);
+ try
+ {
+ $headers = get_headers($url, true);
+ }
+ catch (Exception $e)
+ {
+ return 0;
+ }
if (is_array($headers))
{
@@ -301,4 +310,28 @@ public static function clearcache($state = 'site')
$cache = JCache::getInstance('', $options);
$cache->clean();
}
+
+ /**
+ * Remove Http
+ *
+ * @param string $url Url
+ *
+ * @return mixed
+ *
+ * @since 9.0.18
+ */
+ public static function remove_http($url)
+ {
+ $disallowed = array('http://', 'https://');
+
+ foreach ($disallowed as $d)
+ {
+ if (strpos($url, $d) === 0)
+ {
+ return str_replace($d, '', $url);
+ }
+ }
+
+ return $url;
+ }
}
diff --git a/com_biblestudy/admin/helpers/html/biblestudy.php b/com_biblestudy/admin/helpers/html/biblestudy.php
index 57a37c39a4..753446cf05 100644
--- a/com_biblestudy/admin/helpers/html/biblestudy.php
+++ b/com_biblestudy/admin/helpers/html/biblestudy.php
@@ -1,18 +1,18 @@
getMessage();
}
+
+ return null;
}
}
/**
* Abstraction layer for the GD PHP library
*
- * @package BibleStudy.Admin
+ * @package Proclaim.Admin
* @since 7.0.0
*/
-class GDLib extends ImageLib
+class GDLib extends JBSMImageLib
{
/**
* Extension Name
@@ -106,4 +146,67 @@ public function __construct()
die("GD is not found");
}
}
+
+ /**
+ * Resize Image
+ *
+ * @param string $targetFile Target File Path
+ * @param string $originalFile File
+ * @param int $newWidth Image New Width
+ * @param int $canv_width Image Canvas Width
+ * @param int $canv_height Image Canvas Height
+ *
+ * @return void
+ *
+ * @throws \Exception
+ * @since 9.0.18
+ */
+ public static function resize_image(
+ $targetFile,
+ $originalFile,
+ $newWidth = 200,
+ $canv_width = 200,
+ $canv_height = 200)
+ {
+ $info = getimagesize($originalFile);
+ $mime = $info['mime'];
+
+ switch ($mime)
+ {
+ case 'image/jpeg':
+ $image_create_func = 'imagecreatefromjpeg';
+ $image_save_func = 'imagejpeg';
+ $new_image_ext = 'jpg';
+ break;
+
+ case 'image/png':
+ $image_create_func = 'imagecreatefrompng';
+ $image_save_func = 'imagepng';
+ $new_image_ext = 'png';
+ break;
+
+ case 'image/gif':
+ $image_create_func = 'imagecreatefromgif';
+ $image_save_func = 'imagegif';
+ $new_image_ext = 'gif';
+ break;
+
+ default:
+ throw new Exception('Unknown image type.');
+ }
+
+ $img = $image_create_func($originalFile);
+ list($width, $height) = getimagesize($originalFile);
+
+ $newHeight = ($height / $width) * $newWidth;
+ $tmp = imagecreatetruecolor($canv_width, $canv_height);
+ imagecopyresampled($tmp, $img, 0, 0, 0, 0, $newWidth, $newHeight, $width, $height);
+
+ if (file_exists($targetFile))
+ {
+ unlink($targetFile);
+ }
+
+ $image_save_func($tmp, "$targetFile");
+ }
}
diff --git a/com_biblestudy/admin/helpers/params.php b/com_biblestudy/admin/helpers/params.php
index 4a4b1216bc..6d6718e76c 100644
--- a/com_biblestudy/admin/helpers/params.php
+++ b/com_biblestudy/admin/helpers/params.php
@@ -1,11 +1,11 @@
params Registry
diff --git a/com_biblestudy/admin/helpers/tagDefinitions.helper.php b/com_biblestudy/admin/helpers/tagDefinitions.helper.php
index 1307e75c8a..e751dd9b26 100644
--- a/com_biblestudy/admin/helpers/tagDefinitions.helper.php
+++ b/com_biblestudy/admin/helpers/tagDefinitions.helper.php
@@ -2,10 +2,10 @@
/**
* Set Definition for tags
*
- * @package BibleStudy.Admin
- * @copyright 2007 - 2017 (C) Joomla Bible Study Team All rights reserved
+ * @package Proclaim.Admin
+ * @copyright 2007 - 2017 (C) CWM Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
- * @link https://www.joomlabiblestudy.org
+ * @link https://www.christianwebministries.org
* */
// No Direct Access
diff --git a/com_biblestudy/admin/helpers/tags.php b/com_biblestudy/admin/helpers/tags.php
index f76a8f95ba..7886563c7f 100644
--- a/com_biblestudy/admin/helpers/tags.php
+++ b/com_biblestudy/admin/helpers/tags.php
@@ -1,11 +1,11 @@
load('com_biblestudy', JPATH_COMPONENT_ADMINISTRATOR, 'en-GB', true); // default english phrases
; $language->load('com_biblestudy', JPATH_COMPONENT_ADMINISTRATOR, null, true); // target language
-COM_BIBLESTUDY="Joomla Bible Study"
+COM_BIBLESTUDY="Proclaim"
;; Permission entry and Joomla common handling
COM_BIBLESTUDY_CONFIGURATION="Bibelstudien Konfiguration"
@@ -109,7 +109,7 @@ JBS_CMN_INSTALL="Installieren"
JBS_CMN_INTERNAL_PLAYER="Interner Player"
JBS_CMN_ITEM_NOT_PUBLISHED="Nicht freígegeben"
JBS_CMN_ITEM_PUBLISHED="Freigegeben"
-JBS_CMN_JOOMLA_BIBLE_STUDY="Joomla Bibelstudien (Joomla Bible Study)"
+JBS_CMN_JOOMLA_BIBLE_STUDY="Joomla Bibelstudien (Proclaim)"
JBS_CMN_LANDING_SHOW="Zeige auf der Landing-Page"
JBS_CMN_LANDING_SHOW_DESC="Soll dieser Eintrag auf der Landing-Page über oder unter dem 'WEITERE' Knopf angezeigt werden? Weitere Einstellungen im Template unter 'Landing-Page'"
JBS_CMN_LEGACY_PLAYER="Internal Audio Player"
diff --git a/com_biblestudy/admin/language/en-GB/en-GB.com_biblestudy.ini b/com_biblestudy/admin/language/en-GB/en-GB.com_biblestudy.ini
index f43ebe6413..8014462daa 100644
--- a/com_biblestudy/admin/language/en-GB/en-GB.com_biblestudy.ini
+++ b/com_biblestudy/admin/language/en-GB/en-GB.com_biblestudy.ini
@@ -1,9 +1,9 @@
; $Id: en-GB.com_biblestudy.ini 2025 2011-08-28 04:08:06Z genu $
-; Copyright (c) 2008 Tom Fuller
+; Copyright (c) 2008 CWM Team
; License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
; Note : All ini files need to be saved as UTF-8 - No BOM
-; Note: This is the common language file for all Bible Study components, plugins and modules.
+; Note: This is the common language file for all Proclaim components, plugins and modules.
; It is used for both frontend and backend.
; Plugins and modules use some additional .sys.ini files for core definitions.
; In backend settings page they use xml field loadlanguagefile in the path
@@ -13,10 +13,10 @@
; $language->load('com_biblestudy', JPATH_COMPONENT_ADMINISTRATOR, 'en-GB', true); // default english phrases
; $language->load('com_biblestudy', JPATH_COMPONENT_ADMINISTRATOR, null, true); // target language
-COM_BIBLESTUDY="Joomla Bible Study"
+COM_BIBLESTUDY="Proclaim"
;; Permission entry and Joomla common handling
-COM_BIBLESTUDY_CONFIGURATION="BibleStudy CONFIGURATION"
+COM_BIBLESTUDY_CONFIGURATION="Proclaim CONFIGURATION"
COM_BIBLESTUDY_N_ITEMS_ARCHIVED="%d Item(s) Archived"
COM_BIBLESTUDY_N_ITEMS_DELETED="%d Item(s) Deleted"
COM_BIBLESTUDY_N_ITEMS_PUBLISHED="%d item(s) published"
@@ -41,7 +41,7 @@ JGRID_CHECKBOX_ROW_N="Checkbox for row %d"
JBS_SHOW_DOWNLOAD_BUTTON="Global Show Download"
JBS_SHOW_DOWNLOAD_BUTTON_DESC="Set to yes if you want the download icon to show by default in media files. Individual media file record will override this setting"
PLG_SEARCH_BIBLESTUDYSEARCH_BIBLESTUDYSEARCH="Bible Studies"
-JBS_CPANEL_DESC_WELCOME="Welcome to Joomla Bible Study"
+JBS_CPANEL_DESC_WELCOME="Welcome to Proclaim"
JBS_CMN_CENTER="Center"
JBS_CMN_LEFT="Left"
JBS_CMN_RIGHT="Right"
@@ -117,7 +117,7 @@ JBS_CMN_INSTALL="Install"
JBS_CMN_INTERNAL_PLAYER="Internal Player"
JBS_CMN_ITEM_NOT_PUBLISHED="Item not published"
JBS_CMN_ITEM_PUBLISHED="Published"
-JBS_CMN_JOOMLA_BIBLE_STUDY="Joomla Bible Study"
+JBS_CMN_JOOMLA_BIBLE_STUDY="Proclaim"
JBS_CMN_LANDING_SHOW="Show on Landing Page"
JBS_CMN_LANDING_SHOW_DESC="Choose whether to hide this item on the Landing Page, or wether to show it above or below the "_QQ_"more"_QQ_" button. Must also set this under Templates/Landing Page"
JBS_CMN_LEGACY_PLAYER="Internal Audio Player"
@@ -156,7 +156,7 @@ JBS_CMN_ORDERING="Ordering"
JBS_CMN_ORDERING_DESC="Choose an order for this item on the displayed list"
JBS_CMN_OVER="Over"
JBS_CMN_PARAMETERS="Parameters"
-JBS_CMN_PHP_ERROR="Your host needs to use PHP %s or higher to run Joomla Bible Study"
+JBS_CMN_PHP_ERROR="Your host needs to use PHP %s or higher to run Proclaim"
JBS_CMN_PLAYS="Plays"
JBS_CMN_PODCAST="Podcast"
JBS_CMN_PODCASTS="Podcasts"
@@ -326,7 +326,7 @@ JBS_ADM_FORMAT_POPULAR="Set Items to include in score"
JBS_ADM_FORMAT_POPULAR_DESC="Decide what items will determine the score of a popular study"
JBS_ADM_FULL_WINDOW="Full Body of the Window"
JBS_ADM_HITS_PLAYS_DOWNLOAD="Hits + Plays + Downloads"
-JBS_ADM_INTERNAL_SHARE="BibleStudy internal Sharing"
+JBS_ADM_INTERNAL_SHARE="Proclaim internal Sharing"
JBS_ADM_JWPLAYER="JW Player"
JBS_ADM_JWPLAYER_ADOBE_SITECATALYST="Adobe SiteCatalyst"
JBS_ADM_JWPLAYER_ADOBE_SITECATALYST_DESC="Configures the Adobe SiteCatalyst connection for the Premium and Ads editions."
@@ -578,7 +578,7 @@ JBS_CPL_PIM_DESC="Please look at post installation massages as you have addition
JBS_CPL_PIM_BUTTON="Go to PostMessages"
JBS_CPL_PIM_ERROR_TITLE="Error in Installation"
JBS_CPL_PIM_ERROR_DESC="There is a error in installation; please look at documentation to see how to fix."
-JBS_CPL_PIM_ERROR_BUTTON="Error : Joomla Bible Study Documentation"
+JBS_CPL_PIM_ERROR_BUTTON="Error : Proclaim Documentation"
;; IBM Install, Backup, Migrate
JBS_SUCCESS="records changed"
@@ -608,11 +608,11 @@ JBS_IBM_INSTALLDB_ERRORS="Error installing the database"
JBS_IBM_MAX_EXECUTION_TIME="Maximum script execution time in seconds (large database may not have time to import)"
JBS_IBM_MAX_UPLOAD="Maximum upload allowed in your php.ini file using post_max_size is"
JBS_IBM_MEDIAFILES_CREATED="Mediafiles converted for"
-JBS_IBM_MIGRATE_NOT_OLD_DB="This file is for the current version of Joomla! Bible Study. Please use import."
+JBS_IBM_MIGRATE_NOT_OLD_DB="This file is for the current version of Proclaim. Please use import."
JBS_IBM_NOTE_ERRORS="Please note any error messages below"
JBS_IBM_NOT_CONVERTED="Not converted: "
-JBS_IBM_NOT_CURENT_DB="This file is not for the current version of Joomla! Bible Study. Please use Migration to upgrade from this file."
-JBS_IBM_NOT_DB="This is not a Bible Study SQL File. Please use this only for Bible Study SQL Files"
+JBS_IBM_NOT_CURENT_DB="This file is not for the current version of Proclaim. Please use Migration to upgrade from this file."
+JBS_IBM_NOT_DB="This is not a Proclaim SQL File. Please use this only for Proclaim SQL Files"
JBS_IBM_NO_MINISTRIES="No ministries found to convert"
JBS_IBM_NO_PODCASTS="No podcasts found to convert"
JBS_IBM_NO_PREACHIT_FOUND="No version of PreachIt found"
@@ -642,7 +642,7 @@ JBS_IBM_SERIES_CONVERTED="Series converted"
JBS_IBM_SERMONS_CREATED_FOR="Sermons converted for"
JBS_IBM_SERVER_RECORD_ADDED="Server Record Added"
JBS_IBM_SHOW_JBSMIGRATION_LABEL="Show Migration Tab"
-JBS_IBM_SHOW_JBSMIGRATION_LABEL_DESC="Choose whether or not to show the tab that allows you to migrate from Joomla 1.5 versions of Joomla Bible Study. This should only need to be shown once"
+JBS_IBM_SHOW_JBSMIGRATION_LABEL_DESC="Choose whether or not to show the tab that allows you to migrate from Joomla 1.5 versions of Proclaim. This should only need to be shown once"
JBS_IBM_TEACHERS_CREATED="Teachers converted"
JBS_IBM_VERSION_TOO_OLD="You must upgrade to at least JBS version 6.0.8 to migrate. Please contact customer service at www.joomlabiblestudy.org"
JBS_LBL_REDIRECT_IN_3S="Will Redirect in 3s"
@@ -655,37 +655,37 @@ JBS_LBL_AUTOCLOSE_IN_3S="Window will close in 3s"
;; INS Install -> also see xx-XX.com_biblestudy.sys.ini
; Install strings ; duplicate? see IBM
JBS_INS_DATABASE_SCHEMA_DOES_NOT_MATCH="Database schema (%s) does not match current version (%s)"
-JBS_INS_INSTALLATION_RESULTS="Joomla BibleStudy Results - %s"
+JBS_INS_INSTALLATION_RESULTS="Proclaim Results - %s"
JBS_INS_WARNING_INSTALL="You have tryed to access a page that is not permitted"
-JBS_INS_XML_DESCRIPTION="Joomla Bible Study"
-JBS_INS__MSG_DATABASE_UPDATEVERSION_ERROR="Database update version (%s) does not match Joomla! Bible Study version (%s)."
+JBS_INS_XML_DESCRIPTION="Proclaim"
+JBS_INS__MSG_DATABASE_UPDATEVERSION_ERROR="Database update version (%s) does not match Proclaim version (%s)."
; Preflight and postflight strings ; duplicate? see IBM
JBS_INS_CLICK_TO_FINISH="Click Here To Finish"
JBS_INS_ERROR_SQL_READBUFFER="Could not read the sql file"
-JBS_INS_GET_MORE_HELP="Get more help and information at JoomlaBibleStudy.org"
+JBS_INS_GET_MORE_HELP="Get more help and information at ChristianWebMinistries.org"
JBS_INS_RESETDB="Reset Database to Defaults"
JBS_INS_SQL_UPDATE_ERRORS="Errors Parsing the SQL Update files: %s"
-JBS_INS_TITLE="Joomla! Bible Study"
+JBS_INS_TITLE="Proclaim"
JBS_INS_VISIT_DOCUMENTATION="Visit our Documentation Site"
JBS_INS_VISIT_FORUM="Visit our forum with your questions"
; PostInstall Messages
JBS_POSTINSTALL_TITLE_TEMPLATE="Template Upgrade"
-JBS_POSTINSTALL_BODY_TEMPLATE="Version 9.x of Joomla Bible Study uses the native Bootstrap system to create responsive views. You MUST reconfigure your views for this version. In order to implement this on your website, go to Templates and open the default record. Choose what items you want to display, the html styling (9.x uses your site template css), and spans in the items to display according to how wide you want them. Span1 is 1/12 of the width of the screen; Span12 is the entire width."
+JBS_POSTINSTALL_BODY_TEMPLATE="Version 9.x of Proclaim uses the native Bootstrap system to create responsive views. You MUST reconfigure your views for this version. In order to implement this on your website, go to Templates and open the default record. Choose what items you want to display, the html styling (9.x uses your site template css), and spans in the items to display according to how wide you want them. Span1 is 1/12 of the width of the screen; Span12 is the entire width."
JBS_POSTINSTALL_ACTION_TEMPLATE="Update Template Settings"
; Uninstall strings (used when the extension is uninstalled) ; duplicate? see IBM
-JBS_INS_NO_DATABASE_REMOVED="Uninstall Results: Database tables have not been removed. To complete remove Bible Study Management System, remove all database tables that start with #__bsms (or jos_bsms in most cases)."
-JBS_INS_UNINSTALLED="Joomla Bible Study Uninstalled. Be sure to uninstall the module and plugin as well."
+JBS_INS_NO_DATABASE_REMOVED="Uninstall Results: Database tables have not been removed. To complete remove Proclaim Management System, remove all database tables that start with #__bsms (or jos_bsms in most cases)."
+JBS_INS_UNINSTALLED="Proclaim Uninstalled. Be sure to uninstall the module and plugin as well."
;Migration ; duplicate? see IBM
JBS_MIG_FINISHED="Finished"
-JBS_MIG_MIGRATION_DONE="Joomla Bible Study Migration - Finished."
+JBS_MIG_MIGRATION_DONE="Proclaim Migration - Finished."
JBS_MIG_PROCESSING="Processing:"
-JBS_MIG_TITLE="Joomla Bible Study Migration"
+JBS_MIG_TITLE="Proclaim Migration"
JBS_MIG_STARTING="Starting"
-JBS_MIG_WORKING="Joomla Bible Study Migration - still working"
+JBS_MIG_WORKING="Proclaim Migration - still working"
;; LOC Locations
JBS_LOC_LOCATION_NAME="Location Name"
@@ -711,7 +711,7 @@ JBS_MDL_OR="OR"
JBS_MDL_SELECT_TEMPLATE="Template for this page"
JBS_MDL_SELECT_TEMPLATE_DESC="Choose a template for your page"
JBS_MDL_SHOW_COMPONENT="Show/Hide component link"
-JBS_MDL_SHOW_COMPONENT_DESC="Choose whether to show or hide a link to the main Bible Study component at the bottom of the module display"
+JBS_MDL_SHOW_COMPONENT_DESC="Choose whether to show or hide a link to the main Proclaim component at the bottom of the module display"
JBS_MDL_TEMPLATE="Template File"
JBS_MDL_TEMPLATE_DESC="Choose a template file you created in the Admin/Template Files area or choose default"
JBS_MDL_TOOLTIP="ToolTip Options"
@@ -925,7 +925,7 @@ JBS_PDC_XML_TTITLE="XML File"
JBS_PDC_XML="XML"
;; PLG Plugin specific strings (all plugins)
-PLG_JBSBACKUP_HEADER="Your site's Joomla Bible Study database backup"
+PLG_JBSBACKUP_HEADER="Your site's Proclaim database backup"
JBS_PLG_BACKUP_EMAIL_MSG_ERROR="Errors in backup process"
JBS_PLG_BACKUP_EMAIL_MSG_SUCCESS="Backup was successful"
JBS_PLG_BACKUP_FILES="Number of backup files to keep"
@@ -1021,7 +1021,7 @@ JBS_SHR_SOCIAL_NETWORK="Social Network"
JBS_SHR_TOTALCHARACTERS="Total Characters"
JBS_SHR_TOTALCHARACTERS_DESC="Total characters for string not including the path to the site."
JBS_SHR_USERNAME="Enter your bit.ly username if you have one"
-JBS_SHR_USERNAME_DESC="This is not required. If left blank you will use JoomlaBibleStudy's user name"
+JBS_SHR_USERNAME_DESC="This is not required. If left blank you will use Proclaim's user name"
JBS_SHR_USE_BITLY="Use link shortener bit.ly"
JBS_SHR_USE_BITLY_DESC="Shortens the link. Helps mainly for services like Twitter that only take a certain number of characters"
@@ -1149,51 +1149,51 @@ JBS_TCH_TWITTER_DESC="Enter a full url link to the teacher's Twitter feed starti
JBS_TCH_WEBSITE="Website"
;; TITLE Title Block
-JBS_TITLE_ADMINISTRATION="Joomla! Bible Study: Administration"
-JBS_TITLE_COMMENTS="Joomla! Bible Study: Comments"
-JBS_TITLE_COMMENT_CREATING="Joomla! Bible Study: Comment New"
-JBS_TITLE_COMMENT_EDITING="Joomla! Bible Study: Comment Edit ID#%s"
-JBS_TITLE_CONTROL_PANEL="Joomla! Bible Study: Control Panel"
-JBS_TITLE_INSTALL="Joomla! Bible Study: %s for %s"
-JBS_TITLE_LOCATIONS="Joomla! Bible Study: Locations"
-JBS_TITLE_LOCATIONS_CREATING="Joomla! Bible Study: Locations New"
-JBS_TITLE_LOCATIONS_EDITING="Joomla! Bible Study: Locations Edit %s"
-JBS_TITLE_MEDIA_FILES="Joomla! Bible Study: Media Files"
-JBS_TITLE_MEDIA_FILES_CREATING="Joomla! Bible Study: Media Files New"
-JBS_TITLE_MEDIA_FILES_EDITING="Joomla! Bible Study: Media Files Edit %s"
-JBS_TITLE_MESSAGETYPES="Joomla! Bible Study: Message Type"
-JBS_TITLE_MESSAGETYPES_CREATING="Joomla! Bible Study: Message Type New"
-JBS_TITLE_MESSAGETYPES_EDITING="Joomla! Bible Study: Message Type Edit %s"
-JBS_TITLE_PODCASTS="Joomla! Bible Study: Podcasts"
-JBS_TITLE_PODCAST_CREATING="Joomla! Bible Study: Podcast New"
-JBS_TITLE_PODCAST_EDITING="Joomla! Bible Study: Podcast Edit %s"
-JBS_TITLE_SERIES="Joomla! Bible Study: Series"
-JBS_TITLE_SERIES_CREATING="Joomla! Bible Study: Series New"
-JBS_TITLE_SERIES_EDITING="Joomla! Bible Study: Series Edit %s"
-JBS_TITLE_SERVERS="Joomla! Bible Study: Servers"
-JBS_TITLE_SERVERS_CREATING="Joomla! Bible Study: Servers New"
-JBS_TITLE_SERVERS_EDITING="Joomla! Bible Study: Servers Edit %s"
-JBS_TITLE_SOCIAL_NETWORKING_LINKS="Joomla! Bible Study: Social Networking Links"
-JBS_TITLE_SOCIAL_NETWORKING_LINKS_CREATING="Joomla! Bible Study: Social Networking Links New"
-JBS_TITLE_SOCIAL_NETWORKING_LINKS_EDITING="Joomla! Bible Study: Social Networking Links Edit %s"
-JBS_TITLE_STUDIES="Joomla! Bible Study: Studies"
-JBS_TITLE_STUDIES_CREATING="Joomla! Bible Study: Studies New"
-JBS_TITLE_STUDIES_EDITING="Joomla! Bible Study: Studies Edit %s"
-JBS_TITLE_STYLES="Joomla! Bible Study: Styles"
-JBS_TITLE_STYLES_CREATING="Joomla! Bible Study: Styles New"
-JBS_TITLE_STYLES_EDITING="Joomla! Bible Study: Styles Edit File: %s"
-JBS_TITLE_TEACHERS="Joomla! Bible Study: Teachers"
-JBS_TITLE_TEACHER_CREATING="Joomla! Bible Study: Teacher New"
-JBS_TITLE_TEACHER_EDITING="Joomla! Bible Study: Teacher Edit %s"
-JBS_TITLE_TEMPLATECODES="Joomla! Bible Study: Template Codes"
-JBS_TITLE_TEMPLATECODES_CREATING="Joomla! Bible Study: Template Code New"
-JBS_TITLE_TEMPLATECODES_EDITING="Joomla! Bible Study: Template Code Edit %s"
-JBS_TITLE_TEMPLATES="Joomla! Bible Study: Templates"
-JBS_TITLE_TEMPLATES_CREATING="Joomla! Bible Study: Templates New"
-JBS_TITLE_TEMPLATES_EDITING="Joomla! Bible Study: Templates Edit %s"
-JBS_TITLE_TOPICS="Joomla! Bible Study: Topics"
-JBS_TITLE_TOPICS_CREATING="Joomla! Bible Study: Topics New"
-JBS_TITLE_TOPICS_EDITING="Joomla! Bible Study: Topics Edit %s"
+JBS_TITLE_ADMINISTRATION="Proclaim: Administration"
+JBS_TITLE_COMMENTS="Proclaim: Comments"
+JBS_TITLE_COMMENT_CREATING="Proclaim: Comment New"
+JBS_TITLE_COMMENT_EDITING="Proclaim: Comment Edit ID#%s"
+JBS_TITLE_CONTROL_PANEL="Proclaim: Control Panel"
+JBS_TITLE_INSTALL="Proclaim: %s for %s"
+JBS_TITLE_LOCATIONS="Proclaim: Locations"
+JBS_TITLE_LOCATIONS_CREATING="Proclaim: Locations New"
+JBS_TITLE_LOCATIONS_EDITING="Proclaim: Locations Edit %s"
+JBS_TITLE_MEDIA_FILES="Proclaim: Media Files"
+JBS_TITLE_MEDIA_FILES_CREATING="Proclaim: Media Files New"
+JBS_TITLE_MEDIA_FILES_EDITING="Proclaim: Media Files Edit %s"
+JBS_TITLE_MESSAGETYPES="Proclaim: Message Type"
+JBS_TITLE_MESSAGETYPES_CREATING="Proclaim: Message Type New"
+JBS_TITLE_MESSAGETYPES_EDITING="Proclaim: Message Type Edit %s"
+JBS_TITLE_PODCASTS="Proclaim: Podcasts"
+JBS_TITLE_PODCAST_CREATING="Proclaim: Podcast New"
+JBS_TITLE_PODCAST_EDITING="Proclaim: Podcast Edit %s"
+JBS_TITLE_SERIES="Proclaim: Series"
+JBS_TITLE_SERIES_CREATING="Proclaim: Series New"
+JBS_TITLE_SERIES_EDITING="Proclaim: Series Edit %s"
+JBS_TITLE_SERVERS="Proclaim: Servers"
+JBS_TITLE_SERVERS_CREATING="Proclaim: Servers New"
+JBS_TITLE_SERVERS_EDITING="Proclaim: Servers Edit %s"
+JBS_TITLE_SOCIAL_NETWORKING_LINKS="Proclaim: Social Networking Links"
+JBS_TITLE_SOCIAL_NETWORKING_LINKS_CREATING="Proclaim: Social Networking Links New"
+JBS_TITLE_SOCIAL_NETWORKING_LINKS_EDITING="Proclaim: Social Networking Links Edit %s"
+JBS_TITLE_STUDIES="Proclaim: Studies"
+JBS_TITLE_STUDIES_CREATING="Proclaim: Studies New"
+JBS_TITLE_STUDIES_EDITING="Proclaim: Studies Edit %s"
+JBS_TITLE_STYLES="Proclaim: Styles"
+JBS_TITLE_STYLES_CREATING="Proclaim: Styles New"
+JBS_TITLE_STYLES_EDITING="Proclaim: Styles Edit File: %s"
+JBS_TITLE_TEACHERS="Proclaim: Teachers"
+JBS_TITLE_TEACHER_CREATING="Proclaim: Teacher New"
+JBS_TITLE_TEACHER_EDITING="Proclaim: Teacher Edit %s"
+JBS_TITLE_TEMPLATECODES="Proclaim: Template Codes"
+JBS_TITLE_TEMPLATECODES_CREATING="Proclaim: Template Code New"
+JBS_TITLE_TEMPLATECODES_EDITING="Proclaim: Template Code Edit %s"
+JBS_TITLE_TEMPLATES="Proclaim: Templates"
+JBS_TITLE_TEMPLATES_CREATING="Proclaim: Templates New"
+JBS_TITLE_TEMPLATES_EDITING="Proclaim: Templates Edit %s"
+JBS_TITLE_TOPICS="Proclaim: Topics"
+JBS_TITLE_TOPICS_CREATING="Proclaim: Topics New"
+JBS_TITLE_TOPICS_EDITING="Proclaim: Topics Edit %s"
JBS_TITLE_UPLOAD_FORM="Upload Media File"
;; Topic Items
@@ -1409,7 +1409,7 @@ JBS_TPL_HOURS_MIN_SEC_COLON="H:M:S"
JBS_TPL_HOURS_MIN_SEC_SLASH="Hours/min/sec"
JBS_TPL_IMPORT_EXPORT_TEMPLATE="Import/Export Templates"
JBS_TPL_IMPORT_SUCCESS="Template import complete. Note any error messages above"
-JBS_TPL_JBS_COMMENTS="Joomla Bible Study Comments"
+JBS_TPL_JBS_COMMENTS="Proclaim Comments"
JBS_TPL_JCOMMENTS="Use JComments - Must be installed"
JBS_TPL_LABEL_ONLY="Label Only"
JBS_TPL_LANDINGPAGE_BOOKSLABEL="Books Label"
diff --git a/com_biblestudy/admin/language/en-GB/en-GB.com_biblestudy.sys.ini b/com_biblestudy/admin/language/en-GB/en-GB.com_biblestudy.sys.ini
index 413e2f0f22..c6b69a28d5 100644
--- a/com_biblestudy/admin/language/en-GB/en-GB.com_biblestudy.sys.ini
+++ b/com_biblestudy/admin/language/en-GB/en-GB.com_biblestudy.sys.ini
@@ -5,27 +5,27 @@
; Identify the component as extension
-COM_BIBLESTUDY="Bible Study"
+COM_BIBLESTUDY="Proclaim"
; Name of the component
-JBS_CMN_COM_BIBLESTUDY="Bible Study"
+JBS_CMN_COM_BIBLESTUDY="Proclaim"
; Install strings
JBS_INS_ERROR_SQL_READBUFFER="Could not read the sql file"
-JBS_INS_XML_DESCRIPTION="Joomla Bible Study"
-JBS_INS_INSTALLATION_RESULTS="Joomla BibleStudy Results"
+JBS_INS_XML_DESCRIPTION="Proclaim"
+JBS_INS_INSTALLATION_RESULTS="Proclaim Results"
JBS_INS_FAILURE="Failed to set up database"
; Preflight and postflight strings
-JBS_INS_GET_MORE_HELP="Get more help and information at JoomlaBibleStudy.org"
+JBS_INS_GET_MORE_HELP="Get more help and information at ChristianWebMinistries.org"
JBS_INS_VISIT_DOCUMENTATION="Visit our Documentation Site"
JBS_INS_VISIT_FORUM="Visit our forum with your questions"
JBS_INS_CLICK_TO_FINISH="Click Here To Finish"
-JBS_INS_TITLE="Joomla! Bible Study"
+JBS_INS_TITLE="Proclaim"
; Uninstall strings (used when the extension is uninstalled)
-JBS_INS_UNINSTALLED="Joomla Bible Study Uninstalled. Be sure to uninstall the module and plugins as well."
-JBS_INS_NO_DATABASE_REMOVED="Uninstall Results: Database tables have not been removed. To complete remove Bible Study Management System, remove all database tables that start with #__bsms (or jos_bsms in most cases)."
+JBS_INS_UNINSTALLED="Proclaim Uninstalled. Be sure to uninstall the module and plugins as well."
+JBS_INS_NO_DATABASE_REMOVED="Uninstall Results: Database tables have not been removed. To complete remove Proclaim Management System, remove all database tables that start with #__bsms (or jos_bsms in most cases)."
; Menue entries
JBS_MNU_ADMINISTRATION="Administration"
@@ -51,7 +51,7 @@ JBS_MNU_TOPICS="Topics"
JBS_MNU_COMMENTS_LIST_EDIT_LAYOUT="Administer Comments"
JBS_MNU_COMMENTS_LIST_EDIT_LAYOUT_DESC="Create a link to the Administration Comments Page"
JBS_MNU_LANDING_PAGE_LAYOUT="Landing Page Layout"
-JBS_MNU_LANDING_PAGE_LAYOUT_DESC="Create a link to the main Bible Studies List Page"
+JBS_MNU_LANDING_PAGE_LAYOUT_DESC="Create a link to the main Proclaim List Page"
JBS_MNU_LATEST_STUDY_LAYOUT="Latest Study Details Link"
JBS_MNU_LATEST_STUDY_LAYOUT_DESC="Creates a link to the details view of your latest study automatically"
JBS_MNU_MEDIAFILES_LIST_LAYOUT="FOR ADMIN of Media Files"
@@ -70,6 +70,9 @@ JBS_MNU_STUDIES_LIST_LAYOUT="Studies List Layout"
JBS_MNU_STUDIES_LIST_LAYOUT_DESC="Create a link to the main Studies List Page"
JBS_MNU_TEACHERS_LIST_LAYOUT="Teachers List Layout"
JBS_MNU_TEACHERS_LIST_LAYOUT_DESC="Create a link to the main Teachers List Page"
+JBS_MNU_PODCASTS_LIST_EDIT_LAYOUT="Podcast List Edit Layout"
+JBS_MNU_PODCASTS_LIST_LAYOUT="Podcast Options"
+JBS_MNU_PODCASTS_LIST_LAYOUT_DESC="Options for List layout"
JBS_MNU_SELECT_SERIES_DESC="Choose a single series to link to"
JBS_MNU_SELECT_STUDY_DESC="Choose a single study to link to"
diff --git a/com_biblestudy/admin/lib/assets.php b/com_biblestudy/admin/lib/assets.php
index b963503b08..0eafa797e2 100644
--- a/com_biblestudy/admin/lib/assets.php
+++ b/com_biblestudy/admin/lib/assets.php
@@ -1,11 +1,11 @@
select('extension_id')
->from('#__extensions')
- ->where('`name` = "com_biblestudy"');
+ ->where($this->_db->qn('name') . ' = ' . $this->_db->q('com_biblestudy'));
$this->_db->setQuery($query);
$eid = $this->_db->loadResult();
$this->biblestudyEid = $eid;
@@ -768,15 +768,17 @@ private function RealRun()
$this->doneSteps++;
$export = new JBSMBackup;
$export->exportdb(2);
+ JLog::add('Backup DB', JLog::INFO, 'com_biblestudy');
$this->start = array();
}
if (!empty($this->install))
{
- $this->running = 'Install steps';
+ $this->running = 'Install Steps';
$this->doneSteps++;
$this->install($this->install);
$this->doneSteps++;
+ JLog::add('Fresh Install Steps', JLog::INFO, 'com_biblestudy');
$this->install = array();
}
@@ -785,6 +787,7 @@ private function RealRun()
$this->fiximport();
$this->running = 'Fixing Imported Params';
$this->isimport = 0;
+ JLog::add('Fixing Imported Params', JLog::INFO, 'com_biblestudy');
$this->doneSteps++;
}
@@ -801,7 +804,8 @@ private function RealRun()
if (!$run)
{
- JFactory::getApplication()->enqueueMessage('error updating updates', 'error');
+ JFactory::getApplication()->enqueueMessage('Error Updating Update version ' . (string) $version, 'error');
+ JLog::add('Error Updating Update version ' . (string) $version, JLog::ERROR, 'com_biblestudy');
}
}
}
@@ -949,6 +953,7 @@ private function RealRun()
}
}
+ /** We are going to walk thought the assets that need to be fixed that were found form the finish lookup. */
if (!empty($this->query)
&& empty($this->finish)
&& empty($this->versionStack)
@@ -966,7 +971,7 @@ private function RealRun()
{
$version = array_pop($this->query[$this->versionSwitch]);
$this->doneSteps++;
- $this->running = 'Fix Assets';
+ $this->running = 'Fixing Assets that are not right';
$asset = new JBSMAssets;
$asset->fixAssets($this->versionSwitch, $version);
}
@@ -1131,7 +1136,8 @@ public function uninstall()
->where($this->_db->qn('language_extension') . ' = ' . $this->_db->q('com_biblestudy'));
$this->_db->setQuery($query);
$this->_db->execute();
- echo ' The requested content cannot be loaded. ' . JText::_('JBS_INS_UNINSTALLED') . ' ' . BIBLESTUDY_VERSION . '
' . $drop_result . '';
+ JFactory::getApplication()->enqueueMessage('' . JText::_('JBS_INS_UNINSTALLED') . ' ' .
+ BIBLESTUDY_VERSION . '
' . $drop_result . '');
return true;
}
@@ -1159,7 +1165,7 @@ private function finish($step)
$this->running = 'Update Version';
break;
case 'fixassets':
- // Final step is to fix assets
+ // Final step is to fix assets by building what need to be fixed.
$assets = new JBSMAssets;
$assets->build();
$this->query = $assets->query;
@@ -1182,7 +1188,7 @@ private function finish($step)
$conditions = $this->rmoldurl();
$query = $this->_db->getQuery(true);
$query->delete($this->_db->qn('#__update_sites'));
- $query->where($conditions, 'OR');
+ $query->where($conditions, $glue = 'OR');
$this->_db->setQuery($query);
$this->_db->execute();
$this->running = 'Remove Old Update URL\'s';
@@ -1193,17 +1199,17 @@ private function finish($step)
$query
->select('extension_id')
->from('#__extensions')
- ->where('`name` = "com_biblestudy"');
+ ->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'),
+ $this->_db->q('Proclaim Package'),
);
$query = $this->_db->getQuery(true);
$query->delete($this->_db->qn('#__update_sites'));
- $query->where($conditions, 'OR');
+ $query->where($conditions, $glue = 'OR');
$this->_db->setQuery($query);
$this->_db->execute();
@@ -1213,12 +1219,12 @@ private function finish($step)
);
$query = $this->_db->getQuery(true);
$query->delete($this->_db->qn('#__update_sites_extensions'));
- $query->where($conditions, 'OR');
+ $query->where($conditions, $glue = 'OR');
$this->_db->setQuery($query);
$this->_db->execute();
$updateurl = new stdClass;
- $updateurl->name = 'Joomla Bible Study Package';
+ $updateurl->name = 'Proclaim Package';
$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';
@@ -1254,7 +1260,7 @@ public function postinstall_messages($message)
$query
->select('extension_id')
->from('#__extensions')
- ->where('`name` = "com_biblestudy"');
+ ->where($this->_db->qn('name') . ' = ' . $this->_db->q('com_biblestudy'));
$this->_db->setQuery($query);
$eid = $this->_db->loadResult();
$this->biblestudyEid = $eid;
@@ -1326,7 +1332,7 @@ private function fiximport()
if ($set)
{
- $this->_db->updateObject($table['name'], $row, 'id');
+ $this->_db->updateObject($table['name'], $row, ['id']);
}
}
}
@@ -1350,6 +1356,7 @@ private function allUpdate($value)
if ($buffer === false)
{
JFactory::getApplication()->enqueueMessage(JText::sprintf('JLIBinstallER_ERROR_SQL_READBUFFER'), 'WARNING');
+ JLog::add(JText::sprintf('JLIBinstallER_ERROR_SQL_READBUFFER'), JLog::WARNING, 'com_biblestudy');
return false;
}
@@ -1423,21 +1430,23 @@ private function runUpdates($string)
if ($string != '' && $string{0} != '#')
{
- $this->_db->setQuery($string);
+ $this->_db->setQuery($this->_db->convertUtf8mb4QueryToUtf8($string));
$this->doneSteps++;
- if (!$this->_db->execute())
+ try
{
- $app->enqueueMessage($this->_db->stderr(true), 'warning');
-
- return false;
+ $this->_db->execute();
}
- else
+ catch (RuntimeException $e)
{
- $queryString = (string) $string;
- $queryString = str_replace(array("\r", "\n"), array('', ' '), substr($queryString, 0, 80));
- JLog::add(JText::sprintf('JLIBinstallER_UPDATE_LOG_QUERY', $this->running, $queryString), JLog::INFO, 'com_biblestudy');
+ JLog::add($e->getMessage(), JLog::WARNING, 'com_biblestudy');
+
+ return false;
}
+
+ $queryString = (string) $string;
+ $queryString = str_replace(array("\r", "\n"), array('', ' '), substr($queryString, 0, 80));
+ JLog::add(JText::sprintf('JLIBinstallER_UPDATE_LOG_QUERY', $this->running, $queryString), JLog::INFO, 'com_biblestudy');
}
return true;
@@ -1561,7 +1570,8 @@ public function fixemptyaccess()
$query = $this->_db->getQuery(true);
$query->update($table['table'])
->set('access = ' . $id)
- ->where("access = " . $this->_db->q('0'), 'OR')->where("access = " . $this->_db->q(' '));
+ ->where("access = " . $this->_db->q('0'), $glue = 'OR')
+ ->where("access = " . $this->_db->q(' '));
$this->_db->setQuery($query);
$this->_db->execute();
}
@@ -1579,31 +1589,20 @@ public function fixemptyaccess()
public function rmoldurl()
{
$urls = array(
- $this->_db->qn('location') . ' = ' .
- $this->_db->q('https://www.joomlabiblestudy.org/index.php?option=com_ars&view=update&task=stream&format=xml&id=3'),
- $this->_db->qn('location') . ' = ' .
- $this->_db->q('https://www.joomlabiblestudy.org/index.php?option=com_ars&view=update&task=stream&format=xml&id=14&dummy=extension.xml'),
- $this->_db->qn('location') . ' = ' .
- $this->_db->q('https://www.joomlabiblestudy.org/index.php?option=com_ars&view=update&task=stream&format=xml&id=5&dummy=extension.xml'),
- $this->_db->qn('location') . ' = ' .
- $this->_db->q('https://www.joomlabiblestudy.org/index.php?option=com_ars&view=update&task=stream&format=xml&id=13'),
- $this->_db->qn('location') . ' = ' .
- $this->_db->q('https://www.joomlabiblestudy.org/index.php?option=com_ars&view=update&task=stream&' .
- 'format=xml&id=4&dummy=extension.xml'),
- $this->_db->qn('location') . ' = ' .
- $this->_db->q('https://www.joomlabiblestudy.org/index.php?option=com_ars&view=update&task=stream&format=xml&id=8'),
- $this->_db->qn('location') . ' = ' .
- $this->_db->q('https://www.joomlabiblestudy.org/index.php?option=com_ars&view=update&task=stream&format=xml&id=3&dummy=extension.xml'),
- $this->_db->qn('location') . ' = ' .
- $this->_db->q('https://www.joomlabiblestudy.org/index.php?option=com_ars&view=update&task=stream&format=xml&id=14&dummy=extension.xml'),
- $this->_db->qn('location') . ' = ' .
- $this->_db->q('https://www.joomlabiblestudy.org/index.php?option=com_ars&view=update&task=stream&format=xml&id=13&dummy=extension.xml'),
- $this->_db->qn('location') . ' = ' .
- $this->_db->q('https://www.joomlabiblestudy.org/index.php?option=com_ars&view=update&task=stream&format=xml&id=4&dummy=extension.xml'),
- $this->_db->qn('location') . ' = ' .
- $this->_db->q('https://www.joomlabiblestudy.org/index.php?option=com_ars&view=update&task=stream&format=xml&id=8&dummy=extension.xml'),
- $this->_db->qn('location') . ' = ' .
- $this->_db->q('https://www.joomlabiblestudy.org/index.php?option=com_ars&view=update&task=stream&format=xml&id=5&dummy=extension.xml'));
+ $this->_db->qn('name') . ' = ' .
+ $this->_db->q('Proclaim Module'),
+ $this->_db->qn('name') . ' = ' .
+ $this->_db->q('Proclaim Podcast Module'),
+ $this->_db->qn('name') . ' = ' .
+ $this->_db->q('Proclaim Finder Plg'),
+ $this->_db->qn('name') . ' = ' .
+ $this->_db->q('Proclaim Search Plg'),
+ $this->_db->qn('name') . ' = ' .
+ $this->_db->q('Proclaim Backup Plg'),
+ $this->_db->qn('name') . ' = ' .
+ $this->_db->q('Proclaim Podcast Plg'),
+ $this->_db->qn('name') . ' = ' .
+ $this->_db->q('Proclaim'));
return $urls;
}
diff --git a/com_biblestudy/admin/models/location.php b/com_biblestudy/admin/models/location.php
index 8a007c870c..65612618e7 100644
--- a/com_biblestudy/admin/models/location.php
+++ b/com_biblestudy/admin/models/location.php
@@ -1,11 +1,11 @@
isClient('site'))
+ // Support for 3.2 and newer. isSite().
+ if ($app->isSite())
{
$user = JFactory::getUser();
$groups = $user->getAuthorisedViewLevels();
diff --git a/com_biblestudy/admin/models/messagetype.php b/com_biblestudy/admin/models/messagetype.php
index 473c8a583c..43dac499cc 100644
--- a/com_biblestudy/admin/models/messagetype.php
+++ b/com_biblestudy/admin/models/messagetype.php
@@ -1,11 +1,11 @@
-
status->modules)) : ?>
diff --git a/com_biblestudy/admin/views/install/view.html.php b/com_biblestudy/admin/views/install/view.html.php
index 87b2fe3163..0fb80ef89e 100644
--- a/com_biblestudy/admin/views/install/view.html.php
+++ b/com_biblestudy/admin/views/install/view.html.php
@@ -1,11 +1,11 @@
diff --git a/com_biblestudy/admin/views/templates/view.html.php b/com_biblestudy/admin/views/templates/view.html.php
index af9d948d7f..57f4b3a7d1 100644
--- a/com_biblestudy/admin/views/templates/view.html.php
+++ b/com_biblestudy/admin/views/templates/view.html.php
@@ -2,10 +2,10 @@
/**
* Templates html
*
- * @package BibleStudy.Admin
- * @copyright 2007 - 2017 (C) Joomla Bible Study Team All rights reserved
+ * @package Proclaim.Admin
+ * @copyright 2007 - 2017 (C) CWM Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
- * @link https://www.joomlabiblestudy.org
+ * @link https://www.christianwebministries.org
* */
// No Direct Access
defined('_JEXEC') or die;
@@ -13,7 +13,7 @@
/**
* View class for Templates
*
- * @package BibleStudy.Admin
+ * @package Proclaim.Admin
* @since 7.0.0
*/
class BiblestudyViewTemplates extends JViewLegacy
diff --git a/com_biblestudy/admin/views/topic/tmpl/edit.php b/com_biblestudy/admin/views/topic/tmpl/edit.php
index 1f26210680..d11f9e344e 100644
--- a/com_biblestudy/admin/views/topic/tmpl/edit.php
+++ b/com_biblestudy/admin/views/topic/tmpl/edit.php
@@ -2,10 +2,10 @@
/**
* Form
*
- * @package BibleStudy.Admin
- * @copyright 2007 - 2017 (C) Joomla Bible Study Team All rights reserved
+ * @package Proclaim.Admin
+ * @copyright 2007 - 2017 (C) CWM Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
- * @link https://www.joomlabiblestudy.org
+ * @link https://www.christianwebministries.org
* */
// No Direct Access
defined('_JEXEC') or die;
diff --git a/com_biblestudy/admin/views/topic/view.html.php b/com_biblestudy/admin/views/topic/view.html.php
index 02f03e6a35..b7b4c82210 100644
--- a/com_biblestudy/admin/views/topic/view.html.php
+++ b/com_biblestudy/admin/views/topic/view.html.php
@@ -1,11 +1,11 @@
array(
- '5.3' => '5.3.1',
- '0' => '5.4.23' // Preferred version
+ '5.5' => '5.5.3',
+ '5.6' => '5.6.30',
+ '7.0' => '7.0.13',
+ '7.1' => '7.1.0',
+ '0' => '7.0.13' // Preferred version
),
'MySQL' => array(
'5.1' => '5.1',
- '0' => '5.5' // Preferred version
+ '5.5' => '5.5.3',
+ '0' => '5.5.3' // Preferred version
),
'Joomla!' => array(
- '3.4' => '3.4.1',
- '3.3' => '3.3.6',
- '2.5' => '2.5.28',
- '0' => '3.4.1' // Preferred version
+ '3.6' => '3.6.3',
+ '3.7' => '3.7.0',
+ '0' => '3.7.3' // Preferred version
)
);
+ protected $status;
+
+ /**
+ * The list of extra modules and plugins to install
+ *
+ * @author CWM Team
+ * @var array $_installation_queue Array of Items to install
+ * @since 9.0.18
+ */
+ private $installation_queue = [
+ // -- modules => { (folder) => { (module) => { (position), (published) } }* }*
+ 'modules' => [
+ 'admin' => [],
+ 'site' => ['biblestudy' => 0, 'biblestudy_podcast' => 0,],
+ ],
+ // -- plugins => { (folder) => { (element) => (published) }* }*
+ 'plugins' => [
+ 'finder' => ['biblestudy' => 1,],
+ 'search' => ['biblestudysearch' => 0,],
+ 'system' => ['jbspodcast' => 0, 'jbsbackup' => '0'],
+ ],
+ ];
+
protected $extensions = array('dom', 'gd', 'json', 'pcre', 'SimpleXML');
/**
@@ -65,6 +97,16 @@ public function preflight($type, $parent)
$parent = $parent->getParent();
$manifest = $parent->getManifest();
+ // Include the JLog class.
+ jimport('joomla.log.log');
+ JLog::addLogger(
+ array(
+ 'text_file' => 'com_biblestudy.errors.php'
+ ),
+ JLog::ALL,
+ 'com_biblestudy'
+ );
+
// Prevent installation if requirements are not met.
if (!$this->checkRequirements($manifest->version))
{
@@ -169,15 +211,8 @@ public function update($parent)
*/
public function uninstall($parent)
{
- $adminpath = $parent->getParent()->getPath('extension_administrator');
- $model = "{$adminpath}/models/install.php";
-
- if (file_exists($model))
- {
- require_once $model;
- $installer = new BibleStudyModelInstall;
- $installer->uninstall();
- }
+ // Uninstall sub-extensions
+ $this->_uninstallSubextensions($parent);
return true;
}
@@ -223,6 +258,16 @@ public function postflight($type, $parent)
*/
public function checkRequirements($version)
{
+ // Include the JLog class.
+ jimport('joomla.log.log');
+ JLog::addLogger(
+ array(
+ 'text_file' => 'com_biblestudy.errors.php'
+ ),
+ JLog::ALL,
+ 'com_biblestudy'
+ );
+
$db = JFactory::getDbo();
$pass = $this->checkVersion('PHP', phpversion());
$pass &= $this->checkVersion('Joomla!', JVERSION);
@@ -258,6 +303,11 @@ protected function checkDbo($name, $types)
}
$app->enqueueMessage(sprintf("Database driver '%s' is not supported. Please use MySQL instead.", $name), 'notice');
+ JLog::add(
+ sprintf("Database driver '%s' is not supported. Please use MySQL instead.", $name),
+ JLog::NOTICE,
+ $this->biblestudy_extension
+ );
return false;
}
@@ -284,6 +334,11 @@ protected function checkExtensions($extensions)
{
$pass = 0;
$app->enqueueMessage(sprintf("Required PHP extension '%s' is missing. Please install it into your system.", $name), 'notice');
+ JLog::add(
+ sprintf("Required PHP extension '%s' is missing. Please install it into your system.", $name),
+ JLog::NOTICE,
+ $this->biblestudy_extension
+ );
}
}
@@ -291,7 +346,7 @@ protected function checkExtensions($extensions)
}
/**
- * Check Verions of JBSM
+ * Check Versions of JBSM
*
* @param string $name Name of version
* @param string $version Version to look for
@@ -334,13 +389,18 @@ protected function checkVersion($name, $version)
), 'notice'
);
+ JLog::add(
+ sprintf("%s %s is not supported. Minimum required version is %s %s, but it is higly recommended to use %s %s or later.",
+ $name, $version, $name, $minor, $name, $recommended
+ ), JLog::ERROR, 'com_biblestudy');
+
return false;
}
/**
- * Check the installed version of JBSM
+ * Check the installed version of Proclaim
*
- * @param string $version JBSM Verstion to check for
+ * @param string $version Proclaim Version to check for
*
* @return bool
*
@@ -352,14 +412,6 @@ protected function checkJBSM($version)
{
$app = JFactory::getApplication();
- // Allways load JBSM API if it exists.
- $api = JPATH_ADMINISTRATOR . '/components/com_biblestudy/api.php';
-
- if (file_exists($api))
- {
- require_once $api;
- }
-
$db = JFactory::getDbo();
// Check if JBSM can be found from the database
@@ -372,11 +424,17 @@ protected function checkJBSM($version)
}
// Get installed JBSM version
- $db->setQuery("SELECT version FROM {$db->qn($table)} ORDER BY `id` DESC", 0, 1);
+ $query = $db->getQuery(true);
+ $query->select('version')
+ ->from($db->qn($table))
+ ->order('id DESC');
+ $db->setQuery($query, 0, 1);
$installed = $db->loadResult();
if (!$installed)
{
+ JLog::add('Found No installd version.', JLog::NOTICE, $this->biblestudy_extension);
+
return true;
}
@@ -386,7 +444,13 @@ protected function checkJBSM($version)
return true;
}
+ // @todo need to move to language string.
$app->enqueueMessage(sprintf('Sorry, it is not possible to downgrade BibleStudy %s to version %s.', $installed, $version), 'notice');
+ JLog::add(
+ sprintf('Sorry, it is not possible to downgrade BibleStudy %s to version %s.', $installed, $version),
+ JLog::NOTICE,
+ $this->biblestudy_extension
+ );
return false;
}
@@ -420,8 +484,8 @@ public function deleteFiles($path, $ignore = array())
/**
* Delete Folders
*
- * @param array $path Path to folders
- * @param array $ignore Ingnore array of files
+ * @param string $path Path to folders
+ * @param array $ignore Ingnore array of files
*
* @return void;
*
@@ -458,4 +522,90 @@ public function deleteFolder($path, $ignore = array())
$this->deleteFiles($path, $ignore);
$this->deleteFolders($path, $ignore);
}
+
+ /**
+ * Uninstalls subextensions (modules, plugins) bundled with the main extension
+ *
+ * @param JInstallerAdapter $parent is the class calling this method.
+ *
+ * @return void
+ *
+ * @since 9.0.18
+ */
+ private function _uninstallSubextensions($parent)
+ {
+ jimport('joomla.installer.installer');
+
+ $db = JFactory::getDbo();
+
+ // Modules uninstalling
+ if (count($this->installation_queue['modules']))
+ {
+ foreach ($this->installation_queue['modules'] as $folder => $modules)
+ {
+ if (count($modules))
+ {
+ foreach ($modules as $module => $modulePreferences)
+ {
+ // Find the module ID
+ $sql = $db->getQuery(true)
+ ->select($db->qn('extension_id'))
+ ->from($db->qn('#__extensions'))
+ ->where($db->qn('element') . ' = ' . $db->q('mod_' . $module))
+ ->where($db->qn('type') . ' = ' . $db->q('module'));
+ $db->setQuery($sql);
+ $id = $db->loadResult();
+
+ // Uninstall the module
+ if ($id)
+ {
+ $installer = new JInstaller;
+ $result = $installer->uninstall('module', $id, 1);
+ $this->status->modules[] = [
+ 'name' => 'mod_' . $module,
+ 'client' => $folder,
+ 'result' => $result
+ ];
+ }
+ }
+ }
+ }
+ }
+
+ // Plugins uninstalling
+ if (count($this->installation_queue['plugins']))
+ {
+ foreach ($this->installation_queue['plugins'] as $folder => $plugins)
+ {
+ if (count($plugins))
+ {
+ foreach ($plugins as $plugin => $published)
+ {
+ $sql = $db->getQuery(true)
+ ->select($db->qn('extension_id'))
+ ->from($db->qn('#__extensions'))
+ ->where($db->qn('type') . ' = ' . $db->q('plugin'))
+ ->where($db->qn('element') . ' = ' . $db->q($plugin))
+ ->where($db->qn('folder') . ' = ' . $db->q($folder));
+ $db->setQuery($sql);
+
+ $id = $db->loadResult();
+
+ if ($id)
+ {
+ $installer = new JInstaller;
+ $result = $installer->uninstall('plugin', $id, 1);
+ $this->status->plugins[] = [
+ 'name' => 'plg_' . $plugin,
+ 'group' => $folder,
+ 'result' => $result
+ ];
+ }
+ }
+ }
+ }
+ }
+
+ return;
+ }
}
diff --git a/com_biblestudy/biblestudy.xml b/com_biblestudy/biblestudy.xml
index 8fd721add4..bfc0a4f872 100755
--- a/com_biblestudy/biblestudy.xml
+++ b/com_biblestudy/biblestudy.xml
@@ -2,12 +2,12 @@
Joomla Bible Study Component
+ Proclaim Component
Installed
',spinnerTpl:'',errorTpl:'',closeTpl:'',parentEl:"body",touch:!0,keyboard:!0,focus:!0,closeClickOutside:!0,beforeLoad:n.noop,afterLoad:n.noop,beforeMove:n.noop,afterMove:n.noop,onComplete:n.noop,onInit:n.noop,beforeClose:n.noop,afterClose:n.noop,onActivate:n.noop,onDeactivate:n.noop},a=n(t),r=n(e),c=0,l=function(t){return t&&t.hasOwnProperty&&t instanceof n},u=function(){return t.requestAnimationFrame||t.webkitRequestAnimationFrame||t.mozRequestAnimationFrame||function(e){t.setTimeout(e,1e3/60)}}(),d=function(o){var s;return"function"==typeof n&&o instanceof n&&(o=o[0]),s=o.getBoundingClientRect(),s.bottom>0&&s.right>0&&s.left<(t.innerWidth||e.documentElement.clientWidth)&&s.top<(t.innerHeight||e.documentElement.clientHeight)},p=function(t,o,s){var a=this;a.opts=n.extend(!0,{index:s},i,o||{}),a.id=a.opts.id||++c,a.group=[],a.currIndex=parseInt(a.opts.index,10)||0,a.prevIndex=null,a.prevPos=null,a.currPos=0,a.firstRun=null,a.createGroup(t),a.group.length&&(a.$lastFocus=n(e.activeElement).blur(),a.elems={},a.slides={},a.init(t))};n.extend(p.prototype,{init:function(){var t,e,o=this;o.scrollTop=a.scrollTop(),o.scrollLeft=a.scrollLeft(),n.fancybox.isTouch||n("html").hasClass("fancybox-enabled")||(t=n("body").width(),n("html").addClass("fancybox-enabled"),t=n("body").width()-t,t>1&&n('")),o="",n.each(a.buttons,function(t,e){o+=a.btnTpl[e]||""}),e=n(i.translate(i,a.baseTpl.replace("{{BUTTONS}}",o))).addClass("fancybox-is-hidden").attr("id","fancybox-container-"+i.id).addClass(a.baseClass).data("FancyBox",i).prependTo(a.parentEl),i.$refs={container:e},["bg","inner","infobar","toolbar","stage","caption"].forEach(function(t){i.$refs[t]=e.find(".fancybox-"+t)}),(!a.arrows||i.group.length<2)&&e.find(".fancybox-navigation").remove(),a.infobar||i.$refs.infobar.remove(),a.toolbar||i.$refs.toolbar.remove(),i.trigger("onInit"),i.activate(),i.jumpTo(i.currIndex)},translate:function(t,e){var n=t.opts.i18n[t.opts.lang];return e.replace(/\{\{(\w+)\}\}/g,function(t,e){var i=n[e];return i===o?t:i})},createGroup:function(t){var e=this,i=n.makeArray(t);n.each(i,function(t,i){var a,s,r,c,l={},u={},d=[];n.isPlainObject(i)?(l=i,u=i.opts||i):"object"===n.type(i)&&n(i).length?(a=n(i),d=a.data(),u="options"in d?d.options:{},u="object"===n.type(u)?u:{},l.src="src"in d?d.src:u.src||a.attr("href"),["width","height","thumb","type","filter"].forEach(function(t){t in d&&(u[t]=d[t])}),"srcset"in d&&(u.image={srcset:d.srcset}),u.$orig=a,l.type||l.src||(l.type="inline",l.src=i)):l={type:"html",src:i+""},l.opts=n.extend(!0,{},e.opts,u),n.fancybox.isMobile&&(l.opts=n.extend(!0,{},l.opts,l.opts.mobile)),s=l.type||l.opts.type,r=l.src||"",!s&&r&&(r.match(/(^data:image\/[a-z0-9+\/=]*,)|(\.(jp(e|g|eg)|gif|png|bmp|webp|svg|ico)((\?|#).*)?$)/i)?s="image":r.match(/\.(pdf)((\?|#).*)?$/i)?s="pdf":"#"===r.charAt(0)&&(s="inline")),l.type=s,l.index=e.group.length,l.opts.$orig&&!l.opts.$orig.length&&delete l.opts.$orig,!l.opts.$thumb&&l.opts.$orig&&(l.opts.$thumb=l.opts.$orig.find("img:first")),l.opts.$thumb&&!l.opts.$thumb.length&&delete l.opts.$thumb,"function"===n.type(l.opts.caption)?l.opts.caption=l.opts.caption.apply(i,[e,l]):"caption"in d&&(l.opts.caption=d.caption),l.opts.caption=l.opts.caption===o?"":l.opts.caption+"","ajax"===s&&(c=r.split(/\s+/,2),c.length>1&&(l.src=c.shift(),l.opts.filter=c.shift())),"auto"==l.opts.smallBtn&&(n.inArray(s,["html","inline","ajax"])>-1?(l.opts.toolbar=!1,l.opts.smallBtn=!0):l.opts.smallBtn=!1),"pdf"===s&&(l.type="iframe",l.opts.iframe.preload=!1),l.opts.modal&&(l.opts=n.extend(!0,l.opts,{infobar:0,toolbar:0,smallBtn:0,keyboard:0,slideShow:0,fullScreen:0,thumbs:0,touch:0,clickContent:!1,clickSlide:!1,clickOutside:!1,dblclickContent:!1,dblclickSlide:!1,dblclickOutside:!1})),e.group.push(l)})},addEvents:function(){var o=this;o.removeEvents(),o.$refs.container.on("click.fb-close","[data-fancybox-close]",function(t){t.stopPropagation(),t.preventDefault(),o.close(t)}).on("click.fb-prev touchend.fb-prev","[data-fancybox-prev]",function(t){t.stopPropagation(),t.preventDefault(),o.previous()}).on("click.fb-next touchend.fb-next","[data-fancybox-next]",function(t){t.stopPropagation(),t.preventDefault(),o.next()}),s.on("orientationchange.fb resize.fb",function(t){t&&t.originalEvent&&"resize"===t.originalEvent.type?u(function(){o.update()}):(o.$refs.stage.hide(),setTimeout(function(){o.$refs.stage.show(),o.update()},500))}),r.on("focusin.fb",function(t){var i=n.fancybox?n.fancybox.getInstance():null;i.isClosing||!i.current||!i.current.opts.trapFocus||n(t.target).hasClass("fancybox-container")||n(t.target).is(e)||i&&"fixed"!==n(t.target).css("position")&&!i.$refs.container.has(t.target).length&&(t.stopPropagation(),i.focus(),s.scrollTop(o.scrollTop).scrollLeft(o.scrollLeft))}),r.on("keydown.fb",function(t){var e=o.current,i=t.keyCode||t.which;if(e&&e.opts.keyboard&&!n(t.target).is("input")&&!n(t.target).is("textarea"))return 8===i||27===i?(t.preventDefault(),void o.close(t)):37===i||38===i?(t.preventDefault(),void o.previous()):39===i||40===i?(t.preventDefault(),void o.next()):void o.trigger("afterKeydown",t,i)}),o.group[o.currIndex].opts.idleTime&&(o.idleSecondsCounter=0,r.on("mousemove.fb-idle mouseenter.fb-idle mouseleave.fb-idle mousedown.fb-idle touchstart.fb-idle touchmove.fb-idle scroll.fb-idle keydown.fb-idle",function(){o.idleSecondsCounter=0,o.isIdle&&o.showControls(),o.isIdle=!1}),o.idleInterval=t.setInterval(function(){o.idleSecondsCounter++,o.idleSecondsCounter>=o.group[o.currIndex].opts.idleTime&&(o.isIdle=!0,o.idleSecondsCounter=0,o.hideControls())},1e3))},removeEvents:function(){var e=this;s.off("orientationchange.fb resize.fb"),r.off("focusin.fb keydown.fb .fb-idle"),this.$refs.container.off(".fb-close .fb-prev .fb-next"),e.idleInterval&&(t.clearInterval(e.idleInterval),e.idleInterval=null)},previous:function(t){return this.jumpTo(this.currPos-1,t)},next:function(t){return this.jumpTo(this.currPos+1,t)},jumpTo:function(t,e,i){var a,s,r,c,l,u,d,h=this,p=h.group.length;if(!(h.isSliding||h.isClosing||h.isAnimating&&h.firstRun)){if(t=parseInt(t,10),s=h.current?h.current.opts.loop:h.opts.loop,!s&&(t<0||t>=p))return!1;if(a=h.firstRun=null===h.firstRun,!(p<2&&!a&&h.isSliding)){if(c=h.current,h.prevIndex=h.currIndex,h.prevPos=h.currPos,r=h.createSlide(t),p>1&&((s||r.index>0)&&h.createSlide(t-1),(s||r.index
Please try again later.").one("error",function(){n(this).remove(),e.$ghost=null,r.setBigImage(e)}).one("load",function(){r.afterLoad(e),r.setBigImage(e)}).addClass("fancybox-image").appendTo(e.$content).attr("src",e.opts.thumb||e.opts.$thumb.attr("src"))):r.setBigImage(e)},setBigImage:function(t){var e=this,o=n("
");t.$image=o.one("error",function(){e.setError(t)}).one("load",function(){clearTimeout(t.timouts),t.timouts=null,e.isClosing||(t.width=this.naturalWidth,t.height=this.naturalHeight,t.opts.image.srcset&&o.attr("sizes","100vw").attr("srcset",t.opts.image.srcset),e.hideLoading(t),t.$ghost?t.timouts=setTimeout(function(){t.timouts=null,t.$ghost.hide()},Math.min(300,Math.max(1e3,t.height/1600))):e.afterLoad(t))}).addClass("fancybox-image").attr("src",t.src).appendTo(t.$content),o[0].complete?o.trigger("load"):o[0].error?o.trigger("error"):t.timouts=setTimeout(function(){o[0].complete||t.hasError||e.showLoading(t)},100)},setIframe:function(t){var e,i=this,a=t.opts.iframe,s=t.$slide;t.$content=n('').css(a.css).appendTo(s),e=n(a.tpl.replace(/\{rnd\}/g,(new Date).getTime())).attr(a.attr).appendTo(t.$content),a.preload?(i.showLoading(t),e.on("load.fb error.fb",function(e){this.isReady=1,t.$slide.trigger("refresh"),i.afterLoad(t)}),s.on("refresh.fb",function(){var n,i,s,r,c,l=t.$content;if(1===e[0].isReady){try{n=e.contents(),i=n.find("body")}catch(t){}i&&i.length&&(a.css.width===o||a.css.height===o)&&(s=e[0].contentWindow.document.documentElement.scrollWidth,r=Math.ceil(i.outerWidth(!0)+(l.width()-s)),c=Math.ceil(i.outerHeight(!0)),l.css({width:a.css.width===o?r+(l.outerWidth()-l.innerWidth()):a.css.width,height:a.css.height===o?c+(l.outerHeight()-l.innerHeight()):a.css.height})),l.removeClass("fancybox-is-hidden")}})):this.afterLoad(t),e.attr("src",t.src),t.opts.smallBtn===!0&&t.$content.prepend(i.translate(t,t.opts.btnTpl.smallBtn)),s.one("onReset",function(){try{n(this).find("iframe").hide().attr("src","//about:blank")}catch(t){}n(this).empty(),t.isLoaded=!1})},setContent:function(t,e){var o=this;o.isClosing||(o.hideLoading(t),t.$slide.empty(),l(e)&&e.parent().length?(e.parent(".fancybox-slide--inline").trigger("onReset"),t.$placeholder=n("").hide().insertAfter(e),e.css("display","inline-block")):t.hasError||("string"===n.type(e)&&(e=n("
").append(n.trim(e)).contents(),3===e[0].nodeType&&(e=n("").html(e))),t.opts.filter&&(e=n("").html(e).find(t.opts.filter))),t.$slide.one("onReset",function(){t.$placeholder&&(t.$placeholder.after(e.hide()).remove(),t.$placeholder=null),t.$smallBtn&&(t.$smallBtn.remove(),t.$smallBtn=null),t.hasError||(n(this).empty(),t.isLoaded=!1)}),t.$content=n(e).appendTo(t.$slide),t.opts.smallBtn&&!t.$smallBtn&&(t.$smallBtn=n(o.translate(t,t.opts.btnTpl.smallBtn)).appendTo(t.$content)),this.afterLoad(t))},setError:function(t){t.hasError=!0,t.$slide.removeClass("fancybox-slide--"+t.type),this.setContent(t,this.translate(t,t.opts.errorTpl))},showLoading:function(t){var e=this;t=t||e.current,t&&!t.$spinner&&(t.$spinner=n(e.opts.spinnerTpl).appendTo(t.$slide))},hideLoading:function(t){var e=this;t=t||e.current,t&&t.$spinner&&(t.$spinner.remove(),delete t.$spinner)},afterLoad:function(t){var e=this;e.isClosing||(t.isLoading=!1,t.isLoaded=!0,e.trigger("afterLoad",t),e.hideLoading(t),t.opts.protect&&t.$content&&!t.hasError&&(t.$content.on("contextmenu.fb",function(t){return 2==t.button&&t.preventDefault(),!0}),"image"===t.type&&n('').appendTo(t.$content)),e.revealContent(t))},revealContent:function(t){var e,i,a,s,r,c=this,l=t.$slide,u=!1;return e=t.opts[c.firstRun?"animationEffect":"transitionEffect"],a=t.opts[c.firstRun?"animationDuration":"transitionDuration"],a=parseInt(t.forcedDuration===o?a:t.forcedDuration,10),!t.isMoved&&t.pos===c.currPos&&a||(e=!1),"zoom"!==e||t.pos===c.currPos&&a&&"image"===t.type&&!t.hasError&&(u=c.getThumbPos(t))||(e="fade"),"zoom"===e?(r=c.getFitPos(t),r.scaleX=Math.round(r.width/u.width*100)/100,r.scaleY=Math.round(r.height/u.height*100)/100,delete r.width,delete r.height,s=t.opts.zoomOpacity,"auto"==s&&(s=Math.abs(t.width/t.height-u.width/u.height)>.1),s&&(u.opacity=.1,r.opacity=1),n.fancybox.setTranslate(t.$content.removeClass("fancybox-is-hidden"),u),f(t.$content),void n.fancybox.animate(t.$content,r,a,function(){c.complete()})):(c.updateSlide(t),e?(n.fancybox.stop(l),i="fancybox-animated fancybox-slide--"+(t.pos>c.prevPos?"next":"previous")+" fancybox-fx-"+e,l.removeAttr("style").removeClass("fancybox-slide--current fancybox-slide--next fancybox-slide--previous").addClass(i),t.$content.removeClass("fancybox-is-hidden"),f(l),void n.fancybox.animate(l,"fancybox-slide--current",a,function(e){l.removeClass(i).removeAttr("style"),t.pos===c.currPos&&c.complete()},!0)):(f(l),t.$content.removeClass("fancybox-is-hidden"),void(t.pos===c.currPos&&c.complete())))},getThumbPos:function(o){var i,a=this,s=!1,r=function(e){for(var o,i=e[0],a=i.getBoundingClientRect(),s=[];null!==i.parentElement;)"hidden"!==n(i.parentElement).css("overflow")&&"auto"!==n(i.parentElement).css("overflow")||s.push(i.parentElement.getBoundingClientRect()),i=i.parentElement;return o=s.every(function(t){var e=Math.min(a.right,t.right)-Math.max(a.left,t.left),n=Math.min(a.bottom,t.bottom)-Math.max(a.top,t.top);return e>0&&n>0}),o&&a.bottom>0&&a.right>0&&a.left",e.each(o.group,function(e,o){n=o.opts.thumb||(o.opts.$thumb?o.opts.$thumb.attr("src"):null),n||"image"!==o.type||(n=o.src),n&&n.length&&(t+='
",this.$list=e(t).appendTo(this.$grid).on("click","li",function(){o.jumpTo(e(this).data("index"))}),this.$list.find("img").hide().one("load",function(){var t,n,o,i,a=e(this).parent().removeClass("fancybox-thumbs-loading"),s=a.outerWidth(),r=a.outerHeight();t=this.naturalWidth||this.width,n=this.naturalHeight||this.height,o=t/s,i=n/r,o>=1&&i>=1&&(o>i?(t/=i,n=r):(t=s,n/=o)),e(this).css({width:Math.floor(t),height:Math.floor(n),"margin-top":Math.min(0,Math.floor(.3*r-.3*n)),"margin-left":Math.min(0,Math.floor(.5*s-.5*t))}).show()}).each(function(){this.src=e(this).data("src")})},focus:function(){this.instance.current&&this.$list.children().removeClass("fancybox-thumbs-active").filter('[data-index="'+this.instance.current.index+'"]').addClass("fancybox-thumbs-active").focus()},close:function(){this.$grid.hide()},update:function(){this.instance.$refs.container.toggleClass("fancybox-show-thumbs",this.isVisible),this.isVisible?(this.$grid||this.create(),this.instance.trigger("onThumbsShow"),this.focus()):this.$grid&&this.instance.trigger("onThumbsHide"),this.instance.update()},hide:function(){this.isVisible=!1,this.update()},show:function(){this.isVisible=!0,this.update()},toggle:function(){this.isVisible=!this.isVisible,this.update()}}),e(t).on({"onInit.fb":function(t,e){e&&!e.Thumbs&&(e.Thumbs=new n(e))},"beforeShow.fb":function(t,e,n,o){var i=e&&e.Thumbs;if(i&&i.isActive){if(n.modal)return i.$button.hide(),void i.hide();o&&e.opts.thumbs.autoStart===!0&&i.show(),i.isVisible&&i.focus()}},"afterKeydown.fb":function(t,e,n,o,i){var a=e&&e.Thumbs;a&&a.isActive&&71===i&&(o.preventDefault(),a.toggle())},"beforeClose.fb":function(t,e){var n=e&&e.Thumbs;n&&n.isVisible&&e.opts.thumbs.hideOnClose!==!1&&n.close()}})}(document,window.jQuery),function(t,e,n){"use strict";function o(){var t=e.location.hash.substr(1),n=t.split("-"),o=n.length>1&&/^\+?\d+$/.test(n[n.length-1])?parseInt(n.pop(-1),10)||1:1,i=n.join("-");return o<1&&(o=1),{hash:t,index:o,gallery:i}}function i(t){var e;""!==t.gallery&&(e=n("[data-fancybox='"+n.escapeSelector(t.gallery)+"']").eq(t.index-1),e.length?e.trigger("click"):n("#"+n.escapeSelector(t.gallery)).trigger("click"))}function a(t){var e;return!!t&&(e=t.current?t.current.opts:t.opts,e.$orig?e.$orig.data("fancybox"):e.hash||"")}n.escapeSelector||(n.escapeSelector=function(t){var e=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g,n=function(t,e){return e?"\0"===t?"�":t.slice(0,-1)+"\\"+t.charCodeAt(t.length-1).toString(16)+" ":"\\"+t};return(t+"").replace(e,n)});var s=null,r=null;n(function(){setTimeout(function(){n.fancybox.defaults.hash!==!1&&(n(t).on({"onInit.fb":function(t,e){var n,i;e.group[e.currIndex].opts.hash!==!1&&(n=o(),i=a(e),i&&n.gallery&&i==n.gallery&&(e.currIndex=n.index-1))},"beforeShow.fb":function(n,o,i,c){var l;i.opts.hash!==!1&&(l=a(o),l&&""!==l&&(e.location.hash.indexOf(l)<0&&(o.opts.origHash=e.location.hash),s=l+(o.group.length>1?"-"+(i.index+1):""),"replaceState"in e.history?(r&&clearTimeout(r),r=setTimeout(function(){e.history[c?"pushState":"replaceState"]({},t.title,e.location.pathname+e.location.search+"#"+s),r=null},300)):e.location.hash=s))},"beforeClose.fb":function(o,i,c){var l,u;r&&clearTimeout(r),c.opts.hash!==!1&&(l=a(i),u=i&&i.opts.origHash?i.opts.origHash:"",l&&""!==l&&("replaceState"in history?e.history.replaceState({},t.title,e.location.pathname+e.location.search+u):(e.location.hash=u,n(e).scrollTop(i.scrollTop).scrollLeft(i.scrollLeft))),s=null)}}),n(e).on("hashchange.fb",function(){var t=o();n.fancybox.getInstance()?!s||s===t.gallery+"-"+t.index||1===t.index&&s==t.gallery||(s=null,n.fancybox.close()):""!==t.gallery&&i(t)}),n(e).one("unload.fb popstate.fb",function(){n.fancybox.getInstance("close",!0,0)}),i(o()))},50)})}(document,window,window.jQuery);
\ No newline at end of file
diff --git a/com_biblestudy/media/images/bible2015.png b/com_biblestudy/media/images/bible2015.png
old mode 100755
new mode 100644
index ee8e4eb41c..98f28f9619
Binary files a/com_biblestudy/media/images/bible2015.png and b/com_biblestudy/media/images/bible2015.png differ
diff --git a/com_biblestudy/media/images/biblemenu.png b/com_biblestudy/media/images/biblemenu.png
old mode 100755
new mode 100644
index 5ce26daadd..88f8a744ae
Binary files a/com_biblestudy/media/images/biblemenu.png and b/com_biblestudy/media/images/biblemenu.png differ
diff --git a/com_biblestudy/media/js/fancybox.js b/com_biblestudy/media/js/fancybox.js
index 9cb2cad526..bcd9b15c6a 100644
--- a/com_biblestudy/media/js/fancybox.js
+++ b/com_biblestudy/media/js/fancybox.js
@@ -31,7 +31,7 @@
height: height,
opts: {
smallBtn: false,
- onComplete: function () {
+ afterLoad: function () {
var playerInstance = jwplayer("video_container");
playerInstance.setup({
title: title,
@@ -46,7 +46,7 @@
file: myVideo,
width: width,
height: height,
- mute: mute,
+ mute: false,
autostart: autostart,
controls: controls
});
diff --git a/com_biblestudy/media/plupload/upload.php b/com_biblestudy/media/plupload/upload.php
index 2211aab791..4808198359 100755
--- a/com_biblestudy/media/plupload/upload.php
+++ b/com_biblestudy/media/plupload/upload.php
@@ -3,9 +3,9 @@
* upload.php
*
* @package BibleStudy.Site
- * @copyright 2007 - 2017 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2017 (C) CWM Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
- * @link https://www.joomlabiblestudy.org
+ * @link https://www.christianwebministries.org
* */
// Make sure file is not cached (as it happens for example on iOS devices)
diff --git a/com_biblestudy/site/biblestudy.php b/com_biblestudy/site/biblestudy.php
index 6067130299..f4c67972de 100644
--- a/com_biblestudy/site/biblestudy.php
+++ b/com_biblestudy/site/biblestudy.php
@@ -3,9 +3,9 @@
* Core BibleStudy Site File
*
* @package BibleStudy.Site
- * @copyright 2007 - 2017 (C) Joomla Bible Study Team All rights reserved
+ * @copyright 2007 - 2017 (C) CWM Team All rights reserved
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
- * @link https://www.joomlabiblestudy.org
+ * @link https://www.christianwebministries.org
* */
// No Direct Access
defined('_JEXEC') or die;
diff --git a/com_biblestudy/site/controller.php b/com_biblestudy/site/controller.php
index 3c3bf2fac3..1b91f387e3 100644
--- a/com_biblestudy/site/controller.php
+++ b/com_biblestudy/site/controller.php
@@ -1,11 +1,11 @@
params->get('size');
}
+ $url = JBSMHelper::remove_http($url);
+
$downloadlink = '';
}
@@ -762,13 +764,13 @@ public function getFluidFilesize($media, $params)
$file_size = $media->params->get('size', '0');
- if (!$file_size)
+ if ($file_size == 0)
{
$file_size = JBSMHelper::getRemoteFileSize(JBSMHelper::MediaBuildUrl($media->sparams->get('path'), $params->get('filename'), $params, true));
JBSMHelper::SetFilesize($media->id, $file_size);
}
- if ($file_size)
+ if ($file_size != 0)
{
switch ($file_size)
{
diff --git a/com_biblestudy/site/helpers/podcastsubscribe.php b/com_biblestudy/site/helpers/podcastsubscribe.php
index 7c2fa707ec..24280c7eb2 100644
--- a/com_biblestudy/site/helpers/podcastsubscribe.php
+++ b/com_biblestudy/site/helpers/podcastsubscribe.php
@@ -1,11 +1,11 @@
' . $year . ' All rights reserved.
items as $item)
- { ?>
+ {
+ $img_base = pathinfo($item->series_thumbnail);
+ $originalFile = $item->series_thumbnail;
+
+ if (file_exists(JPATH_ROOT . '/' . $originalFile) && $img_base['basename'])
+ {
+ $array = explode('.', $img_base['basename']);
+ $NewfileName = $img_base['dirname'] . '/' . $array[0] . '-200.' . $array[1];
+ $img = JBSMImageLib::getSeriesPodcast($originalFile, $NewfileName);
+ }
+ else
+ {
+ $img = null;
+ }
+ ?>
- series_thumbnail, $item->id . ' : ' . stripslashes($item->series_text), $this->attribs); ?>
+ id . ' : ' . stripslashes($item->series_text), $this->attribs); ?>
diff --git a/com_biblestudy/site/views/podcastlist/view.html.php b/com_biblestudy/site/views/podcastlist/view.html.php
index f8d2bf7461..e7e92dcfcf 100644
--- a/com_biblestudy/site/views/podcastlist/view.html.php
+++ b/com_biblestudy/site/views/podcastlist/view.html.php
@@ -1,11 +1,11 @@
=0.90 <3.0",
"sentry/sentry": "^0.13",
- "swiftmailer/swiftmailer": "~5.3"
+ "swiftmailer/swiftmailer": "^5.3|^6.0"
},
"suggest": {
"aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
@@ -831,7 +831,7 @@
"logging",
"psr-3"
],
- "time": "2017-03-13T07:08:03+00:00"
+ "time": "2017-06-19T01:22:40+00:00"
},
{
"name": "nikic/php-parser",
@@ -1203,16 +1203,16 @@
},
{
"name": "phpdocumentor/reflection-docblock",
- "version": "2.0.4",
+ "version": "2.0.5",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
- "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
+ "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
- "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e6a969a640b00d8daa3c66518b0405fb41ae0c4b",
+ "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b",
"shasum": ""
},
"require": {
@@ -1248,7 +1248,7 @@
"email": "mike.vanriel@naenius.com"
}
],
- "time": "2015-02-03T12:10:50+00:00"
+ "time": "2016-01-25T08:17:30+00:00"
},
{
"name": "phpmailer/phpmailer",
@@ -1471,16 +1471,16 @@
},
{
"name": "seld/jsonlint",
- "version": "1.6.0",
+ "version": "1.6.1",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/jsonlint.git",
- "reference": "791f8c594f300d246cdf01c6b3e1e19611e301d8"
+ "reference": "50d63f2858d87c4738d5b76a7dcbb99fa8cf7c77"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/791f8c594f300d246cdf01c6b3e1e19611e301d8",
- "reference": "791f8c594f300d246cdf01c6b3e1e19611e301d8",
+ "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/50d63f2858d87c4738d5b76a7dcbb99fa8cf7c77",
+ "reference": "50d63f2858d87c4738d5b76a7dcbb99fa8cf7c77",
"shasum": ""
},
"require": {
@@ -1516,7 +1516,7 @@
"parser",
"validator"
],
- "time": "2017-03-06T16:42:24+00:00"
+ "time": "2017-06-18T15:11:04+00:00"
},
{
"name": "simplepie/simplepie",
@@ -1574,16 +1574,16 @@
},
{
"name": "symfony/config",
- "version": "v2.8.18",
+ "version": "v2.8.25",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "06ce6bb46c24963ec09323da45d0f4f85d3cecd2"
+ "reference": "0b8541d18507d10204a08384640ff6df3c739ebe"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/06ce6bb46c24963ec09323da45d0f4f85d3cecd2",
- "reference": "06ce6bb46c24963ec09323da45d0f4f85d3cecd2",
+ "url": "https://api.github.com/repos/symfony/config/zipball/0b8541d18507d10204a08384640ff6df3c739ebe",
+ "reference": "0b8541d18507d10204a08384640ff6df3c739ebe",
"shasum": ""
},
"require": {
@@ -1626,20 +1626,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
- "time": "2017-03-01T18:13:50+00:00"
+ "time": "2017-04-12T14:07:15+00:00"
},
{
"name": "symfony/console",
- "version": "v2.8.18",
+ "version": "v2.8.25",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "81508e6fac4476771275a3f4f53c3fee9b956bfa"
+ "reference": "46e65f8d98c9ab629bbfcc16a4ff023f61c37fb2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/81508e6fac4476771275a3f4f53c3fee9b956bfa",
- "reference": "81508e6fac4476771275a3f4f53c3fee9b956bfa",
+ "url": "https://api.github.com/repos/symfony/console/zipball/46e65f8d98c9ab629bbfcc16a4ff023f61c37fb2",
+ "reference": "46e65f8d98c9ab629bbfcc16a4ff023f61c37fb2",
"shasum": ""
},
"require": {
@@ -1687,20 +1687,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2017-03-04T11:00:12+00:00"
+ "time": "2017-07-03T08:04:30+00:00"
},
{
"name": "symfony/debug",
- "version": "v2.8.18",
+ "version": "v2.8.25",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "e90099a2958d4833a02d05b504cc06e1c234abcc"
+ "reference": "8470d7701177a88edeb0cec59b44d50ef4477e9b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/e90099a2958d4833a02d05b504cc06e1c234abcc",
- "reference": "e90099a2958d4833a02d05b504cc06e1c234abcc",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/8470d7701177a88edeb0cec59b44d50ef4477e9b",
+ "reference": "8470d7701177a88edeb0cec59b44d50ef4477e9b",
"shasum": ""
},
"require": {
@@ -1744,20 +1744,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2017-02-18T19:13:35+00:00"
+ "time": "2017-06-01T20:52:29+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.8.18",
+ "version": "v2.8.25",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "bb4ec47e8e109c1c1172145732d0aa468d967cd0"
+ "reference": "1377400fd641d7d1935981546aaef780ecd5bf6d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/bb4ec47e8e109c1c1172145732d0aa468d967cd0",
- "reference": "bb4ec47e8e109c1c1172145732d0aa468d967cd0",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1377400fd641d7d1935981546aaef780ecd5bf6d",
+ "reference": "1377400fd641d7d1935981546aaef780ecd5bf6d",
"shasum": ""
},
"require": {
@@ -1804,20 +1804,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2017-02-21T08:33:48+00:00"
+ "time": "2017-06-02T07:47:27+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v2.8.18",
+ "version": "v2.8.25",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "e542d4765092d22552b1bf01ddccfb01d98ee325"
+ "reference": "714b1036010c354ae2b25d7f9ca27e14e265e9f2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/e542d4765092d22552b1bf01ddccfb01d98ee325",
- "reference": "e542d4765092d22552b1bf01ddccfb01d98ee325",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/714b1036010c354ae2b25d7f9ca27e14e265e9f2",
+ "reference": "714b1036010c354ae2b25d7f9ca27e14e265e9f2",
"shasum": ""
},
"require": {
@@ -1853,20 +1853,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2017-02-18T17:06:33+00:00"
+ "time": "2017-07-11T07:12:11+00:00"
},
{
"name": "symfony/finder",
- "version": "v2.8.18",
+ "version": "v2.8.25",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "5fc4b5cab38b9d28be318fcffd8066988e7d9451"
+ "reference": "4f4e84811004e065a3bb5ceeb1d9aa592630f9ad"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/5fc4b5cab38b9d28be318fcffd8066988e7d9451",
- "reference": "5fc4b5cab38b9d28be318fcffd8066988e7d9451",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/4f4e84811004e065a3bb5ceeb1d9aa592630f9ad",
+ "reference": "4f4e84811004e065a3bb5ceeb1d9aa592630f9ad",
"shasum": ""
},
"require": {
@@ -1902,20 +1902,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2017-02-21T08:33:48+00:00"
+ "time": "2017-06-01T20:52:29+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.3.0",
+ "version": "v1.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
+ "reference": "f29dca382a6485c3cbe6379f0c61230167681937"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4",
- "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f29dca382a6485c3cbe6379f0c61230167681937",
+ "reference": "f29dca382a6485c3cbe6379f0c61230167681937",
"shasum": ""
},
"require": {
@@ -1927,7 +1927,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3-dev"
+ "dev-master": "1.4-dev"
}
},
"autoload": {
@@ -1961,20 +1961,20 @@
"portable",
"shim"
],
- "time": "2016-11-14T01:06:16+00:00"
+ "time": "2017-06-09T14:24:12+00:00"
},
{
"name": "symfony/polyfill-php55",
- "version": "v1.3.0",
+ "version": "v1.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php55.git",
- "reference": "03e3f0350bca2220e3623a0e340eef194405fc67"
+ "reference": "94566239a7720cde0820f15f0cc348ddb51ba51d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/03e3f0350bca2220e3623a0e340eef194405fc67",
- "reference": "03e3f0350bca2220e3623a0e340eef194405fc67",
+ "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/94566239a7720cde0820f15f0cc348ddb51ba51d",
+ "reference": "94566239a7720cde0820f15f0cc348ddb51ba51d",
"shasum": ""
},
"require": {
@@ -1984,7 +1984,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3-dev"
+ "dev-master": "1.4-dev"
}
},
"autoload": {
@@ -2017,20 +2017,20 @@
"portable",
"shim"
],
- "time": "2016-11-14T01:06:16+00:00"
+ "time": "2017-06-09T08:25:21+00:00"
},
{
"name": "symfony/polyfill-php56",
- "version": "v1.3.0",
+ "version": "v1.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php56.git",
- "reference": "1dd42b9b89556f18092f3d1ada22cb05ac85383c"
+ "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/1dd42b9b89556f18092f3d1ada22cb05ac85383c",
- "reference": "1dd42b9b89556f18092f3d1ada22cb05ac85383c",
+ "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/bc0b7d6cb36b10cfabb170a3e359944a95174929",
+ "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929",
"shasum": ""
},
"require": {
@@ -2040,7 +2040,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3-dev"
+ "dev-master": "1.4-dev"
}
},
"autoload": {
@@ -2073,20 +2073,20 @@
"portable",
"shim"
],
- "time": "2016-11-14T01:06:16+00:00"
+ "time": "2017-06-09T08:25:21+00:00"
},
{
"name": "symfony/polyfill-util",
- "version": "v1.3.0",
+ "version": "v1.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-util.git",
- "reference": "746bce0fca664ac0a575e465f65c6643faddf7fb"
+ "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/746bce0fca664ac0a575e465f65c6643faddf7fb",
- "reference": "746bce0fca664ac0a575e465f65c6643faddf7fb",
+ "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ebccbde4aad410f6438d86d7d261c6b4d2b9a51d",
+ "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d",
"shasum": ""
},
"require": {
@@ -2095,7 +2095,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3-dev"
+ "dev-master": "1.4-dev"
}
},
"autoload": {
@@ -2125,20 +2125,20 @@
"polyfill",
"shim"
],
- "time": "2016-11-14T01:06:16+00:00"
+ "time": "2017-06-09T08:25:21+00:00"
},
{
"name": "symfony/process",
- "version": "v2.8.18",
+ "version": "v2.8.25",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "41336b20b52f5fd5b42a227e394e673c8071118f"
+ "reference": "57e52a0a6a80ea0aec4fc1b785a7920a95cb88a8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/41336b20b52f5fd5b42a227e394e673c8071118f",
- "reference": "41336b20b52f5fd5b42a227e394e673c8071118f",
+ "url": "https://api.github.com/repos/symfony/process/zipball/57e52a0a6a80ea0aec4fc1b785a7920a95cb88a8",
+ "reference": "57e52a0a6a80ea0aec4fc1b785a7920a95cb88a8",
"shasum": ""
},
"require": {
@@ -2174,20 +2174,20 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2017-03-04T12:20:59+00:00"
+ "time": "2017-07-03T08:04:30+00:00"
},
{
"name": "symfony/stopwatch",
- "version": "v2.8.18",
+ "version": "v2.8.25",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
- "reference": "9e4369666d02ee9b8830da878b7f6a769eb96f4b"
+ "reference": "e02577b841394a78306d7b547701bb7bb705bad5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/stopwatch/zipball/9e4369666d02ee9b8830da878b7f6a769eb96f4b",
- "reference": "9e4369666d02ee9b8830da878b7f6a769eb96f4b",
+ "url": "https://api.github.com/repos/symfony/stopwatch/zipball/e02577b841394a78306d7b547701bb7bb705bad5",
+ "reference": "e02577b841394a78306d7b547701bb7bb705bad5",
"shasum": ""
},
"require": {
@@ -2223,20 +2223,20 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
- "time": "2017-02-18T17:06:33+00:00"
+ "time": "2017-04-12T14:07:15+00:00"
},
{
"name": "symfony/translation",
- "version": "v2.8.18",
+ "version": "v2.8.25",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "b538355bc99db2ec7cc35284ec76d92ae7d1d256"
+ "reference": "a89af885b8c6d0142c79a02ca9cc059ed25d40d8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/b538355bc99db2ec7cc35284ec76d92ae7d1d256",
- "reference": "b538355bc99db2ec7cc35284ec76d92ae7d1d256",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/a89af885b8c6d0142c79a02ca9cc059ed25d40d8",
+ "reference": "a89af885b8c6d0142c79a02ca9cc059ed25d40d8",
"shasum": ""
},
"require": {
@@ -2287,20 +2287,20 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "time": "2017-03-04T12:20:59+00:00"
+ "time": "2017-06-24T16:44:49+00:00"
},
{
"name": "symfony/validator",
- "version": "v2.8.18",
+ "version": "v2.8.25",
"source": {
"type": "git",
"url": "https://github.com/symfony/validator.git",
- "reference": "8d4bfa7ec24e70ebc28d0cea5f2702d3f1257a63"
+ "reference": "6c019627f2a69b9ab2ac41fd53102148a55af564"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/validator/zipball/8d4bfa7ec24e70ebc28d0cea5f2702d3f1257a63",
- "reference": "8d4bfa7ec24e70ebc28d0cea5f2702d3f1257a63",
+ "url": "https://api.github.com/repos/symfony/validator/zipball/6c019627f2a69b9ab2ac41fd53102148a55af564",
+ "reference": "6c019627f2a69b9ab2ac41fd53102148a55af564",
"shasum": ""
},
"require": {
@@ -2360,20 +2360,20 @@
],
"description": "Symfony Validator Component",
"homepage": "https://symfony.com",
- "time": "2017-02-28T02:24:56+00:00"
+ "time": "2017-07-03T08:04:30+00:00"
},
{
"name": "symfony/yaml",
- "version": "v2.8.18",
+ "version": "v2.8.25",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "2a7bab3c16f6f452c47818fdd08f3b1e49ffcf7d"
+ "reference": "4c29dec8d489c4e37cf87ccd7166cd0b0e6a45c5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/2a7bab3c16f6f452c47818fdd08f3b1e49ffcf7d",
- "reference": "2a7bab3c16f6f452c47818fdd08f3b1e49ffcf7d",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/4c29dec8d489c4e37cf87ccd7166cd0b0e6a45c5",
+ "reference": "4c29dec8d489c4e37cf87ccd7166cd0b0e6a45c5",
"shasum": ""
},
"require": {
@@ -2409,24 +2409,24 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2017-03-01T18:13:50+00:00"
+ "time": "2017-06-01T20:52:29+00:00"
},
{
"name": "twig/twig",
- "version": "v1.33.0",
+ "version": "v1.34.4",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "05cf49921b13f6f01d3cfdf9018cfa7a8086fd5a"
+ "reference": "f878bab48edb66ad9c6ed626bf817f60c6c096ee"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/05cf49921b13f6f01d3cfdf9018cfa7a8086fd5a",
- "reference": "05cf49921b13f6f01d3cfdf9018cfa7a8086fd5a",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/f878bab48edb66ad9c6ed626bf817f60c6c096ee",
+ "reference": "f878bab48edb66ad9c6ed626bf817f60c6c096ee",
"shasum": ""
},
"require": {
- "php": ">=5.2.7"
+ "php": ">=5.3.3"
},
"require-dev": {
"psr/container": "^1.0",
@@ -2436,12 +2436,15 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.33-dev"
+ "dev-master": "1.34-dev"
}
},
"autoload": {
"psr-0": {
"Twig_": "lib/"
+ },
+ "psr-4": {
+ "Twig\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2471,7 +2474,7 @@
"keywords": [
"templating"
],
- "time": "2017-03-22T15:40:09+00:00"
+ "time": "2017-07-04T13:19:31+00:00"
},
{
"name": "zendframework/zend-cache",
@@ -4059,16 +4062,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "4.8.35",
+ "version": "4.8.36",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "791b1a67c25af50e230f841ee7a9c6eba507dc87"
+ "reference": "46023de9a91eec7dfb06cc56cb4e260017298517"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/791b1a67c25af50e230f841ee7a9c6eba507dc87",
- "reference": "791b1a67c25af50e230f841ee7a9c6eba507dc87",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/46023de9a91eec7dfb06cc56cb4e260017298517",
+ "reference": "46023de9a91eec7dfb06cc56cb4e260017298517",
"shasum": ""
},
"require": {
@@ -4127,7 +4130,7 @@
"testing",
"xunit"
],
- "time": "2017-02-06T05:18:07+00:00"
+ "time": "2017-06-21T08:07:12+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -4251,23 +4254,23 @@
},
{
"name": "sebastian/diff",
- "version": "1.4.1",
+ "version": "1.4.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
+ "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
- "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
+ "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": "^5.3.3 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.8"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
},
"type": "library",
"extra": {
@@ -4299,7 +4302,7 @@
"keywords": [
"diff"
],
- "time": "2015-12-08T07:14:41+00:00"
+ "time": "2017-05-22T07:24:03+00:00"
},
{
"name": "sebastian/environment",
@@ -4634,16 +4637,16 @@
},
{
"name": "symfony/dependency-injection",
- "version": "v2.8.18",
+ "version": "v2.8.25",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "efdbeefa454a41154fd99a6f0489f0e9cb46c497"
+ "reference": "db8bdcfc6f54c6968756f31c8a9ea77ac10d08d7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/efdbeefa454a41154fd99a6f0489f0e9cb46c497",
- "reference": "efdbeefa454a41154fd99a6f0489f0e9cb46c497",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/db8bdcfc6f54c6968756f31c8a9ea77ac10d08d7",
+ "reference": "db8bdcfc6f54c6968756f31c8a9ea77ac10d08d7",
"shasum": ""
},
"require": {
@@ -4693,7 +4696,7 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2017-02-28T12:31:05+00:00"
+ "time": "2017-07-17T14:02:19+00:00"
}
],
"aliases": [],
diff --git a/copyright.txt b/copyright.txt
index 100905b7e4..6f77422384 100644
--- a/copyright.txt
+++ b/copyright.txt
@@ -1,9 +1,9 @@
------------------------------------------------------
-Joomla Bible Study
+Proclaim
-Copyright (C) 2016 Joomla Bible Study Team All rights reserved.
+Copyright (C) 2016 CWM Team All rights reserved.
-Joomla Bible Study is free software: you can redistribute it and/or modify
+Proclaim is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
@@ -16,7 +16,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see