X-Git-Url: https://git.llucax.com/mecon/samurai.git/blobdiff_plain/421bca9938fcbe0d0cf3e715a27f0a6bc37c15c3..dca3e83212951982c59f002efc6c349f9d9c0ad2:/sistema/local_lib/prepend.php?ds=sidebyside

diff --git a/sistema/local_lib/prepend.php b/sistema/local_lib/prepend.php
index 70cac6e..4ee9c83 100644
--- a/sistema/local_lib/prepend.php
+++ b/sistema/local_lib/prepend.php
@@ -2,7 +2,7 @@
 // vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
 
 require_once 'MECON/general.php';
-prepend_include_path('/home/mmarrese/public_html/meconlib/tronco/lib/');
+prepend_include_path('/home/mmarrese/public_html/meconlib/lib/');
 
 require_once 'MECON/Marco.php';
 require_once 'SAMURAI/DB.php';
@@ -12,23 +12,25 @@ require_once 'constantes.php';
 
 session_start();
 
+if (isset($_GET['login'])) {
+    $_SESSION['samurai']['login'] = $_GET{'login'};
+}
+
+if (isset($_SESSION['usuario'])) {
+    $_SESSION['samurai']['login'] = $_SESSION['usuario'];
+}
 if (!isset($_SESSION['samurai']['id_sistema']) && isset($_GET['id_sistema'])) {
     $_SESSION['samurai']['id_sistema'] = $_GET['id_sistema'];
 }
 if (!isset($_SESSION['samurai']['login']) && isset($_GET['login'])) {
     $_SESSION['samurai']['login'] = $_GET['login'];
 }
-if (isset($_GET['l'])) {
-    $_SESSION['samurai']['login_perm'] = $_GET['l'];
-}
-elseif (!isset($_SESSION['samurai']['login_perm'])) {
-    $_SESSION['samurai']['login_perm'] = 'mmarre@mecon';
-}
+
 //Realizo la conexion con la base de datos
 $tmp = new SAMURAI_DB();
 $DB  =& $tmp->connect();
 //Creo el objeto Permiso
-$SAMURAI_PERM = new SAMURAI_Perm ($_SESSION['samurai']['login_perm'], SAMURAI_ID, $DB);
+$SAMURAI_PERM = new SAMURAI_Perm ($_SESSION['samurai']['login'], SAMURAI_ID, $DB);
 //Creo el objeto Marco
 $MARCO =& new MECON_Marco ('/var/www/sistemas/samurai/sistema/conf/confSecciones.php', $SAMURAI_PERM);
 ?>