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

3 files changed, 14 insertions, 14 deletions

diff --git a/admin/admin_quota_inc.php b/admin/admin_quota_inc.php
index af2e6c7..37a9ac3 100644
--- a/admin/admin_quota_inc.php
+++ b/admin/admin_quota_inc.php
@@ -1,11 +1,11 @@
 <?php
-// $Header: /cvsroot/bitweaver/_bit_quota/admin/admin_quota_inc.php,v 1.1 2005/06/19 05:02:20 bitweaver Exp $
+// $Header: /cvsroot/bitweaver/_bit_quota/admin/admin_quota_inc.php,v 1.2 2005/08/01 18:41:18 squareing Exp $
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See copyright.txt for details and a complete list of authors.
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 if (isset($_REQUEST["quotaset"]) && isset($_REQUEST["homeSample"])) {
 	$gBitSystem->storePreference("home_quota", $_REQUEST["homeSample"]);
-	$smarty->assign('home_quota', $_REQUEST["homeSample"]);
+	$gBitSmarty->assign('home_quota', $_REQUEST["homeSample"]);
 }
 
 require_once( QUOTA_PKG_PATH.'LibertyQuota.php' );
@@ -22,7 +22,7 @@ if( !empty( $_REQUEST['savequota'] ) ) {
 		die;
 	} else {
 		$saveError = TRUE;
-		$smarty->assign_by_ref( 'errors', $gQuota->mErrors );
+		$gBitSmarty->assign_by_ref( 'errors', $gQuota->mErrors );
 	}
 } elseif( !empty( $_REQUEST['assignquota'] ) ) {
 	foreach( array_keys( $_REQUEST ) as $key ) {
@@ -35,16 +35,16 @@ if( !empty( $_REQUEST['savequota'] ) ) {
 }
 $gQuota->load();
 if( $gQuota->isValid() || isset( $_REQUEST['newquota'] ) || !empty( $saveError ) ) {
-	$smarty->assign_by_ref('gQuota', $gQuota);
+	$gBitSmarty->assign_by_ref('gQuota', $gQuota);
 } else {
 	$quotas = $gQuota->getList();
 	$systemGroups = $gQuota->getQuotaGroups();
-	$smarty->assign_by_ref('systemGroups', $systemGroups );
+	$gBitSmarty->assign_by_ref('systemGroups', $systemGroups );
 foreach( array_keys( $systemGroups ) as $groupId ) {
 	$groupQuota[$groupId] = $gQuota->getQuotaMenu( 'quota_group_'.$groupId, $systemGroups[$groupId]['quota_id'] );
 }
-	$smarty->assign_by_ref('groupQuota', $groupQuota );
-	$smarty->assign_by_ref('quotaList', $quotas);
+	$gBitSmarty->assign_by_ref('groupQuota', $groupQuota );
+	$gBitSmarty->assign_by_ref('quotaList', $quotas);
 }
 
 ?>
diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index e7c6799..35428a0 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -1,5 +1,5 @@
 <?php
-global $gBitSystem, $smarty;
+global $gBitSystem, $gBitSmarty;
 $gBitSystem->registerPackage( 'quota', dirname( __FILE__).'/' );
 
 if( $gBitSystem->isPackageActive( 'quota' ) ) {
diff --git a/index.php b/index.php
index 69a5b99..8cfcb08 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_quota/index.php,v 1.2 2005/06/28 07:45:56 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_quota/index.php,v 1.3 2005/08/01 18:41:18 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: index.php,v 1.2 2005/06/28 07:45:56 spiderr Exp $
+ * $Id: index.php,v 1.3 2005/08/01 18:41:18 squareing Exp $
  * @package quota
  */
 
@@ -33,13 +33,13 @@ if( $diskQuota != 0 ) {
 
 if( $quotaPercent > 100 ) {
 	$errors['disk_quota'] = "You are over your disk quota.";
-	$smarty->assign_by_ref( 'errors', $errors );
+	$gBitSmarty->assign_by_ref( 'errors', $errors );
 	$quotaPercent = 100;
 }
 
-$smarty->assign( 'usage', round( ($diskUsage / 1000000), 2 ) );
-$smarty->assign( 'quota', round( ($diskQuota / 1000000), 2 ) );
-$smarty->assign_by_ref( 'quotaPercent', $quotaPercent );
+$gBitSmarty->assign( 'usage', round( ($diskUsage / 1000000), 2 ) );
+$gBitSmarty->assign( 'quota', round( ($diskQuota / 1000000), 2 ) );
+$gBitSmarty->assign_by_ref( 'quotaPercent', $quotaPercent );
 
 $gBitSystem->display( 'bitpackage:quota/quota.tpl', 'View Quota' );