Migrate contact xref to liberty_xref tables; add package-owned gallery view

ContactXref and ContactXrefType become thin subclasses of their liberty
counterparts, scoped to content_type_guid='contact'. load_emails.php updated
to query liberty_xref. Gallery view template moved into contact package as
fisheye_fixed_grid_contact.tpl (keeps fisheye clean; same pattern for future
assembly/component packages). contact/admin/upgrades/5.0.1.php migrates
existing contact_xref_* data into liberty_xref_* tables.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

2 files changed, 17 insertions, 256 deletions

diff --git a/includes/classes/ContactXref.php b/includes/classes/ContactXref.php
index 598c356..4c0573e 100755
--- a/includes/classes/ContactXref.php
+++ b/includes/classes/ContactXref.php
@@ -1,218 +1,17 @@
 <?php
 /**
- * @version $Header$
- * @package articles
- * 
- * @copyright Copyright (c) 2004-2006, bitweaver.org
- * All Rights Reserved. See below for details and a complete list of authors.
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details.
+ * @package contact
+ * @subpackage classes
  */
 
-/**
- * Required setup
- */
 namespace Bitweaver\Contact;
 
-use Bitweaver\BitBase;
-use Bitweaver\BitDate;
+use Bitweaver\Liberty\LibertyXref;
 
