From 69bd91f99617bc2ec7e5beb7aeabaf29633fe6de Mon Sep 17 00:00:00 2001
From: Freddy Daniel Rojas Valda <daniel.rojas@colosa.com>
Date: Mon, 17 Feb 2014 11:29:38 -0400
Subject: [PATCH] Se adicionan validaciones a PMUSER y PROCESS SUPERVISOR

---
 .../src/BusinessModel/ProcessSupervisor.php   |  4 +-
 workflow/engine/src/BusinessModel/User.php    | 63 +++++++++++++++----
 2 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/workflow/engine/src/BusinessModel/ProcessSupervisor.php b/workflow/engine/src/BusinessModel/ProcessSupervisor.php
index 283a5d71d..e233fd6a9 100644
--- a/workflow/engine/src/BusinessModel/ProcessSupervisor.php
+++ b/workflow/engine/src/BusinessModel/ProcessSupervisor.php
@@ -50,6 +50,7 @@ class ProcessSupervisor
             $oCriteria->addJoin(\ProcessUserPeer::USR_UID, \UsersPeer::USR_UID, \Criteria::LEFT_JOIN);
             $oCriteria->add(\ProcessUserPeer::PU_TYPE, 'SUPERVISOR');
             $oCriteria->add(\ProcessUserPeer::PRO_UID, $sProcessUID);
+            $oCriteria->add(\UsersPeer::USR_STATUS, 'ACTIVE');
             $oCriteria->addAscendingOrderByColumn(\UsersPeer::USR_FIRSTNAME);
             $oDataset = \ProcessUserPeer::doSelectRS($oCriteria);
             $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
@@ -61,7 +62,7 @@ class ProcessSupervisor
                                  'usr_firstname' => $aRow['USR_FIRSTNAME'],
                                  'usr_lastname' => $aRow['USR_LASTNAME'],
                                  'usr_username' => $aRow['USR_USERNAME'],
-                                 'usr_email' => $aRow['USR_EMAIL'] );
+                                 'usr_email' => $aRow['USR_EMAIL']);
                 $oDataset->next();
             }
             if ($aResp == null) {
@@ -218,6 +219,7 @@ class ProcessSupervisor
             $oCriteria->add(\UsersPeer::USR_UID, $aUIDS, \Criteria::IN);
             $oCriteria->addAscendingOrderByColumn(\UsersPeer::USR_FIRSTNAME);
             $oCriteria->add(\UsersPeer::USR_ROLE, 'PROCESSMAKER_ADMIN', \Criteria::EQUAL);
+            $oCriteria->add(\UsersPeer::USR_STATUS, 'ACTIVE');
             $oDataset = \UsersPeer::doSelectRS($oCriteria);
             $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
             $oDataset->next();
diff --git a/workflow/engine/src/BusinessModel/User.php b/workflow/engine/src/BusinessModel/User.php
index e0b80e880..7910e8cbb 100644
--- a/workflow/engine/src/BusinessModel/User.php
+++ b/workflow/engine/src/BusinessModel/User.php
@@ -217,6 +217,30 @@ class User
                     throw new \Exception('`usr_replaced_by`:'.$form['USR_REPLACED_BY'].' '.\G::LoadTranslation('ID_AUTHENTICATION_SOURCE_INVALID'));
                 }
             }
