$gBitSmarty Updates

3 files changed, 47 insertions, 47 deletions

diff --git a/admin/admin_calendar_inc.php b/admin/admin_calendar_inc.php
index 54c2cbd..d229bd4 100644
--- a/admin/admin_calendar_inc.php
+++ b/admin/admin_calendar_inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_calendar/admin/admin_calendar_inc.php,v 1.3 2005/07/21 09:39:31 lsces Exp $
+// $Header: /cvsroot/bitweaver/_bit_calendar/admin/admin_calendar_inc.php,v 1.4 2005/07/30 12:00:32 lsces 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.
@@ -25,7 +25,7 @@ $formCalendarFeatures = array(
 		'label' => 'Enable jscalendar popup',
 	),
 );
-$smarty->assign( 'formCalendarFeatures',$formCalendarFeatures );
+$gBitSmarty->assign( 'formCalendarFeatures',$formCalendarFeatures );
 
 if (isset($_REQUEST["calendarfeatures"])) {
 	
diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index ee09424..ca8f0bb 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -1,5 +1,5 @@
 <?php
-global $gBitSystem, $smarty;
+global $gBitSystem, $gBitSmarty;
 $gBitSystem->registerPackage( 'calendar', dirname( __FILE__).'/' );
 
 if( $gBitSystem->isPackageActive( 'calendar' ) ) {
diff --git a/index.php b/index.php
index 9e32336..cce9d29 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_calendar/index.php,v 1.7 2005/07/24 17:41:13 lsces Exp $
+// $Header: /cvsroot/bitweaver/_bit_calendar/index.php,v 1.8 2005/07/30 12:00:32 lsces 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.
@@ -33,7 +33,7 @@ if (isset($_REQUEST["bitcals"])and is_array($_REQUEST["bitcals"])and count($_REQ
 
 // this should be a global array generated by the some object in the kernel
 $bitItems = $gLibertySystem->mContentTypes;
-$smarty->assign('bitItems', $bitItems);
+$gBitSmarty->assign('bitItems', $bitItems);
 
 $bitcal = array();
 
@@ -42,7 +42,7 @@ foreach ($_SESSION['CalendarViewBitCals'] as $calt) {
 }
 
 $trunc = "12"; // put in a pref, number of chars displayed in cal cells
-$smarty->assign('bitcal', $bitcal);
+$gBitSmarty->assign('bitcal', $bitcal);
 
 if (isset($_REQUEST["todate"]) && $_REQUEST['todate']) {
 	$_SESSION['CalendarFocusDate'] = $_REQUEST['todate'];
@@ -68,7 +68,7 @@ if (isset($_REQUEST["viewmode"]) and $_REQUEST["viewmode"]) {
 if (!isset($_SESSION['CalendarViewMode']) or !$_SESSION['CalendarViewMode']) {
 	$_SESSION['CalendarViewMode'] = 'month';
 }
-$smarty->assign('viewmode', $_SESSION['CalendarViewMode']);
+$gBitSmarty->assign('viewmode', $_SESSION['CalendarViewMode']);
 
 if (isset($_REQUEST["find"])) {
 	$find = $_REQUEST["find"];
@@ -76,7 +76,7 @@ if (isset($_REQUEST["find"])) {
 	$find = '';
 }
 
-$smarty->assign('find', $find);
+$gBitSmarty->assign('find', $find);
 
 $z = date("z");
 
@@ -87,15 +87,15 @@ $focus_nextweek = mktime(0, 0, 0, $focus_month, $focus_day + 7, $focus_year);
 $focus_prevmonth = mktime(0, 0, 0, $focus_month - 1, $focus_day, $focus_year);
 $focus_nextmonth = mktime(0, 0, 0, $focus_month + 1, $focus_day, $focus_year);
 
-$smarty->assign('daybefore', $focus_prevday);
-$smarty->assign('weekbefore', $focus_prevweek);
-$smarty->assign('monthbefore', $focus_prevmonth);
-$smarty->assign('dayafter', $focus_nextday);
-$smarty->assign('weekafter', $focus_nextweek);
-$smarty->assign('monthafter', $focus_nextmonth);
-$smarty->assign('focusmonth', $focus_month);
-$smarty->assign('focusdate', $focusdate);
-$smarty->assign('now', mktime(0, 0, 0, date('m'), date('d'), date('Y')));
+$gBitSmarty->assign('daybefore', $focus_prevday);
+$gBitSmarty->assign('weekbefore', $focus_prevweek);
+$gBitSmarty->assign('monthbefore', $focus_prevmonth);
+$gBitSmarty->assign('dayafter', $focus_nextday);
+$gBitSmarty->assign('weekafter', $focus_nextweek);
+$gBitSmarty->assign('monthafter', $focus_nextmonth);
+$gBitSmarty->assign('focusmonth', $focus_month);
+$gBitSmarty->assign('focusdate', $focusdate);
+$gBitSmarty->assign('now', mktime(0, 0, 0, date('m'), date('d'), date('Y')));
 
 $weekdays = range(0, 6);
 
@@ -166,9 +166,9 @@ function m_weeks($y, $m){
 }
 
 
-$smarty->assign('viewstart', $viewstart);
-$smarty->assign('viewend', $viewend);
-$smarty->assign('numberofweeks', $numberofweeks);
+$gBitSmarty->assign('viewstart', $viewstart);
+$gBitSmarty->assign('viewend', $viewend);
+$gBitSmarty->assign('numberofweeks', $numberofweeks);
 
 $daysnames = array(
 	tra("Sunday"),
@@ -215,13 +215,13 @@ for ($i = 0; $i <= $numberofweeks; $i++) {
 			foreach ($listevents["$dday"] as $le) {
 				$leday["{$le['time']}$e"] = $le;
 
-				$smarty->assign_by_ref('cellextra', $le["extra"]);
-				$smarty->assign_by_ref('cellhead', $le["head"]);
-				$smarty->assign_by_ref('cellprio', $le["prio"]);
-				$smarty->assign_by_ref('cellcalname', $le["calname"]);
-				$smarty->assign_by_ref('cellname', $le["name"]);
-				$smarty->assign_by_ref('celldescription', $le["description"]);
-				$leday["{$le['time']}$e"]["over"] = $smarty->fetch("bitpackage:calendar/calendar_box.tpl");
+				$gBitSmarty->assign_by_ref('cellextra', $le["extra"]);
+				$gBitSmarty->assign_by_ref('cellhead', $le["head"]);
+				$gBitSmarty->assign_by_ref('cellprio', $le["prio"]);
+				$gBitSmarty->assign_by_ref('cellcalname', $le["calname"]);
+				$gBitSmarty->assign_by_ref('cellname', $le["name"]);
+				$gBitSmarty->assign_by_ref('celldescription', $le["description"]);
+				$leday["{$le['time']}$e"]["over"] = $gBitSmarty->fetch("bitpackage:calendar/calendar_box.tpl");
 				$e++;
 			}
 		}
@@ -232,13 +232,13 @@ for ($i = 0; $i <= $numberofweeks; $i++) {
 			foreach ($listbitevents["$dday"] as $lte) {
 				$leday["{$lte['time']}$e"] = $lte;
 
-				$smarty->assign('cellextra', "");
-				$smarty->assign_by_ref('cellhead', $lte["head"]);
-				$smarty->assign_by_ref('cellprio', $lte["prio"]);
-				$smarty->assign_by_ref('cellcalname', $lte["calname"]);
-				$smarty->assign_by_ref('cellname', $lte["name"]);
-				$smarty->assign_by_ref('celldescription', $lte["description"]);
-				$leday["{$lte['time']}$e"]["over"] = $smarty->fetch("bitpackage:calendar/calendar_box.tpl");
+				$gBitSmarty->assign('cellextra', "");
+				$gBitSmarty->assign_by_ref('cellhead', $lte["head"]);
+				$gBitSmarty->assign_by_ref('cellprio', $lte["prio"]);
+				$gBitSmarty->assign_by_ref('cellcalname', $lte["calname"]);
+				$gBitSmarty->assign_by_ref('cellname', $lte["name"]);
+				$gBitSmarty->assign_by_ref('celldescription', $lte["description"]);
+				$leday["{$lte['time']}$e"]["over"] = $gBitSmarty->fetch("bitpackage:calendar/calendar_box.tpl");
 				$e++;
 			}
 		}
@@ -262,20 +262,20 @@ $hours = array(  '0:00', '1:00', '2:00', '3:00', '4:00', '5:00', '6:00', '7:00',
 				 '8:00', '8:00','10:00','11:00','12:00','13:00','14:00','15:00',
 				'16:00','17:00','18:00','19:00','20:00','21:00','22:00','23:00');
 
-$smarty->assign('hrows', $hrows); 
-$smarty->assign('hours', $hours); 
+$gBitSmarty->assign('hrows', $hrows); 
+$gBitSmarty->assign('hours', $hours); 
 
-$smarty->assign('trunc', $trunc); 
-$smarty->assign('daformat', $gBitSystem->get_long_date_format()." ".tra("at")." %H:%M"); 
-$smarty->assign('daformat2', $gBitSystem->get_long_date_format()); 
-$smarty->assign('currentweek', $currentweek);
-$smarty->assign('firstweek', $firstweek);
-$smarty->assign('lastweek', $lastweek);
-$smarty->assign('weekdays', $weekdays);
-$smarty->assign('weeks', $weeks);
-$smarty->assign('daysnames', $daysnames);
-$smarty->assign('cell', $cell);
-$smarty->assign('var', '');
+$gBitSmarty->assign('trunc', $trunc); 
+$gBitSmarty->assign('daformat', $gBitSystem->get_long_date_format()." ".tra("at")." %H:%M"); 
+$gBitSmarty->assign('daformat2', $gBitSystem->get_long_date_format()); 
+$gBitSmarty->assign('currentweek', $currentweek);
+$gBitSmarty->assign('firstweek', $firstweek);
+$gBitSmarty->assign('lastweek', $lastweek);
+$gBitSmarty->assign('weekdays', $weekdays);
+$gBitSmarty->assign('weeks', $weeks);
+$gBitSmarty->assign('daysnames', $daysnames);
+$gBitSmarty->assign('cell', $cell);
+$gBitSmarty->assign('var', '');
 
 $section = 'calendar';