[CVS] openbash-org/pages admin.php,1.5,1.6 admin_close.php,1.1,1.2

[Javier B. <jb...@us...>]

Update of /cvsroot/openbash-org/openbash-org/pages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3649/pages

Modified Files:
	admin.php admin_close.php 
Log Message:
Arreglado parcialmente el bug del exit(); La validación parece funcionar bien
pero han salido dos sub-bugs: en ?page=admin si no estás logueado el formulario
aparece dos veces y el close_session funciona mal (muestra el admin_header porque
ese include viene antes en el código).


Index: admin_close.php
===================================================================
RCS file: /cvsroot/openbash-org/openbash-org/pages/admin_close.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** admin_close.php	17 Nov 2004 18:00:20 -0000	1.1
--- admin_close.php	24 Nov 2004 07:40:05 -0000	1.2
***************
*** 1,6 ****
  <?php
! session_destroy();
! $view = new view();
! $view->ask_login();
  ?>
  <!--<meta http-equiv="refresh" content="0;index.php">-->
--- 1,7 ----
  <?php
! $validate = new validate();
! if ($validate->validate()) { session_destroy(); }
! //$view = new view();
! //$view->ask_login();
  ?>
  <!--<meta http-equiv="refresh" content="0;index.php">-->

Index: admin.php
===================================================================
RCS file: /cvsroot/openbash-org/openbash-org/pages/admin.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** admin.php	19 Nov 2004 10:15:39 -0000	1.5
--- admin.php	24 Nov 2004 07:40:05 -0000	1.6
***************
*** 3,26 ****
  include ("modules/Validate.php");
  $validate = new validate();
- $validate->validate();
  
! /* 
!  * The user is logged in
!  */
! if (isset($_GET['a_opt'])) { ?>
! 	<h1><?=$admin['title']?></h1><?
!   switch ($_GET['a_opt']) {
! 	  case 'quotes': $admin_page = 'quotes'; break;
!     case 'news'  : $admin_page = 'news';   break;
!     case 'users' : $admin_page = 'users';  break;
! 		case 'close' : $admin_page = 'close';  break;
!     default      : $admin_page = 'general';break;
! 	}
! } else {
! 		$admin_page = 'general';
! 	}
!    
! include ("pages/admin_header.php");
! include ('pages/admin_'.$admin_page.'.php');
  
  ?>
--- 3,28 ----
  include ("modules/Validate.php");
  $validate = new validate();
  
! if ($validate->validate()) {
! 
! 	/* 
! 	 * The user is logged in
! 	 */
! 	
! 	if (isset($_GET['a_opt'])) { ?>
! 		<h1><?=$admin['title']?></h1><?
! 		switch ($_GET['a_opt']) {
! 		  case 'quotes': $admin_page = 'quotes'; break;
! 			case 'news'  : $admin_page = 'news';   break;
! 		  case 'users' : $admin_page = 'users';  break;
! 			case 'close' : $admin_page = 'close';  break;
! 		  default      : $admin_page = 'general';break;
! 		}	
! 	} else {
! 			$admin_page = 'general';
! 		}
! 	include ("pages/admin_header.php");
! 	include ('pages/admin_'.$admin_page.'.php');
! }
  
  ?>