fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-3620

Browse Source 
Solve conflict classes/class.installer.php and controllers/installer.php
Changed classes/class.installer.php -> classes/PmInstaller.php
Changed and verified usages of each class.
This commit is contained in:
davidcallizaya
2017-08-04 18:44:16 -04:00
parent f0be31202c
commit ce810e444c
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.Installer.php → workflow/engine/classes/PmInstaller.php
View File

@@ -40,7 +40,7 @@
* @author maborak * @author maborak
* @copyright 2008 COLOSA * @copyright 2008 COLOSA
*/ */
class Installer class PmInstaller
{ {
public $options = Array(); public $options = Array();

2
workflow/engine/classes/class.wsTools.php
View File

@@ -1690,7 +1690,7 @@ class workspaceTools
} }
$workspace = new workspaceTools($workspaceName); $workspace = new workspaceTools($workspaceName);
if (Installer::isset_site($workspaceName)) { if (PmInstaller::isset_site($workspaceName)) {
if ($overwrite) { if ($overwrite) {
if (!$workspace->workspaceExists()) { if (!$workspace->workspaceExists()) {
throw new Exception('We can not overwrite this workspace because the workspace ' . $workspaceName . ' does not exist please check the lower case and upper case.'); throw new Exception('We can not overwrite this workspace because the workspace ' . $workspaceName . ' does not exist please check the lower case and upper case.');

2
workflow/engine/controllers/newSiteProxy.php
View File

@@ -15,7 +15,7 @@ class newSiteProxy extends HttpProxyController
$ao_db_drop = (isset( $_POST['AO_DB_DROP'] )) ? true : false; $ao_db_drop = (isset( $_POST['AO_DB_DROP'] )) ? true : false;
$name = trim( $_POST['NW_TITLE'] ); $name = trim( $_POST['NW_TITLE'] );
$inst = new Installer(); $inst = new PmInstaller();
if ($inst->isset_site($name)) { if ($inst->isset_site($name)) {
if($ao_db_drop === true){ if($ao_db_drop === true){
if(!file_exists(PATH_DATA . "sites/" . $name)){ if(!file_exists(PATH_DATA . "sites/" . $name)){

2
workflow/engine/methods/install/autoinstallPlugins.php
View File

@@ -21,7 +21,7 @@
* For more information, contact Colosa Inc, 2566 Le Jeune Rd., * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com. * Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/ */
$inst = new Installer(); $inst = new PmInstaller();
$oProcess = new Processes(); $oProcess = new Processes();

2
workflow/engine/methods/install/autoinstallProcesses.php
View File

@@ -21,7 +21,7 @@
* For more information, contact Colosa Inc, 2566 Le Jeune Rd., * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com. * Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/ */
$inst = new Installer(); $inst = new PmInstaller();
$oProcess = new Processes(); $oProcess = new Processes();

2
workflow/engine/methods/install/newSite.php
View File

@@ -25,7 +25,7 @@
if (isset( $_POST['form']['NW_TITLE'] )) { if (isset( $_POST['form']['NW_TITLE'] )) {
$action = (isset( $_POST['form']['ACTION'] )) ? trim( $_POST['form']['ACTION'] ) : 'test'; $action = (isset( $_POST['form']['ACTION'] )) ? trim( $_POST['form']['ACTION'] ) : 'test';
$name = trim( $_POST['form']['NW_TITLE'] ); $name = trim( $_POST['form']['NW_TITLE'] );
$inst = new Installer(); $inst = new PmInstaller();
$isset = $inst->isset_site( $name ); $isset = $inst->isset_site( $name );