detikify liberty

4 files changed, 27 insertions, 27 deletions

diff --git a/BitMailer.php b/BitMailer.php
index a061a6a..e732322 100644
--- a/BitMailer.php
+++ b/BitMailer.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_newsletters/Attic/BitMailer.php,v 1.16 2006/01/31 20:18:49 bitweaver Exp $
+ * $Header: /cvsroot/bitweaver/_bit_newsletters/Attic/BitMailer.php,v 1.17 2006/02/01 18:42:23 squareing Exp $
  *
  * Copyright (c) 2004 bitweaver.org
  * All Rights Reserved. See copyright.txt for details and a complete list of authors.
  * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
  *
- * $Id: BitMailer.php,v 1.16 2006/01/31 20:18:49 bitweaver Exp $
+ * $Id: BitMailer.php,v 1.17 2006/02/01 18:42:23 squareing Exp $
  *
  * Class that handles editions of newsletters
  * @package newsletters
@@ -15,7 +15,7 @@
  *
  * @author spiderr <spider@steelsun.com>
  *
- * @version $Revision: 1.16 $ $Date: 2006/01/31 20:18:49 $ $Author: bitweaver $
+ * @version $Revision: 1.17 $ $Date: 2006/02/01 18:42:23 $ $Author: squareing $
  */
 
 /**
@@ -169,9 +169,9 @@ class BitMailer extends phpmailer {
 		global $gBitDb;
 		$ret = NULL;
 		if( is_array( $pLookup ) ) {
-			$query = "SELECT mq.*, tc.title, tct.*, uu.`real_name`, uu.`login`, uu.`email` FROM `".BIT_DB_PREFIX."mail_queue` mq
-						INNER JOIN `".BIT_DB_PREFIX."tiki_content` tc ON( mq.`content_id`=tc.`content_id` )
-						INNER JOIN `".BIT_DB_PREFIX."tiki_content_types` tct ON( tct.`content_type_guid`=tc.`content_type_guid` )
+			$query = "SELECT mq.*, lc.title, tct.*, uu.`real_name`, uu.`login`, uu.`email` FROM `".BIT_DB_PREFIX."mail_queue` mq
+						INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON( mq.`content_id`=lc.`content_id` )
+						INNER JOIN `".BIT_DB_PREFIX."liberty_content_types` tct ON( tct.`content_type_guid`=lc.`content_type_guid` )
 						LEFT OUTER JOIN `".BIT_DB_PREFIX."users_users` uu ON( mq.`user_id`=uu.`user_id` )
 					  WHERE mq.`".key( $pLookup )."`=? ";
 			$ret = $gBitDb->getRow( $query, array( current( $pLookup ) ) );
@@ -187,10 +187,10 @@ class BitMailer extends phpmailer {
 		if( is_array( $pMixed ) ) {
 			$col = key( $pMixed );
 			$bindVars[] = current( $pMixed );
-			$query = "SELECT ms.`nl_content_id` AS `hash_key`, ms.*, uu.*, tc.title
+			$query = "SELECT ms.`nl_content_id` AS `hash_key`, ms.*, uu.*, lc.title
 					  FROM `".BIT_DB_PREFIX."mail_subscriptions` ms
 						LEFT OUTER JOIN `".BIT_DB_PREFIX."users_users` uu ON( ms.`user_id`=uu.`user_id` )
-						LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_content` tc ON( ms.`nl_content_id`=tc.`content_id` )
+						LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON( ms.`nl_content_id`=lc.`content_id` )
 					  WHERE ms.`$col`=? ";
 			$ret = $gBitDb->getAssoc( $query, $bindVars );
 		}
diff --git a/BitNewsletter.php b/BitNewsletter.php
index 79d9917..7d681e1 100644
--- a/BitNewsletter.php
+++ b/BitNewsletter.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_newsletters/BitNewsletter.php,v 1.14 2006/01/31 20:18:49 bitweaver Exp $
+ * $Header: /cvsroot/bitweaver/_bit_newsletters/BitNewsletter.php,v 1.15 2006/02/01 18:42:23 squareing Exp $
  *
  * Copyright (c) 2004 bitweaver.org
  * All Rights Reserved. See copyright.txt for details and a complete list of authors.
  * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
  *
- * $Id: BitNewsletter.php,v 1.14 2006/01/31 20:18:49 bitweaver Exp $
+ * $Id: BitNewsletter.php,v 1.15 2006/02/01 18:42:23 squareing Exp $
  *
  * Virtual base class (as much as one can have such things in PHP) for all
  * derived tikiwiki classes that require database access.
@@ -16,7 +16,7 @@
  *
  * @author drewslater <andrew@andrewslater.com>, spiderr <spider@steelsun.com>
  *
- * @version $Revision: 1.14 $ $Date: 2006/01/31 20:18:49 $ $Author: bitweaver $
+ * @version $Revision: 1.15 $ $Date: 2006/02/01 18:42:23 $ $Author: squareing $
  */
 
 /**
@@ -57,7 +57,7 @@ class BitNewsletter extends LibertyContent {
 
 			$query = "SELECT *
 					  FROM `".BIT_DB_PREFIX."newsletters` n
-						INNER JOIN `".BIT_DB_PREFIX."tiki_content` tc ON( n.`content_id`=tc.`content_id` )
+						INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON( n.`content_id`=lc.`content_id` )
 					  WHERE n.`$lookupColumn`=? $whereSql";
 			$result = $this->mDb->query($query,$bindVars);
 			if ($result->numRows()) {
@@ -212,8 +212,8 @@ class BitNewsletter extends LibertyContent {
 		}
 
 		$query = "SELECT *
-				  FROM `".BIT_DB_PREFIX."newsletters` n INNER JOIN `".BIT_DB_PREFIX."tiki_content` tc ON( n.`content_id`=tc.`content_id`)
-				  WHERE n.`content_id`=tc.`content_id` $mid
+				  FROM `".BIT_DB_PREFIX."newsletters` n INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON( n.`content_id`=lc.`content_id`)
+				  WHERE n.`content_id`=lc.`content_id` $mid
 				  ORDER BY ".$this->mDb->convert_sortmode( $pListHash['sort_mode'] );
 		$result = $this->mDb->query( $query, $bindVars, $pListHash['max_records'], $pListHash['offset'] );
 
diff --git a/BitNewsletterEdition.php b/BitNewsletterEdition.php
index 8ccaebc..32bd6b2 100644
--- a/BitNewsletterEdition.php
+++ b/BitNewsletterEdition.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_newsletters/BitNewsletterEdition.php,v 1.17 2006/01/31 20:18:49 bitweaver Exp $
+ * $Header: /cvsroot/bitweaver/_bit_newsletters/BitNewsletterEdition.php,v 1.18 2006/02/01 18:42:23 squareing Exp $
  *
  * Copyright (c) 2004 bitweaver.org
  * All Rights Reserved. See copyright.txt for details and a complete list of authors.
  * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
  *
- * $Id: BitNewsletterEdition.php,v 1.17 2006/01/31 20:18:49 bitweaver Exp $
+ * $Id: BitNewsletterEdition.php,v 1.18 2006/02/01 18:42:23 squareing Exp $
  *
  * Class that handles editions of newsletters
  * @package newsletters
@@ -15,7 +15,7 @@
  *
  * @author spiderr <spider@steelsun.com>
  *
- * @version $Revision: 1.17 $ $Date: 2006/01/31 20:18:49 $ $Author: bitweaver $
+ * @version $Revision: 1.18 $ $Date: 2006/02/01 18:42:23 $ $Author: squareing $
  */
 
 /**
@@ -87,9 +87,9 @@ class BitNewsletterEdition extends LibertyAttachable {
 
 			$this->getServicesSql( 'content_load_function', $selectSql, $joinSql, $whereSql, $bindVars );
 
-			$query = "SELECT ne.*, tc.*
+			$query = "SELECT ne.*, lc.*
 					  FROM `".BIT_DB_PREFIX."newsletters_editions` ne
-						INNER JOIN `".BIT_DB_PREFIX."tiki_content` tc ON( ne.`content_id`=tc.`content_id` )
+						INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON( ne.`content_id`=lc.`content_id` )
 					  WHERE ne.`$lookupColumn`=? $whereSql";
 			if ( $result = $this->mDb->query($query,$bindVars) ) {
 				$this->mInfo = $result->fetchRow();
@@ -147,15 +147,15 @@ class BitNewsletterEdition extends LibertyAttachable {
 
 		if( $pListHash['find'] ) {
 			$findesc = '%' . $pListHash['find'] . '%';
-			$mid .= (empty( $mid ) ? 'WHERE' : 'AND').' (tc.`title` like ? or tc.`data` like ?)';
+			$mid .= (empty( $mid ) ? 'WHERE' : 'AND').' (lc.`title` like ? or lc.`data` like ?)';
 			$bindVars[] = $findesc;
 			$bindVars[] = $findesc;
 		}
-		$query = "SELECT `edition_id` AS `hash_key`, ne.*, tc.*, tc2.`title` AS `newsletter_title`
+		$query = "SELECT `edition_id` AS `hash_key`, ne.*, lc.*, tc2.`title` AS `newsletter_title`
 				  FROM `".BIT_DB_PREFIX."newsletters_editions` ne
-				  	INNER JOIN `".BIT_DB_PREFIX."tiki_content` tc ON( tc.`content_id`=ne.`content_id` )
+				  	INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON( lc.`content_id`=ne.`content_id` )
 				  	INNER JOIN `".BIT_DB_PREFIX."newsletters` n ON( ne.`nl_content_id`=n.`content_id` )
-				  	LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_content` tc2 ON( n.`content_id`=tc2.`content_id` )
+				  	LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content` tc2 ON( n.`content_id`=tc2.`content_id` )
 				  $mid ORDER BY ".$this->mDb->convert_sortmode( $pListHash['sort_mode'] );
 		$query_cant = "select count(*) from `".BIT_DB_PREFIX."newsletters` n INNER JOIN `".BIT_DB_PREFIX."newsletters_editions` ne ON(n.`content_id`=ne.`nl_content_id`) $mid";
 		$ret = $gBitDb->getAssoc( $query, $bindVars, $pListHash['max_records'], $pListHash['offset'] );
diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index 85a7284..2450136 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -11,7 +11,7 @@ $tables = array(
   unsub_msg C(1) default 'y',
   validate_addr C(1) default 'y',
   frequency I8
-  CONSTRAINTS ', CONSTRAINT `tiki_nl_ed_con_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."tiki_content`( `content_id` )'
+  CONSTRAINTS ', CONSTRAINT `tiki_nl_ed_con_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content`( `content_id` )'
 ",
 
 'newsletters_editions' => "
@@ -20,8 +20,8 @@ $tables = array(
   is_draft C(1),
   reply_to C(160),
   content_id I4 NOTNULL
-  CONSTRAINTS ', CONSTRAINT `tiki_nl_ed_nl_con_ref` FOREIGN KEY (`nl_content_id`) REFERENCES `".BIT_DB_PREFIX."tiki_content`( `content_id` )
-  			   , CONSTRAINT `tiki_nl_ed_con_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."tiki_content`( `content_id` )'
+  CONSTRAINTS ', CONSTRAINT `tiki_nl_ed_nl_con_ref` FOREIGN KEY (`nl_content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content`( `content_id` )
+  			   , CONSTRAINT `tiki_nl_ed_con_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content`( `content_id` )'
 ",
 
 'mail_subscriptions' => "
@@ -50,7 +50,7 @@ $tables = array(
   queue_date I8,
   send_date I8,
   emails_sent I8
-  CONSTRAINTS ', CONSTRAINT `mail_content_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."tiki_content` ( `content_id` )'
+  CONSTRAINTS ', CONSTRAINT `mail_content_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content` ( `content_id` )'
 ",
 
 'mail_queue' => "