diff options
| author | Christian Fowler <spider@viovio.com> | 2007-06-15 01:36:50 +0000 |
|---|---|---|
| committer | Christian Fowler <spider@viovio.com> | 2007-06-15 01:36:50 +0000 |
| commit | 020c50669c2311dbc78dfc3a2bfc6660656689b1 (patch) | |
| tree | 705b5cc1aa133d23b1ba4a118994d6c4f7c8e2b0 /FisheyeGallery.php | |
| parent | ba6ae496d051a4908e13bc3d2d3906167cef0cfe (diff) | |
| download | fisheye-020c50669c2311dbc78dfc3a2bfc6660656689b1.tar.gz fisheye-020c50669c2311dbc78dfc3a2bfc6660656689b1.tar.bz2 fisheye-020c50669c2311dbc78dfc3a2bfc6660656689b1.zip | |
migrate gatekeeper list SQL to new service function
Diffstat (limited to 'FisheyeGallery.php')
| -rw-r--r-- | FisheyeGallery.php | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/FisheyeGallery.php b/FisheyeGallery.php index a96a578..03dcc6e 100644 --- a/FisheyeGallery.php +++ b/FisheyeGallery.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeGallery.php,v 1.58 2007/06/13 17:33:40 nickpalmer Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeGallery.php,v 1.59 2007/06/15 01:36:50 spiderr Exp $ * @package fisheye */ @@ -212,12 +212,6 @@ class FisheyeGallery extends FisheyeBase { } } - if( $gBitSystem->isPackageActive( 'gatekeeper' ) ) { - $selectSql .= ' ,ls.`security_id`, ls.`security_description`, ls.`is_private`, ls.`is_hidden`, ls.`access_question`, ls.`access_answer` '; - $joinSql .= " LEFT OUTER JOIN `".BIT_DB_PREFIX."gatekeeper_security_map` cg ON (lc.`content_id`=cg.`content_id`) LEFT OUTER JOIN `".BIT_DB_PREFIX."gatekeeper_security` ls ON (ls.`security_id`=cg.`security_id` )"; -// $where = ' AND (cg.`security_id` IS NULL OR lc.`user_id`=?) '; -// $bindVars[] = $gBitUser->mUserId; - } $this->mItems = array(); $query = "SELECT fgim.*, lc.`content_type_guid`, lc.`user_id`, lct.*, ufm.`favorite_content_id` AS is_favorite $selectSql @@ -619,15 +613,6 @@ vd( $this->mErrors ); $bindVars[] = 'y'; } - if( $gBitSystem->isPackageActive( 'gatekeeper' ) ) { - $selectSql .= ' ,ls.`security_id`, ls.`security_description`, ls.`is_private`, ls.`is_hidden`, ls.`access_question`, ls.`access_answer` '; - $joinSql .= " LEFT OUTER JOIN `".BIT_DB_PREFIX."gatekeeper_security_map` cg ON (lc.`content_id`=cg.`content_id`) LEFT OUTER JOIN `".BIT_DB_PREFIX."gatekeeper_security` ls ON (ls.`security_id`=cg.`security_id` )"; - if( !$gBitUser->isAdmin() ) { - $whereSql .= ' AND (cg.`security_id` IS NULL OR lc.`user_id`=?) '; - $bindVars[] = $gBitUser->mUserId; - } - } - $mapJoin = ""; if( $gBitDbType != 'mysql' ) { // weed out empty galleries if we don't need them. DO NOT get clever and change the IN and EXISTS choices here. |