From aafd2d260cf9dcefc9bc67ba29d3b8cade7003af Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Mon, 29 Sep 2014 11:38:08 -0400
Subject: [PATCH] PM-365 Upgrade de ls PM2.5 + enterprise 2.0.17 puede dar
 conflictos IMPROVEMENT

- The enterprise plugin files cause conflicts.
- A validation was added in function upgrade moving the files to the shared.
---
 workflow/engine/classes/class.wsTools.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index cd5213f59..cdc4aeb6a 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -1653,36 +1653,36 @@ class workspaceTools
             CLI::logging("    Without changes... \n");
             return true;
         }
-        CLI::logging("    Migrating version Enterprise Core...\n");
+        CLI::logging("    Migrating Enterprise Core version...\n");
         if (!file_exists($pathNewFile)) {
             CLI::logging("    Creating folder in $pathNewFile\n");
             G::mk_dir($newDiretory, 0777);
         }
         $shared_stat = stat(PATH_DATA);
         if (file_exists($pathDirectoryEnterprise)) {
-            CLI::logging("    Copying Directory Enterprise to $pathNewFile...\n");
+            CLI::logging("    Copying Enterprise Directory to $pathNewFile...\n");
 
             if ($shared_stat !== false) {
                 workspaceTools::dirPerms($pathDirectoryEnterprise, $shared_stat['uid'], $shared_stat['gid'], $shared_stat['mode']);
             } else {
-                CLI::logging(CLI::error("Could not get the shared folder permissions, not changing workspace permissions") . "\n");
+                CLI::logging(CLI::error("Could not get shared folder permissions, workspace permissions couldn't be changed") . "\n");
             }
             if (G::recursive_copy($pathDirectoryEnterprise, $pathNewFile . PATH_SEP. 'enterprise')) {
                 CLI::logging("    Removing $pathDirectoryEnterprise...\n");
                 G::rm_dir($pathDirectoryEnterprise);
             } else {
-                CLI::logging(CLI::error("    Error: Failure at coping from $pathDirectoryEnterprise...\n"));
+                CLI::logging(CLI::error("    Error: Failure to copy from $pathDirectoryEnterprise...\n"));
             }
             if (file_exists($pathDirectoryEnterprise)) {
                 CLI::logging(CLI::info("    Remove manually $pathDirectoryEnterprise...\n"));
             }
         }
         if (file_exists($pathFileEnterprise)) {
-            CLI::logging("    Copying file Enterprise.php to $pathNewFile...\n");
+            CLI::logging("    Copying Enterprise.php file to $pathNewFile...\n");
             if ($shared_stat !== false) {
                 workspaceTools::dirPerms($pathFileEnterprise, $shared_stat['uid'], $shared_stat['gid'], $shared_stat['mode']);
             } else {
-                CLI::logging(CLI::error("Could not get the shared folder permissions, not changing workspace permissions") . "\n");
+                CLI::logging(CLI::error("Could not get shared folder permissions, workspace permissions couldn't be changed") . "\n");
             }
             CLI::logging("    Removing $pathFileEnterprise...\n");
             copy($pathFileEnterprise , $pathNewFile. PATH_SEP . 'enterprise.php');