Cambio en el mapa

diff --git a/sistema/local_lib/HTML_Copete.php b/sistema/local_lib/HTML_Copete.php
index 814894c2a923865f9cb7240bcff91c29ce7e7190..4f69c39905d4d09358d47892e09f8e6a099a88b4 100644 (file)
--- a/sistema/local_lib/HTML_Copete.php
+++ b/sistema/local_lib/HTML_Copete.php
@@ -51,10 +51,10 @@ class HTML_Copete extends HTML_Table {
     {
     $mapa = '<map name="intranet">
             <area shape="rect" coords="14,0,209,54" href="#" alt="Intranet" title="Intranet" > 
     {
     $mapa = '<map name="intranet">
             <area shape="rect" coords="14,0,209,54" href="#" alt="Intranet" title="Intranet" > 

-            <area shape="rect" coords="605,17,629,41" alt="Logout" title="Logout" href="'.PATH_RAIZ.'logout.php"> 
-            <area shape="rect" coords="645,17,669,41" href="#" alt="Cambio de Clave" title="Cambio de Clave" > 
-            <area shape="rect" coords="685,17,709,41" href="#" alt="Ayuda" title="Ayuda" > 
-            <area shape="rect" coords="726,17,750,41" href="#" alt="E-mail" title="E-mail" > 
+            <area shape="rect" coords="605,17,629,41" alt="E-mail" title="E-mail" href="mailto:intranet2@mecon.gov.ar"> 
+            <area shape="rect" coords="645,17,669,41" href="https://ldapmaster.mecon.ar/bbng/servlet/ServletDispatcher?hans=gui.FormPassUsr" alt="Cambio de Clave" title="Cambio de Clave" > 
+            <area shape="rect" coords="685,17,709,41" href="#" alt="Ayuda" title="Ayuda"> 
+            <area shape="rect" coords="726,17,750,41" alt="Logout" title="Logout" href="'.PATH_RAIZ.'logout.php"> 

             <area shape="poly" coords="473,19,473,43,475,45,561,45,563,43,563,19,561,17,475,17,473,19,473,19" href="'.PATH_RAIZ.'sistemas.php" alt="Sistemas" title="Sistemas" > 
             <area shape="poly" coords="366,19,366,43,368,45,454,45,456,43,456,19,454,17,368,17,366,19,366,19" href="'.PATH_RAIZ.'servicios.php" alt="Servicios" title="Servicios" > 
             <area shape="poly" coords="258,20,258,44,260,46,346,46,348,44,348,20,346,18,260,18,258,20,258,20" href="'.PATH_RAIZ.'noticias.php" alt="Noticias" title="Noticias" > 
             <area shape="poly" coords="473,19,473,43,475,45,561,45,563,43,563,19,561,17,475,17,473,19,473,19" href="'.PATH_RAIZ.'sistemas.php" alt="Sistemas" title="Sistemas" > 
             <area shape="poly" coords="366,19,366,43,368,45,454,45,456,43,456,19,454,17,368,17,366,19,366,19" href="'.PATH_RAIZ.'servicios.php" alt="Servicios" title="Servicios" > 
             <area shape="poly" coords="258,20,258,44,260,46,346,46,348,44,348,20,346,18,260,18,258,20,258,20" href="'.PATH_RAIZ.'noticias.php" alt="Noticias" title="Noticias" > 

diff --git a/sistema/www/login.php b/sistema/www/login.php
index fb025ffd7c5c9a78a04dde6e12eab8daeb01c677..e15ebb083acb4d0f26d2f35e356f762c2606d4ad 100644 (file)
--- a/sistema/www/login.php
+++ b/sistema/www/login.php
@@ -2,6 +2,7 @@
   require_once '../local_lib/HTML_DietMarco.php';
   require_once '../local_lib/HTML_Login.php';
   require_once 'DB.php';
   require_once '../local_lib/HTML_DietMarco.php';
   require_once '../local_lib/HTML_Login.php';
   require_once 'DB.php';

+  require_once 'MECON/Usuario.php'; //Agregado MANAZAR

 
   if(isset($_POST['usuario']))
   {
 
   if(isset($_POST['usuario']))
   {


@@ -30,12 +31,30 @@
     {
       $_SESSION['usuario'] = $_POST['usuario'];
       $_SESSION['documento'] =  $info[0]['uidnumber'][0];
     {
       $_SESSION['usuario'] = $_POST['usuario'];
       $_SESSION['documento'] =  $info[0]['uidnumber'][0];

+      
+      // Agregado MANAZAR
+      $MECON_DNI=  $info[0]['uidnumber'][0];
+      $MECON_NOMBRE=   $info[0]['sn'][0]." ".$info[0]['givenname'][0];
+      $MECON_LOGIN=  $_POST['usuario'];
+      $usuario=& new MECON_USUARIO();
+      $usuario->Insertar_Usuario($MECON_DNI,$MECON_LOGIN,$MECON_NOMBRE);
+      // Fin Agregado MANAZAR
+      

     }
   }else{
     if(!isset($_SESSION['usuario']))
     {
     }
   }else{
     if(!isset($_SESSION['usuario']))
     {

-      $m = new HTML_DietMarco('servicios');
-      $m->addTitle('Servicios');
+      if((isset($_GET['redirect']) && $_GET['redirect'] == 'sistemas') ||
+         (isset($_POST['redirect']) && $_POST['redirect'] == 'sistemas'))
+      {
+           $m = new HTML_DietMarco('sistemas');
+           $m->addTitle('Sistemas');
+      }
+      else
+      {
+           $m = new HTML_DietMarco('servicios');
+           $m->addTitle('Servicios');
+      }

     
       $login = new HTML_Login();
       $t = new HTML_Table(array('width'       => 760,
     
       $login = new HTML_Login();
       $t = new HTML_Table(array('width'       => 760,


@@ -53,18 +72,25 @@
     }
   }
 
     }
   }
 

-  if(isset($_SESSION['usuario']) && (isset($_POST['redirect']) || isset($_GET['redirect'])))
+  if(isset($_SESSION['usuario']) &&
+       (isset($_POST['redirect']) || isset($_GET['redirect'])))

   {
   {

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

     else
     else

-      $query .= $_GET['redirect'];
-    $link = $db->getOne($query);
-    header('location: '.$link);
-  }
-   
+    {
+      $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);
+    }
+  } 

 ?>
 ?>

diff --git a/sistema/www/sistemas.php b/sistema/www/sistemas.php
index c4951646f8a0ceaf16d7cedb0f72ed6f9fe2ace7..a9bcd7c30eb39a2df1ccbd2661573a772d2a935d 100644 (file)
--- a/sistema/www/sistemas.php
+++ b/sistema/www/sistemas.php
@@ -1,8 +1,12 @@
 <?php
 // vim: set binary expandtab ts=4 shiftwidth=4 textwidth=80:
 // $Id$
 <?php
 // vim: set binary expandtab ts=4 shiftwidth=4 textwidth=80:
 // $Id$

-

 require_once '../local_lib/HTML_DietMarco.php';
 require_once '../local_lib/HTML_DietMarco.php';

+if(!isset($_SESSION['usuario']))
+{
+  header('location: login?redirect=sistemas');
+  exit;
+}

 require_once '../local_lib/intranetdb.php';
 require_once 'MECON/HTML/Arbol/ArbolDB.php';
 require_once 'HTML/Table.php';
 require_once '../local_lib/intranetdb.php';
 require_once 'MECON/HTML/Arbol/ArbolDB.php';
 require_once 'HTML/Table.php';