-/**
- * @package contact
- */
-class ContactXref extends BitBase {
-	public $mType;
-	public $mSource;
-	public $mXrefId;
-	public $mContentId;
-	public $mDate;
+class ContactXref extends LibertyXref {
+	protected $mContentTypeGuid = 'contact';
 
 	public function __construct( $iXrefId = NULL ) {
-		$this->mXrefId = NULL;
-		$this->mSource = NULL;
-		parent::__construct();
-		if( $iXrefId ) {
-			$this->load( $iXrefId );
-		}
-
-		// Date object to handle date and time display
-		$this->mDate = new BitDate();
-		$offset = $this->mDate->get_display_offset();
-	}
-
-	public function isValid() {
-		return $this->verifyId( $this->mXrefId );
-	}
-
-	public function load( $pXref_id = NULL ) {
-		if( BitBase::verifyId( $pXref_id ) ) {
-			$sql = "SELECT x.*, CASE
-					WHEN x.`xorder` = 0 THEN s.`cross_ref_title`
-					ELSE s.`cross_ref_title` || '-' || x.`xorder` END
-					AS source_title, s.`source`, s.`xref_type`,
-					CASE WHEN x.`start_date` IS NULL THEN 'y' ELSE 'n' END AS `ignore_start_date`, 
-					CASE WHEN x.`end_date` IS NULL THEN 'y' ELSE 'n' END AS `ignore_end_date`,
-					s.`cross_ref_title` AS `template_title`, s.`template`
-					FROM `".BIT_DB_PREFIX."contact_xref` x
-					JOIN `".BIT_DB_PREFIX."contact_xref_source` s ON s.`source` = x.`source`
-					WHERE x.`xref_id` = ?
-					ORDER BY x.`xorder`";
-			$result = $this->mDb->getRow( $sql, [  $pXref_id ] );
-			if( $result['content_id'] ) {
-				$this->mXrefId = $pXref_id;
-				$this->mContentId = $result['content_id'];
-				$this->mType = $result['xref_type'];
-				$this->mSource = $result['source'];
-				$this->mInfo['title'] = $result['source_title'];
-				unset($result['source_title']);
-				$this->mInfo['data'] = $result;
-				$this->mInfo['format_guid'] = 'text';
-			}
-		}
-	}
-
-	public function verify( &$pParamHash ) {
-//		if ( $this->isValid() ) {
-			// Validate the (optional) xref_id parameter
-			$pParamHash['xref_id'] = ( @$this->verifyId( $pParamHash['xref_id'] ) ) ? (int) $pParamHash['xref_id'] : null;
-
-			if ( isset( $pParamHash['content_id'] )) {
-				$pParamHash['xref_store']['content_id'] = $pParamHash['content_id'];
-			}
-
-			if ( isset( $pParamHash['source'] )) {
-				$pParamHash['xref_store']['source'] = $pParamHash['source'];
-			}
-
-			$pParamHash['xref_store']['xorder'] = 0;
-
-			if ( isset ( $pParamHash['fAddXref'] ) ) {
-				$pParamHash['xref_store']['source'] = isset( $pParamHash['Array_xref_type_list'] ) ? $pParamHash['Array_xref_type_list']['Array.source'] : $pParamHash['source'];
-				$pParamHash['xref_store']['content_id'] = $pParamHash['content_id'];
-				$sql = "SELECT x.`multi` FROM `".BIT_DB_PREFIX."contact_xref_source` x WHERE x.`source` = ?";
-				$next = $this->mDb->getOne( $sql, [  $pParamHash['xref_store']['source'] ] );
-				if ( $next > 0 ) {
-					$sql = "SELECT COALESCE( MAX(x.`xorder`) + 1, 1 ) FROM `".BIT_DB_PREFIX."contact_xref` x
-							WHERE x.`content_id` = ? AND x.`source` = ?";
-					$next = $this->mDb->getOne( $sql, [  $pParamHash['xref_store']['content_id'], $pParamHash['xref_store']['source'] ] );
-				}
-				$pParamHash['xref_store']['xorder'] = $next;
-			}
-
-			if ( isset ( $pParamHash['fStepXref']  ) ) {
-				$pParamHash['xref_store']['source'] = $this->mSource;
-				$pParamHash['xref_store']['xorder'] = $this->mInfo['data']['xorder'] + 1;
-				$pParamHash['xref_store']['content_id'] =  $this->mContentId;
-				$pParamHash['start_date'] = $this->mDb->NOW();
-				$pParamHash['ignore_end_date'] = 'on';
-				$pParamHash['xref_store']['xref'] = 0;
-				$pParamHash['xref_store']['xkey'] = '';
-				$pParamHash['xref_store']['xkey_ext'] = '';
-				$pParamHash['xref_store']['data'] = '';
-			}
-
-			if ( isset( $pParamHash['xref'] )) {
-				$pParamHash['xref_store']['xref'] = $pParamHash['xref'];
-			}
-			if ( isset( $pParamHash['xkey'] )) {
-				$pParamHash['xref_store']['xkey'] = $pParamHash['xkey'];
-			}
-			if ( isset( $pParamHash['xkey_ext'] )) {
-				$pParamHash['xref_store']['xkey_ext'] = $pParamHash['xkey_ext'];
-			}
-			if ( isset( $pParamHash['edit'] )) {
-				$pParamHash['xref_store']['data'] = $pParamHash['edit'];
-			}
-			$pParamHash['xref_store']['last_update_date'] = $this->mDb->NOW();
-
-			// If start and/or end dates are supplied these are updated as well
-			if( !empty( $pParamHash['start_Month'] ) ) {
-				$dateString = $this->mDate->gmmktime(
-					$pParamHash['start_Hour'],
-					$pParamHash['start_Minute'],
-					$pParamHash['start_Second'] ?? 0,
-					$pParamHash['start_Month'],
-					$pParamHash['start_Day'],
-					$pParamHash['start_Year'],
-				);
-
-				$timestamp = $this->mDate->getUTCFromDisplayDate( $dateString );
-				if( $timestamp !== -1 ) {
-					$pParamHash['start_date'] = $timestamp;
-				}
-			}
-			if( !empty( $pParamHash['start_date'] ) ) {
-				$pParamHash['xref_store']['start_date'] = $pParamHash['start_date'];
-			}
-			if( isset ($pParamHash['ignore_start_date']) && $pParamHash['ignore_start_date'] == 'on' ) {
-				$pParamHash['xref_store']['start_date'] = '';
-			}
-
-			if( !empty( $pParamHash['end_Month'] ) ) {
-				$dateString = $this->mDate->gmmktime(
-					$pParamHash['end_Hour'],
-					$pParamHash['end_Minute'],
-					$pParamHash['end_Second'] ?? 0,
-					$pParamHash['end_Month'],
-					$pParamHash['end_Day'],
-					$pParamHash['end_Year'],
-				);
-
-				$timestamp = $this->mDate->getUTCFromDisplayDate( $dateString );
-				if( $timestamp !== -1 ) {
-					$pParamHash['end_date'] = $timestamp;
-				}
-			}
-			if( !empty( $pParamHash['end_date'] ) ) {
-				$pParamHash['xref_store']['end_date'] = $pParamHash['end_date'];
-			}
-			if( isset ($pParamHash['ignore_end_date']) && $pParamHash['ignore_end_date'] == 'on' ) {
-				$pParamHash['xref_store']['end_date'] = '';
-			}
-//		}
-		return count( $this->mErrors ) == 0;
+		parent::__construct( $iXrefId );
 	}
-
-	public function store( &$pParamHash = NULL ) {
-		if( $this->verify( $pParamHash ) ) {
-			$table = BIT_DB_PREFIX."contact_xref";
-
-			$this->mDb->StartTrans();
-			if( isset( $pParamHash['xref_id'] ) ) {
-				$result = $this->mDb->associateUpdate( $table, $pParamHash['xref_store'], [ "xref_id" => $pParamHash['xref_id'] ] );
-			} else {
-				$this->mXrefId = $this->mDb->GenID( 'contact_xref_seq' );
-				$pParamHash['xref_id'] = $this->mXrefId;
-				$pParamHash['xref_store']['xref_id'] = $this->mXrefId;
-				$result = $this->mDb->associateInsert( $table, $pParamHash['xref_store'] );
-			}
-			// load before completing transaction as firebird isolates results
-			$this->load( $this->mXrefId );
-			$this->mDb->CompleteTrans();
-			return true;
-		}
-			return false;
-
-	}
-
-	public function stepXref( &$pParamHash = NULL ) {
-		if ( isset($pParamHash["expunge"]) ) {
-			switch ($pParamHash["expunge"]) {
-				case 2:
-					$pParamHash['end_date'] = $this->mDb->NOW();
-					$this->store( $pParamHash );
-					unset( $pParamHash['xref_id'] );
-					$pParamHash['fStepXref'] = 1;
-					break;
-				case 1:
-					$pParamHash['end_date'] = $this->mDb->NOW();
-					break;
-				default:
-					$pParamHash['ignore_end_date'] = 'on';
-					break;
-			}
-		}
-		$this->store( $pParamHash );
-		return true;
-	}
-
-}
\ No newline at end of file
+}
diff --git a/includes/classes/ContactXrefType.php b/includes/classes/ContactXrefType.php
index 17af008..a88d2bd 100755
--- a/includes/classes/ContactXrefType.php
+++ b/includes/classes/ContactXrefType.php
@@ -1,58 +1,20 @@
 <?php
 /**
- * @version $Header$
- * @package articles
- *
- * @copyright Copyright (c) 2004-2006, bitweaver.org
- * All Rights Reserved. See below for details and a complete list of authors.
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details.
- */
-
-/**
- * Required setup
- */
-namespace Bitweaver\Contact;
-
-use Bitweaver\BitBase;
-
-/**
  * @package contact
+ * @subpackage classes
  */
