fernando/luos
1
0
Fork 0
Code Releases Activity

Merged colosa/processmaker into master

Browse Source
This commit is contained in:
Marco Antonio Nina Mena
2015-05-22 15:34:30 -04:00
parent f521e880cc 3d28d8473c
commit 501c043ecd
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gulliver/system/class.g.php
View File

@@ -5353,12 +5353,14 @@ class G
$sflagAudit = $oServerConf->getAuditLogProperty( 'AL_OPTION', $workspace ); $sflagAudit = $oServerConf->getAuditLogProperty( 'AL_OPTION', $workspace );
$ipClient = G::getIpAddress(); $ipClient = G::getIpAddress();
$licensedFeatures = PMLicensedFeatures::getSingleton(); /*----------------------------------********---------------------------------*/
$licensedFeatures = PMLicensedFeatures::getSingleton();
if ($sflagAudit && $licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) { if ($sflagAudit && $licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) {
$username = isset($_SESSION['USER_LOGGED']) && $_SESSION['USER_LOGGED'] != '' ? $_SESSION['USER_LOGGED'] : 'Unknow User'; $username = isset($_SESSION['USER_LOGGED']) && $_SESSION['USER_LOGGED'] != '' ? $_SESSION['USER_LOGGED'] : 'Unknow User';
$fullname = isset($_SESSION['USR_FULLNAME']) && $_SESSION['USR_FULLNAME'] != '' ? $_SESSION['USR_FULLNAME'] : '-'; $fullname = isset($_SESSION['USR_FULLNAME']) && $_SESSION['USR_FULLNAME'] != '' ? $_SESSION['USR_FULLNAME'] : '-';
G::log("|". $workspace ."|". $ipClient ."|". $username . "|" . $fullname ."|" . $actionToLog . "|" . $valueToLog, PATH_DATA, "audit.log"); G::log("|". $workspace ."|". $ipClient ."|". $username . "|" . $fullname ."|" . $actionToLog . "|" . $valueToLog, PATH_DATA, "audit.log");
} }
/*----------------------------------********---------------------------------*/
} }
/** /**

2
workflow/engine/src/ProcessMaker/Services/Api/Project.php
View File

@@ -111,7 +111,7 @@ class Project extends Api
$outputDir = PATH_DATA . "sites" . PATH_SEP . SYS_SYS . PATH_SEP . "files" . PATH_SEP . "output" . PATH_SEP; $outputDir = PATH_DATA . "sites" . PATH_SEP . SYS_SYS . PATH_SEP . "files" . PATH_SEP . "output" . PATH_SEP;
$version = \ProcessMaker\Util\Common::getLastVersion($outputDir . $exporter->getProjectName() . "-*.pmx") + 1; $version = \ProcessMaker\Util\Common::getLastVersion($outputDir . $exporter->getProjectName() . "-*.pmx") + 1;
$outputFilename = $outputDir . sprintf("%s-%s.%s", $exporter->getProjectName(), $version, "pmx"); $outputFilename = $outputDir . sprintf("%s-%s.%s", str_replace(" ", "_", $exporter->getProjectName()), $version, "pmx");
$exporter->setMetadata("export_version", $version); $exporter->setMetadata("export_version", $version);
$exporter->saveExport($outputFilename); $exporter->saveExport($outputFilename);

2
workflow/engine/src/ProcessMaker/Services/Api/System.php
View File

@@ -64,6 +64,7 @@ class System extends Api
{ {
try { try {
$enabledFeatures = array(); $enabledFeatures = array();
/*----------------------------------********---------------------------------*/
$keys = array ('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0='); $keys = array ('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=');
foreach ($keys as $key) { foreach ($keys as $key) {
if (\PMLicensedFeatures if (\PMLicensedFeatures
@@ -72,6 +73,7 @@ class System extends Api
$enabledFeatures[] = $key; $enabledFeatures[] = $key;
} }
} }
/*----------------------------------********---------------------------------*/
return $enabledFeatures; return $enabledFeatures;
} catch (\Exception $e) { } catch (\Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));

2
workflow/public_html/Web.config
View File

@@ -5,7 +5,7 @@
<rules> <rules>
<rule name="ProcessMaker Rule" stopProcessing="true"> <rule name="ProcessMaker Rule" stopProcessing="true">
<match url="^.*/(.*)$" ignoreCase="true" /> <match url="^.*/(.*)$" ignoreCase="true" />
<action type="Rewrite" url="sysGeneric.php" /> <action type="Rewrite" url="app.php" />
</rule> </rule>
</rules> </rules>
</rewrite> </rewrite>