Menu
▾
▴
[PHPiCalendar-Commits] phpicalendar config.inc.php, 1.194, 1.195 default_config.php, 1.8, 1.9 error.php, 1.5, 1.6 month.php, 1.149, 1.150
|
From: <ji...@us...> - 2008-12-28 10:51:01
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25222 Modified Files: config.inc.php default_config.php error.php month.php Log Message: kill admin.php; misc other changes; bump rc num Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.194 retrieving revision 1.195 diff -C2 -d -r1.194 -r1.195 *** config.inc.php 28 Dec 2008 03:20:29 -0000 1.194 --- config.inc.php 28 Dec 2008 10:50:57 -0000 1.195 *************** *** 30,34 **** # 'download_uri' => '', # 'allow_webcals' => 'yes', ! 'recursive_path' => 'yes', /* ** Timezones ** --- 30,34 ---- # 'download_uri' => '', # 'allow_webcals' => 'yes', ! # 'recursive_path' => 'yes', /* ** Timezones ** *************** *** 58,62 **** # 'show_completed' => 'no', 'allow_login' => 'yes', // Set to yes to prompt for login to unlock calendars. - # 'allow_admin' => 'yes', # 'week_start_day' => 'Monday', // Day of the week your week starts on # 'week_length' => '5', // Number of days to display in the week view --- 58,61 ---- *************** *** 81,89 **** */ ! $list_webcals[] = array( # 'webcal://dimer.tamu.edu/calendars/seminars/Biochem.ics' ); $more_webcals['recur_tests'] = array(); ! $locked_cals[] = array( ); --- 80,88 ---- */ ! $list_webcals = array( # 'webcal://dimer.tamu.edu/calendars/seminars/Biochem.ics' ); $more_webcals['recur_tests'] = array(); ! $locked_cals = array( ); Index: default_config.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** default_config.php 28 Dec 2008 02:31:59 -0000 1.8 --- default_config.php 28 Dec 2008 10:50:57 -0000 1.9 *************** *** 3,7 **** private static $instance; private function __construct(){ ! $this->phpicalendar_version = '2.3rc1.4'; // Configuration file for PHP iCalendar 2.25rc1 // --- 3,7 ---- private static $instance; private function __construct(){ ! $this->phpicalendar_version = '2.3rc1.6'; // Configuration file for PHP iCalendar 2.25rc1 // *************** *** 34,37 **** --- 34,38 ---- $this->download_uri = ''; // The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars -- AUTO SETTING -- Only set if you are having subscribe issues. $this->default_path = ''; // The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar + $this->cpath = ''; // optional subdirectory $this->charset = 'UTF-8'; // Character set your calendar is in, suggested UTF-8, or iso-8859-1 for most languages. Index: error.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/error.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** error.php 11 Dec 2008 21:54:52 -0000 1.5 --- error.php 28 Dec 2008 10:50:57 -0000 1.6 *************** *** 4,19 **** ! function error($error_msg='There was an error processing the request.', $file='NONE', $error_base='./') { ! global $language, $enable_rss, $lang, $charset, $phpiCal_config; if (!isset($template)) $template = $phpiCal_config->template; - if (!isset($lang['l_powered_by'])) $lang['l_powered_by'] = 'Powered by'; - if (!isset($lang['l_error_title'])) $lang['l_error_title'] = 'Error!'; - if (!isset($lang['l_error_window'])) $lang['l_error_window'] = 'There was an error!'; - if (!isset($lang['l_error_calendar'])) $lang['l_error_calendar'] = 'The calendar "%s" was being processed when this error occurred.'; - if (!isset($lang['l_error_back'])) $lang['l_error_back'] = 'Please use the "Back" button to return.'; - if (!isset($lang['l_this_site_is'])) $lang['l_this_site_is'] = 'This site is'; - if (!isset($enable_rss)) $enable_rss = 'no'; ! $error_calendar = sprintf($lang['l_error_calendar'], $file); $current_view = 'error'; $display_date = $lang['l_error_title']; --- 4,12 ---- ! function error($error_msg='There was an error processing the request.', $file='NONE', $error_base='') { ! global $getdate, $rss_powered, $lang, $phpiCal_config, $cal; if (!isset($template)) $template = $phpiCal_config->template; ! $error_calendar = sprintf($lang['l_error_calendar'], print_r($file,true)); $current_view = 'error'; $display_date = $lang['l_error_title']; *************** *** 28,32 **** } } - $page = new Page(BASE.'templates/'.$template.'/error.tpl'); --- 21,24 ---- *************** *** 37,46 **** $page->replace_tags(array( ! 'version' => $phpicalendar_version, ! 'default_path' => $default_path.'/', 'template' => $template, 'cal' => $cal, 'getdate' => $getdate, ! 'charset' => $charset, 'calendar_name' => $calendar_name, 'display_date' => $display_date, --- 29,38 ---- $page->replace_tags(array( ! 'version' => $phpiCal_config->phpicalendar_version, ! 'default_path' => $phpiCal_config->default_path.$error_base, 'template' => $template, 'cal' => $cal, 'getdate' => $getdate, ! 'charset' => $phpiCal_config->charset, 'calendar_name' => $calendar_name, 'display_date' => $display_date, *************** *** 56,60 **** 'l_powered_by' => $lang['l_powered_by'], 'l_error_back' => $lang['l_error_back'], ! 'l_error_window' => $lang['l_error_window'] )); --- 48,53 ---- 'l_powered_by' => $lang['l_powered_by'], 'l_error_back' => $lang['l_error_back'], ! 'l_error_window' => $lang['l_error_window'], ! 'l_this_site_is' => $lang['l_this_site_is'] )); Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.149 retrieving revision 1.150 diff -C2 -d -r1.149 -r1.150 *** month.php 27 Dec 2008 10:58:50 -0000 1.149 --- month.php 28 Dec 2008 10:50:57 -0000 1.150 *************** *** 54,58 **** $page = new Page(BASE.'templates/'.$phpiCal_config->template.'/month.tpl'); - $page->replace_files(array( 'header' => BASE.'templates/'.$phpiCal_config->template.'/header.tpl', --- 54,57 ---- |
