Note: this list is kept only as a demonstration for CVSNotice. For the latest CVS notices, see the Xaraya and Postnuke sites
View Statistics - Next Notice - Previous NoticeDirectory filter : [ all ] / postnuke_modules / postcalendar [ view in CVS ]
| Date | Directory [filter] | File(s) [view] | Author [filter] |
| 02 Oct 2002 20:56:00 | postnuke_modules/postcalendar | pnuser.php,1.61,1.62 pnuserapi.php,1.111,1.112 | Roger Raymond |
| template variable cleanup | |||
Update of /home/cvsroot/postnuke_modules/postcalendar
In directory ns7.hostnuke.net:/tmp/cvs-serv1382
Modified Files:
pnuser.php pnuserapi.php
Log Message:
template variable cleanup
Index: pnuser.php
===================================================================
RCS file: /home/cvsroot/postnuke_modules/postcalendar/pnuser.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** pnuser.php 2 Oct 2002 19:32:11 -0000 1.61
--- pnuser.php 2 Oct 2002 20:55:58 -0000 1.62
***************
*** 137,143 ****
pnThemeLoad(pnUserGetTheme());
global $bgcolor1, $bgcolor2, $bgcolor3, $bgcolor4, $bgcolor5, $textcolor1, $textcolor2;
- $Date = pnVarCleanFromInput('Date');
- extract($args);
$Date = postcalendar_getDate();
$year = substr($Date,0,4);
$month = substr($Date,4,2);
--- 137,142 ----
pnThemeLoad(pnUserGetTheme());
global $bgcolor1, $bgcolor2, $bgcolor3, $bgcolor4, $bgcolor5, $textcolor1, $textcolor2;
$Date = postcalendar_getDate();
+ extract($args);
$year = substr($Date,0,4);
$month = substr($Date,4,2);
***************
*** 165,184 ****
$categories = pnModAPIFunc('PostCalendar','user','getCategories');
- // main menu
- //$output->Text(postcalendar_usermenu(array('Date'=>$Date)));
-
- // are we previewing or committing the event?
- //$preview = pnVarCleanFromInput('preview') ? true : false;
- //$commit = pnVarCleanFromInput('commit') ? true : false;
-
- /* DEBUG /
- if(is_array($_POST)) {
- $vars = $_POST;
- while(list($k,$v) = each($vars)) {
- $output->Text('$args[\''.$k.'\'] => \''.$v.'\'<br />');
- }
- }
- /**/
-
list($event_subject, $event_desc, $event_topic,
$event_startday, $event_startmonth, $event_startyear,
--- 164,167 ----
***************
*** 271,280 ****
$edate = strtotime($event_endyear.'-'.$event_endmonth.'-'.$event_endday);
$tdate = strtotime(date('Y-m-d'));
- /* allow for post-dated events
- if($sdate < $tdate) {
- $error_msg .= $output->Text('Your start date is prior to today\'s date');
- $error_msg .= $output->Linebreak();
- }
- */
if($edate < $sdate && $event_endtype == 1) {
$error_msg .= $output->Text(_PC_SUBMIT_ERROR1);
--- 254,257 ----
***************
*** 454,466 ****
}
//=================================================================
// PARSE MAIN
//=================================================================
$tpl->assign('TPL_NAME',$template_name);
! $tpl->assign('DayView', _CALDAYLINK);
! $tpl->assign('WeekView', _CALWEEKLINK);
! $tpl->assign('MonthView', _CALMONTHLINK);
! $tpl->assign('YearView', _CALYEARLINK);
! $tpl->assign('Submit', _CALSUBMITEVENT);
! $tpl->assign('Search', _CALSEARCHEVENT);
$tpl->assign('ModuleName', $modinfo['displayname']);
$tpl->assign('ModuleDirectory', $modinfo['directory']);
--- 431,450 ----
}
//=================================================================
+ // Setup the correct config file path for the templates
+ //=================================================================
+ $modinfo = pnModGetInfo(pnModGetIDFromName('postcalendar'));
+ $modir = pnVarPrepForOS($modinfo['directory']);
+ $tpl->config_dir = 'modules/'.$modir.'/pntemplates/'.$template_name.'/config/';
+ //=================================================================
// PARSE MAIN
//=================================================================
$tpl->assign('TPL_NAME',$template_name);
! $tpl->assign('FUNCTION',pnVarCleanFromInput('func'));
! //$tpl->assign('DayView', _CALDAYLINK);
! //$tpl->assign('WeekView', _CALWEEKLINK);
! //$tpl->assign('MonthView', _CALMONTHLINK);
! //$tpl->assign('YearView', _CALYEARLINK);
! //$tpl->assign('Submit', _CALSUBMITEVENT);
! //$tpl->assign('Search', _CALSEARCHEVENT);
$tpl->assign('ModuleName', $modinfo['displayname']);
$tpl->assign('ModuleDirectory', $modinfo['directory']);
Index: pnuserapi.php
===================================================================
RCS file: /home/cvsroot/postnuke_modules/postcalendar/pnuserapi.php,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** pnuserapi.php 2 Oct 2002 19:32:11 -0000 1.111
--- pnuserapi.php 2 Oct 2002 20:55:58 -0000 1.112
***************
*** 247,255 ****
$tpl->config_dir = 'modules/'.$modinfo['directory'].'/pntemplates/'.$template_name.'/config/';
//=================================================================
- // Load the Language Defines
- //=================================================================
- $tpl->assign('USER_LANG', pnUserGetLang());
- //include_once('modules/'.$modinfo['directory'].'/pntemplates/'.$template_name.'/lang/'.pnUserGetLang().'/default.php');
- //=================================================================
// populate the template object with information for
// Month Names, Long Day Names and Short Day Names
--- 247,250 ----
***************
*** 442,501 ****
//=================================================================
$ImagePath = 'modules/'.$modinfo['directory'].'/pntemplates/'.$template_name.'/images/';
//=================================================================
// Assign the menu variables to the template object
//=================================================================
$tpl->assign('TPL_NAME',$template_name);
$tpl->assign('VIEW_TYPE',$viewtype);
$tpl->assign('FUNCTION',pnVarCleanFromInput('func'));
! $tpl->assign('DayView',_CALDAYLINK);
! $tpl->assign('WeekView',_CALWEEKLINK);
! $tpl->assign('MonthView',_CALMONTHLINK);
! $tpl->assign('YearView',_CALYEARLINK);
! $tpl->assign('Submit',_CALSUBMITEVENT);
! $tpl->assign('Search',_CALSEARCHEVENT);
! $tpl->assign('ModuleName',$modinfo['displayname']);
! $tpl->assign('ModuleDirectory',$modinfo['directory']);
! $tpl->assign('tplview',$template_view);
! $tpl->assign('ImagePath',$ImagePath);
! $tpl->assign('MonthNames',$pc_month_names);
! $tpl->assign('DayNamesShort',$pc_short_day_names);
! $tpl->assign('DayNamesLong',$pc_long_day_names);
! $tpl->assign('usepopups',$usepopups);
! $tpl->assign('useinternationaldates',$useinternationaldates);
! $tpl->assign('EventsOpenInNewWindow',$eventsopeninnewwindow);
! $tpl->assign('bgcolor1',$bgcolor1);
! $tpl->assign('bgcolor2',$bgcolor2);
! $tpl->assign('bgcolor3',$bgcolor3);
! $tpl->assign('bgcolor4',$bgcolor4);
! $tpl->assign('textcolor1',$textcolor1);
! $tpl->assign('textcolor2',$textcolor2);
! $tpl->assign('PrevMonthURL',$pc_prev);
! $tpl->assign('NextMonthURL',$pc_next);
! $tpl->assign('CurrentMonthURL',$month_link_url);
! $tpl->assign('CurrentMonth',$month_link_text);
! $tpl->assign('PrevDayURL',$pc_prev_day);
! $tpl->assign('NextDayURL',$pc_next_day);
! $tpl->assign('CurrentDayURL',$day_link_url);
! $tpl->assign('CurrentDay',$day_link_text);
! $tpl->assign('PrevWeekURL',$pc_prev_week);
! $tpl->assign('NextWeekURL',$pc_next_week);
! $tpl->assign('CurrentWeekURL',$week_link_url);
! $tpl->assign('CurrentWeek',$week_link_text);
! $tpl->assign('PrevYearURL',$pc_prev_year);
! $tpl->assign('NextYearURL',$pc_next_year);
! $tpl->assign('CurrentYearURL',$year_link_url);
! $tpl->assign('CurrentYear',$year_link_text);
! $tpl->assign('DayNames',$daynames);
! $tpl->assign('Dates',$dates);
! $tpl->assign('EventsByDate',$eventsByDate);
! $tpl->assign('StartDate',$starting_date);
! $tpl->assign('EndDate',$ending_date);
! $tpl->assign('month_view_start',$month_view_start);
! $tpl->assign('month_view_end',$month_view_end);
! $tpl->assign('today_date',$today_date);
! $tpl->assign('DayHighlightColor',$dayhighlightcolor);
! $tpl->assign('EventDateFormat',$pcEventDateFormat);
! $tpl->assign('category',pnModAPIFunc('postcalendar','user','getCategories'));
//=================================================================
--- 437,494 ----
//=================================================================
$ImagePath = 'modules/'.$modinfo['directory'].'/pntemplates/'.$template_name.'/images/';
+
//=================================================================
// Assign the menu variables to the template object
//=================================================================
+
+ // TEMPLATE SPECIFIC VARIABLES
$tpl->assign('TPL_NAME',$template_name);
$tpl->assign('VIEW_TYPE',$viewtype);
$tpl->assign('FUNCTION',pnVarCleanFromInput('func'));
! $tpl->assign('MODULE_NAME',$modinfo['displayname']);
! $tpl->assign('MODULE_DIR',$modinfo['directory']);
! $tpl->assign('TPL_VIEW',$template_view);
! $tpl->assign('TPL_IMAGE_PATH',$ImagePath);
!
! // CALENDAR SETTINGS
! $tpl->assign('USE_POPUPS',$usepopups);
! $tpl->assign('USE_INT_DATES',$useinternationaldates);
! $tpl->assign('OPEN_NEW_WINDOW',$eventsopeninnewwindow);
! $tpl->assign('EVENT_DATE_FORMAT',$pcEventDateFormat);
! $tpl->assign('HIGHLIGHT_COLOR',$dayhighlightcolor);
!
! // ARRAYS
! $tpl->assign('A_MONTH_NAMES',$pc_month_names);
! $tpl->assign('A_SHORT_DAY_NAMES',$pc_short_day_names);
! $tpl->assign('A_LONG_DAY_NAMES',$pc_long_day_names);
! $tpl->assign('A_DAY_NAMES',$daynames);
! $tpl->assign('A_DATES',$dates);
! $tpl->assign('A_EVENTS',$eventsByDate);
! $tpl->assign('A_CATEGORY',pnModAPIFunc('postcalendar','user','getCategories'));
+ // NAVIGATION LINKS AND NAMES
+ $tpl->assign('PREV_MONTH_URL',$pc_prev);
+ $tpl->assign('NEXT_MONTH_URL',$pc_next);
+ $tpl->assign('CURRENT_MONTH_URL',$month_link_url);
+ $tpl->assign('CURRENT_MONTH_NAME',$month_link_text);
+ $tpl->assign('PREV_DAY_URL',$pc_prev_day);
+ $tpl->assign('NEXT_DAY_URL',$pc_next_day);
+ $tpl->assign('CURRENT_DAY_URL',$day_link_url);
+ $tpl->assign('CURRENT_DAY_NAME',$day_link_text);
+ $tpl->assign('PREV_WEEK_URL',$pc_prev_week);
+ $tpl->assign('NEWXT_WEEK_URL',$pc_next_week);
+ $tpl->assign('CURRENT_WEEK_URL',$week_link_url);
+ $tpl->assign('CURRENT_WEEK_NAME',$week_link_text);
+ $tpl->assign('PREV_YEAR_URL',$pc_prev_year);
+ $tpl->assign('NEXT_YEAR_URL',$pc_next_year);
+ $tpl->assign('CURRENT_YEAR_URL',$year_link_url);
+ $tpl->assign('CURRENT_YEAR_NAME',$year_link_text);
+
+ // VIEW SPECIFIC VARIABLES
+ $tpl->assign('VIEW_START_DATE',$starting_date);
+ $tpl->assign('VIEW_END_DATE',$ending_date);
+ $tpl->assign('MONTH_START_DATE',$month_view_start);
+ $tpl->assign('MONTH_END_DATE',$month_view_end);
+ $tpl->assign('TODAY_DATE',$today_date);
//=================================================================
View Statistics - Next Notice - Previous Notice
| Visit Developer Site - Browse CVS Repository |
Syndicate via backend.rss (max. once per hour please) | Powered by CVSNotice 0.1.3 |