[PHPiCalendar-Commits] phpicalendar month.php, 1.146, 1.147 year.php, 1.49, 1.50

[<ji...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32554

Modified Files:
	month.php year.php 
Log Message:
add login to month view

Index: month.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** month.php	17 Dec 2008 06:58:52 -0000	1.146
--- month.php	19 Dec 2008 21:15:53 -0000	1.147
***************
*** 47,50 ****
--- 47,56 ----
  $list_icals_pick = display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED), TRUE);
  
+ // login/logout
+ $is_logged_in = ($username != '' && !$invalid_login) ? true : false;
+ $show_user_login = (!$is_logged_in && $phpiCal_config->allow_login == 'yes');
+ $login_querys = login_querys();
+ $logout_querys = logout_querys();
+ 
  $page = new Page(BASE.'templates/'.$phpiCal_config->template.'/month.tpl');
  
***************
*** 75,79 ****
  	'prev_month'	 	=> $prev_month,
  	'show_goto' 		=> '',
! 	'is_logged_in' 		=> '',
  	'list_jumps' 		=> $list_jumps,
  	'list_icals' 		=> $list_icals,
--- 81,90 ----
  	'prev_month'	 	=> $prev_month,
  	'show_goto' 		=> '',
! 	'show_user_login'	=> $show_user_login,
! 	'invalid_login'		=> $invalid_login,
! 	'login_querys'		=> $login_querys,
! 	'is_logged_in' 		=> $is_logged_in,
! 	'username'			=> $username,
! 	'logout_querys'		=> $logout_querys,
  	'list_jumps' 		=> $list_jumps,
  	'list_icals' 		=> $list_icals,

Index: year.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/year.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** year.php	16 Dec 2008 15:46:24 -0000	1.49
--- year.php	19 Dec 2008 21:15:53 -0000	1.50
***************
*** 37,41 ****
  // login/logout
  $is_logged_in = ($username != '' && !$invalid_login) ? true : false;
! $show_user_login = (!$is_logged_in && $allow_login == 'yes');
  $login_querys = login_querys();
  $logout_querys = logout_querys();
--- 37,41 ----
  // login/logout
  $is_logged_in = ($username != '' && !$invalid_login) ? true : false;
! $show_user_login = (!$is_logged_in && $phpiCal_config->allow_login == 'yes');
  $login_querys = login_querys();
  $logout_querys = logout_querys();
***************
*** 79,83 ****
  	'prev_year'			=> $prev_year,
  	'show_goto' 		=> '',
! 	'show_user_login'	=> $phpiCal_config->show_user_login,
  	'invalid_login'		=> $invalid_login,
  	'login_querys'		=> $login_querys,
--- 79,83 ----
  	'prev_year'			=> $prev_year,
  	'show_goto' 		=> '',
! 	'show_user_login'	=> $show_user_login,
  	'invalid_login'		=> $invalid_login,
  	'login_querys'		=> $login_querys,