From d9d215a4a116dce855582c319303f87462b972b3 Mon Sep 17 00:00:00 2001
From: spiderr <spiderr@bitweaver.org>
Date: Wed, 20 Jan 2021 07:45:47 -0500
Subject: PHP7 implements Countable check

---
 templates/page_icons.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/page_icons.tpl b/templates/page_icons.tpl
index cd49496..67a3ae1 100644
--- a/templates/page_icons.tpl
+++ b/templates/page_icons.tpl
@@ -85,7 +85,7 @@
 			  </div>
 		{/if}
 
-		{if count($showstructs) gt 0}
+		{if $showstructs && (count($showstructs) gt 0)}
 			<select id="sel-structures" name="page" onchange="javascript:BitBase.go(this)">
 				<option value="">{tr}Wiki Books{/tr} &hellip;</option>
 				{section name=struct loop=$showstructs}
-- 
cgit v1.3


From 71cbc7db147f95c78fc3b26d61fc31ad3c6bc0fb Mon Sep 17 00:00:00 2001
From: spiderr <spiderr@bitweaver.org>
Date: Sun, 31 Jan 2021 15:49:08 -0500
Subject: PHP7 clean up dual static + object use of parseData, and create
 ->getParsedData & ::filterDataHash

---
 BitPage.php             |  2 +-
 display_bitpage_inc.php |  2 +-
 edit.php                | 12 ++++--------
 print_multi_pages.php   |  5 ++---
 slideshow.php           |  2 +-
 wiki_rss.php            |  2 +-
 6 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/BitPage.php b/BitPage.php
