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

Merged in qronald/processmaker/HOR-886 (pull request #4167)

Browse Source 
HOR-886
This commit is contained in:
Julio Cesar Laura Avendaño
2016-04-28 16:58:08 -04:00
parent b89b22c18e ba48d13bf3
commit ddff352619
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/src/ProcessMaker/BusinessModel/Light.php
View File

@@ -1268,7 +1268,8 @@ class Light
$multiTimeZone = (int)($sysConf['system_utc_time_zone']) == 1; $multiTimeZone = (int)($sysConf['system_utc_time_zone']) == 1;
} }
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
$offset = timezone_offset_get( new \DateTimeZone( $sysConf['time_zone'] ), new \DateTime() ); $tz = isset($_SESSION['USR_TIME_ZONE'])?$_SESSION['USR_TIME_ZONE']:$sysConf['time_zone'];
$offset = timezone_offset_get( new \DateTimeZone( $tz ), new \DateTime() );
$response['timeZone'] = sprintf( "GMT%s%02d:%02d", ( $offset >= 0 ) ? '+' : '-', abs( $offset / 3600 ), abs( ($offset % 3600) / 60 ) ); $response['timeZone'] = sprintf( "GMT%s%02d:%02d", ( $offset >= 0 ) ? '+' : '-', abs( $offset / 3600 ), abs( ($offset % 3600) / 60 ) );
$response['multiTimeZone'] = $multiTimeZone; $response['multiTimeZone'] = $multiTimeZone;
$fields = \System::getSysInfo(); $fields = \System::getSysInfo();
@@ -1306,9 +1307,12 @@ class Light
$languagesList[] = $languages; $languagesList[] = $languages;
} }
$response['listLanguage'] = $languagesList; $response['listLanguage'] = $languagesList;
if ($params['fileLimit']) { if (isset($params['fileLimit']) && $params['fileLimit']) {
$response['fileLimit'] = $this->return_bytes(ini_get('post_max_size')); $response['fileLimit'] = $this->return_bytes(ini_get('post_max_size'));
} }
if (isset($params['tz']) && $params['tz']) {
$response['tz'] = isset($_SESSION['USR_TIME_ZONE'])?$_SESSION['USR_TIME_ZONE']:$sysConf['time_zone'];
}
return $response; return $response;
} }

22
workflow/engine/src/ProcessMaker/Services/Api/Light.php
View File

@@ -1533,4 +1533,26 @@ class Light extends Api
} }
return $response; return $response;
} }
/**
* Get configuration ProcessMaker
*
* @return array
*
* @url GET /config-user
*
* @param string $fileLimit {@from path}
* @param string $tz {@from path}
*/
public function getConfigurationUser($fileLimit = false, $tz = false)
{
try {
$params = array('fileLimit' => $fileLimit, 'tz' => $tz);
$oMobile = new \ProcessMaker\BusinessModel\Light();
$response = $oMobile->getConfiguration($params);
} catch (\Exception $e) {
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
return $response;
}
} }