From a1eaba625294a5ba902b7f59283d5ee09f61e472 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Fri, 6 Mar 2015 18:22:46 -0400
Subject: [PATCH 1/2] IMPROVEMENT

---
 workflow/engine/controllers/designer.php             |  2 --
 .../methods/processes/processes_Import_Bpmn.php      |  3 +--
 .../ProcessMaker/Project/Adapter/BpmnWorkflow.php    |  4 ++++
 workflow/engine/templates/processes/main.js          | 12 +-----------
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/workflow/engine/controllers/designer.php b/workflow/engine/controllers/designer.php
index a861a3bb5..f76fbb5e2 100644
--- a/workflow/engine/controllers/designer.php
+++ b/workflow/engine/controllers/designer.php
@@ -26,7 +26,6 @@ class Designer extends Controller
         $proUid = isset($httpData->prj_uid) ? $httpData->prj_uid : '';
         $appUid = isset($httpData->app_uid) ? $httpData->app_uid : '';
         $proReadOnly = isset($httpData->prj_readonly) ? $httpData->prj_readonly : 'false';
-        $stringBpmn = isset($httpData->stringBpmn) ? '<textarea id="stringBpmn" style="display:none">' . base64_decode($httpData->stringBpmn) . '</textarea>' : '';
         $client = $this->getClientCredentials();
         $authCode = $this->getAuthorizationCode($client);
         $debug = false; //System::isDebugMode();
@@ -57,7 +56,6 @@ class Designer extends Controller
 
         $this->setVar('prj_uid', $proUid);
         $this->setVar('app_uid', $appUid);
-        $this->setVar('stringBpmn', $stringBpmn);
         $this->setVar('prj_readonly', $proReadOnly);
         $this->setVar('credentials', base64_encode(json_encode($clientToken)));
         $this->setVar('isDebugMode', $debug);
diff --git a/workflow/engine/methods/processes/processes_Import_Bpmn.php b/workflow/engine/methods/processes/processes_Import_Bpmn.php
index 6291ba4f4..ede0c3f40 100644
--- a/workflow/engine/methods/processes/processes_Import_Bpmn.php
+++ b/workflow/engine/methods/processes/processes_Import_Bpmn.php
@@ -15,7 +15,6 @@ if (isset($_FILES["PROCESS_FILENAME"]) &&
             "PRO_CATEGORY" => "",
             "PRO_CREATE_USER" => $_SESSION['USER_LOGGED']
         );
-        $stringBpmn = base64_encode(file_get_contents($_FILES["PROCESS_FILENAME"]["tmp_name"]));
         if ($createMode === "overwrite") {
             $process = Process::getByProTitle($data["PRO_TITLE"]);
             if ($process !== null) {
@@ -27,11 +26,11 @@ if (isset($_FILES["PROCESS_FILENAME"]) &&
             $data["PRO_TITLE"] = Process::getNextTitle($data["PRO_TITLE"]);
         }
         $project = new \ProcessMaker\Project\Adapter\WorkflowBpmn($data);
+        copy($_FILES["PROCESS_FILENAME"]["tmp_name"], PATH_DOCUMENT . $project->getUid());
         $result = array(
             "success" => true,
             "catchMessage" => "",
             "prj_uid" => $project->getUid(),
-            "stringBpmn" => $stringBpmn,
             "createMode" => $createMode
         );
     } catch (Exception $e) {
diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
index 516ec4cf9..09d3f7604 100755
--- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
@@ -1091,6 +1091,10 @@ class BpmnWorkflow extends Project\Bpmn
             $diagram["participants"] = $bwp->getParticipants($configList);
             $project["diagrams"][] = $diagram;
         }
+        if (file_exists(PATH_DOCUMENT . $project["prj_uid"])) {
+            $project["prj_bpmn_file_upload"] = file_get_contents(PATH_DOCUMENT . $project["prj_uid"]);
+            unlink(PATH_DOCUMENT . $project["prj_uid"]);
+        }
 
         return $project;
     }
diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js
index baab76ea3..9eb6e9208 100755
--- a/workflow/engine/templates/processes/main.js
+++ b/workflow/engine/templates/processes/main.js
@@ -1432,17 +1432,7 @@ importProcessBpmnSubmit = function () {
                     return;
                 }
                 Ext.getCmp('importProcessWindow').close();
-                var stringxml = document.createElement("input");
-                stringxml.type = "hidden";
-                stringxml.name = "stringBpmn";
-                stringxml.value = resp_.stringBpmn;
-                var form = document.createElement("form");
-                document.body.appendChild(form);
-                form.appendChild(stringxml);
-                form.style.display = "none";
-                form.action = "../designer?prj_uid=" + resp_.prj_uid;
-                form.method = "POST";
-                form.submit();
+                window.location.href = "../designer?prj_uid=" + resp_.prj_uid;
             },
             failure: function (o, resp) {
                 Ext.getCmp('importProcessWindow').close();

From 7a9078a7c458125b5d32e041142f8d1e73c76d87 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Fri, 6 Mar 2015 18:26:17 -0400
Subject: [PATCH 2/2] IMPROVEMENT

---
 workflow/engine/templates/designer/index.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/workflow/engine/templates/designer/index.html b/workflow/engine/templates/designer/index.html
index aff334230..5b407f802 100644
--- a/workflow/engine/templates/designer/index.html
+++ b/workflow/engine/templates/designer/index.html
@@ -76,8 +76,6 @@
 
 </head>
 <body onresize="resizingFrame();">
-{$stringBpmn}
-
 <!--<div class="ui-layout-north">-->
      <section class="navBar" id="idNavBar">
         <div class="head"></div>