merge recent changes with HEAD - R1 and HEAD are identical now

1 files changed, 26 insertions, 26 deletions

diff --git a/received_pages.php b/received_pages.php
index 4571ddf..1bf3cfb 100644
--- a/received_pages.php
+++ b/received_pages.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_wiki/Attic/received_pages.php,v 1.2 2005/06/28 07:46:27 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_wiki/Attic/received_pages.php,v 1.3 2005/08/01 18:42:04 squareing Exp $
  *
  * Copyright (c) 2004 bitweaver.org
  * Copyright (c) 2003 tikwiki.org
@@ -8,7 +8,7 @@
  * All Rights Reserved. See copyright.txt for details and a complete list of authors.
  * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
  *
- * $Id: received_pages.php,v 1.2 2005/06/28 07:46:27 spiderr Exp $
+ * $Id: received_pages.php,v 1.3 2005/08/01 18:42:04 squareing Exp $
  * @package wiki
  * @subpackage functions
  */
@@ -20,19 +20,19 @@ require_once( '../bit_setup_inc.php' );
 include_once (KERNEL_PKG_PATH.'comm_lib.php');
 include_once( WIKI_PKG_PATH.'BitPage.php');
 if ($feature_comm != 'y') {
-	$smarty->assign('msg', tra("This feature is disabled").": feature_comm");
+	$gBitSmarty->assign('msg', tra("This feature is disabled").": feature_comm");
 	$gBitSystem->display( 'error.tpl' );
 	die;
 }
 if (!$gBitUser->hasPermission( 'bit_p_admin_received_pages' )) {
-	$smarty->assign('msg', tra("You dont have permission to use this feature"));
+	$gBitSmarty->assign('msg', tra("You dont have permission to use this feature"));
 	$gBitSystem->display( 'error.tpl' );
 	die;
 }
 if (!isset($_REQUEST["received_page_id"])) {
 	$_REQUEST["received_page_id"] = 0;
 }
-$smarty->assign('received_page_id', $_REQUEST["received_page_id"]);
+$gBitSmarty->assign('received_page_id', $_REQUEST["received_page_id"]);
 if (isset($_REQUEST["accept"])) {
 	
 	// CODE TO ACCEPT A PAGE HERE
@@ -46,21 +46,21 @@ if ($_REQUEST["received_page_id"]) {
 	$info["data"] = '';
 	$info["comment"] = '';
 }
-$smarty->assign('view', 'n');
+$gBitSmarty->assign('view', 'n');
 if (isset($_REQUEST["view"])) {
 	$info = $commlib->get_received_page($_REQUEST["view"]);
-	$smarty->assign('view', 'y');
+	$gBitSmarty->assign('view', 'y');
 }
 if (isset($_REQUEST["preview"])) {
 	$info["title"] = $_REQUEST["title"];
 	$info["data"] = $_REQUEST["data"];
 	$info["comment"] = $_REQUEST["comment"];
 }
-$smarty->assign('title', $info["title"]);
-$smarty->assign('data', $info["data"]);
-$smarty->assign('comment', $info["comment"]);
+$gBitSmarty->assign('title', $info["title"]);
+$gBitSmarty->assign('data', $info["data"]);
+$gBitSmarty->assign('comment', $info["comment"]);
 // Assign parsed
-$smarty->assign('parsed', $wikilib->parseData($info["data"]));
+$gBitSmarty->assign('parsed', $wikilib->parseData($info["data"]));
 if (isset($_REQUEST["remove"])) {
 	
 	$commlib->remove_received_page($_REQUEST["remove"]);
@@ -68,18 +68,18 @@ if (isset($_REQUEST["remove"])) {
 if (isset($_REQUEST["save"])) {
 	
 	$commlib->update_received_page($_REQUEST["received_page_id"], $_REQUEST["title"], $_REQUEST["data"], $_REQUEST["comment"]);
-	$smarty->assign('title', $_REQUEST["title"]);
-	$smarty->assign('data', $_REQUEST["data"]);
-	$smarty->assign('comment', $_REQUEST["comment"]);
-	$smarty->assign('received_page_id', $_REQUEST["received_page_id"]);
-	$smarty->assign('parsed', $gBitSystem->parseData($_REQUEST["data"]));
+	$gBitSmarty->assign('title', $_REQUEST["title"]);
+	$gBitSmarty->assign('data', $_REQUEST["data"]);
+	$gBitSmarty->assign('comment', $_REQUEST["comment"]);
+	$gBitSmarty->assign('received_page_id', $_REQUEST["received_page_id"]);
+	$gBitSmarty->assign('parsed', $gBitSystem->parseData($_REQUEST["data"]));
 }
 if (empty( $_REQUEST["sort_mode"] )) {
 	$sort_mode = 'received_date_desc';
 } else {
 	$sort_mode = $_REQUEST["sort_mode"];
 }
-$smarty->assign_by_ref('sort_mode', $sort_mode);
+$gBitSmarty->assign_by_ref('sort_mode', $sort_mode);
 if (!isset($_REQUEST["offset"])) {
 	$offset = 0;
 } else {
@@ -89,30 +89,30 @@ if (isset($_REQUEST['page'])) {
 	$page = &$_REQUEST['page'];
 	$offset = ($page - 1) * $maxRecords;
 }
-$smarty->assign_by_ref('offset', $offset);
+$gBitSmarty->assign_by_ref('offset', $offset);
 if (isset($_REQUEST["find"])) {
 	$find = $_REQUEST["find"];
 } else {
 	$find = '';
 }
-$smarty->assign_by_ref('find', $find);
+$gBitSmarty->assign_by_ref('find', $find);
 
 $channels = $wikilib->list_received_pages($offset, $maxRecords, $sort_mode, $find);
 $cant_pages = ceil($channels["cant"] / $maxRecords);
-$smarty->assign_by_ref('cant_pages', $cant_pages);
-$smarty->assign('actual_page', 1 + ($offset / $maxRecords));
+$gBitSmarty->assign_by_ref('cant_pages', $cant_pages);
+$gBitSmarty->assign('actual_page', 1 + ($offset / $maxRecords));
 if ($channels["cant"] > ($offset + $maxRecords)) {
-	$smarty->assign('next_offset', $offset + $maxRecords);
+	$gBitSmarty->assign('next_offset', $offset + $maxRecords);
 } else {
-	$smarty->assign('next_offset', -1);
+	$gBitSmarty->assign('next_offset', -1);
 }
 // If offset is > 0 then prev_offset
 if ($offset > 0) {
-	$smarty->assign('prev_offset', $offset - $maxRecords);
+	$gBitSmarty->assign('prev_offset', $offset - $maxRecords);
 } else {
-	$smarty->assign('prev_offset', -1);
+	$gBitSmarty->assign('prev_offset', -1);
 }
-$smarty->assign_by_ref('channels', $channels["data"]);
+$gBitSmarty->assign_by_ref('channels', $channels["data"]);
 
 // Display the template
 $gBitSystem->display( 'bitpackage:wiki/received_pages.tpl');