Author: Sebastian Bergmann
Date: 2007-01-22 07:10:06 +0100 (Mon, 22 Jan 2007)
New Revision: 4540
Log:
- Also wrap unserialize().
Modified:
experimental/WorkflowDatabaseTiein/src/definition.php
experimental/WorkflowDatabaseTiein/src/execution.php
experimental/WorkflowDatabaseTiein/src/util.php
Modified: experimental/WorkflowDatabaseTiein/src/definition.php
===================================================================
--- experimental/WorkflowDatabaseTiein/src/definition.php 2007-01-20
10:44:40 UTC (rev 4539)
+++ experimental/WorkflowDatabaseTiein/src/definition.php 2007-01-22
06:10:06 UTC (rev 4540)
@@ -98,17 +98,8 @@
// Create node objects.
foreach ( $result as $node )
{
- if ( !empty( $node['node_configuration'] ) )
- {
- $configuration = unserialize( $node['node_configuration']
);
- }
- else
- {
- $configuration = '';
- }
-
$nodes[$node['node_id']] = new $node['node_class'](
- $configuration
+ ezcWorkflowDatabaseUtil::unserialize(
$node['node_configuration'], '' )
);
$nodes[$node['node_id']]->setId( $node['node_id'] );
Modified: experimental/WorkflowDatabaseTiein/src/execution.php
===================================================================
--- experimental/WorkflowDatabaseTiein/src/execution.php 2007-01-20
10:44:40 UTC (rev 4539)
+++ experimental/WorkflowDatabaseTiein/src/execution.php 2007-01-22
06:10:06 UTC (rev 4540)
@@ -130,33 +130,9 @@
$this->id = $executionId;
$this->nextThreadId = $result[0]['execution_next_thread_id'];
- if ( !empty( $result[0]['execution_threads'] ) )
- {
- $this->threads = unserialize( $result[0]['execution_threads'] );
- }
- else
- {
- $this->threads = array();
- }
-
- if ( !empty( $result[0]['execution_variables'] ) )
- {
- $this->variables = unserialize( $result[0]['execution_variables']
);
- }
- else
- {
- $this->variables = array();
- }
-
- if ( !empty( $result[0]['execution_waiting_for'] ) )
- {
- $this->waitingFor = unserialize(
$result[0]['execution_waiting_for'] );
- }
- else
- {
- $this->waitingFor = array();
- }
-
+ $this->threads = ezcWorkflowDatabaseUtil::unserialize(
$result[0]['execution_threads'] );
+ $this->variables = ezcWorkflowDatabaseUtil::unserialize(
$result[0]['execution_variables'] );
+ $this->waitingFor = ezcWorkflowDatabaseUtil::unserialize(
$result[0]['execution_waiting_for'] );
$waitingNames = array_keys( $this->waitingFor );
foreach ( $waitingNames as $waitingName )
@@ -215,16 +191,8 @@
$node->setActivationState(
ezcWorkflowNode::WAITING_FOR_EXECUTION );
$node->setThreadId( $activatedNodes[$nodeId]['thread_id'] );
-
- if ( !empty( $activatedNodes[$nodeId]['state'] ) )
- {
- $node->setState( unserialize(
$activatedNodes[$nodeId]['state'] ) );
- }
-
- if ( !empty( $activatedNodes[$nodeId]['activated_from'] ) )
- {
- $node->setActivatedFrom( unserialize(
$activatedNodes[$nodeId]['activated_from'] ) );
- }
+ $node->setState( ezcWorkflowDatabaseUtil::unserialize(
$activatedNodes[$nodeId]['state'], null ) );
+ $node->setActivatedFrom( ezcWorkflowDatabaseUtil::unserialize(
$activatedNodes[$nodeId]['activated_from'] ) );
}
}
Modified: experimental/WorkflowDatabaseTiein/src/util.php
===================================================================
--- experimental/WorkflowDatabaseTiein/src/util.php 2007-01-20 10:44:40 UTC
(rev 4539)
+++ experimental/WorkflowDatabaseTiein/src/util.php 2007-01-22 06:10:06 UTC
(rev 4540)
@@ -34,5 +34,24 @@
return $var;
}
+
+ /**
+ * Wrapper for unserialize().
+ *
+ * @param string $serializedVar
+ * @param mixed $defaultValue
+ * @return mixed
+ */
+ public static function unserialize( $serializedVar, $defaultValue =
array() )
+ {
+ if ( !empty( $serializedVar ) )
+ {
+ return unserialize( $serializedVar );
+ }
+ else
+ {
+ return $defaultValue;
+ }
+ }
}
?>
--
svn-components mailing list
svn-components@lists.ez.no
http://lists.ez.no/mailman/listinfo/svn-components
