Merged in bugfix/HOR-3663 (pull request #5933)

HOR-3663

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>

gulliver/bin/gulliver.php

@@ -1,6 +1,12 @@
 <?php
+use Illuminate\Foundation\Console\Kernel;
 
-require_once(__DIR__ . '/../../bootstrap/autoload.php');
+// Because laravel has a __ helper function, it's important we include the class.g file to ensure our __ is used.
+require_once __DIR__ . '/../../bootstrap/autoload.php';
+require_once __DIR__ . '/../../bootstrap/app.php';
+$app->make(Kernel::class)->bootstrap();
+
+error_reporting(error_reporting() & ~E_DEPRECATED & ~E_STRICT);
 
 if (!PATH_THIRDPARTY) {
     die("You must launch gulliver command line with the gulliver script\n");

gulliver/bin/tasks/pakeGulliver.php

@@ -491,7 +491,8 @@ function addTarFolder($tar, $pathBase, $pluginHome) {
   }
 }
 
-function run_pack_plugin($task, $args) {
+function run_pack_plugin($task, $args)
+{
     ini_set('display_errors', 'on');
     ini_set('error_reporting', E_ERROR);
 
@@ -505,8 +506,6 @@ function run_pack_plugin($task, $args) {
     }
     $pluginName = $args[0];
 
-  $pluginDirectory = PATH_PLUGINS . $pluginName;
-  $pluginOutDirectory = PATH_OUTTRUNK . 'plugins' . PATH_SEP . $pluginName;
     $pluginHome = PATH_OUTTRUNK . 'plugins' . PATH_SEP . $pluginName;
 
     //verify if plugin exists,
@@ -517,11 +516,17 @@ function run_pack_plugin($task, $args) {
         die();
     }
 
-  require_once ($pluginFilename);
+    if (!file_exists($pluginFilename)) {
+        printf("Error: %s\n", pakeColor::colorize('you must specify a valid name for the plugin', 'ERROR'));
+        exit(0);
+    }
 
-  $oPluginRegistry = PluginRegistry::loadSingleton();
+    if (preg_match_all('/->iVersion(.*)=(.*);/i', file_get_contents($pluginFilename), $result)) {
-  $pluginDetail = $oPluginRegistry->getPluginDetails($pluginName . '.php');
+        $version = trim($result[2][0], ' "');
-  $fileTar = $pluginHome . PATH_SEP . $pluginName . '-' . $pluginDetail->iVersion . '.tar';
+    } else {
+        $version = 1;
+    }
+    $fileTar = $pluginHome . PATH_SEP . $pluginName . '-' . $version . '.tar';
 
     $tar = new Archive_Tar($fileTar);
     $tar->_compress = false;
@@ -2218,19 +2223,20 @@ function run_check_standard_code ( $task, $options) {
 function run_update_plugin_attributes($task, $args)
 {
     try {
-
         //Verify data
         if (!isset($args[0])) {
             throw new Exception("Error: You must specify the name of a plugin");
         }
-
         //Set variables
         $pluginName = $args[0];
-
+        // virtual SYS_SYS for cache
+        define('SYS_SYS', uniqid());
+        foreach (PmSystem::listWorkspaces() as $value) {
+            \ProcessMaker\Util\Cnn::connect($value->name);
             //Update plugin attributes
-        $pmPluginRegistry = PluginRegistry::loadSingleton();
+            $pmPluginRegistry = PluginRegistry::newInstance();
-
+            $pmPluginRegistry->updatePluginAttributesInAllWorkspaces($value->name, $pluginName);
-        $pmPluginRegistry->updatePluginAttributesInAllWorkspaces($pluginName);
+        }
 
         echo "Done!\n";
     } catch (Exception $e) {

thirdparty/pear/Archive/Tar.php

@@ -39,8 +39,6 @@
  * @link      http://pear.php.net/package/Archive_Tar
  */
 
-require_once 'PEAR.php';
-
 define('ARCHIVE_TAR_ATT_SEPARATOR', 90001);
 define('ARCHIVE_TAR_END_BLOCK', pack("a512", ''));
 

workflow/engine/src/ProcessMaker/Plugins/PluginRegistry.php

@@ -129,6 +129,21 @@ class PluginRegistry
         $this->_aPluginDetails[$Namespace] = $detail;
     }
 
+    /**
+     * Unregister the plugin in the class
+     * @param string $namespace Name Plugin
+     * @return PluginDetail
+     */
+    public function unregisterPlugin($namespace)
+    {
+        $detail = null;
+        if (isset($this->_aPluginDetails[$namespace])) {
+            $detail = $this->_aPluginDetails[$namespace];
+            unset($this->_aPluginDetails[$namespace]);
+        }
+        return $detail;
+    }
+
     /**
      * Get setup Plugins
      * @return int
@@ -1371,85 +1386,32 @@ class PluginRegistry
 
     /**
      * Update the plugin attributes in all workspaces
-     * @param string $Namespace Name of Plugin
+     * @param string $workspace Name workspace
+     * @param string $namespace Name of Plugin
      * @throws Exception
      */
-    public function updatePluginAttributesInAllWorkspaces($Namespace)
+    public function updatePluginAttributesInAllWorkspaces($workspace, $namespace)
     {
         try {
-            G::LoadClass("wsTools");
-
             //Set variables
-            $pluginFileName = $Namespace . ".php";
+            $pluginFileName = $namespace . ".php";
 
             //Verify data
             if (!file_exists(PATH_PLUGINS . $pluginFileName)) {
                 throw new Exception("Error: The plugin not exists");
             }
 
-            //Update plugin attributes
+            //remove old data plugin
+            $pmPluginRegistry = PluginRegistry::loadSingleton();
+            $pluginDetails = $pmPluginRegistry->unregisterPlugin($namespace);
+
+            //Load plugin attributes
             require_once(PATH_PLUGINS . $pluginFileName);
 
-            $pmPluginRegistry = PluginRegistry::loadSingleton();
+            if (is_array($pluginDetails->getWorkspaces()) && !in_array($workspace, $pluginDetails->getWorkspaces())) {
-
+                $pmPluginRegistry->disablePlugin($namespace);
-            $pluginDetails = $pmPluginRegistry->getPluginDetails($pluginFileName);
-
-            if (is_array($pluginDetails->getWorkspaces()) &&
-                count($pluginDetails->getWorkspaces()) > 0
-            ) {
-                $arrayWorkspace = array();
-
-                foreach (PmSystem::listWorkspaces() as $value) {
-                    $workspaceTools = $value;
-
-                    $arrayWorkspace[] = $workspaceTools->name;
-                }
-                //Workspaces to update
-                $arrayWorkspaceAux = array_diff($arrayWorkspace, $pluginDetails->getWorkspaces());
-                $strWorkspaceNoWritable = "";
-
-                $arrayWorkspace = array();
-
-                foreach ($arrayWorkspaceAux as $value) {
-                    $workspace = $value;
-
-                    $workspacePathDataSite = PATH_DATA . "sites" . PATH_SEP . $workspace . PATH_SEP;
-
-                    if (file_exists($workspacePathDataSite . "plugin.singleton")) {
-                        $pmPluginRegistry = PluginRegistry::loadSingleton();
-
-                        if (isset($pmPluginRegistry->_aPluginDetails[$Namespace])) {
-                            if (!is_writable($workspacePathDataSite . "plugin.singleton")) {
-                                $strWorkspaceNoWritable .= (($strWorkspaceNoWritable != "") ? ", " : "") . $workspace;
-                            }
-
-                            $arrayWorkspace[] = $workspace;
-                        }
-                    }
-                }
-
-                //Verify data
-                if ($strWorkspaceNoWritable != "") {
-                    throw new Exception(
-                        'Error: The workspaces ' .
-                        $strWorkspaceNoWritable .
-                        ' has problems of permissions of write in file "plugin.singleton", solve this problem'
-                    );
-                }
-
-                //Update plugin attributes
-                foreach ($arrayWorkspace as $value) {
-                    $workspace = $value;
-
-                    $workspacePathDataSite = PATH_DATA . "sites" . PATH_SEP . $workspace . PATH_SEP;
-
-                    $pmPluginRegistry = PluginRegistry::loadSingleton();
-
-                    $pmPluginRegistry->disablePlugin($Namespace);
-
-                    $pmPluginRegistry->savePlugin($Namespace);
-                }
             }
+            $pmPluginRegistry->savePlugin($namespace);
         } catch (Exception $e) {
             throw $e;
         }

workflow/engine/src/ProcessMaker/Util/Cnn.php

@@ -0,0 +1,122 @@
+<?php
+
+namespace ProcessMaker\Util;
+
+use Propel;
+
+/**
+ * Class Cnn
+ * @package ProcessMaker\Util
+ */
+class Cnn
+{
+    private $dbFile;
+    private $workspace;
+
+    /**
+     * Establishes connection for the workspace
+     * @param string $workspace Name workspace
+     */
+    public static function connect($workspace)
+    {
+        $cnn = new static();
+        $cnn->workspace = $workspace;
+        Propel::initConfiguration($cnn->buildParams());
+    }
+
+    /**
+     * Loads the parameters required to connect to each workspace database
+     * @return array
+     */
+    public function buildParams()
+    {
+        if ($this->readFileDBWorkspace()) {
+            return $this->prepareDataSources();
+        }
+        return [];
+    }
+
+    /**
+     * Reads the workspace db.php file
+     * @return bool
+     */
+    private function readFileDBWorkspace()
+    {
+        if (file_exists(PATH_DB . $this->workspace . PATH_SEP . 'db.php')) {
+            $this->dbFile = file_get_contents(PATH_DB . $this->workspace . PATH_SEP . 'db.php');
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Prepares data resources
+     * @return array
+     */
+    private function prepareDataSources()
+    {
+        $phpCode = preg_replace(
+            '/define\s*\(\s*[\x22\x27](.*)[\x22\x27]\s*,\s*(\x22.*\x22|\x27.*\x27)\s*\)\s*;/i',
+            '$$1 = $2;',
+            $this->dbFile
+        );
+        $phpCode = str_replace(['<?php', '<?', '?>'], '', $phpCode);
+
+        eval($phpCode);
+
+        $dataSources = [];
+        $dataSources['datasources'] = array(
+            'workflow' => array(
+                'connection' => $this->buildDsnString(
+                    $DB_ADAPTER,
+                    $DB_HOST,
+                    $DB_NAME,
+                    $DB_USER,
+                    urlencode($DB_PASS)
+                ),
+                'adapter' => "mysql"
+            ),
+            'rbac' => array(
+                'connection' => $this->buildDsnString(
+                    $DB_ADAPTER,
+                    $DB_RBAC_HOST,
+                    $DB_RBAC_NAME,
+                    $DB_RBAC_USER,
+                    urlencode($DB_RBAC_PASS)
+                ),
+                'adapter' => "mysql"
+            ),
+            'report' => array(
+                'connection' => $this->buildDsnString(
+                    $DB_ADAPTER,
+                    $DB_REPORT_HOST,
+                    $DB_REPORT_NAME,
+                    $DB_REPORT_USER,
+                    urlencode($DB_REPORT_PASS)
+                ),
+                'adapter' => "mysql"
+            )
+        );
+        return $dataSources;
+    }
+
+    /**
+     * Builds the DSN string to be used by PROPEL
+     * @param string $adapter
+     * @param string $host
+     * @param string $name
+     * @param string $user
+     * @param string $pass
+     * @return string
+     */
+    private function buildDsnString($adapter, $host, $name, $user, $pass)
+    {
+        $dns = $adapter . "://" . $user . ":" . $pass . "@" . $host . "/" . $name;
+        switch ($adapter) {
+            case 'mysql':
+                $dns .= '?encoding=utf8';
+                break;
+        }
+        return $dns;
+    }
+}