[PHPiCalendar-Commits] phpicalendar/includes event.php,1.19,1.20 login.php,1.6,1.7 todo.php,1.11,1.12

[<jo...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv6823/includes

Modified Files:
	event.php login.php todo.php 
Log Message:
Fleshed out invalid login error response. Only checks for invalid
logins for non-HTTP authentication (even if there is no calendar map
for an HTTP authenticated user).

Switched some include() directives to include_once() to prevent
possible future redeclaration errors.


Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** event.php	23 Nov 2003 17:56:27 -0000	1.19
--- event.php	25 Nov 2003 22:13:56 -0000	1.20
***************
*** 1,5 ****
  <?php 
  define('BASE', '../');
! include (BASE.'functions/init.inc.php'); 
  
  function decode_popup ($item) {
--- 1,5 ----
  <?php 
  define('BASE', '../');
! include_once(BASE.'functions/init.inc.php'); 
  
  function decode_popup ($item) {

Index: login.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/login.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** login.php	25 Nov 2003 21:50:13 -0000	1.6
--- login.php	25 Nov 2003 22:13:57 -0000	1.7
***************
*** 2,6 ****
  	// Hide the login block if logged in, there are no lock usernames,
  	// or if authenticated via HTTP.
! 	if ($username == '' && $allow_login == 'yes' && !isset($_SERVER['PHP_AUTH_USER'])) {
  		// Set the login table width if not set.
  		if (!isset($login_width)) $login_width = "100%";
--- 2,6 ----
  	// Hide the login block if logged in, there are no lock usernames,
  	// or if authenticated via HTTP.
! 	if ($username == '' && $allow_login == 'yes' &&	!isset($_SERVER['PHP_AUTH_USER'])) {
  		// Set the login table width if not set.
  		if (!isset($login_width)) $login_width = "100%";
***************
*** 18,23 ****
  		}
  		
! 		// For Wesley
! 		$login_message = ($user_passed == TRUE) ? $invalid_login_lang : $login_lang;
  
  echo <<<END
--- 18,23 ----
  		}
  		
! 		// If the attempted login was invalid, change the box title.
! 		$login_message = ($invalid_login == TRUE) ? "<font color=\"red\">$invalid_login_lang</font>" : '';
  
  echo <<<END
***************
*** 25,33 ****
  	<table cellpadding="0" cellspacing="0" border="0" width="{$login_width}" class="calborder">
  		<tr>
! 			<td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{$login_message}</div></td>
  		</tr>
  		<tr>
  			<td align="left" class="G10B">
  				<div style="padding: 5px;">
  				<table border="0" width="100%" cellspacing="0" cellpadding="2">
  					<tr>
--- 25,34 ----
  	<table cellpadding="0" cellspacing="0" border="0" width="{$login_width}" class="calborder">
  		<tr>
! 			<td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{$login_lang}</div></td>
  		</tr>
  		<tr>
  			<td align="left" class="G10B">
  				<div style="padding: 5px;">
+ 				{$login_message}
  				<table border="0" width="100%" cellspacing="0" cellpadding="2">
  					<tr>
***************
*** 36,41 ****
  					</tr>
  					<tr>
! 						<td>Password:</td>
! 						<td><input class="login_style" type="{$password_lang}" size="8" name="password"></td>
  					</tr>
  					<tr>
--- 37,42 ----
  					</tr>
  					<tr>
! 						<td>{$password_lang}:</td>
! 						<td><input class="login_style" type="$password" size="8" name="password"></td>
  					</tr>
  					<tr>

Index: todo.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/todo.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** todo.php	22 Nov 2003 19:29:46 -0000	1.11
--- todo.php	25 Nov 2003 22:13:57 -0000	1.12
***************
*** 2,7 ****
  
  define('BASE', '../');
! include (BASE.'functions/init.inc.php');
! include (BASE.'functions/date_functions.php');
  
  $vtodo_array = unserialize(base64_decode($HTTP_GET_VARS['vtodo_array']));
--- 2,7 ----
  
  define('BASE', '../');
! include_once(BASE.'functions/init.inc.php');
! include_once(BASE.'functions/date_functions.php');
  
  $vtodo_array = unserialize(base64_decode($HTTP_GET_VARS['vtodo_array']));