composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue in the lifecycle generation tool (escape double quotes)

Browse Source 
SVN:trunk[950]
This commit is contained in:
Romain Quetiez
2010-11-19 15:34:11 +00:00
parent a97e2825b1
commit 8e125cb743
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pages/graphviz.php
View File

@@ -32,6 +32,17 @@ require_once('../application/utils.inc.php');
require_once('../application/loginwebpage.class.inc.php'); require_once('../application/loginwebpage.class.inc.php');
LoginWebPage::DoLogin(); // Check user rights and prompt if needed LoginWebPage::DoLogin(); // Check user rights and prompt if needed
/**
* Escape a label (string) in a manner suitable for use with graphviz' DOT syntax
* @param string $s The string to escape
* @return string The escaped string
*/
function GraphvizEscape($s)
{
$s = str_replace('"', '\\"', $s);
return $s;
}
/** /**
* Helper to generate a Graphviz code for displaying the life cycle of a class * Helper to generate a Graphviz code for displaying the life cycle of a class
* @param string $sClass The class to display * @param string $sClass The class to display
@@ -71,7 +82,7 @@ function GraphvizLifecycle($sClass)
$aStatesLinks[$aTransitionDef['target_state']]['in']++; $aStatesLinks[$aTransitionDef['target_state']]['in']++;
$sStimulusLabel = $aStimuli[$sStimulusCode]->GetLabel(); $sStimulusLabel = $aStimuli[$sStimulusCode]->GetLabel();
$sTargetStateLabel = MetaModel::GetStateLabel($sClass, $aTransitionDef['target_state']); $sTargetStateLabel = MetaModel::GetStateLabel($sClass, $aTransitionDef['target_state']);
$sDotFileContent .= "\t$sStateCode -> {$aTransitionDef['target_state']} [ label=\"$sStimulusLabel\"];\n"; $sDotFileContent .= "\t$sStateCode -> {$aTransitionDef['target_state']} [ label=\"".GraphvizEscape($sStimulusLabel)."\"];\n";
} }
} }
foreach($aStates as $sStateCode => $aStateDef) foreach($aStates as $sStateCode => $aStateDef)
@@ -83,11 +94,11 @@ function GraphvizLifecycle($sClass)
if ( ($aStatesLinks[$sStateCode]['in'] == 0) || ($aStatesLinks[$sStateCode]['out'] == 0)) if ( ($aStatesLinks[$sStateCode]['in'] == 0) || ($aStatesLinks[$sStateCode]['out'] == 0))
{ {
// End or Start state, make it look different // End or Start state, make it look different
$sDotFileContent .= "\t$sStateCode [ shape=doublecircle,label=\"$sStateLabel\"];\n"; $sDotFileContent .= "\t$sStateCode [ shape=doublecircle,label=\"".GraphvizEscape($sStateLabel)."\"];\n";
} }
else else
{ {
$sDotFileContent .= "\t$sStateCode [ shape=circle,label=\"$sStateLabel\"];\n"; $sDotFileContent .= "\t$sStateCode [ shape=circle,label=\"".GraphvizEscape($sStateLabel)."\"];\n";
} }
} }
} }