BugFix en logout. En login se agrego la posibilidad de pasar por parametro si el...

diff --git a/sistema/www/login.php b/sistema/www/login.php
index 2a3ae8b7d5b25cb621c019a900a1dd5781956631..a4965dcfafd647a1299fb867f5c5c5c3a8b7d3d1 100644 (file)
--- a/sistema/www/login.php
+++ b/sistema/www/login.php
@@ -54,9 +54,7 @@
   {
     if(!isset($_SESSION['usuario']) )
     {
   {
     if(!isset($_SESSION['usuario']) )
     {

-      if((isset($_GET['redirect']) && $_GET['redirect'] == 'sistemas') ||
-         (isset($_POST['redirect']) && $_POST['redirect'] == 'sistemas'))
-      {
+      if (@$_REQUEST['redirect'] == 'sistemas' || @$_REQUEST['embperl']) {

            $m = new HTML_DietMarco('sistemas', 'Sistemas');
 //           $m->addTitle('Sistemas');
       }
            $m = new HTML_DietMarco('sistemas', 'Sistemas');
 //           $m->addTitle('Sistemas');
       }


@@ -85,15 +83,22 @@
   }
 
   if(isset($_SESSION['usuario']) && ! @ $error &&
   }
 
   if(isset($_SESSION['usuario']) && ! @ $error &&

-       (isset($_POST['redirect']) || isset($_GET['redirect'])))
+       (@$_REQUEST['redirect'])) 

   {
   {

-    @ $redirect = $_GET['redirect'].$_POST['redirect'];
+    $redirect = $_REQUEST['redirect'];

     $query = "SELECT link
               FROM servicio
               WHERE servicio = $redirect";
     $link = $DB->getOne($query);
     $query = "SELECT link
               FROM servicio
               WHERE servicio = $redirect";
     $link = $DB->getOne($query);

-    if(PEAR::isError($link))
-      header('location: '.$redirect);
+    if(PEAR::isError($link)) {
+
+      if (@$_REQUEST['embperl']) {
+         header('Location: /Php2Embperl_Session?redirect='.$redirect);
+      }
+      else {
+         header('Location: '.$redirect);
+      }
+    }

     else
       header('location: '.$link);
   }
     else
       header('location: '.$link);
   }

diff --git a/sistema/www/logout.php b/sistema/www/logout.php
index 0aaf7b5fb84e52850910a6d616cef8496608b5c4..b7ef64980f2d50aa0fa4a7bfeda8a9f42d0ee2fe 100644 (file)
--- a/sistema/www/logout.php
+++ b/sistema/www/logout.php
@@ -1,5 +1,4 @@
 <?
 <?

-session_start();

 session_destroy();
 session_destroy();

-header('location: noticias.php');
+header('Location: noticias');

 ?>
 ?>