|
From: <cl...@us...> - 2003-05-30 00:45:23
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv15712/functions
Modified Files:
admin_functions.php ical_parser.php init.inc.php
Log Message:
Cleaned up look and feel of admin pages, corrected some error_reporting.
Index: admin_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/admin_functions.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** admin_functions.php 29 May 2003 05:08:34 -0000 1.1
--- admin_functions.php 30 May 2003 00:45:20 -0000 1.2
***************
*** 51,58 ****
// set up basic connection
! $conn_id = ftp_connect($ftp_server);
// login with username and password
! $login_result = ftp_login($conn_id, $username, $password);
// check connection
--- 51,58 ----
// set up basic connection
! $conn_id = @ftp_connect($ftp_server);
// login with username and password
! $login_result = @ftp_login($conn_id, $username, $password);
// check connection
***************
*** 62,66 ****
// close the FTP stream
! ftp_close($conn_id);
return TRUE;
--- 62,66 ----
// close the FTP stream
! @ftp_close($conn_id);
return TRUE;
***************
*** 97,104 ****
// set up basic connection
! $conn_id = ftp_connect($ftp_server);
// login with username and password
! $login_result = ftp_login($conn_id, $HTTP_SESSION_VARS['phpical_username'], $HTTP_SESSION_VARS['phpical_password']);
// check connection
--- 97,104 ----
// set up basic connection
! $conn_id = @ftp_connect($ftp_server);
// login with username and password
! $login_result = @ftp_login($conn_id, $HTTP_SESSION_VARS['phpical_username'], $HTTP_SESSION_VARS['phpical_password']);
// check connection
***************
*** 107,111 ****
// delete the file
! $delete = ftp_delete($conn_id, $filename);
// check delete status
--- 107,111 ----
// delete the file
! $delete = @ftp_delete($conn_id, $filename);
// check delete status
***************
*** 114,118 ****
// close the FTP stream
! ftp_close($conn_id);
return TRUE;
--- 114,118 ----
// close the FTP stream
! @ftp_close($conn_id);
return TRUE;
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** ical_parser.php 29 May 2003 18:28:00 -0000 1.90
--- ical_parser.php 30 May 2003 00:45:20 -0000 1.91
***************
*** 459,463 ****
foreach($bymonth as $month) {
$year = date('Y', $next_range_time);
! if (is_array($byday)) {
$checkdate_time = mktime(0,0,0,$month,1,$year);
foreach($byday as $day) {
--- 459,463 ----
foreach($bymonth as $month) {
$year = date('Y', $next_range_time);
! if ((isset($byday)) && (is_array($byday))) {
$checkdate_time = mktime(0,0,0,$month,1,$year);
foreach($byday as $day) {
Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** init.inc.php 29 May 2003 18:28:00 -0000 1.31
--- init.inc.php 30 May 2003 00:45:20 -0000 1.32
***************
*** 7,11 ****
// uncomment when developing, comment for shipping version
! error_reporting (E_ALL);
if (!defined('BASE')) define('BASE', './');
--- 7,11 ----
// uncomment when developing, comment for shipping version
! //error_reporting (E_ALL);
if (!defined('BASE')) define('BASE', './');
|