From b158c201147280387102fa2d2456bf57e0e76b2d Mon Sep 17 00:00:00 2001 From: Gustavo Cruz Date: Fri, 13 Mar 2015 15:36:51 -0400 Subject: [PATCH] Removes the last installer references to the missing Features folder. --- gulliver/system/class.bootstrap.php | 3 -- rbac/engine/config/paths.php | 1 - workflow/engine/controllers/installer.php | 44 ----------------------- workflow/public_html/app.php | 3 -- 4 files changed, 51 deletions(-) diff --git a/gulliver/system/class.bootstrap.php b/gulliver/system/class.bootstrap.php index 0988e6232..1466842fa 100644 --- a/gulliver/system/class.bootstrap.php +++ b/gulliver/system/class.bootstrap.php @@ -225,9 +225,6 @@ class Bootstrap self::registerClass("cronFile", PATH_CLASSES . "class.plugin.php"); self::registerClass("pluginDetail", PATH_CLASSES . "class.pluginRegistry.php"); self::registerClass("PMPluginRegistry", PATH_CLASSES . "class.pluginRegistry.php"); -/*----------------------------------********---------------------------------*/ - self::registerClass("PMFeatureRegistry", PATH_CLASSES . "class.featureRegistry.php"); -/*----------------------------------********---------------------------------*/ self::registerClass("featuresDetail", PATH_CLASSES . "class.licensedFeatures.php"); self::registerClass("PMLicensedFeatures", PATH_CLASSES . "class.licensedFeatures.php"); self::registerClass("PMDashlet", PATH_CLASSES . "class.pmDashlet.php"); diff --git a/rbac/engine/config/paths.php b/rbac/engine/config/paths.php index 20a09ce78..440731e86 100755 --- a/rbac/engine/config/paths.php +++ b/rbac/engine/config/paths.php @@ -50,7 +50,6 @@ define( 'PATH_METHODS', PATH_CORE . 'methods' . PATH_SEP ); define( 'PATH_XMLFORM', PATH_CORE . 'xmlform' . PATH_SEP ); define( 'PATH_PLUGINS', PATH_CORE . 'plugins' . PATH_SEP ); - define( 'PATH_FEATURES', PATH_CORE . 'Features' . PATH_SEP ); define( 'PATH_HTMLMAIL', PATH_CORE . 'html_templates' . PATH_SEP ); define( 'PATH_TPL', PATH_CORE . 'templates' . PATH_SEP ); define( 'PATH_TEST', PATH_CORE . 'test' . PATH_SEP ); diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index 5cf266b75..e40431da7 100755 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -13,9 +13,6 @@ class Installer extends Controller public $path_config; public $path_languages; public $path_plugins; -/*----------------------------------********---------------------------------*/ - public $path_features; -/*----------------------------------********---------------------------------*/ public $path_xmlforms; public $path_shared; public $path_sep; @@ -29,9 +26,6 @@ class Installer extends Controller $this->path_config = PATH_CORE . 'config/'; $this->path_languages = PATH_CORE . 'content/languages/'; $this->path_plugins = PATH_CORE . 'plugins/'; -/*----------------------------------********---------------------------------*/ - $this->path_features = PATH_CORE . 'Features/'; -/*----------------------------------********---------------------------------*/ $this->path_xmlforms = PATH_CORE . 'xmlform/'; $this->path_public = PATH_HOME . 'public_html/index.html'; $this->path_shared = PATH_TRUNK . 'shared/'; @@ -788,9 +782,6 @@ class Installer extends Controller $this->mysqlFileQuery( PATH_HOME . 'engine/data/mysql/schema.sql' ); $this->mysqlFileQuery( PATH_HOME . 'engine/data/mysql/insert.sql' ); -/*----------------------------------********---------------------------------*/ - $this->createMysqlFeatures(); -/*----------------------------------********---------------------------------*/ if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) { $this->setPartner(); @@ -1634,40 +1625,5 @@ class Installer extends Controller } } } - -/*----------------------------------********---------------------------------*/ - /** - * create a mysql feature - */ - public function createMysqlFeatures() - { - foreach ($this->getFeatureList() as $feature) { - $this->mysqlFileQuery( $feature->path . '/data/schema.sql' ); - $this->mysqlFileQuery( $feature->path . '/data/insert.sql' ); - } - } - - /** - * returns a list of all the features installed in the Features folder - * @return \stdClass - */ - public function getFeatureList() - { - $invalidFolders = array('ViewContainers'); - $featuresFolders = glob($this->path_features.'/*', GLOB_ONLYDIR); - $features = array(); - foreach ($featuresFolders as $directory) { - $feature = new \stdClass(); - $featureName = basename($directory); - if (in_array($featureName, $invalidFolders)) { - continue; - } - $feature->path = $this->path_features . $featureName; - $feature->name = $featureName; - $features[] = $feature; - } - return $features; - } -/*----------------------------------********---------------------------------*/ } diff --git a/workflow/public_html/app.php b/workflow/public_html/app.php index 27dea5535..5530a8cb9 100644 --- a/workflow/public_html/app.php +++ b/workflow/public_html/app.php @@ -28,9 +28,6 @@ try { ); } } -/*----------------------------------********---------------------------------*/ - $loader->add($rootDir . 'workflow/engine/', 'Features'); -/*----------------------------------********---------------------------------*/ $loader->add($rootDir . 'workflow/engine/src/', "ProcessMaker"); $loader->add($rootDir . 'workflow/engine/src/');