X-Git-Url: https://git.llucax.com/mecon/samurai.git/blobdiff_plain/14b7965388416e66c0d012ac6f001f9c877b5ce8..2dd89e44c718262ef75b7c451d947a5e866b3e67:/sistema/local_lib/prepend.php?ds=sidebyside

diff --git a/sistema/local_lib/prepend.php b/sistema/local_lib/prepend.php
index 31a95f1..01b8b8c 100644
--- a/sistema/local_lib/prepend.php
+++ b/sistema/local_lib/prepend.php
@@ -1,17 +1,24 @@
 <?php
 // vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
 
-require_once 'MECON/general.php';
-
+//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/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 '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'];
 }
@@ -20,7 +27,10 @@ if (!isset($_SESSION['samurai']['login']) && isset($_GET['login'])) {
 }
 
 //Realizo la conexion con la base de datos
-$tmp = new Samurai_DB;
+$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);
 ?>