X-Git-Url: https://git.llucax.com/mecon/intranet.git/blobdiff_plain/618a6fd58b160600ee070cf0216a9a17a6f7ad65..f3ae07982132c35339f6d4e4947546aeea5b9550:/sistema/www/login.php

diff --git a/sistema/www/login.php b/sistema/www/login.php
index 76dfb63..91bccbe 100644
--- a/sistema/www/login.php
+++ b/sistema/www/login.php
@@ -1,14 +1,13 @@
 <?
-  require_once '../local_lib/HTML_DietMarco.php';
-  require_once '../local_lib/HTML_Login.php';
-  require_once 'DB.php';
+  require_once 'HTML_DietMarco.php';
+  require_once 'HTML_Login.php';
   require_once 'MECON/Usuario.php'; //Agregado MANAZAR
 
   if(isset($_POST['usuario']))
   {
     $userid = $_POST['usuario'];
-    $ds = @ldap_connect( "ldapdist.mecon.ar" )
-    or $ds = @ldap_connect( "ldapmaster.mecon.ar" );
+    $ds = @ldap_connect( 'ldapdist.mecon.ar' )
+    or $ds = @ldap_connect( 'ldapmaster.mecon.ar' );
 
     if (! $ds) {
     //error connecting - return false
@@ -38,11 +37,14 @@
       {
         $_SESSION['usuario'] = $_POST['usuario'];
         $_SESSION['documento'] =  $info[0]['uidnumber'][0];
+	// Agregado por culpa de Aldoros
+	$aux = split('-',$_SESSION['documento']);
+	$_SESSION['documento'] = (count($aux) == 3) ? $aux[1] : $aux[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=& new MECON_USUARIO($DB);
         $usuario->Insertar_Usuario($MECON_DNI,$MECON_LOGIN,$MECON_NOMBRE);
         // Fin Agregado MANAZAR
       }
@@ -52,9 +54,7 @@
   {
     if(!isset($_SESSION['usuario']) )
     {
-      if((isset($_GET['redirect']) && $_GET['redirect'] == 'sistemas') ||
-         (isset($_POST['redirect']) && $_POST['redirect'] == 'sistemas'))
-      {
+      if (preg_match('/sistemas/', @$_REQUEST['redirect']) || @$_REQUEST['embperl']) {
            $m = new HTML_DietMarco('sistemas', 'Sistemas');
 //           $m->addTitle('Sistemas');
       }
@@ -83,16 +83,22 @@
   }
 
   if(isset($_SESSION['usuario']) && ! @ $error &&
-       (isset($_POST['redirect']) || isset($_GET['redirect'])))
+       (@$_REQUEST['redirect'])) 
   {
-    @ $redirect = $_GET['redirect'].$_POST['redirect'];
-    $db = DB::Connect('mysql://intranet:intranet@bal747f/intranet');
+    $redirect = $_REQUEST['redirect'];
     $query = "SELECT link
               FROM servicio
               WHERE servicio = $redirect";
-    $link = $db->getOne($query);
-    if(PEAR::isError($link))
-      header('location: '.$redirect);
+    $link = $DB->getOne($query);
+    if(PEAR::isError($link)) {
+
+      if (@$_REQUEST['embperl']) {
+         header('Location: /Php2Embperl_Session?redirect='.$redirect);
+      }
+      else {
+         header('Location: '.$redirect);
+      }
+    }
     else
       header('location: '.$link);
   }