+            if ($form['USR_COUNTRY'] != '') {
+                $oCountry = \IsoCountryPeer::retrieveByPK($form['USR_COUNTRY']);
+                if (is_null($oCountry)) {
+                        throw new \Exception('invalid value for `usr_country`: '.$form['USR_COUNTRY']);
+                    }
+            }
+            if ($form['USR_CITY'] != '') {
+                $oCity = \IsoSubdivisionPeer::retrieveByPK($form['USR_COUNTRY'], $form['USR_CITY']);
+                if (is_null($oCity)) {
+                        throw new \Exception('invalid value for `usr_city`: '.$form['USR_CITY']);
+                    }
+            }
+            if ($form['USR_LOCATION'] != '') {
+                $oLocation = \IsoLocationPeer::retrieveByPK($form['USR_COUNTRY'], $form['USR_LOCATION']);
+                if (is_null($oLocation)) {
+                        throw new \Exception('invalid value for `usr_location`: '.$form['USR_LOCATION']);
+                    }
+            }
+            if ($form['USR_COUNTRY'] != '') {
+                $oReplacedBy = \IsoCountryPeer::retrieveByPK($form['USR_COUNTRY']);
+                if (is_null($oReplacedBy)) {
+                        throw new \Exception('invalid value for `usr_country`: '.$form['USR_COUNTRY']);
+                    }
+            }
             if (isset($arrayData['USR_UID'])) {
                 $form['USR_UID'] = $arrayData['USR_UID'];
             } else {
@@ -322,7 +346,7 @@ class User
                 }
                 $sUserUID = $this->createUser($aData);
                 if ($form['USR_ROLE'] != '') {
-                   $this->assignRoleToUser($sUserUID, $form['USR_ROLE']);
+                    $this->assignRoleToUser($sUserUID, $form['USR_ROLE']);
                 }
             } catch(Exception $oError) {
                 throw new \Exception($oError->getMessage());
@@ -381,7 +405,7 @@ class User
             $form = $arrayData;
             $countPermission = 0;
             $permission = $this->loadUserRolePermission($RBAC->sSystem, $usrLoggedUid);
-            foreach($permission as $key => $value) {
+            foreach ($permission as $key => $value) {
                 if ($value["PER_CODE"] == 'PM_USERS') {
                     $countPermission+=1;
                 }
@@ -400,12 +424,6 @@ class User
             if ($form['USR_NEW_PASS'] != '') {
                 $form['USR_PASSWORD'] = md5($form['USR_NEW_PASS']);
             }
-            if (!isset($form['USR_CITY'])) {
-                $form['USR_CITY'] = '';
-            }
-            if (!isset($form['USR_LOCATION'])) {
-                $form['USR_LOCATION'] = '';
-            }
             if (!isset($form['USR_AUTH_USER_DN'])) {
                 $form['USR_AUTH_USER_DN'] = '';
             }
@@ -534,9 +552,32 @@ class User
             } else {
                 $this->updateUser($aData);
             }
-            $aData['USR_COUNTRY'] = $form['USR_COUNTRY'];
-            $aData['USR_CITY'] = $form['USR_CITY'];
-            $aData['USR_LOCATION'] = $form['USR_LOCATION'];
+            if ($form['USR_COUNTRY'] != '') {
+                $oReplacedBy = \IsoCountryPeer::retrieveByPK($form['USR_COUNTRY']);
+                if (is_null($oReplacedBy)) {
+                        throw new \Exception('invalid value for `usr_country`: '.$form['USR_COUNTRY']);
+                } else {
+                    $aData['USR_COUNTRY'] = $form['USR_COUNTRY'];
+                    $aData['USR_CITY'] = '';
+                    $aData['USR_LOCATION'] = '';
+                }
+            }
+            if ($form['USR_CITY'] != '') {
+                $oCity = \IsoSubdivisionPeer::retrieveByPK($form['USR_COUNTRY'], $form['USR_CITY']);
+                if (is_null($oCity)) {
+                    throw new \Exception('invalid value for `usr_city`: '.$form['USR_CITY']);
+                } else {
+                    $aData['USR_CITY'] = $form['USR_CITY'];
+                }
+            }
+            if ($form['USR_LOCATION'] != '') {
+                $oLocation = \IsoLocationPeer::retrieveByPK($form['USR_COUNTRY'], $form['USR_LOCATION']);
+                if (is_null($oLocation)) {
+                        throw new \Exception('invalid value for `usr_location`: '.$form['USR_LOCATION']);
+                } else {
+                    $aData['USR_LOCATION'] = $form['USR_LOCATION'];
+                }
+            }
             $aData['USR_ADDRESS'] = $form['USR_ADDRESS'];
             $aData['USR_PHONE'] = $form['USR_PHONE'];
             $aData['USR_ZIP_CODE'] = $form['USR_ZIP_CODE'];