From feb552ee967c8a9399a067175c548aa7eb008d30 Mon Sep 17 00:00:00 2001 From: rogercreagh <44980188+rogercreagh@users.noreply.github.com> Date: Thu, 26 Jan 2023 10:50:49 +0000 Subject: [PATCH] v1.0.3.7 problem with reviews params --- src/com_xbbooks/admin/models/reviews.php | 5 +- .../site/controllers/bookreviews.php | 16 ++ src/com_xbbooks/site/models/bookreviews.php | 209 +++++++++++++++ .../site/models/forms/filter_bookreviews.xml | 66 +++++ src/com_xbbooks/site/router.php | 2 +- .../site/views/bookreviews/index.html | 1 + .../site/views/bookreviews/tmpl/default.php | 237 ++++++++++++++++++ .../site/views/bookreviews/tmpl/default.xml | 112 +++++++++ .../site/views/bookreviews/tmpl/index.html | 1 + .../site/views/bookreviews/tmpl/modalpv.php | 31 +++ .../site/views/bookreviews/view.html.php | 72 ++++++ src/com_xbbooks/xbbooks.xml | 4 +- 12 files changed, 752 insertions(+), 4 deletions(-) create mode 100644 src/com_xbbooks/site/controllers/bookreviews.php create mode 100644 src/com_xbbooks/site/models/bookreviews.php create mode 100644 src/com_xbbooks/site/models/forms/filter_bookreviews.xml create mode 100644 src/com_xbbooks/site/views/bookreviews/index.html create mode 100644 src/com_xbbooks/site/views/bookreviews/tmpl/default.php create mode 100644 src/com_xbbooks/site/views/bookreviews/tmpl/default.xml create mode 100644 src/com_xbbooks/site/views/bookreviews/tmpl/index.html create mode 100755 src/com_xbbooks/site/views/bookreviews/tmpl/modalpv.php create mode 100644 src/com_xbbooks/site/views/bookreviews/view.html.php diff --git a/src/com_xbbooks/admin/models/reviews.php b/src/com_xbbooks/admin/models/reviews.php index dc36b4d..969bc3b 100644 --- a/src/com_xbbooks/admin/models/reviews.php +++ b/src/com_xbbooks/admin/models/reviews.php @@ -2,7 +2,7 @@ /******* * @package xbBooks * @filesource admin/models/reviews.php - * @version 1.0.1.3 5th January 2023 + * @version 1.0.3.7 24th January 2023 * @author Roger C-O * @copyright Copyright (c) Roger Creagh-Osborne, 2021 * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html @@ -60,6 +60,9 @@ protected function getListQuery() { } elseif (stripos($search,'s:')===0) { $search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim(substr($search,2)), true) . '%')); $query->where('a.review' . ' LIKE ' . $search.' OR a.summary LIKE '.$search); + } elseif (stripos($search,'b:')===0) { + $search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim(substr($search,2)), true) . '%')); + $query->where('b.title' . ' LIKE ' . $search); } elseif (stripos($search,':')!= 1) { $search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%')); $query->where('(a.title LIKE ' . $search .') OR (a.alias LIKE ' . $search .')'); diff --git a/src/com_xbbooks/site/controllers/bookreviews.php b/src/com_xbbooks/site/controllers/bookreviews.php new file mode 100644 index 0000000..3ee9b89 --- /dev/null +++ b/src/com_xbbooks/site/controllers/bookreviews.php @@ -0,0 +1,16 @@ +getParams(); + $this->setState('params', $params); + + $categoryId = $app->getUserStateFromRequest('catid', 'catid',''); + $app->setUserState('catid', ''); + $this->setState('categoryId',$categoryId); + $tagId = $app->getUserStateFromRequest('tagid', 'tagid',''); + $app->setUserState('tagid', ''); + $this->setState('tagId',$tagId); + + parent::populateState($ordering, $direction); + + //pagination limit + $limit = $this->getUserStateFromRequest($this->context.'.limit', 'limit', 25 ); + $this->setState('limit', $limit); + $this->setState('list.limit', $limit); + $limitstart = $app->getUserStateFromRequest('limitstart', 'limitstart', $app->get('start')); + $this->setState('list.start', $limitstart); + + } + + protected function getListQuery() { + // Initialize variables. + $db = Factory::getDbo(); + $query = $db->getQuery(true); + + // Create the base select statement. + $query->select('a.id AS id, a.title AS title, a.alias AS alias, a.summary AS summary, a.catid AS catid, + a.review AS review, a.rating AS rating, a.state AS published, a.reviewer AS reviewer, + a.created_by AS created_by, a.rev_date AS rev_date, a.note as note, a.ordering AS ordering, + a.params AS params, + a.checked_out AS checked_out, a.checked_out_time AS checked_out_time, a.created AS created') + ->from($db->quoteName('#__xbbookreviews','a')); + + $query->select('c.title AS category_title') + ->join('LEFT', '#__categories AS c ON c.id = a.catid'); + + // Join with books table to get the book title + $query->select($db->quoteName('b.id','bookid').','.$db->quoteName('b.title', 'booktitle')) + ->join('LEFT', $db->quoteName('#__xbbooks', 'b') . ' ON b.id = a.book_id'); + + // Filter by search in title/id/summary/biog + $search = $this->getState('filter.search'); + + if (!empty($search)) { + if (stripos($search, 'i:') === 0) { + $query->where($db->quoteName('a.id') . ' = ' . (int) substr($search, 2)); + } elseif (stripos($search,'s:')===0) { + $search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim(substr($search,2)), true) . '%')); + $query->where('a.review' . ' LIKE ' . $search.' OR a.summary LIKE '.$search); + } elseif (stripos($search,'b:')===0) { + $search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim(substr($search,2)), true) . '%')); + $query->where('b.title' . ' LIKE ' . $search); + } elseif (stripos($search,':')!= 1) { + $search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%')); + $query->where('(a.title LIKE ' . $search .') OR (a.alias LIKE ' . $search .')'); + } + } + + // Filter by published state + $query->where('a.state = 1 '); + + $searchbar = (int)$this->getState('params')['search_bar']; + //if a menu filter is set this takes priority and serch filter field is hidden + + // Filter by category + $categoryId = $this->getState('categoryId'); + $this->setState('categoryId',''); + if (empty($categoryId)) { + $categoryId = $this->getState('params')['menu_category_id']; + } + if (($searchbar==1) && ($categoryId==0)){ + $categoryId = $this->getState('filter.category_id'); + } + if ((is_numeric($categoryId)) && ($categoryId > 0) ){ + $query->where($db->quoteName('a.catid') . ' = ' . (int) $categoryId); + } elseif (is_array($categoryId)) { + $catlist = implode(',', $categoryId); + $query->where($db->quoteName('a.catid') . ' IN ('.$catlist.')'); + } + + //Filter by rating + $ratfilt = $this->getState('filter.ratfilt'); + if (is_numeric($ratfilt)) { + $query->where('a.rating = '.$ratfilt); + } + + //filter by tags + $tagfilt = $this->getState('tagId'); + // $this->setState('tagId',''); + $taglogic = 0; + if (empty($tagfilt)) { //look for menu options + $tagfilt = $this->getState('params')['menu_tag']; + $taglogic = $this->getState('params')['menu_taglogic']; //1=AND otherwise OR + } + if ((!is_array($tagfilt)) && (!empty($tagfilt))) { + $tagfilt = array($tagfilt); + } + + if (($searchbar==1) && (empty($tagfilt))) { + //look for filter options and ignore menu options + $tagfilt = $this->getState('filter.tagfilt'); + $taglogic = $this->getState('filter.taglogic'); //1=AND otherwise OR + } + + if (empty($tagfilt)) { + $subQuery = '(SELECT content_item_id FROM #__contentitem_tag_map + WHERE type_alias LIKE '.$db->quote('com_xbbooks.review').')'; + if ($taglogic === '1') { + $query->where('a.id NOT IN '.$subQuery); + } elseif ($taglogic === '2') { + $query->where('a.id IN '.$subQuery); + } + } else { + $tagfilt = ArrayHelper::toInteger($tagfilt); + $subquery = '(SELECT tmap.tag_id AS tlist FROM #__contentitem_tag_map AS tmap + WHERE tmap.type_alias = '.$db->quote('com_xbbooks.review').' + AND tmap.content_item_id = a.id)'; + switch ($taglogic) { + case 1: //all + for ($i = 0; $i < count($tagfilt); $i++) { + $query->where($tagfilt[$i].' IN '.$subquery); + } + break; + case 2: //none + for ($i = 0; $i < count($tagfilt); $i++) { + $query->where($tagfilt[$i].' NOT IN '.$subquery); + } + break; + default: //any + if (count($tagfilt)==1) { + $query->where($tagfilt[0].' IN '.$subquery); + } else { + $tagIds = implode(',', $tagfilt); + if ($tagIds) { + $subQueryAny = '(SELECT DISTINCT content_item_id FROM #__contentitem_tag_map + WHERE tag_id IN ('.$tagIds.') AND type_alias = '.$db->quote('com_xbbooks.review').')'; + $query->innerJoin('(' . (string) $subQueryAny . ') AS tagmap ON tagmap.content_item_id = a.id'); + } + } + break; + } + } //end if $tagfilt + + // Add the list ordering clause. + $orderCol = $this->state->get('list.ordering', 'rev_date'); + $orderDirn = $this->state->get('list.direction', 'DESC'); + switch($orderCol) { + case 'a.ordering' : + case 'a.catid' : + //needs a menu option to set orderCol to ordering. Also menu option to alllow user to reorder on table + $query->order('category_title '.$orderDirn.', a.ordering'); + break; + case 'category_title': + $query->order('category_title '.$orderDirn.', title'); + break; + default: + $query->order($db->escape($orderCol.' '.$orderDirn)); + break; + } + + $query->group('a.id'); + + return $query; + } + + public function getItems() { + $items = parent::getItems(); + $tagsHelper = new TagsHelper; + foreach ($items as $i=>$item) { + $item->tags = $tagsHelper->getItemTags('com_xbbooks.review' , $item->id); + } + return $items; + } +} diff --git a/src/com_xbbooks/site/models/forms/filter_bookreviews.xml b/src/com_xbbooks/site/models/forms/filter_bookreviews.xml new file mode 100644 index 0000000..5ce2bee --- /dev/null +++ b/src/com_xbbooks/site/models/forms/filter_bookreviews.xml @@ -0,0 +1,66 @@ + + +
\ No newline at end of file diff --git a/src/com_xbbooks/site/router.php b/src/com_xbbooks/site/router.php index 7b38817..218aabb 100644 --- a/src/com_xbbooks/site/router.php +++ b/src/com_xbbooks/site/router.php @@ -85,7 +85,7 @@ public function parse(&$segments) $vars['view'] = 'categories'; break; case 'bookreviews': - $vars['view'] = 'blog'; + $vars['view'] = 'bookreviews'; break; case 'tags': $vars['view'] = 'tags'; diff --git a/src/com_xbbooks/site/views/bookreviews/index.html b/src/com_xbbooks/site/views/bookreviews/index.html new file mode 100644 index 0000000..3af6301 --- /dev/null +++ b/src/com_xbbooks/site/views/bookreviews/index.html @@ -0,0 +1 @@ +