Menu
▾
▴
[ModCVS] CVS: PN_PostCalendar/modules/PostCalendar pnadmin.php,1.24,1.25 pntables.php,1.12,1.13 pnuser.php,1.46,1.47 pnuserapi.php,1.97,1.98
|
From: Roger R. <eps...@us...> - 2002-06-23 19:25:33
|
Update of /cvsroot/pn-modules/PN_PostCalendar/modules/PostCalendar
In directory usw-pr-cvs1:/tmp/cvs-serv10606
Modified Files:
pnadmin.php pntables.php pnuser.php pnuserapi.php
Log Message:
new smarty template custom functions
Index: pnadmin.php
===================================================================
RCS file: /cvsroot/pn-modules/PN_PostCalendar/modules/PostCalendar/pnadmin.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** pnadmin.php 6 Jun 2002 21:15:02 -0000 1.24
--- pnadmin.php 23 Jun 2002 19:25:29 -0000 1.25
***************
*** 1647,1650 ****
--- 1647,1652 ----
$settings[$i][] = $output->Text(_PC_INTERNATIONAL_DATES);
$settings[$i++][] = $output->FormCheckBox('useinternationaldates', pnModGetVar('PostCalendar','useinternationaldates'));
+ $settings[$i][] = $output->Text(_PC_EVENT_DATE_FORMAT);
+ $settings[$i++][] = $output->FormText('pcEventDateFormat', pnModGetVar('PostCalendar','pcEventDateFormat'));
$settings[$i][] = $output->Text(_PC_DISPLAY_TOPICS);
$settings[$i++][] = $output->FormCheckBox('displaytopics', pnModGetVar('PostCalendar','displaytopics'));
***************
*** 1755,1759 ****
$pcDayViewEndHour,
$pcDayViewEndMinute,
! $pcDayTimeIncrement)= pnVarCleanFromInput('time24hours',
'eventsopeninnewwindow',
'useinternationaldates',
--- 1757,1762 ----
$pcDayViewEndHour,
$pcDayViewEndMinute,
! $pcDayTimeIncrement,
! $pcEventDateFormat) = pnVarCleanFromInput('time24hours',
'eventsopeninnewwindow',
'useinternationaldates',
***************
*** 1779,1783 ****
'pcDayViewEndHour',
'pcDayViewEndMinute',
! 'pcDayTimeIncrement');
// make sure we enter something into the DB
--- 1782,1787 ----
'pcDayViewEndHour',
'pcDayViewEndMinute',
! 'pcDayTimeIncrement',
! 'pcEventDateFormat');
// make sure we enter something into the DB
***************
*** 1807,1810 ****
--- 1811,1815 ----
if(!isset($pcDayViewEndMinute)) { $pcDayViewEndMinute='00'; }
if(!isset($pcDayTimeIncrement)) { $pcDayTimeIncrement='60'; }
+ if(!isset($pcEventDateFormat)) { $pcEventDateFormat='%m/$d/%Y'; }
pnModSetVar('PostCalendar', 'time24hours', $time24hours);
***************
*** 1833,1836 ****
--- 1838,1842 ----
pnModSetVar('PostCalendar', 'pcDayViewEndMinute', $pcDayViewEndMinute);
pnModSetVar('PostCalendar', 'pcDayTimeIncrement', $pcDayTimeIncrement);
+ pnModSetVar('PostCalendar', 'pcEventDateFormat', $pcEventDateFormat);
Index: pntables.php
===================================================================
RCS file: /cvsroot/pn-modules/PN_PostCalendar/modules/PostCalendar/pntables.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** pntables.php 10 Jun 2002 05:05:26 -0000 1.12
--- pntables.php 23 Jun 2002 19:25:29 -0000 1.13
***************
*** 125,129 ****
'postal' => 'pc_postal'
);
!
return $pntable;
}
--- 125,138 ----
'postal' => 'pc_postal'
);
!
! // @since version 3.1
! // smarty cache table
! $smarty_cache = pnConfigGetVar('prefix') . '_postcalendar_cache';
! $pntable['postcalendar_cache'] = $smarty_cache;
! $pntable['postcalendar_cache_column'] = array(
! 'cacheid' => 'pc_cacheid',
! 'cachecontents' => 'pc_cachecontents'
! );
!
return $pntable;
}
Index: pnuser.php
===================================================================
RCS file: /cvsroot/pn-modules/PN_PostCalendar/modules/PostCalendar/pnuser.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** pnuser.php 13 Jun 2002 21:49:43 -0000 1.46
--- pnuser.php 23 Jun 2002 19:25:29 -0000 1.47
***************
*** 87,107 ****
'jumpmonth',
'jumpyear');
! // set up defaults
! if(!isset($viewtype)) {
! if(isset($jumpday)) {
! $viewtype = 'day';
! } else {
! // we should make this a setting in the DB
! // month, day, year, flat
! $viewtype = 'month';
! }
! }
if(!isset($Date)) {
! if(isset($jumpday)) {
! $Date = $jumpmonth.'/'.$jumpday.'/'.$jumpyear;
! } else {
! // set it up as today
! $Date = Date('m/d/Y');
! }
}
--- 87,98 ----
'jumpmonth',
'jumpyear');
!
! if(!isset($jumpday)) $jumpday = date('d');
! if(!isset($jumpmonth)) $jumpmonth = date('m');
! if(!isset($jumpyear)) $jumpyear = date('Y');
! if(!isset($viewtype)) $viewtype = 'month';
!
if(!isset($Date)) {
! $Date = $jumpmonth.'/'.$jumpday.'/'.$jumpyear;
}
***************
*** 180,185 ****
// get the theme globals :: is there a better way to do this?
pnThemeLoad(pnUserGetTheme());
! global $bgcolor1, $bgcolor2, $bgcolor3, $bgcolor4, $bgcolor5;
! global $textcolor1, $textcolor2;
$Date = pnVarCleanFromInput('Date');
extract($args);
--- 171,175 ----
// get the theme globals :: is there a better way to do this?
pnThemeLoad(pnUserGetTheme());
! global $bgcolor1, $bgcolor2, $bgcolor3, $bgcolor4, $bgcolor5, $textcolor1, $textcolor2;
$Date = pnVarCleanFromInput('Date');
extract($args);
***************
*** 263,268 ****
'event_postal');
! $event_recurrspec = serialize(compact('event_repeat_freq','event_repeat_freq_type','event_repeat_on_num',
! 'event_repeat_on_day', 'event_repeat_on_freq'));
$event_duration = (60*60*$event_dur_hours) + (60*$event_dur_minutes);
--- 253,268 ----
'event_postal');
! $event_recurrspec = serialize(compact('event_repeat_freq',
! 'event_repeat_freq_type',
! 'event_repeat_on_num',
! 'event_repeat_on_day',
! 'event_repeat_on_freq'));
!
! $event_location_info = serialize(compact('event_location',
! 'event_street1',
! 'event_street2',
! 'event_city',
! 'event_state',
! 'event_postal'));
$event_duration = (60*60*$event_dur_hours) + (60*$event_dur_minutes);
***************
*** 360,363 ****
--- 360,368 ----
'event_endampm'=>$event_endampm,
'event_location'=>$event_location,
+ 'event_street1'=>$event_street1,
+ 'event_street2'=>$event_street2,
+ 'event_city'=>$event_city,
+ 'event_state'=>$event_state,
+ 'event_postal'=>$event_postal,
'event_contname'=>$event_contname,
'event_conttel'=>$event_conttel,
***************
*** 1007,1010 ****
--- 1012,1021 ----
$tpl->left_delimiter = '[-';
$tpl->right_delimiter = '-]';
+ //=================================================================
+ // Register our custom functions
+ //=================================================================
+ $tpl->register_function('pc_date_format','PostCalendar_smarty_pcDateFormat');
+ $tpl->register_function('pc_event_url','PostCalendar_smarty_pcEventURL');
+ $tpl->register_function('pc_date_select','PostCalendar_smarty_pcDateSelect');
// parse the template
***************
*** 1032,1036 ****
$tpl->assign('tplview',$template_view);
! $output->SetOutputMode(_PNH_RETURNOUTPUT);
$sel_data = pnModAPIFunc('PostCalendar','user','buildDaySelect',array('pc_day'=>$day));
$dayselect = $output->FormSelectMultiple('jumpday', $sel_data);
--- 1043,1047 ----
$tpl->assign('tplview',$template_view);
! /*$output->SetOutputMode(_PNH_RETURNOUTPUT);
$sel_data = pnModAPIFunc('PostCalendar','user','buildDaySelect',array('pc_day'=>$day));
$dayselect = $output->FormSelectMultiple('jumpday', $sel_data);
***************
*** 1054,1059 ****
$viewselect = $output->FormSelectMultiple('viewtype', $sel_data);
$jumpsubmit = $output->FormSubmit('Jump!');
! $output->SetOutputMode(_PNH_KEEPOUTPUT);
$tpl->assign('category',$categories);
$tpl->assign('DaySelect',$dayselect);
$tpl->assign('MonthSelect',$monthselect);
--- 1065,1071 ----
$viewselect = $output->FormSelectMultiple('viewtype', $sel_data);
$jumpsubmit = $output->FormSubmit('Jump!');
! $output->SetOutputMode(_PNH_KEEPOUTPUT);*/
$tpl->assign('category',$categories);
+ /*
$tpl->assign('DaySelect',$dayselect);
$tpl->assign('MonthSelect',$monthselect);
***************
*** 1061,1064 ****
--- 1073,1077 ----
$tpl->assign('ViewSelect',$viewselect);
$tpl->assign('JumpSubmit',$jumpsubmit);
+ */
// Return the output that has been generated by this function
Index: pnuserapi.php
===================================================================
RCS file: /cvsroot/pn-modules/PN_PostCalendar/modules/PostCalendar/pnuserapi.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** pnuserapi.php 13 Jun 2002 21:49:43 -0000 1.97
--- pnuserapi.php 23 Jun 2002 19:25:29 -0000 1.98
***************
*** 25,29 ****
*
*/
! ob_start();
//************************************************************************
// define constants used to make the code more readable
--- 25,29 ----
*
*/
! //ob_start();
//************************************************************************
// define constants used to make the code more readable
***************
*** 173,183 ****
{
extract($args);
! if(!isset($pc_year)) { $pc_year = Date_Calc::getYear(); }
// create the return object to be inserted into the form
$output = array();
// we want the list to contain 10 years before today and 30 years after
// maybe this will eventually become a user defined value
! $pc_start_year = $pc_year - 10;
! $pc_end_year = $pc_year + 30;
$count = 0;
if(!isset($selected)) $selected = '';
--- 173,183 ----
{
extract($args);
! if(!isset($pc_year)) { $pc_year = date('Y'); }
// create the return object to be inserted into the form
$output = array();
// we want the list to contain 10 years before today and 30 years after
// maybe this will eventually become a user defined value
! $pc_start_year = date('Y') - 10;
! $pc_end_year = date('Y') + 30;
$count = 0;
if(!isset($selected)) $selected = '';
***************
*** 341,344 ****
--- 341,345 ----
$dayhighlightcolor = pnModGetVar('PostCalendar','dayhighlightcolor');
$firstdayofweek = pnModGetVar('PostCalendar','firstdayofweek');
+ $pcEventDateFormat = pnModGetVar('PostCalendar','pcEventDateFormat');
//=================================================================
***************
*** 604,607 ****
--- 605,614 ----
//=================================================================
+ // Register our custom functions
+ //=================================================================
+ $tpl->register_function('pc_date_format','PostCalendar_smarty_pcDateFormat');
+ $tpl->register_function('pc_event_url','PostCalendar_smarty_pcEventURL');
+ $tpl->register_function('pc_date_select','PostCalendar_smarty_pcDateSelect');
+ //=================================================================
// Assign the variables to the template object
//=================================================================
***************
*** 651,654 ****
--- 658,662 ----
$tpl->assign('today_date',$today_date);
$tpl->assign('DayHighlightColor',$dayhighlightcolor);
+ $tpl->assign('EventDateFormat',$pcEventDateFormat);
//=================================================================
***************
*** 1045,1050 ****
// get the theme globals :: is there a better way to do this?
pnThemeLoad(pnUserGetTheme());
! global $bgcolor1, $bgcolor2, $bgcolor3, $bgcolor4, $bgcolor5;
! global $textcolor1, $textcolor2;
$ampm = array(_AM_VAL=>_PC_AM,_PM_VAL=>_PC_PM);
--- 1053,1057 ----
// get the theme globals :: is there a better way to do this?
pnThemeLoad(pnUserGetTheme());
! global $bgcolor1, $bgcolor2, $bgcolor3, $bgcolor4, $bgcolor5, $textcolor1, $textcolor2;
$ampm = array(_AM_VAL=>_PC_AM,_PM_VAL=>_PC_PM);
***************
*** 1840,1843 ****
--- 1847,1982 ----
$result->Close();
return $categories;
+ }
+
+ //=================================================================
+ // PostCalendar Custom Smarty Functions
+ //=================================================================
+ function PostCalendar_smarty_pcDateFormat($args)
+ {
+ extract($args);
+ if(!isset($format)) {
+ $format = pnModGetVar('PostCalendar','pcEventDateFormat');
+ }
+ if(isset($date)) {
+ list($y,$m,$d) = explode('-',$date);
+ echo strftime($format,mktime(0,0,0,$m,$d,$y));
+ } else {
+ echo strftime($format,time());
+ }
+ }
+
+ function PostCalendar_smarty_pcTimeFormat($args)
+ {
+ }
+
+ function PostCalendar_smarty_pcEventURL($args)
+ {
+ extract($args);
+ $modinfo = pnModGetInfo(pnModGetIDFromName('PostCalendar'));
+ //=================================================================
+ // Find out what Template we're using (n/a)
+ //=================================================================
+ $template_name = pnModGetVar('PostCalendar','pcTemplate');
+ if(!isset($template_name)) {
+ $template_name ='default';
+ }
+ //=================================================================
+ // Find out what Template View to use
+ //=================================================================
+ $template_view = pnVarCleanFromInput('tplview');
+ if(!isset($template_view)) {
+ $template_view ='default';
+ }
+ list($y,$m,$d) = explode('-',$date);
+ $date = "$m/$d/$y";
+ $PostCalendarURL = 'index.php?module='.pnVarPrepForOS($modinfo['name']);
+ if($view == 'details') {
+ echo $PostCalendarURL.'&func=view&tplview='.$template_view.'&viewtype='.$view.'&eid='.$eid;
+ } elseif($view == 'submit') {
+ echo $PostCalendarURL.'&func=submit&tplview='.$template_view.'&Date='.$date;
+ } else {
+ echo $PostCalendarURL.'&func=view&tplview='.$template_view.'&viewtype='.$view.'&Date='.$date;
+ }
+ }
+
+ function PostCalendar_smarty_pcDateSelect($args)
+ {
+ $useinternationaldate = pnModGetVar('PostCalendar','useinternationaldates');
+ list($Date,$d,$m,$y) = pnVarCleanFromInput('Date','jumpday','jumpmonth','jumpyear');
+ if(isset($Date)) {
+ list($m,$d,$y) = explode('/',$Date);
+ }
+ if(!isset($args['day']) || strtolower($args['day']) == 'on') {
+ $args['day'] = true;
+ } else {
+ $args['day'] = false;
+ }
+ if(!isset($args['month']) || strtolower($args['month']) == 'on') {
+ $args['month'] = true;
+ } else {
+ $args['month'] = false;
+ }
+ if(!isset($args['year']) || strtolower($args['year']) == 'on') {
+ $args['year'] = true;
+ } else {
+ $args['year'] = false;
+ }
+ if(!isset($args['view']) || strtolower($args['view']) == 'on') {
+ $args['view'] = true;
+ } else {
+ $args['view'] = false;
+ }
+ if(!isset($args['form']) || strtolower($args['form']) == 'on') {
+ $args['form'] = true;
+ } else {
+ $args['form'] = false;
+ }
+
+ $dayselect=$monthselect=$yearselect=$viewselect=$fstart=$fend='';
+ $output = new pnHTML();
+ $output->SetOutputMode(_PNH_RETURNOUTPUT);
+ if($args['day'] === true) {
+ $sel_data = pnModAPIFunc('PostCalendar','user','buildDaySelect',array('pc_day'=>$d));
+ $dayselect = $output->FormSelectMultiple('jumpday', $sel_data);
+ }
+
+ if($args['month'] === true) {
+ $sel_data = pnModAPIFunc('PostCalendar','user','buildMonthSelect',array('pc_month'=>$m));
+ $monthselect = $output->FormSelectMultiple('jumpmonth', $sel_data);
+ }
+
+ if($args['year'] === true) {
+ $sel_data = pnModAPIFunc('PostCalendar','user','buildYearSelect',array('pc_year'=>$y));
+ $yearselect = $output->FormSelectMultiple('jumpyear', $sel_data);
+ }
+ if($args['view'] === true) {
+ $sel_data = array();
+ $sel_data[0]['id'] = 'day';
+ $sel_data[0]['selected'] = $viewtype=='day';
+ $sel_data[0]['name'] = _CAL_DAYVIEW;
+ $sel_data[1]['id'] = 'week';
+ $sel_data[1]['selected'] = $viewtype=='week';
+ $sel_data[1]['name'] = _CAL_WEEKVIEW;
+ $sel_data[2]['id'] = 'month';
+ $sel_data[2]['selected'] = $viewtype=='month';
+ $sel_data[2]['name'] = _CAL_MONTHVIEW;
+ $sel_data[3]['id'] = 'year';
+ $sel_data[3]['selected'] = $viewtype=='year';
+ $sel_data[3]['name'] = _CAL_YEARVIEW;
+ $viewselect = $output->FormSelectMultiple('viewtype', $sel_data);
+ }
+ $jumpsubmit = $output->FormSubmit('Jump!');
+ if($args['form'] === true) {
+ $fstart = $output->FormStart(pnModURL('PostCalendar','user','view'));
+ $fend = $output->FormEnd();
+ }
+ $output->SetOutputMode(_PNH_KEEPOUTPUT);
+ echo $fstart;
+ if($useinternationaldates) {
+ echo $monthselect,$dayselect,$yearselect,$viewselect,$jumpsubmit;
+ } else {
+ echo $dayselect,$monthselect,$yearselect,$viewselect,$jumpsubmit;
+ }
+ echo $fend;
}
?>
|