extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

docu update and commented some error_log, which mess up the output of the command line client

Browse Source
This commit is contained in:
Ralf Becker 2007-12-10 04:54:57 +00:00
parent 1a743d658d
commit f2cf788aea
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
setup/inc/class.setup.inc.php
View File

@ -36,12 +36,27 @@
var $oProc; var $oProc;
var $cookie_domain; var $cookie_domain;
/**
* @var setup_detection
*/
var $detection; var $detection;
/**
* @var setup_process
*/
var $process; var $process;
var $lang; /**
* @var setup_translation
*/
var $translation;
/**
* @var setup_html
*/
var $html; var $html;
var $system_charset; var $system_charset;
var $lang;
var $ConfigDomain;
/* table name vars */ /* table name vars */
var $tbl_apps; var $tbl_apps;
@ -78,7 +93,6 @@
{ {
$this->ConfigDomain = get_var('ConfigDomain',array('COOKIE','POST'),$_POST['FormDomain']); $this->ConfigDomain = get_var('ConfigDomain',array('COOKIE','POST'),$_POST['FormDomain']);
} }
$GLOBALS['egw_info']['server']['db_type'] = $GLOBALS['egw_domain'][$this->ConfigDomain]['db_type']; $GLOBALS['egw_info']['server']['db_type'] = $GLOBALS['egw_domain'][$this->ConfigDomain]['db_type'];
if ($GLOBALS['egw_info']['server']['db_type'] == 'pgsql') if ($GLOBALS['egw_info']['server']['db_type'] == 'pgsql')
@ -92,7 +106,7 @@
$this->db->Database = $GLOBALS['egw_domain'][$this->ConfigDomain]['db_name']; $this->db->Database = $GLOBALS['egw_domain'][$this->ConfigDomain]['db_name'];
$this->db->User = $GLOBALS['egw_domain'][$this->ConfigDomain]['db_user']; $this->db->User = $GLOBALS['egw_domain'][$this->ConfigDomain]['db_user'];
$this->db->Password = $GLOBALS['egw_domain'][$this->ConfigDomain]['db_pass']; $this->db->Password = $GLOBALS['egw_domain'][$this->ConfigDomain]['db_pass'];
$this->db->set_app('phpgwapi'); $this->db->set_app('phpgwapi');
if ($connect_and_setcharset) if ($connect_and_setcharset)
@ -941,7 +955,7 @@
} }
if (!$changepw) $this->add_acl('preferences','nopasswordchange',$accountid); if (!$changepw) $this->add_acl('preferences','nopasswordchange',$accountid);
} }
error_log("setup::add_account('$username','$first','$last',\$passwd,'$primary_group',$changepw,'$email') successfull created accountid=$accountid"); //error_log("setup::add_account('$username','$first','$last',\$passwd,'$primary_group',$changepw,'$email') successfull created accountid=$accountid");
return $accountid; return $accountid;
} }
@ -1002,7 +1016,7 @@
*/ */
function add_acl($apps,$location,$account,$rights=1) function add_acl($apps,$location,$account,$rights=1)
{ {
error_log("setup::add_acl(".(is_array($apps) ? "array('".implode("','",$apps)."')" : "'$apps'").",'$location',$account,$rights)"); //error_log("setup::add_acl(".(is_array($apps) ? "array('".implode("','",$apps)."')" : "'$apps'").",'$location',$account,$rights)");
if (!is_numeric($account)) if (!is_numeric($account))
{ {
$this->setup_account_object(); $this->setup_account_object();