Changeset 2223 for sandbox/workflow/branches

Timestamp:

03/11/10 15:42:15 (14 years ago)

Author:

pedroerp

Message:

Ticket #609 - Iniciando a migração do workflow para a nova factory.

Location:

sandbox/workflow/branches/609

Files:

• inc/class.ui_userinterface.inc.php (modified) (1 diff)
• inc/common.inc.php (modified) (4 diffs)
• lib/factory/Factory.php (modified) (2 diffs)
• lib/factory/WorkflowFactory.php (modified) (1 diff)
• templateFile.php (modified) (1 diff)

sandbox/workflow/branches/609/inc/class.ui_userinterface.inc.php

@@ -45 +45 @@
                 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['workflow']['title'];
                 $GLOBALS['phpgw_info']['flags'] = array('noheader' => false, 'nonavbar' => false, 'currentapp' => 'workflow');
-                $smarty = CreateObject('workflow.workflow_smarty');
+                //$smarty = CreateObject('workflow.workflow_smarty');
+                $smarty = Factory::getInstance('workflow_smarty');
 
                 // Check if workflow config is ok

sandbox/workflow/branches/609/inc/common.inc.php

@@ -12 +12 @@
 
 /**
- * Server base path. This constant must be defined by expresso itself.
- * Anyway, there are cases that we access Workflow directly; therefore
- * it must be defined somewhere...
- * @name PHPGW_SERVER_ROOT
+ * Server base path. This constant is somewhat simililar to
+ * 'PHPGW_SERVER_ROOT'. Nevertheless, there are cases that we
+ * access Workflow directly and it must be defined somewhere.
+ * @name EGW_SERVER_ROOT
  */
-if (!defined('PHPGW_SERVER_ROOT'))
-        define('PHPGW_SERVER_ROOT', $HTTP_SERVER_VARS['DOCUMENT_ROOT']);
+define('EGW_SERVER_ROOT', $HTTP_SERVER_VARS['DOCUMENT_ROOT']);
 
 /**
@@ -24 +23 @@
  * @name WF_SERVER_ROOT
  */
-define('WF_SERVER_ROOT', PHPGW_SERVER_ROOT.'/workflow/');
+define('WF_SERVER_ROOT', EGW_SERVER_ROOT.'/workflow/');
 
 /**
@@ -39 +38 @@
 
 
-if (file_exists(PHPGW_SERVER_ROOT . '/header.session.inc.php')) {
-        require_once PHPGW_SERVER_ROOT . '/header.session.inc.php';
+if (file_exists(EGW_SERVER_ROOT . '/header.session.inc.php')) {
+        require_once EGW_SERVER_ROOT . '/header.session.inc.php';
 }
 
@@ -54 +53 @@
 /* including common classes */
 require_once WF_LIB_ROOT . 'security/Security.php';
-//require_once WF_LIB_ROOT . 'factory/Factory.php';
+require_once WF_LIB_ROOT . 'factory/Factory.php';
 require_once WF_LIB_ROOT . 'factory/BaseFactory.php';
 require_once WF_LIB_ROOT . 'factory/WorkflowFactory.php';
 require_once WF_LIB_ROOT . 'factory/ProcessFactory.php';
 
-
-/* TODO - here we will still using that old and ugly factory */
-/* in a near future we should do things right.. */
-require_once WF_INC_ROOT . 'class.factory.inc.php';
-$GLOBALS['workflow']['factory'] = new Factory();
-$GLOBALS['workflow']['workflowObjects'] = $GLOBALS['workflow']['factory']->newInstance('WorkflowObjects');
-
-//$GLOBALS['workflow']['workflowObjects'] = Factory::getInstance('WorkflowObjects', 'asd', 123);
+$GLOBALS['workflow']['workflowObjects'] = Factory::getInstance('WorkflowObjects');
 ?>

sandbox/workflow/branches/609/lib/factory/Factory.php

@@ -74 +74 @@
 
                         $args = func_get_args();
-                        call_user_func_array(array(self::$_securedFactory, "getInstance"), $args);
+                        return call_user_func_array(array(self::$_securedFactory, "getInstance"), $args);
 
                 }
@@ -85 +85 @@
 
                         $args = func_get_args();
-                        call_user_func_array(array(self::$_unsecuredFactory, "getInstance"), $args);
+                        return call_user_func_array(array(self::$_unsecuredFactory, "getInstance"), $args);
                 }
-
         }
 

sandbox/workflow/branches/609/lib/factory/WorkflowFactory.php

@@ -49 +49 @@
                 /* registering allowed classes */
                 $this->registerFileInfo('WorkflowObjects', 'class.WorkflowObjects.inc.php', 'inc');
+                $this->registerFileInfo('TemplateServer', 'class.TemplateServer.inc.php', 'inc');
+                $this->registerFileInfo('workflow_smarty', 'class.workflow_smarty.inc.php', 'inc');
 
-                $this->registerFileInfo('db', 'x', 'inc', PHPGW_API_INC);
+                /* registering egw class example */
+                //$this->registerFileInfo('db', 'x', 'inc', PHPGW_API_INC);
 
                 /* ok. no more instances of this class.. */

sandbox/workflow/branches/609/templateFile.php

@@ -12 +12 @@
 if (empty($_SESSION))
         exit(0);
-$GLOBALS['workflow']['factory']->getInstance('TemplateServer')->redirect();
+//$GLOBALS['workflow']['factory']->getInstance('TemplateServer')->redirect();
+Factory::getInstance('TemplateServer')->redirect();
 ?>