Merge pull request #693 from Joomla-Bible-Study/bcordis-save-cache

Bcordis save cache

README.md

@@ -14,15 +14,15 @@ Status
     <tr>
         <td align="center"><a href="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study" target="_blank"><img src="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study.png?branch=development"/></a></td>
         <td align="center">Development</td>
-        <td align="center">9.0.4</td>
+        <td align="center">9.0.5</td>
         <td align="center">TBD</td>
         <td align="center">3.4+</td>
     </tr>
     <tr>
         <td align="center"><a href="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study" target="_blank"><img src="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study.png?branch=master"/></a></td>
         <td align="center">Master</td>
-        <td align="center">9.0.3</td>
-        <td align="center">Aug 22, 2016</td>
+        <td align="center">9.0.4</td>
+        <td align="center">September 4, 2016</td>
         <td align="center">3.4+</td>
     </tr>
 </table>

build/phpcs/Joomla/ruleset.xml

@@ -11,6 +11,7 @@
 	<exclude-pattern type="relative">vendor/*</exclude-pattern>
 	<exclude-pattern type="relative">bin/*</exclude-pattern>
 	<exclude-pattern type="relative">.joomla-dev/*</exclude-pattern>
+	<exclude-pattern type="relative">*/*default.php*</exclude-pattern>
 
 	<!-- Exclude folders not containing production code -->
 	<exclude-pattern type="relative">build/*</exclude-pattern>

build/pkg_biblestudy_package.xml

@@ -8,8 +8,8 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>http://www.joomlabiblestudy.org</authorUrl>
 	<copyright>(C) 2007 - 2016 Joomla Bible Study All rights reserved.</copyright>
-	<version>9.0.3</version>
-	<creationDate>Aug 22, 2016</creationDate>
+	<version>9.0.4</version>
+	<creationDate>September 4, 2016</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<packager>Tom Fuller</packager>
 	<packagerurl>http://www.joomlabiblestudy.org</packagerurl>

com_biblestudy/admin/api.php

@@ -19,8 +19,7 @@
 define('JBSM_PROFILER', 0);
 
 // Version information
-define('BIBLESTUDY_VERSION', '9.0.3');
-define('BIBLESTUDY_VERSION_DATE', '2016-08-22');
+define('BIBLESTUDY_VERSION', '9.0.4');
 define('BIBLESTUDY_VERSION_UPDATEFILE', 'JBS Version ' . BIBLESTUDY_VERSION);
 
 // Default values

com_biblestudy/admin/biblestudy.php

@@ -41,8 +41,8 @@
 
 if ($jbsstate && $type == 'install')
 {
-	$cache = new JCache(array('defaultgroup' => 'default'));
-	$cache->clean();
+	JBSMHelper::clearcache('admin');
+	JBSMHelper::clearcache('site');
 	$app->input->set('task', 'browse');
 }
 

com_biblestudy/admin/controllers/assets.php

@@ -116,8 +116,8 @@ public function browse()
 
 		if (empty($stack))
 		{
-			$cache = new JCache(array('defaultgroup' => 'com_biblestudy'));
-			$cache->clean();
+			JBSMHelper::clearcache('site');
+			JBSMHelper::clearcache('admin');
 			$session->set('asset_stack', '', 'JBSM');
 
 			/** @var BibleStudyModelAssets $model */
@@ -146,8 +146,8 @@ public function clear()
 		// Check for request forgeries.
 		JSession::checkToken('get') or jexit(JText::_('JINVALID_TOKEN'));
 
-		$cache = new JCache(array('defaultgroup' => 'com_biblestudy'));
-		$cache->clean();
+		JBSMHelper::clearcache('admin');
+		JBSMHelper::clearcache('site');
 		$session = JFactory::getSession();
 		$session->set('assat_stack', '', 'JBSM');
 		$app = JFactory::getApplication();

com_biblestudy/admin/controllers/install.php

