fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 9005 "userInfo() returns the state or region for the..." SOLVED

Browse Source 
- The ["city"] key is not correct in the function userInfo()
- Problem solved, has improved informarion returned by the
  userInfo() function
- They are more data being retormados by the userInfo() function,
  which are (example):
Array
(   [username] => "admin"
    [firstname] => "admin"
    [lastname] => "admin"
    [mail] => "admin@processmaker.com"
    [address] => ""
    [zipcode] => ""
    [country] => ""
    [state] => ""
    [location] => ""
    [phone] => ""
    [fax] => ""
    [cellular] => ""
    [birthday] => "2012-06-14"
    [position] => ""
    [replacedby] => "2806627024ff5c5e6de3343023039250"
    [duedate] => "2015-04-04"
    [calendar] => "426489683503e8e7541dd80068593828"
    [status] => "ACTIVE"
    [department] => "1624625814fdb4a23a20805048462289"
    [reportsto] => "4413935114fd9ea33a65206046642414"
    [userexperience] => "SWITCHABLE"
    [photo] => "PATH_TO_PHOTO/9552681404fd9e9ecd508b7074823254.gif"
)
* Available from version 2.0.44
This commit is contained in:
Victor Saisa Lopez
2012-08-30 08:58:38 -04:00
parent 6e98245f3f
commit 6e14ed1bb9
1 changed files with 75 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
workflow/engine/classes/model/Users.php
View File

@@ -238,54 +238,85 @@ public function userExists($UsrUid)
return $row; return $row;
} }
function getAllInformation($UsrUid) public function getAllInformation($userUid)
{ {
if( !isset($UsrUid) or $UsrUid == '' ) { if (!isset($userUid) || $userUid == "") {
throw new Exception('$UsrUid is empty.'); throw (new Exception("$userUid is empty."));
} }
try { try {
require_once ("classes/model/IsoCountry.php");
require_once ("classes/model/IsoLocation.php");
require_once ("classes/model/IsoSubdivision.php");
require_once ("classes/model/Language.php");
require_once 'classes/model/IsoCountry.php'; G::LoadClass("calendar");
require_once 'classes/model/IsoLocation.php';
require_once 'classes/model/IsoSubdivision.php';
require_once 'classes/model/Language.php';
$aFields = $this->load($UsrUid); $aFields = $this->load($userUid);
$c = new Criteria('workflow');
$c->add(IsoCountryPeer::IC_UID, $aFields['USR_COUNTRY']); $c = new Criteria("workflow");
$c->add(IsoCountryPeer::IC_UID, $aFields["USR_COUNTRY"]);
$rs = IsoCountryPeer::doSelectRS($c); $rs = IsoCountryPeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$rs->next(); $rs->next();
$Crow = $rs->getRow(); $rowC = $rs->getRow();
$c->clearSelectColumns(); $c->clearSelectColumns();
$c->add(IsoSubdivisionPeer::IC_UID, $aFields['USR_COUNTRY']); $c->add(IsoSubdivisionPeer::IC_UID, $aFields["USR_COUNTRY"]);
$c->add(IsoSubdivisionPeer::IS_UID, $aFields['USR_CITY']); $c->add(IsoSubdivisionPeer::IS_UID, $aFields["USR_CITY"]);
$rs = IsoSubdivisionPeer::doSelectRS($c); $rs = IsoSubdivisionPeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$rs->next(); $rs->next();
$Srow = $rs->getRow(); $rowS = $rs->getRow();
$aRet['username'] = $aFields['USR_USERNAME']; $c->clearSelectColumns();
$aRet['firstname'] = $aFields['USR_FIRSTNAME']; $c->add(IsoLocationPeer::IC_UID, $aFields["USR_COUNTRY"]);
$aRet['lastname'] = $aFields['USR_LASTNAME']; $c->add(IsoLocationPeer::IL_UID, $aFields["USR_LOCATION"]);
$aRet['mail'] = $aFields['USR_EMAIL']; $rs = IsoLocationPeer::doSelectRS($c);
$aRet['status'] = $aFields['USR_STATUS']; $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$aRet['address'] = $aFields['USR_ADDRESS']; $rs->next();
$aRet['phone'] = $aFields['USR_PHONE']; $rowL = $rs->getRow();
$aRet['fax'] = $aFields['USR_FAX'];
$aRet['cellular'] = $aFields['USR_CELLULAR'];
$aRet['birthday'] = $aFields['USR_BIRTHDAY'];
$aRet['position'] = $aFields['USR_POSITION'];
$aRet['duedate'] = $aFields['USR_DUE_DATE'];
$aRet['country'] = $Crow['IC_NAME'];
$aRet['city'] = $Srow['IS_NAME'];
//Calendar
$calendar = new Calendar();
$calendarInfo = $calendar->getCalendarFor($userUid, $userUid, $userUid);
$aFields["USR_CALENDAR"] = ($calendarInfo["CALENDAR_APPLIED"] != "DEFAULT")? $calendarInfo["CALENDAR_UID"] : "";
return $aRet; //Photo
$pathPhoto = PATH_IMAGES_ENVIRONMENT_USERS . $userUid . ".gif";
if (!file_exists($pathPhoto)) {
$pathPhoto = PATH_HOME . "public_html" . PATH_SEP . "images" . PATH_SEP . "user.gif";
} }
catch (Exception $oException) {
throw $oException; //Data
$arrayData = array();
$arrayData["username"] = $aFields["USR_USERNAME"];
$arrayData["firstname"] = $aFields["USR_FIRSTNAME"];
$arrayData["lastname"] = $aFields["USR_LASTNAME"];
$arrayData["mail"] = $aFields["USR_EMAIL"];
$arrayData["address"] = $aFields["USR_ADDRESS"];
$arrayData["zipcode"] = $aFields["USR_ZIP_CODE"];
$arrayData["country"] = $rowC["IC_NAME"];
$arrayData["state"] = $rowS["IS_NAME"];
$arrayData["location"] = $rowL["IL_NAME"];
$arrayData["phone"] = $aFields["USR_PHONE"];
$arrayData["fax"] = $aFields["USR_FAX"];
$arrayData["cellular"] = $aFields["USR_CELLULAR"];
$arrayData["birthday"] = $aFields["USR_BIRTHDAY"];
$arrayData["position"] = $aFields["USR_POSITION"];
$arrayData["replacedby"] = $aFields["USR_REPLACED_BY"];
$arrayData["duedate"] = $aFields["USR_DUE_DATE"];
$arrayData["calendar"] = $aFields["USR_CALENDAR"];
$arrayData["status"] = $aFields["USR_STATUS"];
$arrayData["department"] = $aFields["DEP_UID"];
$arrayData["reportsto"] = $aFields["USR_REPORTS_TO"];
$arrayData["userexperience"] = $aFields["USR_UX"];
$arrayData["photo"] = $pathPhoto;
return $arrayData;
} catch (Exception $e) {
throw $e;
} }
} }