[Webnotes-cvs] webnotes action.php,1.9,1.10 index.php,1.3,1.4 logout.php,1.14,1.15

[<vb...@us...>]

Update of /cvsroot/webnotes/webnotes
In directory usw-pr-cvs1:/tmp/cvs-serv30158

Modified Files:
	action.php index.php logout.php 
Log Message:
- Removed extra code from logout that was never executed.
- Remove print_header_redirect() since it wasn't used - util_header_redirect() should be used instead.
- Added @ infront of header() calls.
- Used util_header_redirect() rather than using header() directly.


Index: action.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/action.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- action.php	26 Sep 2002 03:41:46 -0000	1.9
+++ action.php	3 Oct 2002 00:23:19 -0000	1.10
@@ -48,8 +48,7 @@
 		} else if ( 'queue' === $f_action ) {
 			note_pending( $f_note_id );
 		} else if ( 'edit' === $f_action ) {
-			header( "Location: $g_note_add_page?f_note_id=$f_note_id" );
-			exit;
+			util_header_redirect( "$g_note_add_page?f_note_id=$f_note_id" );
 		}
 	}
 

Index: index.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.php	21 Sep 2002 02:44:32 -0000	1.3
+++ index.php	3 Oct 2002 00:23:19 -0000	1.4
@@ -8,5 +8,6 @@
 	# $Id$
 	# --------------------------------------------------------
 
-	header("Location: user_home_page.php");
+	require_once( 'core' . DIRECTORY_SEPARATOR . 'api.php' );
+	util_header_redirect( 'user_home_page.php' );
 ?>

Index: logout.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/logout.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- logout.php	21 Sep 2002 02:44:32 -0000	1.14
+++ logout.php	3 Oct 2002 00:23:19 -0000	1.15
@@ -13,35 +13,4 @@
 	### remove cookie
 	setcookie( $g_string_cookie, '', 0, $g_cookie_url );
 	util_header_redirect( $g_logout_redirect_page );
-
-	print_html_top();
-	print_head_top();
-	print_title( $g_window_title );
-	print_css( $g_css_inc_file );
-	print_meta_redirect( $g_logout_redirect_page, 2 );
-	print_head_bottom();
-	print_body_top();
-	print_header( $g_page_title );
-
-	# @@@@ The word "Here" needs to be localised.
-	echo <<<EOT
-	<br />
-	<div align="center">
-		<table width="40%" bgcolor="$g_table_border_color" cellspacing="1" border="0">
-			<tr bgcolor="$g_white_color">
-				<td bgcolor="$g_table_title_color"><strong>$s_logged_out_msg</strong></td>
-			</tr>
-			<tr bgcolor="$g_white_color">
-				<td align="right" bgcolor="$g_primary_dark_color">
-					<strong>$s_logout_redirect_msg <a href="$g_logout_redirect_page">Here</a></strong>
-				</td>
-			</tr>
-		</table>
-	</div>
-
-EOT;
-
-	print_footer( __FILE__ );
-	print_body_bottom();
-	print_html_bottom();
 ?>