[Alba-desarrollo] SVN Alba r4879 - in prosistem/alba/trunk/alba/apps/principal: config modules/default/config modules/seguridad/actions

[commits en pressenter.com.ar]

Author: ftoledo
Date: 2007-07-30 14:18:02 -0300 (Mon, 30 Jul 2007)
New Revision: 4879

Modified:
   prosistem/alba/trunk/alba/apps/principal/config/settings.yml
   prosistem/alba/trunk/alba/apps/principal/modules/default/config/security.yml
   prosistem/alba/trunk/alba/apps/principal/modules/seguridad/actions/actions.class.php
Log:
permisos dependiendo de la demo



Modified: prosistem/alba/trunk/alba/apps/principal/config/settings.yml
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/config/settings.yml	2007-07-30 16:04:40 UTC (rev 4878)
+++ prosistem/alba/trunk/alba/apps/principal/config/settings.yml	2007-07-30 17:18:02 UTC (rev 4879)
@@ -21,7 +21,6 @@
     cache:                  off
 
 
-
 test:
   .settings:
     # E_ALL | E_STRICT & ~E_NOTICE = 2047

Modified: prosistem/alba/trunk/alba/apps/principal/modules/default/config/security.yml
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/default/config/security.yml	2007-07-30 16:04:40 UTC (rev 4878)
+++ prosistem/alba/trunk/alba/apps/principal/modules/default/config/security.yml	2007-07-30 17:18:02 UTC (rev 4879)
@@ -1,3 +1,3 @@
 all:
-    is_secure: off
+    is_secure: on
     
\ No newline at end of file

Modified: prosistem/alba/trunk/alba/apps/principal/modules/seguridad/actions/actions.class.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/seguridad/actions/actions.class.php	2007-07-30 16:04:40 UTC (rev 4878)
+++ prosistem/alba/trunk/alba/apps/principal/modules/seguridad/actions/actions.class.php	2007-07-30 17:18:02 UTC (rev 4879)
@@ -84,12 +84,22 @@
                     /* asigno las credenciales */                                                  
                     $cperm = new Criteria();                                                       
                     $cperm->add(RelUsuarioPermisoPeer::FK_USUARIO_ID, $user->getId());             
+                    $cperm->addAscendingOrderBycolumn(PermisoPeer::CREDENCIAL);
                     $usuarioPermisos = RelUsuarioPermisoPeer::doSelectJoinPermiso($cperm);         
                     foreach ($usuarioPermisos as $usuarioPermiso) {                                
                         $this->getUser()->addCredential($usuarioPermiso->getPermiso()->getCredencial());
                         $message = "{Credenciales} " . $usuarioPermiso->getPermiso()->getCredencial();
                         $this->debugMessage($message);                    
-                    }                                                                              
+                    }                               
+                    // quitando credenciales para la demo
+                    if(SF_ENVIRONMENT =='demo'){
+                        $this->logMessage('{DEMO} quitando credenciales');
+                        $this->getUser()->removeCredential('usuario');
+                        $this->getUser()->removeCredential('permiso');
+                        $this->getUser()->removeCredential('modulo');
+                        $this->getUser()->removeCredential('rol');
+                    
+                    }                                               
                     $this->debugMessage('Login ok');
                     return $this->redirect($this->getRequestParameter('referer', '@homepage'));
                 }
@@ -116,7 +126,7 @@
         $this->debugMessage("Logout");
         $this->getUser()->clearCredentials();
         $this->getUser()->setAuthenticated(false);
-        $this->redirect('default/index');
+        $this->redirect('default');
     }
     /* pagina de ingreso del usuario */
     public function executeEnviarclave() {