[PHPiCalendar-Commits] phpicalendar config.inc.php, 1.181, 1.182 preferences.php, 1.64, 1.65

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

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

Modified Files:
	config.inc.php preferences.php 
Log Message:
add day_end option to preferences

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.181
retrieving revision 1.182
diff -C2 -d -r1.181 -r1.182
*** config.inc.php	20 Dec 2008 09:51:07 -0000	1.181
--- config.inc.php	24 Dec 2008 21:09:31 -0000	1.182
***************
*** 11,15 ****
  #	'allow_admin'	=> 'yes', 
  #	'allow_login'	=> 'yes', 
! #	'allow_preferences'	=> 'yes', 
  #	'show_search'	=> 'yes',
  #	'show_todos'	=> 'no',
--- 11,15 ----
  #	'allow_admin'	=> 'yes', 
  #	'allow_login'	=> 'yes', 
! 	'allow_preferences'	=> 'yes', 
  #	'show_search'	=> 'yes',
  #	'show_todos'	=> 'no',

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** preferences.php	20 Dec 2008 04:24:42 -0000	1.64
--- preferences.php	24 Dec 2008 21:09:31 -0000	1.65
***************
*** 2,6 ****
  define('BASE','./');
  $current_view = 'preferences';
! require_once(BASE.'functions/ical_parser.php');
  require_once(BASE.'functions/template.php');
  $display_date = $lang['l_preferences'];
--- 2,6 ----
  define('BASE','./');
  $current_view = 'preferences';
! require_once(BASE.'functions/init.inc.php');
  require_once(BASE.'functions/template.php');
  $display_date = $lang['l_preferences'];
***************
*** 30,35 ****
  	$cookie_startday	= $_POST['cookie_startday'];
  	$cookie_time		= $_POST['cookie_time'];
  	$cookie_unset		= @$_POST['unset'];
! 	$the_cookie = array ("cookie_language" => "$cookie_language", "cookie_calendar" => "$cookie_calendar", "cookie_view" => "$cookie_view", "cookie_startday" => "$cookie_startday", "cookie_style" => "$cookie_style", "cookie_time" => "$cookie_time", "cookie_cpath"=>"$cookie_cpath");
  	$the_cookie 		= serialize($the_cookie);
  	if ($cookie_unset) { 
--- 30,36 ----
  	$cookie_startday	= $_POST['cookie_startday'];
  	$cookie_time		= $_POST['cookie_time'];
+ 	$cookie_endtime		= $_POST['cookie_endtime'];
  	$cookie_unset		= @$_POST['unset'];
! 	$the_cookie = array ("cookie_language" => "$cookie_language", "cookie_calendar" => "$cookie_calendar", "cookie_view" => "$cookie_view", "cookie_startday" => "$cookie_startday", "cookie_style" => "$cookie_style", "cookie_time" => "$cookie_time","cookie_endtime" => "$cookie_endtime", "cookie_cpath"=>"$cookie_cpath");
  	$the_cookie 		= serialize($the_cookie);
  	if ($cookie_unset) { 
***************
*** 38,44 ****
  		setcookie("$cookie_name","$the_cookie",time()+(60*60*24*7*12*10) ,"/","$phpiCal_config->cookie_uri",0);
  		if (isset($_POST['cookie_view'])) 
! 			$default_view = $_POST['cookie_view'];
  		if (isset($_POST['cookie_style']) && is_dir(BASE.'templates/'.$_POST['cookie_style'].'/')) 
! 			$template = $_POST['cookie_style'];
  		if (isset($_POST['cookie_language']) && is_file(BASE.'languages/'.strtolower($_POST['cookie_language']).'.inc.php')) 
  			include(BASE.'languages/'.strtolower($_POST['cookie_language']).'.inc.php');
--- 39,45 ----
  		setcookie("$cookie_name","$the_cookie",time()+(60*60*24*7*12*10) ,"/","$phpiCal_config->cookie_uri",0);
  		if (isset($_POST['cookie_view'])) 
! 			$phpiCal_config->default_view = $_POST['cookie_view'];
  		if (isset($_POST['cookie_style']) && is_dir(BASE.'templates/'.$_POST['cookie_style'].'/')) 
! 			$phpiCal_config->template = $_POST['cookie_style'];
  		if (isset($_POST['cookie_language']) && is_file(BASE.'languages/'.strtolower($_POST['cookie_language']).'.inc.php')) 
  			include(BASE.'languages/'.strtolower($_POST['cookie_language']).'.inc.php');
***************
*** 57,60 ****
--- 58,62 ----
  	$cookie_startday	= $phpicalendar['cookie_startday'];
  	$cookie_time		= $phpicalendar['cookie_time'];
+ 	$cookie_endtime		= $phpicalendar['cookie_endtime'];
  	if ($cookie_unset) { 
  		unset ($cookie_language, $cookie_calendar, $cookie_view, $cookie_style,$cookie_startday);
***************
*** 70,73 ****
--- 72,76 ----
  	$cookie_startday = $phpiCal_config->week_start_day;
  	$cookie_time = $phpiCal_config->day_start;
+ 	$cookie_endtime = $phpiCal_config->day_end;
  }
  
***************
*** 109,113 ****
  // select for time
  $time_select = '';
! for ($i = 000; $i <= 1200; $i += 100) {
  	$s = sprintf("%04d", $i);
  	$time_select .= '<option value="'.$s.'"';
--- 112,116 ----
  // select for time
  $time_select = '';
! for ($i = 000; $i <= 2400; $i += 100) {
  	$s = sprintf("%04d", $i);
  	$time_select .= '<option value="'.$s.'"';
***************
*** 118,121 ****
--- 121,134 ----
  }
  
+ $endtime_select = '';
+ for ($i = 000; $i <= 2400; $i += 100) {
+ 	$s = sprintf("%04d", $i);
+ 	$endtime_select .= '<option value="'.$s.'"';
+ 	if ($s == $cookie_endtime) {
+ 		$endtime_select .= ' selected="selected"';
+ 	}
+ 	$endtime_select .= ">$s</option>\n";
+ }
+ 
  // select for day of week
  $i=0;
***************
*** 170,173 ****
--- 183,187 ----
  	'view_select' 		=> $view_select,
  	'time_select' 		=> $time_select,
+ 	'endtime_select'	=> $endtime_select,
  	'startday_select' 	=> $startday_select,
  	'style_select' 		=> $style_select,
***************
*** 180,183 ****
--- 194,198 ----
  	'l_select_view'		=> $lang['l_select_view'],
  	'l_select_time'		=> $lang['l_select_time'],
+ 	'l_select_endtime'	=> $lang['l_select_endtime'],
  	'l_select_day'		=> $lang['l_select_day'],
  	'l_select_cal'		=> $lang['l_select_cal'],