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

HOR-812

Browse Source 
HOR-812

HOR-812
This commit is contained in:
Paula V. Quispe
2016-04-20 15:18:23 -04:00
parent 84a88c9bc2
commit 0506053bdb
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1574,6 +1574,10 @@ class workspaceTools
if ($newDatabases != $oldDatabases) { if ($newDatabases != $oldDatabases) {
throw new Exception("We can't overwrite this workspace because it has a different amount of databases. Not only the 'source' but also the 'target' must have the same amount of databases."); throw new Exception("We can't overwrite this workspace because it has a different amount of databases. Not only the 'source' but also the 'target' must have the same amount of databases.");
} }
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.');
}
CLI::logging(CLI::warning("> Workspace $workspaceName already exist, overwriting!") . "\n"); CLI::logging(CLI::warning("> Workspace $workspaceName already exist, overwriting!") . "\n");
} else { } else {
throw new Exception("Destination workspace already exist (use -o to overwrite)"); throw new Exception("Destination workspace already exist (use -o to overwrite)");

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

@@ -18,10 +18,18 @@ class newSiteProxy extends HttpProxyController
//G::LoadClass( 'json' ); //G::LoadClass( 'json' );
$name = trim( $_POST['NW_TITLE'] ); $name = trim( $_POST['NW_TITLE'] );
$inst = new Installer(); $inst = new Installer();
if ($inst->isset_site($name) && $ao_db_drop !==true) { if ($inst->isset_site($name)) {
if($ao_db_drop === true){
if(!file_exists(PATH_DATA . "sites/" . $name)){
$this->error = true;
$this->message = 'We can not overwrite this workspace because the workspace '.$name.' does not exist please check the lower case and upper case.';
return;
}
} else {
$this->error = true; $this->error = true;
return; return;
} }
}
$user = (isset( $_POST['NW_USERNAME'] )) ? trim( $_POST['NW_USERNAME'] ) : 'admin'; $user = (isset( $_POST['NW_USERNAME'] )) ? trim( $_POST['NW_USERNAME'] ) : 'admin';
$pass = (isset( $_POST['NW_PASSWORD'] )) ? $_POST['NW_PASSWORD'] : 'admin'; $pass = (isset( $_POST['NW_PASSWORD'] )) ? $_POST['NW_PASSWORD'] : 'admin';
$pass1 = (isset( $_POST['NW_PASSWORD2'] )) ? $_POST['NW_PASSWORD2'] : 'admin'; $pass1 = (isset( $_POST['NW_PASSWORD2'] )) ? $_POST['NW_PASSWORD2'] : 'admin';