Se agrego la funcionalidad para embeber el abm de perfiles en cualquier sistema exter...

[mecon/samurai.git] / lib / SAMURAI / Perm.php

diff --git a/lib/SAMURAI/Perm.php b/lib/SAMURAI/Perm.php
index 3533f68a13e5b935edd38aba524ffb821f5cc258..965665c3825e1c1550f792526199a5baa094fa54 100644 (file)
--- a/lib/SAMURAI/Perm.php
+++ b/lib/SAMURAI/Perm.php
@@ -83,7 +83,8 @@ class SAMURAI_Perm {
         $query = '
             SELECT DISTINCT psu.id_sistema AS sistema, pps.id_permiso AS permiso
             FROM samurai.perfil_sist_usuario AS psu, samurai.perm_perfil_sist AS pps
         $query = '
             SELECT DISTINCT psu.id_sistema AS sistema, pps.id_permiso AS permiso
             FROM samurai.perfil_sist_usuario AS psu, samurai.perm_perfil_sist AS pps

-            WHERE psu.login = '.$db->quote($login).' AND psu.id_perfil = pps.id_perfil;';
+            WHERE psu.login = '.$db->quote($login).' AND psu.id_perfil = pps.id_perfil
+            AND psu.id_sistema = pps.id_sistema';

         foreach ($db->getAll($query, DB_FETCHMODE_ASSOC) as $row) {
             $this->_permisos[$row['sistema']][] = $row['permiso'];
         }
         foreach ($db->getAll($query, DB_FETCHMODE_ASSOC) as $row) {
             $this->_permisos[$row['sistema']][] = $row['permiso'];
         }


@@ -147,7 +148,7 @@ Si no se pasa ningun parametro ($perm->tiene()), devuelve true si tiene un permi
     function chequear() // ~X2C
     {
         $args = func_get_args();
     function chequear() // ~X2C
     {
         $args = func_get_args();

-        if (!call_user_method_array(array($this, 'tiene'), $args)) {
+        if (!call_user_func_array(array($this, 'tiene'), $args)) {

             include 'MECON/includes/no_autorizado.html';
             exit;
         }
             include 'MECON/includes/no_autorizado.html';
             exit;
         }