diff --git a/.gitignore b/.gitignore index 0428bc4e73..d3bd6b285b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,131 +1,21 @@ # Created by .ignore support plugin (hsz.mobi) - # IntelliJ project files .idea out gen bin/ build/reports/pmd.html -com_biblestudy/admin/biblestudy.script.php -com_biblestudy/admin/biblestudy.xml com_biblestudy/media/css/site/ -composer.lock composer.phar -joomla/.gitignore -joomla/.travis.yml -joomla/CONTRIBUTING.md -joomla/LICENSE.txt -joomla/README.md -joomla/README.txt -joomla/administrator/components/ -joomla/administrator/help/ -joomla/administrator/includes/ -joomla/administrator/index.php -joomla/administrator/language/ -joomla/administrator/manifests/ -joomla/administrator/modules/ -joomla/administrator/templates/ -joomla/bin/ -joomla/build.xml -joomla/build/ -joomla/cli/ -joomla/components/ -joomla/htaccess.txt -joomla/images/ -joomla/includes/ -joomla/index.php -joomla/installation/ -joomla/language/ -joomla/layouts/ -joomla/libraries/ -joomla/media/ -joomla/modules/ -joomla/phpunit.xml.dist -joomla/plugins/ -joomla/robots.txt.dist -joomla/templates/ -joomla/tests/ -joomla/travisci-phpunit.xml -joomla/web.config.txt -vendor/autoload.php -vendor/cilex/ -vendor/composer/ -vendor/container-interop/ -vendor/doctrine/ -vendor/erusev/ -vendor/friendsofphp/ -vendor/herrera-io/ -vendor/ircmaxell/ -vendor/jms/ -vendor/justinrainbow/ -vendor/kherge/ -vendor/leafo/ -vendor/monolog/ -vendor/nikic/ -vendor/paragonie/ -vendor/pdepend/ -Would skip repository vendor/pear/versioncontrol_git -Would skip repository vendor/pear/pear_exception -vendor/pear/cache_lite -vendor/pear/console_getopt -vendor/pear/pear-core-minimal -vendor/phing/ -vendor/phpcollection/ -vendor/phpdocumentor/ -vendor/phpmailer/ -vendor/phpmd/ -vendor/phpoption/ -vendor/phpspec/ -vendor/phpunit/dbunit/.gitattributes -vendor/phpunit/dbunit/.gitignore -vendor/phpunit/dbunit/.travis.yml -vendor/phpunit/dbunit/ChangeLog.markdown -vendor/phpunit/dbunit/LICENSE -vendor/phpunit/dbunit/PHPUnit/ -vendor/phpunit/dbunit/Samples/ -vendor/phpunit/dbunit/Tests/ -vendor/phpunit/dbunit/Vagrantfile -vendor/phpunit/dbunit/build.xml -vendor/phpunit/dbunit/build/ -vendor/phpunit/dbunit/composer.json -vendor/phpunit/dbunit/dbunit.bat -vendor/phpunit/dbunit/dbunit.php -vendor/phpunit/dbunit/package.xml -vendor/phpunit/dbunit/phpunit.xml.dist -vendor/phpunit/php-code-coverage/ -vendor/phpunit/php-file-iterator/ -vendor/phpunit/php-text-template/ -vendor/phpunit/php-timer/ -vendor/phpunit/php-token-stream/ -vendor/phpunit/phpunit-mock-objects/ -vendor/phpunit/phpunit/ -vendor/pimple/ -vendor/psr/ -vendor/sebastian/ -vendor/seld/ -vendor/simplepie/simplepie/.gitignore -vendor/simplepie/simplepie/.travis.yml -vendor/simplepie/simplepie/LICENSE.txt -vendor/simplepie/simplepie/README.markdown -vendor/simplepie/simplepie/autoloader.php -vendor/simplepie/simplepie/build/ -vendor/simplepie/simplepie/compatibility_test/ -vendor/simplepie/simplepie/composer.json -vendor/simplepie/simplepie/db.sql -vendor/simplepi -e/simplepie/demo/cli_test.php -vendor/simplepie/simplepie/demo/for_the_demo/ -vendor/simplepie/simplepie/demo/index.php -vendor/simplepie/simplepie/demo/test.php -vendor/simplepie/simplepie/idn/ -vendor/simplepie/simplepie/library/ -vendor/simplepie/simplepie/phpunit.xml.dist -vendor/simplepie/simplepie/tests/ -vendor/squizlabs/ -vendor/symfony/ -vendor/twig/ -vendor/zendframework/ -vendor/zetacomponents/ -Would skip repository vendor/pear/pear_exception/ -Would skip repository vendor/pear/versioncontrol_git/ -vendor/simplepie/simplepie/demo/cli_test.php +.DS_Store +node_modules/ +/admin/biblestudy.script.php +/admin/biblestudy.xml +build/reports/cpd-code.xml +build/reports/jdepend-dependencies.svg +build/reports/jdepend-pyramid.svg +build/reports/jdepend.xml +build/reports/phpcs-checkstyle.xml +build/reports/project-size.txt +/libraries/vendor/ +composer.lock diff --git a/.travis.yml b/.travis.yml index c3a27d80f6..912d6f74f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,11 +19,6 @@ matrix: env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no" - php: 7.3 env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" - - php: nightly - env: INSTALL_APCU="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" - allow_failures: - - php: 7.3 - - php: nightly services: @@ -33,8 +28,7 @@ before_script: - composer install script: - #- libraries/vendor/bin/phpunit --configuration travisci-phpunit.xml - - if [[ $RUN_PHPCS == "yes" ]]; then bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .; fi + - if [[ $RUN_PHPCS == "yes" ]]; then libraries/vendor/bin/phpcs --report=full --ignore=*/tests/*,*/data/*,*/vendor/*,*/tmpl/* --extensions=php -p --standard=libraries/vendor/joomla/coding-standards/Joomla .; fi - if [[ $RUN_UNIT_TESTS == "yes" ]]; then libraries/vendor/bin/phpunit --configuration travisci-phpunit.xml; fi branches: diff --git a/README.md b/README.md index b3d9f77db5..b2393256bc 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ Status Master - 9.2.0 - Feb 27, 2019 + 9.2.1 + Oct 31, 2019 3.8+ diff --git a/admin/access.xml b/admin/access.xml new file mode 100644 index 0000000000..b9080c34cf --- /dev/null +++ b/admin/access.xml @@ -0,0 +1,187 @@ + + +
+ + + + + + + +
+
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+ +
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+ +
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+
+ +
+
diff --git a/com_biblestudy/admin/addons/addon.php b/admin/addons/addon.php similarity index 99% rename from com_biblestudy/admin/addons/addon.php rename to admin/addons/addon.php index 668db90269..dd26118fe2 100644 --- a/com_biblestudy/admin/addons/addon.php +++ b/admin/addons/addon.php @@ -131,7 +131,7 @@ public function getXml() * @param string $type ? * @param array $config ? * - * @return bool + * @return boolean * * @since 9.0.0 */ diff --git a/com_biblestudy/admin/addons/servers/legacy/fields/docman.php b/admin/addons/servers/legacy/fields/docman.php similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/fields/docman.php rename to admin/addons/servers/legacy/fields/docman.php diff --git a/com_biblestudy/admin/addons/servers/legacy/fields/plupload.php b/admin/addons/servers/legacy/fields/plupload.php similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/fields/plupload.php rename to admin/addons/servers/legacy/fields/plupload.php diff --git a/com_biblestudy/admin/addons/servers/legacy/fields/virtuemart.php b/admin/addons/servers/legacy/fields/virtuemart.php similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/fields/virtuemart.php rename to admin/addons/servers/legacy/fields/virtuemart.php diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/Moxie.swf b/admin/addons/servers/legacy/includes/js/Moxie.swf similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/Moxie.swf rename to admin/addons/servers/legacy/includes/js/Moxie.swf diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/Moxie.xap b/admin/addons/servers/legacy/includes/js/Moxie.xap similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/Moxie.xap rename to admin/addons/servers/legacy/includes/js/Moxie.xap diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/ar.js b/admin/addons/servers/legacy/includes/js/i18n/ar.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/ar.js rename to admin/addons/servers/legacy/includes/js/i18n/ar.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/az.js b/admin/addons/servers/legacy/includes/js/i18n/az.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/az.js rename to admin/addons/servers/legacy/includes/js/i18n/az.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/be_BY.js b/admin/addons/servers/legacy/includes/js/i18n/be_BY.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/be_BY.js rename to admin/addons/servers/legacy/includes/js/i18n/be_BY.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/bg.js b/admin/addons/servers/legacy/includes/js/i18n/bg.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/bg.js rename to admin/addons/servers/legacy/includes/js/i18n/bg.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/bs.js b/admin/addons/servers/legacy/includes/js/i18n/bs.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/bs.js rename to admin/addons/servers/legacy/includes/js/i18n/bs.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/ca.js b/admin/addons/servers/legacy/includes/js/i18n/ca.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/ca.js rename to admin/addons/servers/legacy/includes/js/i18n/ca.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/cs.js b/admin/addons/servers/legacy/includes/js/i18n/cs.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/cs.js rename to admin/addons/servers/legacy/includes/js/i18n/cs.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/cy.js b/admin/addons/servers/legacy/includes/js/i18n/cy.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/cy.js rename to admin/addons/servers/legacy/includes/js/i18n/cy.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/da.js b/admin/addons/servers/legacy/includes/js/i18n/da.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/da.js rename to admin/addons/servers/legacy/includes/js/i18n/da.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/de.js b/admin/addons/servers/legacy/includes/js/i18n/de.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/de.js rename to admin/addons/servers/legacy/includes/js/i18n/de.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/el.js b/admin/addons/servers/legacy/includes/js/i18n/el.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/el.js rename to admin/addons/servers/legacy/includes/js/i18n/el.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/en.js b/admin/addons/servers/legacy/includes/js/i18n/en.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/en.js rename to admin/addons/servers/legacy/includes/js/i18n/en.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/es.js b/admin/addons/servers/legacy/includes/js/i18n/es.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/es.js rename to admin/addons/servers/legacy/includes/js/i18n/es.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/et.js b/admin/addons/servers/legacy/includes/js/i18n/et.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/et.js rename to admin/addons/servers/legacy/includes/js/i18n/et.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/fa.js b/admin/addons/servers/legacy/includes/js/i18n/fa.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/fa.js rename to admin/addons/servers/legacy/includes/js/i18n/fa.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/fi.js b/admin/addons/servers/legacy/includes/js/i18n/fi.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/fi.js rename to admin/addons/servers/legacy/includes/js/i18n/fi.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/fr.js b/admin/addons/servers/legacy/includes/js/i18n/fr.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/fr.js rename to admin/addons/servers/legacy/includes/js/i18n/fr.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/he.js b/admin/addons/servers/legacy/includes/js/i18n/he.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/he.js rename to admin/addons/servers/legacy/includes/js/i18n/he.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/hr.js b/admin/addons/servers/legacy/includes/js/i18n/hr.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/hr.js rename to admin/addons/servers/legacy/includes/js/i18n/hr.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/hu.js b/admin/addons/servers/legacy/includes/js/i18n/hu.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/hu.js rename to admin/addons/servers/legacy/includes/js/i18n/hu.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/hy.js b/admin/addons/servers/legacy/includes/js/i18n/hy.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/hy.js rename to admin/addons/servers/legacy/includes/js/i18n/hy.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/id.js b/admin/addons/servers/legacy/includes/js/i18n/id.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/id.js rename to admin/addons/servers/legacy/includes/js/i18n/id.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/it.js b/admin/addons/servers/legacy/includes/js/i18n/it.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/it.js rename to admin/addons/servers/legacy/includes/js/i18n/it.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/ja.js b/admin/addons/servers/legacy/includes/js/i18n/ja.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/ja.js rename to admin/addons/servers/legacy/includes/js/i18n/ja.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/ka.js b/admin/addons/servers/legacy/includes/js/i18n/ka.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/ka.js rename to admin/addons/servers/legacy/includes/js/i18n/ka.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/kk.js b/admin/addons/servers/legacy/includes/js/i18n/kk.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/kk.js rename to admin/addons/servers/legacy/includes/js/i18n/kk.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/km.js b/admin/addons/servers/legacy/includes/js/i18n/km.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/km.js rename to admin/addons/servers/legacy/includes/js/i18n/km.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/ko.js b/admin/addons/servers/legacy/includes/js/i18n/ko.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/ko.js rename to admin/addons/servers/legacy/includes/js/i18n/ko.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/ku_IQ.js b/admin/addons/servers/legacy/includes/js/i18n/ku_IQ.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/ku_IQ.js rename to admin/addons/servers/legacy/includes/js/i18n/ku_IQ.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/lt.js b/admin/addons/servers/legacy/includes/js/i18n/lt.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/lt.js rename to admin/addons/servers/legacy/includes/js/i18n/lt.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/lv.js b/admin/addons/servers/legacy/includes/js/i18n/lv.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/lv.js rename to admin/addons/servers/legacy/includes/js/i18n/lv.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/ms.js b/admin/addons/servers/legacy/includes/js/i18n/ms.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/ms.js rename to admin/addons/servers/legacy/includes/js/i18n/ms.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/nl.js b/admin/addons/servers/legacy/includes/js/i18n/nl.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/nl.js rename to admin/addons/servers/legacy/includes/js/i18n/nl.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/pl.js b/admin/addons/servers/legacy/includes/js/i18n/pl.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/pl.js rename to admin/addons/servers/legacy/includes/js/i18n/pl.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/pt_BR.js b/admin/addons/servers/legacy/includes/js/i18n/pt_BR.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/pt_BR.js rename to admin/addons/servers/legacy/includes/js/i18n/pt_BR.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/ro.js b/admin/addons/servers/legacy/includes/js/i18n/ro.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/ro.js rename to admin/addons/servers/legacy/includes/js/i18n/ro.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/ru.js b/admin/addons/servers/legacy/includes/js/i18n/ru.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/ru.js rename to admin/addons/servers/legacy/includes/js/i18n/ru.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/sk.js b/admin/addons/servers/legacy/includes/js/i18n/sk.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/sk.js rename to admin/addons/servers/legacy/includes/js/i18n/sk.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/sq.js b/admin/addons/servers/legacy/includes/js/i18n/sq.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/sq.js rename to admin/addons/servers/legacy/includes/js/i18n/sq.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/sr.js b/admin/addons/servers/legacy/includes/js/i18n/sr.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/sr.js rename to admin/addons/servers/legacy/includes/js/i18n/sr.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/sv.js b/admin/addons/servers/legacy/includes/js/i18n/sv.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/sv.js rename to admin/addons/servers/legacy/includes/js/i18n/sv.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/th_TH.js b/admin/addons/servers/legacy/includes/js/i18n/th_TH.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/th_TH.js rename to admin/addons/servers/legacy/includes/js/i18n/th_TH.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/tr.js b/admin/addons/servers/legacy/includes/js/i18n/tr.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/tr.js rename to admin/addons/servers/legacy/includes/js/i18n/tr.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/uk_UA.js b/admin/addons/servers/legacy/includes/js/i18n/uk_UA.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/uk_UA.js rename to admin/addons/servers/legacy/includes/js/i18n/uk_UA.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/vi.js b/admin/addons/servers/legacy/includes/js/i18n/vi.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/vi.js rename to admin/addons/servers/legacy/includes/js/i18n/vi.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/zh_CN.js b/admin/addons/servers/legacy/includes/js/i18n/zh_CN.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/zh_CN.js rename to admin/addons/servers/legacy/includes/js/i18n/zh_CN.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/zh_TW.js b/admin/addons/servers/legacy/includes/js/i18n/zh_TW.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/i18n/zh_TW.js rename to admin/addons/servers/legacy/includes/js/i18n/zh_TW.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/css/jquery.plupload.queue.css b/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/css/jquery.plupload.queue.css similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/css/jquery.plupload.queue.css rename to admin/addons/servers/legacy/includes/js/jquery.plupload.queue/css/jquery.plupload.queue.css diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/backgrounds.gif b/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/backgrounds.gif similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/backgrounds.gif rename to admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/backgrounds.gif diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/buttons-disabled.png b/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/buttons-disabled.png similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/buttons-disabled.png rename to admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/buttons-disabled.png diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/buttons.png b/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/buttons.png similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/buttons.png rename to admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/buttons.png diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/delete.gif b/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/delete.gif similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/delete.gif rename to admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/delete.gif diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/done.gif b/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/done.gif similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/done.gif rename to admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/done.gif diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/error.gif b/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/error.gif similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/error.gif rename to admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/error.gif diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/throbber.gif b/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/throbber.gif similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/throbber.gif rename to admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/throbber.gif diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/transp50.png b/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/transp50.png similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/transp50.png rename to admin/addons/servers/legacy/includes/js/jquery.plupload.queue/img/transp50.png diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/jquery.plupload.queue.js b/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/jquery.plupload.queue.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/jquery.plupload.queue.js rename to admin/addons/servers/legacy/includes/js/jquery.plupload.queue/jquery.plupload.queue.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/jquery.plupload.queue.min.js b/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/jquery.plupload.queue.min.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.plupload.queue/jquery.plupload.queue.min.js rename to admin/addons/servers/legacy/includes/js/jquery.plupload.queue/jquery.plupload.queue.min.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/css/jquery.ui.plupload.css b/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/css/jquery.ui.plupload.css similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/css/jquery.ui.plupload.css rename to admin/addons/servers/legacy/includes/js/jquery.ui.plupload/css/jquery.ui.plupload.css diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/img/loading.gif b/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/img/loading.gif similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/img/loading.gif rename to admin/addons/servers/legacy/includes/js/jquery.ui.plupload/img/loading.gif diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/img/plupload.png b/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/img/plupload.png similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/img/plupload.png rename to admin/addons/servers/legacy/includes/js/jquery.ui.plupload/img/plupload.png diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/jquery.ui.plupload.js b/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/jquery.ui.plupload.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/jquery.ui.plupload.js rename to admin/addons/servers/legacy/includes/js/jquery.ui.plupload/jquery.ui.plupload.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/jquery.ui.plupload.min.js b/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/jquery.ui.plupload.min.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/jquery.ui.plupload/jquery.ui.plupload.min.js rename to admin/addons/servers/legacy/includes/js/jquery.ui.plupload/jquery.ui.plupload.min.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/legacy.js b/admin/addons/servers/legacy/includes/js/legacy.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/legacy.js rename to admin/addons/servers/legacy/includes/js/legacy.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/moxie.js b/admin/addons/servers/legacy/includes/js/moxie.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/moxie.js rename to admin/addons/servers/legacy/includes/js/moxie.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/moxie.min.js b/admin/addons/servers/legacy/includes/js/moxie.min.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/moxie.min.js rename to admin/addons/servers/legacy/includes/js/moxie.min.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/plupload.dev.js b/admin/addons/servers/legacy/includes/js/plupload.dev.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/plupload.dev.js rename to admin/addons/servers/legacy/includes/js/plupload.dev.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/plupload.full.min.js b/admin/addons/servers/legacy/includes/js/plupload.full.min.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/plupload.full.min.js rename to admin/addons/servers/legacy/includes/js/plupload.full.min.js diff --git a/com_biblestudy/admin/addons/servers/legacy/includes/js/plupload.min.js b/admin/addons/servers/legacy/includes/js/plupload.min.js similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/includes/js/plupload.min.js rename to admin/addons/servers/legacy/includes/js/plupload.min.js diff --git a/com_biblestudy/admin/addons/servers/legacy/language/en-GB/en-GB.jbs_addon_legacy.ini b/admin/addons/servers/legacy/language/en-GB/en-GB.jbs_addon_legacy.ini similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/language/en-GB/en-GB.jbs_addon_legacy.ini rename to admin/addons/servers/legacy/language/en-GB/en-GB.jbs_addon_legacy.ini diff --git a/com_biblestudy/admin/addons/servers/legacy/legacy.php b/admin/addons/servers/legacy/legacy.php similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/legacy.php rename to admin/addons/servers/legacy/legacy.php diff --git a/com_biblestudy/admin/addons/servers/legacy/legacy.png b/admin/addons/servers/legacy/legacy.png similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/legacy.png rename to admin/addons/servers/legacy/legacy.png diff --git a/com_biblestudy/admin/addons/servers/legacy/legacy.xml b/admin/addons/servers/legacy/legacy.xml similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/legacy.xml rename to admin/addons/servers/legacy/legacy.xml diff --git a/com_biblestudy/admin/addons/servers/legacy/media.xml b/admin/addons/servers/legacy/media.xml similarity index 100% rename from com_biblestudy/admin/addons/servers/legacy/media.xml rename to admin/addons/servers/legacy/media.xml diff --git a/com_biblestudy/admin/addons/servers/local/fields/jbsmmedia.php b/admin/addons/servers/local/fields/jbsmmedia.php similarity index 100% rename from com_biblestudy/admin/addons/servers/local/fields/jbsmmedia.php rename to admin/addons/servers/local/fields/jbsmmedia.php diff --git a/com_biblestudy/admin/addons/servers/local/fields/plupload.php b/admin/addons/servers/local/fields/plupload.php similarity index 100% rename from com_biblestudy/admin/addons/servers/local/fields/plupload.php rename to admin/addons/servers/local/fields/plupload.php diff --git a/com_biblestudy/admin/addons/servers/local/language/en-GB/en-GB.jbs_addon_local.ini b/admin/addons/servers/local/language/en-GB/en-GB.jbs_addon_local.ini similarity index 100% rename from com_biblestudy/admin/addons/servers/local/language/en-GB/en-GB.jbs_addon_local.ini rename to admin/addons/servers/local/language/en-GB/en-GB.jbs_addon_local.ini diff --git a/com_biblestudy/admin/addons/servers/local/local.php b/admin/addons/servers/local/language/local.php similarity index 100% rename from com_biblestudy/admin/addons/servers/local/local.php rename to admin/addons/servers/local/language/local.php diff --git a/admin/addons/servers/local/local.php b/admin/addons/servers/local/local.php new file mode 100644 index 0000000000..4f810ca79e --- /dev/null +++ b/admin/addons/servers/local/local.php @@ -0,0 +1,137 @@ +upload($data); + } + + /** + * Render Fields for general view. + * + * @param object $media_form Midea files form + * @param bool $new If media is new + * + * @return string + * + * @since 9.1.3 + */ + public function renderGeneral($media_form, $new) + { + $html = ''; + $fields = $media_form->getFieldset('general'); + + if ($fields) + { + foreach ($media_form->getFieldset('general') as $field): + $html .= '
'; + $html .= '
'; + $html .= $field->label; + $html .= '
'; + $html .= '
'; + + // Way to set defaults on new media + if ($new) + { + $s_name = $field->fieldname; + + if (isset($media_form->s_params[$s_name])) + { + $field->setValue($media_form->s_params[$s_name]); + } + } + + $html .= $field->input; + $html .= '
'; + $html .= '
'; + endforeach; + } + + return $html; + } + + /** + * Render Layout and fields + * + * @param object $media_form Midea files form + * @param bool $new If media is new + * + * @return string + * + * @since 9.1.3 + */ + public function render($media_form, $new) + { + $html = ''; + + $html .= JHtml::_('bootstrap.addTab', 'myTab', 'options', JText::_('Options')); + + $html .= '
'; + + foreach ($media_form->getFieldsets('params') as $name => $fieldset) + { + if ($name !== 'general') + { + $html .= '
'; + + foreach ($media_form->getFieldset($name) as $field): + $html .= '
'; + $html .= '
'; + $html .= $field->label; + $html .= '
'; + $html .= '
'; + + // Way to set defaults on new media + if ($new) + { + $s_name = $field->fieldname; + + if (isset($media_form->s_params[$s_name])) + { + $field->setValue($media_form->s_params[$s_name]); + } + } + + $html .= $field->input; + $html .= '
'; + $html .= '
'; + endforeach; + + $html .= '
'; + } + } + + $html .= '
'; + $html .= JHtml::_('bootstrap.endTab'); + + return $html; + } +} diff --git a/com_biblestudy/admin/addons/servers/local/local.png b/admin/addons/servers/local/local.png similarity index 100% rename from com_biblestudy/admin/addons/servers/local/local.png rename to admin/addons/servers/local/local.png diff --git a/com_biblestudy/admin/addons/servers/local/local.xml b/admin/addons/servers/local/local.xml similarity index 100% rename from com_biblestudy/admin/addons/servers/local/local.xml rename to admin/addons/servers/local/local.xml diff --git a/com_biblestudy/admin/addons/servers/local/media.xml b/admin/addons/servers/local/media.xml similarity index 100% rename from com_biblestudy/admin/addons/servers/local/media.xml rename to admin/addons/servers/local/media.xml diff --git a/com_biblestudy/admin/addons/servers/server.php b/admin/addons/servers/server.php similarity index 100% rename from com_biblestudy/admin/addons/servers/server.php rename to admin/addons/servers/server.php diff --git a/com_biblestudy/admin/addons/servers/youtube/language/en-GB/en-GB.jbs_addon_youtube.ini b/admin/addons/servers/youtube/language/en-GB/en-GB.jbs_addon_youtube.ini similarity index 100% rename from com_biblestudy/admin/addons/servers/youtube/language/en-GB/en-GB.jbs_addon_youtube.ini rename to admin/addons/servers/youtube/language/en-GB/en-GB.jbs_addon_youtube.ini diff --git a/com_biblestudy/admin/addons/servers/youtube/media.xml b/admin/addons/servers/youtube/media.xml similarity index 100% rename from com_biblestudy/admin/addons/servers/youtube/media.xml rename to admin/addons/servers/youtube/media.xml diff --git a/com_biblestudy/admin/addons/servers/youtube/youtube.php b/admin/addons/servers/youtube/youtube.php similarity index 100% rename from com_biblestudy/admin/addons/servers/youtube/youtube.php rename to admin/addons/servers/youtube/youtube.php diff --git a/com_biblestudy/admin/addons/servers/youtube/youtube.png b/admin/addons/servers/youtube/youtube.png similarity index 100% rename from com_biblestudy/admin/addons/servers/youtube/youtube.png rename to admin/addons/servers/youtube/youtube.png diff --git a/com_biblestudy/admin/addons/servers/youtube/youtube.xml b/admin/addons/servers/youtube/youtube.xml similarity index 100% rename from com_biblestudy/admin/addons/servers/youtube/youtube.xml rename to admin/addons/servers/youtube/youtube.xml diff --git a/com_biblestudy/admin/api.php b/admin/api.php similarity index 99% rename from com_biblestudy/admin/api.php rename to admin/api.php index 5881cb7363..1640253737 100644 --- a/com_biblestudy/admin/api.php +++ b/admin/api.php @@ -19,7 +19,7 @@ define('JBSM_PROFILER', 0); // Version information -define('BIBLESTUDY_VERSION', '9.1.7'); +define('BIBLESTUDY_VERSION', '9.2.1'); define('BIBLESTUDY_VERSION_UPDATEFILE', 'JBS Version ' . BIBLESTUDY_VERSION); // Default values diff --git a/com_biblestudy/admin/biblestudy.php b/admin/biblestudy.php similarity index 100% rename from com_biblestudy/admin/biblestudy.php rename to admin/biblestudy.php diff --git a/com_biblestudy/admin/config.xml b/admin/config.xml similarity index 100% rename from com_biblestudy/admin/config.xml rename to admin/config.xml diff --git a/com_biblestudy/admin/controller.php b/admin/controller.php similarity index 98% rename from com_biblestudy/admin/controller.php rename to admin/controller.php index c31dee2620..798763f6b1 100644 --- a/com_biblestudy/admin/controller.php +++ b/admin/controller.php @@ -44,7 +44,7 @@ class BiblestudyController extends JControllerLegacy * @return JControllerLegacy his object to support chaining. * * @since 1.5 - * @throws \Exception + * @throws Exception */ public function display($cachable = false, $urlparams = false) { diff --git a/com_biblestudy/admin/controllers/admin.php b/admin/controllers/admin.php similarity index 99% rename from com_biblestudy/admin/controllers/admin.php rename to admin/controllers/admin.php index d8203154bb..11dc168a5f 100644 --- a/com_biblestudy/admin/controllers/admin.php +++ b/admin/controllers/admin.php @@ -10,7 +10,7 @@ defined('_JEXEC') or die; -use \Joomla\Registry\Registry; +use Joomla\Registry\Registry; jimport('joomla.filesystem.folder'); @@ -35,8 +35,8 @@ class BiblestudyControllerAdmin extends JControllerForm * * @return void * + * @throws Exception * @since 7.0.0 - * @throws \Exception */ public function tools() { @@ -567,8 +567,8 @@ public function convertPreachIt() * * @return void * - * @since 7.1.0 - * @throws \Exception + * @since 7.1.0 + * @throws Exception */ public function fix() { @@ -589,8 +589,8 @@ public function fix() * * @return void * + * @throws Exception * @since 7.1.0 - * @throws \Exception */ public function dbReset() { @@ -633,8 +633,8 @@ public function aliasUpdate() * * @return void * + * @throws Exception * @since 7.0.0 - * @throws \Exception */ public function doimport($parent = true) { @@ -689,8 +689,8 @@ public function doimport($parent = true) * * @return boolean * + * @throws Exception * @since 7.0.0 - * @throws \Exception */ public function copyTables($oldprefix) { @@ -743,8 +743,8 @@ public function copyTables($oldprefix) * * @return void * + * @throws Exception * @since 7.1.0 - * @throws \Exception */ public function import() { diff --git a/com_biblestudy/admin/controllers/assets.php b/admin/controllers/assets.php similarity index 100% rename from com_biblestudy/admin/controllers/assets.php rename to admin/controllers/assets.php diff --git a/com_biblestudy/admin/controllers/comment.php b/admin/controllers/comment.php similarity index 100% rename from com_biblestudy/admin/controllers/comment.php rename to admin/controllers/comment.php diff --git a/com_biblestudy/admin/controllers/comments.php b/admin/controllers/comments.php similarity index 100% rename from com_biblestudy/admin/controllers/comments.php rename to admin/controllers/comments.php diff --git a/com_biblestudy/admin/controllers/cpanel.php b/admin/controllers/cpanel.php similarity index 100% rename from com_biblestudy/admin/controllers/cpanel.php rename to admin/controllers/cpanel.php diff --git a/com_biblestudy/admin/controllers/install.php b/admin/controllers/install.php similarity index 100% rename from com_biblestudy/admin/controllers/install.php rename to admin/controllers/install.php diff --git a/com_biblestudy/admin/controllers/location.php b/admin/controllers/location.php similarity index 100% rename from com_biblestudy/admin/controllers/location.php rename to admin/controllers/location.php diff --git a/com_biblestudy/admin/controllers/locations.php b/admin/controllers/locations.php similarity index 100% rename from com_biblestudy/admin/controllers/locations.php rename to admin/controllers/locations.php diff --git a/com_biblestudy/admin/controllers/mediafile.php b/admin/controllers/mediafile.php similarity index 97% rename from com_biblestudy/admin/controllers/mediafile.php rename to admin/controllers/mediafile.php index 4621eb78b8..f11e0988e1 100644 --- a/com_biblestudy/admin/controllers/mediafile.php +++ b/admin/controllers/mediafile.php @@ -38,8 +38,8 @@ class BiblestudyControllerMediafile extends JControllerForm * * @return mixed True if the record can be added, a error object if not. * + * @throws Exception * @since 12.2 - * @throws \Exception */ public function add() { @@ -65,8 +65,8 @@ public function add() * * @return bool * + * @throws Exception * @since 9.0.0 - * @throws \Exception */ public function edit($key = null, $urlVar = null) { @@ -142,8 +142,8 @@ public function batch($model = null) * * @return boolean True if access level checks pass, false otherwise. * + * @throws Exception * @since 12.2 - * @throws \Exception */ public function cancel($key = null) { @@ -202,8 +202,8 @@ public function cancel($key = null) * * @return void * + * @throws Exception * @since 9.0.0 - * @throws \Exception */ public function setServer() { @@ -235,15 +235,15 @@ public function setServer() * * @return void * + * @throws Exception * @since 3.1 - * @throws \Exception */ protected function postSaveHook(JModelLegacy $model, $validData = array()) { $return = $this->input->getCmd('return'); $task = $this->input->get('task'); - if ($return && $task != 'apply') + if ($return && $task !== 'apply') { JFactory::getApplication()->enqueueMessage(JText::_('JBS_MED_SAVE'), 'message'); $this->setRedirect(base64_decode($return)); diff --git a/com_biblestudy/admin/controllers/mediafiles.php b/admin/controllers/mediafiles.php similarity index 100% rename from com_biblestudy/admin/controllers/mediafiles.php rename to admin/controllers/mediafiles.php diff --git a/com_biblestudy/admin/controllers/message.php b/admin/controllers/message.php similarity index 100% rename from com_biblestudy/admin/controllers/message.php rename to admin/controllers/message.php diff --git a/com_biblestudy/admin/controllers/messages.php b/admin/controllers/messages.php similarity index 100% rename from com_biblestudy/admin/controllers/messages.php rename to admin/controllers/messages.php diff --git a/com_biblestudy/admin/controllers/messagetype.php b/admin/controllers/messagetype.php similarity index 100% rename from com_biblestudy/admin/controllers/messagetype.php rename to admin/controllers/messagetype.php diff --git a/com_biblestudy/admin/controllers/messagetypes.php b/admin/controllers/messagetypes.php similarity index 100% rename from com_biblestudy/admin/controllers/messagetypes.php rename to admin/controllers/messagetypes.php diff --git a/com_biblestudy/admin/controllers/podcast.php b/admin/controllers/podcast.php similarity index 100% rename from com_biblestudy/admin/controllers/podcast.php rename to admin/controllers/podcast.php diff --git a/com_biblestudy/admin/controllers/podcasts.php b/admin/controllers/podcasts.php similarity index 100% rename from com_biblestudy/admin/controllers/podcasts.php rename to admin/controllers/podcasts.php diff --git a/com_biblestudy/admin/controllers/serie.php b/admin/controllers/serie.php similarity index 100% rename from com_biblestudy/admin/controllers/serie.php rename to admin/controllers/serie.php diff --git a/com_biblestudy/admin/controllers/series.php b/admin/controllers/series.php similarity index 100% rename from com_biblestudy/admin/controllers/series.php rename to admin/controllers/series.php diff --git a/com_biblestudy/admin/controllers/server.php b/admin/controllers/server.php similarity index 100% rename from com_biblestudy/admin/controllers/server.php rename to admin/controllers/server.php diff --git a/com_biblestudy/admin/controllers/servers.php b/admin/controllers/servers.php similarity index 100% rename from com_biblestudy/admin/controllers/servers.php rename to admin/controllers/servers.php diff --git a/com_biblestudy/admin/controllers/teacher.php b/admin/controllers/teacher.php similarity index 100% rename from com_biblestudy/admin/controllers/teacher.php rename to admin/controllers/teacher.php diff --git a/com_biblestudy/admin/controllers/teachers.php b/admin/controllers/teachers.php similarity index 100% rename from com_biblestudy/admin/controllers/teachers.php rename to admin/controllers/teachers.php diff --git a/com_biblestudy/admin/controllers/template.php b/admin/controllers/template.php similarity index 100% rename from com_biblestudy/admin/controllers/template.php rename to admin/controllers/template.php diff --git a/com_biblestudy/admin/controllers/templatecode.php b/admin/controllers/templatecode.php similarity index 100% rename from com_biblestudy/admin/controllers/templatecode.php rename to admin/controllers/templatecode.php diff --git a/com_biblestudy/admin/controllers/templatecodes.php b/admin/controllers/templatecodes.php similarity index 100% rename from com_biblestudy/admin/controllers/templatecodes.php rename to admin/controllers/templatecodes.php diff --git a/com_biblestudy/admin/controllers/templates.php b/admin/controllers/templates.php similarity index 98% rename from com_biblestudy/admin/controllers/templates.php rename to admin/controllers/templates.php index 838d6b974e..6344884db3 100644 --- a/com_biblestudy/admin/controllers/templates.php +++ b/admin/controllers/templates.php @@ -10,7 +10,7 @@ // No Direct Access defined('_JEXEC') or die; -use \Joomla\Registry\Registry; +use Joomla\Registry\Registry; /** * Controller for Templates @@ -27,7 +27,7 @@ class BiblestudyControllerTemplates extends JControllerAdmin * @param string $prefix The prefix for the PHP class name * @param array $config Configuration array for model. Optional. * - * @return bool|JModelLegacy + * @return boolean|JModelLegacy * * @since 7.0.0 */ @@ -41,7 +41,7 @@ public function getModel($name = 'Template', $prefix = 'BiblestudyModel', $confi /** * Import Template * - * @return bool|JControllerLegacy + * @return boolean|JControllerLegacy * * @since 8.0 */ @@ -297,7 +297,7 @@ private function performDB($query) /** * Export the Template * - * @return bool|JControllerLegacy + * @return boolean|JControllerLegacy * * @since 8.0 */ diff --git a/com_biblestudy/admin/controllers/topic.php b/admin/controllers/topic.php similarity index 100% rename from com_biblestudy/admin/controllers/topic.php rename to admin/controllers/topic.php diff --git a/com_biblestudy/admin/controllers/topics.php b/admin/controllers/topics.php similarity index 100% rename from com_biblestudy/admin/controllers/topics.php rename to admin/controllers/topics.php diff --git a/com_biblestudy/admin/controllers/upload.php b/admin/controllers/upload.php similarity index 100% rename from com_biblestudy/admin/controllers/upload.php rename to admin/controllers/upload.php diff --git a/admin/help/en-GB/biblestudy.html b/admin/help/en-GB/biblestudy.html new file mode 100644 index 0000000000..fa88e7ee0d --- /dev/null +++ b/admin/help/en-GB/biblestudy.html @@ -0,0 +1,8 @@ +
Proclaim Help Screen
+

All help has been moved to our documentation site: +

+ Find + answers here
Also + visit our forum +

diff --git a/admin/help/en-GB/templatecodehelp.html b/admin/help/en-GB/templatecodehelp.html new file mode 100644 index 0000000000..9e2dc13220 --- /dev/null +++ b/admin/help/en-GB/templatecodehelp.html @@ -0,0 +1,508 @@ + + + + + Template Code Helper + + + + + +

Template Code Helper (click field to select)

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Studies Codes (for all views)
To get the list, see each view
Title
Study Number
Description
Date
Id
Scripture 1
Scripture 2
Title
Media
Duration
Topics
Study Thumbnail
Series Thumbnail
Secondary Reference
Link to Details View
Topics
Teacher Name
Teacher Title
Teacher Image
Topics
Hits
Submitted By
Slug
Total Plays
Total Downloads
Location
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Sermon List Codes
List Introduction
Popular Study Drop Down
Go Button
Teachers Dropdown
Series Dropdown
Message Types Dropdown
Years Dropdown
Locations Dropdown
Topics Dropdown
Books Dropdown
Languages Dropdown
Order (Asc, Desc) Dropdown
Pagination links;
Pagination Limit Box
Pagination array
Sample Code
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Sermon Display Codes (Plus any studies code)
Print Button
Social Media Box
Study Text
Main Reference Passage
Related Studies Drop Down
Sample Code
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Series List Codes (plus Series Display Codes below)
To get each series +
Link to each series
Series Image
Series Drop down box
Main Series Page Image
Footer Pagination Links
Series Title
Series Teacher Image
Series Description
Series Teacher Name
Series Teacher Title
Series Teacher Image
Sample Code
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Series Display Codes
Series Title
Series Thumbnail
Series Studies +
Series Description
Series Teacher Name
Series Teacher Title
Series Teacher Image
Sample Code
+
+
+ +
+ + + + + + + + + + + + + + + + + + +
Teacher List Codes (plus Teacher Display Codes below)
Each Teacher's Information +
Link to each teacher
Teacher Image
Sample Code
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Teacher Display Codes
Teacher Thumbnail
Large Teacher Image
Teacher's Studies
Teacher Title
Teacher Phone
Teacher Email
Teacher Website
Teacher Introduction
Teacher Long Information
Teacher Address
Teacher Facebook URL
Teacher Twitter URL
Teacher Blog URL
Teacher Web Link1 URL
Teacher Web Link1 Label
Teacher Web Link2 URL
Teacher Web Link2 Label
Teacher Web Link3 URL
Teacher Web Link3 Label
+
+
+ + + + + + + + + + + +
Module Codes (Plus any Studies Code from above)
Link to more studies
Sample Code
+
+
+ + diff --git a/com_biblestudy/admin/helpers/alias.php b/admin/helpers/alias.php similarity index 100% rename from com_biblestudy/admin/helpers/alias.php rename to admin/helpers/alias.php diff --git a/com_biblestudy/admin/helpers/biblestudyhelper.php b/admin/helpers/biblestudyhelper.php similarity index 99% rename from com_biblestudy/admin/helpers/biblestudyhelper.php rename to admin/helpers/biblestudyhelper.php index fb5272856d..caf1129c7e 100644 --- a/com_biblestudy/admin/helpers/biblestudyhelper.php +++ b/admin/helpers/biblestudyhelper.php @@ -696,7 +696,7 @@ public static function array_sort_by_column(&$arr, $col, $dir = SORT_ASC) * * @return void * - * @throws \Exception + * @throws Exception * * @since 1.5 */ @@ -713,7 +713,7 @@ public static function stop($msg = '') * @param string $haystack String to search. * @param string $needle What to search for. * - * @return bool + * @return boolean * * @since 1.5 */ @@ -729,7 +729,7 @@ public static function startsWith($haystack, $needle) * @param string $haystack String to search. * @param string $needle What to search for. * - * @return bool + * @return boolean * * @since 1.5 */ diff --git a/com_biblestudy/admin/helpers/dbhelper.php b/admin/helpers/dbhelper.php similarity index 98% rename from com_biblestudy/admin/helpers/dbhelper.php rename to admin/helpers/dbhelper.php index 8d00fbd752..9d930c0b36 100644 --- a/com_biblestudy/admin/helpers/dbhelper.php +++ b/admin/helpers/dbhelper.php @@ -33,7 +33,7 @@ class JBSMDbHelper * * @param string $cktable Table to check for exp:"#__bsms_admin * - * @return bool If table is there True else False if not. + * @return boolean If table is there True else False if not. * * @since 7.0 */ @@ -65,8 +65,8 @@ public static function checkIfTable($cktable) * * @return boolean * + * @throws Exception * @since 7.0 - * @throws \Exception */ public static function alterDB($tables, $from = null) { @@ -346,8 +346,8 @@ public static function getInstallState() * * @return boolean * + * @throws Exception * @since 7.1.0 - * @throws \Exception */ public static function fixupcss($filename, $parent, $newcss, $id = null) { @@ -465,8 +465,8 @@ public static function reloadtable($result, $table = 'Style') * * @return boolean|int * + * @throws Exception * @since 7.0 - * @throws \Exception */ public static function resetdb($install = false) { @@ -549,11 +549,11 @@ public static function resetdb($install = false) /** * Clean up Study Topics Duplicates * - * @since 8.0.0 - * * @return void * - * @throws \Exception + * @throws Exception + * @since 8.0.0 + * */ public static function CleanStudyTopics() { diff --git a/com_biblestudy/admin/helpers/defaulttemplatecode.php b/admin/helpers/defaulttemplatecode.php similarity index 100% rename from com_biblestudy/admin/helpers/defaulttemplatecode.php rename to admin/helpers/defaulttemplatecode.php diff --git a/com_biblestudy/admin/helpers/helper.php b/admin/helpers/helper.php similarity index 100% rename from com_biblestudy/admin/helpers/helper.php rename to admin/helpers/helper.php diff --git a/com_biblestudy/admin/helpers/html/biblestudy.php b/admin/helpers/html/biblestudy.php similarity index 100% rename from com_biblestudy/admin/helpers/html/biblestudy.php rename to admin/helpers/html/biblestudy.php diff --git a/com_biblestudy/admin/helpers/html/bsmedia.php b/admin/helpers/html/bsmedia.php similarity index 100% rename from com_biblestudy/admin/helpers/html/bsmedia.php rename to admin/helpers/html/bsmedia.php diff --git a/com_biblestudy/admin/helpers/html/fancybox.php b/admin/helpers/html/fancybox.php similarity index 100% rename from com_biblestudy/admin/helpers/html/fancybox.php rename to admin/helpers/html/fancybox.php diff --git a/com_biblestudy/admin/helpers/html/icon.php b/admin/helpers/html/icon.php similarity index 100% rename from com_biblestudy/admin/helpers/html/icon.php rename to admin/helpers/html/icon.php diff --git a/com_biblestudy/admin/helpers/html/jwplayer.php b/admin/helpers/html/jwplayer.php similarity index 100% rename from com_biblestudy/admin/helpers/html/jwplayer.php rename to admin/helpers/html/jwplayer.php diff --git a/com_biblestudy/admin/helpers/image.php b/admin/helpers/image.php similarity index 100% rename from com_biblestudy/admin/helpers/image.php rename to admin/helpers/image.php diff --git a/com_biblestudy/admin/helpers/imagelib.php b/admin/helpers/imagelib.php similarity index 99% rename from com_biblestudy/admin/helpers/imagelib.php rename to admin/helpers/imagelib.php index 8465a2bd5c..201b5f9450 100644 --- a/com_biblestudy/admin/helpers/imagelib.php +++ b/admin/helpers/imagelib.php @@ -158,7 +158,7 @@ public function __construct() * * @return void * - * @throws \Exception + * @throws Exception * @since 9.0.18 */ public static function resize_image( diff --git a/com_biblestudy/admin/helpers/params.php b/admin/helpers/params.php similarity index 100% rename from com_biblestudy/admin/helpers/params.php rename to admin/helpers/params.php diff --git a/com_biblestudy/admin/helpers/searchfilters.php b/admin/helpers/searchfilters.php similarity index 100% rename from com_biblestudy/admin/helpers/searchfilters.php rename to admin/helpers/searchfilters.php diff --git a/com_biblestudy/admin/helpers/tagDefinitions.helper.php b/admin/helpers/tagDefinitions.helper.php similarity index 100% rename from com_biblestudy/admin/helpers/tagDefinitions.helper.php rename to admin/helpers/tagDefinitions.helper.php diff --git a/com_biblestudy/admin/helpers/tags.php b/admin/helpers/tags.php similarity index 100% rename from com_biblestudy/admin/helpers/tags.php rename to admin/helpers/tags.php diff --git a/com_biblestudy/admin/helpers/template.php b/admin/helpers/template.php similarity index 99% rename from com_biblestudy/admin/helpers/template.php rename to admin/helpers/template.php index 80f16b48a1..456268591a 100644 --- a/com_biblestudy/admin/helpers/template.php +++ b/admin/helpers/template.php @@ -115,7 +115,7 @@ public function __construct() * Get Instance * * @staticvar bibleStudyTemplate $instance - * @return \JBSMTemplate + * @return JBSMTemplate * * @since 1.5 */ diff --git a/com_biblestudy/admin/helpers/thumbnail.php b/admin/helpers/thumbnail.php similarity index 99% rename from com_biblestudy/admin/helpers/thumbnail.php rename to admin/helpers/thumbnail.php index 8ba1800c6d..3e2423e6ff 100644 --- a/com_biblestudy/admin/helpers/thumbnail.php +++ b/admin/helpers/thumbnail.php @@ -90,7 +90,7 @@ public static function resize($path, $new_size) * @param string $path Path to file * @param string $file file to check * - * @return bool + * @return boolean * * @since 9.0 */ diff --git a/com_biblestudy/admin/helpers/translated.php b/admin/helpers/translated.php similarity index 99% rename from com_biblestudy/admin/helpers/translated.php rename to admin/helpers/translated.php index db12655528..ea3dd4e55d 100644 --- a/com_biblestudy/admin/helpers/translated.php +++ b/admin/helpers/translated.php @@ -10,7 +10,7 @@ // No Direct Access defined('_JEXEC') or die; -use \Joomla\Registry\Registry; +use Joomla\Registry\Registry; /** * class for Translated Helper diff --git a/com_biblestudy/admin/helpers/uploadscript.php b/admin/helpers/uploadscript.php similarity index 100% rename from com_biblestudy/admin/helpers/uploadscript.php rename to admin/helpers/uploadscript.php diff --git a/com_biblestudy/admin/install/sql/install-defaults.sql b/admin/install/sql/install-defaults.sql similarity index 100% rename from com_biblestudy/admin/install/sql/install-defaults.sql rename to admin/install/sql/install-defaults.sql diff --git a/admin/install/sql/install.sql b/admin/install/sql/install.sql new file mode 100644 index 0000000000..5967f7f2d9 --- /dev/null +++ b/admin/install/sql/install.sql @@ -0,0 +1,786 @@ +DROP TABLE IF EXISTS `#__bsms_install`; + +-- Dump of table #__bsms_update +-- ------------------------------------------------------------ + +CREATE TABLE IF NOT EXISTS `#__bsms_update` ( + `id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, + `version` VARCHAR(255) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE = InnoDB DEFAULT CHARSET = utf8; + +INSERT IGNORE INTO `#__bsms_update` (`id`, `version`) +VALUES + (1, '9.2.0'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#__bsms_admin` +-- + +CREATE TABLE IF NOT EXISTS `#__bsms_admin` ( + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `drop_tables` INT(3) DEFAULT '0', + `params` TEXT, + `asset_id` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to the #__assets table.', + `access` INT(10) UNSIGNED NOT NULL DEFAULT '0', + `installstate` TEXT, + `debug` TINYINT(3) NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `idx_access` (`access`) +) ENGINE = InnoDB DEFAULT CHARSET = utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#__bsms_books` +-- + +CREATE TABLE IF NOT EXISTS `#__bsms_books` ( + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `bookname` VARCHAR(250) DEFAULT NULL, + `booknumber` INT(5) DEFAULT NULL, + `published` TINYINT(3) NOT NULL DEFAULT '1', + PRIMARY KEY (`id`), + KEY `idx_state` (`published`) +) ENGINE = InnoDB DEFAULT CHARSET = utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#__bsms_comments` +-- + +CREATE TABLE IF NOT EXISTS `#__bsms_comments` ( + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `published` TINYINT(3) NOT NULL DEFAULT '0', + `study_id` INT(11) NOT NULL DEFAULT '0', + `user_id` INT(11) NOT NULL DEFAULT '0', + `full_name` VARCHAR(50) NOT NULL DEFAULT '', + `user_email` VARCHAR(100) NOT NULL DEFAULT '', + `comment_date` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', + `comment_text` TEXT NOT NULL, + `asset_id` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to the #__assets table.', + `access` INT(10) UNSIGNED NOT NULL DEFAULT '0', + `language` CHAR(7) NOT NULL COMMENT 'The language code for the Comments.', + PRIMARY KEY (`id`), + KEY `idx_state` (`published`), + KEY `idx_access` (`access`) +) ENGINE = InnoDB DEFAULT CHARSET = utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#__bsms_locations` +-- + +CREATE TABLE IF NOT EXISTS `#__bsms_locations` ( + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `location_text` VARCHAR(250) DEFAULT NULL, + `contact_id` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Used to link to com_contact', + `address` TEXT, + `suburb` VARCHAR(100) DEFAULT NULL, + `state` VARCHAR(100) DEFAULT NULL, + `country` VARCHAR(100) DEFAULT NULL, + `postcode` VARCHAR(100) DEFAULT NULL, + `telephone` VARCHAR(255) DEFAULT NULL, + `fax` VARCHAR(255) DEFAULT NULL, + `misc` MEDIUMTEXT, + `image` VARCHAR(255) DEFAULT NULL, + `email_to` VARCHAR(255) DEFAULT NULL, + `default_con` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0', + `checked_out` INT(10) UNSIGNED NOT NULL DEFAULT '0', + `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', + `params` TEXT NOT NULL, + `user_id` INT(11) NOT NULL DEFAULT '0', + `mobile` VARCHAR(255) NOT NULL DEFAULT '', + `webpage` VARCHAR(255) NOT NULL DEFAULT '', + `sortname1` VARCHAR(255) NOT NULL, + `sortname2` VARCHAR(255) NOT NULL, + `sortname3` VARCHAR(255) NOT NULL, + `language` CHAR(7) NOT NULL, + `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', + `created_by` INT(10) UNSIGNED NOT NULL DEFAULT '0', + `created_by_alias` VARCHAR(255) NOT NULL DEFAULT '', + `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', + `modified_by` INT(10) UNSIGNED NOT NULL DEFAULT '0', + `metakey` TEXT NOT NULL, + `metadesc` TEXT NOT NULL, + `metadata` TEXT NOT NULL, + `featured` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Set if article is featured.', + `xreference` VARCHAR(50) NOT NULL COMMENT 'A reference to enable linkages to external data sets.', + `version` INT(10) UNSIGNED NOT NULL DEFAULT '1', + `hits` INT(10) UNSIGNED NOT NULL DEFAULT '0', + `publish_up` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', + `publish_down` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', + `published` TINYINT(3) NOT NULL DEFAULT '1', + `asset_id` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to the #__assets table.', + `access` INT(10) UNSIGNED NOT NULL DEFAULT '1', + `ordering` INT(11) NOT NULL DEFAULT '0', + `landing_show` INT(3) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `idx_state` (`published`), + KEY `idx_access` (`access`) +) ENGINE = InnoDB DEFAULT CHARSET = utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#__bsms_mediafiles` +-- + +CREATE TABLE IF NOT EXISTS `#__bsms_mediafiles` ( + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `study_id` INT(5) DEFAULT NULL, + `server_id` INT(5) DEFAULT NULL, + `podcast_id` VARCHAR(50) DEFAULT NULL, + `metadata` TEXT NOT NULL, + `ordering` INT(11) NOT NULL DEFAULT '0', + `createdate` DATETIME DEFAULT NULL, + `hits` INT(10) DEFAULT '0', + `published` TINYINT(3) NOT NULL DEFAULT '1', + `comment` TEXT, + `downloads` INT(10) DEFAULT '0', + `plays` INT(10) DEFAULT '0', + `params` TEXT, + `asset_id` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to the #__assets table.', + `access` INT(10) UNSIGNED NOT NULL DEFAULT '1', + `language` CHAR(7) NOT NULL COMMENT 'The language code for the MediaFile.', + `created_by` INT(10) UNSIGNED NOT NULL DEFAULT '0', + `created_by_alias` VARCHAR(255) NOT NULL DEFAULT '', + `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', + `modified_by` INT(10) UNSIGNED NOT NULL DEFAULT '0', + `checked_out` INT(11) UNSIGNED NOT NULL DEFAULT '0', + `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', + PRIMARY KEY (`id`), + KEY `idx_state` (`published`), + KEY `idx_study_id` (`study_id`), + KEY `idx_access` (`access`), + KEY `idx_checkout` (`checked_out`), + KEY `idx_createdby` (`created_by`) +) ENGINE = InnoDB DEFAULT CHARSET = utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#__bsms_message_type` +-- + +CREATE TABLE IF NOT EXISTS `#__bsms_message_type` ( + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `message_type` TEXT NOT NULL, + `alias` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '', + `published` TINYINT(3) NOT NULL DEFAULT '1', + `asset_id` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to the #__assets table.', + `access` INT(10) UNSIGNED NOT NULL DEFAULT '1', + `ordering` INT(11) NOT NULL DEFAULT '0', + `landing_show` INT(3) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `idx_state` (`published`), + KEY `idx_access` (`access`) +) ENGINE = InnoDB DEFAULT CHARSET = utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#__bsms_podcast` +-- + +CREATE TABLE IF NOT EXISTS `#__bsms_podcast` ( + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `title` VARCHAR(100) DEFAULT NULL, + `website` VARCHAR(100) DEFAULT NULL, + `description` TEXT, + `image` VARCHAR(130) DEFAULT NULL, + `imageh` INT(3) DEFAULT NULL, + `imagew` INT(3) DEFAULT NULL, + `author` VARCHAR(100) DEFAULT NULL, + `podcastimage` VARCHAR(130) DEFAULT NULL, + `podcastsearch` VARCHAR(255) DEFAULT NULL, + `filename` VARCHAR(150) DEFAULT NULL, + `language` VARCHAR(10) DEFAULT 'en-us', + `editor_name` VARCHAR(150) DEFAULT NULL, + `editor_email` VARCHAR(150) DEFAULT NULL, + `podcastlimit` INT(5) DEFAULT NULL, + `published` TINYINT(3) NOT NULL DEFAULT '1', + `episodetitle` INT(11) DEFAULT NULL, + `custom` VARCHAR(200) DEFAULT NULL, + `detailstemplateid` INT(11) DEFAULT NULL, + `asset_id` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to the #__assets table.', + `access` INT(10) UNSIGNED NOT NULL DEFAULT '1', + `alternatelink` VARCHAR(300) DEFAULT NULL COMMENT 'replaces podcast file link on subscription', + `alternateimage` VARCHAR(150) DEFAULT NULL COMMENT 'alternate image path for podcast', + `podcast_subscribe_show` INT(3) DEFAULT NULL, + `podcast_image_subscribe` VARCHAR(150) DEFAULT NULL COMMENT 'The image to use for the podcast subscription image', + `podcast_subscribe_desc` VARCHAR(150) DEFAULT NULL COMMENT 'Words to go below podcast subscribe image', + `alternatewords` VARCHAR(20) DEFAULT NULL, + `episodesubtitle` INT(11) DEFAULT NULL, + `customsubtitle` VARCHAR(200) DEFAULT NULL, + `linktype` INT(10) NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `idx_state` (`published`), + KEY `idx_access` (`access`) +) ENGINE = InnoDB DEFAULT CHARSET = utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#__bsms_series` +-- + +CREATE TABLE IF NOT EXISTS `#__bsms_series` ( + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `series_text` TEXT, + `alias` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '', + `teacher` INT(3) DEFAULT NULL, + `description` TEXT, + `series_thumbnail` VARCHAR(150) DEFAULT NULL, + `published` TINYINT(3) NOT NULL DEFAULT '1', + `asset_id` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to the #__assets table.', + `ordering` INT(11) NOT NULL DEFAULT '0', + `access` INT(10) UNSIGNED NOT NULL DEFAULT '1', + `language` CHAR(7) NOT NULL COMMENT 'The language code for the Series.', + `landing_show` INT(3) DEFAULT NULL, + `pc_show` INT(3) NOT NULL DEFAULT '1' COMMENT 'For displaying on + podcasts page', + PRIMARY KEY (`id`), + KEY `idx_state` (`published`), + KEY `idx_access` (`access`) +) ENGINE = InnoDB DEFAULT CHARSET = utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#__bsms_servers` +-- + +CREATE TABLE IF NOT EXISTS `#__bsms_servers` ( + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `server_name` VARCHAR(250) NOT NULL DEFAULT '', + `published` TINYINT(3) NOT NULL DEFAULT '1', + `asset_id` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to the #__assets table.', + `access` INT(10) UNSIGNED NOT NULL DEFAULT '1', + `type` CHAR(255) NOT NULL, + `params` TEXT NOT NULL, + `media` TEXT NOT NULL, + PRIMARY KEY (`id`), + KEY `idx_state` (`published`), + KEY `idx_access` (`access`) +) ENGINE = InnoDB DEFAULT CHARSET = utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#__bsms_studies` +-- + +CREATE TABLE IF NOT EXISTS `#__bsms_studies` ( + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `studydate` DATETIME DEFAULT NULL, + `teacher_id` INT(11) DEFAULT '1', + `studynumber` VARCHAR(100) DEFAULT '', + `booknumber` INT(3) DEFAULT '101', + `chapter_begin` INT(3) DEFAULT '1', + `verse_begin` INT(3) DEFAULT '1', + `chapter_end` INT(3) DEFAULT '1', + `verse_end` INT(3) DEFAULT '1', + `secondary_reference` TEXT, + `booknumber2` VARCHAR(4) DEFAULT NULL, + `chapter_begin2` VARCHAR(4) DEFAULT NULL, + `verse_begin2` VARCHAR(4) DEFAULT NULL, + `chapter_end2` VARCHAR(4) DEFAULT NULL, + `verse_end2` VARCHAR(4) DEFAULT NULL, + `prod_dvd` VARCHAR(100) DEFAULT NULL, + `prod_cd` VARCHAR(100) DEFAULT NULL, + `server_cd` VARCHAR(10) DEFAULT NULL, + `server_dvd` VARCHAR(10) DEFAULT NULL, + `image_cd` VARCHAR(10) DEFAULT NULL, + `image_dvd` VARCHAR(10) DEFAULT '0', + `studytext2` TEXT, + `comments` TINYINT(1) DEFAULT '1', + `hits` INT(10) NOT NULL DEFAULT '0', + `user_id` INT(10) DEFAULT NULL, + `user_name` VARCHAR(50) DEFAULT NULL, + `show_level` VARCHAR(100) NOT NULL DEFAULT '0', + `location_id` INT(3) DEFAULT NULL, + `studytitle` TEXT, + `alias` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '', + `studyintro` TEXT, + `messagetype` VARCHAR(100) DEFAULT '1', + `series_id` INT(3) DEFAULT '0', + `studytext` TEXT, + `thumbnailm` TEXT, + `thumbhm` INT(11) DEFAULT NULL, + `thumbwm` INT(11) DEFAULT NULL, + `params` TEXT, + `checked_out` INT(11) UNSIGNED NOT NULL DEFAULT '0', + `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', + `published` TINYINT(3) NOT NULL DEFAULT '0', + `publish_up` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', + `publish_down` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', + `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', + `modified_by` INT(10) UNSIGNED NOT NULL DEFAULT '0', + `asset_id` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to the #__assets table.', + `access` INT(10) UNSIGNED NOT NULL DEFAULT '1', + `ordering` INT(11) NOT NULL DEFAULT '0', + `language` CHAR(7) NOT NULL COMMENT 'The language code for the Studies.', + `download_id` INT(10) NOT NULL DEFAULT '0' COMMENT 'Used for link to download of mediafile', + PRIMARY KEY (`id`), + KEY `idx_state` (`published`), + KEY `idx_access` (`access`), + KEY `idx_seriesid` (`series_id`), + KEY `idx_user` (`user_id`), + KEY `idx_createdby` (`user_id`), + KEY `idx_checkout` (`checked_out`) +) ENGINE = InnoDB DEFAULT CHARSET = utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#__bsms_studytopics` +-- + +CREATE TABLE IF NOT EXISTS `#__bsms_studytopics` ( + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `study_id` INT(3) NOT NULL DEFAULT '0', + `topic_id` INT(3) NOT NULL DEFAULT '0', + `asset_id` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to the #__assets table.', + `access` INT(10) UNSIGNED NOT NULL DEFAULT '1', + PRIMARY KEY (`id`), + KEY `idx_access` (`access`), + KEY `idx_study` (`study_id`), + KEY `idx_topic` (`topic_id`) +) ENGINE = InnoDB DEFAULT CHARSET = utf8; + + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#__bsms_teachers` +-- + +CREATE TABLE IF NOT EXISTS `#__bsms_teachers` ( + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `teacher_image` TEXT, + `teacher_thumbnail` TEXT, + `teachername` VARCHAR(250) NOT NULL DEFAULT '', + `alias` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '', + `title` VARCHAR(250) DEFAULT NULL, + `phone` VARCHAR(50) DEFAULT NULL, + `email` VARCHAR(100) DEFAULT NULL, + `website` TEXT, + `information` TEXT, + `image` TEXT, + `imageh` TEXT, + `imagew` TEXT, + `thumb` TEXT, + `thumbw` TEXT, + `thumbh` TEXT, + `short` TEXT, + `ordering` INT(11) NOT NULL DEFAULT '0', + `catid` INT(3) DEFAULT '1', + `list_show` TINYINT(1) NOT NULL DEFAULT '1', + `published` TINYINT(3) NOT NULL DEFAULT '1', + `asset_id` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to the #__assets table.', + `access` INT(10) UNSIGNED NOT NULL DEFAULT '1', + `language` CHAR(7) NOT NULL COMMENT 'The language code for the Teachers.', + `facebooklink` VARCHAR(150) DEFAULT NULL, + `twitterlink` VARCHAR(150) DEFAULT NULL, + `bloglink` VARCHAR(150) DEFAULT NULL, + `link1` VARCHAR(150) DEFAULT NULL, + `linklabel1` VARCHAR(150) DEFAULT NULL, + `link2` VARCHAR(150) DEFAULT NULL, + `linklabel2` VARCHAR(150) DEFAULT NULL, + `link3` VARCHAR(150) DEFAULT NULL, + `linklabel3` VARCHAR(150) DEFAULT NULL, + `contact` INT(11) DEFAULT NULL, + `address` MEDIUMTEXT NOT NULL, + `landing_show` INT(3) DEFAULT NULL, + `address1` MEDIUMTEXT NOT NULL, + PRIMARY KEY (`id`), + KEY `idx_state` (`published`), + KEY `idx_access` (`access`) +) ENGINE = InnoDB DEFAULT CHARSET = utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#__bsms_templatecode` +-- + +CREATE TABLE IF NOT EXISTS `#__bsms_templatecode` ( + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `published` TINYINT(3) NOT NULL DEFAULT '1', + `type` TINYINT(3) NOT NULL, + `filename` TEXT NOT NULL, + `asset_id` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to the #__assets table.', + `templatecode` MEDIUMTEXT NOT NULL, + PRIMARY KEY (`id`) +) ENGINE = InnoDB DEFAULT CHARSET = utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#__bsms_templates` +-- + +CREATE TABLE IF NOT EXISTS `#__bsms_templates` ( + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `type` VARCHAR(255) NOT NULL, + `tmpl` LONGTEXT NOT NULL, + `published` TINYINT(3) NOT NULL DEFAULT '1', + `params` LONGTEXT, + `title` TEXT, + `text` TEXT, + `pdf` TEXT, + `asset_id` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to the #__assets table.', + `access` INT(10) UNSIGNED NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `idx_state` (`published`), + KEY `idx_access` (`access`) +) ENGINE = InnoDB DEFAULT CHARSET = utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#__bsms_timeset` +-- + +CREATE TABLE IF NOT EXISTS `#__bsms_timeset` ( + `timeset` VARCHAR(14) NOT NULL DEFAULT '', + `backup` VARCHAR(14) DEFAULT NULL, + PRIMARY KEY (`timeset`) +) ENGINE = InnoDB DEFAULT CHARSET = utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `#__bsms_topics` +-- + +CREATE TABLE IF NOT EXISTS `#__bsms_topics` ( + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `topic_text` TEXT, + `published` TINYINT(3) NOT NULL DEFAULT '1', + `params` VARCHAR(511) DEFAULT NULL, + `asset_id` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to the #__assets table.', + `language` CHAR(7) DEFAULT '*', + `access` INT(10) UNSIGNED NOT NULL DEFAULT '1', + PRIMARY KEY (`id`), + KEY `idx_state` (`published`), + KEY `idx_access` (`access`) +) ENGINE = InnoDB DEFAULT CHARSET = utf8; + +-- Dump of table #__bsms_admin +-- ------------------------------------------------------------ + +INSERT IGNORE INTO `#__bsms_admin` (`id`, `drop_tables`, `params`, `asset_id`, `access`, `installstate`, `debug`) +VALUES +(1, 0, + '{\"simple_mode\":\"1\",\"metakey\":\"\",\"metadesc\":\"\",\"compat_mode\":\"0\",\"studylistlimit\":\"10\",\"show_location_media\":\"0\",\"popular_limit\":\"\",\"character_filter\":\"1\",\"format_popular\":\"0\",\"default_main_image\":\"\",\"default_series_image\":\"\",\"default_teacher_image\":\"\",\"default_download_image\":\"\",\"default_showHide_image\":\"\",\"thumbnail_teacher_size\":\"150\",\"thumbnail_series_size\":\"150\",\"thumbnail_study_size\":\"150\",\"location_id\":\"-1\",\"teacher_id\":\"1\",\"series_id\":\"-1\",\"booknumber\":\"-1\",\"messagetype\":\"-1\",\"default_study_image\":\"\",\"download\":\"1\",\"target\":\" \",\"server\":\"1\",\"podcast\":[\"-1\"],\"from\":\"x\",\"to\":\"x\",\"pFrom\":\"x\",\"pTo\":\"x\",\"controls\":\"1\",\"jwplayer_pro\":\"0\",\"jwplayer_key\":\"\",\"jwplayer_cdn\":\"\",\"jwplayer_skin\":\"\",\"jwplayer_autostart\":\"false\",\"jwplayer_fallback\":\"true\",\"jwplayer_mute\":\"false\",\"jwplayer_stagevideo\":\"false\",\"jwplayer_primary\":\"html5\",\"playlist\":\"false\",\"jwplayer_listbar\":\"false\",\"jwplayer_logo\":\"\",\"sharing\":\"false\",\"jwplayer_related\":\"false\",\"jwplayer_advertising\":\"\",\"rtmp\":\"Comming Soon\",\"ga\":\"Comming Soon\",\"jwplayer_sitecatalyst\":\"Comming Soon\",\"captions\":\"false\"}', + 7587, 1, NULL, 0); + + +-- Dump of table #__bsms_books +-- ------------------------------------------------------------ + +INSERT IGNORE INTO `#__bsms_books` (`id`, `bookname`, `booknumber`, `published`) +VALUES +(1, 'JBS_BBK_GENESIS', 101, 1), +(2, 'JBS_BBK_EXODUS', 102, 1), +(3, 'JBS_BBK_LEVITICUS', 103, 1), +(4, 'JBS_BBK_NUMBERS', 104, 1), +(5, 'JBS_BBK_DEUTERONOMY', 105, 1), +(6, 'JBS_BBK_JOSHUA', 106, 1), +(7, 'JBS_BBK_JUDGES', 107, 1), +(8, 'JBS_BBK_RUTH', 108, 1), +(9, 'JBS_BBK_1SAMUEL', 109, 1), +(10, 'JBS_BBK_2SAMUEL', 110, 1), +(11, 'JBS_BBK_1KINGS', 111, 1), +(12, 'JBS_BBK_2KINGS', 112, 1), +(13, 'JBS_BBK_1CHRONICLES', 113, 1), +(14, 'JBS_BBK_2CHRONICLES', 114, 1), +(15, 'JBS_BBK_EZRA', 115, 1), +(16, 'JBS_BBK_NEHEMIAH', 116, 1), +(17, 'JBS_BBK_ESTHER', 117, 1), +(18, 'JBS_BBK_JOB', 118, 1), +(19, 'JBS_BBK_PSALM', 119, 1), +(20, 'JBS_BBK_PROVERBS', 120, 1), +(21, 'JBS_BBK_ECCLESIASTES', 121, 1), +(22, 'JBS_BBK_SONG_OF_SOLOMON', 122, 1), +(23, 'JBS_BBK_ISAIAH', 123, 1), +(24, 'JBS_BBK_JEREMIAH', 124, 1), +(25, 'JBS_BBK_LAMENTATIONS', 125, 1), +(26, 'JBS_BBK_EZEKIEL', 126, 1), +(27, 'JBS_BBK_DANIEL', 127, 1), +(28, 'JBS_BBK_HOSEA', 128, 1), +(29, 'JBS_BBK_JOEL', 129, 1), +(30, 'JBS_BBK_AMOS', 130, 1), +(31, 'JBS_BBK_OBADIAH', 131, 1), +(32, 'JBS_BBK_JONAH', 132, 1), +(33, 'JBS_BBK_MICAH', 133, 1), +(34, 'JBS_BBK_NAHUM', 134, 1), +(35, 'JBS_BBK_HABAKKUK', 135, 1), +(36, 'JBS_BBK_ZEPHANIAH', 136, 1), +(37, 'JBS_BBK_HAGGAI', 137, 1), +(38, 'JBS_BBK_ZECHARIAH', 138, 1), +(39, 'JBS_BBK_MALACHI', 139, 1), +(40, 'JBS_BBK_MATTHEW', 140, 1), +(41, 'JBS_BBK_MARK', 141, 1), +(42, 'JBS_BBK_LUKE', 142, 1), +(43, 'JBS_BBK_JOHN', 143, 1), +(44, 'JBS_BBK_ACTS', 144, 1), +(45, 'JBS_BBK_ROMANS', 145, 1), +(46, 'JBS_BBK_1CORINTHIANS', 146, 1), +(47, 'JBS_BBK_2CORINTHIANS', 147, 1), +(48, 'JBS_BBK_GALATIANS', 148, 1), +(49, 'JBS_BBK_EPHESIANS', 149, 1), +(50, 'JBS_BBK_PHILIPPIANS', 150, 1), +(51, 'JBS_BBK_COLOSSIANS', 151, 1), +(52, 'JBS_BBK_1THESSALONIANS', 152, 1), +(53, 'JBS_BBK_2THESSALONIANS', 153, 1), +(54, 'JBS_BBK_1TIMOTHY', 154, 1), +(55, 'JBS_BBK_2TIMOTHY', 155, 1), +(56, 'JBS_BBK_TITUS', 156, 1), +(57, 'JBS_BBK_PHILEMON', 157, 1), +(58, 'JBS_BBK_HEBREWS', 158, 1), +(59, 'JBS_BBK_JAMES', 159, 1), +(60, 'JBS_BBK_1PETER', 160, 1), +(61, 'JBS_BBK_2PETER', 161, 1), +(62, 'JBS_BBK_1JOHN', 162, 1), +(63, 'JBS_BBK_2JOHN', 163, 1), +(64, 'JBS_BBK_3JOHN', 164, 1), +(65, 'JBS_BBK_JUDE', 165, 1), +(66, 'JBS_BBK_REVELATION', 166, 1), +(67, 'JBS_BBK_TOBIT', 167, 1), +(68, 'JBS_BBK_JUDITH', 168, 1), +(69, 'JBS_BBK_1MACCABEES', 169, 1), +(70, 'JBS_BBK_2MACCABEES', 170, 1), +(71, 'JBS_BBK_WISDOM', 171, 1), +(72, 'JBS_BBK_SIRACH', 172, 1), +(73, 'JBS_BBK_BARUCH', 173, 1); + +-- Dump of table #__bsms_locations +-- ------------------------------------------------------------ + +INSERT IGNORE INTO `#__bsms_locations` (`id`, `location_text`, `contact_id`, `address`, `suburb`, `state`, `country`, `postcode`, `telephone`, `fax`, `misc`, `image`, `email_to`, `default_con`, `checked_out`, `checked_out_time`, `params`, `user_id`, `mobile`, `webpage`, `sortname1`, `sortname2`, `sortname3`, `language`, `created`, `created_by`, `created_by_alias`, `modified`, `modified_by`, `metakey`, `metadesc`, `metadata`, `featured`, `xreference`, `version`, `hits`, `publish_up`, `publish_down`, `published`, `asset_id`, `access`, `ordering`, `landing_show`) +VALUES +(1, 'My Location', 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, '0000-00-00 00:00:00', '', 0, + '', '', '', '', '', '', '0000-00-00 00:00:00', 0, '', '0000-00-00 00:00:00', 0, '', '', '', 0, '', 1, 0, + '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 7480, 1, 1, NULL); + +-- Dump of table #__bsms_mediafiles +-- ------------------------------------------------------------ + +INSERT IGNORE INTO `#__bsms_mediafiles` (`id`, `study_id`, `server_id`, `podcast_id`, `metadata`, `ordering`, `createdate`, `hits`, `published`, `comment`, `downloads`, `plays`, `params`, `asset_id`, `access`, `language`, `created_by`, `created_by_alias`, `modified`, `modified_by`, `checked_out`, `checked_out_time`) +VALUES +(1, 1, 1, '1', '{\"plays\":\"0\", \"downloads\":\"0\"}', 0, '2009-09-13 00:10:00', 0, 1, 'Sample Media file', 0, 10, + '{\"link_type\":\"\",\"docMan_id\":\"0\",\"article_id\":\"-1\",\"virtueMart_id\":\"0\",\"player\":\"7\",\"popup\":\"3\",\"mediacode\":\"\",\"filename\":\"\\/MediaFiles\\/2015\\/2015-008.mp3\",\"size\":false,\"special\":\"\",\"media_image\":\"images\\/biblestudy\\/speaker24.png\",\"mime_type\":\"audio\\/mp3\",\"playerwidth\":\"\",\"playerheight\":\"\",\"itempopuptitle\":\"\",\"itempopupfooter\":\"\",\"popupmargin\":\"50\",\"autostart\":\"false\"}', + 7481, 1, '*', 1, 'admin', '0000-00-00 00:00:00', 1, 0, '0000-00-00 00:00:00'), +(2, 1, 3, '', '', 0, '2010-03-12 18:10:00', 0, 1, '', 0, 6, + '{\"link_type\":\"0\",\"docMan_id\":\"0\",\"article_id\":\"-1\",\"virtueMart_id\":\"0\",\"player\":\"0\",\"popup\":\"2\",\"mediacode\":\"\",\"filename\":\"\\/images\\/growthgroupquestions\\/Colossians3_5-11Questions.pdf\",\"size\":0,\"special\":\"\",\"media_image\":\"images\\/biblestudy\\/pdf16.png\",\"mime_type\":\"application\\/pdf\",\"playerwidth\":\"\",\"playerheight\":\"\",\"itempopuptitle\":\"\",\"itempopupfooter\":\"\",\"popupmargin\":\"50\",\"autostart\":\"\"}', + 7593, 1, '*', 0, '', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00'), +(3, 1, 2, '', '', 0, '2015-07-28 19:18:07', 0, 1, '', 0, 0, + '{\"link_type\":\"0\",\"docMan_id\":\"0\",\"article_id\":\"-1\",\"virtueMart_id\":\"0\",\"player\":\"1\",\"popup\":\"3\",\"mediacode\":\"\",\"filename\":\"https:\\/\\/youtu.be\\/PsFo6MhAB9o\",\"size\":0,\"special\":\"\",\"media_image\":\"images\\/biblestudy\\/youtube24.png\",\"mime_type\":\"video\\/mp4\",\"playerwidth\":\"\",\"playerheight\":\"\",\"itempopuptitle\":\"\",\"itempopupfooter\":\"\",\"popupmargin\":\"50\",\"autostart\":\"\"}', + 7596, 1, '*', 0, '', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00'); + +-- Dump of table #__bsms_message_type +-- ------------------------------------------------------------ + +INSERT IGNORE INTO `#__bsms_message_type` (`id`, `message_type`, `alias`, `published`, `asset_id`, `access`, `ordering`, `landing_show`) +VALUES +(1, 'Sunday', X'73756E646179', 1, 7482, 1, 1, NULL); + +-- Dump of table #__bsms_podcast +-- ------------------------------------------------------------ + +INSERT IGNORE INTO `#__bsms_podcast` (`id`, `title`, `website`, `description`, `image`, `imageh`, `imagew`, `author`, `podcastimage`, `podcastsearch`, `filename`, `language`, `editor_name`, `editor_email`, `podcastlimit`, `published`, `episodetitle`, `custom`, `detailstemplateid`, `asset_id`, `access`, `alternatelink`, `alternateimage`, `podcast_subscribe_show`, `podcast_image_subscribe`, `podcast_subscribe_desc`, `alternatewords`, `episodesubtitle`, `customsubtitle`, `linktype`) +VALUES +(1, 'My Podcast', 'www.mywebsite.com', 'Podcast Description goes here', 'www.mywebsite.com/myimage.jpg', 30, 30, + 'Pastor Billy', 'www.mywebsite.com/myimage.jpg', 'jesus', 'mypodcast.xml', '*', 'Jim Editor', 'jim@mywebsite.com', + 50, 1, 0, '', 1, 7483, 1, '', '', 0, '', '', '', 0, '', 0); + +-- Dump of table #__bsms_series +-- ------------------------------------------------------------ + +INSERT IGNORE INTO `#__bsms_series` (`id`, `series_text`, `alias`, `teacher`, `description`, `series_thumbnail`, `published`, `asset_id`, `ordering`, `access`, `language`, `landing_show`, `pc_show`) +VALUES +(1, 'Worship Series', X'776F72736869702D736572696573', -1, '', '', 1, 7484, 1, 1, '*', NULL, 1); + +-- Dump of table #__bsms_servers +-- ------------------------------------------------------------ + +INSERT IGNORE INTO `#__bsms_servers` (`id`, `server_name`, `published`, `asset_id`, `access`, `type`, `params`, `media`) +VALUES +(1, 'Legacy MP3', 1, 7478, 1, 'legacy', + '{\"path\":\"\\/\\/www.calvarychapelnewberg.net\\/\",\"protocol\":\"http:\\/\\/\"}', + '{\"link_type\":\"1\",\"player\":\"7\",\"popup\":\"3\",\"mediacode\":\"\",\"media_image\":\"images\\/biblestudy\\/mp3.png\",\"mime_type\":\"audio\\/mp3\",\"autostart\":\"1\"}'), +(2, 'Legacy YouTube', 1, 7588, 1, 'legacy', '{\"path\":\"\",\"protocol\":\"http:\\/\\/\"}', + '{\"link_type\":\"0\",\"player\":\"1\",\"popup\":\"3\",\"mediacode\":\"\",\"media_image\":\"images\\/biblestudy\\/youtube24.png\",\"mime_type\":\"video\\/mp4\",\"autostart\":\"1\"}'), +(3, 'Legacy PDF', 1, 7589, 1, 'legacy', + '{\"path\":\"http:\\/\\/calvarynewberg.org\\/\",\"protocol\":\"http:\\/\\/\"}', + '{\"link_type\":\"1\",\"player\":\"0\",\"popup\":\"2\",\"mediacode\":\"\",\"media_image\":\"images\\/biblestudy\\/pdf16.png\",\"mime_type\":\"application\\/pdf\",\"autostart\":\"1\"}'); + + +-- Dump of table #__bsms_studies +-- ------------------------------------------------------------ + +INSERT IGNORE INTO `#__bsms_studies` (`id`, `studydate`, `teacher_id`, `studynumber`, `booknumber`, `chapter_begin`, `verse_begin`, `chapter_end`, `verse_end`, `secondary_reference`, `booknumber2`, `chapter_begin2`, `verse_begin2`, `chapter_end2`, `verse_end2`, `prod_dvd`, `prod_cd`, `server_cd`, `server_dvd`, `image_cd`, `image_dvd`, `studytext2`, `comments`, `hits`, `user_id`, `user_name`, `show_level`, `location_id`, `studytitle`, `alias`, `studyintro`, `messagetype`, `series_id`, `studytext`, `thumbnailm`, `thumbhm`, `thumbwm`, `params`, `checked_out`, `checked_out_time`, `published`, `publish_up`, `publish_down`, `modified`, `modified_by`, `asset_id`, `access`, `ordering`, `language`, `download_id`) +VALUES +(1, '2010-03-13 00:10:00', 1, '2015-01', 151, 3, 5, 3, 11, '', '-1', '', '', '', '', NULL, NULL, NULL, NULL, NULL, + '0', NULL, 1, 0, 0, '', '0', 1, 'Four Steps to Defeating the Flesh', + X'666F75722D73746570732D746F2D646566656174696E672D7468652D666C657368', + 'If you’ve lived around Oregon very long you know what Oregon mud is like. The soils in the Willamette Valley contain a fair amount of clay. I remember trying to put in a sprinkler system when we first built our house. Foolishly, I thought I could beat the winter rains and get the system put in. Such was not the case. Towards the end I remember slogging around the yard—with each step I took it got harder and harder to walk as more and more mud clung to my shoes.', + '1', 1, + 'If you’ve lived around Oregon very long you know what Oregon mud is like. The soils in the Willamette Valley contain a fair amount of clay. I remember trying to put in a sprinkler system when we first built our house. Foolishly, I thought I could beat the winter rains and get the system put in. Such was not the case. Towards the end I remember slogging around the yard—with each step I took it got harder and harder to walk as more and more mud clung to my shoes. I use that analogy because the goal of becoming a Christian is to become like God in our character. We realize the old ways of sin just aren’t working for us and we come to Christ who forgives us and gives us eternal life. As Paul says: “old things have passed away, and look new things have come†(2 Cor 5:17). So far so good. The trouble starts when we begin walking around in this life. Instead of feeling light and free and pure—we feel the “old man†or “the flesh†sticking to our character like clay sticking to our shoes. The old ways of thinking, speaking, and acting are still with us—ready to take over at the slightest provocation or temptation. It makes it hard to walk with Christ effectively and smoothly. Paul says it well in: Romans 7:18 “For I know that nothing good lives in me, that is, in my flesh. For the desire to do what is good is with me, but there is no ability to do it. 19 For I do not do the good that I want to do, but I practice the evil that I do not want to do. 20 Now if I do what I do not want, I am no longer the one doing it, but it is the sin that lives in me.†So what’s a Christian to do? The goal is to be like Christ but the flesh seems to be so successful in holding us back. That’s what Colossians 3 and much of Chapter 4 is about. Paul outlines for us what the old character looks like, and what the new nature looks like by contrast. He describes the process of change as something as simple as changing your clothes. It’s simple in theory, difficult in practice, but totally worth the effort. He describes this change away from the old character with four actions: “put to death†(verse 5), “put away†(verse 8) and “put off†(verse 9), then we are to “put on†the new character of Christ (verse 10). The character traits that we are to kill, put away, and put off are: improper or unchecked desire, anger, and lying. From these three spring most of the things we associate with “the fleshâ€. 5 Paul starts off with “thereforeâ€. In light of the fact that we are risen people, we need to start thinking like citizens of heaven (the new age), not like residents of earth (this age). Paul says for us to “put to death what belongs to your earthly nature.†The word “put to death†means: “to make dead.†How does that happen? Paul gives us a clue in Romans 8:13: “But if by the Spirit you put to death the deeds of the body, you will live.†So there is this cooperation that takes place between God’s Spirit and us. In reality, you will not be free from the presence and temptation to act in the old ways until you are given you new body. But as James 1:14 says: “But each person is tempted when he is drawn away and enticed by his own evil desires. 15 Then after desire has conceived, it gives birth to sin, and when sin is fully grown, it gives birth to death.   Evil thoughts will occur; it is what we do with them that matters. When they come we can, by the power of the Spirit, tell them they are dead and have no place in us anymore. Do it strongly; do it often. Picture those thoughts on a paper, and then nail that paper to the cross. Jesus died to rid you of acting on those thought patterns. The word “put to death†can mean: “to deprive of power.†Cut the supply lines to the old nature and it will become weak nd starve. So here is the big question: what in your life is still feeding the flesh? It’s different for everyone, mind you. Starve the flesh and it will go a long way to killing it. This is part 1: “kill the old ways, one thought at a time.†Next, Paul lists five manifestations of the flesh that we need to watch out for. Make no mistake—these are powerful forces in the human mind and are not easily dissuaded or killed. Sexual immorality. It means any sexual intimacy outside of the marriage between a man and a woman. Impurity means the character infected by immoral behavior. Lust refers to any unbridled passion but here likely refers to sexual desire that is out of bounds and out of control. Evil desire is probably better translated as lust—but could refer to the thoughts that precede lust. Remember again, it isn’t the temptation but what we do with it that matters. We sin when we focus on and even encourage impure thoughts that lead to impure actions. Greed, which is idolatry. Greed here is a general term for unchecked physical pleasure. Paul calls it greed because the worship of pleasure – the worship of anything for that matter – takes first place in front of God, and that is idolatry. In Paul’s day, literal idol worship was rampant, as was sexual immorality with temple prostitutes as part of that idolatry. And because sex is such a powerful thing, these actions led to impure thoughts, desires, and lusts. 6 God’s wrath is the natural outpouring against anyone who is not pure. Doing something that is sinful is disobeying God because He said “Be holy, even as I am holy†(Lev. 11:45). Some people say that a loving God cannot be a wrathful God. But you cannot have love without wrath against evil. Love means protecting the innocent against evil. It means coming against evil and destroying it. Just ask any parent who has lost a child to horrible violence—and you begin to understand the love and wrath of God. Before we get too smug in the opinion that we aren’t like those disobedient sinners—look at the next verse. 7 Before we knew Jesus we all disobeyed and were guilty as charged. “All have sinned and fall short of the glory of God†(Romans 3:23). We acted out these things (“walkedâ€) because we were steeped in them. We could translate this verse as: “when your life consisted of such wretched things as these.†As fallen people we couldn’t help but act in these ways, but not anymore. Now we are steeped in the Messiah’s forgiving and cleansing love. We don’t have to act out the deeds of the flesh any more. And Paul goes onto to step 2 of how to do that next. 8 Step One is to “Kill kill, kill them all†– all the thoughts that come from the flesh and urge us to think and do things that are not like God. We should nail those thoughts to the cross. Step Two is to “put off†or “put away†the deeds of the flesh. The flesh should feel like a foreign intruder. We don’t just ignore it; we actively push it away. The Greek here is the picture of taking off your clothes. The flesh is like an old set of worn out clothes that, through the Spirit, we can literally take off. Paul helps us understand this by being very specific in another major area of the old nature: anger. He brings in five ways anger destroys us. Anger and wrath are related. Anger is Greek word for a plant that is bursting with juice. What a great picture of when we get red-hot with anger and our face literally flushes red with blood. Wrath means: “to rush in†and is what we do when we are angry. How often do we get angry and let our anger vent with hurtful words that later we wish we could take back. Malice is when we mean to hurt someone—often the result of anger. Slander is what we say about them to hurt them. It’s the Greek word: blasphema. In this case it is hurtful words about another, rather than God. Finally “filthy language†refers to the words used—words which hurt both the speaker and the hearer. Why do we get angry? There are many answers to that question—but I want to bring in four main ones: Frustration – when a goal is thwarted; like getting to work on time thwarted by heavy traffic. Hurt – when the words or actions of another wounds us. Loss – when something that we hold dear is taken away, like a job or a spouse. Victim thinking – when I don’t get what I think I deserve. Put it to death by declaring the sin nature dead on the cross. Romans 6:6 “For we know that our old self was crucified with Him in order that sin’s dominion over the body may be abolished, so that we may no longer be enslaved to sinâ€. Put it away by separating yourself from that old character, like you’d change out of an old set of clothes. Put it off, remove its power, by thinking of the flesh as something foreign to you, like a limb that is no longer a part of your body—gangrenous and in need of amputation. Then put on the character of Christ like putting on a costume in a play. The more you wear it the more comfortable you will be in it and the more you will own that new character Each one of us struggles with different parts of our old nature. You can be a Christian for many years and still struggle with areas of the flesh. I think that often what happens is a trigger occurs—perhaps a word or phrase that reminds our unconscious mind of an abuse from childhood. We don’t think about but that trigger dis-regulates us, our pre-frontal cortex goes offline and our fleshly nature takes over. The trick is to begin to notice it—even physically in our body—and then work with the Holy Spirit to put you back into your new-self state of mind. 9 – 10 In verse 9, Paul moves to the third major category of the flesh—our interactions with others in relation to the truth. Lying is a default human behavior that we learn at a very young age. We bend facts and manipulate the truth in order to get a result we feel we can’t get by telling the truth. We do it in big ways and in small ways all the time. But lying is not a character trait of heaven—and lying is one of the sins specifically mentioned in Revelation 21:15 as being excluded from heaven. It’s part of the old set of clothes that we need to “put offâ€. It means: “to wholly strip off of oneself†or “to disarmâ€. Does it mean we must then be completely transparently honest with everything we think at all times? Of course not. Ephesians 4:15 says: “Speaking the truth in love let us grow in every way into Him.†Be honest always, and always speak those truths in a way that will build up and encourage another’s relationship with Christ. One way we disarm lying is to think: what can I say that will benefit this person, truly. Sometimes that is saying a difficult thing, but not in a hurtful way, but a helpful one. We move now from “putting off†the old character to “putting on†a new one—which is the character of Christ. The words literally mean to put on a change of clothes. Paul uses the same Greek word in Rom. 13:14: “But put on the Lord Jesus Christ, and make no plans to satisfy the fleshly desires.†The word can also mean: “to sink intoâ€. Believe it or not, you have the power to put on or sink into the character of Jesus—forcing out the old flesh, which is always making plans to satisfy itself. At first it might feel very foreign, like wearing a costume while playing a part in a play. But you know, that’s okay. Play the part of a person who thinks, acts, and speaks like Jesus in love, joy, peace, patience, kindness, gentleness and the like. It might feel a little hypocritical at first but the more you practice the part the more comfortable you get with it and the more it becomes part of you. All you are doing really is cooperating with the force of the Holy Spirit in you that already wants to make these changes. It is part of that “renewal†process Paul talks about here. The more we know about Jesus and His character, and the more we work towards mirroring that character, the more into His “image†we become. You’ll find in the end that this new character is the “real†new you that God has been making all along. 11 Verse 11 brings up what is often the source of the fleshly desires that run counter to the character of Christ—divisions along racial, economic, social, and religious differences. After Alexander the Great conquered much of the known world, he spread the Greek culture far and wide. So the Greeks felt very self-important culturally. The Jews also felt very superior religiously as they had the Torah and a covenant with Yahweh. This division was never so strident when it came to who was in the covenant and who was out—via circumcision. Barbarians were any non-Greek or non-Jews and Scythians were a little known race of people from the far-northern part of the Middle East who were thought to be no better than animals. Slavery was well known in that culture and separated people along socio-economic lines. Often times it is these things that cause the flesh to flare up. But Paul says Christ is in all peoples (how that could be rendered). Jesus is the great equalizer of religious, racial, cultural and socio-economic status. Also, as Paul says in Galatians 3:28, the great equalizer of gender inequalities. In Christ we should never let those things separate us. That’s the old way, not the new. So we’re talked about three ways to help rid ourselves of the old nature and one way to help nurture the new character. Try it on with something you are struggling with, like anger. Picture what it would be like if something or someone makes you angry. How would you normally react and how can these new steps intervene? What are the qualities in the new character that replace unchecked desire, anger, and dishonesty? Fidelity (commitment in your relationships with others and with God) Security (trusting that God will supply your needs) Love (self-sacrificing, other-centered affection that looks out for the good of others always) We’ll talk more about these as they relate to everyday life in the coming verses.', + '', NULL, NULL, + '{\"metakey\":\"Rain, Flesh, \\\"Sexual immorality\\\", Impurity, Lust, \\\"Evil desire\\\", Greed, Frustration, Hurt, Loss, \\\"Victim thinking\\\", \\\"Put it to death\\\", \\\"Put it away\\\",\\\"Put it off\\\"\",\"metadesc\":\"\"}', + 0, '0000-00-00 00:00:00', 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '2015-07-28 23:46:05', 627, 7479, 1, 1, + '*', -1); + +-- Dump of table #__bsms_studytopics +-- ------------------------------------------------------------ + +INSERT IGNORE INTO `#__bsms_studytopics` (`id`, `study_id`, `topic_id`, `asset_id`, `access`) +VALUES +(3, 1, 114, 7594, 1), +(4, 1, 114, 7595, 1); + + +-- Dump of table #__bsms_teachers +-- ------------------------------------------------------------ + +INSERT IGNORE INTO `#__bsms_teachers` (`id`, `teacher_image`, `teacher_thumbnail`, `teachername`, `alias`, `title`, `phone`, `email`, `website`, `information`, `image`, `imageh`, `imagew`, `thumb`, `thumbw`, `thumbh`, `short`, `ordering`, `catid`, `list_show`, `published`, `asset_id`, `access`, `language`, `facebooklink`, `twitterlink`, `bloglink`, `link1`, `linklabel1`, `link2`, `linklabel2`, `link3`, `linklabel3`, `contact`, `address`, `landing_show`, `address1`) +VALUES +(1, '', '', 'Billy Sunday', X'62696C6C792D73756E646179', 'Pastor', '555-555-5555', 'billy@sunday.com', + 'http://billysunday.com', + 'William Ashley Sunday was an American athlete who after being a popular outfielder in baseballs National League during the 1880s became the most celebrated and influential American evangelist during the first two decades of the 20th century. ', + 'media/com_biblestudy/images/billy_sunday11.jpg', '276', '197', 'media/com_biblestudy/images/images.jpg', '101', + '141', 'Billy Sunday: 1862-1935', 0, 1, 1, 1, 7489, 1, '*', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, '', NULL, ''); + +-- Dump of table #__bsms_templatatecode + +INSERT IGNORE INTO `#__bsms_templatecode` (`id`, `published`, `type`, `filename`, `asset_id`, `templatecode`) VALUES +(1, 1, 1, 'easy', 188, 'get(\'id\');\r\n$listOrder = $this->escape($this->state->get(\'list.ordering\'));\r\n$listDirn = $this->escape($this->state->get(\'list.direction\'));\r\n$archived = $this->state->get(\'filter.published\') == 2 ? true : false;\r\n$trashed = $this->state->get(\'filter.published\') == -2 ? true : false;\r\n$saveOrder = $listOrder == \'study.ordering\';\r\n$columns = 12;\r\n\r\n\r\n\r\n?>\r\n\r\n\r\n\r\n
\r\n

\r\n Teachings\r\n

\r\n
\r\n\r\n\r\n\r\n
\r\n\r\n page->books;\r\n echo $this->page->teachers;\r\n echo $this->page->series;\r\n $oddeven = \'\';\r\n $class1 = \'#d3d3d3\';\r\n $class2 = \'\';?>\r\n
\r\nitems as $study)\r\n{\r\n\r\n $oddeven = ($oddeven == $class1) ? $class2 : $class1;\r\n ?>\r\n
\r\n
\r\n study_thumbnail) {echo \'\'.$study->study_thumbnail .\'\'; echo \'
\';} ?>\r\n studytitle;?>
\r\n scripture1;?> | studydate;?>
\r\n
teachername;?>

\r\n media; ?>\r\n
\r\n\r\n\r\n
\r\n\r\n
\r\n pagination->getPageslinks();?>\r\n
\r\n'); + +-- Dump of table #__bsms_templates +-- ------------------------------------------------------------ + +INSERT IGNORE INTO `#__bsms_templates` (`id`, `type`, `tmpl`, `published`, `params`, `title`, `text`, `pdf`, `asset_id`, `access`) +VALUES +(1, 'tmplList', '', 1, + '{\"useterms\":\"0\",\"terms\":\"\",\"css\":\"biblestudy.css\",\"studieslisttemplateid\":\"1\",\"sermonstemplate\":\"0\",\"detailstemplateid\":\"1\",\"sermontemplate\":\"0\",\"teachertemplateid\":\"1\",\"teachertemplate\":\"0\",\"teacherstemplate\":\"0\",\"serieslisttemplateid\":\"1\",\"seriesdisplaystemplate\":\"0\",\"seriesdetailtemplateid\":\"1\",\"seriesdisplaytemplate\":\"0\",\"offset\":\"false\",\"teacher_id\":[\"-1\"],\"series_id\":[\"-1\"],\"booknumber\":[\"-1\"],\"topic_id\":[\"-1\"],\"messagetype\":[\"-1\"],\"locations\":[\"-1\"],\"show_verses\":\"0\",\"stylesheet\":\"\",\"date_format\":\"2\",\"custom_date_format\":\"\",\"duration_type\":\"2\",\"protocol\":\"http:\\/\\/\",\"player\":\"0\",\"popuptype\":\"window\",\"internal_popup\":\"1\",\"special\":\"_blank\",\"autostart\":\"1\",\"playerresposive\":\"1\",\"player_width\":\"400\",\"player_height\":\"300\",\"embedshare\":\"TRUE\",\"backcolor\":\"0x287585\",\"frontcolor\":\"0xFFFFFF\",\"lightcolor\":\"0x000000\",\"screencolor\":\"0x000000\",\"popuptitle\":\"{{title}}\",\"popupfooter\":\"{{filename}}\",\"popupmargin\":\"50\",\"popupbackground\":\"black\",\"popupimage\":\"media\\/com_biblestudy\\/images\\/speaker24.png\",\"show_filesize\":\"1\",\"playerposition\":\"over\",\"playeridlehide\":\"1\",\"default_order\":\"DESC\",\"default_order_secondary\":\"ASC\",\"show_page_title\":\"1\",\"show_page_image\":\"1\",\"list_page_title\":\"Bible Studies\",\"list_title_align\":\"text-align:center\",\"use_headers_list\":\"1\",\"studies_element\":\"1\",\"list_intro\":\"\",\"intro_show\":\"1\",\"list_teacher_show\":\"1\",\"listteachers\":[],\"teacherlink\":\"1\",\"showpodcastsubscribelist\":\"1\",\"subscribeintro\":\"Our Podcasts\",\"details_text\":\"Study Details\",\"show_book_search\":\"1\",\"ddbooks\":\"1\",\"booklist\":\"1\",\"use_go_button\":\"1\",\"ddgobutton\":\"2\",\"show_teacher_search\":\"1\",\"ddteachers\":\"3\",\"show_series_search\":\"1\",\"ddseries\":\"4\",\"show_type_search\":\"1\",\"ddmessagetype\":\"5\",\"show_year_search\":\"1\",\"ddyears\":\"6\",\"show_order_search\":\"1\",\"ddorder\":\"7\",\"show_topic_search\":\"1\",\"ddtopics\":\"8\",\"show_locations_search\":\"1\",\"ddlocations\":\"9\",\"show_popular\":\"1\",\"ddpopular\":\"10\",\"listlanguage\":\"0\",\"ddlanguage\":\"11\",\"show_pagination\":\"1\",\"listcolor1\":\"#8f8fb2\",\"listcolor2\":\"#ccccff\",\"rowspanitem\":\"1\",\"rowspanitemspan\":\"2\",\"rowspanitemimage\":\"img-polaroid\",\"rowspanitempull\":\"pull-left\",\"scripture1row\":\"0\",\"scripture1col\":\"3\",\"scripture1colspan\":\"2\",\"scripture1element\":\"1\",\"scripture1custom\":\"\",\"scripture1linktype\":\"0\",\"scripture2row\":\"0\",\"scripture2col\":\"1\",\"scripture2colspan\":\"3\",\"scripture2element\":\"1\",\"scripture2custom\":\"\",\"scripture2linktype\":\"0\",\"secondaryrow\":\"0\",\"secondarycol\":\"1\",\"secondarycolspan\":\"1\",\"secondaryelement\":\"1\",\"secondarycustom\":\"\",\"secondarylinktype\":\"0\",\"jbsmediarow\":\"1\",\"jbsmediacol\":\"4\",\"jbsmediacolspan\":\"4\",\"jbsmediaelement\":\"0\",\"jbsmediacustom\":\"\",\"jbsmedialinktype\":\"2\",\"titlerow\":\"1\",\"titlecol\":\"2\",\"titlecolspan\":\"4\",\"titleelement\":\"1\",\"titlecustom\":\"\",\"titlelinktype\":\"0\",\"daterow\":\"1\",\"datecol\":\"1\",\"datecolspan\":\"2\",\"dateelement\":\"1\",\"datecustom\":\"\",\"datelinktype\":\"0\",\"teacherrow\":\"0\",\"teachercol\":\"1\",\"teachercolspan\":\"1\",\"teacherelement\":\"1\",\"teachercustom\":\"\",\"teacherlinktype\":\"0\",\"teacherimagerrow\":\"0\",\"teacherimagecol\":\"1\",\"teacherimagecolspan\":\"1\",\"teacherimageelement\":\"1\",\"teacherimagecustom\":\"\",\"teacher-titlerow\":\"0\",\"teacher-titlecol\":\"1\",\"teacher-titlecolspan\":\"1\",\"teacher-titleelement\":\"1\",\"teacher-titlecustom\":\"\",\"teacher-titlelinktype\":\"0\",\"durationrow\":\"0\",\"durationcol\":\"1\",\"durationcolspan\":\"1\",\"durationelement\":\"1\",\"durationcustom\":\"\",\"durationlinktype\":\"0\",\"studyintrorow\":\"0\",\"studyintrocol\":\"1\",\"studyintrocolspan\":\"12\",\"studyintroelement\":\"1\",\"studyintrocustom\":\"\",\"studyintrolinktype\":\"0\",\"seriesrow\":\"0\",\"seriescol\":\"1\",\"seriescolspan\":\"1\",\"serieselement\":\"1\",\"seriescustom\":\"\",\"serieslinktype\":\"0\",\"seriesthumbnailrow\":\"0\",\"seriesthumbnailcol\":\"1\",\"seriesthumbnailcolspan\":\"1\",\"seriesthumbnailelement\":\"1\",\"seriesthumbnailcustom\":\"\",\"seriesthumbnaillinktype\":\"0\",\"seriesdescriptionrow\":\"0\",\"seriesdescriptioncol\":\"1\",\"seriesdescriptioncolspan\":\"1\",\"seriesdescriptionelement\":\"1\",\"seriesdescriptioncustom\":\"\",\"seriesdescriptionlinktype\":\"0\",\"submittedrow\":\"0\",\"submittedcol\":\"1\",\"submittedcolspan\":\"1\",\"submittedelement\":\"1\",\"submittedcustom\":\"\",\"submittedlinktype\":\"0\",\"hitsrow\":\"0\",\"hitscol\":\"1\",\"hitscolspan\":\"6\",\"hitselement\":\"1\",\"hitscustom\":\"\",\"hitslinktype\":\"0\",\"downloadsrow\":\"0\",\"downloadscol\":\"1\",\"downloadscolspan\":\"1\",\"downloadselement\":\"1\",\"downloadscustom\":\"\",\"downloadslinktype\":\"0\",\"studynumberrow\":\"0\",\"studynumbercol\":\"1\",\"studynumbercolspan\":\"1\",\"studynumberelement\":\"1\",\"studynumbercustom\":\"\",\"studynumberlinktype\":\"0\",\"topicrow\":\"0\",\"topiccol\":\"1\",\"topiccolspan\":\"6\",\"topicelement\":\"1\",\"topiccustom\":\"\",\"topiclinktype\":\"0\",\"locationsrow\":\"0\",\"locationscol\":\"1\",\"locationscolspan\":\"1\",\"locationselement\":\"1\",\"locationscustom\":\"\",\"locationslinktype\":\"0\",\"messagetyperow\":\"0\",\"messagetypecol\":\"1\",\"messagetypecolspan\":\"6\",\"messagetypeelement\":\"1\",\"messagetypecustom\":\"\",\"messagetypelinktype\":\"0\",\"thumbnailrow\":\"0\",\"thumbnailcol\":\"1\",\"thumbnailcolspan\":\"1\",\"thumbnailelement\":\"1\",\"thumbnailcustom\":\"\",\"thumbnaillinktype\":\"0\",\"customrow\":\"0\",\"customcol\":\"1\",\"customcolspan\":\"1\",\"customelement\":\"1\",\"customcustom\":\"\",\"customtext\":\"\",\"show_print_view\":\"1\",\"link_text\":\"Return to Studies List\",\"showrelated\":\"1\",\"showpodcastsubscribedetails\":\"1\",\"show_scripture_link\":\"0\",\"show_passage_view\":\"1\",\"bible_version\":\"51\",\"socialnetworking\":\"1\",\"sharetype\":\"1\",\"sharelabel\":\"Share This\",\"comments_type\":\"0\",\"show_comments\":\"1\",\"link_comments\":\"0\",\"comment_access\":\"1\",\"comment_publish\":\"0\",\"use_captcha\":\"1\",\"public_key\":\"\",\"private_key\":\"\",\"email_comments\":\"1\",\"recipient\":\"\",\"subject\":\"Comments on studies\",\"body\":\"Comments entered.\",\"study_detailtemplate\":\"\",\"teacher_title\":\"Our Teachers\",\"teachers_element\":\"1\",\"tsrowspanitem\":\"0\",\"tsrowspanitemspan\":\"4\",\"tsrowspanitemimage\":\"img-polaroid\",\"tsrowspanitempull\":\"pull-left\",\"use_headers_teacher_list\":\"1\",\"tslistcolor1\":\"\",\"tslistcolor2\":\"\",\"tsteacherrow\":\"1\",\"tsteachercol\":\"1\",\"tsteachercolspan\":\"2\",\"tsteacherelement\":\"1\",\"tsteachercustom\":\"\",\"tsteacherlinktype\":\"0\",\"tsteacherimagerrow\":\"0\",\"tsteacherimagecol\":\"1\",\"tsteacherimagecolspan\":\"1\",\"tsteacherimageelement\":\"1\",\"tsteacherimagecustom\":\"\",\"tsteacher-titlerow\":\"0\",\"tsteacher-titlecol\":\"1\",\"tsteacher-titlecolspan\":\"1\",\"tsteacher-titleelement\":\"1\",\"tsteacher-titlecustom\":\"\",\"tsteacher-titlelinktype\":\"0\",\"tsteacheremailrow\":\"0\",\"tsteacheremailcol\":\"1\",\"tsteacheremailcolspan\":\"1\",\"tsteacheremailelement\":\"1\",\"tsteacheremailcustom\":\"\",\"tsteacherwebrow\":\"0\",\"tsteacherwebcol\":\"1\",\"tsteacherwebcolspan\":\"1\",\"tsteacherwebelement\":\"1\",\"tsteacherphonerow\":\"0\",\"tsteacherphonecol\":\"1\",\"tsteacherphonecolspan\":\"1\",\"tsteacherphoneelement\":\"1\",\"tsteacherphonecustom\":\"\",\"tsteacherfbrow\":\"0\",\"tsteacherfbcol\":\"1\",\"tsteacherfbcolspan\":\"1\",\"tsteacherfbelement\":\"1\",\"tsteacherfbcustom\":\"\",\"tsteachertwrow\":\"0\",\"tsteachertwcol\":\"1\",\"tsteachertwcolspan\":\"1\",\"tsteachertwelement\":\"1\",\"tsteachertwcustom\":\"\",\"tsteacherblogrow\":\"0\",\"tsteacherblogcol\":\"1\",\"tsteacherblogcolspan\":\"1\",\"tsteacherblogelement\":\"1\",\"tsteacherblogcustom\":\"\",\"tsteachershortrow\":\"0\",\"tsteachershortcol\":\"1\",\"tsteachershortcolspan\":\"1\",\"tsteachershortelement\":\"1\",\"tsteachershortcustom\":\"\",\"tsteachershortlinktype\":\"0\",\"tscustomrow\":\"\",\"tscustomcol\":\"1\",\"tscustomcolspan\":\"1\",\"tscustomelement\":\"1\",\"tscustomcustom\":\"\",\"tscustomtext\":\"\",\"tsteacherallinonerow\":\"0\",\"tsteacherallinonecol\":\"1\",\"tsteacherallinonecolspan\":\"1\",\"tsteacherallinoneelement\":\"1\",\"tsteacherallinonecustom\":\"\",\"teacher_headercode\":\"\",\"teacher_templatecode\":\" {{teacher}} {{title}} {{teacher}} {{short}} {{information}} \",\"teacher_wrapcode\":\"0\",\"show_teacher_studies\":\"0\",\"studies\":\"\",\"label_teacher\":\"Latest Messages\",\"teacherlinkstudies\":\"1\",\"tdrowspanitem\":\"0\",\"tdrowspanitemspan\":\"4\",\"tdrowspanitemimage\":\"img-polaroid\",\"tdrowspanitempull\":\"pull-left\",\"use_headers_teacher_details\":\"1\",\"teacherdisplay_color\":\"\",\"tdteacherrow\":\"1\",\"tdteachercol\":\"1\",\"tdteachercolspan\":\"2\",\"tdteacherelement\":\"1\",\"tdteachercustom\":\"\",\"tdteacherimagerrow\":\"0\",\"tdteacherimagecol\":\"1\",\"tdteacherimagecolspan\":\"1\",\"tdteacherimageelement\":\"1\",\"tdteacherimagecustom\":\"\",\"tdteacher-titlerow\":\"0\",\"tdteacher-titlecol\":\"1\",\"tdteacher-titlecolspan\":\"1\",\"tdteacher-titleelement\":\"1\",\"tdteacher-titlecustom\":\"\",\"tdteacheremailrow\":\"0\",\"tdteacheremailcol\":\"1\",\"tdteacheremailcolspan\":\"1\",\"tdteacheremailelement\":\"1\",\"tdteacheremailcustom\":\"\",\"tdteacherwebrow\":\"0\",\"tdteacherwebcol\":\"1\",\"tdteacherwebcolspan\":\"1\",\"tdteacherwebelement\":\"1\",\"tdteacherphonerow\":\"0\",\"tdteacherphonecol\":\"1\",\"tdteacherphonecolspan\":\"1\",\"tdteacherphoneelement\":\"1\",\"tdteacherphonecustom\":\"\",\"tdteacherfbrow\":\"0\",\"tdteacherfbcol\":\"1\",\"tdteacherfbcolspan\":\"1\",\"tdteacherfbelement\":\"1\",\"tdteacherfbcustom\":\"\",\"tdteachertwrow\":\"0\",\"tdteachertwcol\":\"1\",\"tdteachertwcolspan\":\"1\",\"tdteachertwelement\":\"1\",\"tdteachertwcustom\":\"\",\"tdteacherblogrow\":\"0\",\"tdteacherblogcol\":\"1\",\"tdteacherblogcolspan\":\"1\",\"tdteacherblogelement\":\"1\",\"tdteacherblogcustom\":\"\",\"tdteachershortrow\":\"0\",\"tdteachershortcol\":\"1\",\"tdteachershortcolspan\":\"1\",\"tdteachershortelement\":\"1\",\"tdteachershortcustom\":\"\",\"tdteacherlongrow\":\"0\",\"tdteacherlongcol\":\"1\",\"tdteacherlongcolspan\":\"1\",\"tdteacherlongelement\":\"1\",\"tdteacherlongcustom\":\"\",\"tdteacheraddressrow\":\"0\",\"tdteacheraddresscol\":\"1\",\"tdteacheraddresscolspan\":\"1\",\"tdteacheraddresselement\":\"1\",\"tdteacheraddresscustom\":\"\",\"tdteacherlink1row\":\"0\",\"tdteacherlink1col\":\"1\",\"tdteacherlink1colspan\":\"1\",\"tdteacherlink1element\":\"1\",\"tdteacherlink1custom\":\"\",\"tdteacherlink2row\":\"0\",\"tdteacherlink2col\":\"1\",\"tdteacherlink2colspan\":\"1\",\"tdteacherlink2element\":\"1\",\"tdteacherlink2custom\":\"\",\"tdteacherlink3row\":\"0\",\"tdteacherlink3col\":\"1\",\"tdteacherlink3colspan\":\"1\",\"tdteacherlink3element\":\"1\",\"tdteacherlink3custom\":\"\",\"tdteacherlargeimagerow\":\"0\",\"tdteacherlargeimagecol\":\"1\",\"tdteacherlargeimagecolspan\":\"1\",\"tdteacherlargeimageelement\":\"1\",\"tdteacherlargeimagecustom\":\"\",\"tdcustomrow\":\"\",\"tdcustomcol\":\"1\",\"tdcustomcolspan\":\"1\",\"tdcustomelement\":\"1\",\"tdcustomcustom\":\"\",\"tdcustomtext\":\"\",\"tdteacherallinonerow\":\"0\",\"tdteacherallinonecol\":\"1\",\"tdteacherallinonecolspan\":\"1\",\"tdteacherallinoneelement\":\"1\",\"tdteacherallinonecustom\":\"\",\"series_title\":\"Our Series\",\"show_series_title\":\"1\",\"show_page_image_series\":\"1\",\"series_element\":\"1\",\"use_headers_series\":\"1\",\"series_show_description\":\"1\",\"series_characters\":\"\",\"search_series\":\"1\",\"series_list_teachers\":\"1\",\"series_list_years\":\"1\",\"series_list_show_pagination\":\"1\",\"series_list_order\":\"ASC\",\"series_order_field\":\"series_text\",\"srowspanitem\":\"0\",\"srowspanitemspan\":\"4\",\"srowspanitemimage\":\"img-polaroid\",\"srowspanitempull\":\"pull-left\",\"sseriesrow\":\"2\",\"sseriescol\":\"1\",\"sseriescolspan\":\"6\",\"sserieselement\":\"1\",\"sseriescustom\":\"\",\"sserieslinktype\":\"0\",\"sseriesthumbnailrow\":\"1\",\"sseriesthumbnailcol\":\"2\",\"sseriesthumbnailcolspan\":\"1\",\"sseriesthumbnailelement\":\"1\",\"sseriesthumbnailcustom\":\"\",\"sseriesthumbnaillinktype\":\"0\",\"steacherrow\":\"0\",\"steachercol\":\"1\",\"steachercolspan\":\"1\",\"steacherelement\":\"1\",\"steachercustom\":\"\",\"steacherlinktype\":\"0\",\"steacherimagerow\":\"0\",\"steacherimagecol\":\"1\",\"steacherimagecolspan\":\"1\",\"steacherimageelement\":\"1\",\"steacherimagecustom\":\"\",\"steacher-titlerow\":\"0\",\"steacher-titlecol\":\"1\",\"steacher-titlecolspan\":\"1\",\"steacher-titleelement\":\"1\",\"steacher-titlecustom\":\"\",\"steacher-titlelinktype\":\"0\",\"sdescriptionrow\":\"0\",\"sdescriptioncol\":\"1\",\"sdescriptioncolspan\":\"1\",\"sdescriptionelement\":\"1\",\"sdescriptioncustom\":\"\",\"sdescriptionlinktype\":\"0\",\"sdcustomrow\":\"0\",\"sdcustomcol\":\"1\",\"sdcustomcolspan\":\"1\",\"sdcustomelement\":\"1\",\"sdcustomcustom\":\"\",\"sdcustomtext\":\"\",\"series_detail_sort\":\"studydate\",\"series_detail_order\":\"DESC\",\"series_detail_limit\":\"\",\"series_list_return\":\"1\",\"sdrowspanitem\":\"0\",\"sdrowspanitemspan\":\"4\",\"sdrowspanitemimage\":\"img-polaroid\",\"sdrowspanitempull\":\"pull-left\",\"seriesdisplay_color\":\"\",\"use_header_seriesdisplay\":\"0\",\"sdseriesrow\":\"2\",\"sdseriescol\":\"1\",\"sdseriescolspan\":\"6\",\"sdserieselement\":\"1\",\"sdseriescustom\":\"\",\"sdserieslinktype\":\"0\",\"sdseriesthumbnailrow\":\"1\",\"sdseriesthumbnailcol\":\"2\",\"sdseriesthumbnailcolspan\":\"1\",\"sdseriesthumbnailelement\":\"1\",\"sdseriesthumbnailcustom\":\"\",\"sdseriesthumbnaillinktype\":\"0\",\"sdteacherrow\":\"0\",\"sdteachercol\":\"1\",\"sdteachercolspan\":\"1\",\"sdteacherelement\":\"1\",\"sdteachercustom\":\"\",\"sdteacherlinktype\":\"0\",\"sdteacherimagerow\":\"0\",\"sdteacherimagecol\":\"1\",\"sdteacherimagecolspan\":\"1\",\"sdteacherimageelement\":\"1\",\"sdteacherimagecustom\":\"\",\"sdteacher-titlerow\":\"0\",\"sdteacher-titlecol\":\"1\",\"sdteacher-titlecolspan\":\"1\",\"sdteacher-titleelement\":\"1\",\"sdteacher-titlecustom\":\"\",\"sdteacher-titlelinktype\":\"0\",\"sddescriptionrow\":\"0\",\"sddescriptioncol\":\"1\",\"sddescriptioncolspan\":\"1\",\"sddescriptionelement\":\"1\",\"sddescriptioncustom\":\"\",\"sddescriptionlinktype\":\"0\",\"tip_title\":\"Sermon Information\",\"tooltip\":\"1\",\"tip_item1_title\":\"Title\",\"tip_item1\":\"title\",\"tip_item2_title\":\"Details\",\"tip_item2\":\"title\",\"tip_item3_title\":\"Teacher\",\"tip_item3\":\"title\",\"tip_item4_title\":\"Reference\",\"tip_item4\":\"title\",\"tip_item5_title\":\"Date\",\"tip_item5\":\"title\",\"drowspanitem\":\"0\",\"drowspanitemspan\":\"4\",\"drowspanitemimage\":\"img-polaroid\",\"drowspanitempull\":\"pull-left\",\"dscripture1row\":\"1\",\"dscripture1col\":\"1\",\"dscripture1colspan\":\"1\",\"dscripture1element\":\"1\",\"dscripture1custom\":\"\",\"dscripture1linktype\":\"0\",\"dscripture2row\":\"0\",\"dscripture2col\":\"1\",\"dscripture2colspan\":\"1\",\"dscripture2element\":\"1\",\"dscripture2custom\":\"\",\"dscripture2linktype\":\"0\",\"dsecondaryrow\":\"0\",\"dsecondarycol\":\"1\",\"dsecondarycolspan\":\"1\",\"dsecondaryelement\":\"1\",\"dsecondarycustom\":\"\",\"dsecondarylinktype\":\"0\",\"djbsmediarow\":\"1\",\"djbsmediacol\":\"3\",\"djbsmediacolspan\":\"1\",\"djbsmediaelement\":\"1\",\"djbsmediacustom\":\"\",\"djbsmedialinktype\":\"0\",\"dcustomrow\":\"0\",\"dcustomcol\":\"1\",\"dcustomcolspan\":\"1\",\"dcustomelement\":\"1\",\"dcustomcustom\":\"\",\"dcustomtext\":\"\",\"dtitlerow\":\"1\",\"dtitlecol\":\"2\",\"dtitlecolspan\":\"3\",\"dtitleelement\":\"1\",\"dtitlecustom\":\"\",\"dtitlelinktype\":\"0\",\"ddaterow\":\"0\",\"ddatecol\":\"1\",\"ddatecolspan\":\"1\",\"ddateelement\":\"1\",\"ddatecustom\":\"\",\"ddatelinktype\":\"0\",\"dteacherrow\":\"0\",\"dteachercol\":\"1\",\"dteachercolspan\":\"1\",\"dteacherelement\":\"1\",\"dteachercustom\":\"\",\"dteacherlinktype\":\"0\",\"dteacherimagerrow\":\"0\",\"dteacherimagecol\":\"1\",\"dteacherimagecolspan\":\"1\",\"dteacherimageelement\":\"1\",\"dteacherimagecustom\":\"\",\"dteacher-titlerow\":\"0\",\"dteacher-titlecol\":\"1\",\"dteacher-titlecolspan\":\"1\",\"dteacher-titleelement\":\"1\",\"dteacher-titlecustom\":\"\",\"dteacher-titlelinktype\":\"0\",\"ddurationrow\":\"0\",\"ddurationcol\":\"1\",\"ddurationcolspan\":\"1\",\"ddurationelement\":\"1\",\"ddurationcustom\":\"\",\"ddurationlinktype\":\"0\",\"dstudyintrorow\":\"0\",\"dstudyintrocol\":\"1\",\"dstudyintrocolspan\":\"6\",\"dstudyintroelement\":\"1\",\"dstudyintrocustom\":\"\",\"dstudyintrolinktype\":\"0\",\"dseriesrow\":\"0\",\"dseriescol\":\"1\",\"dseriescolspan\":\"1\",\"dserieselement\":\"1\",\"dseriescustom\":\"\",\"dserieslinktype\":\"0\",\"dseriesthumbnailrow\":\"0\",\"dseriesthumbnailcol\":\"1\",\"dseriesthumbnailcolspan\":\"1\",\"dseriesthumbnailelement\":\"1\",\"dseriesthumbnailcustom\":\"\",\"dseriesthumbnaillinktype\":\"0\",\"dseriesdescriptionrow\":\"0\",\"dseriesdescriptioncol\":\"1\",\"dseriesdescriptioncolspan\":\"1\",\"dseriesdescriptionelement\":\"1\",\"dseriesdescriptioncustom\":\"\",\"dseriesdescriptionlinktype\":\"0\",\"dsubmittedrow\":\"0\",\"dsubmittedcol\":\"1\",\"dsubmittedcolspan\":\"1\",\"dsubmittedelement\":\"1\",\"dsubmittedcustom\":\"\",\"dsubmittedlinktype\":\"0\",\"dhitsrow\":\"0\",\"dhitscol\":\"1\",\"dhitscolspan\":\"6\",\"dhitselement\":\"1\",\"dhitscustom\":\"\",\"dhitslinktype\":\"0\",\"ddownloadsrow\":\"0\",\"ddownloadscol\":\"1\",\"ddownloadscolspan\":\"1\",\"ddownloadselement\":\"1\",\"ddownloadscustom\":\"\",\"ddownloadslinktype\":\"0\",\"dstudynumberrow\":\"0\",\"dstudynumbercol\":\"1\",\"dstudynumbercolspan\":\"1\",\"dstudynumberelement\":\"1\",\"dstudynumbercustom\":\"\",\"dstudynumberlinktype\":\"0\",\"dtopicrow\":\"0\",\"dtopiccol\":\"1\",\"dtopiccolspan\":\"6\",\"dtopicelement\":\"1\",\"dtopiccustom\":\"\",\"dtopiclinktype\":\"0\",\"dlocationsrow\":\"0\",\"dlocationscol\":\"1\",\"dlocationscolspan\":\"1\",\"dlocationselement\":\"1\",\"dlocationscustom\":\"\",\"dlocationslinktype\":\"0\",\"dmessagetyperow\":\"0\",\"dmessagetypecol\":\"1\",\"dmessagetypecolspan\":\"6\",\"dmessagetypeelement\":\"1\",\"dmessagetypecustom\":\"\",\"dmessagetypelinktype\":\"0\",\"dthumbnailrow\":\"0\",\"dthumbnailcol\":\"1\",\"dthumbnailcolspan\":\"1\",\"dthumbnailelement\":\"1\",\"dthumbnailcustom\":\"\",\"dthumbnaillinktype\":\"0\",\"landing_hide\":\"0\",\"landing_default_order\":\"ASC\",\"landing_hidelabel\":\"Show\\/Hide All\",\"headingorder_1\":\"teachers\",\"headingorder_2\":\"series\",\"headingorder_3\":\"books\",\"headingorder_4\":\"topics\",\"headingorder_5\":\"locations\",\"headingorder_6\":\"messagetypes\",\"headingorder_7\":\"years\",\"showteachers\":\"1\",\"landingteachersuselimit\":\"0\",\"landingteacherslimit\":\"\",\"teacherslabel\":\"Speakers\",\"linkto\":\"1\",\"showseries\":\"1\",\"landingseriesuselimit\":\"0\",\"landingserieslimit\":\"\",\"serieslabel\":\"Series\",\"series_linkto\":\"0\",\"showbooks\":\"1\",\"landingbookslimit\":\"\",\"bookslabel\":\"Books\",\"showtopics\":\"1\",\"landingtopicslimit\":\"\",\"topicslabel\":\"Topics\",\"showlocations\":\"1\",\"landinglocationsuselimit\":\"0\",\"landinglocationslimit\":\"\",\"locationslabel\":\"Locations\",\"showmessagetypes\":\"1\",\"landingmessagetypeuselimit\":\"0\",\"landingmessagetypeslimit\":\"\",\"messagetypeslabel\":\"Message Types\",\"showyears\":\"1\",\"landingyearslimit\":\"\",\"yearslabel\":\"Years\",\"series_order\":\"2\",\"books_order\":\"2\",\"teachers_order\":\"2\",\"years_order\":\"1\",\"topics_order\":\"2\",\"locations_order\":\"2\",\"messagetypes_order\":\"2\"}', + 'Default', 'textfile24.png', 'pdf24.png', 7490, 1); + +-- Dump of table #__bsms_timeset +-- ------------------------------------------------------------ + +INSERT IGNORE INTO `#__bsms_timeset` (`timeset`, `backup`) +VALUES +('1281646339', '1281646339'); + +-- Dump of table #__bsms_topics +-- ------------------------------------------------------------ + +INSERT IGNORE INTO `#__bsms_topics` (`id`, `topic_text`, `published`, `params`, `asset_id`, `language`, `access`) +VALUES +(1, 'JBS_TOP_ABORTION', 1, NULL, 7491, '*', 1), +(2, 'JBS_TOP_GODS_ACTIVITY', 1, NULL, 7492, '*', 1), +(3, 'JBS_TOP_ADDICTION', 1, NULL, 7493, '*', 1), +(4, 'JBS_TOP_AFTERLIFE', 1, NULL, 7494, '*', 1), +(5, 'JBS_TOP_APOLOGETICS', 1, NULL, 7495, '*', 1), +(6, 'JBS_TOP_GODS_ATTRIBUTES', 1, NULL, 7496, '*', 1), +(7, 'JBS_TOP_BAPTISM', 1, NULL, 7497, '*', 1), +(8, 'JBS_TOP_BASICS_OF_CHRISTIANITY', 1, NULL, 7498, '*', 1), +(9, 'JBS_TOP_BECOMING_A_CHRISTIAN', 1, NULL, 7499, '*', 1), +(10, 'JBS_TOP_BIBLE', 1, NULL, 7500, '*', 1), +(11, 'JBS_TOP_JESUS_BIRTH', 1, NULL, 7501, '*', 1), +(12, 'JBS_TOP_CHILDREN', 1, NULL, 7502, '*', 1), +(13, 'JBS_TOP_CHRIST', 1, NULL, 7503, '*', 1), +(14, 'JBS_TOP_CHRISTIAN_CHARACTER_FRUITS', 1, NULL, 7504, '*', 1), +(15, 'JBS_TOP_CHRISTIAN_VALUES', 1, NULL, 7505, '*', 1), +(16, 'JBS_TOP_CHRISTMAS_SEASON', 1, NULL, 7506, '*', 1), +(17, 'JBS_TOP_CHURCH', 1, NULL, 7507, '*', 1), +(18, 'JBS_TOP_COMMUNICATION', 1, NULL, 7508, '*', 1), +(19, 'JBS_TOP_COMMUNION___LORDS_SUPPER', 1, NULL, 7509, '*', 1), +(21, 'JBS_TOP_CREATION', 1, NULL, 7510, '*', 1), +(22, 'JBS_TOP_JESUS_CROSS_FINAL_WEEK', 1, NULL, 7511, '*', 1), +(23, 'JBS_TOP_CULTS', 1, NULL, 7512, '*', 1), +(24, 'JBS_TOP_DEATH', 1, NULL, 7513, '*', 1), +(26, 'JBS_TOP_DESCRIPTIONS_OF_GOD', 1, NULL, 7514, '*', 1), +(27, 'JBS_TOP_DISCIPLES', 1, NULL, 7515, '*', 1), +(28, 'JBS_TOP_DISCIPLESHIP', 1, NULL, 7516, '*', 1), +(29, 'JBS_TOP_JESUS_DIVINITY', 1, NULL, 7517, '*', 1), +(30, 'JBS_TOP_DIVORCE', 1, NULL, 7518, '*', 1), +(32, 'JBS_TOP_EASTER_SEASON', 1, NULL, 7519, '*', 1), +(33, 'JBS_TOP_EMOTIONS', 1, NULL, 7520, '*', 1), +(34, 'JBS_TOP_ENTERTAINMENT', 1, NULL, 7521, '*', 1), +(35, 'JBS_TOP_EVANGELISM', 1, NULL, 7522, '*', 1), +(36, 'JBS_TOP_FAITH', 1, NULL, 7523, '*', 1), +(37, 'JBS_TOP_BLENDED_FAMILY_RELATIONSHIPS', 1, NULL, 7524, '*', 1), +(39, 'JBS_TOP_FORGIVING_OTHERS', 1, NULL, 7525, '*', 1), +(40, 'JBS_TOP_GODS_FORGIVENESS', 1, NULL, 7526, '*', 1), +(41, 'JBS_TOP_FRIENDSHIP', 1, NULL, 7527, '*', 1), +(42, 'JBS_TOP_FULFILLMENT_IN_LIFE', 1, NULL, 7528, '*', 1), +(43, 'JBS_TOP_FUND_RAISING_RALLY', 1, NULL, 7529, '*', 1), +(44, 'JBS_TOP_FUNERALS', 1, NULL, 7530, '*', 1), +(45, 'JBS_TOP_GIVING', 1, NULL, 7531, '*', 1), +(46, 'JBS_TOP_GODS_WILL', 1, NULL, 7532, '*', 1), +(47, 'JBS_TOP_HARDSHIP_OF_LIFE', 1, NULL, 7533, '*', 1), +(48, 'JBS_TOP_HOLY_SPIRIT', 1, NULL, 7534, '*', 1), +(50, 'JBS_TOP_JESUS_HUMANITY', 1, NULL, 7535, '*', 1), +(52, 'JBS_TOP_KINGDOM_OF_GOD', 1, NULL, 7536, '*', 1), +(55, 'JBS_TOP_LEADERSHIP_ESSENTIALS', 1, NULL, 7537, '*', 1), +(56, 'JBS_TOP_JESUS_LIFE', 1, NULL, 7538, '*', 1), +(57, 'JBS_TOP_LOVE', 1, NULL, 7539, '*', 1), +(58, 'JBS_TOP_GODS_LOVE', 1, NULL, 7540, '*', 1), +(59, 'JBS_TOP_MARRIAGE', 1, NULL, 7541, '*', 1), +(61, 'JBS_TOP_JESUS_MIRACLES', 1, NULL, 7542, '*', 1), +(62, 'JBS_TOP_MISCONCEPTIONS_OF_CHRISTIANITY', 1, NULL, 7543, '*', 1), +(63, 'JBS_TOP_MONEY', 1, NULL, 7544, '*', 1), +(65, 'JBS_TOP_GODS_NATURE', 1, NULL, 7545, '*', 1), +(66, 'JBS_TOP_OUR_NEED_FOR_GOD', 1, NULL, 7546, '*', 1), +(69, 'JBS_TOP_PARABLES', 1, NULL, 7547, '*', 1), +(70, 'JBS_TOP_PARANORMAL', 1, NULL, 7548, '*', 1), +(71, 'JBS_TOP_PARENTING', 1, NULL, 7549, '*', 1), +(73, 'JBS_TOP_POVERTY', 1, NULL, 7550, '*', 1), +(74, 'JBS_TOP_PRAYER', 1, NULL, 7551, '*', 1), +(76, 'JBS_TOP_PROMINENT_N_T__MEN', 1, NULL, 7552, '*', 1), +(77, 'JBS_TOP_PROMINENT_N_T__WOMEN', 1, NULL, 7553, '*', 1), +(78, 'JBS_TOP_PROMINENT_O_T__MEN', 1, NULL, 7554, '*', 1), +(79, 'JBS_TOP_PROMINENT_O_T__WOMEN', 1, NULL, 7555, '*', 1), +(82, 'JBS_TOP_MESSIANIC_PROPHECIES', 1, NULL, 7556, '*', 1), +(83, 'JBS_TOP_RACISM', 1, NULL, 7557, '*', 1), +(84, 'JBS_TOP_JESUS_RESURRECTION', 1, NULL, 7558, '*', 1), +(85, 'JBS_TOP_SECOND_COMING', 1, NULL, 7559, '*', 1), +(86, 'JBS_TOP_SEXUALITY', 1, NULL, 7560, '*', 1), +(87, 'JBS_TOP_SIN', 1, NULL, 7561, '*', 1), +(88, 'JBS_TOP_SINGLENESS', 1, NULL, 7562, '*', 1), +(89, 'JBS_TOP_SMALL_GROUPS', 1, NULL, 7563, '*', 1), +(90, 'JBS_TOP_SPIRITUAL_DISCIPLINES', 1, NULL, 7564, '*', 1), +(91, 'JBS_TOP_SPIRITUAL_GIFTS', 1, NULL, 7565, '*', 1), +(92, 'JBS_TOP_SUPERNATURAL', 1, NULL, 7566, '*', 1), +(93, 'JBS_TOP_JESUS_TEACHING', 1, NULL, 7567, '*', 1), +(94, 'JBS_TOP_TEMPTATION', 1, NULL, 7568, '*', 1), +(95, 'JBS_TOP_TEN_COMMANDMENTS', 1, NULL, 7569, '*', 1), +(97, 'JBS_TOP_TRUTH', 1, NULL, 7570, '*', 1), +(98, 'JBS_TOP_TWELVE_APOSTLES', 1, NULL, 7571, '*', 1), +(100, 'JBS_TOP_WEDDINGS', 1, NULL, 7572, '*', 1), +(101, 'JBS_TOP_WORKPLACE_ISSUES', 1, NULL, 7573, '*', 1), +(102, 'JBS_TOP_WORLD_RELIGIONS', 1, NULL, 7574, '*', 1), +(103, 'JBS_TOP_FAMILY', 1, NULL, 7575, '*', 1), +(104, 'JBS_TOP_FREEDOM', 1, NULL, 7576, '*', 1), +(105, 'JBS_TOP_STEWARDSHIP', 1, NULL, 7577, '*', 1), +(106, 'JBS_TOP_WORSHIP', 1, NULL, 7578, '*', 1), +(107, 'JBS_TOP_HOLIDAYS', 1, NULL, 7579, '*', 1), +(108, 'JBS_TOP_SPECIAL_SERVICES', 1, NULL, 7580, '*', 1), +(109, 'JBS_TOP_MEN', 1, NULL, 7581, '*', 1), +(110, 'JBS_TOP_WOMEN', 1, NULL, 7582, '*', 1), +(111, 'JBS_TOP_HOT_TOPICS', 1, NULL, 7583, '*', 1), +(112, 'JBS_TOP_NARNIA', 1, NULL, 7584, '*', 1), +(113, 'JBS_TOP_DA_VINCI_CODE', 1, NULL, 7585, '*', 1), +(114, 'JBS_TOP_RAIN', 1, NULL, 7590, '*', 1); + +-- -------------------------------------------------------- diff --git a/com_biblestudy/admin/install/sql/uninstall-dbtables.sql b/admin/install/sql/uninstall-dbtables.sql similarity index 100% rename from com_biblestudy/admin/install/sql/uninstall-dbtables.sql rename to admin/install/sql/uninstall-dbtables.sql diff --git a/com_biblestudy/admin/install/sql/uninstall.sql b/admin/install/sql/uninstall.sql similarity index 100% rename from com_biblestudy/admin/install/sql/uninstall.sql rename to admin/install/sql/uninstall.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/6.1.1.sql b/admin/install/sql/updates/mysql/6.1.1.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/6.1.1.sql rename to admin/install/sql/updates/mysql/6.1.1.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/6.1.2.sql b/admin/install/sql/updates/mysql/6.1.2.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/6.1.2.sql rename to admin/install/sql/updates/mysql/6.1.2.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/6.1.3.sql b/admin/install/sql/updates/mysql/6.1.3.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/6.1.3.sql rename to admin/install/sql/updates/mysql/6.1.3.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/6.1.4.sql b/admin/install/sql/updates/mysql/6.1.4.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/6.1.4.sql rename to admin/install/sql/updates/mysql/6.1.4.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/6.2.2.sql b/admin/install/sql/updates/mysql/6.2.2.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/6.2.2.sql rename to admin/install/sql/updates/mysql/6.2.2.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/6.2.3.sql b/admin/install/sql/updates/mysql/6.2.3.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/6.2.3.sql rename to admin/install/sql/updates/mysql/6.2.3.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/7.0.0.sql b/admin/install/sql/updates/mysql/7.0.0.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/7.0.0.sql rename to admin/install/sql/updates/mysql/7.0.0.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/7.0.1.1.sql b/admin/install/sql/updates/mysql/7.0.1.1.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/7.0.1.1.sql rename to admin/install/sql/updates/mysql/7.0.1.1.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/7.0.1.sql b/admin/install/sql/updates/mysql/7.0.1.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/7.0.1.sql rename to admin/install/sql/updates/mysql/7.0.1.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/7.0.2.sql b/admin/install/sql/updates/mysql/7.0.2.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/7.0.2.sql rename to admin/install/sql/updates/mysql/7.0.2.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/7.0.3.sql b/admin/install/sql/updates/mysql/7.0.3.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/7.0.3.sql rename to admin/install/sql/updates/mysql/7.0.3.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/7.0.4.sql b/admin/install/sql/updates/mysql/7.0.4.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/7.0.4.sql rename to admin/install/sql/updates/mysql/7.0.4.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/7.1.0.sql b/admin/install/sql/updates/mysql/7.1.0.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/7.1.0.sql rename to admin/install/sql/updates/mysql/7.1.0.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/7.1.1.sql b/admin/install/sql/updates/mysql/7.1.1.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/7.1.1.sql rename to admin/install/sql/updates/mysql/7.1.1.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/7.1.2.sql b/admin/install/sql/updates/mysql/7.1.2.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/7.1.2.sql rename to admin/install/sql/updates/mysql/7.1.2.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/7.1.3.sql b/admin/install/sql/updates/mysql/7.1.3.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/7.1.3.sql rename to admin/install/sql/updates/mysql/7.1.3.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/8.0.0.sql b/admin/install/sql/updates/mysql/8.0.0.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/8.0.0.sql rename to admin/install/sql/updates/mysql/8.0.0.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/8.0.8.sql b/admin/install/sql/updates/mysql/8.0.8.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/8.0.8.sql rename to admin/install/sql/updates/mysql/8.0.8.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/9.0.0.sql b/admin/install/sql/updates/mysql/9.0.0.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/9.0.0.sql rename to admin/install/sql/updates/mysql/9.0.0.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/9.0.1.sql b/admin/install/sql/updates/mysql/9.0.1.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/9.0.1.sql rename to admin/install/sql/updates/mysql/9.0.1.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/9.0.10.sql b/admin/install/sql/updates/mysql/9.0.10.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/9.0.10.sql rename to admin/install/sql/updates/mysql/9.0.10.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/9.0.11.sql b/admin/install/sql/updates/mysql/9.0.11.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/9.0.11.sql rename to admin/install/sql/updates/mysql/9.0.11.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/9.0.12.sql b/admin/install/sql/updates/mysql/9.0.12.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/9.0.12.sql rename to admin/install/sql/updates/mysql/9.0.12.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/9.0.13.sql b/admin/install/sql/updates/mysql/9.0.13.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/9.0.13.sql rename to admin/install/sql/updates/mysql/9.0.13.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/9.0.14.sql b/admin/install/sql/updates/mysql/9.0.14.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/9.0.14.sql rename to admin/install/sql/updates/mysql/9.0.14.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/9.0.15.sql b/admin/install/sql/updates/mysql/9.0.15.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/9.0.15.sql rename to admin/install/sql/updates/mysql/9.0.15.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/9.0.17.sql b/admin/install/sql/updates/mysql/9.0.17.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/9.0.17.sql rename to admin/install/sql/updates/mysql/9.0.17.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/9.0.2.sql b/admin/install/sql/updates/mysql/9.0.2.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/9.0.2.sql rename to admin/install/sql/updates/mysql/9.0.2.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/9.0.8.sql b/admin/install/sql/updates/mysql/9.0.8.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/9.0.8.sql rename to admin/install/sql/updates/mysql/9.0.8.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/9.0.9.sql b/admin/install/sql/updates/mysql/9.0.9.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/9.0.9.sql rename to admin/install/sql/updates/mysql/9.0.9.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/9.1.0.sql b/admin/install/sql/updates/mysql/9.1.0.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/9.1.0.sql rename to admin/install/sql/updates/mysql/9.1.0.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/9.1.1.sql b/admin/install/sql/updates/mysql/9.1.1.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/9.1.1.sql rename to admin/install/sql/updates/mysql/9.1.1.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/9.1.2.sql b/admin/install/sql/updates/mysql/9.1.2.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/9.1.2.sql rename to admin/install/sql/updates/mysql/9.1.2.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/9.1.3.sql b/admin/install/sql/updates/mysql/9.1.3.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/9.1.3.sql rename to admin/install/sql/updates/mysql/9.1.3.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/9.1.4.sql b/admin/install/sql/updates/mysql/9.1.4.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/9.1.4.sql rename to admin/install/sql/updates/mysql/9.1.4.sql diff --git a/com_biblestudy/admin/install/sql/updates/mysql/9.1.5.sql b/admin/install/sql/updates/mysql/9.1.5.sql similarity index 100% rename from com_biblestudy/admin/install/sql/updates/mysql/9.1.5.sql rename to admin/install/sql/updates/mysql/9.1.5.sql diff --git a/com_biblestudy/admin/install/updates/6.1.1.php b/admin/install/updates/6.1.1.php similarity index 98% rename from com_biblestudy/admin/install/updates/6.1.1.php rename to admin/install/updates/6.1.1.php index cce07143a7..9648527e94 100644 --- a/com_biblestudy/admin/install/updates/6.1.1.php +++ b/admin/install/updates/6.1.1.php @@ -23,7 +23,7 @@ class Migration611 * * @param JDatabaseDriver $db Data bass driver * - * @return bool + * @return boolean * * @since 9.0.0 */ diff --git a/com_biblestudy/admin/install/updates/6.1.2.php b/admin/install/updates/6.1.2.php similarity index 97% rename from com_biblestudy/admin/install/updates/6.1.2.php rename to admin/install/updates/6.1.2.php index f75e0e3050..0cdc04f56b 100644 --- a/com_biblestudy/admin/install/updates/6.1.2.php +++ b/admin/install/updates/6.1.2.php @@ -23,7 +23,7 @@ class Migration612 * * @param JDatabaseDriver $db Data bass driver * - * @return bool + * @return boolean * * @since 9.0.0 */ diff --git a/com_biblestudy/admin/install/updates/6.1.3.php b/admin/install/updates/6.1.3.php similarity index 99% rename from com_biblestudy/admin/install/updates/6.1.3.php rename to admin/install/updates/6.1.3.php index 1ecb11c24b..5bd682c7a2 100644 --- a/com_biblestudy/admin/install/updates/6.1.3.php +++ b/admin/install/updates/6.1.3.php @@ -23,7 +23,7 @@ class Migration613 * * @param JDatabaseDriver $db Data bass driver * - * @return bool + * @return boolean * * @since 9.0.0 */ diff --git a/com_biblestudy/admin/install/updates/6.1.4.php b/admin/install/updates/6.1.4.php similarity index 99% rename from com_biblestudy/admin/install/updates/6.1.4.php rename to admin/install/updates/6.1.4.php index 6e9f584739..ab07a98c83 100644 --- a/com_biblestudy/admin/install/updates/6.1.4.php +++ b/admin/install/updates/6.1.4.php @@ -23,7 +23,7 @@ class Migration614 * * @param JDatabaseDriver $db Data bass driver * - * @return bool + * @return boolean * * @since 9.0.0 */ diff --git a/com_biblestudy/admin/install/updates/6.2.2.php b/admin/install/updates/6.2.2.php similarity index 98% rename from com_biblestudy/admin/install/updates/6.2.2.php rename to admin/install/updates/6.2.2.php index 8f806f80b8..37091a6789 100644 --- a/com_biblestudy/admin/install/updates/6.2.2.php +++ b/admin/install/updates/6.2.2.php @@ -23,7 +23,7 @@ class Migration622 * * @param JDatabaseDriver $db Data bass driver * - * @return bool + * @return boolean * * @since 9.0.0 */ diff --git a/com_biblestudy/admin/install/updates/6.2.3.php b/admin/install/updates/6.2.3.php similarity index 99% rename from com_biblestudy/admin/install/updates/6.2.3.php rename to admin/install/updates/6.2.3.php index f99c8d4989..8ce9ee59e3 100644 --- a/com_biblestudy/admin/install/updates/6.2.3.php +++ b/admin/install/updates/6.2.3.php @@ -23,7 +23,7 @@ class Migration623 * * @param JDatabaseDriver $db Data bass driver * - * @return bool + * @return boolean * * @since 9.0.0 */ diff --git a/com_biblestudy/admin/install/updates/7.0.0.php b/admin/install/updates/7.0.0.php similarity index 99% rename from com_biblestudy/admin/install/updates/7.0.0.php rename to admin/install/updates/7.0.0.php index bf4c44d1ab..fa8503f63a 100644 --- a/com_biblestudy/admin/install/updates/7.0.0.php +++ b/admin/install/updates/7.0.0.php @@ -25,7 +25,7 @@ class Migration700 * * @param JDatabaseDriver $db Data bass driver * - * @return bool + * @return boolean * * @since 9.0.0 * @throws Exception diff --git a/com_biblestudy/admin/install/updates/7.0.1.php b/admin/install/updates/7.0.1.php similarity index 99% rename from com_biblestudy/admin/install/updates/7.0.1.php rename to admin/install/updates/7.0.1.php index 77adb8de7d..1aa003db80 100644 --- a/com_biblestudy/admin/install/updates/7.0.1.php +++ b/admin/install/updates/7.0.1.php @@ -23,7 +23,7 @@ class Migration701 * * @param JDatabaseDriver $db Data bass driver * - * @return bool + * @return boolean * * @since 9.0.0 */ diff --git a/com_biblestudy/admin/install/updates/7.0.2.php b/admin/install/updates/7.0.2.php similarity index 100% rename from com_biblestudy/admin/install/updates/7.0.2.php rename to admin/install/updates/7.0.2.php diff --git a/com_biblestudy/admin/install/updates/7.1.0.php b/admin/install/updates/7.1.0.php similarity index 98% rename from com_biblestudy/admin/install/updates/7.1.0.php rename to admin/install/updates/7.1.0.php index a563e9bca9..c7940dee61 100644 --- a/com_biblestudy/admin/install/updates/7.1.0.php +++ b/admin/install/updates/7.1.0.php @@ -10,8 +10,6 @@ // No Direct Access defined('_JEXEC') or die; -use Joomla\Registry\Registry; - /** * Update for 7.1.0 class * diff --git a/com_biblestudy/admin/install/updates/8.0.0.php b/admin/install/updates/8.0.0.php similarity index 99% rename from com_biblestudy/admin/install/updates/8.0.0.php rename to admin/install/updates/8.0.0.php index b80d96dcc1..f894920155 100644 --- a/com_biblestudy/admin/install/updates/8.0.0.php +++ b/admin/install/updates/8.0.0.php @@ -10,7 +10,7 @@ // No Direct Access defined('_JEXEC') or die; -use \Joomla\Registry\Registry; +use Joomla\Registry\Registry; /** * Update for 8.0.0 class @@ -42,7 +42,7 @@ public function up($db) * * @param JDatabaseDriver $db Joomla Data bass driver * - * @return bool + * @return boolean * * @since 9.0.0 */ diff --git a/com_biblestudy/admin/install/updates/9.0.0.php b/admin/install/updates/9.0.0.php similarity index 99% rename from com_biblestudy/admin/install/updates/9.0.0.php rename to admin/install/updates/9.0.0.php index 54526062eb..3fdecde90b 100644 --- a/com_biblestudy/admin/install/updates/9.0.0.php +++ b/admin/install/updates/9.0.0.php @@ -7,7 +7,7 @@ */ defined('_JEXEC') or die; -use \Joomla\Registry\Registry; +use Joomla\Registry\Registry; /** * Update for 9.0.0 class @@ -82,7 +82,7 @@ public function build($db) * @param JDatabaseDriver $db Joomla database driver * @param array $server Server to process * - * @return bool + * @return boolean * * @since 9.0.0 */ @@ -143,7 +143,7 @@ public function servers($db, $server) * @param JDatabaseDriver $db Joomla database driver * @param array $media Media to process. * - * @return bool + * @return boolean * * @throws string If problem with media save. * @@ -323,7 +323,7 @@ public function media($db, $media) * * @param JDatabaseDriver $db Joomla Database driver * - * @return bool + * @return boolean * * @since 9.0.0 */ @@ -382,7 +382,7 @@ public function up($db) * * @param JDatabaseDriver $db Joomla Database driver * - * @return bool + * @return boolean * * @since 9.0.0 */ @@ -582,7 +582,7 @@ public function migrateTemplateLists($db) * * @param int $element ? * - * @return bool|string + * @return boolean|string * * @since 9.0.0 */ @@ -598,7 +598,7 @@ public function testingMigration($element) * * @param int $elementNumber Number to stirng * - * @return bool|string + * @return boolean|string * * @since 9.0.0 */ @@ -750,7 +750,7 @@ private function changeSetting($row, $col, $registry) * * @param JDatabaseDriver $db Joomla Database driver * - * @return bool + * @return boolean * * @since 9.0.0 */ diff --git a/com_biblestudy/admin/install/updates/9.0.1.php b/admin/install/updates/9.0.1.php similarity index 99% rename from com_biblestudy/admin/install/updates/9.0.1.php rename to admin/install/updates/9.0.1.php index eb5cc8985b..66075e6747 100644 --- a/com_biblestudy/admin/install/updates/9.0.1.php +++ b/admin/install/updates/9.0.1.php @@ -20,7 +20,7 @@ class Migration901 * * @param JDatabaseDriver $db Joomla Data bass driver * - * @return bool + * @return boolean * * @since 9.0.1 */ diff --git a/com_biblestudy/admin/install/updates/9.1.4.php b/admin/install/updates/9.1.4.php similarity index 98% rename from com_biblestudy/admin/install/updates/9.1.4.php rename to admin/install/updates/9.1.4.php index 108a6990f5..c48c627afd 100644 --- a/com_biblestudy/admin/install/updates/9.1.4.php +++ b/admin/install/updates/9.1.4.php @@ -7,8 +7,6 @@ */ defined('_JEXEC') or die; -use \Joomla\Registry\Registry; - /** * Update for 9.1.4 class * @@ -44,7 +42,7 @@ public function build($db) * * @param JDatabaseDriver $db Joomla Data bass driver * - * @return bool + * @return boolean * * @since 9.0.1 * @throws Exception diff --git a/com_biblestudy/admin/install/updates/9.1.5.php b/admin/install/updates/9.1.5.php similarity index 99% rename from com_biblestudy/admin/install/updates/9.1.5.php rename to admin/install/updates/9.1.5.php index 1f15fd79bf..52d21b4cbd 100644 --- a/com_biblestudy/admin/install/updates/9.1.5.php +++ b/admin/install/updates/9.1.5.php @@ -20,7 +20,7 @@ class Migration915 * * @param JDatabaseDriver $db Joomla Data bass driver * - * @return bool + * @return boolean * * @since 9.0.1 */ diff --git a/com_biblestudy/admin/language/cs-CZ/cs-CZ.com_biblestudy.ini b/admin/language/cs-CZ/cs-CZ.com_biblestudy.ini similarity index 100% rename from com_biblestudy/admin/language/cs-CZ/cs-CZ.com_biblestudy.ini rename to admin/language/cs-CZ/cs-CZ.com_biblestudy.ini diff --git a/com_biblestudy/admin/language/cs-CZ/cs-CZ.com_biblestudy.sys.ini b/admin/language/cs-CZ/cs-CZ.com_biblestudy.sys.ini similarity index 100% rename from com_biblestudy/admin/language/cs-CZ/cs-CZ.com_biblestudy.sys.ini rename to admin/language/cs-CZ/cs-CZ.com_biblestudy.sys.ini diff --git a/com_biblestudy/admin/language/de-DE/de-DE.com_biblestudy.ini b/admin/language/de-DE/de-DE.com_biblestudy.ini similarity index 100% rename from com_biblestudy/admin/language/de-DE/de-DE.com_biblestudy.ini rename to admin/language/de-DE/de-DE.com_biblestudy.ini diff --git a/com_biblestudy/admin/language/de-DE/de-DE.com_biblestudy.sys.ini b/admin/language/de-DE/de-DE.com_biblestudy.sys.ini similarity index 100% rename from com_biblestudy/admin/language/de-DE/de-DE.com_biblestudy.sys.ini rename to admin/language/de-DE/de-DE.com_biblestudy.sys.ini diff --git a/com_biblestudy/admin/language/en-GB/en-GB.com_biblestudy.ini b/admin/language/en-GB/en-GB.com_biblestudy.ini similarity index 94% rename from com_biblestudy/admin/language/en-GB/en-GB.com_biblestudy.ini rename to admin/language/en-GB/en-GB.com_biblestudy.ini index 4689568f25..9a32517601 100644 --- a/com_biblestudy/admin/language/en-GB/en-GB.com_biblestudy.ini +++ b/admin/language/en-GB/en-GB.com_biblestudy.ini @@ -2,22 +2,16 @@ ; 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 +; Used only for Post Install Language Translations. +COM_BIBLESTUDY="CWM-Proclaim" -; 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 -; /administrator/components/com_biblestudy/models/fields to load this language file. -; During execution, they load this file using -; $language = JFactory::getLanguage(); -; $language->load('com_biblestudy', JPATH_COMPONENT_ADMINISTRATOR, 'en-GB', true); // default english phrases -; $language->load('com_biblestudy', JPATH_COMPONENT_ADMINISTRATOR, null, true); // target language - -; Identify the component as extension -COM_BIBLESTUDY="Proclaim" +; Simple Mode message +SIMPLEMODEMESSAGE_TITLE="Simple Mode" +SIMPLEMODEMESSAGE_BODY="This version of CWM-Proclaim! introduces Simple Mode. Simple mode provides an easier interface to enter and display messages. It is ON by default. Turn it OFF and ON in the Administration tab." +SIMPLEMODEMESSAGE_ACTION="Go to the Administration tab and toggle Simple Mode OFF for the full featured CWM-Proclaim!" ;; Permission entry and Joomla common handling -COM_BIBLESTUDY_CONFIGURATION="Proclaim CONFIGURATION" +COM_BIBLESTUDY_CONFIGURATION="CWM-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" @@ -39,13 +33,17 @@ JGRID_CHECKBOX_ROW_N="Checkbox for row %d" ;; CMN Common phrases used in several sections ;JBS_COM_EDIT_ITEM="Edit Item" ;JBS_SELECT_LANGUAGE="Select Language" ; replaced by JOPTION_SELECT_LANGUAGE +JBS_PLG_SEARCH_BIBLESTUDYSEARCH="Sermons" +JBS_CPANEL_SIMPLE_MODE_ON="CWM-Proclaim! is set to Simple Mode" +JBS_CPANEL_SIMPLE_MODE_LINK="Turn off Simple Mode under Administrative Parameters" +JBS_CPANEL_SIMPLE_MODE_DESC="Simple mode provides an easier way to administer CWM-Proclaim! by restricting editing display choices" JBS_USERS="Users for Simple View" JBS_USERS_DESC="Choose one or more users for the simple view on the administrative side" JBS_CMN_SELECT_USER="Select user(s)" 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 Proclaim" +JBS_CPANEL_DESC_WELCOME="Welcome to CWM-Proclaim" JBS_CMN_CENTER="Center" JBS_CMN_LEFT="Left" JBS_CMN_RIGHT="Right" @@ -121,7 +119,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="Proclaim" +JBS_CMN_JOOMLA_BIBLE_STUDY="CWM-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" @@ -160,7 +158,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 Proclaim" +JBS_CMN_PHP_ERROR="Your host needs to use PHP %s or higher to run CWM-Proclaim" JBS_CMN_PLAYS="Plays" JBS_CMN_PODCAST="Podcast" JBS_CMN_PODCASTS="Podcasts" @@ -339,7 +337,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="Proclaim internal Sharing" +JBS_ADM_INTERNAL_SHARE="CWM-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." @@ -423,7 +421,7 @@ JBS_ADM_SHARETYPE_DESC="Choose whether to use internal Share or addthis.com soci JBS_ADM_SHOW_LOCATION_MEDIA="Show Location with Study on Media drop down" JBS_ADM_SHOW_LOCATION_MEDIA_DESC="Choose Show if you want the location information to show up with the study and date on the drop down in the mediafile edit view on the backend" JBS_ADM_SIMPLE_MODE="Simple Mode" -JBS_ADM_SIMPLE_MODE_DESC="This option turns off and on the Proclaim Simple Mode. Simple mode has fewer options and dedicated site views. This is a good choice for sites where simplicity of administering Proclaim is key" +JBS_ADM_SIMPLE_MODE_DESC="This option turns off and on the CWM-Proclaim Simple Mode. Simple mode has fewer options and dedicated site views. This is a good choice for sites where simplicity of administering CWM-Proclaim is key" JBS_ADM_SOCIALNETWORKING="Use Social Media Links" JBS_ADM_SOCIALNETWORKING_DESC="Show or Hide links for users to post studydetails link on social media sites (configure on Social Media tab)" JBS_ADM_STUDYLISTLIMIT="Study Limit in MediaFile" @@ -618,7 +616,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 : Proclaim Documentation" +JBS_CPL_PIM_ERROR_BUTTON="Error : CWM-Proclaim Documentation" ;; IBM Install, Backup, Migrate JBS_SUCCESS="records changed" @@ -648,11 +646,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 Proclaim. Please use import." +JBS_IBM_MIGRATE_NOT_OLD_DB="This file is for the current version of CWM-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 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_NOT_CURENT_DB="This file is not for the current version of CWM-Proclaim. Please use Migration to upgrade from this file." +JBS_IBM_NOT_DB="This is not a CWM-Proclaim SQL File. Please use this only for CWM-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" @@ -682,7 +680,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 Proclaim. 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 CWM-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" @@ -695,10 +693,10 @@ 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="Proclaim Results - %s" +JBS_INS_INSTALLATION_RESULTS="CWM-Proclaim Results - %s" JBS_INS_WARNING_INSTALL="You have tryed to access a page that is not permitted" -JBS_INS_XML_DESCRIPTION="Proclaim" -JBS_INS__MSG_DATABASE_UPDATEVERSION_ERROR="Database update version (%s) does not match Proclaim version (%s)." +JBS_INS_XML_DESCRIPTION="CWM-Proclaim" +JBS_INS__MSG_DATABASE_UPDATEVERSION_ERROR="Database update version (%s) does not match CWM-Proclaim version (%s)." ; Preflight and postflight strings ; duplicate? see IBM JBS_INS_CLICK_TO_FINISH="Click Here To Finish" @@ -706,28 +704,28 @@ JBS_INS_ERROR_SQL_READBUFFER="Could not read the sql file" 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="Proclaim" +JBS_INS_TITLE="CWM-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 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_BODY_TEMPLATE="Version 9.x of CWM-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" JBS_POSTINSTALL_TITLE_FONTAWESOME="Font Awesome update to v5" JBS_POSTINSTALL_BODY_FONTAWESOME="We have updated Font Awesome to v5. We have place v4 backwords compadibility script to acomidate." ; 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 Proclaim Management System, remove all database tables that start with #__bsms (or jos_bsms in most cases)." -JBS_INS_UNINSTALLED="Proclaim Plugins, and Modules have uninstalled" +JBS_INS_NO_DATABASE_REMOVED="Uninstall Results: Database tables have not been removed. To complete remove CWM-Proclaim Management System, remove all database tables that start with #__bsms (or jos_bsms in most cases)." +JBS_INS_UNINSTALLED="CWM-Proclaim Plugins, and Modules have uninstalled" ;Migration ; duplicate? see IBM JBS_MIG_FINISHED="Finished" -JBS_MIG_MIGRATION_DONE="Proclaim Migration - Finished." +JBS_MIG_MIGRATION_DONE="CWM-Proclaim Migration - Finished." JBS_MIG_PROCESSING="Processing:" -JBS_MIG_TITLE="Proclaim Migration" +JBS_MIG_TITLE="CWM-Proclaim Migration" JBS_MIG_STARTING="Starting" -JBS_MIG_WORKING="Proclaim Migration - still working" +JBS_MIG_WORKING="CWM-Proclaim Migration - still working" ;; LOC Locations JBS_LOC_LOCATION_NAME="Location Name" @@ -753,7 +751,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 Proclaim component at the bottom of the module display" +JBS_MDL_SHOW_COMPONENT_DESC="Choose whether to show or hide a link to the main CWM-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" @@ -834,7 +832,7 @@ JBS_MED_MEDIA_FILES="Media File Information" JBS_MED_MEDIA_FILES_DETAILS="Media File Details" JBS_MED_MEDIA_FILES_LINKER="Media File Linker" JBS_MED_MEDIA_FILES_SETTINGS="Media File Settings" -JBS_MED_MEDIA_FILES_STATS="Statistics" +JBS_MED_MEDIA_FILES_STATS="Plays/Downloads" JBS_MED_MEDIA_POPUPFOOTER="Popup Footer Elements" JBS_MED_MEDIA_POPUPMARGIN="Height Margin for Popup" JBS_MED_MEDIA_POPUPMARGIN_DESC="Set space above and below popup for header and footer. Affects only this file" @@ -948,7 +946,7 @@ JBS_PDC_XML_TTITLE="XML File" JBS_PDC_XML="XML" ;; PLG Plugin specific strings (all plugins) -PLG_JBSBACKUP_HEADER="Your site's Proclaim database backup" +PLG_JBSBACKUP_HEADER="Your site's CWM-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" @@ -1044,7 +1042,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 Proclaim's user name" +JBS_SHR_USERNAME_DESC="This is not required. If left blank you will use CWM-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" @@ -1172,51 +1170,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="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_ADMINISTRATION="CWM-Proclaim: Administration" +JBS_TITLE_COMMENTS="CWM-Proclaim: Comments" +JBS_TITLE_COMMENT_CREATING="CWM-Proclaim: Comment New" +JBS_TITLE_COMMENT_EDITING="CWM-Proclaim: Comment Edit ID#%s" +JBS_TITLE_CONTROL_PANEL="CWM-Proclaim: Control Panel" +JBS_TITLE_INSTALL="CWM-Proclaim: %s for %s" +JBS_TITLE_LOCATIONS="CWM-Proclaim: Locations" +JBS_TITLE_LOCATIONS_CREATING="CWM-Proclaim: Locations New" +JBS_TITLE_LOCATIONS_EDITING="CWM-Proclaim: Locations Edit %s" +JBS_TITLE_MEDIA_FILES="CWM-Proclaim: Media Files" +JBS_TITLE_MEDIA_FILES_CREATING="CWM-Proclaim: Media Files New" +JBS_TITLE_MEDIA_FILES_EDITING="CWM-Proclaim: Media Files Edit %s" +JBS_TITLE_MESSAGETYPES="CWM-Proclaim: Message Type" +JBS_TITLE_MESSAGETYPES_CREATING="CWM-Proclaim: Message Type New" +JBS_TITLE_MESSAGETYPES_EDITING="CWM-Proclaim: Message Type Edit %s" +JBS_TITLE_PODCASTS="CWM-Proclaim: Podcasts" +JBS_TITLE_PODCAST_CREATING="CWM-Proclaim: Podcast New" +JBS_TITLE_PODCAST_EDITING="CWM-Proclaim: Podcast Edit %s" +JBS_TITLE_SERIES="CWM-Proclaim: Series" +JBS_TITLE_SERIES_CREATING="CWM-Proclaim: Series New" +JBS_TITLE_SERIES_EDITING="CWM-Proclaim: Series Edit %s" +JBS_TITLE_SERVERS="CWM-Proclaim: Servers" +JBS_TITLE_SERVERS_CREATING="CWM-Proclaim: Servers New" +JBS_TITLE_SERVERS_EDITING="CWM-Proclaim: Servers Edit %s" +JBS_TITLE_SOCIAL_NETWORKING_LINKS="CWM-Proclaim: Social Networking Links" +JBS_TITLE_SOCIAL_NETWORKING_LINKS_CREATING="CWM-Proclaim: Social Networking Links New" +JBS_TITLE_SOCIAL_NETWORKING_LINKS_EDITING="CWM-Proclaim: Social Networking Links Edit %s" +JBS_TITLE_STUDIES="CWM-Proclaim: Studies" +JBS_TITLE_STUDIES_CREATING="CWM-Proclaim: Studies New" +JBS_TITLE_STUDIES_EDITING="CWM-Proclaim: Studies Edit %s" +JBS_TITLE_STYLES="CWM-Proclaim: Styles" +JBS_TITLE_STYLES_CREATING="CWM-Proclaim: Styles New" +JBS_TITLE_STYLES_EDITING="CWM-Proclaim: Styles Edit File: %s" +JBS_TITLE_TEACHERS="CWM-Proclaim: Teachers" +JBS_TITLE_TEACHER_CREATING="CWM-Proclaim: Teacher New" +JBS_TITLE_TEACHER_EDITING="CWM-Proclaim: Teacher Edit %s" +JBS_TITLE_TEMPLATECODES="CWM-Proclaim: Template Codes" +JBS_TITLE_TEMPLATECODES_CREATING="CWM-Proclaim: Template Code New" +JBS_TITLE_TEMPLATECODES_EDITING="CWM-Proclaim: Template Code Edit %s" +JBS_TITLE_TEMPLATES="CWM-Proclaim: Templates" +JBS_TITLE_TEMPLATES_CREATING="CWM-Proclaim: Templates New" +JBS_TITLE_TEMPLATES_EDITING="CWM-Proclaim: Templates Edit %s" +JBS_TITLE_TOPICS="CWM-Proclaim: Topics" +JBS_TITLE_TOPICS_CREATING="CWM-Proclaim: Topics New" +JBS_TITLE_TOPICS_EDITING="CWM-Proclaim: Topics Edit %s" JBS_TITLE_UPLOAD_FORM="Upload Media File" ;; Topic Items @@ -1433,7 +1431,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="Proclaim Comments" +JBS_TPL_JBS_COMMENTS="CWM-Proclaim Comments" JBS_TPL_JCOMMENTS="Use JComments - Must be installed" JBS_TPL_LABEL_ONLY="Label Only" JBS_TPL_LANDINGPAGE_BOOKSLABEL="Books Label" @@ -1837,4 +1835,4 @@ JBS_ADDON_CUSTOM_ICON_DESC="Use any of the FontAwesome icons with this format fa JBS_ADDON_BUTTON_TEXT="Button Text" JBS_ADDON_BUTTON_TEXT_DESC="If you choose only a button, enter text for that button" JBS_ADDON_DOWNLOAD_USE_BUTTON="Default Download Icon" -JBS_ADDON_DOWNLOAD_USE_BUTTON_DESC="Choose whether to use a button/icon or image for the default download icon. Button/icon overrides image choice" +JBS_ADDON_DOWNLOAD_USE_BUTTON_DESC="Choose whether to use a button/icon or image for the default download icon. Button/icon overrides image choice" \ No newline at end of file diff --git a/com_biblestudy/admin/language/en-GB/en-GB.com_biblestudy.sys.ini b/admin/language/en-GB/en-GB.com_biblestudy.sys.ini similarity index 83% rename from com_biblestudy/admin/language/en-GB/en-GB.com_biblestudy.sys.ini rename to admin/language/en-GB/en-GB.com_biblestudy.sys.ini index 4108488772..56e0c809e5 100644 --- a/com_biblestudy/admin/language/en-GB/en-GB.com_biblestudy.sys.ini +++ b/admin/language/en-GB/en-GB.com_biblestudy.sys.ini @@ -9,15 +9,15 @@ SIMPLEMODEMESSAGE_TITLE="Simple Mode" SIMPLEMODEMESSAGE_BODY="This version of Proclaim! introduces Simple Mode. Simple mode provides an easier interface to enter and display messages. It is ON by default. Turn it OFF and ON in the Administration tab." SIMPLEMODEMESSAGE_ACTION="Go to the Administration tab and toggle Simple Mode OFF for the full featured Proclaim!" ; Identify the component as extension -COM_BIBLESTUDY="Proclaim" +COM_BIBLESTUDY="CWM-Proclaim" ; Name of the component -JBS_CMN_COM_BIBLESTUDY="Proclaim" +JBS_CMN_COM_BIBLESTUDY="CWM-Proclaim" ; Install strings JBS_INS_ERROR_SQL_READBUFFER="Could not read the sql file" -JBS_INS_XML_DESCRIPTION="Proclaim" -JBS_INS_INSTALLATION_RESULTS="Proclaim Results" +JBS_INS_XML_DESCRIPTION="CWM-Proclaim" +JBS_INS_INSTALLATION_RESULTS="CWM-Proclaim Results" JBS_INS_FAILURE="Failed to set up database" ; Preflight and postflight strings @@ -25,12 +25,23 @@ JBS_INS_GET_MORE_HELP="Get more help and information at ChristianWebMinistries.o 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="Proclaim" -JBS_MIGfinishED="Proclaim migration finished" +JBS_INS_TITLE="CWM-Proclaim" +JBS_MIGFINISHED="CWM-Proclaim migration finished" + +; Install Strings +JBS_INS_INSTALLED="Installed" +JBS_INS_NOT_INSTALLED="Not Installed" +JBS_INS_REMOVED="Removed" +JBS_INS_NOT_REMOVED="Not Removed" +JBS_INS_CLIENT="Client" +JBS_INS_MODULE="Module" +JBS_INS_STATUS="Status" +JBS_INS_EXTENSION="Extension" +JBS_INS_UNINSTALL="Uninstall" ; Uninstall strings (used when the extension is uninstalled) -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)." +JBS_INS_UNINSTALLED="CWM-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 CWM-Proclaim Management System, remove all database tables that start with #__bsms (or jos_bsms in most cases)." ; Menue entries JBS_MNU_ADMINISTRATION="Administration" diff --git a/com_biblestudy/admin/language/es-ES/es-ES.com_biblestudy.ini b/admin/language/es-ES/es-ES.com_biblestudy.ini similarity index 100% rename from com_biblestudy/admin/language/es-ES/es-ES.com_biblestudy.ini rename to admin/language/es-ES/es-ES.com_biblestudy.ini diff --git a/com_biblestudy/admin/language/es-ES/es-ES.com_biblestudy.sys.ini b/admin/language/es-ES/es-ES.com_biblestudy.sys.ini similarity index 100% rename from com_biblestudy/admin/language/es-ES/es-ES.com_biblestudy.sys.ini rename to admin/language/es-ES/es-ES.com_biblestudy.sys.ini diff --git a/com_biblestudy/admin/language/hu-HU/hu-HU.com_biblestudy.ini b/admin/language/hu-HU/hu-HU.com_biblestudy.ini similarity index 100% rename from com_biblestudy/admin/language/hu-HU/hu-HU.com_biblestudy.ini rename to admin/language/hu-HU/hu-HU.com_biblestudy.ini diff --git a/com_biblestudy/admin/language/hu-HU/hu-HU.com_biblestudy.sys.ini b/admin/language/hu-HU/hu-HU.com_biblestudy.sys.ini similarity index 100% rename from com_biblestudy/admin/language/hu-HU/hu-HU.com_biblestudy.sys.ini rename to admin/language/hu-HU/hu-HU.com_biblestudy.sys.ini diff --git a/com_biblestudy/admin/language/nl-NL/nl-NL.com_biblestudy.ini b/admin/language/nl-NL/nl-NL.com_biblestudy.ini similarity index 100% rename from com_biblestudy/admin/language/nl-NL/nl-NL.com_biblestudy.ini rename to admin/language/nl-NL/nl-NL.com_biblestudy.ini diff --git a/com_biblestudy/admin/language/no-NO/no-NO.com_biblestudy.ini b/admin/language/no-NO/no-NO.com_biblestudy.ini similarity index 100% rename from com_biblestudy/admin/language/no-NO/no-NO.com_biblestudy.ini rename to admin/language/no-NO/no-NO.com_biblestudy.ini diff --git a/com_biblestudy/admin/language/no-NO/no-NO.com_biblestudy.sys.ini b/admin/language/no-NO/no-NO.com_biblestudy.sys.ini similarity index 100% rename from com_biblestudy/admin/language/no-NO/no-NO.com_biblestudy.sys.ini rename to admin/language/no-NO/no-NO.com_biblestudy.sys.ini diff --git a/com_biblestudy/admin/lib/assets.php b/admin/lib/assets.php similarity index 62% rename from com_biblestudy/admin/lib/assets.php rename to admin/lib/assets.php index c702f2e3b2..8e162b8f0b 100644 --- a/com_biblestudy/admin/lib/assets.php +++ b/admin/lib/assets.php @@ -19,8 +19,16 @@ class JBSMAssets { public static $parent_id = null; + /** + * @var array + * @since 7.0.4 + */ public $query = array(); + /** + * @var integer + * @since 7.0.4 + */ public $count = 0; /** @@ -30,7 +38,7 @@ class JBSMAssets * * @since 9.0.0 */ - public function build () + public function build() { $db = JFactory::getDbo(); @@ -47,7 +55,7 @@ public function build () ->from($db->qn($object['name']) . ' as j') ->leftJoin('#__assets as a ON (a.id = j.asset_id)'); $db->setQuery($query); - $results = $db->loadObjectList(); + $results = $db->loadObjectList(); $this->count += count($results); $this->query = array_merge((array) $this->query, array($object['assetname'] => $results)); } @@ -67,7 +75,7 @@ public function build () * * @since 9.0.0 */ - public static function fixAssets ($key, $result) + public static function fixAssets($key, $result) { $result = (Object) $result; self::parentid(); @@ -97,11 +105,11 @@ public static function fixAssets ($key, $result) /** * Set Parent ID * - * @return int Parent ID + * @return integer Parent ID * * @since 9.0.0 */ - public static function parentid () + public static function parentid() { if (!self::$parent_id) { @@ -126,87 +134,87 @@ public static function parentid () * * @since 9.0.0 */ - protected static function getassetObjects () + protected static function getassetObjects() { $objects = array( - array( - 'name' => '#__bsms_servers', - 'titlefield' => 'server_name', - 'assetname' => 'server', - 'realname' => 'JBS_CMN_SERVERS' - ), - array( - 'name' => '#__bsms_studies', - 'titlefield' => 'studytitle', - 'assetname' => 'message', - 'realname' => 'JBS_CMN_STUDIES' - ), - array( - 'name' => '#__bsms_comments', - 'titlefield' => 'comment_date', - 'assetname' => 'comment', - 'realname' => 'JBS_CMN_COMMENTS' - ), - array( - 'name' => '#__bsms_locations', - 'titlefield' => 'location_text', - 'assetname' => 'location', - 'realname' => 'JBS_CMN_LOCATIONS' - ), - array( - 'name' => '#__bsms_mediafiles', - 'titlefield' => 'filename', - 'assetname' => 'mediafile', - 'realname' => 'JBS_CMN_MEDIA_FILES' - ), - array( - 'name' => '#__bsms_message_type', - 'titlefield' => 'message_type', - 'assetname' => 'messagetype', - 'realname' => 'JBS_CMN_MESSAGETYPES' - ), - array( - 'name' => '#__bsms_podcast', - 'titlefield' => 'title', - 'assetname' => 'podcast', - 'realname' => 'JBS_CMN_PODCASTS' - ), - array( - 'name' => '#__bsms_series', - 'titlefield' => 'series_text', - 'assetname' => 'serie', - 'realname' => 'JBS_CMN_SERIES' - ), - array( - 'name' => '#__bsms_teachers', - 'titlefield' => 'teachername', - 'assetname' => 'teacher', - 'realname' => 'JBS_CMN_TEACHERS' - ), - array( - 'name' => '#__bsms_templates', - 'titlefield' => 'title', - 'assetname' => 'template', - 'realname' => 'JBS_CMN_TEMPLATES' - ), - array( - 'name' => '#__bsms_topics', - 'titlefield' => 'topic_text', - 'assetname' => 'topic', - 'realname' => 'JBS_CMN_TOPICS' - ), - array( - 'name' => '#__bsms_templatecode', - 'titlefield' => 'filename', - 'assetname' => 'templatecode', - 'realname' => 'JBS_CMN_TEMPLATECODE' - ), - array( - 'name' => '#__bsms_admin', - 'titlefield' => 'id', - 'assetname' => 'admin', - 'realname' => 'JBS_CMN_ADMINISTRATION' - ) + array( + 'name' => '#__bsms_servers', + 'titlefield' => 'server_name', + 'assetname' => 'server', + 'realname' => 'JBS_CMN_SERVERS' + ), + array( + 'name' => '#__bsms_studies', + 'titlefield' => 'studytitle', + 'assetname' => 'message', + 'realname' => 'JBS_CMN_STUDIES' + ), + array( + 'name' => '#__bsms_comments', + 'titlefield' => 'comment_date', + 'assetname' => 'comment', + 'realname' => 'JBS_CMN_COMMENTS' + ), + array( + 'name' => '#__bsms_locations', + 'titlefield' => 'location_text', + 'assetname' => 'location', + 'realname' => 'JBS_CMN_LOCATIONS' + ), + array( + 'name' => '#__bsms_mediafiles', + 'titlefield' => 'filename', + 'assetname' => 'mediafile', + 'realname' => 'JBS_CMN_MEDIA_FILES' + ), + array( + 'name' => '#__bsms_message_type', + 'titlefield' => 'message_type', + 'assetname' => 'messagetype', + 'realname' => 'JBS_CMN_MESSAGETYPES' + ), + array( + 'name' => '#__bsms_podcast', + 'titlefield' => 'title', + 'assetname' => 'podcast', + 'realname' => 'JBS_CMN_PODCASTS' + ), + array( + 'name' => '#__bsms_series', + 'titlefield' => 'series_text', + 'assetname' => 'serie', + 'realname' => 'JBS_CMN_SERIES' + ), + array( + 'name' => '#__bsms_teachers', + 'titlefield' => 'teachername', + 'assetname' => 'teacher', + 'realname' => 'JBS_CMN_TEACHERS' + ), + array( + 'name' => '#__bsms_templates', + 'titlefield' => 'title', + 'assetname' => 'template', + 'realname' => 'JBS_CMN_TEMPLATES' + ), + array( + 'name' => '#__bsms_topics', + 'titlefield' => 'topic_text', + 'assetname' => 'topic', + 'realname' => 'JBS_CMN_TOPICS' + ), + array( + 'name' => '#__bsms_templatecode', + 'titlefield' => 'filename', + 'assetname' => 'templatecode', + 'realname' => 'JBS_CMN_TEMPLATECODE' + ), + array( + 'name' => '#__bsms_admin', + 'titlefield' => 'id', + 'assetname' => 'admin', + 'realname' => 'JBS_CMN_ADMINISTRATION' + ) ); return $objects; @@ -222,7 +230,7 @@ protected static function getassetObjects () * * @since 9.0.0 */ - private static function setasset ($data, $assetName) + private static function setasset($data, $assetName) { JTable::addIncludePath(JPATH_COMPONENT_ADMINISTRATOR . '/tables'); $table = JTable::getInstance($assetName, 'Table'); @@ -231,10 +239,10 @@ private static function setasset ($data, $assetName) { try { - if ($assetName == 'mediafile') + if ($assetName === 'mediafile') { $columns = array('media_image', 'special', 'filename', 'size', 'mime_type', 'mediacode', 'link_type', - 'docMan_id', 'article_id', 'virtueMart_id', 'player', 'popup', 'server', 'internal_viewer', 'path'); + 'docMan_id', 'article_id', 'virtueMart_id', 'player', 'popup', 'server', 'internal_viewer', 'path'); foreach ($columns as $col) { @@ -250,6 +258,7 @@ private static function setasset ($data, $assetName) return false; } + $table->store(); } @@ -265,7 +274,7 @@ private static function setasset ($data, $assetName) * * @since 9.0.0 */ - private static function deleteasset ($data) + private static function deleteasset($data) { $db = JFactory::getDbo(); @@ -275,7 +284,7 @@ private static function deleteasset ($data) { $query = $db->getQuery(true); $query->delete('#__assets') - ->where('id = ' . $db->quote($data->asset_id)); + ->where('id = ' . $db->quote($data->asset_id)); $db->setQuery($query); $db->execute(); } @@ -295,7 +304,7 @@ private static function deleteasset ($data) * * @since 9.0.0 */ - public static function checkAssets () + public static function checkAssets() { $return = array(); $db = JFactory::getDbo(); @@ -317,8 +326,8 @@ public static function checkAssets () // Get the total number of rows and collect the table into a query $query = $db->getQuery(true); $query->select('j.id as jid, j.asset_id as jasset_id, a.id as aid, a.rules as arules, a.parent_id') - ->from($db->qn($object['name']) . ' as j') - ->leftJoin('#__assets as a ON (a.id = j.asset_id)'); + ->from($db->qn($object['name']) . ' as j') + ->leftJoin('#__assets as a ON (a.id = j.asset_id)'); $db->setQuery($query); $results = $db->loadObjectList(); $nullrows = 0; @@ -341,28 +350,28 @@ public static function checkAssets () $nomatchrows++; } // If $parent_id and $result->parent_id match and the Asset rules are not blank then everything is okay - if (self::$parent_id == $result->parent_id && $result->arules !== "") + if (self::$parent_id == $result->parent_id && $result->arules !== '') { $matchrows++; } // If $parent_id and $result->parent_id match and the Asset rules is blank we need to fix - if (self::$parent_id == $result->parent_id && $result->arules === "") + if (self::$parent_id == $result->parent_id && $result->arules === '') { $arulesrows++; } } $return[] = array( - 'realname' => $object['realname'], - 'numrows' => $numrows, - 'nullrows' => $nullrows, - 'matchrows' => $matchrows, - 'arulesrows' => $arulesrows, - 'nomatchrows' => $nomatchrows, - 'parent_id' => self::$parent_id, - 'result_parent_id' => $result->parent_id, - 'id' => $result->jid, - 'assetid' => $result->jasset_id + 'realname' => $object['realname'], + 'numrows' => $numrows, + 'nullrows' => $nullrows, + 'matchrows' => $matchrows, + 'arulesrows' => $arulesrows, + 'nomatchrows' => $nomatchrows, + 'parent_id' => self::$parent_id, + 'result_parent_id' => $result->parent_id, + 'id' => $result->jid, + 'assetid' => $result->jasset_id ); } diff --git a/com_biblestudy/admin/lib/backup.php b/admin/lib/backup.php similarity index 100% rename from com_biblestudy/admin/lib/backup.php rename to admin/lib/backup.php diff --git a/com_biblestudy/admin/lib/debug.php b/admin/lib/debug.php similarity index 100% rename from com_biblestudy/admin/lib/debug.php rename to admin/lib/debug.php diff --git a/com_biblestudy/admin/lib/piconvert.php b/admin/lib/piconvert.php similarity index 100% rename from com_biblestudy/admin/lib/piconvert.php rename to admin/lib/piconvert.php diff --git a/com_biblestudy/admin/lib/restore.php b/admin/lib/restore.php similarity index 100% rename from com_biblestudy/admin/lib/restore.php rename to admin/lib/restore.php diff --git a/com_biblestudy/admin/lib/ssconvert.php b/admin/lib/ssconvert.php similarity index 100% rename from com_biblestudy/admin/lib/ssconvert.php rename to admin/lib/ssconvert.php diff --git a/com_biblestudy/admin/lib/stats.php b/admin/lib/stats.php similarity index 99% rename from com_biblestudy/admin/lib/stats.php rename to admin/lib/stats.php index 98c2395369..062a31c13d 100644 --- a/com_biblestudy/admin/lib/stats.php +++ b/admin/lib/stats.php @@ -10,7 +10,7 @@ // No Direct Access defined('_JEXEC') or die; -use \Joomla\Registry\Registry; +use Joomla\Registry\Registry; /** * Bible Study stats support class diff --git a/com_biblestudy/admin/lib/version.php b/admin/lib/version.php similarity index 100% rename from com_biblestudy/admin/lib/version.php rename to admin/lib/version.php diff --git a/com_biblestudy/admin/models/admin.php b/admin/models/admin.php similarity index 99% rename from com_biblestudy/admin/models/admin.php rename to admin/models/admin.php index 9bdb10a0e5..1f236f380d 100644 --- a/com_biblestudy/admin/models/admin.php +++ b/admin/models/admin.php @@ -14,7 +14,8 @@ JLoader::register('InstallerModel', JPATH_ADMINISTRATOR . '/components/com_installer/models/extension.php'); JLoader::register('Com_BiblestudyInstallerScript', JPATH_ADMINISTRATOR . '/components/com_biblestudy/biblestudy.script.php'); JLoader::register('JoomlaInstallerScript', JPATH_ADMINISTRATOR . '/components/com_admin/script.php'); -use \Joomla\Registry\Registry; + +use Joomla\Registry\Registry; /** * Admin admin model class diff --git a/com_biblestudy/admin/models/archive.php b/admin/models/archive.php similarity index 100% rename from com_biblestudy/admin/models/archive.php rename to admin/models/archive.php diff --git a/com_biblestudy/admin/models/assets.php b/admin/models/assets.php similarity index 99% rename from com_biblestudy/admin/models/assets.php rename to admin/models/assets.php index f142bce627..43cd3491ab 100644 --- a/com_biblestudy/admin/models/assets.php +++ b/admin/models/assets.php @@ -73,7 +73,7 @@ public function __construct($config = array()) /** * Start Looking though the Versions * - * @return bool + * @return boolean * * @since 7.0 */ @@ -150,7 +150,7 @@ private function getSteps() * * @param bool $resetTimer If the time must be reset * - * @return bool + * @return boolean * * @since 7.0 */ @@ -230,7 +230,7 @@ private function resetStack() /** * Loads the Versions/SQL/After stack from the session * - * @return bool + * @return boolean * * @since 7.0 */ @@ -276,7 +276,7 @@ private function loadStack() /** * Makes sure that no more than 5 seconds since the start of the timer have elapsed * - * @return bool + * @return boolean * * @since 7.0 */ @@ -291,7 +291,7 @@ private function haveEnoughTime() /** * Start the Run through the Pre Versions then SQL files then After PHP functions. * - * @return bool + * @return boolean * * @since 7.0 */ diff --git a/com_biblestudy/admin/models/comment.php b/admin/models/comment.php similarity index 100% rename from com_biblestudy/admin/models/comment.php rename to admin/models/comment.php diff --git a/com_biblestudy/admin/models/comments.php b/admin/models/comments.php similarity index 100% rename from com_biblestudy/admin/models/comments.php rename to admin/models/comments.php diff --git a/com_biblestudy/admin/models/cpanel.php b/admin/models/cpanel.php similarity index 98% rename from com_biblestudy/admin/models/cpanel.php rename to admin/models/cpanel.php index e2de7df47f..9d7c9356f7 100644 --- a/com_biblestudy/admin/models/cpanel.php +++ b/admin/models/cpanel.php @@ -6,7 +6,7 @@ * @link https://www.christianwebministries.org * */ -use \Joomla\Registry\Registry; +use Joomla\Registry\Registry; /** * JModel class for Cpanel @@ -63,7 +63,7 @@ public function getData() * Returns null if the com_postinstall component is broken because the user screwed up his Joomla! site following * some idiot's advice. Apparently there's no shortage of idiots giving terribly bad advice to Joomla! users. * - * @return bool|null + * @return boolean|null * * @since 7.0 */ diff --git a/com_biblestudy/admin/models/dir.php b/admin/models/dir.php similarity index 100% rename from com_biblestudy/admin/models/dir.php rename to admin/models/dir.php diff --git a/com_biblestudy/admin/models/fields/booklist.php b/admin/models/fields/booklist.php similarity index 100% rename from com_biblestudy/admin/models/fields/booklist.php rename to admin/models/fields/booklist.php diff --git a/com_biblestudy/admin/models/fields/elementoptions.php b/admin/models/fields/elementoptions.php similarity index 100% rename from com_biblestudy/admin/models/fields/elementoptions.php rename to admin/models/fields/elementoptions.php diff --git a/com_biblestudy/admin/models/fields/filesize.php b/admin/models/fields/filesize.php similarity index 100% rename from com_biblestudy/admin/models/fields/filesize.php rename to admin/models/fields/filesize.php diff --git a/com_biblestudy/admin/models/fields/filters.php b/admin/models/fields/filters.php similarity index 100% rename from com_biblestudy/admin/models/fields/filters.php rename to admin/models/fields/filters.php diff --git a/com_biblestudy/admin/models/fields/icontype.php b/admin/models/fields/icontype.php similarity index 100% rename from com_biblestudy/admin/models/fields/icontype.php rename to admin/models/fields/icontype.php diff --git a/com_biblestudy/admin/models/fields/linkoptions.php b/admin/models/fields/linkoptions.php similarity index 100% rename from com_biblestudy/admin/models/fields/linkoptions.php rename to admin/models/fields/linkoptions.php diff --git a/com_biblestudy/admin/models/fields/listoptions.php b/admin/models/fields/listoptions.php similarity index 100% rename from com_biblestudy/admin/models/fields/listoptions.php rename to admin/models/fields/listoptions.php diff --git a/com_biblestudy/admin/models/fields/loadlanguagefile.php b/admin/models/fields/loadlanguagefile.php similarity index 100% rename from com_biblestudy/admin/models/fields/loadlanguagefile.php rename to admin/models/fields/loadlanguagefile.php diff --git a/com_biblestudy/admin/models/fields/locationlist.php b/admin/models/fields/locationlist.php similarity index 100% rename from com_biblestudy/admin/models/fields/locationlist.php rename to admin/models/fields/locationlist.php diff --git a/com_biblestudy/admin/models/fields/locations.php b/admin/models/fields/locations.php similarity index 100% rename from com_biblestudy/admin/models/fields/locations.php rename to admin/models/fields/locations.php diff --git a/com_biblestudy/admin/models/fields/locationslist.php b/admin/models/fields/locationslist.php similarity index 100% rename from com_biblestudy/admin/models/fields/locationslist.php rename to admin/models/fields/locationslist.php diff --git a/com_biblestudy/admin/models/fields/mediafile.php b/admin/models/fields/mediafile.php similarity index 100% rename from com_biblestudy/admin/models/fields/mediafile.php rename to admin/models/fields/mediafile.php diff --git a/com_biblestudy/admin/models/fields/mediafileimages.php b/admin/models/fields/mediafileimages.php similarity index 100% rename from com_biblestudy/admin/models/fields/mediafileimages.php rename to admin/models/fields/mediafileimages.php diff --git a/com_biblestudy/admin/models/fields/messagetypelist.php b/admin/models/fields/messagetypelist.php similarity index 100% rename from com_biblestudy/admin/models/fields/messagetypelist.php rename to admin/models/fields/messagetypelist.php diff --git a/com_biblestudy/admin/models/fields/mimetype.php b/admin/models/fields/mimetype.php similarity index 97% rename from com_biblestudy/admin/models/fields/mimetype.php rename to admin/models/fields/mimetype.php index 3fcb23c2b1..82e0ca6107 100644 --- a/com_biblestudy/admin/models/fields/mimetype.php +++ b/admin/models/fields/mimetype.php @@ -10,8 +10,6 @@ // No Direct Access defined('_JEXEC') or die; -use Joomla\Registry\Registry; - JFormHelper::loadFieldClass('list'); /** diff --git a/com_biblestudy/admin/models/fields/modal/seriesdetail.php b/admin/models/fields/modal/seriesdetail.php similarity index 100% rename from com_biblestudy/admin/models/fields/modal/seriesdetail.php rename to admin/models/fields/modal/seriesdetail.php diff --git a/com_biblestudy/admin/models/fields/modal/study.php b/admin/models/fields/modal/study.php similarity index 100% rename from com_biblestudy/admin/models/fields/modal/study.php rename to admin/models/fields/modal/study.php diff --git a/com_biblestudy/admin/models/fields/modal/studydetails.php b/admin/models/fields/modal/studydetails.php similarity index 100% rename from com_biblestudy/admin/models/fields/modal/studydetails.php rename to admin/models/fields/modal/studydetails.php diff --git a/com_biblestudy/admin/models/fields/modal/teacherdisplay.php b/admin/models/fields/modal/teacherdisplay.php similarity index 100% rename from com_biblestudy/admin/models/fields/modal/teacherdisplay.php rename to admin/models/fields/modal/teacherdisplay.php diff --git a/com_biblestudy/admin/models/fields/modal/templates.php b/admin/models/fields/modal/templates.php similarity index 100% rename from com_biblestudy/admin/models/fields/modal/templates.php rename to admin/models/fields/modal/templates.php diff --git a/com_biblestudy/admin/models/fields/modal/upload.php b/admin/models/fields/modal/upload.php similarity index 100% rename from com_biblestudy/admin/models/fields/modal/upload.php rename to admin/models/fields/modal/upload.php diff --git a/com_biblestudy/admin/models/fields/rowoptions.php b/admin/models/fields/rowoptions.php similarity index 100% rename from com_biblestudy/admin/models/fields/rowoptions.php rename to admin/models/fields/rowoptions.php diff --git a/com_biblestudy/admin/models/fields/serieslinkoptions.php b/admin/models/fields/serieslinkoptions.php similarity index 100% rename from com_biblestudy/admin/models/fields/serieslinkoptions.php rename to admin/models/fields/serieslinkoptions.php diff --git a/com_biblestudy/admin/models/fields/serieslist.php b/admin/models/fields/serieslist.php similarity index 100% rename from com_biblestudy/admin/models/fields/serieslist.php rename to admin/models/fields/serieslist.php diff --git a/com_biblestudy/admin/models/fields/seriesoptions.php b/admin/models/fields/seriesoptions.php similarity index 100% rename from com_biblestudy/admin/models/fields/seriesoptions.php rename to admin/models/fields/seriesoptions.php diff --git a/com_biblestudy/admin/models/fields/server.php b/admin/models/fields/server.php similarity index 100% rename from com_biblestudy/admin/models/fields/server.php rename to admin/models/fields/server.php diff --git a/com_biblestudy/admin/models/fields/servertype.php b/admin/models/fields/servertype.php similarity index 99% rename from com_biblestudy/admin/models/fields/servertype.php rename to admin/models/fields/servertype.php index 175e4bce6b..dfcf5f981a 100644 --- a/com_biblestudy/admin/models/fields/servertype.php +++ b/admin/models/fields/servertype.php @@ -11,6 +11,7 @@ defined('_JEXEC') or die; JFormHelper::loadFieldClass('list'); + use Joomla\Utilities\ArrayHelper; /** diff --git a/com_biblestudy/admin/models/fields/spanoptions.php b/admin/models/fields/spanoptions.php similarity index 100% rename from com_biblestudy/admin/models/fields/spanoptions.php rename to admin/models/fields/spanoptions.php diff --git a/com_biblestudy/admin/models/fields/teacherlinkoptions.php b/admin/models/fields/teacherlinkoptions.php similarity index 100% rename from com_biblestudy/admin/models/fields/teacherlinkoptions.php rename to admin/models/fields/teacherlinkoptions.php diff --git a/com_biblestudy/admin/models/fields/teacherlist.php b/admin/models/fields/teacherlist.php similarity index 100% rename from com_biblestudy/admin/models/fields/teacherlist.php rename to admin/models/fields/teacherlist.php diff --git a/com_biblestudy/admin/models/fields/templatelist.php b/admin/models/fields/templatelist.php similarity index 100% rename from com_biblestudy/admin/models/fields/templatelist.php rename to admin/models/fields/templatelist.php diff --git a/com_biblestudy/admin/models/fields/topics.php b/admin/models/fields/topics.php similarity index 100% rename from com_biblestudy/admin/models/fields/topics.php rename to admin/models/fields/topics.php diff --git a/com_biblestudy/admin/models/fields/topicslist.php b/admin/models/fields/topicslist.php similarity index 100% rename from com_biblestudy/admin/models/fields/topicslist.php rename to admin/models/fields/topicslist.php diff --git a/com_biblestudy/admin/models/fields/upload.php b/admin/models/fields/upload.php similarity index 100% rename from com_biblestudy/admin/models/fields/upload.php rename to admin/models/fields/upload.php diff --git a/com_biblestudy/admin/models/fields/yearlist.php b/admin/models/fields/yearlist.php similarity index 100% rename from com_biblestudy/admin/models/fields/yearlist.php rename to admin/models/fields/yearlist.php diff --git a/com_biblestudy/admin/models/forms/admin.xml b/admin/models/forms/admin.xml similarity index 100% rename from com_biblestudy/admin/models/forms/admin.xml rename to admin/models/forms/admin.xml diff --git a/com_biblestudy/admin/models/forms/archive.xml b/admin/models/forms/archive.xml similarity index 100% rename from com_biblestudy/admin/models/forms/archive.xml rename to admin/models/forms/archive.xml diff --git a/com_biblestudy/admin/models/forms/comment.xml b/admin/models/forms/comment.xml similarity index 100% rename from com_biblestudy/admin/models/forms/comment.xml rename to admin/models/forms/comment.xml diff --git a/com_biblestudy/admin/models/forms/filter_comments.xml b/admin/models/forms/filter_comments.xml similarity index 100% rename from com_biblestudy/admin/models/forms/filter_comments.xml rename to admin/models/forms/filter_comments.xml diff --git a/com_biblestudy/admin/models/forms/filter_locations.xml b/admin/models/forms/filter_locations.xml similarity index 100% rename from com_biblestudy/admin/models/forms/filter_locations.xml rename to admin/models/forms/filter_locations.xml diff --git a/com_biblestudy/admin/models/forms/filter_mediafiles.xml b/admin/models/forms/filter_mediafiles.xml similarity index 100% rename from com_biblestudy/admin/models/forms/filter_mediafiles.xml rename to admin/models/forms/filter_mediafiles.xml diff --git a/com_biblestudy/admin/models/forms/filter_messages.xml b/admin/models/forms/filter_messages.xml similarity index 100% rename from com_biblestudy/admin/models/forms/filter_messages.xml rename to admin/models/forms/filter_messages.xml diff --git a/com_biblestudy/admin/models/forms/filter_messagetypes.xml b/admin/models/forms/filter_messagetypes.xml similarity index 100% rename from com_biblestudy/admin/models/forms/filter_messagetypes.xml rename to admin/models/forms/filter_messagetypes.xml diff --git a/com_biblestudy/admin/models/forms/filter_podcasts.xml b/admin/models/forms/filter_podcasts.xml similarity index 100% rename from com_biblestudy/admin/models/forms/filter_podcasts.xml rename to admin/models/forms/filter_podcasts.xml diff --git a/com_biblestudy/admin/models/forms/filter_series.xml b/admin/models/forms/filter_series.xml similarity index 100% rename from com_biblestudy/admin/models/forms/filter_series.xml rename to admin/models/forms/filter_series.xml diff --git a/com_biblestudy/admin/models/forms/filter_servers.xml b/admin/models/forms/filter_servers.xml similarity index 100% rename from com_biblestudy/admin/models/forms/filter_servers.xml rename to admin/models/forms/filter_servers.xml diff --git a/com_biblestudy/admin/models/forms/filter_teachers.xml b/admin/models/forms/filter_teachers.xml similarity index 100% rename from com_biblestudy/admin/models/forms/filter_teachers.xml rename to admin/models/forms/filter_teachers.xml diff --git a/com_biblestudy/admin/models/forms/filter_templatecodes.xml b/admin/models/forms/filter_templatecodes.xml similarity index 100% rename from com_biblestudy/admin/models/forms/filter_templatecodes.xml rename to admin/models/forms/filter_templatecodes.xml diff --git a/com_biblestudy/admin/models/forms/filter_templates.xml b/admin/models/forms/filter_templates.xml similarity index 100% rename from com_biblestudy/admin/models/forms/filter_templates.xml rename to admin/models/forms/filter_templates.xml diff --git a/com_biblestudy/admin/models/forms/filter_topics.xml b/admin/models/forms/filter_topics.xml similarity index 100% rename from com_biblestudy/admin/models/forms/filter_topics.xml rename to admin/models/forms/filter_topics.xml diff --git a/com_biblestudy/admin/models/forms/location.xml b/admin/models/forms/location.xml similarity index 100% rename from com_biblestudy/admin/models/forms/location.xml rename to admin/models/forms/location.xml diff --git a/com_biblestudy/admin/models/forms/mediafile.xml b/admin/models/forms/mediafile.xml similarity index 100% rename from com_biblestudy/admin/models/forms/mediafile.xml rename to admin/models/forms/mediafile.xml diff --git a/com_biblestudy/admin/models/forms/message.xml b/admin/models/forms/message.xml similarity index 100% rename from com_biblestudy/admin/models/forms/message.xml rename to admin/models/forms/message.xml diff --git a/com_biblestudy/admin/models/forms/messagetype.xml b/admin/models/forms/messagetype.xml similarity index 100% rename from com_biblestudy/admin/models/forms/messagetype.xml rename to admin/models/forms/messagetype.xml diff --git a/com_biblestudy/admin/models/forms/podcast.xml b/admin/models/forms/podcast.xml similarity index 100% rename from com_biblestudy/admin/models/forms/podcast.xml rename to admin/models/forms/podcast.xml diff --git a/com_biblestudy/admin/models/forms/serie.xml b/admin/models/forms/serie.xml similarity index 100% rename from com_biblestudy/admin/models/forms/serie.xml rename to admin/models/forms/serie.xml diff --git a/com_biblestudy/admin/models/forms/server.xml b/admin/models/forms/server.xml similarity index 100% rename from com_biblestudy/admin/models/forms/server.xml rename to admin/models/forms/server.xml diff --git a/com_biblestudy/admin/models/forms/teacher.xml b/admin/models/forms/teacher.xml similarity index 100% rename from com_biblestudy/admin/models/forms/teacher.xml rename to admin/models/forms/teacher.xml diff --git a/com_biblestudy/admin/models/forms/template.xml b/admin/models/forms/template.xml similarity index 100% rename from com_biblestudy/admin/models/forms/template.xml rename to admin/models/forms/template.xml diff --git a/com_biblestudy/admin/models/forms/templatecode.xml b/admin/models/forms/templatecode.xml similarity index 100% rename from com_biblestudy/admin/models/forms/templatecode.xml rename to admin/models/forms/templatecode.xml diff --git a/com_biblestudy/admin/models/forms/topic.xml b/admin/models/forms/topic.xml similarity index 100% rename from com_biblestudy/admin/models/forms/topic.xml rename to admin/models/forms/topic.xml diff --git a/com_biblestudy/admin/models/forms/upload.xml b/admin/models/forms/upload.xml similarity index 100% rename from com_biblestudy/admin/models/forms/upload.xml rename to admin/models/forms/upload.xml diff --git a/com_biblestudy/admin/models/install.php b/admin/models/install.php similarity index 82% rename from com_biblestudy/admin/models/install.php rename to admin/models/install.php index 4c9ea4078c..cf670dc438 100644 --- a/com_biblestudy/admin/models/install.php +++ b/admin/models/install.php @@ -31,107 +31,116 @@ class BibleStudyModelInstall extends JModelLegacy { /** @var int Total numbers of Versions * - * @since 7.1 */ + * @since 7.1 + */ public $totalSteps = 0; /** @var int Numbers of Versions already processed * - * @since 7.1 */ + * @since 7.1 + */ public $doneSteps = 0; /** @var string Running Now * - * @since 7.1 */ + * @since 7.1 + */ public $running = null; /** @var array Call stack for the Visioning System. * - * @since 7.1 */ + * @since 7.1 + */ public $callstack = array(); /** @var string Path to Mysql files * - * @since 7.1 */ + * @since 7.1 + */ protected $filePath = '/components/com_biblestudy/install/sql/updates/mysql'; /** @var string Path to PHP Version files * - * @since 7.1 */ + * @since 7.1 + */ protected $phpPath = '/components/com_biblestudy/install/updates/'; /** @var float The time the process started * - * @since 7.1 */ + * @since 7.1 + */ private $startTime = null; /** @var array The pre versions to process * - * @since 7.1 */ + * @since 7.1 + */ private $versionStack = array(); /** @var array The pre versions sub sql array to process * - * @since 7.1 */ + * @since 7.1 + */ private $allupdates = array(); /** @var string Version of BibleStudy * - * @since 7.1 */ + * @since 7.1 + */ private $versionSwitch = null; /** @var int Id of Extinction Table * - * @since 7.1 */ + * @since 7.1 + */ private $biblestudyEid = 0; /** @var array Array of Finish Task * - * @since 7.1 */ + * @since 7.1 + */ private $finish = array(); /** @var string Version number to be running * - * @since 7.1 */ + * @since 7.1 + */ private $version = "0.0.0"; /** @type array PHP file steps for migrations * - * @since 7.1 */ + * @since 7.1 + */ private $subSteps = array(); /** @var array Array of Sub Query from php files queries Task * - * @since 7.1 */ + * @since 7.1 + */ private $subQuery = array(); /** @type array list of php files to work through * - * @since 7.1 */ + * @since 7.1 + */ private $subFiles = array(); /** @var array Array of Install Task * - * @since 7.1 */ - private $install = array(); - - /** @var array Array of Install Task - * - * @since 9.0.14 */ + * @since 9.0.14 + */ private $start = array(); /** @var int If was imported * - * @since 7.1 */ + * @since 7.1 + */ private $isimport = 0; - /** @type string Type of process - * - * @since 7.1 */ - protected $type = null; - /** @type array Array of assets to fix * - * @since 7.1 */ + * @since 7.1 + */ public $query = array(); /** @@ -139,8 +148,8 @@ class BibleStudyModelInstall extends JModelLegacy * * @param array $config An optional associative array of configuration settings. * + * @throws Exception * @since 7.1 - * @throws \Exception */ public function __construct($config = array()) { @@ -152,10 +161,10 @@ public function __construct($config = array()) /** * Start Looking though the Versions * - * @return bool + * @return boolean * + * @throws Exception * @since 7.1 - * @throws \Exception */ public function startScanning() { @@ -177,10 +186,8 @@ public function startScanning() { return true; } - else - { - return $this->run(false); - } + + return $this->run(false); } /** @@ -214,40 +221,24 @@ private function microtime_float() * * @return boolean * + * @throws Exception * @since 7.1 - * @throws \Exception */ private function getSteps() { $olderversiontype = 0; $app = JFactory::getApplication(); - $check = JBSMDbHelper::getInstallState(); - - if ($check) - { - $this->type = 'install'; - } - else - { - $this->type = 'migration'; - } // Set Finishing Steps - $this->finish = array('updateversion', 'fixassets', 'fixmenus', 'fixemptyaccess', 'fixemptylanguage', 'rmoldurl', 'setupdateurl', 'finish'); + $this->finish = array('updateversion', 'fixassets', 'fixmenus', 'fixemptyaccess', 'fixemptylanguage', + 'rmoldurl', 'setupdateurl', 'finish'); $this->totalSteps += count($this->finish); - // Check to see if this is not a migration before preceding. - if ($this->type != 'migration') - { - $this->type = 'install'; - $this->install = array('install', 'install-defaults'); - $this->totalSteps += count($this->install); - - return true; - } - - // First we check to see if there is a current version database installed. This will have a #__bsms_version table so we check for it's existence. - // Check to be sure a really early version is not installed $versiontype: 1 = current version type 2 = older version type 3 = no version + /** + * First we check to see if there is a current version database installed. This will have a #__bsms_version + * table so we check for it's existence. + * Check to be sure a really early version is not installed $versiontype: 1 = current version type 2 = older version type 3 = no version + */ $tables = $this->_db->getTableList(); $prefix = $this->_db->getPrefix(); @@ -345,16 +336,17 @@ private function getSteps() switch ($versiontype) { case 1: - self::correctVersions(); - /* Find Last updated Version in Update table */ + $this->correctVersions(); + + // Find Last updated Version in Update table $query = $this->_db->getQuery(true); $query->select('version') ->from('#__bsms_update') ->order($this->_db->qn('id') . ' DESC'); $this->_db->setQuery($query, 0, 1); - $updates = $this->_db->loadObject(); - $version = $updates->version; - $this->versionSwitch = $version; + $updates = $this->_db->loadObject(); + $version = $updates->version; + $this->versionSwitch = $version; $this->callstack['subversiontype_version'] = $version; break; @@ -415,14 +407,14 @@ private function getSteps() usort($files, 'version_compare'); usort($php, 'version_compare'); - /* Find Extension ID of component */ + // Find Extension ID of component $query = $this->_db->getQuery(true); $query ->select('extension_id') ->from('#__extensions') ->where($this->_db->qn('name') . ' = ' . $this->_db->q('com_biblestudy')); $this->_db->setQuery($query); - $eid = $this->_db->loadResult(); + $eid = $this->_db->loadResult(); $this->biblestudyEid = $eid; foreach ($files as $i => $value) @@ -431,7 +423,7 @@ private function getSteps() if ($update && $eid) { - /* Set new Schema Version */ + // Set new Schema Version $this->setSchemaVersion($update, $eid); } else @@ -445,8 +437,8 @@ private function getSteps() } elseif ($files) { - $this->totalSteps += count($files); - $this->versionStack = $files; + $this->totalSteps += count($files); + $this->versionStack = $files; } else { @@ -470,8 +462,8 @@ private function getSteps() } } - $this->isimport = JFactory::getApplication()->input->getInt('jbsmalt', 0); - $this->totalSteps += 1; + $this->isimport = JFactory::getApplication()->input->getInt('jbsmalt', 0); + ++$this->totalSteps; return true; } @@ -481,12 +473,12 @@ private function getSteps() * * @return boolean * + * @throws Exception * @since 7.1 - * @throws \Exception */ private function correctVersions() { - /* Find Last updated Version in Update table */ + // Find Last updated Version in Update table $query = $this->_db->getQuery(true); $query->select('*') ->from('#__bsms_update'); @@ -495,11 +487,11 @@ private function correctVersions() foreach ($updates AS $value) { - /* Check to see if Bad version is in key 3 */ + // Check to see if Bad version is in key 3 if (($value->id === '3') && ($value->version !== '7.0.1.1')) { - /* Find Last updated Version in Update table */ + // Find Last updated Version in Update table $query = "INSERT INTO `#__bsms_update` (id,version) VALUES (3,'7.0.1.1') ON DUPLICATE KEY UPDATE version= '7.0.1.1';"; $this->_db->setQuery($query); @@ -522,10 +514,10 @@ private function correctVersions() * @param string $version Version number * @param integer $eid Extension ID * - * @return bool + * @return boolean * + * @throws Exception * @since 7.1.0 - * @throws \Exception */ private function setSchemaVersion($version, $eid) { @@ -558,12 +550,10 @@ private function setSchemaVersion($version, $eid) return true; } - else - { - $app->enqueueMessage('Could not locate extension id in schemas table'); + + $app->enqueueMessage('Could not locate extension id in schemas table'); return false; - } } return false; @@ -574,10 +564,10 @@ private function setSchemaVersion($version, $eid) * * @param bool $resetTimer If the time must be reset * - * @return bool + * @return boolean * - * @since 7.1 * @throws Exception + * @since 7.1 */ public function run($resetTimer = true) { @@ -609,23 +599,21 @@ public function run($resetTimer = true) private function saveStack() { $stack = array( - 'aversion' => $this->version, - 'version' => $this->versionStack, - 'switch' => $this->versionSwitch, - 'allupdates' => $this->allupdates, - 'finish' => $this->finish, - 'install' => $this->install, - 'start' => $this->start, - 'subFiles' => $this->subFiles, - 'subQuery' => $this->subQuery, - 'subSteps' => $this->subSteps, - 'isimport' => $this->isimport, - 'callstack' => $this->callstack, - 'total' => $this->totalSteps, - 'done' => $this->doneSteps, - 'run' => $this->running, - 'type' => $this->type, - 'query' => $this->query, + 'aversion' => $this->version, + 'version' => $this->versionStack, + 'switch' => $this->versionSwitch, + 'allupdates' => $this->allupdates, + 'finish' => $this->finish, + 'start' => $this->start, + 'subFiles' => $this->subFiles, + 'subQuery' => $this->subQuery, + 'subSteps' => $this->subSteps, + 'isimport' => $this->isimport, + 'callstack' => $this->callstack, + 'total' => $this->totalSteps, + 'done' => $this->doneSteps, + 'run' => $this->running, + 'query' => $this->query, ); $stack = json_encode($stack); @@ -659,7 +647,6 @@ private function resetStack() $this->versionSwitch = null; $this->allupdates = array(); $this->finish = array(); - $this->install = array(); $this->start = array(); $this->subFiles = array(); $this->subQuery = array(); @@ -669,21 +656,20 @@ private function resetStack() $this->totalSteps = 0; $this->doneSteps = 0; $this->running = JText::_('JBS_MIG_STARTING'); - $this->type = null; $this->query = array(); } /** * Loads the Versions/SQL/After stack from the session * - * @return bool + * @return boolean * * @since 7.1 */ private function loadStack() { $session = JFactory::getSession(); - $stack = $session->get('migration_stack', '', 'JBSM'); + $stack = $session->get('migration_stack', '', 'JBSM'); if (empty($stack)) { @@ -692,7 +678,6 @@ private function loadStack() $this->versionSwitch = null; $this->allupdates = array(); $this->finish = array(); - $this->install = array(); $this->start = array(); $this->subFiles = array(); $this->subQuery = array(); @@ -702,7 +687,6 @@ private function loadStack() $this->totalSteps = 0; $this->doneSteps = 0; $this->running = JText::_('JBS_MIG_STARTING'); - $this->type = null; $this->query = array(); return false; @@ -725,7 +709,6 @@ private function loadStack() $this->versionSwitch = $stack['switch']; $this->allupdates = $stack['allupdates']; $this->finish = $stack['finish']; - $this->install = $stack['install']; $this->start = $stack['start']; $this->subFiles = $stack['subFiles']; $this->subQuery = $stack['subQuery']; @@ -735,7 +718,6 @@ private function loadStack() $this->totalSteps = $stack['total']; $this->doneSteps = $stack['done']; $this->running = $stack['run']; - $this->type = $stack['type']; $this->query = $stack['query']; return true; @@ -744,7 +726,7 @@ private function loadStack() /** * Makes sure that no more than 5 seconds since the start of the timer have elapsed * - * @return bool + * @return boolean * * @since 7.1 */ @@ -759,12 +741,12 @@ private function haveEnoughTime() /** * Start the Run through the Pre Versions then SQL files then After PHP functions. * - * @return bool + * @return boolean * + * @throws Exception * @since 7.1 - * @throws \Exception */ - private function RealRun() + private function realRun() { $app = JFactory::getApplication(); $run = true; @@ -779,26 +761,16 @@ private function RealRun() $this->start = array(); } - if (!empty($this->install)) - { - $this->running = 'Install Steps'; - $this->doneSteps++; - $this->install($this->install); - $this->doneSteps++; - JLog::add('Fresh Install Steps', JLog::INFO, 'com_biblestudy'); - $this->install = array(); - } - if ($this->isimport) { $this->fiximport(); - $this->running = 'Fixing Imported Params'; + $this->running = 'Fixing Imported Params'; $this->isimport = 0; JLog::add('Fixing Imported Params', JLog::INFO, 'com_biblestudy'); $this->doneSteps++; } - if (!empty($this->versionStack) && empty($this->install)) + if (!empty($this->versionStack)) { krsort($this->versionStack); @@ -817,7 +789,7 @@ private function RealRun() } } - if ((!empty($this->allupdates) || !empty($this->subFiles)) && empty($this->versionStack) && empty($this->install)) + if ((!empty($this->allupdates) || !empty($this->subFiles)) && empty($this->versionStack)) { ksort($this->allupdates); @@ -841,15 +813,15 @@ private function RealRun() $string = array_shift($this->allupdates[$this->version]); $this->running = $this->version . ' String: ' . $string; - $run = $this->runUpdates($string); + $run = $this->runUpdates($string); $this->doneSteps++; } elseif (in_array($this->version, $this->subFiles) && @empty($this->allupdates[$this->version])) { // Check for corresponding PHP file and run migration - $migration_file = JPATH_ADMINISTRATOR . '/components/com_biblestudy/install/updates/' . $this->version . '.php'; + $migrationfile = JPATH_ADMINISTRATOR . '/components/com_biblestudy/install/updates/' . $this->version . '.php'; - require_once $migration_file; + require_once $migrationfile; $migrationClass = "Migration" . str_ireplace(".", '', $this->version); $migration = new $migrationClass; @@ -872,7 +844,7 @@ private function RealRun() $step = $this->versionSwitch = array_shift($this->subSteps[$this->version]); JLog::add('Change step : ' . $step, JLog::INFO, 'com_biblestudy'); } - elseif(empty($this->subSteps[$this->version])) + elseif (empty($this->subSteps[$this->version])) { JLog::add('Unset Last Step : ' . $step, JLog::INFO, 'com_biblestudy'); @@ -889,7 +861,7 @@ private function RealRun() if (isset($this->subQuery[$this->version][$step]) && !empty($this->subQuery[$this->version][$step])) { - $query = array_shift($this->subQuery[$this->version][$step]); + $query = array_shift($this->subQuery[$this->version][$step]); $migration->query = $this->subQuery[$this->version]; } elseif (isset($this->subQuery[$this->version][$step]) && empty($this->subQuery[$this->version][$step])) @@ -938,7 +910,7 @@ private function RealRun() JLog::add('Unset Version if no steps : ' . $this->version, JLog::INFO, 'com_biblestudy'); } - if ($run == false) + if ($run === false) { JBSMDbHelper::resetdb(); $this->resetStack(); @@ -949,7 +921,7 @@ private function RealRun() } } - if (!empty($this->finish) && empty($this->versionStack) && empty($this->allupdates) && empty($this->subFiles) && empty($this->install)) + if (!empty($this->finish) && empty($this->versionStack) && empty($this->allupdates) && empty($this->subFiles)) { while (!empty($this->finish) && $this->haveEnoughTime()) { @@ -965,8 +937,7 @@ private function RealRun() && empty($this->finish) && empty($this->versionStack) && empty($this->allupdates) - && empty($this->subFiles) - && empty($this->install) ) + && empty($this->subFiles)) { krsort($this->query); @@ -979,8 +950,7 @@ private function RealRun() $version = array_pop($this->query[$this->versionSwitch]); $this->doneSteps++; $this->running = 'Fixing Assets that are not right'; - $asset = new JBSMAssets; - $asset->fixAssets($this->versionSwitch, $version); + JBSMAssets::fixAssets($this->versionSwitch, $version); } else { @@ -993,8 +963,7 @@ private function RealRun() && empty($this->finish) && empty($this->versionStack) && empty($this->allupdates) - && empty($this->subFiles) - && empty($this->install)) + && empty($this->subFiles)) { // Fix any problem with db versions after migration. JLoader::register('BiblestudyModelAdmin', JPATH_ADMINISTRATOR . '/components/com_biblestudy/models/admin.php'); @@ -1012,88 +981,13 @@ private function RealRun() return true; } - /** - * Install step system - * - * @param array $files List of installs to install - * - * @return bool - * - * @since 7.1 - * @throws \Exception - */ - private function install($files = array('install', 'install-defaults')) - { - $app = JFactory::getApplication(); - $db = JFactory::getDbo(); - jimport('joomla.filesystem.folder'); - jimport('joomla.filesystem.file'); - $path = JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'components/com_biblestudy/install/sql'; - - foreach ($files as $value) - { - // Get file contents - $buffer = file_get_contents($path . '/' . $value . '.sql'); - - // Graceful exit and rollback if read not successful - if ($buffer === false) - { - $app->enqueueMessage(JText::_('JBS_INS_ERROR_SQL_READBUFFER'), 'error'); - - return false; - } - - // Create an array of queries from the sql file - $queries = $db->splitSql($buffer); - - if (count($queries) == 0) - { - // No queries to process - return 0; - } - - $this->totalSteps += count($queries); - $this->allupdates = array_merge($this->allupdates, $queries); - } - - $component = JPATH_ADMINISTRATOR . '/components/com_biblestudy/biblestudy.xml'; - - $xml = new stdClass; - - if (file_exists($component)) - { - $xml = simplexml_load_file($component); - } - - // Check for corresponding PHP file and run Install - $migration_file = JPATH_ADMINISTRATOR . '/components/com_biblestudy/install/updates/' . $xml->version . '.php'; - - if (JFile::exists($migration_file)) - { - require_once $migration_file; - $migrationClass = "Migration" . str_ireplace(".", '', $xml->version); - - if (class_exists($migrationClass)) - { - $migration = new $migrationClass; - - if (function_exists($migration->postinstall_messages())) - { - $migration->postinstall_messages(); - } - } - } - - return true; - } - /** * Uninstall of JBSM * - * @return bool + * @return boolean * + * @throws Exception * @since 7.1 - * @throws \Exception */ public function uninstall() { @@ -1123,7 +1017,7 @@ public function uninstall() $parent_id = $this->_db->loadResult(); $query = $this->_db->getQuery(true); - if ($parent_id != '0') + if ($parent_id !== '0') { $query->delete() ->from('#__assets') @@ -1154,7 +1048,7 @@ public function uninstall() { $querie = trim($querie); - if ($querie != '' && $querie{0} != '#' && $querie != '`') + if ($querie !== '' && $querie{0} !== '#' && $querie !== '`') { $this->_db->setQuery($querie); $this->_db->execute(); @@ -1186,8 +1080,8 @@ public function uninstall() * * @return boolean * + * @throws Exception * @since 7.1 - * @throws \Exception */ private function finish($step) { @@ -1198,7 +1092,8 @@ private function finish($step) { case 'updateversion': $update = $this->getUpdateVersion(); - /* Set new Schema Version */ + + // Set new Schema Version $run = $this->setSchemaVersion($update, $this->biblestudyEid); $this->running = 'Update Version'; break; @@ -1206,7 +1101,7 @@ private function finish($step) // Final step is to fix assets by building what need to be fixed. $assets = new JBSMAssets; $assets->build(); - $this->query = $assets->query; + $this->query = $assets->query; $this->totalSteps += $assets->count; break; case 'fixmenus': @@ -1232,14 +1127,14 @@ private function finish($step) $this->running = 'Remove Old Update URL\'s'; break; case 'setupdateurl': - /* Find Extension ID of component */ + // Find Extension ID of component $query = $this->_db->getQuery(true); $query ->select('extension_id') ->from('#__extensions') ->where($this->_db->qn('name') . ' = ' . $this->_db->q('com_biblestudy')); $this->_db->setQuery($query); - $eid = $this->_db->loadResult(); + $eid = $this->_db->loadResult(); $conditions = array( $this->_db->qn('name') . ' = ' . @@ -1257,7 +1152,7 @@ private function finish($step) ); $query = $this->_db->getQuery(true); $query->delete($this->_db->qn('#__update_sites_extensions')); - $query->where($conditions, $glue = 'OR'); + $query->where($conditions, $glue = 'OR'); $this->_db->setQuery($query); $this->_db->execute(); @@ -1267,8 +1162,8 @@ private function finish($step) $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; + $lastid = $this->_db->insertid(); + $updateurl1 = new stdClass; $updateurl1->update_site_id = $lastid; $updateurl1->extension_id = $eid; $this->_db->insertObject('#__update_sites_extensions', $updateurl1); @@ -1277,7 +1172,8 @@ private function finish($step) default: $app->enqueueMessage('' . JText::_('JBS_CMN_OPERATION_SUCCESSFUL') . JText::_('SIMPLEMODEMESSAGE_BODY') . - JText::_('JBS_IBM_REVIEW_ADMIN_TEMPLATE'), 'message'); + JText::_('JBS_IBM_REVIEW_ADMIN_TEMPLATE') + ); break; } @@ -1295,7 +1191,7 @@ private function finish($step) */ public function postinstall_messages($message) { - /* Find Extension ID of component */ + // Find Extension ID of component $query = $this->_db->getQuery(true); $query ->select('extension_id') @@ -1336,7 +1232,7 @@ private function getUpdateVersion() /** * Fix Import problem * - * @return bool True if fix complete, False if failure + * @return boolean True if fix complete, False if failure * * @since 7.1 */ @@ -1347,7 +1243,7 @@ private function fiximport() foreach ($tables as $table) { - if (strpos($table['name'], '_bsms_timeset') == false) + if (strpos($table['name'], '_bsms_timeset') === false) { $query = $this->_db->getQuery(true); $query->select('*')->from($table); @@ -1376,7 +1272,7 @@ private function fiximport() if ($set) { - $this->_db->updateObject($table['name'], $row, ['id']); + $this->_db->updateObject($table['name'], $row, array('id')); } } } @@ -1392,8 +1288,8 @@ private function fiximport() * * @return boolean * + * @throws Exception * @since 7.1.4 - * @throws \Exception */ private function allUpdate($value) { @@ -1421,20 +1317,20 @@ private function allUpdate($value) $this->allupdates = array_merge($this->allupdates, array($value => $queries)); // Build php steps now. - $migration_file = JPATH_ADMINISTRATOR . '/components/com_biblestudy/install/updates/' . $value . '.php'; + $migrationFile = JPATH_ADMINISTRATOR . '/components/com_biblestudy/install/updates/' . $value . '.php'; - if (JFile::exists($migration_file)) + if (JFile::exists($migrationFile)) { - require_once $migration_file; + require_once $migrationFile; $migrationClass = "Migration" . str_ireplace(".", '', $value); if (class_exists($migrationClass)) { - $migration = new $migrationClass; + $migration = new $migrationClass; if (isset($migration->postinstall_messages)) { - $steps = $migration->steps; + $steps = $migration->steps; $this->totalSteps += count($steps); // If Steps build is mandatory. @@ -1445,12 +1341,12 @@ private function allUpdate($value) $this->totalSteps += (int) $migration->count; } - $this->subSteps = array_merge($this->subSteps, array($value => $steps)); + $this->subSteps = array_merge($this->subSteps, array($value => $steps)); $this->subQuery = array_merge($this->subQuery, array($value => $migration->query)); } else { - $this->subSteps = array_merge($this->subSteps, array($value => array('up'))); + $this->subSteps = array_merge($this->subSteps, array($value => array('up'))); $this->totalSteps += 1; } } @@ -1464,17 +1360,17 @@ private function allUpdate($value) * * @param string $string String of SQL to process. * - * @return bool + * @return boolean * + * @throws Exception * @since 7.1 - * @throws \Exception */ private function runUpdates($string) { // Process each query in the $queries array (split out of sql file). $string = trim($string); - if ($string != '' && $string{0} != '#') + if ($string !== '' && $string{0} !== '#') { $this->_db->setQuery($this->_db->convertUtf8mb4QueryToUtf8($string)); $this->doneSteps++; @@ -1485,7 +1381,7 @@ private function runUpdates($string) } catch (RuntimeException $e) { - JLog::add($e->getMessage(), JLog::WARNING, 'com_biblestudy'); + JLog::add($e->getMessage(), JLog::WARNING, 'com_biblestudy'); return false; } @@ -1494,7 +1390,7 @@ private function runUpdates($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::INFO, 'com_biblestudy' ); } @@ -1516,15 +1412,15 @@ private function postinstallclenup() ->where($this->_db->qn('language_extension') . ' = ' . $this->_db->q('com_biblestudy')); $this->_db->setQuery($query); $this->_db->execute(); - JLog::add('PostInstallCleanup', JLog::INFO, 'com_biblestudy'); + JLog::add('PostInstallCleanup', JLog::INFO, 'com_biblestudy'); } /** * Fix Menus * + * @return boolean * @since 7.1.0 * - * @return bool */ public function fixMenus() { @@ -1558,9 +1454,9 @@ public function fixMenus() /** * Function to find empty language field and set them to "*" * + * @return boolean * @since 7.1.0 * - * @return bool */ public function fixemptylanguage() { @@ -1590,9 +1486,9 @@ public function fixemptylanguage() /** * Function to Find empty access in the db and set them to Public * + * @return boolean * @since 7.1.0 * - * @return bool */ public function fixemptyaccess() { @@ -1620,7 +1516,7 @@ public function fixemptyaccess() $query = $this->_db->getQuery(true); $query->update($table['table']) ->set('access = ' . $id) - ->where("access = " . $this->_db->q('0'), $glue = 'OR') + ->where("access = " . $this->_db->q('0'), $glue = 'OR') ->where("access = " . $this->_db->q(' ')); $this->_db->setQuery($query); $this->_db->execute(); diff --git a/com_biblestudy/admin/models/location.php b/admin/models/location.php similarity index 100% rename from com_biblestudy/admin/models/location.php rename to admin/models/location.php diff --git a/com_biblestudy/admin/models/locations.php b/admin/models/locations.php similarity index 100% rename from com_biblestudy/admin/models/locations.php rename to admin/models/locations.php diff --git a/com_biblestudy/admin/models/mediafile.php b/admin/models/mediafile.php similarity index 99% rename from com_biblestudy/admin/models/mediafile.php rename to admin/models/mediafile.php index 8181ea1e06..47c06a3b31 100644 --- a/com_biblestudy/admin/models/mediafile.php +++ b/admin/models/mediafile.php @@ -148,7 +148,7 @@ public function save($data) /** * Get the media form * - * @return bool|mixed + * @return boolean|mixed * * @throws Exception * diff --git a/com_biblestudy/admin/models/mediafiles.php b/admin/models/mediafiles.php similarity index 100% rename from com_biblestudy/admin/models/mediafiles.php rename to admin/models/mediafiles.php diff --git a/com_biblestudy/admin/models/message.php b/admin/models/message.php similarity index 100% rename from com_biblestudy/admin/models/message.php rename to admin/models/message.php diff --git a/com_biblestudy/admin/models/messages.php b/admin/models/messages.php similarity index 100% rename from com_biblestudy/admin/models/messages.php rename to admin/models/messages.php diff --git a/com_biblestudy/admin/models/messagetype.php b/admin/models/messagetype.php similarity index 100% rename from com_biblestudy/admin/models/messagetype.php rename to admin/models/messagetype.php diff --git a/com_biblestudy/admin/models/messagetypes.php b/admin/models/messagetypes.php similarity index 100% rename from com_biblestudy/admin/models/messagetypes.php rename to admin/models/messagetypes.php diff --git a/com_biblestudy/admin/models/podcast.php b/admin/models/podcast.php similarity index 100% rename from com_biblestudy/admin/models/podcast.php rename to admin/models/podcast.php diff --git a/com_biblestudy/admin/models/podcasts.php b/admin/models/podcasts.php similarity index 100% rename from com_biblestudy/admin/models/podcasts.php rename to admin/models/podcasts.php diff --git a/com_biblestudy/admin/models/serie.php b/admin/models/serie.php similarity index 100% rename from com_biblestudy/admin/models/serie.php rename to admin/models/serie.php diff --git a/com_biblestudy/admin/models/series.php b/admin/models/series.php similarity index 100% rename from com_biblestudy/admin/models/series.php rename to admin/models/series.php diff --git a/com_biblestudy/admin/models/server.php b/admin/models/server.php similarity index 99% rename from com_biblestudy/admin/models/server.php rename to admin/models/server.php index e190ee67f7..6d97ab9840 100644 --- a/com_biblestudy/admin/models/server.php +++ b/admin/models/server.php @@ -164,7 +164,7 @@ public function save($data) /** * Get the server form * - * @return bool|mixed + * @return boolean|mixed * * @throws Exception * diff --git a/com_biblestudy/admin/models/servers.php b/admin/models/servers.php similarity index 100% rename from com_biblestudy/admin/models/servers.php rename to admin/models/servers.php diff --git a/com_biblestudy/admin/models/teacher.php b/admin/models/teacher.php similarity index 99% rename from com_biblestudy/admin/models/teacher.php rename to admin/models/teacher.php index 661315755a..a5eb9b9f10 100644 --- a/com_biblestudy/admin/models/teacher.php +++ b/admin/models/teacher.php @@ -150,7 +150,7 @@ public function checkout($pk = null) * * @param array $data Data * - * @return bool + * @return boolean * * @since 9.0.0 */ diff --git a/com_biblestudy/admin/models/teachers.php b/admin/models/teachers.php similarity index 100% rename from com_biblestudy/admin/models/teachers.php rename to admin/models/teachers.php diff --git a/com_biblestudy/admin/models/template.php b/admin/models/template.php similarity index 100% rename from com_biblestudy/admin/models/template.php rename to admin/models/template.php diff --git a/com_biblestudy/admin/models/templatecode.php b/admin/models/templatecode.php similarity index 100% rename from com_biblestudy/admin/models/templatecode.php rename to admin/models/templatecode.php diff --git a/com_biblestudy/admin/models/templatecodes.php b/admin/models/templatecodes.php similarity index 100% rename from com_biblestudy/admin/models/templatecodes.php rename to admin/models/templatecodes.php diff --git a/com_biblestudy/admin/models/templates.php b/admin/models/templates.php similarity index 100% rename from com_biblestudy/admin/models/templates.php rename to admin/models/templates.php diff --git a/com_biblestudy/admin/models/topic.php b/admin/models/topic.php similarity index 100% rename from com_biblestudy/admin/models/topic.php rename to admin/models/topic.php diff --git a/com_biblestudy/admin/models/topics.php b/admin/models/topics.php similarity index 100% rename from com_biblestudy/admin/models/topics.php rename to admin/models/topics.php diff --git a/com_biblestudy/admin/postinstall/template.php b/admin/postinstall/template.php similarity index 96% rename from com_biblestudy/admin/postinstall/template.php rename to admin/postinstall/template.php index 331318a153..0c490abdd6 100644 --- a/com_biblestudy/admin/postinstall/template.php +++ b/admin/postinstall/template.php @@ -57,7 +57,7 @@ function Admin_Postinstall_Template_condition() } } } - catch (\Exception $e) + catch (Exception $e) { $results = null; } @@ -70,8 +70,8 @@ function Admin_Postinstall_Template_condition() * * @return void * + * @throws Exception * @since 3.2 - * @throws \Exception */ function Admin_Postinstall_Template_action() { diff --git a/com_biblestudy/admin/tables/admin.php b/admin/tables/admin.php similarity index 74% rename from com_biblestudy/admin/tables/admin.php rename to admin/tables/admin.php index 91f4141ff3..b894d12771 100644 --- a/com_biblestudy/admin/tables/admin.php +++ b/admin/tables/admin.php @@ -108,8 +108,40 @@ public function bind($array, $ignore = '') // Convert the params field to a string. $parameter = new Registry; $parameter->loadArray($array['params']); + $params = $parameter->toArray(); $array['params'] = (string) $parameter; } + // If simple mode, check and rename some files to hide menus + $views = array(); + $views[] = 'landingpage'; + $views[] = 'podcastdisplay'; + $views[] = 'podcastlist'; + $views[] = 'seriesdisplay'; + $views[] = 'seriesdisplays'; + $views[] = 'sermon'; + $views[] = 'teacher'; + $views[] = 'teachers'; + if ($params['simple_mode'] == 1) + { + //Go through each folder and change content of default.xml to add the hidden value to the layout tag + foreach ($views as $view) + { + $filecontents = file_get_contents(JPATH_ROOT . DIRECTORY_SEPARATOR . 'components/com_biblestudy/views/'.$view.'/tmpl/default.xml'); + if (substr_count($filecontents, '