[PHPiCalendar-Commits] phpicalendar/functions admin_functions.php,1.4,1.5

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31874/functions

Modified Files:
	admin_functions.php 
Log Message:
[ 1032648 ] traditional_chinese has some extra \n that thwart header



Index: admin_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/admin_functions.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** admin_functions.php	22 Nov 2003 21:16:10 -0000	1.4
--- admin_functions.php	1 Oct 2004 23:34:08 -0000	1.5
***************
*** 4,9 ****
  // returns boolean is the user logged in
  function is_loggedin () {
! 	global $HTTP_SESSION_VARS;
! 	if (!isset($HTTP_SESSION_VARS['phpical_loggedin']) || $HTTP_SESSION_VARS['phpical_loggedin'] == FALSE) {
  		return FALSE;
  	}
--- 4,9 ----
  // returns boolean is the user logged in
  function is_loggedin () {
! 	global $_SESSION;
! 	if (!isset($_SESSION['phpical_loggedin']) || $_SESSION['phpical_loggedin'] == FALSE) {
  		return FALSE;
  	}
***************
*** 18,22 ****
  // returns boolean was the login successful
  function login ($username, $password) {
! 	global $HTTP_SESSION_VARS;
  	global $auth_method;
  	
--- 18,22 ----
  // returns boolean was the login successful
  function login ($username, $password) {
! 	global $_SESSION;
  	global $auth_method;
  	
***************
*** 32,39 ****
  	}
  	
! 	$HTTP_SESSION_VARS['phpical_loggedin'] = $loggedin;
  	if ($loggedin) {
! 		$HTTP_SESSION_VARS['phpical_username'] = $username;
! 		$HTTP_SESSION_VARS['phpical_password'] = $password;
  	}
  	
--- 32,39 ----
  	}
  	
! 	$_SESSION['phpical_loggedin'] = $loggedin;
  	if ($loggedin) {
! 		$_SESSION['phpical_username'] = $username;
! 		$_SESSION['phpical_password'] = $password;
  	}
  	
***************
*** 87,91 ****
  // returns boolean was delete successful
  function delete_cal ($filename) {
! 	global $HTTP_SESSION_VARS;
  	global $auth_method;
  	global $ftp_server;
--- 87,91 ----
  // returns boolean was delete successful
  function delete_cal ($filename) {
! 	global $_SESSION;
  	global $auth_method;
  	global $ftp_server;
***************
*** 100,104 ****
  		
  		// login with username and password
! 		$login_result = @ftp_login($conn_id, $HTTP_SESSION_VARS['phpical_username'], $HTTP_SESSION_VARS['phpical_password']); 
  		
  		// check connection
--- 100,104 ----
  		
  		// login with username and password
! 		$login_result = @ftp_login($conn_id, $_SESSION['phpical_username'], $_SESSION['phpical_password']); 
  		
  		// check connection
***************
*** 117,122 ****
  		
  		return TRUE;
! 	}
! 	else {
  		$filename = $calendar_path . "/" . $filename;
  	
--- 117,121 ----
  		
  		return TRUE;
! 	} else {
  		$filename = $calendar_path . "/" . $filename;
  	
***************
*** 151,155 ****
  // returns boolean was copy successful
  function copy_cal ($source, $destination) {
! 	global $HTTP_SESSION_VARS;
  	global $auth_method;
  	global $ftp_server;
--- 150,154 ----
  // returns boolean was copy successful
  function copy_cal ($source, $destination) {
! 	global $_SESSION;
  	global $auth_method;
  	global $ftp_server;
***************
*** 164,168 ****
  		
  		// login with username and password
! 		$login_result = ftp_login($conn_id, $HTTP_SESSION_VARS['phpical_username'], $HTTP_SESSION_VARS['phpical_password']); 
  		
  		// check connection
--- 163,167 ----
  		
  		// login with username and password
! 		$login_result = ftp_login($conn_id, $_SESSION['phpical_username'], $_SESSION['phpical_password']); 
  		
  		// check connection