Merge remote branch 'upstream/master' into BUG-10747

This commit is contained in:
Hector Cortez
2013-02-19 09:11:51 -04:00

View File

@@ -17,8 +17,10 @@ class newSiteProxy extends HttpProxyController
//G::LoadClass( 'json' );
$name = trim( $_POST['NW_TITLE'] );
$inst = new Installer();
$isset = $inst->isset_site( $name );
$new = ((! $isset)) ? true : false;
if ($inst->isset_site($name)) {
$this->error = true;
return;
}
$user = (isset( $_POST['NW_USERNAME'] )) ? trim( $_POST['NW_USERNAME'] ) : 'admin';
$pass = (isset( $_POST['NW_PASSWORD'] )) ? $_POST['NW_PASSWORD'] : 'admin';
$pass1 = (isset( $_POST['NW_PASSWORD2'] )) ? $_POST['NW_PASSWORD2'] : 'admin';