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

BUG SKIN "Problem in skin creation" SOLVED

Browse Source 
- Problem in skin creation (ADMIN>Skins)
- Solved problem, fixed in skin creation
* Available from version ProcessMaker-2.5
This commit is contained in:
Victor Saisa Lopez
2013-04-26 13:15:36 -04:00
parent 6cf8402466
commit adc814b6be
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
workflow/engine/methods/setup/skin_Ajax.php
View File

@@ -69,7 +69,7 @@ function skinList ()
} else { } else {
$value['SKIN_STATUS'] = G::LoadTranslation( 'ID_INACTIVE' ); $value['SKIN_STATUS'] = G::LoadTranslation( 'ID_INACTIVE' );
} }
$skinListArray['skins'][] = $value; $skinListArray['skins'][] = $value;
} }
} }
@@ -134,6 +134,7 @@ function newSkin ($baseSkin = 'classic')
//TODO: Improve this pre_replace lines //TODO: Improve this pre_replace lines
$configFileOriginal = $pathBase . "config.xml"; $configFileOriginal = $pathBase . "config.xml";
$configFileFinal = PATH_CUSTOM_SKINS . $skinFolder . PATH_SEP . 'config.xml'; $configFileFinal = PATH_CUSTOM_SKINS . $skinFolder . PATH_SEP . 'config.xml';
$xmlConfiguration = file_get_contents( $configFileOriginal ); $xmlConfiguration = file_get_contents( $configFileOriginal );
$workspace = ($_REQUEST['workspace'] == 'global') ? '' : SYS_SYS; $workspace = ($_REQUEST['workspace'] == 'global') ? '' : SYS_SYS;
@@ -143,8 +144,8 @@ function newSkin ($baseSkin = 'classic')
$xmlConfiguration = preg_replace( '/(<id>)(.+?)(<\/id>)/i', '<id>' . G::generateUniqueID() . '</id><!-- $2 -->', $xmlConfiguration ); $xmlConfiguration = preg_replace( '/(<id>)(.+?)(<\/id>)/i', '<id>' . G::generateUniqueID() . '</id><!-- $2 -->', $xmlConfiguration );
if ($workspace != "" && isset($skinInformationArray["workspace"]["__VALUE__"])) { if (isset($skinInformationArray["workspace"]["__VALUE__"])) {
$workspace = (!empty($skinInformationArray["workspace"]["__VALUE__"]))? $skinInformationArray["workspace"]["__VALUE__"] . "|" . $workspace : $workspace; $workspace = ($workspace != "" && !empty($skinInformationArray["workspace"]["__VALUE__"]))? $skinInformationArray["workspace"]["__VALUE__"] . "|" . $workspace : $workspace;
$xmlConfiguration = preg_replace("/(<workspace>)(.*)(<\/workspace>)/i", "<workspace>" . $workspace . "</workspace><!-- $2 -->", $xmlConfiguration); $xmlConfiguration = preg_replace("/(<workspace>)(.*)(<\/workspace>)/i", "<workspace>" . $workspace . "</workspace><!-- $2 -->", $xmlConfiguration);
$xmlConfiguration = preg_replace("/(<name>)(.*)(<\/name>)/i", "<name>" . $skinName . "</name><!-- $2 -->", $xmlConfiguration); $xmlConfiguration = preg_replace("/(<name>)(.*)(<\/name>)/i", "<name>" . $skinName . "</name><!-- $2 -->", $xmlConfiguration);
@@ -260,8 +261,8 @@ function importSkin ()
$xmlConfigurationObj = G::xmlParser($xmlConfiguration); $xmlConfigurationObj = G::xmlParser($xmlConfiguration);
$skinInformationArray = $xmlConfigurationObj->result["skinConfiguration"]["__CONTENT__"]["information"]["__CONTENT__"]; $skinInformationArray = $xmlConfigurationObj->result["skinConfiguration"]["__CONTENT__"]["information"]["__CONTENT__"];
if ($workspace != "" && isset($skinInformationArray["workspace"]["__VALUE__"])) { if (isset($skinInformationArray["workspace"]["__VALUE__"])) {
$workspace = (!empty($skinInformationArray["workspace"]["__VALUE__"]))? $skinInformationArray["workspace"]["__VALUE__"] . "|" . $workspace : $workspace; $workspace = ($workspace != "" && !empty($skinInformationArray["workspace"]["__VALUE__"]))? $skinInformationArray["workspace"]["__VALUE__"] . "|" . $workspace : $workspace;
$xmlConfiguration = preg_replace("/(<workspace>)(.*)(<\/workspace>)/i", "<workspace>" . $workspace . "</workspace><!-- $2 -->", $xmlConfiguration); $xmlConfiguration = preg_replace("/(<workspace>)(.*)(<\/workspace>)/i", "<workspace>" . $workspace . "</workspace><!-- $2 -->", $xmlConfiguration);
} else { } else {