extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

small fix

Browse Source
This commit is contained in:
Ralf Becker 2008-10-02 15:27:39 +00:00
parent 4328a0c906
commit 8d7c57e253
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
setup/inc/class.setup_cmd_database.inc.php
View File

@ -7,13 +7,13 @@
* @package setup * @package setup
* @copyright (c) 2007 by Ralf Becker <RalfBecker-AT-outdoor-training.de> * @copyright (c) 2007 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$ * @version $Id$
*/ */
/** /**
* setup command: test or create the database * setup command: test or create the database
*/ */
class setup_cmd_database extends setup_cmd class setup_cmd_database extends setup_cmd
{ {
/** /**
* Allow to run this command via setup-cli * Allow to run this command via setup-cli
@ -26,7 +26,7 @@ class setup_cmd_database extends setup_cmd
* @var egw_db * @var egw_db
*/ */
private $test_db; private $test_db;
/** /**
* Constructor * Constructor
* *
@ -65,7 +65,7 @@ class setup_cmd_database extends setup_cmd
/** /**
* run the command: test or create database * run the command: test or create database
* *
* @param boolean $check_only=false only run the checks (and throw the exceptions), but not the command itself * @param boolean $check_only=false only run the checks (and throw the exceptions), but not the command itself
* @return string success message * @return string success message
* @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2); * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
@ -78,7 +78,7 @@ class setup_cmd_database extends setup_cmd
throw new egw_exception_wrong_userinput(lang("'%1' is no valid domain name!",$this->domain)); throw new egw_exception_wrong_userinput(lang("'%1' is no valid domain name!",$this->domain));
} }
if ($this->remote_id && $check_only) return true; // further checks can only done locally if ($this->remote_id && $check_only) return true; // further checks can only done locally
$this->_merge_defaults(); $this->_merge_defaults();
//_debug_array($this->as_array()); //_debug_array($this->as_array());
@ -101,14 +101,14 @@ class setup_cmd_database extends setup_cmd
// we catch the exception to properly restore the db // we catch the exception to properly restore the db
} }
$this->restore_db(); $this->restore_db();
if ($e) if ($e)
{ {
throw $e; throw $e;
} }
return $msg; return $msg;
} }
/** /**
* Connect to database * Connect to database
* *
@ -124,7 +124,7 @@ class setup_cmd_database extends setup_cmd
if (is_null($name)) $name = $this->db_name; if (is_null($name)) $name = $this->db_name;
$this->test_db = new egw_db(); $this->test_db = new egw_db();
$error_rep = error_reporting(); $error_rep = error_reporting();
error_reporting($error_rep & ~E_WARNING); // switch warnings of, in case they are on error_reporting($error_rep & ~E_WARNING); // switch warnings of, in case they are on
try { try {
@ -134,7 +134,7 @@ class setup_cmd_database extends setup_cmd
// just give a nicer error, after switching error_reporting on again // just give a nicer error, after switching error_reporting on again
} }
error_reporting($error_rep); error_reporting($error_rep);
if ($e) if ($e)
{ {
throw new egw_exception_wrong_userinput(lang('Can not connect to %1 database %2 on host %3 using user %4!', throw new egw_exception_wrong_userinput(lang('Can not connect to %1 database %2 on host %3 using user %4!',
@ -143,12 +143,12 @@ class setup_cmd_database extends setup_cmd
return lang('Successful connected to %1 database %2 on %3 using user %4.', return lang('Successful connected to %1 database %2 on %3 using user %4.',
$this->db_type,$name,$this->db_host.($this->db_port?':'.$this->db_port:''),$user); $this->db_type,$name,$this->db_host.($this->db_port?':'.$this->db_port:''),$user);
} }
/** /**
* Check and if does not yet exist create the new database and user * Check and if does not yet exist create the new database and user
* *
* The check will fail if the database exists, but already contains tables * The check will fail if the database exists, but already contains tables
* *
* @return string with success message * @return string with success message
* @throws egw_exception_wrong_userinput * @throws egw_exception_wrong_userinput
*/ */
@ -186,7 +186,7 @@ class setup_cmd_database extends setup_cmd
} }
return $msg; return $msg;
} }
/** /**
* Return default database settings for a given domain * Return default database settings for a given domain
* *
@ -231,7 +231,7 @@ class setup_cmd_database extends setup_cmd
//echo "<p>setting $name='{$this->$name}' to it's default='$default'</p>\n"; //echo "<p>setting $name='{$this->$name}' to it's default='$default'</p>\n";
$this->set_defaults[$name] = $this->$name = $default; $this->set_defaults[$name] = $this->$name = $default;
} }
if (strpos($this->$name,'$domain')) if (strpos($this->$name,'$domain') !== false)
{ {
$this->$name = str_replace(array('$domain','.','-'),array($this->domain,'_','_'),$this->$name); $this->$name = str_replace(array('$domain','.','-'),array($this->domain,'_','_'),$this->$name);
} }