From 0fce5f28c1e494fc8dd59c4be8485ec517b50cfb Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Tue, 19 Aug 2014 13:29:32 -0400 Subject: [PATCH] Update for template output now if the have members on a page it can also output the photos --- Toolkit/Template/Page/BodyFactory.php | 254 +++++++++++++------------- Toolkit/Template/Page/Member.php | 148 +++++++-------- Toolkit/Template/Page/Toolbox.php | 2 +- 3 files changed, 196 insertions(+), 208 deletions(-) diff --git a/Toolkit/Template/Page/BodyFactory.php b/Toolkit/Template/Page/BodyFactory.php index d5f7000..c120abc 100644 --- a/Toolkit/Template/Page/BodyFactory.php +++ b/Toolkit/Template/Page/BodyFactory.php @@ -1,4 +1,5 @@ _breadCrumbsFactory = $breadCrumbsFactory; - $this->_pageGateway = $pageGateway; - $this->_paragraphGateway = $paragraphGateway; - $this->_keywordReplacement = $keywordReplacement; - $this->_cache = $cache; - - } + ) { + $this->_breadCrumbsFactory = $breadCrumbsFactory; + $this->_pageGateway = $pageGateway; + $this->_paragraphGateway = $paragraphGateway; + $this->_keywordReplacement = $keywordReplacement; + $this->_cache = $cache; + } - // }}} - // {{{ getPageBodyBuilder() + // }}} + // {{{ getPageBodyBuilder() /** * description of getPageBodyBuilder @@ -112,107 +112,117 @@ class Toolkit_Template_Page_BodyFactory * |\Toolkit_Template_Page_Member|\Toolkit_Template_Page_Toolbox * @access public */ - public function getPageBodyBuilder($id) - { + public function getPageBodyBuilder($id) + { $memberId = filter_var($_REQUEST['member_id'], FILTER_VALIDATE_INT); - $page = $this->_pageGateway->find($id); - - $forgotPassword = (isset($_GET['forgot']) && $_GET['forgot'] == 1); - $siteMap = (isset($_GET['sitemap']) && $_GET['sitemap'] == 1); - $memberDbSiteMap = ( isset($_GET['memberDbSiteMap']) - && $_GET['memberDbSiteMap'] == 1); - $pageDoesNotExist = ($page === false); + $page = $this->_pageGateway->find($id); + + $forgotPassword = (isset($_GET['forgot']) && $_GET['forgot'] == 1); + $siteMap = (isset($_GET['sitemap']) && $_GET['sitemap'] == 1); + $memberDbSiteMap + = ( isset($_GET['memberDbSiteMap']) + && $_GET['memberDbSiteMap'] == 1); + $pageDoesNotExist = ($page === false); if ($pageDoesNotExist && $memberId) { $pageDoesNotExist = false; } - $pageIsTurnedOff = ( is_array($page) - && !$page['active'] - && !strstr($_SERVER['HTTP_REFERER'], 'admin/') - && !$_REQUEST['preview']); - $googleSearch = ( defined('GOOGLE_SEARCH') - && GOOGLE_SEARCH - && isset($_GET['query']) - && !empty($_GET['query'])); - $glmSearch = ( defined('GLM_SEARCH') - && GLM_SEARCH - && isset($_REQUEST['GLMSearch']) - && $_REQUEST['GLMSearch'] == 'true'); - $memberPage = ( defined('MEMBERS_DB') - && MEMBERS_DB - && $page['include_members'] - || $memberId - ); - - if ($forgotPassword) { - die('Toolkit_Template_Page_BodyFactory::getPageBodyBuilder'); - } elseif ($memberDbSiteMap) { - return new Toolkit_Members_SiteMapPage( - Toolkit_Database::getInstance(), - $this->_pageGateway - ); - } elseif ($siteMap) { - return new Toolkit_Template_Page_SiteMap( - Toolkit_Database::getInstance(), - $this->_pageGateway - ); - } elseif ($pageDoesNotExist) { - // page does not exist - // give 301 redirect and go back to index page - header($_SERVER['SERVER_PROTOCOL'] . ' 301 Moved Permanently'); - header('Location: ' . BASE_URL . 'index.php'); - exit(); - } elseif ($pageIsTurnedOff) { - // page exists, but is turned off - // give 404 redirect and go back to index page - header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found'); - return new Toolkit_Template_Page_Bad(); - } elseif ($googleSearch) { - return new Toolkit_Template_Page_GoogleSearch(); - } elseif ($glmSearch) { - return new Toolkit_Template_Page_GLMSearch(); - } elseif ($memberPage) { - $conf = new Config; - $root =& $conf->parseConfig( - BASE . 'Toolkit/Members/config.ini', - 'IniFile' - ); - - $imageAdapter = new Toolkit_FileServer_ImageAdapter(); - - return new Toolkit_Template_Page_Member( - $id, - new Toolkit_Template_Image_Factory($imageAdapter), - $this->_breadCrumbsFactory, - $this->_pageGateway, - $this->_paragraphGateway, - $this->_keywordReplacement, - $this->_cache, - $root - ); - } else { // regular toolbox page - $imageAdapter = new Toolkit_FileServer_ImageAdapter(); - - $photoGallery = null; - if (defined('PHOTO_GALLERY') && PHOTO_GALLERY) { - $dbh = Toolkit_Database::getInstance(); - $photoGallery = new Toolkit_Photos_Gallery( - $dbh, - new Toolkit_Photos_Display($dbh) - ); - } - - return new Toolkit_Template_Page_Toolbox( - $id, - new Toolkit_Template_Image_Factory($imageAdapter), - $this->_breadCrumbsFactory, - $this->_pageGateway, - $this->_paragraphGateway, - $this->_keywordReplacement, - $this->_cache, - $photoGallery - ); - } - } - - // }}} + $pageIsTurnedOff + = ( is_array($page) + && !$page['active'] + && !strstr($_SERVER['HTTP_REFERER'], + 'admin/' + ) && !$_REQUEST['preview']); + $googleSearch + = ( defined('GOOGLE_SEARCH') + && GOOGLE_SEARCH + && isset($_GET['query']) + && !empty($_GET['query'])); + $glmSearch + = ( defined('GLM_SEARCH') + && GLM_SEARCH + && isset($_REQUEST['GLMSearch']) + && $_REQUEST['GLMSearch'] == 'true'); + $memberPage + = ( defined('MEMBERS_DB') + && MEMBERS_DB + && $page['include_members'] + || $memberId + ); + + if ($forgotPassword) { + die('Toolkit_Template_Page_BodyFactory::getPageBodyBuilder'); + } elseif ($memberDbSiteMap) { + return new Toolkit_Members_SiteMapPage( + Toolkit_Database::getInstance(), $this->_pageGateway + ); + } elseif ($siteMap) { + return new Toolkit_Template_Page_SiteMap( + Toolkit_Database::getInstance(), $this->_pageGateway + ); + } elseif ($pageDoesNotExist) { + // page does not exist + // give 301 redirect and go back to index page + header($_SERVER['SERVER_PROTOCOL'] . ' 301 Moved Permanently'); + header('Location: ' . BASE_URL . 'index.php'); + exit(); + } elseif ($pageIsTurnedOff) { + // page exists, but is turned off + // give 404 redirect and go back to index page + header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found'); + return new Toolkit_Template_Page_Bad(); + } elseif ($googleSearch) { + return new Toolkit_Template_Page_GoogleSearch(); + } elseif ($glmSearch) { + return new Toolkit_Template_Page_GLMSearch(); + } elseif ($memberPage) { + $conf = new Config; + $root = & $conf->parseConfig( + BASE . 'Toolkit/Members/config.ini', 'IniFile' + ); + + $imageAdapter = new Toolkit_FileServer_ImageAdapter(); + + $photoGallery = null; + if (defined('PHOTO_GALLERY') && PHOTO_GALLERY) { + $dbh = Toolkit_Database::getInstance(); + $photoGallery = new Toolkit_Photos_Gallery( + $dbh, new Toolkit_Photos_Display($dbh) + ); + } + + return new Toolkit_Template_Page_Member( + $id, + new Toolkit_Template_Image_Factory($imageAdapter), + $this->_breadCrumbsFactory, + $this->_pageGateway, + $this->_paragraphGateway, + $this->_keywordReplacement, + $this->_cache, $root, + $photoGallery + ); + } else { // regular toolbox page + $imageAdapter = new Toolkit_FileServer_ImageAdapter(); + + $photoGallery = null; + if (defined('PHOTO_GALLERY') && PHOTO_GALLERY) { + $dbh = Toolkit_Database::getInstance(); + $photoGallery = new Toolkit_Photos_Gallery( + $dbh, new Toolkit_Photos_Display($dbh) + ); + } + + return new Toolkit_Template_Page_Toolbox( + $id, + new Toolkit_Template_Image_Factory($imageAdapter), + $this->_breadCrumbsFactory, + $this->_pageGateway, + $this->_paragraphGateway, + $this->_keywordReplacement, + $this->_cache, + $photoGallery + ); + } + } + + // }}} } diff --git a/Toolkit/Template/Page/Member.php b/Toolkit/Template/Page/Member.php index 7a9bd98..36ec762 100644 --- a/Toolkit/Template/Page/Member.php +++ b/Toolkit/Template/Page/Member.php @@ -1,4 +1,5 @@ */ -class Toolkit_Template_Page_Member extends Toolkit_Template_Page_Toolbox +class Toolkit_Template_Page_Member + extends Toolkit_Template_Page_Toolbox { // {{{ properties @@ -63,7 +65,8 @@ class Toolkit_Template_Page_Member extends Toolkit_Template_Page_Toolbox Toolkit_Toolbox_ParagraphGatewayAbstract $paragraphGateway, Toolkit_Template_KeywordReplacement $keywordReplacement, Cache_Lite $cache, - Config_Container $config + Config_Container $config, + Toolkit_Photos_Gallery $photoGallery = null ) { $this->id = $id; $this->imageFactory = $imageFactory; @@ -73,10 +76,10 @@ class Toolkit_Template_Page_Member extends Toolkit_Template_Page_Toolbox $this->keywordReplacement = $keywordReplacement; $this->cache = $cache; $this->_configContainer = $config; + $this->photoGallery = $photoGallery; } // }}} - // {{{ getBreadCrumbs() /** @@ -92,7 +95,7 @@ class Toolkit_Template_Page_Member extends Toolkit_Template_Page_Toolbox $stack = parent::getbreadCrumbsArray($id); $lastNode = array_pop($stack); - $anchor = '' . $lastNode . ''; + $anchor = '' . $lastNode . ''; array_push($stack, $anchor); array_push($stack, 'Member Name'); @@ -114,28 +117,23 @@ class Toolkit_Template_Page_Member extends Toolkit_Template_Page_Toolbox private function _getMemberSearchResults($id) { $memberMap = false; - $page = $this->pageGateway->find($id); - $html = ''; + $page = $this->pageGateway->find($id); + $html = ''; if ($page['include_member_map']) { $memberMap = true; $googleMap = new Toolkit_Members_Map(); - $html = $googleMap->toHtml(); + $html = $googleMap->toHtml(); } $dbh = Toolkit_Database::getInstance(); $searchQuery = new Toolkit_Members_SearchQueryGenerator( - true, - $this->_configContainer + true, $this->_configContainer ); - $sql = $searchQuery->getQuery($dbh); + $sql = $searchQuery->getQuery($dbh); $searchList = new Toolkit_Members_SearchList( - $dbh, - 50, - null, - null, - (bool)$page['search_form'] + $dbh, 50, null, null, (bool) $page['search_form'] ); $searchList->setConfig($this->_configContainer); @@ -150,8 +148,8 @@ class Toolkit_Template_Page_Member extends Toolkit_Template_Page_Toolbox ->getContent(); if ($nonMembers) { $defaultSort = array( - 'nonmember' => 'ASC', - 'member_name' => 'ASC' + 'nonmember' => 'ASC', + 'member_name' => 'ASC' ); } else { $defaultSort = array( @@ -189,19 +187,13 @@ class Toolkit_Template_Page_Member extends Toolkit_Template_Page_Toolbox $html = ''; if ($page['include_member_map']) { $googleMap = new Toolkit_Members_Map(); - $html = $googleMap->toHtml(); + $html = $googleMap->toHtml(); } - $pageUrl - = ($_REQUEST['page_id']) + $pageUrl = ($_REQUEST['page_id']) ? MEDIA_BASE_URL . "members-only-area/?page_id={$_REQUEST['page_id']}" : MEDIA_BASE_URL . "index.php?catid={$_GET['catid']}"; - $form = new Toolkit_Members_UserSearchForm( - 'SearchForm', - 'get', - $pageUrl, - null, - null, - true + $form = new Toolkit_Members_UserSearchForm( + 'SearchForm', 'get', $pageUrl, null, null, true ); $res = $form->setCatid($_GET['catid']); @@ -211,8 +203,7 @@ class Toolkit_Template_Page_Member extends Toolkit_Template_Page_Toolbox $form->setPageMemberRegions($this->pageGateway); $form->configureForm($dbh, $this->_configContainer); $html .= $form->toHtml( - Toolkit_Members::getFlexyOptions(), - $this->pageGateway + Toolkit_Members::getFlexyOptions(), $this->pageGateway ); } else { return Toolkit_Common::handleError($res); @@ -236,8 +227,7 @@ class Toolkit_Template_Page_Member extends Toolkit_Template_Page_Toolbox { try { $profileCreator = new Toolkit_Members_ProfilePage( - Toolkit_Database::getInstance(), - $this->pageGateway, + Toolkit_Database::getInstance(), $this->pageGateway, $_GET['member_id'] ); @@ -246,15 +236,13 @@ class Toolkit_Template_Page_Member extends Toolkit_Template_Page_Toolbox ); $profileWriter = new Toolkit_Members_ProfileWriter( - new Cache_Lite(Toolkit_Members::getCacheOptions()), - $tEngine + new Cache_Lite(Toolkit_Members::getCacheOptions()), $tEngine ); $profileWriter->setTemplate('memberDetail.tpl'); $profileWriter->attach( new Toolkit_Members_Exposure( - $profileCreator->getMemberId(), - 'detail' + $profileCreator->getMemberId(), 'detail' ) ); @@ -290,31 +278,25 @@ class Toolkit_Template_Page_Member extends Toolkit_Template_Page_Toolbox ); $flexyOpts = Toolkit_Coupons_Controller::getFlexyOptions(); - $tEngine = new HTML_Template_Flexy($flexyOpts); + $tEngine = new HTML_Template_Flexy($flexyOpts); $widget->addPageCategories( - Toolkit_Database::getInstance(), - $id + Toolkit_Database::getInstance(), $id ); $searchForm = new Toolkit_Coupons_UserSearch( - 'coupon_search', - 'get', - MEDIA_BASE_URL . 'index.php' + 'coupon_search', 'get', MEDIA_BASE_URL . 'index.php' ); $searchForm->configureForm( - Toolkit_Database::getInstance(), - $id + Toolkit_Database::getInstance(), $id ); $widget->setSearchForm($searchForm); $couponForm = new HTML_QuickForm( - 'coupon_form', - 'post', - MEDIA_BASE_URL . 'Toolkit/Coupons/print.php' + 'coupon_form', 'post', MEDIA_BASE_URL . 'Toolkit/Coupons/print.php' ); - $renderer =& $couponForm->defaultRenderer(); + $renderer = & $couponForm->defaultRenderer(); $renderer->clearAllTemplates(); return $widget->toHtml($couponForm, $tEngine, 'coupons.html'); } @@ -322,8 +304,8 @@ class Toolkit_Template_Page_Member extends Toolkit_Template_Page_Toolbox private function _isMemberActive($memberId) { try { - $dbh = Toolkit_Database::getInstance(); - $sql = " + $dbh = Toolkit_Database::getInstance(); + $sql = " SELECT active FROM member WHERE member_id = :member_id"; @@ -334,8 +316,8 @@ class Toolkit_Template_Page_Member extends Toolkit_Template_Page_Toolbox } catch (PDOException $e) { Toolkit_Common::handleError($e); } - } + // {{{ getContent() /** @@ -346,43 +328,39 @@ class Toolkit_Template_Page_Member extends Toolkit_Template_Page_Toolbox */ public function getContent() { - $GLOBALS['bottomScripts'][] - = MEDIA_APP_BASE_URL . 'libjs/member-link.js'; - $breadCrumbsBuilder = $this->breadCrumbsFactory->createBreadCrumbsHelper(); - $page = $this->pageGateway->find($this->id); - - $tpl - = new HTML_Template_Flexy($GLOBALS['flexyOptions']); - $tPage = new stdClass(); - $tPage->pods = ''; - $tPage->isMainLevel = false; - $tPage->title = $page['title']; - $tPage->photos = $photoGalleryContent; - $tPage->coupons = null; - $tPage->specials = $specials; - $tPage->staticPageContent - = $this->getStaticPageContent($this->id); - $tPage->breadCrumbs - = $breadCrumbsBuilder->toHtml($this->id); - $tPage->primaryParagraph - = $this->getPrimaryParagraph($this->id); - $tPage->secondaryParagraphs - = $this->getSecondaryParagraphs($this->id); - - if (filter_input(INPUT_GET, 'member_id', FILTER_VALIDATE_INT)) { - $tPage->profile = $this->_getMemberProfilePage($this->id); - } elseif ($page['search_form']) { -// $tPage->searchForm = $this->_getMemberSearchForm($this->id); - $tPage->searchResults = $this->_getMemberSearchResults($this->id); - } elseif (isset($_GET['search'])) { - $tPage->searchResults = $this->_getMemberSearchResults($this->id); - } else { -// $tPage->searchForm = $this->_getMemberSearchForm($this->id); + $GLOBALS['bottomScripts'][] = MEDIA_APP_BASE_URL . 'libjs/member-link.js'; + $breadCrumbsBuilder = $this->breadCrumbsFactory->createBreadCrumbsHelper(); + $page = $this->pageGateway->find($this->id); + + $photoGalleryContent = null; + if (defined('PHOTO_GALLERY') && PHOTO_GALLERY) { + $photoGalleryContent = $this->photoGallery->getPageGallery($this->id); + } + + $tpl = new HTML_Template_Flexy($GLOBALS['flexyOptions']); + $tPage = new stdClass(); + $tPage->photos = $photoGalleryContent; + $tPage->pods = ''; + $tPage->isMainLevel = false; + $tPage->title = $page['title']; + $tPage->photos = $photoGalleryContent; + $tPage->coupons = null; + $tPage->specials = $specials; + $tPage->staticPageContent = $this->getStaticPageContent($this->id); + $tPage->breadCrumbs = $breadCrumbsBuilder->toHtml($this->id); + $tPage->primaryParagraph = $this->getPrimaryParagraph($this->id); + $tPage->secondaryParagraphs = $this->getSecondaryParagraphs($this->id); + + if (filter_input(INPUT_GET, 'member_id', FILTER_VALIDATE_INT)) { + $tPage->profile = $this->_getMemberProfilePage($this->id); + } elseif ($page['search_form']) { + $tPage->searchResults = $this->_getMemberSearchResults($this->id); + } elseif (isset($_GET['search'])) { $tPage->searchResults = $this->_getMemberSearchResults($this->id); - } + } else { + $tPage->searchResults = $this->_getMemberSearchResults($this->id); + } return $tPage; -// $tpl->compile('toolbox.html'); -// return $tpl->bufferedOutputObject($tPage); } // }}} diff --git a/Toolkit/Template/Page/Toolbox.php b/Toolkit/Template/Page/Toolbox.php index 04e58b5..9bca0b3 100644 --- a/Toolkit/Template/Page/Toolbox.php +++ b/Toolkit/Template/Page/Toolbox.php @@ -163,7 +163,7 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody $tPage = new stdClass(); if ($page) { $tPage->title = $page['title']; - $tPage->photos = $photoGalleryContent; + $tPage->photos = $photoGalleryContent; $tPage->coupons = (defined('COUPONS')) ? $this->_getPageCoupons($this->id) -- 2.17.1