BugFixes

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

diff --git a/sistema/local_lib/prepend.php b/sistema/local_lib/prepend.php
index 31a95f1ac0027551ed2e4b293eae78b8b9239a42..97b93f19040631fa93b81c24549a2c38807c20ea 100644 (file)
--- a/sistema/local_lib/prepend.php
+++ b/sistema/local_lib/prepend.php
@@ -1,26 +1,39 @@
 <?php
 // vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
 
 <?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/');
-prepend_include_path('/var/www/intranet/www/sistemas/samurai');
+//require_once 'MECON/general.php';
+//prepend_include_path('/home/mmarrese/public_html/meconlib/lib/');

 
 require_once 'MECON/Marco.php';
 
 require_once 'MECON/Marco.php';

-require_once 'local_lib/Samurai_DB.php';
-require_once 'local_lib/Samurai.php';
+require_once 'SAMURAI/DB.php';
+require_once 'SAMURAI/Perm.php';
+require_once 'util.php';
+require_once 'SAMURAI/constantes.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 'MECON/Usuario.php';

 
 //Realizo la conexion con la base de datos
 
 //Realizo la conexion con la base de datos

-$tmp = new Samurai_DB;
+$tmp = new SAMURAI_DB();

 $DB  =& $tmp->connect();
 
 $DB  =& $tmp->connect();
 

+//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');    
+}
+elseif (@$_SESSION['samurai']['id_sistema']) {
+    //Creo el objeto Permiso
+    $SAMURAI_PERM = new SAMURAI_Perm ($_SESSION['usuario'],
+            $_SESSION['samurai']['id_sistema'], $DB);
+}
+//}}}

 ?>
 ?>