index 043feee..7a3680b 100644
--- a/BitPage.php
+++ b/BitPage.php
@@ -194,7 +194,7 @@ class BitPage extends LibertyMime implements BitCacheable {
 				}
 
 				if ( $parse ) {
-					$this->mInfo['parsed_data'] = $this->parseData();
+					$this->getParsedData();
 				}
 			} else {
 				$this->mPageId = NULL;
diff --git a/display_bitpage_inc.php b/display_bitpage_inc.php
index 4154b41..ba8e63b 100644
--- a/display_bitpage_inc.php
+++ b/display_bitpage_inc.php
@@ -116,7 +116,7 @@ if( $gBitSystem->isFeatureActive( 'wiki_comments' )) {
 // Footnotes
 if( $gBitSystem->isFeatureActive( 'wiki_footnotes' ) && $gBitUser->isValid() ) {
 	if( $footnote = $gContent->getFootnote( $gBitUser->mUserId ) ) {
-		$gBitSmarty->assign( 'footnote', $gContent->parseData( $footnote ) );
+		$gBitSmarty->assign( 'footnote', LibertyContent::parseDataHash( $footnote ) );
 	}
 }
 
diff --git a/edit.php b/edit.php
index 3a083c7..76b2cb3 100644
--- a/edit.php
+++ b/edit.php
@@ -73,10 +73,10 @@ if( $gBitSystem->isFeatureActive( 'wiki_footnotes' ) ) {
 		$gBitSmarty->assign( 'footnote', $footnote );
 		if( $footnote )
 			$gBitSmarty->assign( 'has_footnote', 'y' );
-		$gBitSmarty->assign( 'parsed_footnote', $gContent->parseData( $footnote ) );
+		$gBitSmarty->assign( 'parsed_footnote', LibertyContent::parseDataHash( $footnote ) );
 		if( isset( $_REQUEST['footnote'] ) ) {
 
-			$gBitSmarty->assign( 'parsed_footnote', $gContent->parseData( $_REQUEST['footnote'] ) );
+			$gBitSmarty->assign( 'parsed_footnote', LibertyContent::parseDataHash( $_REQUEST['footnote'] ) );
 			$gBitSmarty->assign( 'footnote', $_REQUEST['footnote'] );
 			$gBitSmarty->assign( 'has_footnote', 'y' );
 			if( empty( $_REQUEST['footnote'] ) ) {
@@ -210,16 +210,12 @@ if( isset( $_REQUEST["preview"] ) ) {
 		$formInfo['edit_section'] = 1;
 	}
 
-	$data_to_parse = $formInfo['edit'];
+	$data_to_parse['data'] = $formInfo['edit'];
 	if( !empty( $formInfo['section'] ) && !empty( $gContent->mInfo['data'] )) {
 		$full_page_data = $gContent->mInfo['data'];
 	}
 
-
-	$formInfo['parsed_data'] = $gContent->parseData(
-		$data_to_parse,
-		( !empty( $_REQUEST['format_guid'] ) ? $_REQUEST['format_guid'] : ( isset( $gContent->mInfo['format_guid'] ) ? $gContent->mInfo['format_guid'] : 'tikiwiki' ))
-	);
+	$formInfo['parsed_data'] = LibertyContent::parseDataHash( $data_to_parse );
 	$gContent->invokeServices( 'content_preview_function' );
 }
 
diff --git a/print_multi_pages.php b/print_multi_pages.php
index acd4063..0fafcc5 100644
--- a/print_multi_pages.php
+++ b/print_multi_pages.php
@@ -31,9 +31,8 @@ if (isset($_REQUEST["print"])) {
 		$page = new BitPage( NULL, $contentId );
 		if( $page->load() ) {
 			$page->verifyViewPermission();
-			$page_info = $page->mInfo;
-			$page_info["parsed"] = $page->parseData( $page_info );
-			$pages[] = $page_info;
+			$page->getParsedData();
+			$pages[] = $page->mInfo;
 		}
 	}
 }
diff --git a/slideshow.php b/slideshow.php
index d403b9b..137ae2f 100755
--- a/slideshow.php
+++ b/slideshow.php
@@ -72,7 +72,7 @@ if (isset($reqs[1][$_REQUEST["slide"]])) {
 	$slide_title = '';
 }
 
-$slide_data = $gContent->parseData( $slides[$_REQUEST["slide"] + 1] );
+$slide_data = LibertyContent::parseDataHash( $slides[$_REQUEST["slide"] + 1] );
 
 if (isset($reqs[1][$_REQUEST["slide"] - 1])) {
 	$slide_prev_title = $reqs[1][$_REQUEST["slide"] - 1];
diff --git a/wiki_rss.php b/wiki_rss.php
index d616c5b..f3eadb1 100644
--- a/wiki_rss.php
+++ b/wiki_rss.php
@@ -43,7 +43,7 @@ if( !$gBitUser->hasPermission( 'p_wiki_view_page' ) ) {
 		$item = new FeedItem();
 		$item->title = $feed['title'];
 		$item->link = BIT_BASE_URI.$wiki->getDisplayUrl( $feed['title'] );
-		$item->description = $wiki->parseData( $feed );
+		$item->description = BitPage::parseDataHash( $feed );
 
 		$item->date = ( int )$feed['last_modified'];
 		$item->source = 'http://'.$_SERVER['HTTP_HOST'].BIT_ROOT_URL;
-- 
cgit v1.3


From 6d833069375f8e19bbb7efad08144ac06ddca051 Mon Sep 17 00:00:00 2001
From: modela bitweaver <spiderr@bitweaver.org>
Date: Mon, 1 Feb 2021 10:52:48 -0500
Subject: PHP7 clean up warnings

---
 modules/mod_recent_page_changes.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/mod_recent_page_changes.php b/modules/mod_recent_page_changes.php
index c597952..93e3e14 100644
--- a/modules/mod_recent_page_changes.php
+++ b/modules/mod_recent_page_changes.php
@@ -10,7 +10,6 @@
  * @subpackage modules
  */
 global $gQueryUserId, $moduleParams;
-$params = $moduleParams['module_params'];
 
 /**
  * required setup
@@ -21,13 +20,16 @@ if( $gBitUser->hasPermission( 'p_wiki_view_page' ) ) {
 	$wp = new BitPage();
 
 	$listHash = array(
-		'max_records' => $moduleParams['module_rows'],
 		'sort_mode' => 'last_modified_desc',
 		'user_id' => $gQueryUserId,
 	);
+	if( !empty( $moduleParams['module_rows'] ) ) {
+		$listHash['max_records'] = $moduleParams['module_rows'];
+	}
 	$modLastModif = $wp->getList( $listHash );
 
 	$_template->tpl_vars['modLastModif'] = new Smarty_variable( $modLastModif );
-	$_template->tpl_vars['maxlen'] = new Smarty_variable( isset( $params["maxlen"] ) );
+	if( !empty( $moduleParams['module_params']["maxlen"] ) ) {
+		$_template->tpl_vars['maxlen'] = new Smarty_variable( isset( $moduleParams['module_params']["maxlen"] ) );
+	}
 }
-?>
-- 
cgit v1.3


From 3de7b595a6e01676ec80317e647baf2176aee6b4 Mon Sep 17 00:00:00 2001
From: modela bitweaver <spiderr@bitweaver.org>
Date: Mon, 1 Feb 2021 20:09:35 -0500
Subject: move classes to includes/classes and use PKG_CLASS/INCLUDE_PATH
 constants

---
 BitBook.php                           |   71 ---
 BitPage.php                           | 1065 ---------------------------------
 admin/pump_wiki_inc.php               |    2 +-
 display_bitpage_inc.php               |    2 +-
 export_lib.php                        |    2 +-
 includes/classes/BitBook.php          |   71 +++
 includes/classes/BitPage.php          | 1065 +++++++++++++++++++++++++++++++++
 index.php                             |    2 +-
 list_pages.php                        |    2 +-
 lookup_page_inc.php                   |    2 +-
 modules/mod_comm_received_objects.php |    2 +-
 modules/mod_random_pages.php          |    2 +-
 modules/mod_recent_page_changes.php   |    2 +-
 modules/mod_top_pages.php             |    2 +-
 page_history.php                      |    2 +-
 print_multi_pages.php                 |    2 +-
 print_pages.php                       |    2 +-
 sitemap.php                           |    2 +-
 18 files changed, 1150 insertions(+), 1150 deletions(-)
 delete mode 100644 BitBook.php
 delete mode 100644 BitPage.php
 create mode 100644 includes/classes/BitBook.php
 create mode 100644 includes/classes/BitPage.php

diff --git a/BitBook.php b/BitBook.php
deleted file mode 100644
index 3845e2e..0000000
--- a/BitBook.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * BitBook class
- *
- * @author   spider <spider@steelsun.com>
- * @version  $Revision: 1.14 $
- * @package  wiki
- */
-// +----------------------------------------------------------------------+
-// | Copyright (c) 2004, 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
-// |
-// | For comments, please use phpdocu.sourceforge.net documentation standards!!!
-// | -> see http://phpdocu.sourceforge.net/
-// +----------------------------------------------------------------------+
-// | Authors: spider <spider@steelsun.com>
-// +----------------------------------------------------------------------+
-//
-// $Id: BitBook.php,v 1.14 2010/04/17 22:46:11 wjames5 Exp $
-
-
-/**
- * required setup
- */
-require_once( WIKI_PKG_PATH.'BitPage.php' );
-require_once( LIBERTY_PKG_PATH.'LibertyStructure.php' );
-
-define('BITBOOK_CONTENT_TYPE_GUID', 'bitbook' );
-
-/**
- * BitBook class
- *
- * @abstract
- * @author   spider <spider@steelsun.com>
- * @version  $Revision: 1.14 $
- * @package  wiki
- */
-class BitBook extends BitPage {
-	public $mPageId;
-	public $mPageName;
-	function __construct( $pPageId=NULL, $pContentId=NULL ) {
-		parent::__construct( $pPageId, $pContentId );
-		$this->registerContentType( BITBOOK_CONTENT_TYPE_GUID, array(
-			'content_type_guid' => BITBOOK_CONTENT_TYPE_GUID,
-			'content_name' => 'Wiki Book',
-			'handler_class' => 'BitBook',
-			'handler_package' => 'wiki',
-			'handler_file' => 'BitBook.php',
-			'maintainer_url' => 'http://www.bitweaver.org'
-		) );
-		$this->mContentTypeGuid = BITBOOK_CONTENT_TYPE_GUID;
-
-		// Permission setup
-		$this->mCreateContentPerm  = 'p_wiki_create_book';
-		$this->mUpdateContentPerm  = 'p_wiki_update_book';
-		$this->mAdminContentPerm = 'p_wiki_admin_book';
-	}
-
-	function getList( &$pListHash ) {
-		$struct = new LibertyStructure();
-		$pListHash['content_type_guid'] = $this->mContentTypeGuid;
-		return $struct->getList( $pListHash );
-	}
-
-	function getStats() {
-		return FALSE;
-	}
-}
-?>
diff --git a/BitPage.php b/BitPage.php
deleted file mode 100644
index 7a3680b..0000000
--- a/BitPage.php
+++ /dev/null
@@ -1,1065 +0,0 @@
-<?php
-/**
- * @package wiki
- * @author spider <spider@steelsun.com>
- *
- * Copyright (c) 2004 bitweaver.org
- * Copyright (c) 2003 tikwiki.org
- * Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
- * 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
- */
-require_once( LIBERTY_PKG_PATH.'LibertyMime.php' );
-
-/**
- * @package wiki
- */
-class BitPage extends LibertyMime implements BitCacheable {
-	public $mPageId;
-	public $mPageName;
-
-	function __construct( $pPageId=NULL, $pContentId=NULL ) {
-		parent::__construct();
-		$this->registerContentType( BITPAGE_CONTENT_TYPE_GUID, array(
-				'content_type_guid' => BITPAGE_CONTENT_TYPE_GUID,
-				'content_name' => 'Wiki Page',
-				'handler_class' => 'BitPage',
-				'handler_package' => 'wiki',
-				'handler_file' => 'BitPage.php',
-				'maintainer_url' => 'http://www.bitweaver.org'
-			) );
-		$this->mPageId = (int)$pPageId;
-		$this->mContentId = (int)$pContentId;
-		$this->mContentTypeGuid = BITPAGE_CONTENT_TYPE_GUID;
-
-		// Permission setup
-		$this->mViewContentPerm  = 'p_wiki_view_page';
-		$this->mCreateContentPerm = 'p_wiki_create_page';
-		$this->mUpdateContentPerm  = 'p_wiki_update_page';
-		$this->mAdminContentPerm = 'p_wiki_admin';
-	}
-
-	public static function isCacheableClass() {
-		return true;
-	}
-
-	public function isCacheableObject() {
-		return true;
-	}
-
-	public static function getCacheClass() {
-		return 'BitPage';
-	}
-
-	public function __sleep() {
-		return array_merge( parent::__sleep(), array( 'mPageId', 'mPageName' ) );
-	}
-
-	public static function findContentIdByPageId( $pPageId ) {
-		global $gBitDb;
-		$ret = NULL;
-		if( BitBase::verifyId( $pPageId ) ) {
-			$ret = $gBitDb->getOne( "SELECT `content_id` FROM `".BIT_DB_PREFIX."wiki_pages` WHERE `page_id`=?", array( (int)$pPageId ) );
-		}
-		return $ret;
-	}
-
-	function findByPageName( $pPageName, $pUserId=NULL ) {
-		$userWhere = '';
-		$bindVars = array( $pPageName, $this->mContentTypeGuid );
-		if( @BitBase::verifyId( $pUserId ) ) {
-			$userWhere = " AND lc.`user_id`=?";
-			array_push( $bindVars, $pUserId );
-		}
-		$ret = $this->mDb->getOne("select `page_id` from `".BIT_DB_PREFIX."wiki_pages` wp INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id` = wp.`content_id`) where lc.`title`=? AND lc.`content_type_guid`=? $userWhere", $bindVars );
-		return $ret;
-	}
-
-	public static function lookupObject( $pLookupHash ) {
-		if( !empty( $pLookupHash['page_id'] ) )  {
-			$loadContentId = BitPage::findContentIdByPageId( $pLookupHash['page_id'] );
-		} elseif( !empty( $pLookupHash['content_id'] ) ) {
-			$loadContentId = $pLookupHash['content_id'];
-		} elseif( !empty( $pLookupHash['page'] ) ) {
-			//handle legacy forms that use plain 'page' form variable name
-
-			//if page had some special enities they were changed to HTML for for security reasons.
-			//now we deal only with string so convert it back - so we can support this case:
-			//You&Me --(detoxify in kernel)--> You&amp;Me --(now)--> You&Me
-			//we could do htmlspecialchars_decode but it allows <> marks here, so we just transform &amp; to & - it's not so scary.
-			$loadPage = str_replace("&amp;", "&", $pLookupHash['page'] );
-			// Fix nignx mapping of '+' sign when doing rewrite
-			$loadPage = str_replace("+", " ", $loadPage );
-
-			if( $loadPage && $existsInfo = static::pageExists( $loadPage ) ) {
-				if (count($existsInfo)) {
-					if (count($existsInfo) > 1) {
-						// Perhaps something should be done on page conflicts
-					}
-					$loadPageId = $existsInfo[0]['page_id'];
-					$loadContentId = $existsInfo[0]['content_id'];
-				}
-			}
-		}
-
-		if( !empty( $loadContentId ) ) {
-			$ret = static::getLibertyObject( $loadContentId );
-		}
-
-		if( empty( $ret ) || !is_object( $ret ) ) {
-			$ret = new self();
-		}
-		return $ret;
-	}
-
-	/**
-	 * Determines if a wiki page (row in wiki_pages) exists, and returns a hash of important info. If N pages exists with $pPageName, returned existsHash has a row for each unique pPageName row.
-	 * @param pPageName name of the wiki page
-	 * @param pCaseSensitive look for case sensitive names
-	 * @param pContentId if you insert the content id of the currently viewed content, non-existing links can be created immediately
-	 */
-	public static function pageExists( $pPageName, $pCaseSensitive=FALSE, $pContentId=NULL ) {
-		global $gBitSystem;
-		$ret = NULL;
-
-		if( $gBitSystem->isPackageActive( 'wiki' ) ) {
-			$columnExpression = $gBitSystem->mDb->getCaseLessColumn('lc.title');
-
-			$pageWhere = $pCaseSensitive ? 'lc.`title`' : $columnExpression;
-			$bindVars = array( ($pCaseSensitive ? $pPageName : strtoupper( $pPageName ) ) );
-			$query = "SELECT `page_id`, wp.`content_id`, lcds.`data` AS `summary`, lc.`last_modified`, lc.`title`
-				FROM `".BIT_DB_PREFIX."wiki_pages` wp
-					INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id`=wp.`content_id`)
-					LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_data` lcds ON (lc.`content_id` = lcds.`content_id` AND lcds.`data_type`='summary')
-				WHERE $pageWhere = ?";
-			if( !$ret = $gBitSystem->mDb->getAll( $query, $bindVars ) ) {
-				$query = "SELECT `page_id`, wp.`content_id`, lcds.`data` AS `summary`, lc.`last_modified`, lc.`title`, lal.`alias_title`
-					FROM `".BIT_DB_PREFIX."wiki_pages` wp
-						INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id`=wp.`content_id`)
-						INNER JOIN `".BIT_DB_PREFIX."liberty_aliases` lal ON (lc.`content_id`=lal.`content_id`)
-						LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_data` lcds ON (lc.`content_id` = lcds.`content_id` AND lcds.`data_type`='summary')
-					WHERE ".$gBitSystem->mDb->getCaseLessColumn('lal.alias_title')." = ?";
-				$ret = $gBitSystem->mDb->getAll( $query, $bindVars );
-			}
-		}
-		return $ret;
-	}
-
-	/**
-	 * load
-	 *
-	 * @access public
-	 * @return TRUE on success, FALSE on failure - mErrors will contain reason for failure
-	 */
-	function load( $pContentId=NULL, $pPluginParams = TRUE ) {
-		if( $this->verifyId( $this->mPageId ) || $this->verifyId( $this->mContentId ) ) {
-			global $gBitSystem;
-
-			$lookupColumn = @BitBase::verifyId( $this->mPageId ) ? 'page_id' : 'content_id';
-			$parse = ( !isset( $pPluginParams['parse'] ) or $pPluginParams['parse'] ) ? true : false;
-			$bindVars = array(); $selectSql = ''; $joinSql = ''; $whereSql = '';
-			array_push( $bindVars, $lookupId = @BitBase::verifyId( $this->mPageId )? $this->mPageId : $this->mContentId );
-			$this->getServicesSql( 'content_load_sql_function', $selectSql, $joinSql, $whereSql, $bindVars );
-
-			$query = "
-				SELECT wp.*, lc.*, lcds.`data` AS `summary`,
-				uue.`login` AS modifier_user, uue.`real_name` AS modifier_real_name,
-				uuc.`login` AS creator_user, uuc.`real_name` AS creator_real_name $selectSql
-				FROM `".BIT_DB_PREFIX."wiki_pages` wp
-					INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id` = wp.`content_id`) $joinSql
-					LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_data` lcds ON (lc.`content_id` = lcds.`content_id` AND lcds.`data_type`='summary')
-					LEFT JOIN `".BIT_DB_PREFIX."users_users` uue ON (uue.`user_id` = lc.`modifier_user_id`)
-					LEFT JOIN `".BIT_DB_PREFIX."users_users` uuc ON (uuc.`user_id` = lc.`user_id`)
-				WHERE wp.`$lookupColumn`=? $whereSql";
-			if( $this->mInfo = $this->mDb->getRow( $query, $bindVars ) ) {
-				$this->mContentId = $this->mInfo['content_id'];
-				$this->mPageId = $this->mInfo['page_id'];
-				$this->mPageName = $this->mInfo['title'];
-				$this->mInfo['display_url'] = $this->getDisplayUrl( $this->mPageName );
-
-				// TODO: this is a bad habbit and should not be done BitUser::getDisplayName sorts out what name to display
-				$this->mInfo['creator'] = (isset( $this->mInfo['creator_real_name'] ) ? $this->mInfo['creator_real_name'] : $this->mInfo['creator_user'] );
-				$this->mInfo['editor'] = (isset( $this->mInfo['modifier_real_name'] ) ? $this->mInfo['modifier_real_name'] : $this->mInfo['modifier_user'] );
-
-				// Save some work if wiki_attachments are not active
-				// get prefs before we parse the data that we know how to parse the data
-				if( $gBitSystem->isFeatureActive( 'wiki_attachments' ) ) {
-					LibertyMime::load();
-				} else {
-					LibertyContent::load();
-				}
-
-				if ( $parse ) {
-					$this->getParsedData();
-				}
-			} else {
-				$this->mPageId = NULL;
-			}
-		}
-		return( count( $this->mInfo ) );
-	}
-
-	/**
-	* This is the ONLY method that should be called in order to store (create or update) a wiki page!
-	* It is very smart and will figure out what to do for you. It should be considered a black box.
-	*
-	* @param array pParams hash of values that will be used to store the page
-	*
-	* @return bool TRUE on success, FALSE if store could not occur. If FALSE, $this->mErrors will have reason why
-	*
-	* @access public
-	**/
-	function store( &$pParamHash ) {
-		$this->StartTrans();
-
-		if( $this->verify( $pParamHash ) && LibertyMime::store( $pParamHash ) ) {
-			$pParamHash['page_store']['wiki_page_size'] = !empty( $pParamHash['edit'] ) ? strlen( $pParamHash['edit'] ) : 0;
-
-			$table = BIT_DB_PREFIX."wiki_pages";
-			if( $this->verifyId( $this->mPageId ) ) {
-				$result = $this->mDb->associateUpdate( $table, $pParamHash['page_store'], array( "page_id" => $this->mPageId ) );
-			} else {
-				$pParamHash['page_store']['content_id'] = $pParamHash['content_id'];
-				if( @$this->verifyId( $pParamHash['page_id'] ) ) {
-					// if pParamHash['page_id'] is set, some is requesting a particular page_id. Use with caution!
-					$pParamHash['page_store']['page_id'] = $pParamHash['page_id'];
-				} else {
-					$pParamHash['page_store']['page_id'] = $this->mDb->GenID( 'wiki_pages_page_id_seq');
-				}
-				$this->mPageId = $pParamHash['page_store']['page_id'];
-
-				$result = $this->mDb->associateInsert( $table, $pParamHash['page_store'] );
-			}
-			// Access new data for notifications
-			$this->load();
-
-			if( isset( $mailEvents ) ) {
-				global $notificationlib, $gBitUser, $gBitSystem, $gBitSmarty;
-				include_once( KERNEL_PKG_PATH.'notification_lib.php' );
-				$notificationlib->post_content_event($this->mContentId, $this->mInfo['content_type_guid'], 'wiki', $this->mInfo['title'], $this->mInfo['modifier_user'], $this->mInfo['edit_comment'], $this->mInfo['data']);
-
-				if( $gBitSystem->isFeatureActive( 'users_watches') ) {
-					$nots = $gBitUser->get_event_watches( 'wiki_page_changed', $this->mPageId );
-
-					foreach ($nots as $not) {
-#						if ($wiki_watch_editor != 'y' && $not['user_id'] == $user)
-#							break;
-						$gBitSmarty->assign('mail_site', $_SERVER["SERVER_NAME"]);
-
-						$gBitSmarty->assign('mail_page', $this->mInfo['title']);
-						$gBitSmarty->assign('mail_date', $gBitSystem->getUTCTime());
-						$gBitSmarty->assign('mail_user', $this->mInfo['modifier_user']);
-						$gBitSmarty->assign('mail_comment', $this->mInfo['edit_comment']);
-						$gBitSmarty->assign('mail_last_version', $this->mInfo['version'] - 1);
-						$gBitSmarty->assign('mail_data', $this->mInfo['data']);
-						$gBitSmarty->assign('mail_hash', $not['hash']);
-						$foo = parse_url($_SERVER["REQUEST_URI"]);
-						$machine = httpPrefix();
-						$gBitSmarty->assign('mail_machine', $machine);
-						$parts = explode('/', $foo['path']);
-
-						if (count($parts) > 1)
-							unset ($parts[count($parts) - 1]);
-
-						$gBitSmarty->assign('mail_machine_raw', httpPrefix(). implode('/', $parts));
-						$gBitSmarty->assign('mail_pagedata', $this->mInfo['data']);
-						$mail_data = $gBitSmarty->fetch('bitpackage:wiki/user_watch_wiki_page_changed.tpl');
-						$email_to = $not['email'];
-						@mail($email_to, tra('Wiki page'). ' ' . $this->mInfo['title'] . ' ' . tra('changed'), $mail_data, "From: ".$gBitSystem->getConfig( 'site_sender_email' )."\r\nContent-type: text/plain;charset=utf-8\r\n");
-					}
-				}
-			}
-		}
-		$this->CompleteTrans();
-		return( count( $this->mErrors ) == 0 );
-	}
-
-	/**
-	* verify This function is responsible for data integrity and validation before any operations are performed with the $pParamHash
-	* NOTE: This is a PRIVATE METHOD!!!! do not call outside this class, under penalty of death!
-	*
-	* @param array pParams reference to hash of values that will be used to store the page, they will be modified where necessary
-	*
-	* @return bool TRUE on success, FALSE if verify failed. If FALSE, $this->mErrors will have reason why
-	*
-	* @access private
-	**/
-	function verify( &$pParamHash ) {
-		global $gBitUser, $gBitSystem;
-
-		// make sure we're all loaded up of we have a mPageId
-		if( $this->verifyId( $this->mPageId ) && empty( $this->mInfo ) ) {
-			$this->load();
-		}
-
-		if( isset( $this->mInfo['content_id'] ) && $this->verifyId( $this->mInfo['content_id'] ) ) {
-			$pParamHash['content_id'] = $this->mInfo['content_id'];
-		}
-
-		// It is possible a derived class set this to something different
-		if( empty( $pParamHash['content_type_guid'] ) ) {
-			$pParamHash['content_type_guid'] = $this->mContentTypeGuid;
-		}
-
-		if( @$this->verifyId( $pParamHash['content_id'] ) ) {
-			$pParamHash['page_store']['content_id'] = $pParamHash['content_id'];
-		}
-
-		// check for name issues, first truncate length if too long
-		if( empty( $pParamHash['title'] ) ) {
-			$this->mErrors['title'] = 'You must specify a title';
-		} elseif( !empty( $pParamHash['title']) || !empty($this->mPageName))  {
-			if( !$this->verifyId( $this->mPageId ) ) {
-				if( empty( $pParamHash['title'] ) ) {
-					$this->mErrors['title'] = 'You must enter a name for this page.';
-				} else {
-					$pParamHash['content_store']['title'] = substr( $pParamHash['title'], 0, 160 );
-					if ($gBitSystem->isFeatureActive( 'wiki_allow_dup_page_names')) {
-						# silently allow pages with duplicate names to be created
-					} else {
-						if( $this->pageExists( $pParamHash['title'] ) ) {
-							$this->mErrors['title'] = 'Page "'.$pParamHash['title'].'" already exists. Please choose a different name.';
-						}
-					}
-				}
-			} else {
-				$pParamHash['content_store']['title'] = ( isset( $pParamHash['title'] ) ) ? substr( $pParamHash['title'], 0, 160 ) : $this->mPageName;
-				if ($gBitSystem->isFeatureActive( 'wiki_allow_dup_page_names')) {
-					# silently allow pages with duplicate names to be created
-				} else {
-					if( $gBitUser->hasPermission( 'p_wiki_rename_page' )
-					&& (isset( $this->mInfo['title'] )
-					&& ($pParamHash['title'] != $this->mInfo['title'])) ) {
-						if( $this->pageExists( $pParamHash['title'] ) ) {
-							$this->mErrors['title'] = 'Page "'.$pParamHash['title'].'" already exists. Please choose a different name.';
-						}
-					}
-				}
-			}
-		}
-
-		if( empty( $pParamHash['edit_comment'] ) ) {
-			$pParamHash['page_store']['edit_comment'] = NULL;
-		} else {
-			$pParamHash['page_store']['edit_comment'] = substr( $pParamHash['edit_comment'], 0, 200 );
-		}
-
-		if( !empty( $pParamHash['minor'] ) && $this->isValid() ) {
-			// we can only minor save over our own versions
-			if( !$gBitUser->isRegistered() || ($this->mInfo['modifier_user_id'] != $gBitUser->mUserId && !$gBitUser->isAdmin()) ) {
-				unset( $pParamHash['minor'] );
-			}
-		}
-
-		// if we have an error we get them all by checking parent classes for additional errors
-		if( count( $this->mErrors ) > 0 ){
-			parent::verify( $pParamHash );
-		}
-
-		return( count( $this->mErrors ) == 0 );
-	}
-
-	/**
-	 * Remove page from database
-	 */
-	function expunge() {
-		$ret = FALSE;
-		if( $this->isValid() ) {
-			$this->StartTrans();
-			$this->expungeVersion(); // will nuke all versions
-			$query = "DELETE FROM `".BIT_DB_PREFIX."wiki_pages` WHERE `content_id` = ?";
-			$result = $this->mDb->query( $query, array( $this->mContentId ) );
-			if( LibertyMime::expunge() ) {
-				$ret = TRUE;
-				$this->CompleteTrans();
-			} else {
-				$this->mDb->RollbackTrans();
-			}
-		}
-		return $ret;
-	}
-
-	function isUserPage() {
-		$ret = FALSE;
-		if( $this->mPageName ) {
-			$ret = preg_match( '/^UserPage(.*)/', $this->mPageName, $matches );
-		}
-		return $ret;
-	}
-
-	function isValid() {
-		return( $this->verifyId( $this->mPageId ) );
-	}
-
-	function isLocked() {
-		$ret = FALSE;
-		if( $this->verifyId( $this->mPageId ) ) {
-			if( empty( $this->mInfo ) ) {
-				$this->load();
-			}
-			$ret = $this->getField( 'flag' ) == 'L';
-		}
-		return( $ret );
-	}
-
-	function isCommentable() {
-		global $gBitSystem;
-		return( $gBitSystem->isFeatureActive( 'wiki_comments' ));
-	}
-
-	function setLock( $pLock, $pModUserId=NULL ) {
-		if( $this->verifyId( $this->mPageId ) ) {
-			$bindVars = array();
-			$userSql = '';
-			if( $pModUserId ) {
-				$userSql = "`modifier_user_id`=?, ";
-				array_push( $bindVars, $pModUserId );
-			}
-			array_push( $bindVars, $pLock, $this->mPageId );
-			$query = "update `".BIT_DB_PREFIX."wiki_pages` SET $userSql `flag`=? where `page_id`=?";
-			$result = $this->mDb->query($query, $bindVars );
-			$this->mInfo['flag'] = $pLock;
-		}
-		return true;
-	}
-
-	function lock( $pModUserId=NULL ) {
-		return( $this->setLock( 'L', $pModUserId ) );
-	}
-
-	function unlock( $pModUserId=NULL ) {
-		return( $this->setLock( NULL, $pModUserId ) );
-	}
-
-	// *********  Footnote functions for the wiki ********** //
-	/**
-	 *  Store footnote
-	 */
-	function storeFootnote($pUserId, $pData) {
-		if( $this->verifyId( $this->mPageId ) ) {
-			$querydel = "delete from `".BIT_DB_PREFIX."wiki_footnotes` where `user_id`=? and `page_id`=?";
-			$this->mDb->query( $querydel, array( $pUserId, $this->mPageId ) );
-			$query = "insert into `".BIT_DB_PREFIX."wiki_footnotes`(`user_id`,`page_id`,`data`) values(?,?,?)";
-			$this->mDb->query( $query, array( $pUserId, $this->mPageId, $pData ) );
-		}
-	}
-
-	/**
-	 *  Delete footnote
-	 */
-	function expungeFootnote( $pUserId ) {
-		if( $this->verifyId( $this->mPageId ) ) {
-			$query = "delete from `".BIT_DB_PREFIX."wiki_footnotes` where `user_id`=? and `page_id`=?";
-			$this->mDb->query($query,array($pUserId,$this->mPageId));
-		}
-	}
-
-	/**
-	 *  Get footnote
-	 */
-	function getFootnote( $pUserId ) {
-		if( $this->verifyId( $this->mPageId ) ) {
-			$count = $this->mDb->getOne( "select count(*) from `".BIT_DB_PREFIX."wiki_footnotes` where `user_id`=? and `page_id`=?", array( $pUserId, $this->mPageId ) );
-			if( $count ) {
-				return $this->mDb->getOne("select `data` from `".BIT_DB_PREFIX."wiki_footnotes` where `user_id`=? and `page_id`=?",array( $pUserId, $this->mPageId ) );
-			}
-		}
-	}
-
-	/**
-	* Generates a link to a wiki page within lists of pages
-	* @return the link to display the page.
-	*/
-	function getListLink( $pParamHash ) {
-		return BitPage::getPageLink( $pParamHash['title'], NULL );
-	}
-
-
-	/**
-	* Returns include file that will
-	* @return the fully specified path to file to be included
-	*/
-	function getRenderFile() {
-		return WIKI_PKG_PATH."display_bitpage_inc.php";
-	}
-
-
-	/**
-	 * Returns the center template for the view selected
-	 */
-	function getViewTemplate( $pAction ){
-		$ret = null;
-		switch ( $pAction ){
-			case "view":
-				$ret = "bitpackage:wiki/center_wiki_page.tpl";
-				break;
-			case "list":
-				$ret = "bitpackage:liberty/center_".$pAction."_generic.tpl";
-				break;
-		}
-		return $ret;
-	}
-
-
-	/**
-	 * Create the generic title for a content item
-	 *
-	 * This will normally be overwriten by extended classes to provide
-	 * an appropriate title string
-	 * @return string Descriptive title for the page
-	 */
-	function getTitle() {
-		$ret = $this->getField('title');
-		if( $this->isValid() ) {
-			$ret = static::getTitleFromHash( $this->mInfo );
-			$requestPage = strtoupper( self::getParameter( $_REQUEST, 'page' ) );
-			if( $requestPage && $requestPage != strtoupper( $this->mInfo['title'] ) ) {
-				$aliases = $this->getAliases( TRUE );
-				if( in_array( $requestPage, $aliases ) ) {
-					$ret = $_REQUEST['page'];
-				}
-			}
-		}
-		return $ret;
-	}
-
-	/**
-	* Generates the URL to this wiki page
-	* @param pExistsHash the hash that was returned by LibertyContent::pageExists
-	* @return the link to display the page.
-	*/
-	public static function getDisplayUrlFromHash( &$pParamHash ) {
-		global $gBitSystem;
-		if( !empty( $pParamHash['title'] ) ) {
-			if( $gBitSystem->isFeatureActive( 'pretty_urls' ) || $gBitSystem->isFeatureActive( 'pretty_urls_extended' ) ) {
-				$rewrite_tag = $gBitSystem->isFeatureActive( 'pretty_urls_extended' ) ? 'view/':'';
-				$prettyPageName = preg_replace( '/ /', '+', $pParamHash['title'] );
-				$ret = WIKI_PKG_URL.$rewrite_tag.$prettyPageName;
-			} else {
-				$ret = WIKI_PKG_URL.'index.php?page='.urlencode( $pParamHash['title'] );
-			}
-		} else {
-			$ret = parent::getDisplayUrlFromHash( $pParamHash );
-		}
-
-		return $ret;
-	}
-
-	/**
-	* Returns HTML link to display a page if it exists, or to create if not
-	* @param pExistsHash the hash that was returned by LibertyContent::pageExists
-	* @return the link to display the page.
-	*/
-	public static function getPageLink( $pLinkText=NULL, $pMixed=NULL, $pAnchor=NULL ) {
-		global $gBitSystem, $gBitUser;
-		$ret = $pLinkText;
-		if( $gBitSystem->isPackageActive( 'wiki' ) ) {
-			if( !empty( $pMixed ) && is_array( $pMixed ) ) {
-				if( is_array( current( $pMixed ) ) ) {
-					$exists = $pMixed[0];
-					$multiple = TRUE;
-				} else {
-					$exists = $pMixed;
-					$multiple = FALSE;
-				}
-
-				// we have a multi-demensional array (likely returned from LibertyContent::pageExists() ) - meaning we potentially have multiple pages with the same name
-				if( $multiple ) {
-					$desc = tra( 'Multiple pages with this name' );
-				} else {
-					$desc = empty( $exists['summary'] ) ? $exists['title'] : $exists['summary'];
-				}
-				$ret = '<a title="'.htmlspecialchars( $desc ).'" href="'.BitPage::getDisplayUrlFromHash( $exists ).'">'.htmlspecialchars( $exists['title'] ).'</a>';
-			} else {
-				if( $gBitUser->hasPermission( 'p_wiki_create_page' ) ) {
-					$ret = '<a title="'.tra( "Create the page" ).': '.htmlspecialchars( $pLinkText ).'" href="'.WIKI_PKG_URL.'edit.php?page='.urlencode( $pLinkText ).'" class="create">'.htmlspecialchars( $pLinkText ).'</a>';
-				} else {
-					$ret = $pLinkText;
-				}
-			}
-		}
-		return $ret;
-	}
-
-	/**
-	* Returns content_id's that link to this page
-	* @return hash of content
-	*/
-	function getBacklinks() {
-		if( $this->isValid() ) {
-			$to_title = $this->mInfo['title'];
-			$query = "SELECT lcl.`from_content_id`, lc.`title`
-					  FROM `".BIT_DB_PREFIX."liberty_content_links` lcl INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lcl.`from_content_id`=lc.`content_id`)
-					  WHERE lcl.`to_title` = ? ORDER BY lcl.POS";
-			$ret = $this->mDb->getAssoc( $query, array( $to_title ) );
-			return $ret;
-		}
-	}
-
-
-	/**
-	 * Roll back to a specific version of a page
-	 * @param pVersion Version number to roll back to
-	 * @param comment Comment text to be added to the action log
-	 * @return TRUE if completed successfully
-	 */
-	function rollbackVersion( $pVersion, $comment = '' ) {
-		global $gBitSystem;
-		$ret = FALSE;
-		if( parent::rollbackVersion( $pVersion, $comment ) ) {
-			$action = "Changed actual version to $pVersion";
-			$t = $gBitSystem->getUTCTime();
-			$query = "insert into `".BIT_DB_PREFIX."liberty_action_log`(`log_message`,`content_id`,`last_modified`,`user_id`,`ip`,`error_message`) values(?,?,?,?,?,?)";
-			$result = $this->mDb->query($query,array($action,$this->mContentId,$t,ROOT_USER_ID,$_SERVER["REMOTE_ADDR"],$comment));
-			$ret = TRUE;
-		}
-		return $ret;
-	}
-
-	/**
-	 * getList
-	 *
-	 * @param array $pListHash array of list parameters
-	 * @param boolean $pListHash['orphans_only'] only return orphan wiki pages
-	 * @param boolean $pListHash['extras'] load extra infrmation such as backlinks and links
-	 * @param boolean $pListHash['get_data'] return the wiki page data along with the listed information
-	 * @param string $pListHash['find_title'] filter by the page title
-	 * @param string $pListHash['find_author'] filter by the login name of the page author
-	 * @param string $pListHash['find_last_editor'] filter by the login name of the last editor of the page
-	 * @access public
-	 * @return array of wiki pages
-	 */
-	function getList( &$pListHash ) {
-		global $gBitSystem, $gBitUser;
-		LibertyContent::prepGetList( $pListHash );
-
-		if( $pListHash['sort_mode'] == 'size_asc' || $pListHash['sort_mode'] == 'size_desc' ) {
-			$pListHash['sort_mode'] = str_replace( 'size', 'wiki_page_size', $pListHash['sort_mode'] );
-		}
-
-		$specialSort = array(
-			'versions_desc',
-			'versions_asc',
-			'links_asc',
-			'links_desc',
-			'backlinks_asc',
-			'backlinks_desc'
-		);
-
-		if( in_array( $pListHash['sort_mode'], $specialSort )) {
-			$originalListHash         = $pListHash;
-			// now we can set the new values in the pListHash
-			$pListHash['sort_mode']   = 'modifier_user_desc';
-			$pListHash['offset']      = 0;
-			$pListHash['max_records'] = -1;
-		}
-
-		$whereSql = $joinSql = $selectSql = '';
-		$bindVars = array();
-		$this->getServicesSql( 'content_list_sql_function', $selectSql, $joinSql, $whereSql, $bindVars, NULL, $pListHash );
-
-		if ( !empty( $pListHash['content_type_guid'] ) ) {
-			$whereSql .= " AND lc.`content_type_guid`=? ";
-			$bindVars[] = $pListHash['content_type_guid'];
-		}
-
-		// make find_title compatible with {minifind}
-		if( empty( $pListHash['find_title'] )) {
-			$pListHash['find_title'] = $pListHash['find'];
-		}
-
-		// use an array or string to search for wiki page titles
-		if( is_array( $pListHash['find_title'] )) {
-			$whereSql .= " AND lc.`title` IN (".implode(',',array_fill( 0, count( $pListHash['find_title'] ), '?' )).")";
-			$bindVars = array_merge( $bindVars, $pListHash['find_title'] );
-		} elseif( !empty( $pListHash['find_title'] ) && is_string( $pListHash['find_title'] )) {
-			$whereSql .= " AND UPPER(lc.`title`) LIKE ? ";
-			$bindVars = array_merge( $bindVars, array( '%'.strtoupper( $pListHash['find_title'] ) . '%' ));
-		}
-
-		// limit by user id
-		if( @BitBase::verifyId( $pListHash['user_id'] )) {
-			$whereSql .= " AND lc.`user_id` = ? ";
-			$bindVars = array_merge( $bindVars, array( $pListHash['user_id'] ));
-		}
-
-		// filter pages by author login
-		if( !empty( $pListHash['find_author'] )) {
-			$whereSql .= " AND UPPER(uuc.`login`) = ? ";
-			$bindVars = array_merge( $bindVars, array( strtoupper( $pListHash['find_author'] )));
-		}
-
-		// filter pages by last editor
-		if( !empty( $pListHash['find_last_editor'] )) {
-			$whereSql .= " AND UPPER(uue.`login`) = ? ";
-			$bindVars = array_merge( $bindVars, array( strtoupper( $pListHash['find_last_editor'] )));
-		}
-
-		$get_data = '';
-		if( !empty( $pListHash['get_data'] )) {
-			$get_data = ', lc.`data`';
-		}
-
-		if( empty( $pListHash['orphans_only'] )) {
-			$whereSql =  preg_replace('/^ AND */',' WHERE ', $whereSql);
-			$query = "SELECT
-					uue.`login` AS modifier_user, uue.`real_name` AS modifier_real_name, uuc.`login` AS creator_user, uuc.`real_name` AS creator_real_name,
-					wp.`page_id`, wp.`wiki_page_size` as `len`, lcds.`data` AS `summary`, wp.`edit_comment`, wp.`content_id`, wp.`flag`,
-					lc.`title`, lc.`format_guid`, lc.`last_modified`, lc.`created`, lc.`ip`, lc.`version`,
-					lch.`hits` $get_data $selectSql
-				FROM `".BIT_DB_PREFIX."wiki_pages` wp
-					INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id` = wp.`content_id`)
-					INNER JOIN `".BIT_DB_PREFIX."users_users` uuc ON ( uuc.`user_id` = lc.`user_id` )
-					INNER JOIN `".BIT_DB_PREFIX."users_users` uue ON ( uue.`user_id` = lc.`modifier_user_id` )
-					LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_data` lcds ON (lc.`content_id` = lcds.`content_id` AND lcds.`data_type`='summary')
-					LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_hits` lch ON (lc.`content_id` = lch.`content_id`)
-					$joinSql
-				$whereSql
-				ORDER BY ".$this->mDb->convertSortmode( $pListHash['sort_mode'] );
-			$query_cant = "
-				SELECT COUNT(*)
-				FROM `".BIT_DB_PREFIX."wiki_pages` wp
-					INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id` = wp.`content_id`)
-					INNER JOIN `".BIT_DB_PREFIX."users_users` uuc ON ( uuc.`user_id` = lc.`user_id` )
-					INNER JOIN `".BIT_DB_PREFIX."users_users` uue ON ( uue.`user_id` = lc.`modifier_user_id` )
-					$joinSql
-				$whereSql
-				";
-		} else {
-			$whereSql .= ' AND lcl.`to_content_id` is NULL ';
-			$whereSql =  preg_replace('/^ AND */',' WHERE ', $whereSql);
-			$query = "SELECT
-					uue.`login` AS modifier_user, uue.`real_name` AS modifier_real_name, uuc.`login` AS creator_user, uuc.`real_name` AS creator_real_name,
-					wp.`page_id`, wp.`wiki_page_size` AS `len`,lcds.`data` AS `summary`, wp.`edit_comment`, wp.`content_id`, wp.`flag`,
-					lc.`title`, lc.`format_guid`, lc.`last_modified`, lc.`created`, lc.`ip`, lc.`version`,
-					lch.`hits` $get_data $selectSql
-				FROM `".BIT_DB_PREFIX."wiki_pages` wp
-					INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id` = wp.`content_id`)
-					INNER JOIN `".BIT_DB_PREFIX."users_users` uuc ON ( uuc.`user_id` = lc.`user_id` )
-					INNER JOIN `".BIT_DB_PREFIX."users_users` uue ON ( uue.`user_id` = lc.`user_id` )
-					LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_links` lcl ON (wp.`content_id` = lcl.`to_content_id`)
-					LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_hits` lch ON (lc.`content_id` = lch.`content_id`)
-					LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_data` lcds ON (lc.`content_id` = lcds.`content_id` AND lcds.`data_type`='summary')
-					$joinSql
-				$whereSql
-				ORDER BY ".$this->mDb->convertSortmode( $pListHash['sort_mode'] );
-			$query_cant = "
-				SELECT COUNT(*)
-				FROM `".BIT_DB_PREFIX."wiki_pages` wp
-					LEFT JOIN `".BIT_DB_PREFIX."liberty_content_links` lcl ON (wp.`content_id` = lcl.`to_content_id`)
-					INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id` = wp.`content_id`)
-					$joinSql
-				$whereSql";
-		}
-
-		// If sort mode is versions then offset is 0, max_records is -1 (again) and sort_mode is nil
-		// If sort mode is links then offset is 0, max_records is -1 (again) and sort_mode is nil
-		// If sort mode is backlinks then offset is 0, max_records is -1 (again) and sort_mode is nil
-
-		$ret = array();
-		$this->StartTrans();
-
-		# get count of total number of items available
-		$cant = $this->mDb->getOne( $query_cant, $bindVars );
-		$pListHash["cant"] = $cant;
-
-		# Check for offset out of range
-		if ( $pListHash['offset'] < 0 ) {
-			$pListHash['offset'] = 0;
-		} elseif ( $pListHash['offset']	> $pListHash["cant"] ) {
-			$lastPageNumber = ceil ( $pListHash["cant"] / $pListHash['max_records'] ) - 1;
-			$pListHash['offset'] = $pListHash['max_records'] * $lastPageNumber;
-		}
-
-		$result = $this->mDb->query( $query, $bindVars, $pListHash['max_records'], $pListHash['offset'] );
-		$this->CompleteTrans();
-		while( $res = $result->fetchRow() ) {
-			$aux = array();
-			$aux = $res;
-			$aux['creator'] = (isset( $res['creator_real_name'] ) ? $res['creator_real_name'] : $res['creator_user'] );
-			$aux['editor'] = (isset( $res['modifier_real_name'] ) ? $res['modifier_real_name'] : $res['modifier_user'] );
-			$aux['flag'] = $res["flag"] == 'L' ? 'locked' : 'unlocked';
-			$aux['display_url'] = static::getDisplayUrlFromHash( $aux );
-			// display_link does not seem to be used when getList is called
-			//$aux['display_link'] = $this->getDisplayLink( $aux['title'] ); //WIKI_PKG_URL."index.php?page_id=".$res['page_id'];
-			if( !empty( $pListHash['extras'] )) {
-				// USE SPARINGLY!!! This gets expensive fast
-//				$aux['versions"]  = $this->mDb->getOne( "SELECT COUNT(*) FROM `".BIT_DB_PREFIX."liberty_content_history` WHERE `page_id`=?", array( $res["page_id"] ));
-				$aux['links']     = $this->mDb->getOne( "SELECT COUNT(*) FROM `".BIT_DB_PREFIX."liberty_content_links` WHERE `from_content_id`=?", array( $res["content_id"] ));
-				$aux['backlinks'] = $this->mDb->getOne( "select COUNT(*) FROM `".BIT_DB_PREFIX."liberty_content_links` WHERE `to_title`=?", array( $aux['title'] ));
-			}
-			$ret[] = $aux;
-		}
-
-		// apply the custom sorting options if needed
-		if( !empty( $originalListHash )) {
-			if( $originalListHash['sort_mode'] == 'versions_asc' && !empty( $ret['versions'] )) {
-				usort( $ret, 'compare_versions');
-			} elseif( $originalListHash['sort_mode'] == 'versions_desc' && !empty( $ret['versions'] )) {
-				usort( $ret, 'r_compare_versions');
-			} elseif( $originalListHash['sort_mode'] == 'links_desc' && !empty( $ret['links'] )) {
-				usort( $ret, 'compare_links');
-			} elseif( $originalListHash['sort_mode'] == 'links_asc' && !empty( $ret['links'] )) {
-				usort( $ret, 'r_compare_links');
-			} elseif( $originalListHash['sort_mode'] == 'backlinks_desc' && !empty( $ret['backlinks'] )) {
-				usort($ret, 'compare_backlinks');
-			} elseif( $originalListHash['sort_mode'] == 'backlinks_asc' && !empty( $ret['backlinks'] )) {
-				usort($ret, 'r_compare_backlinks');
-			}
-
-			// return only requested values
-			if( in_array( $originalListHash['sort_mode'], $specialSort )) {
-				$ret = array_slice( $ret, $originalListHash['offset'], $originalListHash['max_records'] );
-			}
-
-			// load original listHash
-			$pListHash = $originalListHash;
-		}
-
-		LibertyContent::postGetList( $pListHash );
-
-		return $ret;
-	}
-
-	/* Update a page
-	 * $pHashOld the where conmdition : page_id
-	 * $pHashNew the new fields: title, data
-	 */
-	function update( $pHashOld, $pHashNew) {
-		$set = array();
-		$where = array();
-		if (!empty($pHashNew['title'])) {
-			$set[] = "lc.`title`=?";
-			$bindVars[] = $pHashNew['title'];
-		}
-		if (!empty($pHashNew['data'])) {
-			$set[] = "lc.`data`=?";
-			$bindVars[] = $pHashNew['data'];
-		}
-		if (!empty($pHashOld['page_id'])) {
-			$where[] = "wp.`page_id`=?";
-			$bindVars[] = $pHashOld['page_id'] ;
-		}
-		if (empty($where)) {
-			$this->mErrors['page_id'] = "You must specify a where condition";
-			return false;
-		}
-
-		$query = "update `".BIT_DB_PREFIX."liberty_content` lc
-			LEFT JOIN `".BIT_DB_PREFIX."wiki_pages` wp on (wp.`content_id`= lc.`content_id`)
-			SET ".implode(',', $set)."
-			WHERE ".implode (" AND ", $where);
-		$this->mDb->query( $query, $bindVars);
-		return true;
-	}
-
-	// ...page... functions
-	function countSubPages( $pData ) {
-		return(( preg_match_all( '/'.( defined( 'PAGE_SEP' ) ? preg_quote( PAGE_SEP ) : '\.\.\.page\.\.\.').'/', $pData, $matches ) + 1 ));
-	}
-
-	/**
-	 * getSubPage
-	 *
-	 * @param array $pData
-	 * @param array $pPageNumber
-	 * @access public
-	 * @return string SubPage
-	 */
-	function getSubPage( $pData, $pPageNumber ) {
-		// Get slides
-		$parts = explode( defined( 'PAGE_SEP' ) ? PAGE_SEP : "...page...", $pData );
-		if( substr( $parts[$pPageNumber - 1], 1, 5 ) == "<br/>" ) {
-			$ret = substr( $parts[$pPageNumber - 1], 6 );
-		} else {
-			$ret = $parts[$pPageNumber - 1];
-		}
-		return $ret;
-	}
-
-	/**
-	 * getLikePages Like pages are pages that share a word in common with the current page
-	 *
-	 * @param array $pPageTitle
-	 * @access public
-	 * @return boolean TRUE on success, FALSE on failure - $this->mErrors will contain reason for failure
-	 */
-	function getLikePages( $pPageTitle ) {
-		$ret = array();
-		if( !empty( $pPageName ) ) {
-			preg_match_all("/([A-Z])([a-z]+)/", $pPageTitle, $words);
-			// Add support to ((x)) in either strict or full modes
-			preg_match_all("/(([A-Za-z]|[\x80-\xFF])+)/", $pPageTitle, $words2);
-			$words = array_unique(array_merge($words[0], $words2[0]));
-			$exps = array();
-			$bindVars=array();
-			foreach ($words as $word) {
-				$exps[] = "`title` like ?";
-				$bindVars[] = "%$word%";
-			}
-			$selectSql = '';
-			$joinSql = '';
-			$whereSql = implode(" or ", $exps);
-			array_push( $bindVars, $this->mContentTypeGuid );
-			$this->getServicesSql( 'content_list_sql_function', $selectSql, $joinSql, $whereSql, $bindVars );
-
-			$query = "SELECT lc.`title` FROM `".BIT_DB_PREFIX."wiki_pages` wp INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id` = wp.`content_id`) $join WHERE $whereSql";
-			$result = $this->mDb->query($query,$bindVars);
-			while ($res = $result->fetchRow()) {
-				$ret[] = $res["title"];
-			}
-		}
-		return $ret;
-	}
-
-	/**
-	 * getStats getStats is always used by the stats package to display various stats of your package.
-	 *
-	 * @access public
-	 * @return boolean TRUE on success, FALSE on failure - $this->mErrors will contain reason for failure
-	 */
-	function getStats() {
-		global $gBitSystem;
-		$ret = array();
-
-		$query = "SELECT COUNT(*) FROM `".BIT_DB_PREFIX."wiki_pages`";
-		$ret['pages'] = array(
-			'label' => "Number of pages",
-			'value' => $this->mDb->getOne( $query ),
-		);
-
-		$listHash = array( 'orphans_only' => TRUE );
-		$this->getList( $listHash );
-		$ret['orphans'] = array(
-			'label' => 'Orphan Pages',
-			'value' => $listHash['listInfo']['total_records'],
-		);
-
-		$query = "SELECT SUM(`wiki_page_size`) FROM `".BIT_DB_PREFIX."wiki_pages`";
-		$ret['size'] = array(
-			'label' => "Combined size",
-			'value' => $this->mDb->getOne( $query ),
-			'modifier' => 'display_bytes',
-		);
-
-		$ret['average_size'] = array(
-			'label' => 'Average page size',
-			'value' => $ret['size']['value'] / $ret['pages']['value'],
-			'modifier' => 'display_bytes',
-		);
-
-		$query = "
-			SELECT COUNT(*)
-			FROM `".BIT_DB_PREFIX."liberty_content_history` lch
-			INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON( lch.`content_id` = lc.`content_id` )
-			WHERE lc.`content_type_guid` = ?";
-		$ret['versions'] = array(
-			'label' => "Versions",
-			'value' => $this->mDb->getOne( $query, array( BITPAGE_CONTENT_TYPE_GUID )),
-		);
-
-		$ret['average_versions'] = array(
-			'label' => 'Average versions per page',
-			'value' => round( $ret['versions']['value'] / $ret['pages']['value'], 3 ),
-		);
-
-		$query = "
-			SELECT COUNT(*) FROM `".BIT_DB_PREFIX."liberty_content_links` lcl
-			INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON( lcl.`from_content_id` = lc.`content_id` OR lcl.`from_content_id` = lc.`content_id` )
-			WHERE lc.`content_type_guid` = ?";
-		$ret['links'] = array(
-			'label' => "Total wiki links",
-			'value' => $this->mDb->getOne( $query, array( BITPAGE_CONTENT_TYPE_GUID )),
-		);
-
-		$ret['average_links'] = array(
-			'label' => 'Average links per page',
-			'value' => round( $ret['links']['value'] / $ret['pages']['value'], 3 ),
-		);
-
-		return $ret;
-	}
-
-	// {{{ ==================================== GraphViz wiki graph methods ====================================
-	/**
-	 * linkStructureGraph
-	 *
-	 * @param array $pLinkStructure
-	 * @param array $pParams
-	 * @param array $pGraphViz
-	 * @access public
-	 * @return boolean TRUE on success, FALSE on failure - $this->mErrors will contain reason for failure
-	 */
-	function linkStructureGraph( $pLinkStructure = array(), $pParams = array(), &$pGraphViz ) {
-		if( !empty( $pLinkStructure ) && !empty( $pGraphViz )) {
-			$pParams['graph']['URL'] = WIKI_PKG_URL.'index.php';
-			$pGraphViz->addAttributes( $pParams['graph'] );
-			$pLinkStructure['title'] = $pLinkStructure['name'];
-			$pParams['node']['URL'] = static::getDisplayUrlFromHash( $pLinkStructure );
-			$pGraphViz->addNode( $pLinkStructure['name'], $pParams['node'] );
-
-			foreach( $pLinkStructure['pages'] as $node ) {
-				$this->linkStructureGraph( $node, $pParams, $pGraphViz );
-				$pGraphViz->addEdge( array( $pLinkStructure['name'] => $node['name'] ), $pParams['node'] );
-			}
-		}
-	}
-
-	/**
-	 * linkStructureMap
-	 *
-	 * @param array $pPageName
-	 * @param int $pLevel
-	 * @param array $pParams
-	 * @access public
-	 * @return boolean TRUE on success, FALSE on failure - $this->mErrors will contain reason for failure
-	 */
-	function linkStructureMap( $pPageName, $pLevel = 0, $pParams = array() ) {
-		if( !empty( $pPageName ) && @include_once( 'Image/GraphViz.php' )) {
-			$graph = new Image_GraphViz();
-			$this->linkStructureGraph( $this->getLinkStructure( $pPageName, $pLevel ), $pParams, $graph );
-			return $graph->fetch( 'cmap' );
-		}
-	}
-
-	/**
-	 * getLinkStructure
-	 *
-	 * @param array $pPageName
-	 * @param float $pLevel
-	 * @access public
-	 * @return boolean TRUE on success, FALSE on failure - $this->mErrors will contain reason for failure
-	 */
-	function getLinkStructure( $pPageName, $pLevel = 0 ) {
-		$query = "
-			SELECT lc2.`title`
-			FROM `".BIT_DB_PREFIX."liberty_content_links` lcl
-			INNER JOIN liberty_content lc1 ON( lc1.`content_id` = lcl.`from_content_id` AND lc1.`content_status_id` > 49 )
-			INNER JOIN liberty_content lc2 ON( lc2.`content_id` = lcl.`to_content_id` AND lc2.`content_status_id` > 49 )
-			WHERE lc1.`title` = ? AND lcl.`from_content_id` <> lcl.`to_content_id`";
-		$result = $this->mDb->query( $query, array( $pPageName ));
-
-		$ret['pages'] = array();
-		$ret['name']  = $pPageName;
-
-		while( $res = $result->fetchRow() ) {
-			if( !empty( $pLevel )) {
-				$ret['pages'][] = $this->getLinkStructure( $res['title'], $pLevel - 1 );
-			} else {
-				$ret['pages'][] = array(
-					'name'  => $res['title'],
-					'pages' => array(),
-				);
-			}
-		}
-		return $ret;
-	}
-	// }}}
-}
-
-/* vim: :set fdm=marker : */
-?>
diff --git a/admin/pump_wiki_inc.php b/admin/pump_wiki_inc.php
index 92a6afa..ba4c01e 100644
--- a/admin/pump_wiki_inc.php
+++ b/admin/pump_wiki_inc.php
@@ -7,7 +7,7 @@
 /**
  * required setup
  */
-require_once( WIKI_PKG_PATH.'BitPage.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 
 $tutorial_intro = '^This tutorial does not contain any direct links to any particular pages. This is to help you understand how to navigate bitweaver. If you don\'t feel confident about finding your way back to this page, it might be useful to open a second browser window to carry out these instructions or print this page before continuing.
 
diff --git a/display_bitpage_inc.php b/display_bitpage_inc.php
index ba8e63b..eaa118c 100644
--- a/display_bitpage_inc.php
+++ b/display_bitpage_inc.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-include_once( WIKI_PKG_PATH.'BitBook.php');
+include_once( WIKI_PKG_CLASS_PATH.'BitBook.php');
 
 $gBitSystem->verifyPackage( 'wiki' );
 
diff --git a/export_lib.php b/export_lib.php
index 58f9377..e63877c 100644
--- a/export_lib.php
+++ b/export_lib.php
@@ -13,7 +13,7 @@
  * required setup
  */
 require_once( KERNEL_PKG_PATH.'BitBase.php' );
-require_once( WIKI_PKG_PATH.'BitPage.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 /**
  * @package wiki
  * @subpackage ExportLib
diff --git a/includes/classes/BitBook.php b/includes/classes/BitBook.php
new file mode 100644
index 0000000..a028742
--- /dev/null
+++ b/includes/classes/BitBook.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * BitBook class
+ *
+ * @author   spider <spider@steelsun.com>
+ * @version  $Revision: 1.14 $
+ * @package  wiki
+ */
+// +----------------------------------------------------------------------+
+// | Copyright (c) 2004, 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
+// |
+// | For comments, please use phpdocu.sourceforge.net documentation standards!!!
+// | -> see http://phpdocu.sourceforge.net/
+// +----------------------------------------------------------------------+
+// | Authors: spider <spider@steelsun.com>
+// +----------------------------------------------------------------------+
+//
+// $Id: BitBook.php,v 1.14 2010/04/17 22:46:11 wjames5 Exp $
+
+
+/**
+ * required setup
+ */
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
+require_once( LIBERTY_PKG_PATH.'LibertyStructure.php' );
+
+define('BITBOOK_CONTENT_TYPE_GUID', 'bitbook' );
+
+/**
+ * BitBook class
+ *
+ * @abstract
+ * @author   spider <spider@steelsun.com>
+ * @version  $Revision: 1.14 $
+ * @package  wiki
+ */
+class BitBook extends BitPage {
+	public $mPageId;
+	public $mPageName;
+	function __construct( $pPageId=NULL, $pContentId=NULL ) {
+		parent::__construct( $pPageId, $pContentId );
+		$this->registerContentType( BITBOOK_CONTENT_TYPE_GUID, array(
+			'content_type_guid' => BITBOOK_CONTENT_TYPE_GUID,
+			'content_name' => 'Wiki Book',
+			'handler_class' => 'BitBook',
+			'handler_package' => 'wiki',
+			'handler_file' => 'BitBook.php',
+			'maintainer_url' => 'http://www.bitweaver.org'
+		) );
+		$this->mContentTypeGuid = BITBOOK_CONTENT_TYPE_GUID;
+
+		// Permission setup
+		$this->mCreateContentPerm  = 'p_wiki_create_book';
+		$this->mUpdateContentPerm  = 'p_wiki_update_book';
+		$this->mAdminContentPerm = 'p_wiki_admin_book';
+	}
+
+	function getList( &$pListHash ) {
+		$struct = new LibertyStructure();
+		$pListHash['content_type_guid'] = $this->mContentTypeGuid;
+		return $struct->getList( $pListHash );
+	}
+
+	function getStats() {
+		return FALSE;
+	}
+}
+?>
diff --git a/includes/classes/BitPage.php b/includes/classes/BitPage.php
new file mode 100644
index 0000000..7a3680b
--- /dev/null
+++ b/includes/classes/BitPage.php
@@ -0,0 +1,1065 @@
+<?php
+/**
+ * @package wiki
+ * @author spider <spider@steelsun.com>
+ *
+ * Copyright (c) 2004 bitweaver.org
+ * Copyright (c) 2003 tikwiki.org
+ * Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
+ * 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
+ */
+require_once( LIBERTY_PKG_PATH.'LibertyMime.php' );
+
+/**
+ * @package wiki
+ */
+class BitPage extends LibertyMime implements BitCacheable {
+	public $mPageId;
+	public $mPageName;
+
+	function __construct( $pPageId=NULL, $pContentId=NULL ) {
+		parent::__construct();
+		$this->registerContentType( BITPAGE_CONTENT_TYPE_GUID, array(
+				'content_type_guid' => BITPAGE_CONTENT_TYPE_GUID,
+				'content_name' => 'Wiki Page',
+				'handler_class' => 'BitPage',
+				'handler_package' => 'wiki',
+				'handler_file' => 'BitPage.php',
+				'maintainer_url' => 'http://www.bitweaver.org'
+			) );
+		$this->mPageId = (int)$pPageId;
+		$this->mContentId = (int)$pContentId;
+		$this->mContentTypeGuid = BITPAGE_CONTENT_TYPE_GUID;
+
+		// Permission setup
+		$this->mViewContentPerm  = 'p_wiki_view_page';
+		$this->mCreateContentPerm = 'p_wiki_create_page';
+		$this->mUpdateContentPerm  = 'p_wiki_update_page';
+		$this->mAdminContentPerm = 'p_wiki_admin';
+	}
+
+	public static function isCacheableClass() {
+		return true;
+	}
+
+	public function isCacheableObject() {
+		return true;
+	}
+
+	public static function getCacheClass() {
+		return 'BitPage';
+	}
+
+	public function __sleep() {
+		return array_merge( parent::__sleep(), array( 'mPageId', 'mPageName' ) );
+	}
+
+	public static function findContentIdByPageId( $pPageId ) {
+		global $gBitDb;
+		$ret = NULL;
+		if( BitBase::verifyId( $pPageId ) ) {
+			$ret = $gBitDb->getOne( "SELECT `content_id` FROM `".BIT_DB_PREFIX."wiki_pages` WHERE `page_id`=?", array( (int)$pPageId ) );
+		}
+		return $ret;
+	}
+
+	function findByPageName( $pPageName, $pUserId=NULL ) {
+		$userWhere = '';
+		$bindVars = array( $pPageName, $this->mContentTypeGuid );
+		if( @BitBase::verifyId( $pUserId ) ) {
+			$userWhere = " AND lc.`user_id`=?";
+			array_push( $bindVars, $pUserId );
+		}
+		$ret = $this->mDb->getOne("select `page_id` from `".BIT_DB_PREFIX."wiki_pages` wp INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id` = wp.`content_id`) where lc.`title`=? AND lc.`content_type_guid`=? $userWhere", $bindVars );
+		return $ret;
+	}
+
+	public static function lookupObject( $pLookupHash ) {
+		if( !empty( $pLookupHash['page_id'] ) )  {
+			$loadContentId = BitPage::findContentIdByPageId( $pLookupHash['page_id'] );
+		} elseif( !empty( $pLookupHash['content_id'] ) ) {
+			$loadContentId = $pLookupHash['content_id'];
+		} elseif( !empty( $pLookupHash['page'] ) ) {
+			//handle legacy forms that use plain 'page' form variable name
+
+			//if page had some special enities they were changed to HTML for for security reasons.
+			//now we deal only with string so convert it back - so we can support this case:
+			//You&Me --(detoxify in kernel)--> You&amp;Me --(now)--> You&Me
+			//we could do htmlspecialchars_decode but it allows <> marks here, so we just transform &amp; to & - it's not so scary.
+			$loadPage = str_replace("&amp;", "&", $pLookupHash['page'] );
+			// Fix nignx mapping of '+' sign when doing rewrite
+			$loadPage = str_replace("+", " ", $loadPage );
+
+			if( $loadPage && $existsInfo = static::pageExists( $loadPage ) ) {
+				if (count($existsInfo)) {
+					if (count($existsInfo) > 1) {
+						// Perhaps something should be done on page conflicts
+					}
+					$loadPageId = $existsInfo[0]['page_id'];
+					$loadContentId = $existsInfo[0]['content_id'];
+				}
+			}
+		}
+
+		if( !empty( $loadContentId ) ) {
+			$ret = static::getLibertyObject( $loadContentId );
+		}
+
+		if( empty( $ret ) || !is_object( $ret ) ) {
+			$ret = new self();
+		}
+		return $ret;
+	}
+
+	/**
+	 * Determines if a wiki page (row in wiki_pages) exists, and returns a hash of important info. If N pages exists with $pPageName, returned existsHash has a row for each unique pPageName row.
+	 * @param pPageName name of the wiki page
+	 * @param pCaseSensitive look for case sensitive names
+	 * @param pContentId if you insert the content id of the currently viewed content, non-existing links can be created immediately
+	 */
+	public static function pageExists( $pPageName, $pCaseSensitive=FALSE, $pContentId=NULL ) {
+		global $gBitSystem;
+		$ret = NULL;
+
+		if( $gBitSystem->isPackageActive( 'wiki' ) ) {
+			$columnExpression = $gBitSystem->mDb->getCaseLessColumn('lc.title');
+
+			$pageWhere = $pCaseSensitive ? 'lc.`title`' : $columnExpression;
+			$bindVars = array( ($pCaseSensitive ? $pPageName : strtoupper( $pPageName ) ) );
+			$query = "SELECT `page_id`, wp.`content_id`, lcds.`data` AS `summary`, lc.`last_modified`, lc.`title`
+				FROM `".BIT_DB_PREFIX."wiki_pages` wp
+					INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id`=wp.`content_id`)
+					LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_data` lcds ON (lc.`content_id` = lcds.`content_id` AND lcds.`data_type`='summary')
+				WHERE $pageWhere = ?";
+			if( !$ret = $gBitSystem->mDb->getAll( $query, $bindVars ) ) {
+				$query = "SELECT `page_id`, wp.`content_id`, lcds.`data` AS `summary`, lc.`last_modified`, lc.`title`, lal.`alias_title`
+					FROM `".BIT_DB_PREFIX."wiki_pages` wp
+						INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id`=wp.`content_id`)
+						INNER JOIN `".BIT_DB_PREFIX."liberty_aliases` lal ON (lc.`content_id`=lal.`content_id`)
+						LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_data` lcds ON (lc.`content_id` = lcds.`content_id` AND lcds.`data_type`='summary')
+					WHERE ".$gBitSystem->mDb->getCaseLessColumn('lal.alias_title')." = ?";
+				$ret = $gBitSystem->mDb->getAll( $query, $bindVars );
+			}
+		}
+		return $ret;
+	}
+
+	/**
+	 * load
+	 *
+	 * @access public
+	 * @return TRUE on success, FALSE on failure - mErrors will contain reason for failure
+	 */
+	function load( $pContentId=NULL, $pPluginParams = TRUE ) {
+		if( $this->verifyId( $this->mPageId ) || $this->verifyId( $this->mContentId ) ) {
+			global $gBitSystem;
+
+			$lookupColumn = @BitBase::verifyId( $this->mPageId ) ? 'page_id' : 'content_id';
+			$parse = ( !isset( $pPluginParams['parse'] ) or $pPluginParams['parse'] ) ? true : false;
+			$bindVars = array(); $selectSql = ''; $joinSql = ''; $whereSql = '';
+			array_push( $bindVars, $lookupId = @BitBase::verifyId( $this->mPageId )? $this->mPageId : $this->mContentId );
+			$this->getServicesSql( 'content_load_sql_function', $selectSql, $joinSql, $whereSql, $bindVars );
+
+			$query = "
+				SELECT wp.*, lc.*, lcds.`data` AS `summary`,
+				uue.`login` AS modifier_user, uue.`real_name` AS modifier_real_name,
+				uuc.`login` AS creator_user, uuc.`real_name` AS creator_real_name $selectSql
+				FROM `".BIT_DB_PREFIX."wiki_pages` wp
+					INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id` = wp.`content_id`) $joinSql
+					LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_data` lcds ON (lc.`content_id` = lcds.`content_id` AND lcds.`data_type`='summary')
+					LEFT JOIN `".BIT_DB_PREFIX."users_users` uue ON (uue.`user_id` = lc.`modifier_user_id`)
+					LEFT JOIN `".BIT_DB_PREFIX."users_users` uuc ON (uuc.`user_id` = lc.`user_id`)
+				WHERE wp.`$lookupColumn`=? $whereSql";
+			if( $this->mInfo = $this->mDb->getRow( $query, $bindVars ) ) {
+				$this->mContentId = $this->mInfo['content_id'];
+				$this->mPageId = $this->mInfo['page_id'];
+				$this->mPageName = $this->mInfo['title'];
+				$this->mInfo['display_url'] = $this->getDisplayUrl( $this->mPageName );
+
+				// TODO: this is a bad habbit and should not be done BitUser::getDisplayName sorts out what name to display
+				$this->mInfo['creator'] = (isset( $this->mInfo['creator_real_name'] ) ? $this->mInfo['creator_real_name'] : $this->mInfo['creator_user'] );
+				$this->mInfo['editor'] = (isset( $this->mInfo['modifier_real_name'] ) ? $this->mInfo['modifier_real_name'] : $this->mInfo['modifier_user'] );
+
+				// Save some work if wiki_attachments are not active
+				// get prefs before we parse the data that we know how to parse the data
+				if( $gBitSystem->isFeatureActive( 'wiki_attachments' ) ) {
+					LibertyMime::load();
+				} else {
+					LibertyContent::load();
+				}
+
+				if ( $parse ) {
+					$this->getParsedData();
+				}
+			} else {
+				$this->mPageId = NULL;
+			}
+		}
+		return( count( $this->mInfo ) );
+	}
+
+	/**
+	* This is the ONLY method that should be called in order to store (create or update) a wiki page!
+	* It is very smart and will figure out what to do for you. It should be considered a black box.
+	*
+	* @param array pParams hash of values that will be used to store the page
+	*
+	* @return bool TRUE on success, FALSE if store could not occur. If FALSE, $this->mErrors will have reason why
+	*
+	* @access public
+	**/
+	function store( &$pParamHash ) {
+		$this->StartTrans();
+
+		if( $this->verify( $pParamHash ) && LibertyMime::store( $pParamHash ) ) {
+			$pParamHash['page_store']['wiki_page_size'] = !empty( $pParamHash['edit'] ) ? strlen( $pParamHash['edit'] ) : 0;
+
+			$table = BIT_DB_PREFIX."wiki_pages";
+			if( $this->verifyId( $this->mPageId ) ) {
+				$result = $this->mDb->associateUpdate( $table, $pParamHash['page_store'], array( "page_id" => $this->mPageId ) );
+			} else {
+				$pParamHash['page_store']['content_id'] = $pParamHash['content_id'];
+				if( @$this->verifyId( $pParamHash['page_id'] ) ) {
+					// if pParamHash['page_id'] is set, some is requesting a particular page_id. Use with caution!
+					$pParamHash['page_store']['page_id'] = $pParamHash['page_id'];
+				} else {
+					$pParamHash['page_store']['page_id'] = $this->mDb->GenID( 'wiki_pages_page_id_seq');
+				}
+				$this->mPageId = $pParamHash['page_store']['page_id'];
+
+				$result = $this->mDb->associateInsert( $table, $pParamHash['page_store'] );
+			}
+			// Access new data for notifications
+			$this->load();
+
+			if( isset( $mailEvents ) ) {
+				global $notificationlib, $gBitUser, $gBitSystem, $gBitSmarty;
+				include_once( KERNEL_PKG_PATH.'notification_lib.php' );
+				$notificationlib->post_content_event($this->mContentId, $this->mInfo['content_type_guid'], 'wiki', $this->mInfo['title'], $this->mInfo['modifier_user'], $this->mInfo['edit_comment'], $this->mInfo['data']);
+
+				if( $gBitSystem->isFeatureActive( 'users_watches') ) {
+					$nots = $gBitUser->get_event_watches( 'wiki_page_changed', $this->mPageId );
+
+					foreach ($nots as $not) {
+#						if ($wiki_watch_editor != 'y' && $not['user_id'] == $user)
+#							break;
+						$gBitSmarty->assign('mail_site', $_SERVER["SERVER_NAME"]);
+
+						$gBitSmarty->assign('mail_page', $this->mInfo['title']);
+						$gBitSmarty->assign('mail_date', $gBitSystem->getUTCTime());
+						$gBitSmarty->assign('mail_user', $this->mInfo['modifier_user']);
+						$gBitSmarty->assign('mail_comment', $this->mInfo['edit_comment']);
+						$gBitSmarty->assign('mail_last_version', $this->mInfo['version'] - 1);
+						$gBitSmarty->assign('mail_data', $this->mInfo['data']);
+						$gBitSmarty->assign('mail_hash', $not['hash']);
+						$foo = parse_url($_SERVER["REQUEST_URI"]);
+						$machine = httpPrefix();
+						$gBitSmarty->assign('mail_machine', $machine);
+						$parts = explode('/', $foo['path']);
+
+						if (count($parts) > 1)
+							unset ($parts[count($parts) - 1]);
+
+						$gBitSmarty->assign('mail_machine_raw', httpPrefix(). implode('/', $parts));
+						$gBitSmarty->assign('mail_pagedata', $this->mInfo['data']);
+						$mail_data = $gBitSmarty->fetch('bitpackage:wiki/user_watch_wiki_page_changed.tpl');
+						$email_to = $not['email'];
+						@mail($email_to, tra('Wiki page'). ' ' . $this->mInfo['title'] . ' ' . tra('changed'), $mail_data, "From: ".$gBitSystem->getConfig( 'site_sender_email' )."\r\nContent-type: text/plain;charset=utf-8\r\n");
+					}
+				}
+			}
+		}
+		$this->CompleteTrans();
+		return( count( $this->mErrors ) == 0 );
+	}
+
+	/**
+	* verify This function is responsible for data integrity and validation before any operations are performed with the $pParamHash
+	* NOTE: This is a PRIVATE METHOD!!!! do not call outside this class, under penalty of death!
+	*
+	* @param array pParams reference to hash of values that will be used to store the page, they will be modified where necessary
+	*
+	* @return bool TRUE on success, FALSE if verify failed. If FALSE, $this->mErrors will have reason why
+	*
+	* @access private
+	**/
+	function verify( &$pParamHash ) {
+		global $gBitUser, $gBitSystem;
+
+		// make sure we're all loaded up of we have a mPageId
+		if( $this->verifyId( $this->mPageId ) && empty( $this->mInfo ) ) {
+			$this->load();
+		}
+
+		if( isset( $this->mInfo['content_id'] ) && $this->verifyId( $this->mInfo['content_id'] ) ) {
+			$pParamHash['content_id'] = $this->mInfo['content_id'];
+		}
+
+		// It is possible a derived class set this to something different
+		if( empty( $pParamHash['content_type_guid'] ) ) {
+			$pParamHash['content_type_guid'] = $this->mContentTypeGuid;
+		}
+
+		if( @$this->verifyId( $pParamHash['content_id'] ) ) {
+			$pParamHash['page_store']['content_id'] = $pParamHash['content_id'];
+		}
+
+		// check for name issues, first truncate length if too long
+		if( empty( $pParamHash['title'] ) ) {
+			$this->mErrors['title'] = 'You must specify a title';
+		} elseif( !empty( $pParamHash['title']) || !empty($this->mPageName))  {
+			if( !$this->verifyId( $this->mPageId ) ) {
+				if( empty( $pParamHash['title'] ) ) {
+					$this->mErrors['title'] = 'You must enter a name for this page.';
+				} else {
+					$pParamHash['content_store']['title'] = substr( $pParamHash['title'], 0, 160 );
+					if ($gBitSystem->isFeatureActive( 'wiki_allow_dup_page_names')) {
+						# silently allow pages with duplicate names to be created
+					} else {
+						if( $this->pageExists( $pParamHash['title'] ) ) {
+							$this->mErrors['title'] = 'Page "'.$pParamHash['title'].'" already exists. Please choose a different name.';
+						}
+					}
+				}
+			} else {
+				$pParamHash['content_store']['title'] = ( isset( $pParamHash['title'] ) ) ? substr( $pParamHash['title'], 0, 160 ) : $this->mPageName;
+				if ($gBitSystem->isFeatureActive( 'wiki_allow_dup_page_names')) {
+					# silently allow pages with duplicate names to be created
+				} else {
+					if( $gBitUser->hasPermission( 'p_wiki_rename_page' )
+					&& (isset( $this->mInfo['title'] )
+					&& ($pParamHash['title'] != $this->mInfo['title'])) ) {
+						if( $this->pageExists( $pParamHash['title'] ) ) {
+							$this->mErrors['title'] = 'Page "'.$pParamHash['title'].'" already exists. Please choose a different name.';
+						}
+					}
+				}
+			}
+		}
+
+		if( empty( $pParamHash['edit_comment'] ) ) {
+			$pParamHash['page_store']['edit_comment'] = NULL;
+		} else {
+			$pParamHash['page_store']['edit_comment'] = substr( $pParamHash['edit_comment'], 0, 200 );
+		}
+
+		if( !empty( $pParamHash['minor'] ) && $this->isValid() ) {
+			// we can only minor save over our own versions
+			if( !$gBitUser->isRegistered() || ($this->mInfo['modifier_user_id'] != $gBitUser->mUserId && !$gBitUser->isAdmin()) ) {
+				unset( $pParamHash['minor'] );
+			}
+		}
+
+		// if we have an error we get them all by checking parent classes for additional errors
+		if( count( $this->mErrors ) > 0 ){
+			parent::verify( $pParamHash );
+		}
+
+		return( count( $this->mErrors ) == 0 );
+	}
+
+	/**
+	 * Remove page from database
+	 */
+	function expunge() {
+		$ret = FALSE;
+		if( $this->isValid() ) {
+			$this->StartTrans();
+			$this->expungeVersion(); // will nuke all versions
+			$query = "DELETE FROM `".BIT_DB_PREFIX."wiki_pages` WHERE `content_id` = ?";
+			$result = $this->mDb->query( $query, array( $this->mContentId ) );
+			if( LibertyMime::expunge() ) {
+				$ret = TRUE;
+				$this->CompleteTrans();
+			} else {
+				$this->mDb->RollbackTrans();
+			}
+		}
+		return $ret;
+	}
+
+	function isUserPage() {
+		$ret = FALSE;
+		if( $this->mPageName ) {
+			$ret = preg_match( '/^UserPage(.*)/', $this->mPageName, $matches );
+		}
+		return $ret;
+	}
+
+	function isValid() {
+		return( $this->verifyId( $this->mPageId ) );
+	}
+
+	function isLocked() {
+		$ret = FALSE;
+		if( $this->verifyId( $this->mPageId ) ) {
+			if( empty( $this->mInfo ) ) {
+				$this->load();
+			}
+			$ret = $this->getField( 'flag' ) == 'L';
+		}
+		return( $ret );
+	}
+
+	function isCommentable() {
+		global $gBitSystem;
+		return( $gBitSystem->isFeatureActive( 'wiki_comments' ));
+	}
+
+	function setLock( $pLock, $pModUserId=NULL ) {
+		if( $this->verifyId( $this->mPageId ) ) {
+			$bindVars = array();
+			$userSql = '';
+			if( $pModUserId ) {
+				$userSql = "`modifier_user_id`=?, ";
+				array_push( $bindVars, $pModUserId );
+			}
+			array_push( $bindVars, $pLock, $this->mPageId );
+			$query = "update `".BIT_DB_PREFIX."wiki_pages` SET $userSql `flag`=? where `page_id`=?";
+			$result = $this->mDb->query($query, $bindVars );
+			$this->mInfo['flag'] = $pLock;
+		}
+		return true;
+	}
+
+	function lock( $pModUserId=NULL ) {
+		return( $this->setLock( 'L', $pModUserId ) );
+	}
+
+	function unlock( $pModUserId=NULL ) {
+		return( $this->setLock( NULL, $pModUserId ) );
+	}
+
+	// *********  Footnote functions for the wiki ********** //
+	/**
+	 *  Store footnote
+	 */
+	function storeFootnote($pUserId, $pData) {
+		if( $this->verifyId( $this->mPageId ) ) {
+			$querydel = "delete from `".BIT_DB_PREFIX."wiki_footnotes` where `user_id`=? and `page_id`=?";
+			$this->mDb->query( $querydel, array( $pUserId, $this->mPageId ) );
+			$query = "insert into `".BIT_DB_PREFIX."wiki_footnotes`(`user_id`,`page_id`,`data`) values(?,?,?)";
+			$this->mDb->query( $query, array( $pUserId, $this->mPageId, $pData ) );
+		}
+	}
+
+	/**
+	 *  Delete footnote
+	 */
+	function expungeFootnote( $pUserId ) {
+		if( $this->verifyId( $this->mPageId ) ) {
+			$query = "delete from `".BIT_DB_PREFIX."wiki_footnotes` where `user_id`=? and `page_id`=?";
+			$this->mDb->query($query,array($pUserId,$this->mPageId));
+		}
+	}
+
+	/**
+	 *  Get footnote
+	 */
+	function getFootnote( $pUserId ) {
+		if( $this->verifyId( $this->mPageId ) ) {
+			$count = $this->mDb->getOne( "select count(*) from `".BIT_DB_PREFIX."wiki_footnotes` where `user_id`=? and `page_id`=?", array( $pUserId, $this->mPageId ) );
+			if( $count ) {
+				return $this->mDb->getOne("select `data` from `".BIT_DB_PREFIX."wiki_footnotes` where `user_id`=? and `page_id`=?",array( $pUserId, $this->mPageId ) );
+			}
+		}
+	}
+
+	/**
+	* Generates a link to a wiki page within lists of pages
+	* @return the link to display the page.
+	*/
+	function getListLink( $pParamHash ) {
+		return BitPage::getPageLink( $pParamHash['title'], NULL );
+	}
+
+
+	/**
+	* Returns include file that will
+	* @return the fully specified path to file to be included
+	*/
+	function getRenderFile() {
+		return WIKI_PKG_PATH."display_bitpage_inc.php";
+	}
+
+
+	/**
+	 * Returns the center template for the view selected
+	 */
+	function getViewTemplate( $pAction ){
+		$ret = null;
+		switch ( $pAction ){
+			case "view":
+				$ret = "bitpackage:wiki/center_wiki_page.tpl";
+				break;
+			case "list":
+				$ret = "bitpackage:liberty/center_".$pAction."_generic.tpl";
+				break;
+		}
+		return $ret;
+	}
+
+
+	/**
+	 * Create the generic title for a content item
+	 *
+	 * This will normally be overwriten by extended classes to provide
+	 * an appropriate title string
+	 * @return string Descriptive title for the page
+	 */
+	function getTitle() {
+		$ret = $this->getField('title');
+		if( $this->isValid() ) {
+			$ret = static::getTitleFromHash( $this->mInfo );
+			$requestPage = strtoupper( self::getParameter( $_REQUEST, 'page' ) );
+			if( $requestPage && $requestPage != strtoupper( $this->mInfo['title'] ) ) {
+				$aliases = $this->getAliases( TRUE );
+				if( in_array( $requestPage, $aliases ) ) {
+					$ret = $_REQUEST['page'];
+				}
+			}
+		}
+		return $ret;
+	}
+
+	/**
+	* Generates the URL to this wiki page
+	* @param pExistsHash the hash that was returned by LibertyContent::pageExists
+	* @return the link to display the page.
+	*/
+	public static function getDisplayUrlFromHash( &$pParamHash ) {
+		global $gBitSystem;
+		if( !empty( $pParamHash['title'] ) ) {
+			if( $gBitSystem->isFeatureActive( 'pretty_urls' ) || $gBitSystem->isFeatureActive( 'pretty_urls_extended' ) ) {
+				$rewrite_tag = $gBitSystem->isFeatureActive( 'pretty_urls_extended' ) ? 'view/':'';
+				$prettyPageName = preg_replace( '/ /', '+', $pParamHash['title'] );
+				$ret = WIKI_PKG_URL.$rewrite_tag.$prettyPageName;
+			} else {
+				$ret = WIKI_PKG_URL.'index.php?page='.urlencode( $pParamHash['title'] );
+			}
+		} else {
+			$ret = parent::getDisplayUrlFromHash( $pParamHash );
+		}
+
+		return $ret;
+	}
+
+	/**
+	* Returns HTML link to display a page if it exists, or to create if not
+	* @param pExistsHash the hash that was returned by LibertyContent::pageExists
+	* @return the link to display the page.
+	*/
+	public static function getPageLink( $pLinkText=NULL, $pMixed=NULL, $pAnchor=NULL ) {
+		global $gBitSystem, $gBitUser;
+		$ret = $pLinkText;
+		if( $gBitSystem->isPackageActive( 'wiki' ) ) {
+			if( !empty( $pMixed ) && is_array( $pMixed ) ) {
+				if( is_array( current( $pMixed ) ) ) {
+					$exists = $pMixed[0];
+					$multiple = TRUE;
+				} else {
+					$exists = $pMixed;
+					$multiple = FALSE;
+				}
+
+				// we have a multi-demensional array (likely returned from LibertyContent::pageExists() ) - meaning we potentially have multiple pages with the same name
+				if( $multiple ) {
+					$desc = tra( 'Multiple pages with this name' );
+				} else {
+					$desc = empty( $exists['summary'] ) ? $exists['title'] : $exists['summary'];
+				}
+				$ret = '<a title="'.htmlspecialchars( $desc ).'" href="'.BitPage::getDisplayUrlFromHash( $exists ).'">'.htmlspecialchars( $exists['title'] ).'</a>';
+			} else {
+				if( $gBitUser->hasPermission( 'p_wiki_create_page' ) ) {
+					$ret = '<a title="'.tra( "Create the page" ).': '.htmlspecialchars( $pLinkText ).'" href="'.WIKI_PKG_URL.'edit.php?page='.urlencode( $pLinkText ).'" class="create">'.htmlspecialchars( $pLinkText ).'</a>';
+				} else {
+					$ret = $pLinkText;
+				}
+			}
+		}
+		return $ret;
+	}
+
+	/**
+	* Returns content_id's that link to this page
+	* @return hash of content
+	*/
+	function getBacklinks() {
+		if( $this->isValid() ) {
+			$to_title = $this->mInfo['title'];
+			$query = "SELECT lcl.`from_content_id`, lc.`title`
+					  FROM `".BIT_DB_PREFIX."liberty_content_links` lcl INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lcl.`from_content_id`=lc.`content_id`)
+					  WHERE lcl.`to_title` = ? ORDER BY lcl.POS";
+			$ret = $this->mDb->getAssoc( $query, array( $to_title ) );
+			return $ret;
+		}
+	}
+
+
+	/**
+	 * Roll back to a specific version of a page
+	 * @param pVersion Version number to roll back to
+	 * @param comment Comment text to be added to the action log
+	 * @return TRUE if completed successfully
+	 */
+	function rollbackVersion( $pVersion, $comment = '' ) {
+		global $gBitSystem;
+		$ret = FALSE;
+		if( parent::rollbackVersion( $pVersion, $comment ) ) {
+			$action = "Changed actual version to $pVersion";
+			$t = $gBitSystem->getUTCTime();
+			$query = "insert into `".BIT_DB_PREFIX."liberty_action_log`(`log_message`,`content_id`,`last_modified`,`user_id`,`ip`,`error_message`) values(?,?,?,?,?,?)";
+			$result = $this->mDb->query($query,array($action,$this->mContentId,$t,ROOT_USER_ID,$_SERVER["REMOTE_ADDR"],$comment));
+			$ret = TRUE;
+		}
+		return $ret;
+	}
+
+	/**
+	 * getList
+	 *
+	 * @param array $pListHash array of list parameters
+	 * @param boolean $pListHash['orphans_only'] only return orphan wiki pages
+	 * @param boolean $pListHash['extras'] load extra infrmation such as backlinks and links
+	 * @param boolean $pListHash['get_data'] return the wiki page data along with the listed information
+	 * @param string $pListHash['find_title'] filter by the page title
+	 * @param string $pListHash['find_author'] filter by the login name of the page author
+	 * @param string $pListHash['find_last_editor'] filter by the login name of the last editor of the page
+	 * @access public
+	 * @return array of wiki pages
+	 */
+	function getList( &$pListHash ) {
+		global $gBitSystem, $gBitUser;
+		LibertyContent::prepGetList( $pListHash );
+
+		if( $pListHash['sort_mode'] == 'size_asc' || $pListHash['sort_mode'] == 'size_desc' ) {
+			$pListHash['sort_mode'] = str_replace( 'size', 'wiki_page_size', $pListHash['sort_mode'] );
+		}
+
+		$specialSort = array(
+			'versions_desc',
+			'versions_asc',
+			'links_asc',
+			'links_desc',
+			'backlinks_asc',
+			'backlinks_desc'
+		);
+
+		if( in_array( $pListHash['sort_mode'], $specialSort )) {
+			$originalListHash         = $pListHash;
+			// now we can set the new values in the pListHash
+			$pListHash['sort_mode']   = 'modifier_user_desc';
+			$pListHash['offset']      = 0;
+			$pListHash['max_records'] = -1;
+		}
+
+		$whereSql = $joinSql = $selectSql = '';
+		$bindVars = array();
+		$this->getServicesSql( 'content_list_sql_function', $selectSql, $joinSql, $whereSql, $bindVars, NULL, $pListHash );
+
+		if ( !empty( $pListHash['content_type_guid'] ) ) {
+			$whereSql .= " AND lc.`content_type_guid`=? ";
+			$bindVars[] = $pListHash['content_type_guid'];
+		}
+
+		// make find_title compatible with {minifind}
+		if( empty( $pListHash['find_title'] )) {
+			$pListHash['find_title'] = $pListHash['find'];
+		}
+
+		// use an array or string to search for wiki page titles
+		if( is_array( $pListHash['find_title'] )) {
+			$whereSql .= " AND lc.`title` IN (".implode(',',array_fill( 0, count( $pListHash['find_title'] ), '?' )).")";
+			$bindVars = array_merge( $bindVars, $pListHash['find_title'] );
+		} elseif( !empty( $pListHash['find_title'] ) && is_string( $pListHash['find_title'] )) {
+			$whereSql .= " AND UPPER(lc.`title`) LIKE ? ";
+			$bindVars = array_merge( $bindVars, array( '%'.strtoupper( $pListHash['find_title'] ) . '%' ));
+		}
+
+		// limit by user id
+		if( @BitBase::verifyId( $pListHash['user_id'] )) {
+			$whereSql .= " AND lc.`user_id` = ? ";
+			$bindVars = array_merge( $bindVars, array( $pListHash['user_id'] ));
+		}
+
+		// filter pages by author login
+		if( !empty( $pListHash['find_author'] )) {
+			$whereSql .= " AND UPPER(uuc.`login`) = ? ";
+			$bindVars = array_merge( $bindVars, array( strtoupper( $pListHash['find_author'] )));
+		}
+
+		// filter pages by last editor
+		if( !empty( $pListHash['find_last_editor'] )) {
+			$whereSql .= " AND UPPER(uue.`login`) = ? ";
+			$bindVars = array_merge( $bindVars, array( strtoupper( $pListHash['find_last_editor'] )));
+		}
+
+		$get_data = '';
+		if( !empty( $pListHash['get_data'] )) {
+			$get_data = ', lc.`data`';
+		}
+
+		if( empty( $pListHash['orphans_only'] )) {
+			$whereSql =  preg_replace('/^ AND */',' WHERE ', $whereSql);
+			$query = "SELECT
+					uue.`login` AS modifier_user, uue.`real_name` AS modifier_real_name, uuc.`login` AS creator_user, uuc.`real_name` AS creator_real_name,
+					wp.`page_id`, wp.`wiki_page_size` as `len`, lcds.`data` AS `summary`, wp.`edit_comment`, wp.`content_id`, wp.`flag`,
+					lc.`title`, lc.`format_guid`, lc.`last_modified`, lc.`created`, lc.`ip`, lc.`version`,
+					lch.`hits` $get_data $selectSql
+				FROM `".BIT_DB_PREFIX."wiki_pages` wp
+					INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id` = wp.`content_id`)
+					INNER JOIN `".BIT_DB_PREFIX."users_users` uuc ON ( uuc.`user_id` = lc.`user_id` )
+					INNER JOIN `".BIT_DB_PREFIX."users_users` uue ON ( uue.`user_id` = lc.`modifier_user_id` )
+					LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_data` lcds ON (lc.`content_id` = lcds.`content_id` AND lcds.`data_type`='summary')
+					LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_hits` lch ON (lc.`content_id` = lch.`content_id`)
+					$joinSql
+				$whereSql
+				ORDER BY ".$this->mDb->convertSortmode( $pListHash['sort_mode'] );
+			$query_cant = "
+				SELECT COUNT(*)
+				FROM `".BIT_DB_PREFIX."wiki_pages` wp
+					INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id` = wp.`content_id`)
+					INNER JOIN `".BIT_DB_PREFIX."users_users` uuc ON ( uuc.`user_id` = lc.`user_id` )
+					INNER JOIN `".BIT_DB_PREFIX."users_users` uue ON ( uue.`user_id` = lc.`modifier_user_id` )
+					$joinSql
+				$whereSql
+				";
+		} else {
+			$whereSql .= ' AND lcl.`to_content_id` is NULL ';
+			$whereSql =  preg_replace('/^ AND */',' WHERE ', $whereSql);
+			$query = "SELECT
+					uue.`login` AS modifier_user, uue.`real_name` AS modifier_real_name, uuc.`login` AS creator_user, uuc.`real_name` AS creator_real_name,
+					wp.`page_id`, wp.`wiki_page_size` AS `len`,lcds.`data` AS `summary`, wp.`edit_comment`, wp.`content_id`, wp.`flag`,
+					lc.`title`, lc.`format_guid`, lc.`last_modified`, lc.`created`, lc.`ip`, lc.`version`,
+					lch.`hits` $get_data $selectSql
+				FROM `".BIT_DB_PREFIX."wiki_pages` wp
+					INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id` = wp.`content_id`)
+					INNER JOIN `".BIT_DB_PREFIX."users_users` uuc ON ( uuc.`user_id` = lc.`user_id` )
+					INNER JOIN `".BIT_DB_PREFIX."users_users` uue ON ( uue.`user_id` = lc.`user_id` )
+					LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_links` lcl ON (wp.`content_id` = lcl.`to_content_id`)
+					LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_hits` lch ON (lc.`content_id` = lch.`content_id`)
+					LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_data` lcds ON (lc.`content_id` = lcds.`content_id` AND lcds.`data_type`='summary')
+					$joinSql
+				$whereSql
+				ORDER BY ".$this->mDb->convertSortmode( $pListHash['sort_mode'] );
+			$query_cant = "
+				SELECT COUNT(*)
+				FROM `".BIT_DB_PREFIX."wiki_pages` wp
+					LEFT JOIN `".BIT_DB_PREFIX."liberty_content_links` lcl ON (wp.`content_id` = lcl.`to_content_id`)
+					INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id` = wp.`content_id`)
+					$joinSql
+				$whereSql";
+		}
+
+		// If sort mode is versions then offset is 0, max_records is -1 (again) and sort_mode is nil
+		// If sort mode is links then offset is 0, max_records is -1 (again) and sort_mode is nil
+		// If sort mode is backlinks then offset is 0, max_records is -1 (again) and sort_mode is nil
+
+		$ret = array();
+		$this->StartTrans();
+
+		# get count of total number of items available
+		$cant = $this->mDb->getOne( $query_cant, $bindVars );
+		$pListHash["cant"] = $cant;
+
+		# Check for offset out of range
+		if ( $pListHash['offset'] < 0 ) {
+			$pListHash['offset'] = 0;
+		} elseif ( $pListHash['offset']	> $pListHash["cant"] ) {
+			$lastPageNumber = ceil ( $pListHash["cant"] / $pListHash['max_records'] ) - 1;
+			$pListHash['offset'] = $pListHash['max_records'] * $lastPageNumber;
+		}
+
+		$result = $this->mDb->query( $query, $bindVars, $pListHash['max_records'], $pListHash['offset'] );
+		$this->CompleteTrans();
+		while( $res = $result->fetchRow() ) {
+			$aux = array();
+			$aux = $res;
+			$aux['creator'] = (isset( $res['creator_real_name'] ) ? $res['creator_real_name'] : $res['creator_user'] );
+			$aux['editor'] = (isset( $res['modifier_real_name'] ) ? $res['modifier_real_name'] : $res['modifier_user'] );
+			$aux['flag'] = $res["flag"] == 'L' ? 'locked' : 'unlocked';
+			$aux['display_url'] = static::getDisplayUrlFromHash( $aux );
+			// display_link does not seem to be used when getList is called
+			//$aux['display_link'] = $this->getDisplayLink( $aux['title'] ); //WIKI_PKG_URL."index.php?page_id=".$res['page_id'];
+			if( !empty( $pListHash['extras'] )) {
+				// USE SPARINGLY!!! This gets expensive fast
+//				$aux['versions"]  = $this->mDb->getOne( "SELECT COUNT(*) FROM `".BIT_DB_PREFIX."liberty_content_history` WHERE `page_id`=?", array( $res["page_id"] ));
+				$aux['links']     = $this->mDb->getOne( "SELECT COUNT(*) FROM `".BIT_DB_PREFIX."liberty_content_links` WHERE `from_content_id`=?", array( $res["content_id"] ));
+				$aux['backlinks'] = $this->mDb->getOne( "select COUNT(*) FROM `".BIT_DB_PREFIX."liberty_content_links` WHERE `to_title`=?", array( $aux['title'] ));
+			}
+			$ret[] = $aux;
+		}
+
+		// apply the custom sorting options if needed
+		if( !empty( $originalListHash )) {
+			if( $originalListHash['sort_mode'] == 'versions_asc' && !empty( $ret['versions'] )) {
+				usort( $ret, 'compare_versions');
+			} elseif( $originalListHash['sort_mode'] == 'versions_desc' && !empty( $ret['versions'] )) {
+				usort( $ret, 'r_compare_versions');
+			} elseif( $originalListHash['sort_mode'] == 'links_desc' && !empty( $ret['links'] )) {
+				usort( $ret, 'compare_links');
+			} elseif( $originalListHash['sort_mode'] == 'links_asc' && !empty( $ret['links'] )) {
+				usort( $ret, 'r_compare_links');
+			} elseif( $originalListHash['sort_mode'] == 'backlinks_desc' && !empty( $ret['backlinks'] )) {
+				usort($ret, 'compare_backlinks');
+			} elseif( $originalListHash['sort_mode'] == 'backlinks_asc' && !empty( $ret['backlinks'] )) {
+				usort($ret, 'r_compare_backlinks');
+			}
+
+			// return only requested values
+			if( in_array( $originalListHash['sort_mode'], $specialSort )) {
+				$ret = array_slice( $ret, $originalListHash['offset'], $originalListHash['max_records'] );
+			}
+
+			// load original listHash
+			$pListHash = $originalListHash;
+		}
+
+		LibertyContent::postGetList( $pListHash );
+
+		return $ret;
+	}
+
+	/* Update a page
+	 * $pHashOld the where conmdition : page_id
+	 * $pHashNew the new fields: title, data
+	 */
+	function update( $pHashOld, $pHashNew) {
+		$set = array();
+		$where = array();
+		if (!empty($pHashNew['title'])) {
+			$set[] = "lc.`title`=?";
+			$bindVars[] = $pHashNew['title'];
+		}
+		if (!empty($pHashNew['data'])) {
+			$set[] = "lc.`data`=?";
+			$bindVars[] = $pHashNew['data'];
+		}
+		if (!empty($pHashOld['page_id'])) {
+			$where[] = "wp.`page_id`=?";
+			$bindVars[] = $pHashOld['page_id'] ;
+		}
+		if (empty($where)) {
+			$this->mErrors['page_id'] = "You must specify a where condition";
+			return false;
+		}
+
+		$query = "update `".BIT_DB_PREFIX."liberty_content` lc
+			LEFT JOIN `".BIT_DB_PREFIX."wiki_pages` wp on (wp.`content_id`= lc.`content_id`)
+			SET ".implode(',', $set)."
+			WHERE ".implode (" AND ", $where);
+		$this->mDb->query( $query, $bindVars);
+		return true;
+	}
+
+	// ...page... functions
+	function countSubPages( $pData ) {
+		return(( preg_match_all( '/'.( defined( 'PAGE_SEP' ) ? preg_quote( PAGE_SEP ) : '\.\.\.page\.\.\.').'/', $pData, $matches ) + 1 ));
+	}
+
+	/**
+	 * getSubPage
+	 *
+	 * @param array $pData
+	 * @param array $pPageNumber
+	 * @access public
+	 * @return string SubPage
+	 */
+	function getSubPage( $pData, $pPageNumber ) {
+		// Get slides
+		$parts = explode( defined( 'PAGE_SEP' ) ? PAGE_SEP : "...page...", $pData );
+		if( substr( $parts[$pPageNumber - 1], 1, 5 ) == "<br/>" ) {
+			$ret = substr( $parts[$pPageNumber - 1], 6 );
+		} else {
+			$ret = $parts[$pPageNumber - 1];
+		}
+		return $ret;
+	}
+
+	/**
+	 * getLikePages Like pages are pages that share a word in common with the current page
+	 *
+	 * @param array $pPageTitle
+	 * @access public
+	 * @return boolean TRUE on success, FALSE on failure - $this->mErrors will contain reason for failure
+	 */
+	function getLikePages( $pPageTitle ) {
+		$ret = array();
+		if( !empty( $pPageName ) ) {
+			preg_match_all("/([A-Z])([a-z]+)/", $pPageTitle, $words);
+			// Add support to ((x)) in either strict or full modes
+			preg_match_all("/(([A-Za-z]|[\x80-\xFF])+)/", $pPageTitle, $words2);
+			$words = array_unique(array_merge($words[0], $words2[0]));
+			$exps = array();
+			$bindVars=array();
+			foreach ($words as $word) {
+				$exps[] = "`title` like ?";
+				$bindVars[] = "%$word%";
+			}
+			$selectSql = '';
+			$joinSql = '';
+			$whereSql = implode(" or ", $exps);
+			array_push( $bindVars, $this->mContentTypeGuid );
+			$this->getServicesSql( 'content_list_sql_function', $selectSql, $joinSql, $whereSql, $bindVars );
+
+			$query = "SELECT lc.`title` FROM `".BIT_DB_PREFIX."wiki_pages` wp INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id` = wp.`content_id`) $join WHERE $whereSql";
+			$result = $this->mDb->query($query,$bindVars);
+			while ($res = $result->fetchRow()) {
+				$ret[] = $res["title"];
+			}
+		}
+		return $ret;
+	}
+
+	/**
+	 * getStats getStats is always used by the stats package to display various stats of your package.
+	 *
+	 * @access public
+	 * @return boolean TRUE on success, FALSE on failure - $this->mErrors will contain reason for failure
+	 */
+	function getStats() {
+		global $gBitSystem;
+		$ret = array();
+
+		$query = "SELECT COUNT(*) FROM `".BIT_DB_PREFIX."wiki_pages`";
+		$ret['pages'] = array(
+			'label' => "Number of pages",
+			'value' => $this->mDb->getOne( $query ),
+		);
+
+		$listHash = array( 'orphans_only' => TRUE );
+		$this->getList( $listHash );
+		$ret['orphans'] = array(
+			'label' => 'Orphan Pages',
+			'value' => $listHash['listInfo']['total_records'],
+		);
+
+		$query = "SELECT SUM(`wiki_page_size`) FROM `".BIT_DB_PREFIX."wiki_pages`";
+		$ret['size'] = array(
+			'label' => "Combined size",
+			'value' => $this->mDb->getOne( $query ),
+			'modifier' => 'display_bytes',
+		);
+
+		$ret['average_size'] = array(
+			'label' => 'Average page size',
+			'value' => $ret['size']['value'] / $ret['pages']['value'],
+			'modifier' => 'display_bytes',
+		);
+
+		$query = "
+			SELECT COUNT(*)
+			FROM `".BIT_DB_PREFIX."liberty_content_history` lch
+			INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON( lch.`content_id` = lc.`content_id` )
+			WHERE lc.`content_type_guid` = ?";
+		$ret['versions'] = array(
+			'label' => "Versions",
+			'value' => $this->mDb->getOne( $query, array( BITPAGE_CONTENT_TYPE_GUID )),
+		);
+
+		$ret['average_versions'] = array(
+			'label' => 'Average versions per page',
+			'value' => round( $ret['versions']['value'] / $ret['pages']['value'], 3 ),
+		);
+
+		$query = "
+			SELECT COUNT(*) FROM `".BIT_DB_PREFIX."liberty_content_links` lcl
+			INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON( lcl.`from_content_id` = lc.`content_id` OR lcl.`from_content_id` = lc.`content_id` )
+			WHERE lc.`content_type_guid` = ?";
+		$ret['links'] = array(
+			'label' => "Total wiki links",
+			'value' => $this->mDb->getOne( $query, array( BITPAGE_CONTENT_TYPE_GUID )),
+		);
+
+		$ret['average_links'] = array(
+			'label' => 'Average links per page',
+			'value' => round( $ret['links']['value'] / $ret['pages']['value'], 3 ),
+		);
+
+		return $ret;
+	}
+
+	// {{{ ==================================== GraphViz wiki graph methods ====================================
+	/**
+	 * linkStructureGraph
+	 *
+	 * @param array $pLinkStructure
+	 * @param array $pParams
+	 * @param array $pGraphViz
+	 * @access public
+	 * @return boolean TRUE on success, FALSE on failure - $this->mErrors will contain reason for failure
+	 */
+	function linkStructureGraph( $pLinkStructure = array(), $pParams = array(), &$pGraphViz ) {
+		if( !empty( $pLinkStructure ) && !empty( $pGraphViz )) {
+			$pParams['graph']['URL'] = WIKI_PKG_URL.'index.php';
+			$pGraphViz->addAttributes( $pParams['graph'] );
+			$pLinkStructure['title'] = $pLinkStructure['name'];
+			$pParams['node']['URL'] = static::getDisplayUrlFromHash( $pLinkStructure );
+			$pGraphViz->addNode( $pLinkStructure['name'], $pParams['node'] );
+
+			foreach( $pLinkStructure['pages'] as $node ) {
+				$this->linkStructureGraph( $node, $pParams, $pGraphViz );
+				$pGraphViz->addEdge( array( $pLinkStructure['name'] => $node['name'] ), $pParams['node'] );
+			}
+		}
+	}
+
+	/**
+	 * linkStructureMap
+	 *
+	 * @param array $pPageName
+	 * @param int $pLevel
+	 * @param array $pParams
+	 * @access public
+	 * @return boolean TRUE on success, FALSE on failure - $this->mErrors will contain reason for failure
+	 */
+	function linkStructureMap( $pPageName, $pLevel = 0, $pParams = array() ) {
+		if( !empty( $pPageName ) && @include_once( 'Image/GraphViz.php' )) {
+			$graph = new Image_GraphViz();
+			$this->linkStructureGraph( $this->getLinkStructure( $pPageName, $pLevel ), $pParams, $graph );
+			return $graph->fetch( 'cmap' );
+		}
+	}
+
+	/**
+	 * getLinkStructure
+	 *
+	 * @param array $pPageName
+	 * @param float $pLevel
+	 * @access public
+	 * @return boolean TRUE on success, FALSE on failure - $this->mErrors will contain reason for failure
+	 */
+	function getLinkStructure( $pPageName, $pLevel = 0 ) {
+		$query = "
+			SELECT lc2.`title`
+			FROM `".BIT_DB_PREFIX."liberty_content_links` lcl
+			INNER JOIN liberty_content lc1 ON( lc1.`content_id` = lcl.`from_content_id` AND lc1.`content_status_id` > 49 )
+			INNER JOIN liberty_content lc2 ON( lc2.`content_id` = lcl.`to_content_id` AND lc2.`content_status_id` > 49 )
+			WHERE lc1.`title` = ? AND lcl.`from_content_id` <> lcl.`to_content_id`";
+		$result = $this->mDb->query( $query, array( $pPageName ));
+
+		$ret['pages'] = array();
+		$ret['name']  = $pPageName;
+
+		while( $res = $result->fetchRow() ) {
+			if( !empty( $pLevel )) {
+				$ret['pages'][] = $this->getLinkStructure( $res['title'], $pLevel - 1 );
+			} else {
+				$ret['pages'][] = array(
+					'name'  => $res['title'],
+					'pages' => array(),
+				);
+			}
+		}
+		return $ret;
+	}
+	// }}}
+}
+
+/* vim: :set fdm=marker : */
+?>
diff --git a/index.php b/index.php
index c5aecbd..676a1ac 100644
--- a/index.php
+++ b/index.php
@@ -16,7 +16,7 @@
 require_once( '../kernel/setup_inc.php' );
 
 $gBitSystem->verifyPackage( 'wiki' );
-require_once( WIKI_PKG_PATH.'BitPage.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 
 if( !empty( $_REQUEST['structure_id'] ) ) {
 	include( LIBERTY_PKG_PATH.'display_structure_inc.php' );
diff --git a/list_pages.php b/list_pages.php
index be8ef91..56957ca 100644
--- a/list_pages.php
+++ b/list_pages.php
@@ -8,7 +8,7 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-require_once( WIKI_PKG_PATH.'BitPage.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 
 // verify stuff
 $gBitSystem->verifyPackage( 'wiki' );
diff --git a/lookup_page_inc.php b/lookup_page_inc.php
index 33650be..0fd5e17 100644
--- a/lookup_page_inc.php
+++ b/lookup_page_inc.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( WIKI_PKG_PATH.'BitBook.php');
+require_once( WIKI_PKG_CLASS_PATH.'BitBook.php');
 
 global $gContent;
 include_once( LIBERTY_PKG_PATH.'lookup_content_inc.php' );
diff --git a/modules/mod_comm_received_objects.php b/modules/mod_comm_received_objects.php
index 6c857b5..667a588 100644
--- a/modules/mod_comm_received_objects.php
+++ b/modules/mod_comm_received_objects.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( WIKI_PKG_PATH.'BitPage.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 $wikilib = new WikiLib();
 $ranking = $wikilib->list_received_pages(0, -1, $sort_mode = 'title_asc', '');
 $_template->tpl_vars['modReceivedPages'] = new Smarty_variable( $ranking["cant"]);
diff --git a/modules/mod_random_pages.php b/modules/mod_random_pages.php
index a104820..a6674bc 100644
--- a/modules/mod_random_pages.php
+++ b/modules/mod_random_pages.php
@@ -13,7 +13,7 @@
 /**
  * Required files
  */
-require_once( WIKI_PKG_PATH.'BitPage.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 $wp = new BitPage();
 
 if( $gBitUser->hasPermission( 'p_wiki_view_page' ) ) {
diff --git a/modules/mod_recent_page_changes.php b/modules/mod_recent_page_changes.php
index 93e3e14..5299b5b 100644
--- a/modules/mod_recent_page_changes.php
+++ b/modules/mod_recent_page_changes.php
@@ -16,7 +16,7 @@ global $gQueryUserId, $moduleParams;
  */
  
 if( $gBitUser->hasPermission( 'p_wiki_view_page' ) ) {
-	require_once( WIKI_PKG_PATH.'BitPage.php' );
+	require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 	$wp = new BitPage();
 
 	$listHash = array(
diff --git a/modules/mod_top_pages.php b/modules/mod_top_pages.php
index 052228c..0062542 100644
--- a/modules/mod_top_pages.php
+++ b/modules/mod_top_pages.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( WIKI_PKG_PATH.'BitPage.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 global $gQueryUser, $module_rows, $module_params;
 
 extract( $moduleParams );
diff --git a/page_history.php b/page_history.php
index ebd3063..1c7653e 100644
--- a/page_history.php
+++ b/page_history.php
@@ -14,7 +14,7 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-require_once( WIKI_PKG_PATH.'BitPage.php');
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php');
 
 $gBitSystem->verifyPackage( 'wiki' );
 $gBitSystem->verifyFeature( 'wiki_history' );
diff --git a/print_multi_pages.php b/print_multi_pages.php
index 0fafcc5..154233b 100644
--- a/print_multi_pages.php
+++ b/print_multi_pages.php
@@ -14,7 +14,7 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-require_once( WIKI_PKG_PATH.'BitPage.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 
 $gBitSystem->verifyFeature( 'wiki_multiprint' );
 
diff --git a/print_pages.php b/print_pages.php
index 4c27d5b..cf7c6d8 100644
--- a/print_pages.php
+++ b/print_pages.php
@@ -14,7 +14,7 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-require_once( WIKI_PKG_PATH.'BitPage.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 if( !$gBitSystem->isFeatureActive( 'wiki_multiprint' ) ) {
 	$gBitSystem->fatalError( tra("This feature is disabled").": wiki_multiprint" );
 }
diff --git a/sitemap.php b/sitemap.php
index 3556a4e..8828a10 100644
--- a/sitemap.php
+++ b/sitemap.php
@@ -15,7 +15,7 @@
  */
 require_once( '../kernel/setup_inc.php' );
 
-require_once( WIKI_PKG_PATH.'BitBook.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitBook.php' );
 
 $book = new BitBook();
 $gSiteMapHash = array();
-- 
cgit v1.3


From 8e8fb7e46c83f9c66d88cedbbd30c67f87c7a2d4 Mon Sep 17 00:00:00 2001
From: modela bitweaver <spiderr@bitweaver.org>
Date: Mon, 1 Feb 2021 22:47:37 -0500
Subject: move _inc and _lib to includes/ and use PKG_INCLUDE_PATH constants

---
 backlinks.php                    |   2 +-
 copyrights.php                   |   4 +-
 copyrights_lib.php               |  77 ---------------
 display_bitpage_inc.php          | 169 -------------------------------
 edit.php                         |   6 +-
 export_lib.php                   |  81 ---------------
 export_wiki_pages.php            |   2 +-
 includes/classes/BitPage.php     |   2 +-
 includes/copyrights_lib.php      |  77 +++++++++++++++
 includes/display_bitpage_inc.php | 169 +++++++++++++++++++++++++++++++
 includes/export_lib.php          |  81 +++++++++++++++
 includes/lookup_page_inc.php     |  93 +++++++++++++++++
 includes/plugins_lib.php         | 208 +++++++++++++++++++++++++++++++++++++++
 index.php                        |   4 +-
 like_pages.php                   |   4 +-
 lookup_page_inc.php              |  93 -----------------
 page_history.php                 |   2 +-
 plugins_lib.php                  | 208 ---------------------------------------
 remove_page.php                  |   4 +-
 wiki_graph.php                   |   4 +-
 20 files changed, 645 insertions(+), 645 deletions(-)
 delete mode 100644 copyrights_lib.php
 delete mode 100644 display_bitpage_inc.php
 delete mode 100644 export_lib.php
 create mode 100644 includes/copyrights_lib.php
 create mode 100644 includes/display_bitpage_inc.php
 create mode 100644 includes/export_lib.php
 create mode 100644 includes/lookup_page_inc.php
 create mode 100644 includes/plugins_lib.php
 delete mode 100644 lookup_page_inc.php
 delete mode 100644 plugins_lib.php

diff --git a/backlinks.php b/backlinks.php
index 3c01f90..7491ed9 100644
--- a/backlinks.php
+++ b/backlinks.php
@@ -13,7 +13,7 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-include_once( WIKI_PKG_PATH.'lookup_page_inc.php');
+include_once( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php');
 
 $gBitSystem->verifyPackage( 'wiki' );
 $gBitSystem->verifyFeature( 'wiki_backlinks' );
diff --git a/copyrights.php b/copyrights.php
index 6a5dd46..31160e2 100644
--- a/copyrights.php
+++ b/copyrights.php
@@ -17,8 +17,8 @@ require_once( '../kernel/setup_inc.php' );
 $gBitSystem->isFeatureActive( 'wiki_copyrights', tra("The copyright management feature is not enabled.") );
 
 $gBitUser->hasPermission( 'p_wiki_edit_copyright' );
-require_once( WIKI_PKG_PATH.'copyrights_lib.php' );
-require_once( WIKI_PKG_PATH.'lookup_page_inc.php' );
+require_once( WIKI_PKG_INCLUDE_PATH.'copyrights_lib.php' );
+require_once( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php' );
 
 if (isset($_REQUEST['addcopyright'])) {
 	if ($gBitSystem->isFeatureActive( 'wiki_copyrights' ) && isset($_REQUEST['copyrightTitle']) && isset($_REQUEST['copyrightYear'])
diff --git a/copyrights_lib.php b/copyrights_lib.php
deleted file mode 100644
index ef8d1be..0000000
--- a/copyrights_lib.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Copyright (c) 2004 bitweaver.org
- * Copyright (c) 2003 tikwiki.org
- * Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
- * 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 wiki
- */
-
-/**
- * @package wiki
- * @subpackage CopyrightsLib
- */
-class CopyrightsLib extends BitBase {
-	function list_copyrights( $pPageId ) {
-		$query = "select * from `".BIT_DB_PREFIX."liberty_copyrights` WHERE `page_id`=? order by ".$this->mDb->convertSortmode( "copyright_order_asc" );
-		$query_cant = "select count(*) from `".BIT_DB_PREFIX."liberty_copyrights` WHERE `page_id`=?";
-		$result = $this->mDb->query($query, array( $pPageId ));
-		$cant = $this->mDb->getOne($query_cant, array( $pPageId ));
-		$ret = array();
-		while ($res = $result->fetchRow()) {
-			$ret[] = $res;
-		}
-		$retval = array();
-		$retval["data"] = $ret;
-		$retval["cant"] = $cant;
-		return $retval;
-	}
-	function top_copyright_order( $pPageId ) {
-		$query = "select MAX(`copyright_order`) from `".BIT_DB_PREFIX."liberty_copyrights` where `page_id` = ?";
-		return $this->mDb->getOne($query, array( $pPageId ));
-	}
-	function unique_copyright( $pPageId , $title) {
-		$query = "select `copyrightID` from `".BIT_DB_PREFIX."liberty_copyrights` where `page_id`=? and `title`=?";
-		return $this->mDb->getOne($query, array( $pPageId ,$title));
-	}
-	function add_copyright( $pPageId , $title, $year, $authors, $pUserId) {
-		//$unique = $this->unique_copyright( $pPageId ,$title);
-		//if($unique != 0) {
-		// security here?
-		//$this->edit_copyright($unique,$title,$year,$authors,$pUserId);
-		//return;
-		//}
-		$top = $this->top_copyright_order( $pPageId );
-		$order = $top + 1;
-		$query = "insert into `".BIT_DB_PREFIX."liberty_copyrights` (`page_id`, `title`, `copyright_year`, `authors`, `copyright_order`, `user_id`) values (?,?,?,?,?,?)";
-		$this->mDb->query($query,array( $pPageId ,$title,$year,$authors,$order,$pUserId));
-		return true;
-	}
-	function edit_copyright($id, $title, $year, $authors, $pUserId) {
-		$query = "update `".BIT_DB_PREFIX."liberty_copyrights` SET `copyright_year`=?, `title`=?, `authors`=?, `user_id`=? where `copyright_id`=?";
-		$this->mDb->query($query,array($year,$title,$authors,$pUserId,(int)$id));
-		return true;
-	}
-	function remove_copyright($id) {
-		$query = "delete from `".BIT_DB_PREFIX."liberty_copyrights` where `copyright_id`=?";
-		$this->mDb->query($query,array((int)$id));
-		return true;
-	}
-	function up_copyright($id) {
-		$query = "update `".BIT_DB_PREFIX."liberty_copyrights` set `copyright_order`=`copyright_order`-1 where `copyright_id`=?";
-		$result = $this->mDb->query($query,array((int)$id));
-		return true;
-	}
-	function down_copyright($id) {
-		$query = "update `".BIT_DB_PREFIX."liberty_copyrights` set `copyright_order`=`copyright_order`+1 where `copyright_id`=?";
-		$result = $this->mDb->query($query,array((int)$id));
-		return true;
-	}
-}
-
-global $copyrightslib;
-$copyrightslib = new CopyrightsLib();
-
-?>
diff --git a/display_bitpage_inc.php b/display_bitpage_inc.php
deleted file mode 100644
index eaa118c..0000000
--- a/display_bitpage_inc.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-/**
- * Copyright (c) 2004 bitweaver.org
- * Copyright (c) 2003 tikwiki.org
- * Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
- * 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 wiki
- * @subpackage functions
- */
-
-/**
- * required setup
- */
-include_once( WIKI_PKG_CLASS_PATH.'BitBook.php');
-
-$gBitSystem->verifyPackage( 'wiki' );
-
-$gContent->verifyViewPermission();
-
-// Check permissions to access this page
-if( !$gContent->isValid() || !is_a( $gContent, 'BitPage' ) ) {
-	$gBitSystem->fatalError( tra( 'Page cannot be found' ), NULL, NULL, HttpStatusCodes::HTTP_GONE );
-}
-
-$displayHash = array( 'perm_name' => 'p_wiki_view_page' );
-$gContent->invokeServices( 'content_display_function', $displayHash );
-
-// Let creator set permissions
-// does this work with setPreference()??? - xing - Tuesday Oct 07, 2008   17:51:38 CEST
-if( $gBitSystem->isFeatureActive( 'wiki_creator_admin' ) && $gContent->isOwner() ) {
-	$gBitUser->setPreference( 'p_wiki_admin', TRUE );
-}
-
-// doesn't seem to be used - xing - Tuesday Oct 07, 2008   17:52:42 CEST
-//if( isset( $_REQUEST["copyrightpage"] )) {
-//	$gBitSmarty->assignByRef( 'copyrightpage', $_REQUEST["copyrightpage"] );
-//}
-
-// Get the backlinks for the page "page"
-if( $gBitSystem->isFeatureActive( 'wiki_backlinks' )) {
-	$gBitSmarty->assign( 'backlinks', $gContent->getBacklinks() );
-}
-
-// Now increment page hits since we are visiting this page
-$gContent->addHit();
-
-// Check if we have to lock / unlock this page
-if( !empty( $_REQUEST["action"] ) && ( $_REQUEST["action"] == 'lock' || $_REQUEST["action"] == 'unlock' )
-	&& ( $gContent->hasAdminPermission() || ($gContent->hasUserPermission( 'p_wiki_lock_page' ) && $gBitSystem->isFeatureActive( 'wiki_usrlock' )) ) ) {
-	$gContent->setLock( $_REQUEST["action"] == 'lock' ? 'L' : NULL );
-}
-
-// Process an undo here
-if( !empty( $_REQUEST["undo"] ) && !$gContent->isLocked() && ( $gContent->hasUpdatePermission() || $gContent->hasUserPermission( 'p_wiki_rollback' ))) {
-	// Remove the last version
-	$gContent->removeLastVersion();
-}
-
-// work out if this page has slides
-if( $gBitSystem->isFeatureActive( 'wiki_uses_slides' )) {
-	$slides = split( "-=[^=]+=-", $gContent->mInfo["data"] );
-	if( count( $slides ) <= 1 ) {
-		$slides = explode( defined( 'PAGE_SEP' ) ? PAGE_SEP : "...page...", $gContent->mInfo["data"] );
-	}
-
-	// if we have more than on slide, we let the templates know about it
-	if( count( $slides ) > 1 ) {
-		$gBitSmarty->assign( 'show_slideshow', 'y' );
-	}
-}
-
-// ...page... stuff - TODO: this is cumbersome and should be cleaned up
-$pages = $gContent->countSubPages( $gContent->getField( 'parsed_data' ) );
-if( $pages > 1 ) {
-	if( !isset( $_REQUEST['pagenum'] )) {
-		$_REQUEST['pagenum'] = 1;
-	}
-	$gContent->mInfo['parsed_data'] = $gContent->getSubPage( $gContent->mInfo['parsed_data'], $_REQUEST['pagenum'] );
-	$gBitSmarty->assign( 'pages', $pages );
-	if( $pages > $_REQUEST['pagenum'] ) {
-		$gBitSmarty->assign('next_page', $_REQUEST['pagenum'] + 1 );
-	} else {
-		$gBitSmarty->assign( 'next_page', $_REQUEST['pagenum'] );
-	}
-	if( $_REQUEST['pagenum'] > 1 ) {
-		$gBitSmarty->assign( 'prev_page', $_REQUEST['pagenum'] - 1 );
-	} else {
-		$gBitSmarty->assign( 'prev_page', 1 );
-	}
-	$gBitSmarty->assign( 'first_page', 1 );
-	$gBitSmarty->assign( 'last_page', $pages );
-	$gBitSmarty->assign( 'pagenum', $_REQUEST['pagenum'] );
-}
-
-// Comments engine!
-if( $gBitSystem->isFeatureActive( 'wiki_comments' )) {
-	$comments_vars = array( 'page' );
-	$comments_prefix_var = 'wiki page:';
-	$comments_object_var = 'page';
-	$commentsParentId = $gContent->mContentId;
-	$comments_return_url = WIKI_PKG_URL.'index.php?page_id='.$gContent->mPageId;
-	# Support displaying comments on their own page instead of on content page
-	if( isset( $_REQUEST["comments_page"] ) && ( $_REQUEST["comments_page"] == '1' ) || !empty( $_REQUEST['view_comment_id'] )) {
-		$gBitSmarty->assign( 'comments_page', 1 );
-		$comments_on_separate_page = 1;
-		$comments_return_url = WIKI_PKG_URL.'index.php?page_id='.$gContent->mPageId.'&amp;comments_page=1';
-		if ( !empty($_REQUEST['view_comment_id']) ) {
-			$comments_return_url .= '&amp;comments_maxComments=1';
-		}
-	}
-	include_once( LIBERTY_PKG_PATH.'comments_inc.php' );
-}
-
-// Footnotes
-if( $gBitSystem->isFeatureActive( 'wiki_footnotes' ) && $gBitUser->isValid() ) {
-	if( $footnote = $gContent->getFootnote( $gBitUser->mUserId ) ) {
-		$gBitSmarty->assign( 'footnote', LibertyContent::parseDataHash( $footnote ) );
-	}
-}
-
-// Copyrights
-if( $gBitSystem->isFeatureActive( 'wiki_copyrights' ) ) {
-	require_once( WIKI_PKG_PATH.'copyrights_lib.php' );
-	$copyrights = $copyrightslib->list_copyrights( $gContent->mPageId );
-	$gBitSmarty->assign('pageCopyrights', $copyrights["data"]);
-}
-
-// Watches
-if( $gBitSystem->isFeatureActive( 'users_watches' ) ) {
-	if( !empty( $_REQUEST['watch_event'] ) ) {
-		if( $gBitUser->isRegistered() ) {
-			if( $_REQUEST['watch_action']=='add' ) {
-				$gBitUser->storeWatch( $_REQUEST['watch_event'], $_REQUEST['watch_object'], $gContent->mContentTypeGuid, $gContent->mPageName, $gContent->getDisplayUrl() );
-			} else {
-				$gBitUser->expungeWatch( $_REQUEST['watch_event'], $_REQUEST['watch_object'] );
-			}
-		} else {
-			$gBitSystem->fatalError( tra( "This feature requires a registered user. ").": users_watches" );
-		}
-	}
-
-	if( $watch = $gBitUser->getEventWatches( 'wiki_page_changed', $gContent->mPageId ) ) {
-		$gBitSmarty->assign( 'user_watching_page', 'y' );
-	}
-}
-
-if( $gContent->isValid() && $gBitSystem->isPackageActive( 'stickies' ) ) {
-	require_once( STICKIES_PKG_PATH.'BitSticky.php' );
-	global $gNote;
-	$gNote = new BitSticky( NULL, NULL, $gContent->mContentId );
-	$gNote->load();
-	$gBitSmarty->assignByRef( 'stickyInfo', $gNote->mInfo );
-}
-
-$pageInfo = $gContent->mInfo;
-$pageInfo['title'] = $gContent->getTitle();
-
-// Display the Index Template
-$gBitSmarty->assignByRef( 'pageInfo', $pageInfo );
-
-// S5 slideshows
-if( isset( $_REQUEST['s5'] )) {
-	include_once( WIKI_PKG_PATH.'s5.php');
-}
-
-$gBitSystem->display( 'bitpackage:wiki/show_page.tpl', $pageInfo['title'], array( 'display_mode' => 'display' ));
-?>
diff --git a/edit.php b/edit.php
index 76b2cb3..36cf39e 100644
--- a/edit.php
+++ b/edit.php
@@ -14,7 +14,7 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-include_once( WIKI_PKG_PATH.'BitBook.php' );
+include_once( WIKI_PKG_CLASS_PATH.'BitBook.php' );
 
 $gBitSystem->verifyPackage( 'wiki' );
 
@@ -22,7 +22,7 @@ $gBitSystem->verifyPackage( 'wiki' );
 unset($_REQUEST['content_id']);
 // Disable parsing data if not asking to preview page
 $_REQUEST["parse"] = false;
-include( WIKI_PKG_PATH.'lookup_page_inc.php' );
+include( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php' );
 
 if( $gContent->isValid() ) {
 	$gContent->verifyUpdatePermission();
@@ -142,7 +142,7 @@ if( isset( $_REQUEST["fCancel"] ) ) {
 		&& !empty( $_REQUEST['copyrightYear'] )
 		&& !empty( $_REQUEST['copyrightTitle'] )
 	) {
-		require_once( WIKI_PKG_PATH.'copyrights_lib.php' );
+		require_once( WIKI_PKG_INCLUDE_PATH.'copyrights_lib.php' );
 		$copyrightYear = $_REQUEST['copyrightYear'];
 		$copyrightTitle = $_REQUEST['copyrightTitle'];
 		$copyrightAuthors = $_REQUEST['copyrightAuthors'];
diff --git a/export_lib.php b/export_lib.php
deleted file mode 100644
index e63877c..0000000
--- a/export_lib.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Copyright (c) 2004 bitweaver.org
- * Copyright (c) 2003 tikwiki.org
- * Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
- * 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 wiki
- */
-
-/**
- * required setup
- */
-require_once( KERNEL_PKG_PATH.'BitBase.php' );
-require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
-/**
- * @package wiki
- * @subpackage ExportLib
- */
-class ExportLib extends BitBase {
-
-	function MakeWikiZip( $pExportFile ) {
-		global $gBitUser,$gBitSystem;
-		include_once (UTIL_PKG_INC."tar.class.php");
-		$tar = new tar();
-		$query = "SELECT wp.`page_id` from `".BIT_DB_PREFIX."wiki_pages` wp INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id` = wp.`content_id`) 
-				  ORDER BY lc.".$this->mDb->convertSortmode("title_asc");
-		$result = $this->mDb->query($query,array());
-		while ($res = $result->fetchRow()) {
-			$page_id = $res["page_id"];
-			$content = $this->export_wiki_page($page_id, 0);
-			$tar->addData($page_id, $content, $gBitSystem->getUTCTime());
-		}
-		$tar->toTar( $pExportFile, FALSE); 
-		return '';
-	}
-
-	function export_wiki_page($page_id, $nversions = 1) {
-		global $gBitSystem;
-		$head = '';
-		$head .= "Date: " . $gBitSystem->mServerTimestamp->get_rfc2822_datetime(). "\r\n";
-		$head .= sprintf("Mime-Version: 1.0 (Produced by Tiki)\r\n");
-		$iter = $this->get_page_history($page_id);
-		$gWikiPage = new BitPage( $page_id );
-		$gWikiPage->load();
-		$info = $gWikiPage->mInfo;
-		$parts = array();
-		$parts[] = MimeifyPageRevision($info);
-		if ($nversions > 1 || $nversions == 0) {
-			foreach ($iter as $revision) {
-				$parts[] = MimeifyPageRevision($revision);
-				if ($nversions > 0 && count($parts) >= $nversions)
-					break;
-			}
-		}
-		if (count($parts) > 1)
-			return $head . MimeMultipart($parts);
-		assert ($parts);
-		return $head . $parts[0];
-	}
-
-	// Returns all the versions for this page
-	// without the data itself
-	function get_page_history($page_id) {
-		$query = "SELECT lc.`title`, th.`description`, th.`version`, th.`last_modified`, th.`user_id`, th.`ip`, th.`data`, th.`history_comment`, uu.`login` as `creator_user`, uu.`real_name` " .
-				 "FROM `".BIT_DB_PREFIX."wiki_pages` wp " .
-				 "INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id` = wp.`content_id`) " .
-				 "INNER JOIN `".BIT_DB_PREFIX."liberty_content_history` th ON (th.`page_id` = th.`page_id`) " .
-				 "INNER JOIN `".BIT_DB_PREFIX."users_users` uu ON (uu.`user_id` = th.`user_id`) " .
-				 "WHERE wp.`page_id`=? order by th.".$this->mDb->convertSortmode("version_desc");
-		$result = $this->mDb->query($query,array($page_id));
-		$ret = array();
-		while ($res = $result->fetchRow()) {
-			array_push( $ret, $res );
-		}
-		return $ret;
-	}
-}
-$exportlib = new ExportLib();
-?>
diff --git a/export_wiki_pages.php b/export_wiki_pages.php
index c6f18fb..1c5d5bb 100644
--- a/export_wiki_pages.php
+++ b/export_wiki_pages.php
@@ -15,7 +15,7 @@
  */
 require_once( '../kernel/setup_inc.php' );
 include_once( UTIL_PKG_INC.'zip_lib.php' );
-include_once( WIKI_PKG_PATH.'export_lib.php' );
+include_once( WIKI_PKG_INCLUDE_PATH.'export_lib.php' );
 if (!$gBitUser->hasPermission( 'p_wiki_admin' ))
 	die;
 if (!isset($_REQUEST["page_id"])) {
diff --git a/includes/classes/BitPage.php b/includes/classes/BitPage.php
index 7a3680b..48e2f84 100644
--- a/includes/classes/BitPage.php
+++ b/includes/classes/BitPage.php
@@ -484,7 +484,7 @@ class BitPage extends LibertyMime implements BitCacheable {
 	* @return the fully specified path to file to be included
 	*/
 	function getRenderFile() {
-		return WIKI_PKG_PATH."display_bitpage_inc.php";
+		return WIKI_PKG_INCLUDE_PATH."display_bitpage_inc.php";
 	}
 
 
diff --git a/includes/copyrights_lib.php b/includes/copyrights_lib.php
new file mode 100644
index 0000000..ef8d1be
--- /dev/null
+++ b/includes/copyrights_lib.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright (c) 2004 bitweaver.org
+ * Copyright (c) 2003 tikwiki.org
+ * Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
+ * 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 wiki
+ */
+
+/**
+ * @package wiki
+ * @subpackage CopyrightsLib
+ */
+class CopyrightsLib extends BitBase {
+	function list_copyrights( $pPageId ) {
+		$query = "select * from `".BIT_DB_PREFIX."liberty_copyrights` WHERE `page_id`=? order by ".$this->mDb->convertSortmode( "copyright_order_asc" );
+		$query_cant = "select count(*) from `".BIT_DB_PREFIX."liberty_copyrights` WHERE `page_id`=?";
+		$result = $this->mDb->query($query, array( $pPageId ));
+		$cant = $this->mDb->getOne($query_cant, array( $pPageId ));
+		$ret = array();
+		while ($res = $result->fetchRow()) {
+			$ret[] = $res;
+		}
+		$retval = array();
+		$retval["data"] = $ret;
+		$retval["cant"] = $cant;
+		return $retval;
+	}
+	function top_copyright_order( $pPageId ) {
+		$query = "select MAX(`copyright_order`) from `".BIT_DB_PREFIX."liberty_copyrights` where `page_id` = ?";
+		return $this->mDb->getOne($query, array( $pPageId ));
+	}
+	function unique_copyright( $pPageId , $title) {
+		$query = "select `copyrightID` from `".BIT_DB_PREFIX."liberty_copyrights` where `page_id`=? and `title`=?";
+		return $this->mDb->getOne($query, array( $pPageId ,$title));
+	}
+	function add_copyright( $pPageId , $title, $year, $authors, $pUserId) {
+		//$unique = $this->unique_copyright( $pPageId ,$title);
+		//if($unique != 0) {
+		// security here?
+		//$this->edit_copyright($unique,$title,$year,$authors,$pUserId);
+		//return;
+		//}
+		$top = $this->top_copyright_order( $pPageId );
+		$order = $top + 1;
+		$query = "insert into `".BIT_DB_PREFIX."liberty_copyrights` (`page_id`, `title`, `copyright_year`, `authors`, `copyright_order`, `user_id`) values (?,?,?,?,?,?)";
+		$this->mDb->query($query,array( $pPageId ,$title,$year,$authors,$order,$pUserId));
+		return true;
+	}
+	function edit_copyright($id, $title, $year, $authors, $pUserId) {
+		$query = "update `".BIT_DB_PREFIX."liberty_copyrights` SET `copyright_year`=?, `title`=?, `authors`=?, `user_id`=? where `copyright_id`=?";
+		$this->mDb->query($query,array($year,$title,$authors,$pUserId,(int)$id));
+		return true;
+	}
+	function remove_copyright($id) {
+		$query = "delete from `".BIT_DB_PREFIX."liberty_copyrights` where `copyright_id`=?";
+		$this->mDb->query($query,array((int)$id));
+		return true;
+	}
+	function up_copyright($id) {
+		$query = "update `".BIT_DB_PREFIX."liberty_copyrights` set `copyright_order`=`copyright_order`-1 where `copyright_id`=?";
+		$result = $this->mDb->query($query,array((int)$id));
+		return true;
+	}
+	function down_copyright($id) {
+		$query = "update `".BIT_DB_PREFIX."liberty_copyrights` set `copyright_order`=`copyright_order`+1 where `copyright_id`=?";
+		$result = $this->mDb->query($query,array((int)$id));
+		return true;
+	}
+}
+
+global $copyrightslib;
+$copyrightslib = new CopyrightsLib();
+
+?>
diff --git a/includes/display_bitpage_inc.php b/includes/display_bitpage_inc.php
new file mode 100644
index 0000000..a8c92f6
--- /dev/null
+++ b/includes/display_bitpage_inc.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * Copyright (c) 2004 bitweaver.org
+ * Copyright (c) 2003 tikwiki.org
+ * Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
+ * 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 wiki
+ * @subpackage functions
+ */
+
+/**
+ * required setup
+ */
+include_once( WIKI_PKG_CLASS_PATH.'BitBook.php');
+
+$gBitSystem->verifyPackage( 'wiki' );
+
+$gContent->verifyViewPermission();
+
+// Check permissions to access this page
+if( !$gContent->isValid() || !is_a( $gContent, 'BitPage' ) ) {
+	$gBitSystem->fatalError( tra( 'Page cannot be found' ), NULL, NULL, HttpStatusCodes::HTTP_GONE );
+}
+
+$displayHash = array( 'perm_name' => 'p_wiki_view_page' );
+$gContent->invokeServices( 'content_display_function', $displayHash );
+
+// Let creator set permissions
+// does this work with setPreference()??? - xing - Tuesday Oct 07, 2008   17:51:38 CEST
+if( $gBitSystem->isFeatureActive( 'wiki_creator_admin' ) && $gContent->isOwner() ) {
+	$gBitUser->setPreference( 'p_wiki_admin', TRUE );
+}
+
+// doesn't seem to be used - xing - Tuesday Oct 07, 2008   17:52:42 CEST
+//if( isset( $_REQUEST["copyrightpage"] )) {
+//	$gBitSmarty->assignByRef( 'copyrightpage', $_REQUEST["copyrightpage"] );
+//}
+
+// Get the backlinks for the page "page"
+if( $gBitSystem->isFeatureActive( 'wiki_backlinks' )) {
+	$gBitSmarty->assign( 'backlinks', $gContent->getBacklinks() );
+}
+
+// Now increment page hits since we are visiting this page
+$gContent->addHit();
+
+// Check if we have to lock / unlock this page
+if( !empty( $_REQUEST["action"] ) && ( $_REQUEST["action"] == 'lock' || $_REQUEST["action"] == 'unlock' )
+	&& ( $gContent->hasAdminPermission() || ($gContent->hasUserPermission( 'p_wiki_lock_page' ) && $gBitSystem->isFeatureActive( 'wiki_usrlock' )) ) ) {
+	$gContent->setLock( $_REQUEST["action"] == 'lock' ? 'L' : NULL );
+}
+
+// Process an undo here
+if( !empty( $_REQUEST["undo"] ) && !$gContent->isLocked() && ( $gContent->hasUpdatePermission() || $gContent->hasUserPermission( 'p_wiki_rollback' ))) {
+	// Remove the last version
+	$gContent->removeLastVersion();
+}
+
+// work out if this page has slides
+if( $gBitSystem->isFeatureActive( 'wiki_uses_slides' )) {
+	$slides = split( "-=[^=]+=-", $gContent->mInfo["data"] );
+	if( count( $slides ) <= 1 ) {
+		$slides = explode( defined( 'PAGE_SEP' ) ? PAGE_SEP : "...page...", $gContent->mInfo["data"] );
+	}
+
+	// if we have more than on slide, we let the templates know about it
+	if( count( $slides ) > 1 ) {
+		$gBitSmarty->assign( 'show_slideshow', 'y' );
+	}
+}
+
+// ...page... stuff - TODO: this is cumbersome and should be cleaned up
+$pages = $gContent->countSubPages( $gContent->getField( 'parsed_data' ) );
+if( $pages > 1 ) {
+	if( !isset( $_REQUEST['pagenum'] )) {
+		$_REQUEST['pagenum'] = 1;
+	}
+	$gContent->mInfo['parsed_data'] = $gContent->getSubPage( $gContent->mInfo['parsed_data'], $_REQUEST['pagenum'] );
+	$gBitSmarty->assign( 'pages', $pages );
+	if( $pages > $_REQUEST['pagenum'] ) {
+		$gBitSmarty->assign('next_page', $_REQUEST['pagenum'] + 1 );
+	} else {
+		$gBitSmarty->assign( 'next_page', $_REQUEST['pagenum'] );
+	}
+	if( $_REQUEST['pagenum'] > 1 ) {
+		$gBitSmarty->assign( 'prev_page', $_REQUEST['pagenum'] - 1 );
+	} else {
+		$gBitSmarty->assign( 'prev_page', 1 );
+	}
+	$gBitSmarty->assign( 'first_page', 1 );
+	$gBitSmarty->assign( 'last_page', $pages );
+	$gBitSmarty->assign( 'pagenum', $_REQUEST['pagenum'] );
+}
+
+// Comments engine!
+if( $gBitSystem->isFeatureActive( 'wiki_comments' )) {
+	$comments_vars = array( 'page' );
+	$comments_prefix_var = 'wiki page:';
+	$comments_object_var = 'page';
+	$commentsParentId = $gContent->mContentId;
+	$comments_return_url = WIKI_PKG_URL.'index.php?page_id='.$gContent->mPageId;
+	# Support displaying comments on their own page instead of on content page
+	if( isset( $_REQUEST["comments_page"] ) && ( $_REQUEST["comments_page"] == '1' ) || !empty( $_REQUEST['view_comment_id'] )) {
+		$gBitSmarty->assign( 'comments_page', 1 );
+		$comments_on_separate_page = 1;
+		$comments_return_url = WIKI_PKG_URL.'index.php?page_id='.$gContent->mPageId.'&amp;comments_page=1';
+		if ( !empty($_REQUEST['view_comment_id']) ) {
+			$comments_return_url .= '&amp;comments_maxComments=1';
+		}
+	}
+	include_once( LIBERTY_PKG_PATH.'comments_inc.php' );
+}
+
+// Footnotes
+if( $gBitSystem->isFeatureActive( 'wiki_footnotes' ) && $gBitUser->isValid() ) {
+	if( $footnote = $gContent->getFootnote( $gBitUser->mUserId ) ) {
+		$gBitSmarty->assign( 'footnote', LibertyContent::parseDataHash( $footnote ) );
+	}
+}
+
+// Copyrights
+if( $gBitSystem->isFeatureActive( 'wiki_copyrights' ) ) {
+	require_once( WIKI_PKG_INCLUDE_PATH.'copyrights_lib.php' );
+	$copyrights = $copyrightslib->list_copyrights( $gContent->mPageId );
+	$gBitSmarty->assign('pageCopyrights', $copyrights["data"]);
+}
+
+// Watches
+if( $gBitSystem->isFeatureActive( 'users_watches' ) ) {
+	if( !empty( $_REQUEST['watch_event'] ) ) {
+		if( $gBitUser->isRegistered() ) {
+			if( $_REQUEST['watch_action']=='add' ) {
+				$gBitUser->storeWatch( $_REQUEST['watch_event'], $_REQUEST['watch_object'], $gContent->mContentTypeGuid, $gContent->mPageName, $gContent->getDisplayUrl() );
+			} else {
+				$gBitUser->expungeWatch( $_REQUEST['watch_event'], $_REQUEST['watch_object'] );
+			}
+		} else {
+			$gBitSystem->fatalError( tra( "This feature requires a registered user. ").": users_watches" );
+		}
+	}
+
+	if( $watch = $gBitUser->getEventWatches( 'wiki_page_changed', $gContent->mPageId ) ) {
+		$gBitSmarty->assign( 'user_watching_page', 'y' );
+	}
+}
+
+if( $gContent->isValid() && $gBitSystem->isPackageActive( 'stickies' ) ) {
+	require_once( STICKIES_PKG_PATH.'BitSticky.php' );
+	global $gNote;
+	$gNote = new BitSticky( NULL, NULL, $gContent->mContentId );
+	$gNote->load();
+	$gBitSmarty->assignByRef( 'stickyInfo', $gNote->mInfo );
+}
+
+$pageInfo = $gContent->mInfo;
+$pageInfo['title'] = $gContent->getTitle();
+
+// Display the Index Template
+$gBitSmarty->assignByRef( 'pageInfo', $pageInfo );
+
+// S5 slideshows
+if( isset( $_REQUEST['s5'] )) {
+	include_once( WIKI_PKG_PATH.'s5.php');
+}
+
+$gBitSystem->display( 'bitpackage:wiki/show_page.tpl', $pageInfo['title'], array( 'display_mode' => 'display' ));
+?>
diff --git a/includes/export_lib.php b/includes/export_lib.php
new file mode 100644
index 0000000..e63877c
--- /dev/null
+++ b/includes/export_lib.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright (c) 2004 bitweaver.org
+ * Copyright (c) 2003 tikwiki.org
+ * Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
+ * 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 wiki
+ */
+
+/**
+ * required setup
+ */
+require_once( KERNEL_PKG_PATH.'BitBase.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
+/**
+ * @package wiki
+ * @subpackage ExportLib
+ */
+class ExportLib extends BitBase {
+
+	function MakeWikiZip( $pExportFile ) {
+		global $gBitUser,$gBitSystem;
+		include_once (UTIL_PKG_INC."tar.class.php");
+		$tar = new tar();
+		$query = "SELECT wp.`page_id` from `".BIT_DB_PREFIX."wiki_pages` wp INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id` = wp.`content_id`) 
+				  ORDER BY lc.".$this->mDb->convertSortmode("title_asc");
+		$result = $this->mDb->query($query,array());
+		while ($res = $result->fetchRow()) {
+			$page_id = $res["page_id"];
+			$content = $this->export_wiki_page($page_id, 0);
+			$tar->addData($page_id, $content, $gBitSystem->getUTCTime());
+		}
+		$tar->toTar( $pExportFile, FALSE); 
+		return '';
+	}
+
+	function export_wiki_page($page_id, $nversions = 1) {
+		global $gBitSystem;
+		$head = '';
+		$head .= "Date: " . $gBitSystem->mServerTimestamp->get_rfc2822_datetime(). "\r\n";
+		$head .= sprintf("Mime-Version: 1.0 (Produced by Tiki)\r\n");
+		$iter = $this->get_page_history($page_id);
+		$gWikiPage = new BitPage( $page_id );
+		$gWikiPage->load();
+		$info = $gWikiPage->mInfo;
+		$parts = array();
+		$parts[] = MimeifyPageRevision($info);
+		if ($nversions > 1 || $nversions == 0) {
+			foreach ($iter as $revision) {
+				$parts[] = MimeifyPageRevision($revision);
+				if ($nversions > 0 && count($parts) >= $nversions)
+					break;
+			}
+		}
+		if (count($parts) > 1)
+			return $head . MimeMultipart($parts);
+		assert ($parts);
+		return $head . $parts[0];
+	}
+
+	// Returns all the versions for this page
+	// without the data itself
+	function get_page_history($page_id) {
+		$query = "SELECT lc.`title`, th.`description`, th.`version`, th.`last_modified`, th.`user_id`, th.`ip`, th.`data`, th.`history_comment`, uu.`login` as `creator_user`, uu.`real_name` " .
+				 "FROM `".BIT_DB_PREFIX."wiki_pages` wp " .
+				 "INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id` = wp.`content_id`) " .
+				 "INNER JOIN `".BIT_DB_PREFIX."liberty_content_history` th ON (th.`page_id` = th.`page_id`) " .
+				 "INNER JOIN `".BIT_DB_PREFIX."users_users` uu ON (uu.`user_id` = th.`user_id`) " .
+				 "WHERE wp.`page_id`=? order by th.".$this->mDb->convertSortmode("version_desc");
+		$result = $this->mDb->query($query,array($page_id));
+		$ret = array();
+		while ($res = $result->fetchRow()) {
+			array_push( $ret, $res );
+		}
+		return $ret;
+	}
+}
+$exportlib = new ExportLib();
+?>
diff --git a/includes/lookup_page_inc.php b/includes/lookup_page_inc.php
new file mode 100644
index 0000000..0fd5e17
--- /dev/null
+++ b/includes/lookup_page_inc.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright (c) 2004 bitweaver.org
+ * Copyright (c) 2003 tikwiki.org
+ * Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
+ * 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 wiki
+ * @subpackage functions
+ */
+
+/**
+ * required setup
+ */
+require_once( WIKI_PKG_CLASS_PATH.'BitBook.php');
+
+global $gContent;
+include_once( LIBERTY_PKG_PATH.'lookup_content_inc.php' );
+
+// this is needed when the center module is applied to avoid abusing $_REQUEST
+if( empty( $lookupHash )) {
+	$lookupHash = &$_REQUEST;
+}
+
+// if we already have a gContent, we assume someone else created it for us, and has properly loaded everything up.
+if( empty( $gContent ) || !is_object( $gContent ) || strtolower( get_class( $gContent ) ) != 'bitpage' ) {
+	if( !empty( $lookupHash['page_id'] ) )  {
+		$loadContentId = BitPage::findContentIdByPageId( $lookupHash['page_id'] );
+	} elseif( !empty( $lookupHash['content_id'] ) ) {
+		$loadContentId = $lookupHash['content_id'];
+	} elseif( !empty( $lookupHash['page'] ) ) {
+		//handle legacy forms that use plain 'page' form variable name
+
+		//if page had some special enities they were changed to HTML for for security reasons.
+		//now we deal only with string so convert it back - so we can support this case:
+		//You&Me --(detoxify in kernel)--> You&amp;Me --(now)--> You&Me
+		//we could do htmlspecialchars_decode but it allows <> marks here, so we just transform &amp; to & - it's not so scary.
+		$loadPage = str_replace("&amp;", "&", $lookupHash['page'] );
+		// Fix nignx mapping of '+' sign when doing rewrite
+		$loadPage = str_replace("+", " ", $loadPage );
+
+		if( $loadPage && $existsInfo = BitPage::pageExists( $loadPage ) ) {
+			if (count($existsInfo)) {
+				if (count($existsInfo) > 1) {
+					// Display page so user can select which wiki page they want (there are multiple that share this name)
+					$gBitSmarty->assign( 'choose', $lookupHash['page'] );
+					$gBitSmarty->assign('dupePages', $existsInfo);
+					$gBitSystem->display('bitpackage:wiki/page_select.tpl', NULL, array( 'display_mode' => 'display' ));
+					die;
+				} else {
+					$loadPageId = $existsInfo[0]['page_id'];
+					$loadContentId = $existsInfo[0]['content_id'];
+				}
+			}
+		} elseif( $loadPage ) {
+			$gBitSmarty->assign('page', $loadPage);//to have the create page link in the error
+		}
+	}
+
+	if( !empty( $loadContentId ) ) {
+		$gContent = BitPage::getLibertyObject( $loadContentId );
+	}
+
+	if( empty( $gContent ) || !is_object( $gContent ) ) {
+		$gContent = new BitPage();
+	}
+}
+
+// we weren't passed a structure, but maybe this page belongs to one. let's check...
+if( $gContent->isValid() && empty( $gStructure ) ) {
+	//Get the structures this page is a member of
+	if( !empty($lookupHash['structure']) ) {
+		$structure=$lookupHash['structure'];
+	} else {
+		$structure='';
+	}
+	$structs = $gContent->getStructures();
+	if (count($structs)==1) {
+		$gStructure = new LibertyStructure( $structs[0]['structure_id'] );
+		if( $gStructure->load() ) {
+			$gStructure->loadNavigation();
+			$gStructure->loadPath();
+			$gBitSmarty->assign( 'structureInfo', $gStructure->mInfo );
+		}
+	} else {
+		$gBitSmarty->assign('showstructs', $structs);
+	}
+}
+
+$gBitSmarty->clearAssign( 'gContent' );
+$gBitSmarty->assignByRef( 'gContent', $gContent );
+?>
diff --git a/includes/plugins_lib.php b/includes/plugins_lib.php
new file mode 100644
index 0000000..61ffe41
--- /dev/null
+++ b/includes/plugins_lib.php
@@ -0,0 +1,208 @@
+<?php
+    /**
+    * Plugin Lib
+    *
+    * A port of PhpWiki WikiPlugin class
+    * Principal use is port PhpWiki plugins, but can be used to make new ones.
+    * Use:
+    * - Extends PluginsLib with your class
+    * - add the lines
+    * <code>
+    * include "pluginslib.php";
+    *
+    * function wikiplugin_backlinks($data, $params) {
+    *    $plugin = new BackLinks();
+    *    return $plugin->run($data, $params);
+    * }
+    * function wikiplugin_backlinks_help() {
+    *    $plugin = new BackLinks();
+    *    return $plugin->getDescription();
+    * }    * </code>
+    * @package wiki
+	*/
+
+	/**	
+    * @package wiki
+    * @subpackage PluginsLib
+    * @author Claudio Bustos
+    * @version $Revision$
+    */
+    class PluginsLib extends BitBase {
+        public $_errors;
+        public $_data;
+        public $_params;
+        /**
+        * Array of params to be expanded as arrays. Explode the string with {@link $separator}
+        * @var array
+        */
+        public $expanded_params = array();
+        /**
+        * Separator used to explote params listed on {@link $expanded_params}
+        * @var string
+        */
+        public $separator = "|";
+        /**
+        * List of fields retrieved from {@link BitBase::list_pages()}
+        * Keys are the name of the fields and values the names for tra();
+        * @var array
+        */
+        public $aInfoPresetNames = array(
+        "hits" => "Hits", "last_modified" => "Last mod", "user" => "Last author", "len" => "Size", "comment" => "Com", "creator" => "Creator", "version" => "Last ver", "flag" => "Status", "versions" => "Vers", "links" => "Links", "backlinks" => "Backlinks");
+
+        /**
+        * Process the params, in this order:
+        * - default values, asigned on {@link PluginsLib::getDefaultArguments()}
+        * - request values, sended by GET or POST method, if $request is put to true
+        * - explicit values, asigned on the Wiki
+        * @param array sended to wikiplugin_name($data, $params)
+        * @param bool if set to true, accept values from $_REQUEST
+        * @param bool if set to true, assign default values from {@link PluginsLib::getDefaultArguments()}
+        * @return array list of params
+        */
+        function getParams($params, $request = false, $defaults = false) {
+            if ($defaults === false) {
+                $defaults = $this->getDefaultArguments();
+            }
+            $args = array();
+            foreach ($defaults as $arg => $default_val) {
+                if (isset($params[$arg])) {
+                    $args[$arg] = $params[$arg];
+                } elseif(isset($_REQUEST[$arg])) {
+                    $args[$arg] = $_REQUEST[$arg];
+                } else {
+                    // maybe this kind of transformation can be grouped on a external function
+                    if ($default_val==="[pagename]") {
+                        $default_val=$_REQUEST["page"];
+                    }
+                    $args[$arg] = $default_val;
+                }
+                if (in_array($arg, $this->expanded_params)) {
+                    if ($args[$arg]) {
+                    $args[$arg] = explode($this->separator, $args[$arg]);
+                    foreach($args[$arg] as $id=>$value) {
+                        $args[$arg][$id]=trim($value);
+                    }
+                    } else {
+                    $args[$arg]=array();
+                    }
+                }
+            }
+            return $args;
+        }
+        /**
+        * Returns the name of the Plugin
+        * By default, erase the first 'WikiPlugin'
+        * Made for overload it.
+        * @return string
+        */
+        function getName() {
+            return preg_replace('/^WikiPlugin/', '', get_class($this));
+        }
+        /**
+        * Returns a description of the Plugin
+        * Made for overload it.
+        * @return string
+        */
+        function getDescription() {
+            return $this->getName();
+        }
+        /**
+        * Returns the version of the version
+        * Made for overload it.
+        * @return string
+        */
+        function getVersion() {
+            return tra("No version indicated");
+            //return preg_replace("/[Revision: $]/", '',
+            //                    "\$Revision$");
+        }
+        /**
+        * Returns the default arguments for the plugin
+        * Use keys as the arguments and values as ... the default values
+        * @return array
+        */
+        function getDefaultArguments() {
+            return array('description' => $this->getDescription());
+        }
+        /**
+        * Run the plugin
+        * For sake of God, overload it!
+        * @param string
+        * @param array
+        */
+        function run ($data, $params) {
+            /**
+            * UGLY ERROR!.
+            */
+            return $this->error("PluginsLib::run: pure virtual function. Don't be so lazy!");
+        }
+        function error ($message) {
+            return "~np~<span class='warn'>Plugin ".$this->getName()." ".tra("failed")." : ".tra($message)."</span>~/np~";
+        }
+        function getErrorDetail() {
+            return $this->_errors;
+        }
+        function _error($message) {
+            $this->_errors = $message;
+            return false;
+        }
+    }
+    /**
+    * Class with utilities for Plugins
+	*
+    * @package wiki
+    * @subpackage PluginsLib
+    * @author Claudio Bustos
+    * @version $Revision$
+    */
+    class PluginsLibUtil {
+        /**
+        * Create a table with information from pages
+        * @param array key ["data"] from one of the functions that retrieve información about pages
+        * @param array list of keys to show.
+        * @param array definition of the principal field. By default:
+        *              array("field"=>"title","name"=>"Page")
+        * @return string
+        */
+        function createTable($aData,$aInfo=false,$aPrincipalField=false) {
+            // contract
+            if (!$aPrincipalField or !is_array($aPrincipalField)) {
+                $aPrincipalField=array("field"=>"title","name"=>"Page");
+            }
+            if (!is_array($aInfo)) {
+                $aInfo=false;
+            }
+            // ~contract
+            $sOutput="";
+            if ($aInfo) {
+                $iNumCol=count($aInfo)+1;
+                $sStyle=" style='width:".(floor(100/$iNumCol))."%' ";
+                // Header for info
+                $sOutput  .= "<table class='normal'><tr><td class='heading' $sStyle>".tra($aPrincipalField["name"])."</td>";
+                foreach($aInfo as $iInfo => $sHeader) {
+                    $sOutput  .= "<td class='heading' $sStyle >".tra($sHeader)."</td>";
+                }
+                $sOutput  .= "</tr>";
+            }
+            $iCounter=1;
+            foreach($aData as $aPage) {
+                $sClass=($iCounter%2)?"odd":"even";
+                if (!$aInfo) {
+                    $sOutput  .= "*((".$aPage[$aPrincipalField["field"]]."))\n";
+                } else {
+                    $sOutput  .= "<tr><td class='$sClass'>((".$aPage[$aPrincipalField["field"]]."))</td>";
+                    foreach($aInfo as $sInfo) {
+                        if (isset($aPage[$sInfo])) {
+                            $sOutput  .= "<td class='$sClass'>".$aPage[$sInfo]."</td>";
+                        }
+                    }
+                }
+            $iCounter++;
+            }
+                if ($aInfo) {
+                    $sOutput  .= "</table>";
+                }
+        return $sOutput;
+        }
+    }
+?>
diff --git a/index.php b/index.php
index 676a1ac..21f4986 100644
--- a/index.php
+++ b/index.php
@@ -43,9 +43,9 @@ if( !empty( $_REQUEST['structure_id'] ) ) {
 		$gHome->store( $homeHash );
 	}
 
-	include( WIKI_PKG_PATH.'lookup_page_inc.php' );
+	include( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php' );
 	if( $gContent->isValid() ) {
 		$gBitSystem->setCanonicalLink( $gContent->getDisplayUrl() );
 	}
-	include( WIKI_PKG_PATH.'display_bitpage_inc.php' );
+	include( WIKI_PKG_INCLUDE_PATH.'display_bitpage_inc.php' );
 }
diff --git a/like_pages.php b/like_pages.php
index d23c719..5a9a700 100644
--- a/like_pages.php
+++ b/like_pages.php
@@ -14,8 +14,8 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-include_once( WIKI_PKG_PATH.'BitPage.php');
-include_once( WIKI_PKG_PATH.'lookup_page_inc.php' );
+include_once( WIKI_PKG_CLASS_PATH.'BitPage.php');
+include_once( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php' );
 $gBitSystem->verifyPackage( 'wiki' );
 $gBitSystem->verifyFeature( 'wiki_like_pages' );
 $gBitSystem->verifyPermission( 'p_wiki_list_pages' );
diff --git a/lookup_page_inc.php b/lookup_page_inc.php
deleted file mode 100644
index 0fd5e17..0000000
--- a/lookup_page_inc.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Copyright (c) 2004 bitweaver.org
- * Copyright (c) 2003 tikwiki.org
- * Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
- * 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 wiki
- * @subpackage functions
- */
-
-/**
- * required setup
- */
-require_once( WIKI_PKG_CLASS_PATH.'BitBook.php');
-
-global $gContent;
-include_once( LIBERTY_PKG_PATH.'lookup_content_inc.php' );
-
-// this is needed when the center module is applied to avoid abusing $_REQUEST
-if( empty( $lookupHash )) {
-	$lookupHash = &$_REQUEST;
-}
-
-// if we already have a gContent, we assume someone else created it for us, and has properly loaded everything up.
-if( empty( $gContent ) || !is_object( $gContent ) || strtolower( get_class( $gContent ) ) != 'bitpage' ) {
-	if( !empty( $lookupHash['page_id'] ) )  {
-		$loadContentId = BitPage::findContentIdByPageId( $lookupHash['page_id'] );
-	} elseif( !empty( $lookupHash['content_id'] ) ) {
-		$loadContentId = $lookupHash['content_id'];
-	} elseif( !empty( $lookupHash['page'] ) ) {
-		//handle legacy forms that use plain 'page' form variable name
-
-		//if page had some special enities they were changed to HTML for for security reasons.
-		//now we deal only with string so convert it back - so we can support this case:
-		//You&Me --(detoxify in kernel)--> You&amp;Me --(now)--> You&Me
-		//we could do htmlspecialchars_decode but it allows <> marks here, so we just transform &amp; to & - it's not so scary.
-		$loadPage = str_replace("&amp;", "&", $lookupHash['page'] );
-		// Fix nignx mapping of '+' sign when doing rewrite
-		$loadPage = str_replace("+", " ", $loadPage );
-
-		if( $loadPage && $existsInfo = BitPage::pageExists( $loadPage ) ) {
-			if (count($existsInfo)) {
-				if (count($existsInfo) > 1) {
-					// Display page so user can select which wiki page they want (there are multiple that share this name)
-					$gBitSmarty->assign( 'choose', $lookupHash['page'] );
-					$gBitSmarty->assign('dupePages', $existsInfo);
-					$gBitSystem->display('bitpackage:wiki/page_select.tpl', NULL, array( 'display_mode' => 'display' ));
-					die;
-				} else {
-					$loadPageId = $existsInfo[0]['page_id'];
-					$loadContentId = $existsInfo[0]['content_id'];
-				}
-			}
-		} elseif( $loadPage ) {
-			$gBitSmarty->assign('page', $loadPage);//to have the create page link in the error
-		}
-	}
-
-	if( !empty( $loadContentId ) ) {
-		$gContent = BitPage::getLibertyObject( $loadContentId );
-	}
-
-	if( empty( $gContent ) || !is_object( $gContent ) ) {
-		$gContent = new BitPage();
-	}
-}
-
-// we weren't passed a structure, but maybe this page belongs to one. let's check...
-if( $gContent->isValid() && empty( $gStructure ) ) {
-	//Get the structures this page is a member of
-	if( !empty($lookupHash['structure']) ) {
-		$structure=$lookupHash['structure'];
-	} else {
-		$structure='';
-	}
-	$structs = $gContent->getStructures();
-	if (count($structs)==1) {
-		$gStructure = new LibertyStructure( $structs[0]['structure_id'] );
-		if( $gStructure->load() ) {
-			$gStructure->loadNavigation();
-			$gStructure->loadPath();
-			$gBitSmarty->assign( 'structureInfo', $gStructure->mInfo );
-		}
-	} else {
-		$gBitSmarty->assign('showstructs', $structs);
-	}
-}
-
-$gBitSmarty->clearAssign( 'gContent' );
-$gBitSmarty->assignByRef( 'gContent', $gContent );
-?>
diff --git a/page_history.php b/page_history.php
index 1c7653e..03f8af2 100644
--- a/page_history.php
+++ b/page_history.php
@@ -20,7 +20,7 @@ $gBitSystem->verifyPackage( 'wiki' );
 $gBitSystem->verifyFeature( 'wiki_history' );
 
 // Get the page from the request var or default it to HomePage
-include( WIKI_PKG_PATH.'lookup_page_inc.php' );
+include( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php' );
 
 //vd($gContent->mPageId);vd($gContent->mInfo);
 if( !$gContent->isValid() || empty( $gContent->mInfo ) ) {
diff --git a/plugins_lib.php b/plugins_lib.php
deleted file mode 100644
index 61ffe41..0000000
--- a/plugins_lib.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-    /**
-    * Plugin Lib
-    *
-    * A port of PhpWiki WikiPlugin class
-    * Principal use is port PhpWiki plugins, but can be used to make new ones.
-    * Use:
-    * - Extends PluginsLib with your class
-    * - add the lines
-    * <code>
-    * include "pluginslib.php";
-    *
-    * function wikiplugin_backlinks($data, $params) {
-    *    $plugin = new BackLinks();
-    *    return $plugin->run($data, $params);
-    * }
-    * function wikiplugin_backlinks_help() {
-    *    $plugin = new BackLinks();
-    *    return $plugin->getDescription();
-    * }    * </code>
-    * @package wiki
-	*/
-
-	/**	
-    * @package wiki
-    * @subpackage PluginsLib
-    * @author Claudio Bustos
-    * @version $Revision$
-    */
-    class PluginsLib extends BitBase {
-        public $_errors;
-        public $_data;
-        public $_params;
-        /**
-        * Array of params to be expanded as arrays. Explode the string with {@link $separator}
-        * @var array
-        */
-        public $expanded_params = array();
-        /**
-        * Separator used to explote params listed on {@link $expanded_params}
-        * @var string
-        */
-        public $separator = "|";
-        /**
-        * List of fields retrieved from {@link BitBase::list_pages()}
-        * Keys are the name of the fields and values the names for tra();
-        * @var array
-        */
-        public $aInfoPresetNames = array(
-        "hits" => "Hits", "last_modified" => "Last mod", "user" => "Last author", "len" => "Size", "comment" => "Com", "creator" => "Creator", "version" => "Last ver", "flag" => "Status", "versions" => "Vers", "links" => "Links", "backlinks" => "Backlinks");
-
-        /**
-        * Process the params, in this order:
-        * - default values, asigned on {@link PluginsLib::getDefaultArguments()}
-        * - request values, sended by GET or POST method, if $request is put to true
-        * - explicit values, asigned on the Wiki
-        * @param array sended to wikiplugin_name($data, $params)
-        * @param bool if set to true, accept values from $_REQUEST
-        * @param bool if set to true, assign default values from {@link PluginsLib::getDefaultArguments()}
-        * @return array list of params
-        */
-        function getParams($params, $request = false, $defaults = false) {
-            if ($defaults === false) {
-                $defaults = $this->getDefaultArguments();
-            }
-            $args = array();
-            foreach ($defaults as $arg => $default_val) {
-                if (isset($params[$arg])) {
-                    $args[$arg] = $params[$arg];
-                } elseif(isset($_REQUEST[$arg])) {
-                    $args[$arg] = $_REQUEST[$arg];
-                } else {
-                    // maybe this kind of transformation can be grouped on a external function
-                    if ($default_val==="[pagename]") {
-                        $default_val=$_REQUEST["page"];
-                    }
-                    $args[$arg] = $default_val;
-                }
-                if (in_array($arg, $this->expanded_params)) {
-                    if ($args[$arg]) {
-                    $args[$arg] = explode($this->separator, $args[$arg]);
-                    foreach($args[$arg] as $id=>$value) {
-                        $args[$arg][$id]=trim($value);
-                    }
-                    } else {
-                    $args[$arg]=array();
-                    }
-                }
-            }
-            return $args;
-        }
-        /**
-        * Returns the name of the Plugin
-        * By default, erase the first 'WikiPlugin'
-        * Made for overload it.
-        * @return string
-        */
-        function getName() {
-            return preg_replace('/^WikiPlugin/', '', get_class($this));
-        }
-        /**
-        * Returns a description of the Plugin
-        * Made for overload it.
-        * @return string
-        */
-        function getDescription() {
-            return $this->getName();
-        }
-        /**
-        * Returns the version of the version
-        * Made for overload it.
-        * @return string
-        */
-        function getVersion() {
-            return tra("No version indicated");
-            //return preg_replace("/[Revision: $]/", '',
-            //                    "\$Revision$");
-        }
-        /**
-        * Returns the default arguments for the plugin
-        * Use keys as the arguments and values as ... the default values
-        * @return array
-        */
-        function getDefaultArguments() {
-            return array('description' => $this->getDescription());
-        }
-        /**
-        * Run the plugin
-        * For sake of God, overload it!
-        * @param string
-        * @param array
-        */
-        function run ($data, $params) {
-            /**
-            * UGLY ERROR!.
-            */
-            return $this->error("PluginsLib::run: pure virtual function. Don't be so lazy!");
-        }
-        function error ($message) {
-            return "~np~<span class='warn'>Plugin ".$this->getName()." ".tra("failed")." : ".tra($message)."</span>~/np~";
-        }
-        function getErrorDetail() {
-            return $this->_errors;
-        }
-        function _error($message) {
-            $this->_errors = $message;
-            return false;
-        }
-    }
-    /**
-    * Class with utilities for Plugins
-	*
-    * @package wiki
-    * @subpackage PluginsLib
-    * @author Claudio Bustos
-    * @version $Revision$
-    */
-    class PluginsLibUtil {
-        /**
-        * Create a table with information from pages
-        * @param array key ["data"] from one of the functions that retrieve información about pages
-        * @param array list of keys to show.
-        * @param array definition of the principal field. By default:
-        *              array("field"=>"title","name"=>"Page")
-        * @return string
-        */
-        function createTable($aData,$aInfo=false,$aPrincipalField=false) {
-            // contract
-            if (!$aPrincipalField or !is_array($aPrincipalField)) {
-                $aPrincipalField=array("field"=>"title","name"=>"Page");
-            }
-            if (!is_array($aInfo)) {
-                $aInfo=false;
-            }
-            // ~contract
-            $sOutput="";
-            if ($aInfo) {
-                $iNumCol=count($aInfo)+1;
-                $sStyle=" style='width:".(floor(100/$iNumCol))."%' ";
-                // Header for info
-                $sOutput  .= "<table class='normal'><tr><td class='heading' $sStyle>".tra($aPrincipalField["name"])."</td>";
-                foreach($aInfo as $iInfo => $sHeader) {
-                    $sOutput  .= "<td class='heading' $sStyle >".tra($sHeader)."</td>";
-                }
-                $sOutput  .= "</tr>";
-            }
-            $iCounter=1;
-            foreach($aData as $aPage) {
-                $sClass=($iCounter%2)?"odd":"even";
-                if (!$aInfo) {
-                    $sOutput  .= "*((".$aPage[$aPrincipalField["field"]]."))\n";
-                } else {
-                    $sOutput  .= "<tr><td class='$sClass'>((".$aPage[$aPrincipalField["field"]]."))</td>";
-                    foreach($aInfo as $sInfo) {
-                        if (isset($aPage[$sInfo])) {
-                            $sOutput  .= "<td class='$sClass'>".$aPage[$sInfo]."</td>";
-                        }
-                    }
-                }
-            $iCounter++;
-            }
-                if ($aInfo) {
-                    $sOutput  .= "</table>";
-                }
-        return $sOutput;
-        }
-    }
-?>
diff --git a/remove_page.php b/remove_page.php
index ea7f86e..dbf0247 100644
--- a/remove_page.php
+++ b/remove_page.php
@@ -14,8 +14,8 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-include_once( WIKI_PKG_PATH.'BitPage.php');
-include_once( WIKI_PKG_PATH.'lookup_page_inc.php' );
+include_once( WIKI_PKG_CLASS_PATH.'BitPage.php');
+include_once( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php' );
 
 $gBitSystem->verifyPackage( 'wiki' );
 
diff --git a/wiki_graph.php b/wiki_graph.php
index d4c82fa..19b34c6 100644
--- a/wiki_graph.php
+++ b/wiki_graph.php
@@ -14,8 +14,8 @@
  * required setup
  */
 include_once( '../kernel/setup_inc.php' );
-include_once( WIKI_PKG_PATH.'BitPage.php');
-include_once( WIKI_PKG_PATH.'lookup_page_inc.php');
+include_once( WIKI_PKG_CLASS_PATH.'BitPage.php');
+include_once( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php');
 include_once( 'Image/GraphViz.php' );
 $graph = new Image_GraphViz();
 
-- 
cgit v1.3


From 46f16280083e21264d6499899f447999a95a534e Mon Sep 17 00:00:00 2001
From: modela bitweaver <spiderr@bitweaver.org>
Date: Tue, 2 Feb 2021 01:17:54 -0500
Subject: move _inc and _lib to includes/ and use PKG_INCLUDE_PATH constants

---
 admin/upgrade_inc.php              | 6 +++---
 edit.php                           | 6 +++---
 edit_book.php                      | 8 ++++----
 export_wiki_pages.php              | 2 +-
 includes/classes/BitBook.php       | 2 +-
 includes/classes/BitPage.php       | 2 +-
 includes/display_bitpage_inc.php   | 2 +-
 includes/export_lib.php            | 2 +-
 includes/lookup_page_inc.php       | 2 +-
 index.php                          | 2 +-
 modules/mod_wiki_last_comments.php | 2 +-
 page_history.php                   | 2 +-
 page_watches.php                   | 4 ++--
 slideshow.php                      | 4 ++--
 wiki_rss.php                       | 4 ++--
 15 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php
index 65d2c0e..0431384 100644
--- a/admin/upgrade_inc.php
+++ b/admin/upgrade_inc.php
@@ -84,7 +84,7 @@ array( 'ALTER' => array(
 // STEP 3
 array( 'PHP' => '
 	global $gBitSystem;
-	require_once( WIKI_PKG_PATH."BitPage.php" );
+	require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 	$max = $gBitSystem->mDb->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`
@@ -225,8 +225,8 @@ array( 'QUERY' =>
 // STEP 5
 array( 'PHP' => '
 	global $gBitSystem;
-	require_once( LIBERTY_PKG_PATH."LibertyStructure.php" );
-	require_once( WIKI_PKG_PATH."BitBook.php" );
+	require_once( LIBERTY_PKG_CLASS_PATH.'LibertyStructure.php' );
+	require_once( WIKI_PKG_CLASS_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->mDb->getAssoc( $query );
 	$s = new LibertyStructure();
diff --git a/edit.php b/edit.php
index 36cf39e..ccfb2c3 100644
--- a/edit.php
+++ b/edit.php
@@ -32,7 +32,7 @@ if( $gContent->isValid() ) {
 
 //make comment count for this page available for templates
 if( $gBitSystem->isFeatureActive( 'wiki_comments' ) && !empty( $_REQUEST['page_id'] ) ) {
-	require_once( LIBERTY_PKG_PATH.'LibertyComment.php' );
+	require_once( LIBERTY_PKG_CLASS_PATH.'LibertyComment.php' );
 	$gComment = new LibertyComment();
 	$numComments = $gComment->getNumComments($gContent->mContentId);
 	$gBitSmarty->assign('comments_count', $numComments);
@@ -413,7 +413,7 @@ if( isset( $_REQUEST["suck_url"] ) ) {
 		$gBitSystem->fatalError( tra( "Importing remote URLs is disabled" ));
 	}
 	// Suck another page and append to the end of current
-	require_once( UTIL_PKG_INC.'htmlparser/html_parser_inc.php' );
+	require_once( UTIL_PKG_INCLUDE_PATH.'htmlparser/html_parser_inc.php' );
 	$suck_url = isset( $_REQUEST["suck_url"] ) ? $_REQUEST["suck_url"] : '';
 	$parsehtml = isset( $_REQUEST["parsehtml"] ) ? ( $_REQUEST["parsehtml"] == 'on' ? 'y' : 'n' ): 'n';
 	if( isset( $_REQUEST['do_suck'] ) && strlen( $suck_url ) > 0 ) {
@@ -443,7 +443,7 @@ if( isset( $_REQUEST["suck_url"] ) ) {
 		// Need to parse HTML?
 		if( $parsehtml == 'y' ) {
 			// Read compiled( serialized ) grammar
-			$grammarfile = UTIL_PKG_INC.'htmlparser/htmlgrammar.cmp';
+			$grammarfile = UTIL_PKG_INCLUDE_PATH.'htmlparser/htmlgrammar.cmp';
 			if( !$fp = @fopen( $grammarfile,'r' ) ) {
 				$gBitSystem->fatalError( tra( "Can't parse remote HTML page" ));
 			}
diff --git a/edit_book.php b/edit_book.php
index 3257ca0..ee2dfd5 100644
--- a/edit_book.php
+++ b/edit_book.php
@@ -22,8 +22,8 @@ if( isset( $_COOKIE['book_section'] ) && $_COOKIE['book_section'] == 'o' ) {
 }
 $gBitSmarty->assign( 'book_section',$book_section );
 
-include_once( LIBERTY_PKG_PATH.'LibertyStructure.php');
-include_once( WIKI_PKG_PATH.'BitBook.php');
+include_once( LIBERTY_PKG_CLASS_PATH.'LibertyStructure.php');
+include_once( WIKI_PKG_CLASS_PATH.'BitBook.php');
 
 global $gStructure;
 
@@ -34,7 +34,7 @@ global $gStructure;
 // get a book instance
 global $gContent;
 if( @BitBase::verifyId( $_REQUEST["structure_id"] ) || @BitBase::verifyId( $_REQUEST["content_id"] ) ) {
-	include_once( LIBERTY_PKG_PATH.'lookup_content_inc.php' );
+	include_once( LIBERTY_PKG_INCLUDE_PATH.'lookup_content_inc.php' );
 	if( empty( $gContent ) ){
 		$gBitSystem->fatalError( 'Error: Invalid structure id, the book you requested could not be found.' );
 	} elseif( empty( $_REQUEST["structure_id"] ) ) {
@@ -140,7 +140,7 @@ if( isset($_REQUEST["createstructure"]) ) {
 
 	// set the correct display template
 	$mid = 'bitpackage:wiki/edit_book.tpl';
-	include_once( LIBERTY_PKG_PATH.'edit_structure_inc.php');
+	include_once( LIBERTY_PKG_INCLUDE_PATH.'edit_structure_inc.php');
 	if( $gBitThemes->isAjaxRequest() ) {
 		$gBitSmarty->display( 'bitpackage:kernel/feedback_inc.tpl' );
 	}
diff --git a/export_wiki_pages.php b/export_wiki_pages.php
index 1c5d5bb..26baa89 100644
--- a/export_wiki_pages.php
+++ b/export_wiki_pages.php
@@ -14,7 +14,7 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-include_once( UTIL_PKG_INC.'zip_lib.php' );
+include_once( UTIL_PKG_INCLUDE_PATH.'zip_lib.php' );
 include_once( WIKI_PKG_INCLUDE_PATH.'export_lib.php' );
 if (!$gBitUser->hasPermission( 'p_wiki_admin' ))
 	die;
diff --git a/includes/classes/BitBook.php b/includes/classes/BitBook.php
index a028742..f31d35a 100644
--- a/includes/classes/BitBook.php
+++ b/includes/classes/BitBook.php
@@ -25,7 +25,7 @@
  * required setup
  */
 require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
-require_once( LIBERTY_PKG_PATH.'LibertyStructure.php' );
+require_once( LIBERTY_PKG_CLASS_PATH.'LibertyStructure.php' );
 
 define('BITBOOK_CONTENT_TYPE_GUID', 'bitbook' );
 
diff --git a/includes/classes/BitPage.php b/includes/classes/BitPage.php
index 48e2f84..9b2b03a 100644
--- a/includes/classes/BitPage.php
+++ b/includes/classes/BitPage.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( LIBERTY_PKG_PATH.'LibertyMime.php' );
+require_once( LIBERTY_PKG_CLASS_PATH.'LibertyMime.php' );
 
 /**
  * @package wiki
diff --git a/includes/display_bitpage_inc.php b/includes/display_bitpage_inc.php
index a8c92f6..57beec0 100644
--- a/includes/display_bitpage_inc.php
+++ b/includes/display_bitpage_inc.php
@@ -110,7 +110,7 @@ if( $gBitSystem->isFeatureActive( 'wiki_comments' )) {
 			$comments_return_url .= '&amp;comments_maxComments=1';
 		}
 	}
-	include_once( LIBERTY_PKG_PATH.'comments_inc.php' );
+	include_once( LIBERTY_PKG_INCLUDE_PATH.'comments_inc.php' );
 }
 
 // Footnotes
diff --git a/includes/export_lib.php b/includes/export_lib.php
index e63877c..83f19dd 100644
--- a/includes/export_lib.php
+++ b/includes/export_lib.php
@@ -22,7 +22,7 @@ class ExportLib extends BitBase {
 
 	function MakeWikiZip( $pExportFile ) {
 		global $gBitUser,$gBitSystem;
-		include_once (UTIL_PKG_INC."tar.class.php");
+		include_once (UTIL_PKG_INCLUDE_PATH."tar.class.php");
 		$tar = new tar();
 		$query = "SELECT wp.`page_id` from `".BIT_DB_PREFIX."wiki_pages` wp INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON (lc.`content_id` = wp.`content_id`) 
 				  ORDER BY lc.".$this->mDb->convertSortmode("title_asc");
diff --git a/includes/lookup_page_inc.php b/includes/lookup_page_inc.php
index 0fd5e17..8fe4da9 100644
--- a/includes/lookup_page_inc.php
+++ b/includes/lookup_page_inc.php
@@ -16,7 +16,7 @@
 require_once( WIKI_PKG_CLASS_PATH.'BitBook.php');
 
 global $gContent;
-include_once( LIBERTY_PKG_PATH.'lookup_content_inc.php' );
+include_once( LIBERTY_PKG_INCLUDE_PATH.'lookup_content_inc.php' );
 
 // this is needed when the center module is applied to avoid abusing $_REQUEST
 if( empty( $lookupHash )) {
diff --git a/index.php b/index.php
index 21f4986..4c88ac7 100644
--- a/index.php
+++ b/index.php
@@ -19,7 +19,7 @@ $gBitSystem->verifyPackage( 'wiki' );
 require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 
 if( !empty( $_REQUEST['structure_id'] ) ) {
-	include( LIBERTY_PKG_PATH.'display_structure_inc.php' );
+	include( LIBERTY_PKG_INCLUDE_PATH.'display_structure_inc.php' );
 } else {
 	// if no page set
 	if ( !isset( $_REQUEST['page'] ) and !isset( $_REQUEST['page_id'] ) ) {
diff --git a/modules/mod_wiki_last_comments.php b/modules/mod_wiki_last_comments.php
index 4f8e544..b3d8fae 100644
--- a/modules/mod_wiki_last_comments.php
+++ b/modules/mod_wiki_last_comments.php
@@ -18,7 +18,7 @@ global $gQueryUserId, $moduleParams;
  * required setup
  */
 if( $gBitUser->hasPermission( 'p_wiki_view_page' ) ) {
-	require_once( LIBERTY_PKG_PATH.'LibertyComment.php' );
+	require_once( LIBERTY_PKG_CLASS_PATH.'LibertyComment.php' );
 	$cmt = new LibertyComment();
 	$listHash = array( 'max_records' => $moduleParams['module_rows'], 'user_id' => $gQueryUserId, 'content_type_guid' => BITPAGE_CONTENT_TYPE_GUID );
 	$lastComments = $cmt->getList( $listHash );
diff --git a/page_history.php b/page_history.php
index 03f8af2..fe77244 100644
--- a/page_history.php
+++ b/page_history.php
@@ -39,7 +39,7 @@ if (!empty( $_REQUEST['rollback_preview'] )) {
 // set up stuff to get history working
 $smartyContentRef = 'pageInfo';
 $rollbackPerm     = 'p_wiki_rollback';
-include_once( LIBERTY_PKG_PATH.'content_history_inc.php' );
+include_once( LIBERTY_PKG_INCLUDE_PATH.'content_history_inc.php' );
 
 // pagination stuff
 $gBitSmarty->assign( 'page', $page = !empty( $_REQUEST['page'] ) ? $_REQUEST['page'] : 1 );
diff --git a/page_watches.php b/page_watches.php
index 485bf88..c36d161 100644
--- a/page_watches.php
+++ b/page_watches.php
@@ -14,14 +14,14 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-include_once( WIKI_PKG_PATH.'BitPage.php');
+include_once( WIKI_PKG_CLASS_PATH.'BitPage.php');
 
 $gBitSystem->verifyPackage( 'wiki' );
 $gBitSystem->verifyFeature( 'users_watches' );
 $gBitSystem->verifyPermission( 'p_admin_users', tra( "Permission denied you cannot browse these page watches" ) );
 
 // Get the page from the request var or default it to HomePage
-include( WIKI_PKG_PATH.'lookup_page_inc.php' );
+include( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php' );
 
 // make comment count for this page available for templates
 $gComment = new LibertyComment();
diff --git a/slideshow.php b/slideshow.php
index 137ae2f..dc426c3 100755
--- a/slideshow.php
+++ b/slideshow.php
@@ -25,7 +25,7 @@ if (!isset($_SESSION["thedate"])) {
 	$thedate = $_SESSION["thedate"];
 }
 
-require_once ( WIKI_PKG_PATH.'lookup_page_inc.php' );
+require_once ( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php' );
 // If the page doesn't exist then display an error
 if (!$gContent->isValid()) {
 	$gBitSystem->fatalError( tra("Page cannot be found"), NULL, NULL, HttpStatusCodes::HTTP_NOT_FOUND );
@@ -35,7 +35,7 @@ if (!$gContent->isValid()) {
 $gContent->verifyViewPermission();
 
 // Get page data
-include( WIKI_PKG_PATH.'lookup_page_inc.php' );
+include( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php' );
 $info = $gContent->mInfo;
 
 // If not locked and last version is user version then can undo
diff --git a/wiki_rss.php b/wiki_rss.php
index f3eadb1..71d47a9 100644
--- a/wiki_rss.php
+++ b/wiki_rss.php
@@ -13,8 +13,8 @@ $gBitSystem->verifyPackage( 'wiki' );
 $gBitSystem->verifyPackage( 'rss' );
 $gBitSystem->verifyFeature( 'wiki_rss' );
 
-require_once( WIKI_PKG_PATH."BitPage.php" );
-require_once( RSS_PKG_PATH."rss_inc.php" );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
+require_once( RSS_PKG_INCLUDE_PATH.'rss_inc.php' );
 
 $rss->title = $gBitSystem->getConfig( 'wiki_rss_title', $gBitSystem->getConfig( 'site_title' ).' - '.tra( 'Wiki' ) );
 $rss->description = $gBitSystem->getConfig( 'wiki_rss_description', $gBitSystem->getConfig( 'site_title' ).' - '.tra( 'RSS Feed' ) );
-- 
cgit v1.3


From b01aa01c0a9a00cb5866e8693f36a02a9203d2af Mon Sep 17 00:00:00 2001
From: modela bitweaver <spiderr@bitweaver.org>
Date: Tue, 2 Feb 2021 11:28:58 -0500
Subject: update requires for move classes to includes/classes and use
 PKG_CLASS/INCLUDE_PATH constants

---
 admin/schema_inc.php             | 4 ++--
 book_to_html.php                 | 2 +-
 books.php                        | 2 +-
 includes/display_bitpage_inc.php | 2 +-
 includes/export_lib.php          | 2 +-
 orphan_pages.php                 | 2 +-
 templates/center_wiki_page.php   | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index c156d50..2ff6e8b 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -135,8 +135,8 @@ if( defined( 'RSS_PKG_NAME' )) {
 
 // ### Register content types
 $gBitInstaller->registerContentObjects( WIKI_PKG_NAME, array(
-	'BitPage' => WIKI_PKG_PATH.'BitPage.php',
-	'BitBook' => WIKI_PKG_PATH.'BitBook.php',
+	'BitPage' => WIKI_PKG_CLASS_PATH.'BitPage.php',
+	'BitBook' => WIKI_PKG_CLASS_PATH.'BitBook.php',
 ));
 
 // Requirements
diff --git a/book_to_html.php b/book_to_html.php
index 203be49..c539620 100644
--- a/book_to_html.php
+++ b/book_to_html.php
@@ -15,7 +15,7 @@
  */
 require_once( '../kernel/setup_inc.php' );
 
-include_once( WIKI_PKG_PATH.'BitBook.php');
+include_once( WIKI_PKG_CLASS_PATH.'BitBook.php');
 
 function copys($source,$dest)
 {
diff --git a/books.php b/books.php
index 66d848a..37e698d 100644
--- a/books.php
+++ b/books.php
@@ -14,7 +14,7 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-include_once( WIKI_PKG_PATH.'BitBook.php');
+include_once( WIKI_PKG_CLASS_PATH.'BitBook.php');
 
 // verify stuff
 $gBitSystem->verifyPackage( 'wiki' );
diff --git a/includes/display_bitpage_inc.php b/includes/display_bitpage_inc.php
index 57beec0..9c29c7e 100644
--- a/includes/display_bitpage_inc.php
+++ b/includes/display_bitpage_inc.php
@@ -147,7 +147,7 @@ if( $gBitSystem->isFeatureActive( 'users_watches' ) ) {
 }
 
 if( $gContent->isValid() && $gBitSystem->isPackageActive( 'stickies' ) ) {
-	require_once( STICKIES_PKG_PATH.'BitSticky.php' );
+	require_once( STICKIES_PKG_CLASS_PATH.'BitSticky.php' );
 	global $gNote;
 	$gNote = new BitSticky( NULL, NULL, $gContent->mContentId );
 	$gNote->load();
diff --git a/includes/export_lib.php b/includes/export_lib.php
index 83f19dd..264bc20 100644
--- a/includes/export_lib.php
+++ b/includes/export_lib.php
@@ -12,7 +12,7 @@
 /**
  * required setup
  */
-require_once( KERNEL_PKG_PATH.'BitBase.php' );
+require_once( KERNEL_PKG_CLASS_PATH.'BitBase.php' );
 require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 /**
  * @package wiki
diff --git a/orphan_pages.php b/orphan_pages.php
index 682c85f..796c4da 100644
--- a/orphan_pages.php
+++ b/orphan_pages.php
@@ -8,7 +8,7 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-include_once( WIKI_PKG_PATH.'BitPage.php' );
+include_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 
 // verify stuff
 $gBitSystem->verifyPackage( 'wiki' );
diff --git a/templates/center_wiki_page.php b/templates/center_wiki_page.php
index 45460bf..74a661f 100644
--- a/templates/center_wiki_page.php
+++ b/templates/center_wiki_page.php
@@ -6,7 +6,7 @@ $lookupHash['page_id']    = ( !empty( $moduleParams['module_params']['page_id']
 $lookupHash['content_id'] = ( !empty( $moduleParams['module_params']['content_id'] ) ? $moduleParams['module_params']['content_id'] : NULL );
 $lookupHash['page']       = ( !empty( $moduleParams['module_params']['page'] )       ? $moduleParams['module_params']['page'] : NULL );
 
-require_once( WIKI_PKG_PATH."BitPage.php" );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 $modulePage = BitPage::lookupObject( $lookupHash );
 $showTitle = TRUE;
 if( !empty( $moduleParams['module_params']['notitle'] ) ) {
-- 
cgit v1.3


From b83a41245d23566c2b8bfdfc46247f0bd31b6844 Mon Sep 17 00:00:00 2001
From: modela bitweaver <spiderr@bitweaver.org>
Date: Wed, 3 Feb 2021 16:06:26 -0500
Subject: update path for kernel/includes/setup_inc.php

---
 admin/admin_external_wikis.php | 2 +-
 backlinks.php                  | 2 +-
 book_to_html.php               | 2 +-
 books.php                      | 2 +-
 copyrights.php                 | 2 +-
 edit.php                       | 2 +-
 edit_book.php                  | 2 +-
 export_wiki_pages.php          | 2 +-
 index.php                      | 2 +-
 like_pages.php                 | 2 +-
 list_pages.php                 | 2 +-
 orphan_pages.php               | 2 +-
 page_history.php               | 2 +-
 page_loader.php                | 2 +-
 page_watches.php               | 2 +-
 print_multi_pages.php          | 2 +-
 print_pages.php                | 2 +-
 rankings.php                   | 2 +-
 remove_page.php                | 2 +-
 sitemap.php                    | 2 +-
 slideshow.php                  | 2 +-
 wiki_graph.php                 | 2 +-
 wiki_rss.php                   | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/admin/admin_external_wikis.php b/admin/admin_external_wikis.php
index 6daab7b..cefa711 100644
--- a/admin/admin_external_wikis.php
+++ b/admin/admin_external_wikis.php
@@ -3,7 +3,7 @@
 // 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.
 // Initialization
-require_once( '../../kernel/setup_inc.php' );
+require_once( '../../kernel/includes/setup_inc.php' );
 include_once( KERNEL_PKG_PATH.'admin_lib.php' );
 if (!$gBitUser->isAdmin()) {
 	$gBitSmarty->assign('msg', tra("You dont have permission to use this feature"));
diff --git a/backlinks.php b/backlinks.php
index 7491ed9..f637de5 100644
--- a/backlinks.php
+++ b/backlinks.php
@@ -12,7 +12,7 @@
 /**
  * required setup
  */
-require_once( '../kernel/setup_inc.php' );
+require_once( '../kernel/includes/setup_inc.php' );
 include_once( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php');
 
 $gBitSystem->verifyPackage( 'wiki' );
diff --git a/book_to_html.php b/book_to_html.php
index c539620..a5c5802 100644
--- a/book_to_html.php
+++ b/book_to_html.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( '../kernel/setup_inc.php' );
+require_once( '../kernel/includes/setup_inc.php' );
 
 include_once( WIKI_PKG_CLASS_PATH.'BitBook.php');
 
diff --git a/books.php b/books.php
index 37e698d..f1bdcb9 100644
--- a/books.php
+++ b/books.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( '../kernel/setup_inc.php' );
+require_once( '../kernel/includes/setup_inc.php' );
 include_once( WIKI_PKG_CLASS_PATH.'BitBook.php');
 
 // verify stuff
diff --git a/copyrights.php b/copyrights.php
index 31160e2..c3a10dd 100644
--- a/copyrights.php
+++ b/copyrights.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( '../kernel/setup_inc.php' );
+require_once( '../kernel/includes/setup_inc.php' );
 $gBitSystem->isFeatureActive( 'wiki_copyrights', tra("The copyright management feature is not enabled.") );
 
 $gBitUser->hasPermission( 'p_wiki_edit_copyright' );
diff --git a/edit.php b/edit.php
index ccfb2c3..e4d7e60 100644
--- a/edit.php
+++ b/edit.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( '../kernel/setup_inc.php' );
+require_once( '../kernel/includes/setup_inc.php' );
 include_once( WIKI_PKG_CLASS_PATH.'BitBook.php' );
 
 $gBitSystem->verifyPackage( 'wiki' );
diff --git a/edit_book.php b/edit_book.php
index ee2dfd5..7d85f4a 100644
--- a/edit_book.php
+++ b/edit_book.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( '../kernel/setup_inc.php' );
+require_once( '../kernel/includes/setup_inc.php' );
 
 if( isset( $_COOKIE['book_section'] ) && $_COOKIE['book_section'] == 'o' ) {
 	$book_section = 'block';
diff --git a/export_wiki_pages.php b/export_wiki_pages.php
index 26baa89..cf78b56 100644
--- a/export_wiki_pages.php
+++ b/export_wiki_pages.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( '../kernel/setup_inc.php' );
+require_once( '../kernel/includes/setup_inc.php' );
 include_once( UTIL_PKG_INCLUDE_PATH.'zip_lib.php' );
 include_once( WIKI_PKG_INCLUDE_PATH.'export_lib.php' );
 if (!$gBitUser->hasPermission( 'p_wiki_admin' ))
diff --git a/index.php b/index.php
index 4c88ac7..3cf1a10 100644
--- a/index.php
+++ b/index.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( '../kernel/setup_inc.php' );
+require_once( '../kernel/includes/setup_inc.php' );
 
 $gBitSystem->verifyPackage( 'wiki' );
 require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
diff --git a/like_pages.php b/like_pages.php
index 5a9a700..2762e24 100644
--- a/like_pages.php
+++ b/like_pages.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( '../kernel/setup_inc.php' );
+require_once( '../kernel/includes/setup_inc.php' );
 include_once( WIKI_PKG_CLASS_PATH.'BitPage.php');
 include_once( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php' );
 $gBitSystem->verifyPackage( 'wiki' );
diff --git a/list_pages.php b/list_pages.php
index 56957ca..d6dd9b8 100644
--- a/list_pages.php
+++ b/list_pages.php
@@ -7,7 +7,7 @@
 /**
  * required setup
  */
-require_once( '../kernel/setup_inc.php' );
+require_once( '../kernel/includes/setup_inc.php' );
 require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 
 // verify stuff
diff --git a/orphan_pages.php b/orphan_pages.php
index 796c4da..7ba51be 100644
--- a/orphan_pages.php
+++ b/orphan_pages.php
@@ -7,7 +7,7 @@
 /**
  * required setup
  */
-require_once( '../kernel/setup_inc.php' );
+require_once( '../kernel/includes/setup_inc.php' );
 include_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 
 // verify stuff
diff --git a/page_history.php b/page_history.php
index fe77244..86f18fe 100644
--- a/page_history.php
+++ b/page_history.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( '../kernel/setup_inc.php' );
+require_once( '../kernel/includes/setup_inc.php' );
 require_once( WIKI_PKG_CLASS_PATH.'BitPage.php');
 
 $gBitSystem->verifyPackage( 'wiki' );
diff --git a/page_loader.php b/page_loader.php
index d15060b..06ed9bf 100644
--- a/page_loader.php
+++ b/page_loader.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-include_once( '../../kernel/setup_inc.php' );
+include_once( '../../kernel/includes/setup_inc.php' );
 include_once (HTML_PKG_PATH.'htmlpages_lib.php');
 $refresh = 1000 * $_REQUEST["refresh"];
 ?>
diff --git a/page_watches.php b/page_watches.php
index c36d161..791f78f 100644
--- a/page_watches.php
+++ b/page_watches.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( '../kernel/setup_inc.php' );
+require_once( '../kernel/includes/setup_inc.php' );
 include_once( WIKI_PKG_CLASS_PATH.'BitPage.php');
 
 $gBitSystem->verifyPackage( 'wiki' );
diff --git a/print_multi_pages.php b/print_multi_pages.php
index 154233b..60155c8 100644
--- a/print_multi_pages.php
+++ b/print_multi_pages.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( '../kernel/setup_inc.php' );
+require_once( '../kernel/includes/setup_inc.php' );
 require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 
 $gBitSystem->verifyFeature( 'wiki_multiprint' );
diff --git a/print_pages.php b/print_pages.php
index cf7c6d8..d7e5f61 100644
--- a/print_pages.php
+++ b/print_pages.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( '../kernel/setup_inc.php' );
+require_once( '../kernel/includes/setup_inc.php' );
 require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 if( !$gBitSystem->isFeatureActive( 'wiki_multiprint' ) ) {
 	$gBitSystem->fatalError( tra("This feature is disabled").": wiki_multiprint" );
diff --git a/rankings.php b/rankings.php
index 184a6ec..217b917 100644
--- a/rankings.php
+++ b/rankings.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( '../kernel/setup_inc.php' );
+require_once( '../kernel/includes/setup_inc.php' );
 
 $gBitSystem->verifyPackage( 'wiki' );
 $gBitSystem->verifyFeature( 'wiki_rankings' );
diff --git a/remove_page.php b/remove_page.php
index dbf0247..ba380e7 100644
--- a/remove_page.php
+++ b/remove_page.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( '../kernel/setup_inc.php' );
+require_once( '../kernel/includes/setup_inc.php' );
 include_once( WIKI_PKG_CLASS_PATH.'BitPage.php');
 include_once( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php' );
 
diff --git a/sitemap.php b/sitemap.php
index 8828a10..80a5295 100644
--- a/sitemap.php
+++ b/sitemap.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( '../kernel/setup_inc.php' );
+require_once( '../kernel/includes/setup_inc.php' );
 
 require_once( WIKI_PKG_CLASS_PATH.'BitBook.php' );
 
diff --git a/slideshow.php b/slideshow.php
index dc426c3..0767273 100755
--- a/slideshow.php
+++ b/slideshow.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( '../kernel/setup_inc.php' );
+require_once( '../kernel/includes/setup_inc.php' );
 require_once( 'BitPage.php' );
 
 $gBitSystem->verifyPackage( 'wiki' );
diff --git a/wiki_graph.php b/wiki_graph.php
index 19b34c6..f8b60f8 100644
--- a/wiki_graph.php
+++ b/wiki_graph.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-include_once( '../kernel/setup_inc.php' );
+include_once( '../kernel/includes/setup_inc.php' );
 include_once( WIKI_PKG_CLASS_PATH.'BitPage.php');
 include_once( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php');
 include_once( 'Image/GraphViz.php' );
diff --git a/wiki_rss.php b/wiki_rss.php
index 71d47a9..6af3d04 100644
--- a/wiki_rss.php
+++ b/wiki_rss.php
@@ -7,7 +7,7 @@
 /**
  * Initialization
  */
-require_once( "../kernel/setup_inc.php" );
+require_once( "../kernel/includes/setup_inc.php" );
 
 $gBitSystem->verifyPackage( 'wiki' );
 $gBitSystem->verifyPackage( 'rss' );
-- 
cgit v1.3


From 7c21e90b0a8b347248cccede865fd8ff1f93c21b Mon Sep 17 00:00:00 2001
From: spiderr <spiderr@bitweaver.org>
Date: Thu, 4 Feb 2021 12:02:22 -0500
Subject: move _inc and _lib to includes/ and use PKG_INCLUDE_PATH constants;
 remove ancient imagegals and s5 features

---
 admin/admin_external_wikis.php   | 2 +-
 edit.php                         | 5 -----
 includes/classes/BitPage.php     | 2 +-
 includes/display_bitpage_inc.php | 6 ------
 page_loader.php                  | 2 +-
 5 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/admin/admin_external_wikis.php b/admin/admin_external_wikis.php
index cefa711..636fd87 100644
--- a/admin/admin_external_wikis.php
+++ b/admin/admin_external_wikis.php
@@ -4,7 +4,7 @@
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details.
 // Initialization
 require_once( '../../kernel/includes/setup_inc.php' );
-include_once( KERNEL_PKG_PATH.'admin_lib.php' );
+include_once( KERNEL_PKG_INCLUDE_PATH.'admin_lib.php' );
 if (!$gBitUser->isAdmin()) {
 	$gBitSmarty->assign('msg', tra("You dont have permission to use this feature"));
 	$gBitSystem->display( 'error.tpl' , NULL, array( 'display_mode' => 'admin' ));
diff --git a/edit.php b/edit.php
index e4d7e60..aba7162 100644
--- a/edit.php
+++ b/edit.php
@@ -148,11 +148,6 @@ if( isset( $_REQUEST["fCancel"] ) ) {
 		$copyrightAuthors = $_REQUEST['copyrightAuthors'];
 		$copyrightslib->add_copyright( $gContent->mPageId, $copyrightTitle, $copyrightYear, $copyrightAuthors, $gBitUser->mUserId );
 	}
-	// Parse $edit and eliminate image references to external URIs( make them internal )
-	if( $gBitSystem->isPackageActive( 'imagegals' ) ) {
-		include_once( IMAGEGALS_PKG_PATH.'imagegal_lib.php' );
-		$edit = $imagegallib->capture_images( $edit );
-	}
 
 	if( $gContent->mPageId )
 	{	if( isset( $_REQUEST['isminor'] ) && $_REQUEST['isminor']=='on' ) {
diff --git a/includes/classes/BitPage.php b/includes/classes/BitPage.php
index 9b2b03a..92c0776 100644
--- a/includes/classes/BitPage.php
+++ b/includes/classes/BitPage.php
@@ -239,7 +239,7 @@ class BitPage extends LibertyMime implements BitCacheable {
 
 			if( isset( $mailEvents ) ) {
 				global $notificationlib, $gBitUser, $gBitSystem, $gBitSmarty;
-				include_once( KERNEL_PKG_PATH.'notification_lib.php' );
+				include_once( KERNEL_PKG_INCLUDE_PATH.'notification_lib.php' );
 				$notificationlib->post_content_event($this->mContentId, $this->mInfo['content_type_guid'], 'wiki', $this->mInfo['title'], $this->mInfo['modifier_user'], $this->mInfo['edit_comment'], $this->mInfo['data']);
 
 				if( $gBitSystem->isFeatureActive( 'users_watches') ) {
diff --git a/includes/display_bitpage_inc.php b/includes/display_bitpage_inc.php
index 9c29c7e..e129e73 100644
--- a/includes/display_bitpage_inc.php
+++ b/includes/display_bitpage_inc.php
@@ -160,10 +160,4 @@ $pageInfo['title'] = $gContent->getTitle();
 // Display the Index Template
 $gBitSmarty->assignByRef( 'pageInfo', $pageInfo );
 
-// S5 slideshows
-if( isset( $_REQUEST['s5'] )) {
-	include_once( WIKI_PKG_PATH.'s5.php');
-}
-
 $gBitSystem->display( 'bitpackage:wiki/show_page.tpl', $pageInfo['title'], array( 'display_mode' => 'display' ));
-?>
diff --git a/page_loader.php b/page_loader.php
index 06ed9bf..bcc9b33 100644
--- a/page_loader.php
+++ b/page_loader.php
@@ -14,7 +14,7 @@
  * required setup
  */
 include_once( '../../kernel/includes/setup_inc.php' );
-include_once (HTML_PKG_PATH.'htmlpages_lib.php');
+include_once (HTML_PKG_INCLUDE_PATH.'htmlpages_lib.php');
 $refresh = 1000 * $_REQUEST["refresh"];
 ?>
 <html>
-- 
cgit v1.3


From ca400d1b97ff591f157a11ad0b442046468eb413 Mon Sep 17 00:00:00 2001
From: spiderr <spiderr@bitweaver.org>
Date: Fri, 12 Feb 2021 13:28:46 -0500
Subject: rename *_structure_inc.php to structure_*_inc.php

---
 edit_book.php                |  2 +-
 includes/lookup_page_inc.php | 17 ++++++++++++-----
 index.php                    |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/edit_book.php b/edit_book.php
index 7d85f4a..9b572a0 100644
--- a/edit_book.php
+++ b/edit_book.php
@@ -140,7 +140,7 @@ if( isset($_REQUEST["createstructure"]) ) {
 
 	// set the correct display template
 	$mid = 'bitpackage:wiki/edit_book.tpl';
-	include_once( LIBERTY_PKG_INCLUDE_PATH.'edit_structure_inc.php');
+	include_once( LIBERTY_PKG_INCLUDE_PATH.'structure_edit_inc.php');
 	if( $gBitThemes->isAjaxRequest() ) {
 		$gBitSmarty->display( 'bitpackage:kernel/feedback_inc.tpl' );
 	}
diff --git a/includes/lookup_page_inc.php b/includes/lookup_page_inc.php
index 8fe4da9..e7eb19f 100644
--- a/includes/lookup_page_inc.php
+++ b/includes/lookup_page_inc.php
@@ -75,16 +75,23 @@ if( $gContent->isValid() && empty( $gStructure ) ) {
 	} else {
 		$structure='';
 	}
-	$structs = $gContent->getStructures();
-	if (count($structs)==1) {
-		$gStructure = new LibertyStructure( $structs[0]['structure_id'] );
+	if( $structs = $gContent->getStructures() ) {
+		$structId = $structs[0]['structure_id'];
+		if( count( $structs ) > 0 ) {
+			$gBitSmarty->assign('showstructs', $structs);
+			foreach( $structs as $struct ) {
+				if( $struct['parent_id'] == 0 ) {
+					$structId = $struct['structure_id'];
+					break;
+				}
+			}
+		}
+		$gStructure = new LibertyStructure( $structId );
 		if( $gStructure->load() ) {
 			$gStructure->loadNavigation();
 			$gStructure->loadPath();
 			$gBitSmarty->assign( 'structureInfo', $gStructure->mInfo );
 		}
-	} else {
-		$gBitSmarty->assign('showstructs', $structs);
 	}
 }
 
diff --git a/index.php b/index.php
index 3cf1a10..9cc8fd5 100644
--- a/index.php
+++ b/index.php
@@ -19,7 +19,7 @@ $gBitSystem->verifyPackage( 'wiki' );
 require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 
 if( !empty( $_REQUEST['structure_id'] ) ) {
-	include( LIBERTY_PKG_INCLUDE_PATH.'display_structure_inc.php' );
+	include( LIBERTY_PKG_INCLUDE_PATH.'structure_display_inc.php' );
 } else {
 	// if no page set
 	if ( !isset( $_REQUEST['page'] ) and !isset( $_REQUEST['page_id'] ) ) {
-- 
cgit v1.3


From ca8def9bf27b2390be9a29f43eb0fbd8872deb24 Mon Sep 17 00:00:00 2001
From: spiderr <spiderr@bitweaver.org>
Date: Fri, 12 Feb 2021 13:50:47 -0500
Subject: rename *_structure to structure_*

---
 templates/edit_book.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/edit_book.tpl b/templates/edit_book.tpl
index 1627695..c315868 100755
--- a/templates/edit_book.tpl
+++ b/templates/edit_book.tpl
@@ -6,6 +6,6 @@
 	</div>
 
 	<div class="body">
-		{include file="bitpackage:liberty/edit_structure.tpl"}
+		{include file="bitpackage:liberty/structure_edit.tpl"}
 	</div><!-- end .body -->
 </div><!-- end .edit -->
-- 
cgit v1.3


From 141fe9bc8963964b71c239beacb01d27216e2f2c Mon Sep 17 00:00:00 2001
From: modela bitweaver <spiderr@bitweaver.org>
Date: Sat, 13 Feb 2021 19:03:53 -0500
Subject: move bit_setup_inc.php to includes/

---
 bit_setup_inc.php          | 25 -------------------------
 includes/bit_setup_inc.php | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 bit_setup_inc.php
 create mode 100644 includes/bit_setup_inc.php

diff --git a/bit_setup_inc.php b/bit_setup_inc.php
deleted file mode 100644
index fdb877c..0000000
--- a/bit_setup_inc.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-global $gBitSystem, $gBitUser;
-
-$registerHash = array(
-	'package_name' => 'wiki',
-	'package_path' => dirname( __FILE__ ).'/',
-	'homeable' => TRUE,
-);
-$gBitSystem->registerPackage( $registerHash );
-
-define( 'BITPAGE_CONTENT_TYPE_GUID', 'bitpage' );
-
-if( $gBitSystem->isPackageActive( 'wiki' )) {
-	if( $gBitUser->hasPermission( 'p_wiki_view_page' )) {
-		$menuHash = array(
-			'package_name'       => WIKI_PKG_NAME,
-			'index_url'          => WIKI_PKG_URL.'index.php',
-			'menu_template'      => 'bitpackage:wiki/menu_wiki.tpl',
-		);
-		$gBitSystem->registerAppMenu( $menuHash );
-	}
-
-	$gBitSystem->registerNotifyEvent( array( "wiki_page_changes" => tra( "Any wiki page is changed" )));
-}
-?>
diff --git a/includes/bit_setup_inc.php b/includes/bit_setup_inc.php
new file mode 100644
index 0000000..fdb877c
--- /dev/null
+++ b/includes/bit_setup_inc.php
@@ -0,0 +1,25 @@
+<?php
+global $gBitSystem, $gBitUser;
+
+$registerHash = array(
+	'package_name' => 'wiki',
+	'package_path' => dirname( __FILE__ ).'/',
+	'homeable' => TRUE,
+);
+$gBitSystem->registerPackage( $registerHash );
+
+define( 'BITPAGE_CONTENT_TYPE_GUID', 'bitpage' );
+
+if( $gBitSystem->isPackageActive( 'wiki' )) {
+	if( $gBitUser->hasPermission( 'p_wiki_view_page' )) {
+		$menuHash = array(
+			'package_name'       => WIKI_PKG_NAME,
+			'index_url'          => WIKI_PKG_URL.'index.php',
+			'menu_template'      => 'bitpackage:wiki/menu_wiki.tpl',
+		);
+		$gBitSystem->registerAppMenu( $menuHash );
+	}
+
+	$gBitSystem->registerNotifyEvent( array( "wiki_page_changes" => tra( "Any wiki page is changed" )));
+}
+?>
-- 
cgit v1.3


From 74a96f9bbf5d4f7cca7276aaf18ca7feb06107f2 Mon Sep 17 00:00:00 2001
From: spiderr <spiderr@bitweaver.org>
Date: Sat, 13 Feb 2021 22:01:57 -0500
Subject: update package_path in bit_setup_inc

---
 includes/bit_setup_inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/bit_setup_inc.php b/includes/bit_setup_inc.php
index fdb877c..4b4b556 100644
--- a/includes/bit_setup_inc.php
+++ b/includes/bit_setup_inc.php
@@ -3,7 +3,7 @@ global $gBitSystem, $gBitUser;
 
 $registerHash = array(
 	'package_name' => 'wiki',
-	'package_path' => dirname( __FILE__ ).'/',
+	'package_path' => dirname( dirname( __FILE__ ) ).'/',
 	'homeable' => TRUE,
 );
 $gBitSystem->registerPackage( $registerHash );
-- 
cgit v1.3


From 671cbf17ad19dc751ef922ffdee660ffaf5b33d8 Mon Sep 17 00:00:00 2001
From: spiderr <spiderr@bitweaver.org>
Date: Fri, 7 May 2021 12:51:55 -0400
Subject: add mTicket to remove wiki book listing

---
 templates/list_books.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/list_books.tpl b/templates/list_books.tpl
index 2dd8dd6..00fe866 100644
--- a/templates/list_books.tpl
+++ b/templates/list_books.tpl
@@ -32,7 +32,7 @@
 					{/if}
 				{/if}
 				{if ($channels[ix].creator_user_id == $gBitUser->mUserId) || $gBitUser->hasPermission( 'p_wiki_admin_book' )}
-					<a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?action=remove&structure_id={$channels[ix].structure_id}">{booticon iname="icon-trash" ipackage="icons" iexplain="remove"}</a>
+					<a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?action=remove&structure_id={$channels[ix].structure_id}&tk={$gBitUser->mTicket}">{booticon iname="icon-trash" ipackage="icons" iexplain="remove"}</a>
 				{/if}
 			</td>
 		</tr>
-- 
cgit v1.3