diff options
| author | Christian Fowler <spider@viovio.com> | 2006-02-10 04:56:54 +0000 |
|---|---|---|
| committer | Christian Fowler <spider@viovio.com> | 2006-02-10 04:56:54 +0000 |
| commit | 75e0063ee4064becfcce9c9cbc3c6383fbb01b77 (patch) | |
| tree | ada044f3752f806fce19033de9cc2f4943c9fdf5 /LibertyContent.php | |
| parent | befd1e14f19acb8926870861e88022fd3ee8c043 (diff) | |
| download | liberty-75e0063ee4064becfcce9c9cbc3c6383fbb01b77.tar.gz liberty-75e0063ee4064becfcce9c9cbc3c6383fbb01b77.tar.bz2 liberty-75e0063ee4064becfcce9c9cbc3c6383fbb01b77.zip | |
add proector support, remove \!gatekeeper specific code, and service function for content_list_function
Diffstat (limited to 'LibertyContent.php')
| -rw-r--r-- | LibertyContent.php | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/LibertyContent.php b/LibertyContent.php index 2147cd9..9c65913 100644 --- a/LibertyContent.php +++ b/LibertyContent.php @@ -3,7 +3,7 @@ * Management of Liberty content * * @package liberty -* @version $Header: /cvsroot/bitweaver/_bit_liberty/LibertyContent.php,v 1.53 2006/02/09 14:45:28 lsces Exp $ +* @version $Header: /cvsroot/bitweaver/_bit_liberty/LibertyContent.php,v 1.54 2006/02/10 04:56:54 spiderr Exp $ * @author spider <spider@steelsun.com> */ @@ -93,15 +93,6 @@ class LibertyContent extends LibertyBase { global $gLibertySystem, $gBitSystem, $gBitUser; $this->loadPreferences(); $this->mInfo['content_type'] = $gLibertySystem->mContentTypes[$this->mInfo['content_type_guid']]; - if( $gBitSystem->isPackageActive( 'gatekeeper' ) ) { -// $this->mInfo['perm_level'] = $this->getUserPermissions(); - } else { - if ( empty($gBitUser->mGroups[$this->mInfo['group_id']] ) ) { - $this->mInfo = NULL; -// $this->mContentId = 0; - $pContentId = 0; - } - } } } @@ -605,6 +596,9 @@ class LibertyContent extends LibertyBase { if( !empty( $loadHash['where_sql'] ) ) { $pWhereSql .= $loadHash['where_sql']; } + if( !empty( $loadHash['bind_vars'] ) ) { + $pBindVars = array_merge( $pBindVars, $loadHash['bind_vars'] ); + } } } } @@ -1267,11 +1261,11 @@ class LibertyContent extends LibertyBase { WHERE ls.`security_id`=cgm.`security_id` AND cgm.`content_id`=`cb_gallery_content_id` LIMIT 1) IS NULL"; } } - } else { + } else { $groups = array_keys($gBitUser->mGroups); $mid .= " AND lc.`group_id` IN ( ".implode( ',',array_fill ( 0, count( $groups ),'?' ) )." )"; $bindVars = array_merge( $bindVars, $groups ); - } + } if( in_array( $pListHash['sort_mode'], array( 'modifier_user_desc', |