X-Git-Url: https://git.llucax.com/mecon/samurai.git/blobdiff_plain/08d4baced9d229a7378f2ee7060918faaf53da7e..9002d01b94477c868b4b6b84eb496262ea30fadf:/sistema/local_lib/prepend.php?ds=sidebyside

diff --git a/sistema/local_lib/prepend.php b/sistema/local_lib/prepend.php
index 34650a8..fd3706d 100644
--- a/sistema/local_lib/prepend.php
+++ b/sistema/local_lib/prepend.php
@@ -1,24 +1,28 @@
 <?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/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';
 require_once 'SAMURAI/Perm.php';
 require_once 'util.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 (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']);
@@ -32,7 +36,7 @@ elseif (($_SERVER['REQUEST_URI'] != "/sistemas/samurai/sel-sistema" &&
         !@$_SESSION['samurai']['id_sistema']) {
     header('Location: /sistemas/samurai/sel-sistema?redirect=index');    
 }
-elseif (@$_SESSION['samurai']['id_sistema']) {
+if (@$_SESSION['samurai']['id_sistema']) {
     //Creo el objeto Permiso
     $SAMURAI_PERM = new SAMURAI_Perm ($_SESSION['usuario'],
             $_SESSION['samurai']['id_sistema'], $DB);