Update of /cvsroot/phpicalendar/phpicalendar
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3514
Modified Files:
config.inc.php default_config.php
Log Message:
obfuscate list_webcals links to hide user:pass (bug 1819552)
Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.195
retrieving revision 1.196
diff -C2 -d -r1.195 -r1.196
*** config.inc.php 28 Dec 2008 10:50:57 -0000 1.195
--- config.inc.php 28 Dec 2008 11:55:43 -0000 1.196
***************
*** 23,26 ****
--- 23,28 ----
Note that the allow_webcals setting allows webcals to be passed as URLs. You do NOT need to override the default setting to list specific webcals for inclusion in the SPECIAL CALENDARS section below.
+
+ The salt parameter is used to obfuscate things like webcal links that may have usernames and passwords. This should be changed.
*/
# 'calendar_path' => '/Library/WebServer/Documents/phpicalendar/calendars/recur_tests',
***************
*** 31,34 ****
--- 33,37 ----
# 'allow_webcals' => 'yes',
# 'recursive_path' => 'yes',
+ # 'salt' => 'SaLt4',
/* ** Timezones **
***************
*** 81,85 ****
*/
$list_webcals = array(
! # 'webcal://dimer.tamu.edu/calendars/seminars/Biochem.ics'
);
$more_webcals['recur_tests'] = array();
--- 84,88 ----
*/
$list_webcals = array(
! 'webcal://dimer.tamu.edu/calendars/seminars/Biochem.ics'
);
$more_webcals['recur_tests'] = array();
Index: default_config.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** default_config.php 28 Dec 2008 10:50:57 -0000 1.9
--- default_config.php 28 Dec 2008 11:55:43 -0000 1.10
***************
*** 68,72 ****
$this->ftp_port = '21'; // Only used if $this->auth_method='ftp'. The ftp port. '21' is the default for ftp servers.
$this->ftp_calendar_path = ''; // Only used if $this->auth_method='ftp'. The full path to the calendar directory on the ftp server. If = '', will attempt to deduce the path based on $this->calendar_path, but may not be accurate depending on ftp server config.
!
// Calendar colors
//
--- 68,72 ----
$this->ftp_port = '21'; // Only used if $this->auth_method='ftp'. The ftp port. '21' is the default for ftp servers.
$this->ftp_calendar_path = ''; // Only used if $this->auth_method='ftp'. The full path to the calendar directory on the ftp server. If = '', will attempt to deduce the path based on $this->calendar_path, but may not be accurate depending on ftp server config.
! $this->salt = '';
// Calendar colors
//
|
