Minor BugFix.

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

diff --git a/sistema/local_lib/prepend.php b/sistema/local_lib/prepend.php
index 373b0742697b618a7ce1b42892a17c8a04fe4d7c..fd3706d43a6a3e88ac3f76bfc32b0e482aad271d 100644 (file)
--- a/sistema/local_lib/prepend.php
+++ b/sistema/local_lib/prepend.php
@@ -1,20 +1,45 @@
 <?php
 // vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
 
+//require_once 'MECON/general.php';
+//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';
-
-session_start();
-
-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'];
-}
+require_once 'SAMURAI/Perm.php';
+require_once 'util.php';
+require_once 'SAMURAI/constantes.php';
+require_once 'MECON/Usuario.php';
 
 //Realizo la conexion con la base de datos
 $tmp = new SAMURAI_DB();
 $DB  =& $tmp->connect();
 
+if (PEAR::isError($DB)) {
+    $ERROR = new MECON_HTML_Error($DB->getMessage());
+    echo $ERROR->toHtml();
+    exit;
+}
+
+
+//CARGO LAS VARIABLES DE SESION INTERNAS {{{
+if (!isset($_SESSION['usuario'])) {
+    header('Location: /sistemas/intranet/login?redirect='.$_SERVER['REQUEST_URI']);
+}
+if (isset($_GET['id_sistema'])) {
+    $_SESSION['samurai']['id_sistema'] = $_GET['id_sistema'];
+}
+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');    
+}
+if (@$_SESSION['samurai']['id_sistema']) {
+    //Creo el objeto Permiso
+    $SAMURAI_PERM = new SAMURAI_Perm ($_SESSION['usuario'],
+            $_SESSION['samurai']['id_sistema'], $DB);
+}
+//}}}
 ?>