summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--FisheyeBase.php38
-rw-r--r--FisheyeGallery.php98
-rw-r--r--FisheyeImage.php68
-rw-r--r--admin/schema_inc.php20
-rwxr-xr-xthumbnailer.php8
5 files changed, 116 insertions, 116 deletions
diff --git a/FisheyeBase.php b/FisheyeBase.php
index d934a65..6d1efe3 100644
--- a/FisheyeBase.php
+++ b/FisheyeBase.php
@@ -1,6 +1,6 @@
<?php
/**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeBase.php,v 1.15 2006/01/24 01:21:57 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeBase.php,v 1.16 2006/01/31 20:17:25 bitweaver Exp $
* @package fisheye
*/
@@ -40,9 +40,9 @@ class FisheyeBase extends LibertyAttachable
$ret = NULL;
if( is_numeric( $pContentId ) ) {
- $sql = "SELECT tfg.`gallery_id` AS `hash_key`, tfg.*, tc.`title`
- FROM `".BIT_DB_PREFIX."tiki_fisheye_gallery` tfg, `".BIT_DB_PREFIX."tiki_content` tc, `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` tfgim
- WHERE tfgim.`item_content_id` = ? AND tfgim.`gallery_content_id`=tfg.`content_id` AND tfg.`content_id`=tc.`content_id`";
+ $sql = "SELECT fg.`gallery_id` AS `hash_key`, fg.*, tc.`title`
+ FROM `".BIT_DB_PREFIX."fisheye_gallery` fg, `".BIT_DB_PREFIX."tiki_content` tc, `".BIT_DB_PREFIX."fisheye_gallery_image_map` fgim
+ WHERE fgim.`item_content_id` = ? AND fgim.`gallery_content_id`=fg.`content_id` AND fg.`content_id`=tc.`content_id`";
$ret = $this->mDb->getAssoc( $sql, array( $pContentId ) );
}
return $ret;
@@ -57,7 +57,7 @@ class FisheyeBase extends LibertyAttachable
function updatePosition($pGalleryContentId, $newPosition = NULL) {
if( $pGalleryContentId && $newPosition && $this->verifyId($this->mContentId) ) {
// SQL optimization to prevent stupid updates of identical data
- $sql = "UPDATE `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` SET `position` = ?
+ $sql = "UPDATE `".BIT_DB_PREFIX."fisheye_gallery_image_map` SET `position` = ?
WHERE `item_content_id` = ? AND `gallery_content_id` = ? AND (`position` IS NULL OR `position`!=?)";
$rs = $this->mDb->query($sql, array($newPosition, $this->mContentId, $pGalleryContentId, $newPosition));
}
@@ -77,24 +77,24 @@ class FisheyeBase extends LibertyAttachable
$p = 0;
$c = 1;
$joinSql = '';
- $selectSql = '';//AS title$g, tfg$g.gallery_id AS gallery_id$g";
+ $selectSql = '';//AS title$g, fg$g.gallery_id AS gallery_id$g";
$whereSql = '';
$bindVars = array();
foreach( $path as $galleryId ) {
if( $galleryId ) {
$p++; $c++;
- $selectSql .= " tc$p.`title` AS `title$p`, tfg$p.`gallery_id` AS `gallery_id$p`,";
- $joinSql .= " `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` tfgim$p
- INNER JOIN `".BIT_DB_PREFIX."tiki_content` tc$p ON(tfgim$p.`gallery_content_id`=tc$p.`content_id`)
- INNER JOIN `".BIT_DB_PREFIX."tiki_fisheye_gallery` tfg$p ON(tfg$p.`content_id`=tc$p.`content_id`),";
- $whereSql .= " tfg$p.`gallery_id`=? AND tfgim$p.`item_content_id`=tc$c.`content_id` AND ";
+ $selectSql .= " tc$p.`title` AS `title$p`, fg$p.`gallery_id` AS `gallery_id$p`,";
+ $joinSql .= " `".BIT_DB_PREFIX."fisheye_gallery_image_map` fgim$p
+ INNER JOIN `".BIT_DB_PREFIX."tiki_content` tc$p ON(fgim$p.`gallery_content_id`=tc$p.`content_id`)
+ INNER JOIN `".BIT_DB_PREFIX."fisheye_gallery` fg$p ON(fg$p.`content_id`=tc$p.`content_id`),";
+ $whereSql .= " fg$p.`gallery_id`=? AND fgim$p.`item_content_id`=tc$c.`content_id` AND ";
array_push( $bindVars, $galleryId );
}
}
-// $selectSql .= " tc$c.title AS title$c ";//AS title$g, tfg$g.gallery_id AS gallery_id$g";
- $joinSql .= " `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` tfgim$c
- INNER JOIN `".BIT_DB_PREFIX."tiki_content` tc$c ON(tfgim$c.`item_content_id`=tc$c.`content_id`) ";
- $whereSql .= " tc$c.`content_id`=? AND tfgim$c.`gallery_content_id`=tc$p.`content_id` ";
+// $selectSql .= " tc$c.title AS title$c ";//AS title$g, fg$g.gallery_id AS gallery_id$g";
+ $joinSql .= " `".BIT_DB_PREFIX."fisheye_gallery_image_map` fgim$c
+ INNER JOIN `".BIT_DB_PREFIX."tiki_content` tc$c ON(fgim$c.`item_content_id`=tc$c.`content_id`) ";
+ $whereSql .= " tc$c.`content_id`=? AND fgim$c.`gallery_content_id`=tc$p.`content_id` ";
array_push( $bindVars, $this->mContentId );
$rs = $this->mDb->query( "SELECT ".rtrim( $selectSql, ',')." FROM ".rtrim( $joinSql, ',')." WHERE $whereSql", $bindVars );
if( !empty( $rs->fields ) ) {
@@ -112,7 +112,7 @@ class FisheyeBase extends LibertyAttachable
function addToGalleries( $pGalleryArray, $pPosition=NULL ) {
if( $this->isValid() ) {
- $inGalleries = $this->mDb->getAssoc( "SELECT `gallery_id`,`gallery_content_id` FROM `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` tfgim INNER JOIN `".BIT_DB_PREFIX."tiki_fisheye_gallery` tfg ON (tfgim.`gallery_content_id`=tfg.`content_id`) WHERE `item_content_id` = ?", array( $this->mContentId ) );
+ $inGalleries = $this->mDb->getAssoc( "SELECT `gallery_id`,`gallery_content_id` FROM `".BIT_DB_PREFIX."fisheye_gallery_image_map` fgim INNER JOIN `".BIT_DB_PREFIX."fisheye_gallery` fg ON (fgim.`gallery_content_id`=fg.`content_id`) WHERE `item_content_id` = ?", array( $this->mContentId ) );
$galleries = array();
if( count( $pGalleryArray ) ) {
foreach( $pGalleryArray as $galleryId ) {
@@ -138,7 +138,7 @@ class FisheyeBase extends LibertyAttachable
if( count( $inGalleries ) ) {
// if we have any left over in the inGalleries array, we should delete them. these were the "unchecked" boxes
foreach( $inGalleries as $galleryId ) {
- $sql = "DELETE FROM `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` WHERE `gallery_content_id` = ? AND `item_content_id` = ?";
+ $sql = "DELETE FROM `".BIT_DB_PREFIX."fisheye_gallery_image_map` WHERE `gallery_content_id` = ? AND `item_content_id` = ?";
$rs = $this->mDb->query($sql, array( $galleryId, $this->mContentId ) );
}
}
@@ -158,7 +158,7 @@ class FisheyeBase extends LibertyAttachable
// without hitting a security_id. If there is clear path it returns TRUE. If there is a security_id, then
// it determines if the current user has permission
$query = "SELECT branch,level,cb_item_content_id,cb_gallery_content_id
- FROM connectby('`".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map`', '`gallery_content_id`', '`item_content_id`', ?, 0, '/') AS t(`cb_gallery_content_id` int,`cb_item_content_id` int, `level` int, `branch` text)
+ FROM connectby('`".BIT_DB_PREFIX."fisheye_gallery_image_map`', '`gallery_content_id`', '`item_content_id`', ?, 0, '/') AS t(`cb_gallery_content_id` int,`cb_item_content_id` int, `level` int, `branch` text)
WHERE `cb_gallery_content_id`=?
ORDER BY branch
";
@@ -167,7 +167,7 @@ class FisheyeBase extends LibertyAttachable
}
} else {
$sql = "SELECT count(`item_content_id`) as `item_count`
- FROM `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map`
+ FROM `".BIT_DB_PREFIX."fisheye_gallery_image_map`
WHERE `gallery_content_id` = ? AND `item_content_id` = ?";
$rs = $this->mDb->query($sql, array($pGalleryContentId, $pItemContentId));
if ($rs->fields['item_count'] > 0) {
diff --git a/FisheyeGallery.php b/FisheyeGallery.php
index 22c1924..57b409a 100644
--- a/FisheyeGallery.php
+++ b/FisheyeGallery.php
@@ -1,6 +1,6 @@
<?php
/**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeGallery.php,v 1.14 2006/01/15 06:46:36 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeGallery.php,v 1.15 2006/01/31 20:17:25 bitweaver Exp $
* @package fisheye
*/
@@ -18,7 +18,7 @@ define('FISHEYEGALLERY_CONTENT_TYPE_GUID', 'fisheyegallery' );
* @subpackage FisheyeGallery
*/
class FisheyeGallery extends FisheyeBase {
- var $mGalleryId; // tiki_fisheye_gallery.gallery_id
+ var $mGalleryId; // fisheye_gallery.gallery_id
var $mItems; // Array of FisheyeImage class instances which belong to this gallery
function FisheyeGallery($pGalleryId = NULL, $pContentId = NULL) {
@@ -55,13 +55,13 @@ class FisheyeGallery extends FisheyeBase {
$whereSql = $bindVars = NULL;
}
- if ($whereSql) { // If we have some way to know what tiki_fisheye_gallery row to load...
+ if ($whereSql) { // If we have some way to know what fisheye_gallery row to load...
$this->getServicesSql( 'content_load_function', $selectSql, $joinSql, $whereSql, $bindVars );
$query = "SELECT fg.*, tc.* $selectSql
, uue.`login` AS modifier_user, uue.`real_name` AS `modifier_real_name`
, uuc.`login` AS creator_user, uuc.`real_name` AS `creator_real_name`
- FROM `".BIT_DB_PREFIX."tiki_fisheye_gallery` fg, `".BIT_DB_PREFIX."tiki_content` tc $joinSql
+ FROM `".BIT_DB_PREFIX."fisheye_gallery` fg, `".BIT_DB_PREFIX."tiki_content` tc $joinSql
LEFT JOIN `".BIT_DB_PREFIX."users_users` uue ON (uue.`user_id` = tc.`modifier_user_id`)
LEFT JOIN `".BIT_DB_PREFIX."users_users` uuc ON (uuc.`user_id` = tc.`user_id`)
$whereSql AND fg.`content_id` = tc.`content_id`";
@@ -103,12 +103,12 @@ class FisheyeGallery extends FisheyeBase {
}
if( @$this->verifyId( $pCurrentImageId ) ) {
// this code sucks but works - XOXO spiderr
- $query = "SELECT tfgim.*, tfi.`image_id`, tf.`storage_path`
- FROM `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` tfgim
- INNER JOIN `".BIT_DB_PREFIX."tiki_fisheye_image` tfi ON ( tfi.`content_id`=tfgim.`item_content_id` )
- INNER JOIN `".BIT_DB_PREFIX."tiki_files` tf ON ( tf.`file_id`=tfi.`image_id` )
- WHERE tfgim.`gallery_content_id` = ?
- ORDER BY tfgim.`position`, tfi.`content_id` ";
+ $query = "SELECT fgim.*, fi.`image_id`, tf.`storage_path`
+ FROM `".BIT_DB_PREFIX."fisheye_gallery_image_map` fgim
+ INNER JOIN `".BIT_DB_PREFIX."fisheye_image` fi ON ( fi.`content_id`=fgim.`item_content_id` )
+ INNER JOIN `".BIT_DB_PREFIX."tiki_files` tf ON ( tf.`file_id`=fi.`image_id` )
+ WHERE fgim.`gallery_content_id` = ?
+ ORDER BY fgim.`position`, fi.`content_id` ";
if( $rs = $this->mDb->query($query, array( $this->mContentId ) ) ) {
$rows = $rs->getRows();
for( $i = 0; $i < count( $rows ); $i++ ) {
@@ -158,16 +158,16 @@ class FisheyeGallery extends FisheyeBase {
$join = '';
if( $gBitSystem->isPackageActive( 'gatekeeper' ) ) {
$select .= ' ,ts.`security_id`, ts.`security_description`, ts.`is_private`, ts.`is_hidden`, ts.`access_question`, ts.`access_answer` ';
- $join .= " LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_content_security_map` tcs ON (tc.`content_id`=tcs.`content_id`) LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_security` ts ON (ts.`security_id`=tcs.`security_id` )";
-// $where = ' AND (tcs.`security_id` IS NULL OR tc.`user_id`=?) ';
+ $join .= " LEFT OUTER JOIN `".BIT_DB_PREFIX."gatekeeper_security_map` cg ON (tc.`content_id`=cg.`content_id`) LEFT OUTER JOIN `".BIT_DB_PREFIX."gatekeeper_security` ts ON (ts.`security_id`=cg.`security_id` )";
+// $where = ' AND (cg.`security_id` IS NULL OR tc.`user_id`=?) ';
// $bindVars[] = $gBitUser->mUserId;
}
$this->mItems = NULL;
- $query = "SELECT tfgim.*, tc.`content_type_guid`, tc.`user_id`, ufm.`favorite_content_id` AS is_favorite $select
- FROM `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` tfgim INNER JOIN `".BIT_DB_PREFIX."tiki_content` tc ON ( tc.`content_id`=tfgim.`item_content_id` ) $join LEFT OUTER JOIN `".BIT_DB_PREFIX."users_favorites_map` ufm ON ( ufm.`favorite_content_id`=tc.`content_id` AND tc.`user_id`=ufm.`user_id` )
- WHERE tfgim.`gallery_content_id` = ? $where
- ORDER BY tfgim.`position`, tfgim.`item_content_id` $mid";
+ $query = "SELECT fgim.*, tc.`content_type_guid`, tc.`user_id`, ufm.`favorite_content_id` AS is_favorite $select
+ FROM `".BIT_DB_PREFIX."fisheye_gallery_image_map` fgim INNER JOIN `".BIT_DB_PREFIX."tiki_content` tc ON ( tc.`content_id`=fgim.`item_content_id` ) $join LEFT OUTER JOIN `".BIT_DB_PREFIX."users_favorites_map` ufm ON ( ufm.`favorite_content_id`=tc.`content_id` AND tc.`user_id`=ufm.`user_id` )
+ WHERE fgim.`gallery_content_id` = ? $where
+ ORDER BY fgim.`position`, fgim.`item_content_id` $mid";
$rs = $this->mDb->query($query, $bindVars, $pMaxRows, $pOffset);
$rows = $rs->getRows();
@@ -206,7 +206,7 @@ class FisheyeGallery extends FisheyeBase {
if ($this->mGalleryId) {
$query = "SELECT COUNT(*) AS `count`
- FROM `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map`
+ FROM `".BIT_DB_PREFIX."fisheye_gallery_image_map`
WHERE `gallery_content_id` = ?";
$rs = $this->mDb->query($query, array($this->mContentId));
$ret = $rs->fields['count'];
@@ -276,18 +276,18 @@ class FisheyeGallery extends FisheyeBase {
$pThumbnailContentId = $this->mInfo['preview_content_id'];
} else {
if( $this->mDb->isAdvancedPostgresEnabled() ) {
- $query = "SELECT COALESCE( tfg.`preview_content_id`, tc.`content_id` )
- FROM connectby('`".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map`', '`item_content_id`', '`gallery_content_id`', ?, 0, '/') AS t(`cb_item_content_id` int, `cb_parent_content_id` int, `level` int, `branch` text)
+ $query = "SELECT COALESCE( fg.`preview_content_id`, tc.`content_id` )
+ FROM connectby('`".BIT_DB_PREFIX."fisheye_gallery_image_map`', '`item_content_id`', '`gallery_content_id`', ?, 0, '/') AS t(`cb_item_content_id` int, `cb_parent_content_id` int, `level` int, `branch` text)
INNER JOIN tiki_content tc ON(content_id=cb_item_content_id)
- LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_content_security_map` tcsm ON (tcsm.`content_id`=tc.`content_id`), `".BIT_DB_PREFIX."tiki_fisheye_gallery` tfg
- WHERE tc.`content_type_guid`='fisheyeimage' AND tcsm.`security_id` IS NULL AND `cb_parent_content_id`=tfg.`content_id` ORDER BY RANDOM()";
+ LEFT OUTER JOIN `".BIT_DB_PREFIX."gatekeeper_security_map` cgm ON (cgm.`content_id`=tc.`content_id`), `".BIT_DB_PREFIX."fisheye_gallery` fg
+ WHERE tc.`content_type_guid`='fisheyeimage' AND cgm.`security_id` IS NULL AND `cb_parent_content_id`=fg.`content_id` ORDER BY RANDOM()";
if( $pThumbnailContentId = $this->mDb->getOne( $query, array( $pContentId ) ) ) {
$pThumbnailContentType = 'fisheyeimage';
}
} else {
- $query = "SELECT tfgim.`item_content_id`, tc.`content_type_guid`
- FROM `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` tfgim INNER JOIN `".BIT_DB_PREFIX."tiki_content` tc ON ( tfgim.`item_content_id`=tc.`content_id` )
- WHERE tfgim.`gallery_content_id` = ?
+ $query = "SELECT fgim.`item_content_id`, tc.`content_type_guid`
+ FROM `".BIT_DB_PREFIX."fisheye_gallery_image_map` fgim INNER JOIN `".BIT_DB_PREFIX."tiki_content` tc ON ( fgim.`item_content_id`=tc.`content_id` )
+ WHERE fgim.`gallery_content_id` = ?
ORDER BY ".$this->mDb->convert_sortmode('random');
$rs = $this->mDb->query($query, array( $pContentId ), 1);
$pThumbnailContentId = $rs->fields['item_content_id'];
@@ -321,7 +321,7 @@ class FisheyeGallery extends FisheyeBase {
if ($this->mGalleryId) {
if (!$pContentId)
$pContentId = NULL;
- $query = "UPDATE `".BIT_DB_PREFIX."tiki_fisheye_gallery` SET `preview_content_id` = ? WHERE `gallery_id`= ?";
+ $query = "UPDATE `".BIT_DB_PREFIX."fisheye_gallery` SET `preview_content_id` = ? WHERE `gallery_id`= ?";
$rs = $this->mDb->query($query, array($pContentId, $this->mGalleryId));
$this->mInfo['preview_content_id'] = $pContentId;
$ret = TRUE;
@@ -336,14 +336,14 @@ class FisheyeGallery extends FisheyeBase {
$this->mContentId = $pStorageHash['content_id'];
$this->mInfo['content_id'] = $this->mContentId;
if ($this->galleryExistsInDatabase()) {
- $query = "UPDATE `".BIT_DB_PREFIX."tiki_fisheye_gallery`
+ $query = "UPDATE `".BIT_DB_PREFIX."fisheye_gallery`
SET `rows_per_page` = ?, `cols_per_page` = ?, `thumbnail_size` = ?
WHERE `gallery_id` = ?";
$bindVars = array($pStorageHash['rows_per_page'], $pStorageHash['cols_per_page'], $pStorageHash['thumbnail_size'], $this->mGalleryId);
} else {
- $this->mGalleryId = $this->mDb->GenID('tiki_fisheye_gallery_id_seq');
+ $this->mGalleryId = $this->mDb->GenID('fisheye_gallery_id_seq');
$this->mInfo['gallery_id'] = $this->mGalleryId;
- $query = "INSERT INTO `".BIT_DB_PREFIX."tiki_fisheye_gallery` (`gallery_id`, `content_id`, `rows_per_page`, `cols_per_page`, `thumbnail_size`) VALUES (?,?,?,?,?)";
+ $query = "INSERT INTO `".BIT_DB_PREFIX."fisheye_gallery` (`gallery_id`, `content_id`, `rows_per_page`, `cols_per_page`, `thumbnail_size`) VALUES (?,?,?,?,?)";
$bindVars = array($this->mGalleryId, $this->mContentId, $pStorageHash['rows_per_page'], $pStorageHash['cols_per_page'], $pStorageHash['thumbnail_size']);
}
$rs = $this->mDb->query($query, $bindVars);
@@ -362,7 +362,7 @@ class FisheyeGallery extends FisheyeBase {
function removeItem( $pContentId ) {
$ret = FALSE;
if( $this->isValid() && @$this->verifyId( $pContentId ) ) {
- $query = "DELETE FROM `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map`
+ $query = "DELETE FROM `".BIT_DB_PREFIX."fisheye_gallery_image_map`
WHERE `item_content_id`=? AND `gallery_content_id`=?";
$rs = $this->mDb->query($query, array($pContentId, $this->mContentId ) );
$ret = TRUE;
@@ -378,7 +378,7 @@ class FisheyeGallery extends FisheyeBase {
function addItem( $pContentId, $pPosition=NULL ) {
$ret = FALSE;
if( $this->isValid() && @$this->verifyId( $pContentId ) && ( $this->mContentId != $pContentId ) && !$this->isInGallery( $this->mContentId, $pContentId ) && !$this->isInGallery( $pContentId, $this->mContentId ) ) {
- $query = "INSERT INTO `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` (`item_content_id`, `gallery_content_id`, `position`) VALUES (?,?,?)";
+ $query = "INSERT INTO `".BIT_DB_PREFIX."fisheye_gallery_image_map` (`item_content_id`, `gallery_content_id`, `position`) VALUES (?,?,?)";
$rs = $this->mDb->query($query, array($pContentId, $this->mContentId, $pPosition ) );
$ret = TRUE;
}
@@ -396,7 +396,7 @@ class FisheyeGallery extends FisheyeBase {
$this->mItems[$key]->expunge( $pRecursiveDelete );
} elseif( $this->mItems[$key]->mInfo['content_type_guid'] == FISHEYEIMAGE_CONTENT_TYPE_GUID ) {
$query = "SELECT COUNT(`item_content_id`) AS `other_gallery`
- FROM `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map`
+ FROM `".BIT_DB_PREFIX."fisheye_gallery_image_map`
WHERE `item_content_id`=? AND `gallery_content_id`!=?";
if( $rs = $this->mDb->query($query, array($this->mItems[$key]->mContentId, $this->mContentId ) ) ) {
if( empty( $rs->fields['other_gallery'] ) ) {
@@ -407,11 +407,11 @@ class FisheyeGallery extends FisheyeBase {
}
}
- $query = "DELETE FROM `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` WHERE `gallery_content_id`=?";
+ $query = "DELETE FROM `".BIT_DB_PREFIX."fisheye_gallery_image_map` WHERE `gallery_content_id`=?";
$rs = $this->mDb->query($query, array( $this->mContentId ) );
- $query = "DELETE FROM `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` WHERE `item_content_id`=?";
+ $query = "DELETE FROM `".BIT_DB_PREFIX."fisheye_gallery_image_map` WHERE `item_content_id`=?";
$rs = $this->mDb->query($query, array( $this->mContentId ) );
- $query = "DELETE FROM `".BIT_DB_PREFIX."tiki_fisheye_gallery` WHERE `content_id`=?";
+ $query = "DELETE FROM `".BIT_DB_PREFIX."fisheye_gallery` WHERE `content_id`=?";
$rs = $this->mDb->query($query, array( $this->mContentId ) );
if( LibertyContent::expunge() ) {
$this->mDb->CompleteTrans();
@@ -429,7 +429,7 @@ vd( $this->mErrors );
if( @$this->verifyId( $this->mGalleryId ) ) {
$query = "SELECT COUNT(`gallery_id`) AS `count`
- FROM `".BIT_DB_PREFIX."tiki_fisheye_gallery`
+ FROM `".BIT_DB_PREFIX."fisheye_gallery`
WHERE `gallery_id` = ?";
$rs = $this->mDb->query($query, array($this->mGalleryId));
if ($rs->fields['count'] > 0)
@@ -489,17 +489,17 @@ vd( $this->mErrors );
// this *has* to go first because of bindVars order
if( empty( $pListHash['show_empty'] ) ) {
// This will nicely pull out the unused rows, but it is dog slow
-// $join .= " INNER JOIN `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` tfgim ON (tfgim.`gallery_content_id`=tc.`content_id`) ";
+// $join .= " INNER JOIN `".BIT_DB_PREFIX."fisheye_gallery_image_map` fgim ON (fgim.`gallery_content_id`=tc.`content_id`) ";
$mid = '';
}
if( !empty( $pListHash['root_only'] ) ) {
- $join .= " LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` tfgim2 ON (tfgim2.`item_content_id`=tc.`content_id`)";
+ $join .= " LEFT OUTER JOIN `".BIT_DB_PREFIX."fisheye_gallery_image_map` tfgim2 ON (tfgim2.`item_content_id`=tc.`content_id`)";
$mid .= ' AND tfgim2.`item_content_id` IS NULL ';
}
if( !empty( $pListHash['contain_item'] ) ) {
$select = " , tfgim3.`item_content_id` AS `in_gallery` ";
- $join .= " LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` tfgim3 ON (tfgim3.`gallery_content_id`=tc.`content_id`) AND tfgim3.`item_content_id`=? ";
+ $join .= " LEFT OUTER JOIN `".BIT_DB_PREFIX."fisheye_gallery_image_map` tfgim3 ON (tfgim3.`gallery_content_id`=tc.`content_id`) AND tfgim3.`item_content_id`=? ";
$bindVars[] = $pListHash['contain_item'];
}
if( @$this->verifyId( $pListHash['user_id'] ) ) {
@@ -512,16 +512,16 @@ vd( $this->mErrors );
}
if( $gBitSystem->isPackageActive( 'gatekeeper' ) ) {
$select .= ' ,ts.`security_id`, ts.`security_description`, ts.`is_private`, ts.`is_hidden`, ts.`access_question`, ts.`access_answer` ';
- $join .= " LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_content_security_map` tcs ON (tc.`content_id`=tcs.`content_id`) LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_security` ts ON (ts.`security_id`=tcs.`security_id` )";
+ $join .= " LEFT OUTER JOIN `".BIT_DB_PREFIX."gatekeeper_security_map` cg ON (tc.`content_id`=cg.`content_id`) LEFT OUTER JOIN `".BIT_DB_PREFIX."gatekeeper_security` ts ON (ts.`security_id`=cg.`security_id` )";
if( !$gBitUser->isAdmin() ) {
- $mid .= ' AND (tcs.`security_id` IS NULL OR tc.`user_id`=?) ';
+ $mid .= ' AND (cg.`security_id` IS NULL OR tc.`user_id`=?) ';
$bindVars[] = $gBitUser->mUserId;
}
}
// weed out empty galleries if we don't need them
if( empty( $pListHash['show_empty'] ) ) {
- $mapJoin = "INNER JOIN `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` tfgim ON (tfgim.`gallery_content_id`=tc.`content_id`)";
+ $mapJoin = "INNER JOIN `".BIT_DB_PREFIX."fisheye_gallery_image_map` fgim ON (fgim.`gallery_content_id`=tc.`content_id`)";
} else {
$mapJoin = "";
}
@@ -532,11 +532,11 @@ vd( $this->mErrors );
$sort .= " ORDER BY ".$this->mDb->convert_sortmode( $pListHash['sort_mode'] )." ";
}
- $query = "SELECT DISTINCT( tfg.`gallery_id` ) AS `hash_key`, tfg.*, tc.*, uu.`login`, uu.`real_name`, ptc.`content_type_guid` AS `preview_content_type_guid` $select
- FROM `".BIT_DB_PREFIX."tiki_fisheye_gallery` tfg
- LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_content` ptc ON( tfg.`preview_content_id`=ptc.`content_id` ), `".BIT_DB_PREFIX."users_users` uu, `".BIT_DB_PREFIX."tiki_content` tc
+ $query = "SELECT DISTINCT( fg.`gallery_id` ) AS `hash_key`, fg.*, tc.*, uu.`login`, uu.`real_name`, ptc.`content_type_guid` AS `preview_content_type_guid` $select
+ FROM `".BIT_DB_PREFIX."fisheye_gallery` fg
+ LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_content` ptc ON( fg.`preview_content_id`=ptc.`content_id` ), `".BIT_DB_PREFIX."users_users` uu, `".BIT_DB_PREFIX."tiki_content` tc
$mapJoin $join
- WHERE tfg.`content_id` = tc.`content_id` AND uu.`user_id` = tc.`user_id` $mid $sort";
+ WHERE fg.`content_id` = tc.`content_id` AND uu.`user_id` = tc.`user_id` $mid $sort";
if( $rs = $this->mDb->query( $query, $bindVars, $pListHash['max_records'], $pListHash['offset'] ) ) {
$data = $rs->GetAssoc();
if( empty( $pListHash['no_thumbnails'] ) ) {
@@ -555,11 +555,11 @@ vd( $this->mErrors );
}
// count galleries
- $query_c = "SELECT COUNT( DISTINCT( tfg.`gallery_id` ) )
- FROM `".BIT_DB_PREFIX."tiki_fisheye_gallery` tfg
- LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_content` ptc ON( tfg.`preview_content_id`=ptc.`content_id` ), `".BIT_DB_PREFIX."users_users` uu, `".BIT_DB_PREFIX."tiki_content` tc
+ $query_c = "SELECT COUNT( DISTINCT( fg.`gallery_id` ) )
+ FROM `".BIT_DB_PREFIX."fisheye_gallery` fg
+ LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_content` ptc ON( fg.`preview_content_id`=ptc.`content_id` ), `".BIT_DB_PREFIX."users_users` uu, `".BIT_DB_PREFIX."tiki_content` tc
$mapJoin $join
- WHERE tfg.`content_id` = tc.`content_id` AND uu.`user_id` = tc.`user_id` $mid";
+ WHERE fg.`content_id` = tc.`content_id` AND uu.`user_id` = tc.`user_id` $mid";
$cant = $this->mDb->getOne( $query_c, $bindVars );
$ret['cant'] = $cant;
diff --git a/FisheyeImage.php b/FisheyeImage.php
index 321a04f..8b0e5c2 100644
--- a/FisheyeImage.php
+++ b/FisheyeImage.php
@@ -1,6 +1,6 @@
<?php
/**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeImage.php,v 1.15 2006/01/23 07:20:27 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeImage.php,v 1.16 2006/01/31 20:17:25 bitweaver Exp $
* @package fisheye
*/
@@ -39,22 +39,22 @@ class FisheyeImage extends FisheyeBase {
$mid = NULL;
$bindVars = array( $gBitUser->mUserId );
if ( @$this->verifyId( $this->mImageId ) ) {
- $mid = " WHERE tfi.`image_id` = ?";
+ $mid = " WHERE fi.`image_id` = ?";
$bindVars[] = $this->mImageId;
} elseif ( @$this->verifyId( $this->mContentId ) ) {
- $mid = " WHERE tfi.`content_id` = ?";
+ $mid = " WHERE fi.`content_id` = ?";
$bindVars[] = $this->mContentId;
}
if( $gBitSystem->isPackageActive( 'gatekeeper' ) ) {
$gateSql = ' ,ts.`security_id`, ts.`security_description`, ts.`is_private`, ts.`is_hidden`, ts.`access_question`, ts.`access_answer` ';
- $mid = " LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_content_security_map` tcs ON ( tc.`content_id`=tcs.`content_id` ) LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_security` ts ON ( tcs.`security_id`=ts.`security_id` )
+ $mid = " LEFT OUTER JOIN `".BIT_DB_PREFIX."gatekeeper_security_map` cg ON ( tc.`content_id`=cg.`content_id` ) LEFT OUTER JOIN `".BIT_DB_PREFIX."gatekeeper_security` ts ON ( cg.`security_id`=ts.`security_id` )
".$mid;
}
- $sql = "SELECT tfi.*, tc.* $gateSql
+ $sql = "SELECT fi.*, tc.* $gateSql
, uue.`login` AS `modifier_user`, uue.`real_name` AS `modifier_real_name`
, uuc.`login` AS `creator_user`, uuc.`real_name` AS `creator_real_name`, ufm.`favorite_content_id` AS `is_favorite`
- FROM `".BIT_DB_PREFIX."tiki_fisheye_image` tfi
- INNER JOIN `".BIT_DB_PREFIX."tiki_content` tc ON (tc.`content_id` = tfi.`content_id`)
+ FROM `".BIT_DB_PREFIX."fisheye_image` fi
+ INNER JOIN `".BIT_DB_PREFIX."tiki_content` tc ON (tc.`content_id` = fi.`content_id`)
LEFT JOIN `".BIT_DB_PREFIX."users_users` uue ON (uue.`user_id` = tc.`modifier_user_id`)
LEFT JOIN `".BIT_DB_PREFIX."users_users` uuc ON (uuc.`user_id` = tc.`user_id`)
LEFT JOIN `".BIT_DB_PREFIX."users_favorites_map` ufm ON (ufm.`favorite_content_id`=tc.`content_id` AND ufm.`user_id`=?)
@@ -71,10 +71,10 @@ class FisheyeImage extends FisheyeBase {
if( $gBitSystem->isPackageActive( 'gatekeeper' ) && !@$this->verifyId( $this->mInfo['security_id'] ) ) {
// check to see if this image is in a protected gallery
// this burns an extra select but avoids an big and gnarly LEFT JOIN sequence that may be hard to optimize on all DB's
- $query = "SELECT ts.* FROM `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` tfgim
- INNER JOIN `".BIT_DB_PREFIX."tiki_content_security_map` tsm ON(tfgim.`gallery_content_id`=tsm.`content_id` )
- INNER JOIN `".BIT_DB_PREFIX."tiki_security` ts ON(tsm.`security_id`=ts.`security_id` )
- WHERE tfgim.`item_content_id`=?";
+ $query = "SELECT ts.* FROM `".BIT_DB_PREFIX."fisheye_gallery_image_map` fgim
+ INNER JOIN `".BIT_DB_PREFIX."gatekeeper_security_map` tsm ON(fgim.`gallery_content_id`=tsm.`content_id` )
+ INNER JOIN `".BIT_DB_PREFIX."gatekeeper_security` ts ON(tsm.`security_id`=ts.`security_id` )
+ WHERE fgim.`item_content_id`=?";
$grs = $this->mDb->query($query, array( $this->mContentId ) );
if( $grs && $grs->RecordCount() ) {
$this->mInfo = array_merge( $this->mInfo, $grs->fields );
@@ -109,7 +109,7 @@ class FisheyeImage extends FisheyeBase {
if( $this->isValid() && ($details = $this->getImageDetails( BIT_ROOT_PATH.$this->mInfo['image_file']['storage_path'] ) ) ) {
if( $this->mInfo['width'] != $details['width'] || $this->mInfo['height'] != $details['height'] ) {
// if our data got out of sync with the database, force an update
- $query = "UPDATE `".BIT_DB_PREFIX."tiki_fisheye_image` SET `width`=?, `height`=? WHERE `content_id`=?";
+ $query = "UPDATE `".BIT_DB_PREFIX."fisheye_image` SET `width`=?, `height`=? WHERE `content_id`=?";
$this->mDb->query( $query, array( $details['width'], $details['height'], $this->mContentId ) );
$this->mInfo['width'] = $details['width'];
$this->mInfo['height'] = $details['height'];
@@ -189,14 +189,14 @@ class FisheyeImage extends FisheyeBase {
}
if ($this->imageExistsInDatabase()) {
- $sql = "UPDATE `".BIT_DB_PREFIX."tiki_fisheye_image`
+ $sql = "UPDATE `".BIT_DB_PREFIX."fisheye_image`
SET `content_id` = ?, `width` = ?, `height` = ?
WHERE `image_id` = ?";
$bindVars = array($this->mContentId, $imageDetails['width'], $imageDetails['height'], $this->mImageId);
} else {
- $this->mImageId = $this->mDb->GenID('tiki_fisheye_image_id_seq');
+ $this->mImageId = $this->mDb->GenID('fisheye_image_id_seq');
$this->mInfo['image_id'] = $this->mImageId;
- $sql = "INSERT INTO `".BIT_DB_PREFIX."tiki_fisheye_image` (`image_id`, `content_id`, `width`, `height`) VALUES (?,?,?,?)";
+ $sql = "INSERT INTO `".BIT_DB_PREFIX."fisheye_image` (`image_id`, `content_id`, `width`, `height`) VALUES (?,?,?,?)";
$bindVars = array($this->mImageId, $this->mContentId, $imageDetails['width'], $imageDetails['height']);
}
$rs = $this->mDb->query($sql, $bindVars);
@@ -227,7 +227,7 @@ class FisheyeImage extends FisheyeBase {
$rotateFunc = liberty_get_function( 'rotate' );
if( $rotateFunc( $fileHash ) ) {
liberty_clear_thumbnails( $fileHash );
- $this->mDb->query( "UPDATE `".BIT_DB_PREFIX."tiki_fisheye_image` SET `width`=`height`, `height`=`width` WHERE `content_id`=?", array( $this->mContentId ) );
+ $this->mDb->query( "UPDATE `".BIT_DB_PREFIX."fisheye_image` SET `width`=`height`, `height`=`width` WHERE `content_id`=?", array( $this->mContentId ) );
$this->generateThumbnails();
} else {
$this->mErrors['rotate'] = $fileHash['error'];
@@ -256,7 +256,7 @@ class FisheyeImage extends FisheyeBase {
$details = $this->getImageDetails( $fileHash['source_file'] );
$query = "UPDATE `".BIT_DB_PREFIX."tiki_files` SET `size`=? WHERE `file_id`=?";
$this->mDb->query( $query, array( $details['size'], $this->mInfo['image_file']['file_id'] ) );
- $query = "UPDATE `".BIT_DB_PREFIX."tiki_fisheye_image` SET `width`=?, `height`=? WHERE `content_id`=?";
+ $query = "UPDATE `".BIT_DB_PREFIX."fisheye_image` SET `width`=?, `height`=? WHERE `content_id`=?";
$this->mDb->query( $query, array( $details['width'], $details['height'], $this->mContentId ) );
}
return (count($this->mErrors) == 0);
@@ -267,10 +267,10 @@ class FisheyeImage extends FisheyeBase {
global $gBitSystem;
// LibertyAttachable will take care of thumbnail generation of the offline thumbnailer is not active
if( $gBitSystem->isFeatureActive( 'feature_offline_thumbnailer' ) ) {
- $query = "DELETE FROM `".BIT_DB_PREFIX."tiki_thumbnail_queue`
+ $query = "DELETE FROM `".BIT_DB_PREFIX."liberty_thumbnail_queue`
WHERE `content_id`=?";
$this->mDb->query( $query, array( $this->mContentId ) );
- $query = "INSERT INTO `".BIT_DB_PREFIX."tiki_thumbnail_queue`
+ $query = "INSERT INTO `".BIT_DB_PREFIX."liberty_thumbnail_queue`
(`content_id`, `queue_date`, `resize_original`) VALUES (?,?,?)";
$this->mDb->query( $query, array( $this->mContentId, $gBitSystem->getUTCTime(), $pResizeOriginal ) );
} else {
@@ -400,11 +400,11 @@ class FisheyeImage extends FisheyeBase {
function expunge() {
if( $this->isValid() ) {
$this->mDb->StartTrans();
- $query = "DELETE FROM `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` WHERE `item_content_id` = ?";
+ $query = "DELETE FROM `".BIT_DB_PREFIX."fisheye_gallery_image_map` WHERE `item_content_id` = ?";
$rs = $this->mDb->query($query, array( $this->mContentId ));
- $query = "UPDATE `".BIT_DB_PREFIX."tiki_fisheye_gallery` SET `preview_content_id`=NULL WHERE `preview_content_id` = ?";
+ $query = "UPDATE `".BIT_DB_PREFIX."fisheye_gallery` SET `preview_content_id`=NULL WHERE `preview_content_id` = ?";
$rs = $this->mDb->query($query, array( $this->mContentId ));
- $query = "DELETE FROM `".BIT_DB_PREFIX."tiki_fisheye_image` WHERE `content_id` = ?";
+ $query = "DELETE FROM `".BIT_DB_PREFIX."fisheye_image` WHERE `content_id` = ?";
$rs = $this->mDb->query($query, array( $this->mContentId ));
if( LibertyAttachable::expunge() ) {
$this->mDb->CompleteTrans();
@@ -423,7 +423,7 @@ class FisheyeImage extends FisheyeBase {
$ret = FALSE;
if( $this->isValid() && $this->mImageId ) {
$sql = "SELECT COUNT(`image_id`) AS `count`
- FROM `".BIT_DB_PREFIX."tiki_fisheye_image`
+ FROM `".BIT_DB_PREFIX."fisheye_image`
WHERE `image_id` = ?";
$rs = $this->mDb->query($sql, array($this->mImageId));
@@ -455,7 +455,7 @@ class FisheyeImage extends FisheyeBase {
if( @$this->verifyId( $pListHash['gallery_id'] ) ) {
- $mid .= " AND tfg.`gallery_id` = ? ";
+ $mid .= " AND fg.`gallery_id` = ? ";
$bindVars[] = $pListHash['gallery_id'];
}
@@ -466,11 +466,11 @@ class FisheyeImage extends FisheyeBase {
// $this->debug();
if( $gBitSystem->isPackageActive( 'gatekeeper' ) ) {
if( $this->mDb->isAdvancedPostgresEnabled() ) {
- $mid .= " AND (SELECT ts.`security_id` FROM connectby('tiki_fisheye_gallery_image_map', 'gallery_content_id', 'item_content_id', tfi.`content_id`, 0, '/') AS t(`cb_gallery_content_id` int, `cb_item_content_id` int, level int, branch text), `".BIT_DB_PREFIX."tiki_content_security_map` tcsm, `".BIT_DB_PREFIX."tiki_security` ts
- WHERE ts.`security_id`=tcsm.`security_id` AND tcsm.`content_id`=`cb_gallery_content_id` LIMIT 1) IS NULL";
+ $mid .= " AND (SELECT ts.`security_id` FROM connectby('fisheye_gallery_image_map', 'gallery_content_id', 'item_content_id', fi.`content_id`, 0, '/') AS t(`cb_gallery_content_id` int, `cb_item_content_id` int, level int, branch text), `".BIT_DB_PREFIX."gatekeeper_security_map` cgm, `".BIT_DB_PREFIX."gatekeeper_security` ts
+ WHERE ts.`security_id`=cgm.`security_id` AND cgm.`content_id`=`cb_gallery_content_id` LIMIT 1) IS NULL";
} else {
$select .= ' ,ts.`security_id`, ts.`security_description`, ts.`is_private`, ts.`is_hidden`, ts.`access_question`, ts.`access_answer` ';
- $join .= " LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_content_security_map` tcs ON (tc.`content_id`=tcs.`content_id`) LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_security` ts ON (ts.`security_id`=tcs.`security_id` ) LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` tfgim ON (tfgim.`item_content_id`=tc.`content_id`) LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_content_security_map` tcs2 ON (tfgim.`gallery_content_id`=tcs2.`content_id`) LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_security` ts2 ON (ts2.`security_id`=tcs2.`security_id` )";
+ $join .= " LEFT OUTER JOIN `".BIT_DB_PREFIX."gatekeeper_security_map` cg ON (tc.`content_id`=cg.`content_id`) LEFT OUTER JOIN `".BIT_DB_PREFIX."gatekeeper_security` ts ON (ts.`security_id`=cg.`security_id` ) LEFT OUTER JOIN `".BIT_DB_PREFIX."fisheye_gallery_image_map` fgim ON (fgim.`item_content_id`=tc.`content_id`) LEFT OUTER JOIN `".BIT_DB_PREFIX."gatekeeper_security_map` tcs2 ON (fgim.`gallery_content_id`=tcs2.`content_id`) LEFT OUTER JOIN `".BIT_DB_PREFIX."gatekeeper_security` ts2 ON (ts2.`security_id`=tcs2.`security_id` )";
$mid .= ' AND (tcs2.`security_id` IS NULL OR tc.`user_id`=?) ';
$bindVars[] = $gBitUser->mUserId;
}
@@ -479,14 +479,14 @@ class FisheyeImage extends FisheyeBase {
//converted in prepGetList()
$mid .= " ORDER BY ".$this->mDb->convert_sortmode( $pListHash['sort_mode'] )." ";
}
- $query = "SELECT $distinct tfi.`image_id` AS `hash_key`, tfi.*, tf.*, tc.*, tfg.`gallery_id`, uu.`login`, uu.`real_name` $select
- FROM `".BIT_DB_PREFIX."tiki_fisheye_image` tfi
- INNER JOIN `".BIT_DB_PREFIX."tiki_attachments` ta ON(ta.`content_id`=tfi.`content_id`)
- INNER JOIN `".BIT_DB_PREFIX."tiki_files` tf ON(ta.`foreign_id`=tf.`file_id`)
+ $query = "SELECT $distinct fi.`image_id` AS `hash_key`, fi.*, tf.*, tc.*, fg.`gallery_id`, uu.`login`, uu.`real_name` $select
+ FROM `".BIT_DB_PREFIX."fisheye_image` fi
+ INNER JOIN `".BIT_DB_PREFIX."tiki_attachments` a ON(a.`content_id`=fi.`content_id`)
+ INNER JOIN `".BIT_DB_PREFIX."tiki_files` tf ON(a.`foreign_id`=tf.`file_id`)
, `".BIT_DB_PREFIX."users_users` uu, `".BIT_DB_PREFIX."tiki_content` tc $join
- LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` tfgim2 ON(tfgim2.`item_content_id`=tc.`content_id`)
- LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_fisheye_gallery` tfg ON(tfg.`content_id`=tfgim2.`gallery_content_id`)
- WHERE tfi.`content_id` = tc.`content_id` AND uu.`user_id` = tc.`user_id` $mid";
+ LEFT OUTER JOIN `".BIT_DB_PREFIX."fisheye_gallery_image_map` tfgim2 ON(tfgim2.`item_content_id`=tc.`content_id`)
+ LEFT OUTER JOIN `".BIT_DB_PREFIX."fisheye_gallery` fg ON(fg.`content_id`=tfgim2.`gallery_content_id`)
+ WHERE fi.`content_id` = tc.`content_id` AND uu.`user_id` = tc.`user_id` $mid";
if( $rs = $this->mDb->query( $query, $bindVars, $pListHash['max_records'],$pListHash['offset'] ) ) {
$ret = $rs->GetAssoc();
diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index a649975..39e8bb4 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -2,7 +2,7 @@
$tables = array(
-'tiki_fisheye_gallery' => "
+'fisheye_gallery' => "
gallery_id I4 PRIMARY,
content_id I4,
rows_per_page I4,
@@ -11,13 +11,13 @@ $tables = array(
preview_content_id I4
",
-'tiki_fisheye_gallery_image_map' => "
+'fisheye_gallery_image_map' => "
gallery_content_id I4 NOTNULL,
item_content_id I4 NOTNULL,
position I4
",
-'tiki_fisheye_image' => "
+'fisheye_image' => "
image_id I4 PRIMARY,
content_id I4 NOTNULL,
photo_date I8,
@@ -25,13 +25,13 @@ $tables = array(
height I4
",
/*
-'tiki_fisheye_image_exif' => "
+'fisheye_image_exif' => "
content_id I4 PRIMARY,
exif_title C(250),
exif_data X
",
*/
-'tiki_thumbnail_queue' => "
+'liberty_thumbnail_queue' => "
content_id I4 PRIMARY,
queue_date I8 NOTNULL,
begin_date I8,
@@ -50,10 +50,10 @@ foreach( array_keys( $tables ) AS $tableName ) {
}
$indices = array (
- 'tiki_fisheye_gallery_id_idx' => array( 'table' => 'tiki_fisheye_gallery', 'cols' => 'gallery_id', 'opts' => NULL ),
- 'tiki_fisheye_gallery_content_idx' => array( 'table' => 'tiki_fisheye_gallery', 'cols' => 'content_id', 'opts' => array( 'UNIQUE' ) ),
- 'tiki_fisheye_image_id_idx' => array( 'table' => 'tiki_fisheye_image', 'cols' => 'image_id', 'opts' => NULL ),
- 'tiki_fisheye_image_content_idx' => array( 'table' => 'tiki_fisheye_image', 'cols' => 'content_id', 'opts' => array( 'UNIQUE' ) ),
+ 'fisheye_gallery_id_idx' => array( 'table' => 'fisheye_gallery', 'cols' => 'gallery_id', 'opts' => NULL ),
+ 'fisheye_gallery_content_idx' => array( 'table' => 'fisheye_gallery', 'cols' => 'content_id', 'opts' => array( 'UNIQUE' ) ),
+ 'fisheye_image_id_idx' => array( 'table' => 'fisheye_image', 'cols' => 'image_id', 'opts' => NULL ),
+ 'fisheye_image_content_idx' => array( 'table' => 'fisheye_image', 'cols' => 'content_id', 'opts' => array( 'UNIQUE' ) ),
);
$gBitInstaller->registerSchemaIndexes( FISHEYE_PKG_NAME, $indices );
@@ -64,7 +64,7 @@ $gBitInstaller->registerPackageInfo( FISHEYE_PKG_NAME, array(
// ### Sequences
$sequences = array (
- 'tiki_fisheye_gallery_id_seq' => array( 'start' => 1 )
+ 'fisheye_gallery_id_seq' => array( 'start' => 1 )
);
$gBitInstaller->registerSchemaSequences( FISHEYE_PKG_NAME, $sequences );
diff --git a/thumbnailer.php b/thumbnailer.php
index 70225ef..de4e816 100755
--- a/thumbnailer.php
+++ b/thumbnailer.php
@@ -9,7 +9,7 @@
* suggested crontab entry runs the thumbnailer every minute:
* * * * * * apache php -q /path/to/bitweaver/fisheye/thumbnailer.php 20 >> /var/log/httpd/thumbnail_log
*
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/thumbnailer.php,v 1.7 2005/10/29 17:52:39 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/thumbnailer.php,v 1.8 2006/01/31 20:17:25 bitweaver Exp $
* @package fisheye
* @subpackage functions
*/
@@ -46,7 +46,7 @@
$gBitSystem->mDb->StartTrans();
$sql = "SELECT tq.content_id AS hash_key, tq.*
- FROM `".BIT_DB_PREFIX."tiki_thumbnail_queue` tq
+ FROM `".BIT_DB_PREFIX."liberty_thumbnail_queue` tq
WHERE tq.begin_date IS NULL
ORDER BY tq.queue_date";
$rs = $gBitSystem->mDb->query( $sql, NULL, $thumbCount );
@@ -54,7 +54,7 @@
$processContent = array();
while( !$rs->EOF ) {
$processContent[$rs->fields['content_id']] = $rs->fields;
- $sql2 = "UPDATE `".BIT_DB_PREFIX."tiki_thumbnail_queue` SET `begin_date`=? WHERE `content_id`=?";
+ $sql2 = "UPDATE `".BIT_DB_PREFIX."liberty_thumbnail_queue` SET `begin_date`=? WHERE `content_id`=?";
$rs2 = $gBitSystem->mDb->query( $sql2, array( date( 'U' ), $rs->fields['content_id'] ) );
$rs->MoveNext();
}
@@ -71,7 +71,7 @@
}
if( $image->renderThumbnails() ) {
$log[$contentId]['message'] = 'SUCCESS: Thumbnails created';
- $sql3 = "UPDATE `".BIT_DB_PREFIX."tiki_thumbnail_queue` SET `begin_date`=?, `end_date`=? WHERE `content_id`=?";
+ $sql3 = "UPDATE `".BIT_DB_PREFIX."liberty_thumbnail_queue` SET `begin_date`=?, `end_date`=? WHERE `content_id`=?";
$rs3 = $gBitSystem->mDb->query( $sql3, array( $begin, $gBitSystem->getUTCTime(), $contentId ) );
} else {
$log[$contentId]['message'] = ' ERROR: '.$image->mErrors['thumbnail'];
generated by cgit v1.3 (git 2.53.0) at 2026-07-01 20:26:39 +0000