- Arregle un rowspan en la celda que contiene a la tabla TablaInfoMes

[mecon/intranet.git] / sistema / www / login.php

diff --git a/sistema/www/login.php b/sistema/www/login.php
index e15ebb083acb4d0f26d2f35e356f762c2606d4ad..f78827cdd4250e62e0fd0955338ad98625ba59e1 100644 (file)
--- a/sistema/www/login.php
+++ b/sistema/www/login.php
@@ -25,7 +25,7 @@
 
     if (!isset($sr)) {
     //error reading / authenticating  - return false
 
     if (!isset($sr)) {
     //error reading / authenticating  - return false

-      echo "Error leyendo!\n";
+      $error = true;

     }
     else
     {
     }
     else
     {


@@ -41,22 +41,25 @@
       // Fin Agregado MANAZAR
       
     }
       // Fin Agregado MANAZAR
       
     }

-  }else{
+  }
+  {

     if(!isset($_SESSION['usuario']))
     {
       if((isset($_GET['redirect']) && $_GET['redirect'] == 'sistemas') ||
          (isset($_POST['redirect']) && $_POST['redirect'] == 'sistemas'))
       {
     if(!isset($_SESSION['usuario']))
     {
       if((isset($_GET['redirect']) && $_GET['redirect'] == 'sistemas') ||
          (isset($_POST['redirect']) && $_POST['redirect'] == 'sistemas'))
       {

-           $m = new HTML_DietMarco('sistemas');
+           $m = new HTML_DietMarco('sistemas', 'Sistemas');

            $m->addTitle('Sistemas');
       }
       else
       {
            $m->addTitle('Sistemas');
       }
       else
       {

-           $m = new HTML_DietMarco('servicios');
+           $m = new HTML_DietMarco('servicios', 'Servicios');

            $m->addTitle('Servicios');
       }
     
       $login = new HTML_Login();
            $m->addTitle('Servicios');
       }
     
       $login = new HTML_Login();

+      if(isset($error) && $error == 1)
+      $login->login_incorrecto = true;//FIXME terminar de prgramar cuando haya ldap

       $t = new HTML_Table(array('width'       => 760,
                                 'align'       => 'center',
                                'cellspacing' => 0,
       $t = new HTML_Table(array('width'       => 760,
                                 'align'       => 'center',
                                'cellspacing' => 0,


@@ -75,22 +78,15 @@
   if(isset($_SESSION['usuario']) &&
        (isset($_POST['redirect']) || isset($_GET['redirect'])))
   {
   if(isset($_SESSION['usuario']) &&
        (isset($_POST['redirect']) || isset($_GET['redirect'])))
   {

-    if((isset($_GET['redirect']) && $_GET['redirect'] == 'sistemas') ||
-       (isset($_POST['redirect']) && $_POST['redirect'] == 'sistemas'))
-    {
-      header('location: sistemas.php');
-      exit;
-    }
+    @ $redirect = $_GET['redirect'].$_POST['redirect'];
+    $db = DB::Connect('mysql://intranet:intranet@bal747f/intranet');
+    $query = "SELECT link
+              FROM servicio
+              WHERE servicio = $redirect";
+    $link = $db->getOne($query);
+    if(PEAR::isError($link))
+      header('location: '.$redirect);

     else
     else

-    {
-      $db = DB::Connect('mysql://intranet:intranet@bal747f/intranet');
-      $query = "SELECT link
-                FROM servicio
-               WHERE servicio = ";
-      if(isset($_POST['redirect'])) $query .= $_POST['redirect'];
-      else                          $query .= $_GET['redirect'];
-      $link = $db->getOne($query);

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

-    }

   } 
 ?>
   } 
 ?>