-class ContactXrefType extends BitBase {
-
-	public function __construct() {
-		parent::__construct();
 
-	}
-
-	public static function getContactXrefTypeList( $pOptionHash=NULL ) {
-		global $gBitSystem;
-
-		$where = '';
-		$bindVars = [];
-		if( !empty( $pOptionHash['active_role'] ) ) {
-			$where = " WHERE cxs.`role_id` = ? ";
-			$bindVars[] = $pOptionHash['active_role'];
-		}
-		if ( !empty(  $pOptionHash['source'] ) ) {
-			$where = " WHERE cxs.`source` = ? ";
-			$bindVars[] = $pOptionHash['source'];
-		}
-
-		$query = "SELECT cxs.*
-				 FROM `".BIT_DB_PREFIX."contact_xref_source` cxs
-				 $where ORDER BY cxs.`xref_type`, cxs.source`";
-
-		$result = $gBitSystem->mDb->query( $query, $bindVars );
+namespace Bitweaver\Contact;
 
-		$ret = [];
+use Bitweaver\Liberty\LibertyXrefType;
 
-		while( $res = $result->fetchRow() ) {
-			$res["num_entries"] = $gBitSystem->mDb->getOne( "SELECT COUNT(*) FROM `".BIT_DB_PREFIX."contact_xref` WHERE `source`= ?", [ $res["source"] ] );
+class ContactXrefType extends LibertyXrefType {
 
-			$ret[] = $res;
+	public static function getContactXrefTypeList( $pOptionHash = NULL ) {
+		if( $pOptionHash === NULL ) {
+			$pOptionHash = [];
 		}
-
-		return $ret;
+		$pOptionHash['content_type_guid'] = 'contact';
+		return LibertyXrefType::getXrefTypeList( $pOptionHash );
 	}
-}
\ No newline at end of file
+}