X-Git-Url: https://git.llucax.com/mecon/samurai.git/blobdiff_plain/2dd89e44c718262ef75b7c451d947a5e866b3e67..9002d01b94477c868b4b6b84eb496262ea30fadf:/sistema/local_lib/prepend.php?ds=inline

diff --git a/sistema/local_lib/prepend.php b/sistema/local_lib/prepend.php
index 01b8b8c..fd3706d 100644
--- a/sistema/local_lib/prepend.php
+++ b/sistema/local_lib/prepend.php
@@ -2,35 +2,44 @@
 // 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 'MECON/HTML/Error.php';
 require_once 'SAMURAI/DB.php';
 require_once 'SAMURAI/Perm.php';
 require_once 'util.php';
-require_once 'constantes.php';
+require_once 'SAMURAI/constantes.php';
+require_once 'MECON/Usuario.php';
 
-session_start();
+//Realizo la conexion con la base de datos
+$tmp = new SAMURAI_DB();
+$DB  =& $tmp->connect();
 
-if (isset($_GET['login'])) {
-    $_SESSION['samurai']['login'] = $_GET{'login'};
+if (PEAR::isError($DB)) {
+    $ERROR = new MECON_HTML_Error($DB->getMessage());
+    echo $ERROR->toHtml();
+    exit;
 }
 
-if (isset($_SESSION['usuario'])) {
-    $_SESSION['samurai']['login'] = $_SESSION['usuario'];
+
+//CARGO LAS VARIABLES DE SESION INTERNAS {{{
+if (!isset($_SESSION['usuario'])) {
+    header('Location: /sistemas/intranet/login?redirect='.$_SERVER['REQUEST_URI']);
 }
-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'];
+elseif (($_SERVER['REQUEST_URI'] != "/sistemas/samurai/sel-sistema" &&
+            $_SERVER['REQUEST_URI'] !=
+            "/sistemas/samurai/sel-sistema?redirect=index")&& 
+        !@$_SESSION['samurai']['id_sistema']) {
+    header('Location: /sistemas/samurai/sel-sistema?redirect=index');    
 }
-
-//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'], SAMURAI_ID, $DB);
-//Creo el objeto Marco
-$MARCO =& new MECON_Marco ('/var/www/sistemas/samurai/sistema/conf/confSecciones.php', $SAMURAI_PERM);
+if (@$_SESSION['samurai']['id_sistema']) {
+    //Creo el objeto Permiso
+    $SAMURAI_PERM = new SAMURAI_Perm ($_SESSION['usuario'],
+            $_SESSION['samurai']['id_sistema'], $DB);
+}
+//}}}
 ?>