mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use a custom exception instead of adding a delimiter to the error message

This commit is contained in:
Sean Comeau 2013-01-14 11:57:40 -08:00
parent ba9c967435
commit 42cd99626e
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/setup.php
View File

@ -1,5 +1,23 @@
<?php <?php
class HintException extends Exception
{
private $hint;
public function __construct($message, $hint, $code = 0, Exception $previous = null) {
$this->hint = $hint;
parent::__construct($message, $code, $previous);
}
public function __toString() {
return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n";
}
public function getHint() {
return $this->hint;
}
}
class OC_Setup { class OC_Setup {
public static function install($options) { public static function install($options) {
$error = array(); $error = array();
@ -19,9 +37,9 @@ class OC_Setup {
if($dbtype=='mysql') if($dbtype=='mysql')
$dbprettyname = 'MySQL'; $dbprettyname = 'MySQL';
else if($dbtype=='pgsql') else if($dbtype=='pgsql')
$dbprettyname = 'PostgreSQL'; $dbprettyname = 'PostgreSQL';
else else
$dbprettyname = 'Oracle'; $dbprettyname = 'Oracle';
if(empty($options['dbuser'])) { if(empty($options['dbuser'])) {
@ -69,11 +87,16 @@ class OC_Setup {
try { try {
self::setupMySQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username); self::setupMySQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username);
} catch (Exception $e) { } catch (HintException $e) {
$msgs = explode('|', $e->getMessage());
$error[] = array( $error[] = array(
'error' => $msgs[0], 'error' => $e->getMessage(),
'hint' => $msgs[1] 'hint' => $e->getHint()
);
return($error);
} catch (Exception $e) {
$error[] = array(
'error' => $e->getMessage(),
'hint' => ''
); );
return($error); return($error);
} }
@ -167,7 +190,7 @@ class OC_Setup {
//check if the database user has admin right //check if the database user has admin right
$connection = @mysql_connect($dbhost, $dbuser, $dbpass); $connection = @mysql_connect($dbhost, $dbuser, $dbpass);
if(!$connection) { if(!$connection) {
throw new Exception('MySQL username and/or password not valid|You need to enter either an existing account or the administrator.'); throw new HintException('MySQL username and/or password not valid','You need to enter either an existing account or the administrator.');
} }
$oldUser=OC_Config::getValue('dbuser', false); $oldUser=OC_Config::getValue('dbuser', false);
@ -231,12 +254,12 @@ class OC_Setup {
$query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'"; $query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'";
$result = mysql_query($query, $connection); $result = mysql_query($query, $connection);
if (!$result) { if (!$result) {
throw new Exception("MySQL user '" . "$name" . "'@'localhost' already exists|Delete this user from MySQL."); throw new HintException("MySQL user '" . "$name" . "'@'localhost' already exists","Delete this user from MySQL.");
} }
$query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'"; $query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
$result = mysql_query($query, $connection); $result = mysql_query($query, $connection);
if (!$result) { if (!$result) {
throw new Exception("MySQL user '" . "$name" . "'@'%' already exists|Delete this user from MySQL."); throw new HintException("MySQL user '" . "$name" . "'@'%' already exists","Delete this user from MySQL.");
} }
} }