@@ -92,8 +92,8 @@ public function browse()
 
 		if (empty($stack))
 		{
-			$cache = new JCache(array('defaultgroup' => 'com_biblestudy'));
-			$cache->clean();
+			JBSMHelper::clearcache('site');
+			JBSMHelper::clearcache('admin');
 			$session->set('migration_stack', '', 'JBSM');
 
 			/** @var BibleStudyModelInstall $model */
@@ -119,8 +119,8 @@ public function browse()
 	 */
 	public function clear()
 	{
-		$cache = new JCache(array('defaultgroup' => 'com_biblestudy'));
-		$cache->clean();
+		JBSMHelper::clearcache('site');
+		JBSMHelper::clearcache('admin');
 		$session = JFactory::getSession();
 		$session->set('migration_stack', '', 'JBSM');
 		$this->browse();

com_biblestudy/admin/helpers/helper.php

@@ -186,4 +186,40 @@ public static function MediaBuildUrl ($spath, $path, $params, $setProtical = fal
 
 		return $path;
 	}
+
+	/**
+	 * Clear Cache of JBSM
+	 *
+	 * @param   string  $state  Where to clean the cache from. Site or Admin.
+	 *
+	 * @since 9.0.4
+	 * @return void
+	 */
+	public static function clearcache($state = 'site')
+	{
+		$conf = JFactory::getConfig();
+		$options = array();
+
+		if ($state == 'admin')
+		{
+			$options = array(
+				'defaultgroup' => 'com_biblestudy',
+				'storage'      => $conf->get('cache_handler', ''),
+				'caching'      => true,
+				'cachebase'    => $conf->get('cache_path', JPATH_ADMINISTRATOR . '/cache')
+			);
+		}
+		elseif ($state == 'site')
+		{
+			$options = array(
+				'defaultgroup' => 'com_biblestudy',
+				'storage'      => $conf->get('cache_handler', ''),
+				'caching'      => true,
+				'cachebase'    => $conf->get('cache_path', JPATH_SITE . '/cache')
+			);
+		}
+
+		$cache = JCache::getInstance('', $options);
+		$cache->clean();
+	}
 }

com_biblestudy/admin/models/admin.php

@@ -79,6 +79,8 @@ public function getForm($data = array(), $loadData = true)
 	 */
 	public function save($data)
 	{
+		$this->cleanCache();
+
 		if (parent::save($data))
 		{
 			return true;

com_biblestudy/admin/models/message.php

@@ -214,6 +214,8 @@ public function save($data)
 		$params = JBSMParams::getAdmin()->params;
 		$input  = JFactory::getApplication()->input;
 
+		$this->cleanCache();
+
 		if ($input->get('a_id'))
 		{
 			$data['id'] = $input->get('a_id');

com_biblestudy/admin/views/comments/tmpl/default.php

@@ -24,6 +24,8 @@
 $trashed    = $this->state->get('filter.published') == -2 ? true : false;
 $saveOrder  = $listOrder == 'ordering';
 $sortFields = $this->getSortFields();
+$columns    = 9;
+
 JFactory::getDocument()->addScriptDeclaration('
 	Joomla.orderTable = function()
 	{
@@ -62,60 +64,11 @@
 					<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 				</div>
 			<?php else : ?>
-				<div id="filter-bar" class="btn-toolbar">
-					<div class="filter-search btn-group pull-left">
-						<label for="filter_search"
-						       class="element-invisible"><?php echo JText::_('JBS_CMN_FILTER_SEARCH_DESC'); ?></label>
-						<input type="text" name="filter_search"
-						       placeholder="<?php echo JText::_('JBS_CMN_FILTER_SEARCH_DESC'); ?>"
-						       id="filter_search"
-						       value="<?php echo $this->escape($this->state->get('filter.search')); ?>"
-						       title="<?php echo JText::_('JBS_CMN_FILTER_SEARCH_DESC'); ?>"/>
-					</div>
-					<div class="btn-group pull-left hidden-phone">
-						<button class="btn tip hasTooltip" type="submit"
-						        title="<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>"><i
-									class="icon-search"></i></button>
-						<button class="btn tip hasTooltip" type="button"
-						        onclick="document.id('filter_search').value='';this.form.submit();"
-						        title="<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>"><i class="icon-remove"></i>
-						</button>
-					</div>
-					<div class="btn-group pull-right hidden-phone">
-						<label for="limit"
-						       class="element-invisible"><?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?></label>
-						<?php echo $this->pagination->getLimitBox(); ?>
-					</div>
-					<div class="btn-group pull-right hidden-phone">
-						<label for="directionTable"
-						       class="element-invisible"><?php echo JText::_('JFIELD_ORDERING_DESC'); ?></label>
-						<select name="directionTable" id="directionTable" class="input-medium"
-						        onchange="Joomla.orderTable()">
-							<option value=""><?php echo JText::_('JFIELD_ORDERING_DESC'); ?></option>
-							<option
-									value="asc" <?php if ($listDirn == 'asc') echo 'selected="selected"'; ?>><?php echo JText::_('JBS_CMN_ASCENDING'); ?></option>
-							<option
-									value="desc" <?php if ($listDirn == 'desc') echo 'selected="selected"'; ?>><?php echo JText::_('JBS_CMN_DESCENDING'); ?></option>
-						</select>
-					</div>
-					<div class="btn-group pull-right">
-						<label for="sortTable"
-						       class="element-invisible"><?php echo JText::_('JBS_CMN_SELECT_BY'); ?></label>
-						<select name="sortTable" id="sortTable" class="input-medium" onchange="Joomla.orderTable()">
-							<option value=""><?php echo JText::_('JBS_CMN_SELECT_BY'); ?></option>
-							<?php echo JHtml::_('select.options', $sortFields, 'value', 'text', $listOrder); ?>
-						</select>
-					</div>
-				</div>
-				<div class="clearfix"></div>
-
 				<table class="table table-striped adminlist" id="comments">
 					<thead>
 					<tr>
 						<th width="1%" class="hidden-phone">
-							<input type="checkbox" name="checkall-toggle" value=""
-							       title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>"
-							       onclick="Joomla.checkAll(this)"/>
+							<?php echo JHtml::_('grid.checkall'); ?>
 						</th>
 						<th width="1%" style="min-width:55px;" class="nowrap center">
 							<?php echo JHtml::_('grid.sort', 'JBS_CMN_PUBLISHED', 'comment.published', $listDirn, $listOrder); ?>
@@ -143,6 +96,12 @@ class="element-invisible"><?php echo JText::_('JBS_CMN_SELECT_BY'); ?></label>
 						</th>
 					</tr>
 					</thead>
+					<tfoot>
+					<tr>
+						<td colspan="<?php echo $columns; ?>">
+						</td>
+					</tr>
+					</tfoot>
 					<tbody>
 					<?php
 					foreach ($this->items as $i => $item) :
@@ -158,47 +117,31 @@ class="element-invisible"><?php echo JText::_('JBS_CMN_SELECT_BY'); ?></label>
 								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
 							</td>
 							<td class="center">
-								<?php echo JHtml::_('jgrid.published', $item->published, $i, 'comments.', $canChange, 'cb', '', ''); ?>
+								<div class="btn-group">
+									<?php echo JHtml::_('jgrid.published', $item->published, $i, 'comments.', $canChange, 'cb', '', ''); ?><?php
+
+									// Create dropdown items
+									$action = $archived ? 'unarchive' : 'archive';
+									JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'messages');
+
+									$action = $trashed ? 'untrash' : 'trash';
+									JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'messages');
+
+									// Render dropdown list
+									echo JHtml::_('actionsdropdown.render', $this->escape($item->studytitle));
+									?>
+								</div>
 							</td>
 
 							<td class="nowrap has-context" style="width:10%;">
 								<div class="pull-left">
 									<?php if ($canEdit || $canEditOwn) : ?>
 										<a href="<?php echo $link; ?>"><?php echo $this->escape($item->studytitle) . ' - '
-													. JText::_($item->bookname) . ' ' . $item->chapter_begin; ?></a>
+												. JText::_($item->bookname) . ' ' . $item->chapter_begin; ?></a>
 									<?php else : ?>
 										<?php echo $this->escape($item->studytitle) . ' - ' . JText::_($item->bookname) . ' ' . $item->chapter_begin; ?>
 									<?php endif; ?>
 								</div>
-								<div class="pull-left">
-									<?php
-									// Create dropdown items
-									JHtml::_('dropdown.edit', $item->id, 'comment.');
-									JHtml::_('dropdown.divider');
-									if ($item->published) :
-										JHtml::_('dropdown.unpublish', 'cb' . $i, 'comments.');
-									else :
-										JHtml::_('dropdown.publish', 'cb' . $i, 'comments.');
-									endif;
-
-									JHtml::_('dropdown.divider');
-
-									if ($archived) :
-										JHtml::_('dropdown.unarchive', 'cb' . $i, 'comments.');
-									else :
-										JHtml::_('dropdown.archive', 'cb' . $i, 'comments.');
-									endif;
-
-									if ($trashed) :
-										JHtml::_('dropdown.untrash', 'cb' . $i, 'comments.');
-									else :
-										JHtml::_('dropdown.trash', 'cb' . $i, 'comments.');
-									endif;
-
-									// Render dropdown list
-									echo JHtml::_('dropdown.render');
-									?>
-								</div>
 							</td>
 							<td class="small hidden-phone">
 								<?php echo $this->escape($item->access_level); ?>

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

@@ -181,16 +181,6 @@ protected function addToolbar()
 		}
 
 		JHtmlSidebar::setAction('index.php?option=com_biblestudy&view=comments');
-
-		JHtmlSidebar::addFilter(
-			JText::_('JOPTION_SELECT_PUBLISHED'), 'filter_published',
-			JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true)
-		);
-
-		JHtmlSidebar::addFilter(
-			JText::_('JOPTION_SELECT_ACCESS'), 'filter_access',
-			JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'))
-			);
 	}
 
 	/**

com_biblestudy/admin/views/locations/tmpl/default.php

@@ -23,6 +23,7 @@
 $archived  = $this->state->get('filter.published') == 2 ? true : false;
 $trashed   = $this->state->get('filter.published') == -2 ? true : false;
 $saveOrder = $listOrder == 'location.ordering';
+$columns   = 5;
 
 if ($saveOrder)
 {
@@ -70,6 +71,12 @@
 						</th>
 					</tr>
 					</thead>
+					<tfoot>
+					<tr>
+						<td colspan="<?php echo $columns; ?>">
+						</td>
+					</tr>
+					</tfoot>
 					<tbody>
 					<?php
 					foreach ($this->items as $i => $item) :
@@ -97,7 +104,7 @@
 											<?php echo $this->escape($item->location_text); ?></a>
 									<?php else : ?>
 										<span
-												title="<?php echo JText::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->location_text)); ?>"><?php echo $this->escape($item->location_text); ?></span>
+											title="<?php echo JText::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->location_text)); ?>"><?php echo $this->escape($item->location_text); ?></span>
 									<?php endif; ?>
 								</div>
 								<div class="pull-left">