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

Merged in marcoAntonioNina/processmaker (pull request #1024)

Browse Source 
Improvement generate file support
This commit is contained in:
Julio Cesar Laura Avendaño
2014-10-22 16:44:05 -04:00
parent 1c36517b30 3c9b42eb21
commit e186232cde
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5565,7 +5565,7 @@ class G
$clean = trim(str_replace($strip, "", strip_tags($string))); $clean = trim(str_replace($strip, "", strip_tags($string)));
$clean = preg_replace('/\s+/', "-", $clean); $clean = preg_replace('/\s+/', "-", $clean);
$clean = ($alpha) ? preg_replace("/[^a-zA-Z0-9]/", "", $clean) : $clean ; $clean = ($alpha) ? preg_replace("/[^a-zA-Z0-9]/", "", $clean) : $clean ;
$clean = ($force_lowercase) ? (function_exists('mb_strtolower')) ? mb_strtolower($clean, 'UTF-8') : strtolower($clean) : $clean; $clean = ($lowercase) ? (function_exists('mb_strtolower')) ? mb_strtolower($clean, 'UTF-8') : strtolower($clean) : $clean;
return $clean; return $clean;
} }
} }

13
workflow/engine/controllers/adminProxy.php
View File

@@ -1368,7 +1368,14 @@ class adminProxy extends HttpProxyController
//License Information: //License Information:
$activeLicense = $licenseManager->getActiveLicense(); $activeLicense = $licenseManager->getActiveLicense();
$params['license'] = $licenseManager; $licenseInfo = array();
$noInclude = array('licensedfeaturesList', 'result', 'serial');
foreach ($licenseManager as $index => $value) {
if (!in_array($index, $noInclude)) {
$licenseInfo[$index] = G::sanitizeInput($value);
}
}
$params['license'] = $licenseInfo;
//Operative System version (Linux, Windows) //Operative System version (Linux, Windows)
try { try {
@@ -1391,9 +1398,9 @@ class adminProxy extends HttpProxyController
//ProcessMaker Version //ProcessMaker Version
$params['pmVersion'] = System::getVersion(); $params['pmVersion'] = System::getVersion();
if (file_exists(PATH_DATA. 'log/upgrades.log')) { if (file_exists(PATH_DATA. 'log/upgrades.log')) {
$params['pmUpgrade'] = file_get_contents(PATH_DATA. 'log/upgrades.log', 'r'); $params['pmUpgrade'] = serialize(file_get_contents(PATH_DATA. 'log/upgrades.log', 'r'));
} else { } else {
$params['pmUpgrade'] = G::LoadTranslation('ID_UPGRADE_NEVER_UPGRADE'); $params['pmUpgrade'] = serialize(G::LoadTranslation('ID_UPGRADE_NEVER_UPGRADE'));
} }
//Database server Version (MySQL version) //Database server Version (MySQL version)