merge recent changes from R1 to HEAD

2 files changed, 19 insertions, 15 deletions

diff --git a/admin/admin_wiki_inc.php b/admin/admin_wiki_inc.php
index acbba99..55ff2b7 100644
--- a/admin/admin_wiki_inc.php
+++ b/admin/admin_wiki_inc.php
@@ -1,5 +1,5 @@
 <?php
-// $Header: /cvsroot/bitweaver/_bit_wiki/admin/admin_wiki_inc.php,v 1.3 2005/08/01 18:42:05 squareing Exp $
+// $Header: /cvsroot/bitweaver/_bit_wiki/admin/admin_wiki_inc.php,v 1.4 2005/08/07 17:46:50 squareing Exp $
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // 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.
@@ -321,7 +321,7 @@ if (isset($_REQUEST["wikidiscussprefs"])) {
 	if (isset($_REQUEST["wiki_forum"])) {
 		$gBitSystem->storePreference('wiki_forum', $_REQUEST["wiki_forum"]);
 		$gBitSmarty->assign('wiki_forum', $_REQUEST["wiki_forum"]);
-		$wiki_forum_id = $gBitSystem->getOne("select `forumID` from `tiki_forums` where `name`='" . $_REQUEST["wiki_forum"] . "'");
+		$wiki_forum_id = $gBitSystem->mDb->getOne("select `forumID` from `tiki_forums` where `name`='" . $_REQUEST["wiki_forum"] . "'");
 		$gBitSystem->storePreference('wiki_forum_id', $wiki_forum_id);
 		$gBitSmarty->assign('wiki_forum_id', $wiki_forum_id);
 	}
diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php
index 64f8bed..3c48d62 100644
--- a/admin/upgrade_inc.php
+++ b/admin/upgrade_inc.php
@@ -1,6 +1,6 @@
 <?php
 
-global $gBitSystem, $gUpgradeFrom, $gUpgradeTo;
+global $gBitSystem, $gUpgradeFrom, $gUpgradeTo, $gBitDb;
 
 $upgrades = array(
 
@@ -69,23 +69,23 @@ array( 'ALTER' => array(
 
 // STEP 3
 array( 'PHP' => '
-	global $gBitSystem;
+	global $gBitSystem, $gBitDb;
 	require_once( WIKI_PKG_PATH."BitPage.php" );
-	$max = $gBitSystem->GetOne( "SELECT MAX(`page_id`) FROM `'.BIT_DB_PREFIX.'tiki_pages`" );
-	$gBitSystem->mDb->mDb->CreateSequence( "tiki_pages_page_id_seq", $max + 1 );
+	$max = $gBitDb->GetOne( "SELECT MAX(`page_id`) FROM `'.BIT_DB_PREFIX.'tiki_pages`" );
+	$gBitSystem->mDb->CreateSequence( "tiki_pages_page_id_seq", $max + 1 );
 	$query = "SELECT uu.`user_id`, uu2.`user_id` AS modifier_user_id, tp.`lastModif` AS created, tp.`lastModif` AS `last_modified`, tp.`data`, tp.`pageName` AS `title`, tp.`ip`, tp.`hits`
 			  FROM `'.BIT_DB_PREFIX.'tiki_pages` tp INNER JOIN `'.BIT_DB_PREFIX.'users_users` uu ON( tp.`creator`=uu.`login` ) INNER JOIN `'.BIT_DB_PREFIX.'users_users` uu2 ON( tp.`user`=uu2.`login` )";
-	if( $rs = $gBitSystem->query( $query ) ) {
+	if( $rs = $gBitDb->query( $query ) ) {
 		while( !$rs->EOF ) {
-			$conId = $gBitSystem->mDb->mDb->GenID( "tiki_content_id_seq" );
+			$conId = $gBitDb->GenID( "tiki_content_id_seq" );
 			$rs->fields["content_id"] = $conId;
 			$rs->fields["content_type_guid"] = BITPAGE_CONTENT_TYPE_GUID;
 			$rs->fields["format_guid"] = PLUGIN_GUID_TIKIWIKI;
-			$gBitSystem->mDb->associateInsert( "tiki_content", $rs->fields );
-			$gBitSystem->query( "UPDATE `'.BIT_DB_PREFIX.'tiki_pages` SET `content_id`=? WHERE `pageName`=?", array( $conId, $rs->fields["title"] ) );
+			$gBitDb->associateInsert( "tiki_content", $rs->fields );
+			$gBitDb->query( "UPDATE `'.BIT_DB_PREFIX.'tiki_pages` SET `content_id`=? WHERE `pageName`=?", array( $conId, $rs->fields["title"] ) );
 			if( $w_use_dir = $gBitSystem->getPreference("w_use_dir") ) {
 				$page = new BitPage( NULL, $conId );
-				if( $page->load() && $rs2 = $gBitSystem->query( "SELECT * FROM `'.BIT_DB_PREFIX.'tiki_wiki_attachments` twa  INNER JOIN `'.BIT_DB_PREFIX.'users_users` uu ON( twa.`user`=uu.`login` ) WHERE twa.`page`=?", array( $rs->fields["title"] ) ) ) {
+				if( $page->load() && $rs2 = $gBitDb->query( "SELECT * FROM `'.BIT_DB_PREFIX.'tiki_wiki_attachments` twa  INNER JOIN `'.BIT_DB_PREFIX.'users_users` uu ON( twa.`user`=uu.`login` ) WHERE twa.`page`=?", array( $rs->fields["title"] ) ) ) {
 					while( !$rs2->EOF ) {
 						$info = $rs2->fields;
 						$storeHash["modifier_user_id"] = $rs->fields["modifier_user_id"];
@@ -95,7 +95,7 @@ array( 'PHP' => '
 						$storeHash["upload"]["size"] = filesize( $w_use_dir.$info["path"] );
 						$storeHash["upload"]["tmp_name"] = $w_use_dir.$info["path"];
 						if( $page->store( $storeHash ) ) {
-							$gBitSystem->query( "DELETE FROM `'.BIT_DB_PREFIX.'tiki_wiki_attachments` WHERE `page`=?", array( $rs->fields["title"] ) );
+							$gBitDb->query( "DELETE FROM `'.BIT_DB_PREFIX.'tiki_wiki_attachments` WHERE `page`=?", array( $rs->fields["title"] ) );
 						}
 						unset( $storeHash );
 						$rs2->MoveNext();
@@ -183,6 +183,10 @@ array( 'QUERY' =>
 	"UPDATE `".BIT_DB_PREFIX."tiki_categorized_objects` SET `object_type`='".BITPAGE_CONTENT_TYPE_GUID."', `object_id`=(SELECT tc.`content_id` FROM `".BIT_DB_PREFIX."tiki_content` tc WHERE tc.`title`=`".BIT_DB_PREFIX."tiki_categorized_objects`.`objId` AND `".BIT_DB_PREFIX."tiki_categorized_objects`.`object_type`='wiki page')",
 
 
+	// update user watches
+	"update `".BIT_DB_PREFIX."tiki_user_watches` as `tw` set `object` = (select `tp`.`page_id` from `tiki_pages` as `tp`, `tiki_content` as `tc` where `tp`.`content_id` = `tc`.`content_id` and   `tc`.`title` = `tw`.`title` )",
+
+
 	),
 )),
 
@@ -207,11 +211,11 @@ array( 'PHP' => '
 	require_once( LIBERTY_PKG_PATH."LibertyStructure.php" );
 	require_once( WIKI_PKG_PATH."BitBook.php" );
 	$query = "SELECT `structure_id`, `content_id` FROM `".BIT_DB_PREFIX."tiki_structures` WHERE `parent_id` IS NULL OR `parent_id`=0";
-	$roots = $gBitSystem->GetAssoc( $query );
+	$roots = $gBitDb->getAssoc( $query );
 	$s = new LibertyStructure();
 	foreach( $roots AS $rootId=>$contentId ) {
-		$gBitSystem->query( "UPDATE `".BIT_DB_PREFIX."tiki_structures` SET `root_structure_id`=? WHERE `structure_id`=?", array( $rootId, $rootId ) );
-		$gBitSystem->query( "UPDATE `".BIT_DB_PREFIX."tiki_content` SET `content_type_guid`=? WHERE `content_id`=?", array( BITBOOK_CONTENT_TYPE_GUID, $contentId ) );
+		$gBitDb->query( "UPDATE `".BIT_DB_PREFIX."tiki_structures` SET `root_structure_id`=? WHERE `structure_id`=?", array( $rootId, $rootId ) );
+		$gBitDb->query( "UPDATE `".BIT_DB_PREFIX."tiki_content` SET `content_type_guid`=? WHERE `content_id`=?", array( BITBOOK_CONTENT_TYPE_GUID, $contentId ) );
 		$toc = $s->build_subtree_toc( $rootId );
 		$s->setTreeRoot( $rootId, $toc );
 	}