Retoques varios. Nada grave

[mecon/samurai.git] / sistema / local_lib / prepend.php

diff --git a/sistema/local_lib/prepend.php b/sistema/local_lib/prepend.php
index 01b8b8c251a228de05c60fb43c806c251d2df937..7439734b9d1ad680a56d80f4bd54dbc22c7fb53c 100644 (file)
--- a/sistema/local_lib/prepend.php
+++ b/sistema/local_lib/prepend.php
@@ -1,31 +1,25 @@
 <?php
 // vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
 
-//require_once 'MECON/general.php';
-//prepend_include_path('/home/mmarrese/public_html/meconlib/tronco/lib/');
+require_once 'MECON/general.php';
+prepend_include_path('/home/mmarrese/public_html/meconlib/lib/');
 
 require_once 'MECON/Marco.php';
 require_once 'SAMURAI/DB.php';
 require_once 'SAMURAI/Perm.php';
 require_once 'util.php';
-require_once 'constantes.php';
+require_once 'SAMURAI/constantes.php';
 
 session_start();
 
-if (isset($_GET['login'])) {
-    $_SESSION['samurai']['login'] = $_GET{'login'};
-}
-
+//CARGO LAS VARIABLES DE SESION INTERNAS {{{
 if (isset($_SESSION['usuario'])) {
     $_SESSION['samurai']['login'] = $_SESSION['usuario'];
 }
-if (!isset($_SESSION['samurai']['id_sistema']) && isset($_GET['id_sistema'])) {
+if (isset($_GET['id_sistema'])) {
     $_SESSION['samurai']['id_sistema'] = $_GET['id_sistema'];
 }
-if (!isset($_SESSION['samurai']['login']) && isset($_GET['login'])) {
-    $_SESSION['samurai']['login'] = $_GET['login'];
-}
-
+//}}}
 //Realizo la conexion con la base de datos
 $tmp = new SAMURAI_DB();
 $DB  =& $tmp->connect();