HOR-3620
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:
@@ -40,7 +40,7 @@
|
||||
* @author maborak
|
||||
* @copyright 2008 COLOSA
|
||||
*/
|
||||
class Installer
|
||||
class PmInstaller
|
||||
{
|
||||
|
||||
public $options = Array();
|
||||
@@ -1690,7 +1690,7 @@ class workspaceTools
|
||||
}
|
||||
$workspace = new workspaceTools($workspaceName);
|
||||
|
||||
if (Installer::isset_site($workspaceName)) {
|
||||
if (PmInstaller::isset_site($workspaceName)) {
|
||||
if ($overwrite) {
|
||||
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.');
|
||||
|
||||
@@ -15,7 +15,7 @@ class newSiteProxy extends HttpProxyController
|
||||
$ao_db_drop = (isset( $_POST['AO_DB_DROP'] )) ? true : false;
|
||||
|
||||
$name = trim( $_POST['NW_TITLE'] );
|
||||
$inst = new Installer();
|
||||
$inst = new PmInstaller();
|
||||
if ($inst->isset_site($name)) {
|
||||
if($ao_db_drop === true){
|
||||
if(!file_exists(PATH_DATA . "sites/" . $name)){
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
|
||||
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
|
||||
*/
|
||||
$inst = new Installer();
|
||||
$inst = new PmInstaller();
|
||||
|
||||
$oProcess = new Processes();
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
|
||||
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
|
||||
*/
|
||||
$inst = new Installer();
|
||||
$inst = new PmInstaller();
|
||||
|
||||
$oProcess = new Processes();
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
if (isset( $_POST['form']['NW_TITLE'] )) {
|
||||
$action = (isset( $_POST['form']['ACTION'] )) ? trim( $_POST['form']['ACTION'] ) : 'test';
|
||||
$name = trim( $_POST['form']['NW_TITLE'] );
|
||||
$inst = new Installer();
|
||||
$inst = new PmInstaller();
|
||||
|
||||
$isset = $inst->isset_site( $name );
|
||||
|
||||
|
||||
Reference in New Issue
Block a user