extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

added option to showheader command to only transfer the remote_hash and not the whole header

Browse Source
This commit is contained in:
Ralf Becker 2007-12-07 00:07:08 +00:00
parent b2640f0cec
commit 1151deace4
2 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/admin-cli.php
View File

@ -82,7 +82,7 @@ switch($action)
return do_check_acl();
case '--show-header';
return run_command(new setup_cmd_showheader());
return run_command(new setup_cmd_showheader($arg0s[2]));
case '--exit-codes':
return list_exit_codes();

54
setup/inc/class.setup_cmd_showheader.inc.php
View File

@ -21,10 +21,16 @@ class setup_cmd_showheader extends setup_cmd
/**
* Constructor
*
* @param array $data=array() default parm from parent class, no real parameters
* @param boolean $data=true send only the remote_hash, domain and webserver_url and not the complete header
*/
function __construct($data=array())
function __construct($data=true)
{
if (!is_array($data))
{
$data = array(
'hash_only' => $data,
);
}
//echo __CLASS__.'::__construct()'; _debug_array($data);
admin_cmd::__construct($data);
}
@ -67,20 +73,38 @@ class setup_cmd_showheader extends setup_cmd
foreach($GLOBALS['egw_domain'] as $domain => &$data)
{
$data += $this->_fetch_config($data);
try {
// it's saver to only send the remote_hash and not install_id and config_pw
$data['remote_hash'] = admin_cmd::remote_hash($data['install_id'],$data['config_passwd']);
}
catch(Exception $e) {
if ($data['install_id']) $data['error'] .= $e->getMessage();
}
if ($this->hash_only)
{
$data = array(
'remote_hash' => $data['remote_hash'],
'webserver_url' => $data['webserver_url'],
)+($data['error'] ? array(
'error' => $data['error'],
) : array());
}
}
if ($this->hash_only)
{
$ret = array('egw_domain' => $GLOBALS['egw_domain']);
}
else
{
$ret = array(
'egw_info' => $GLOBALS['egw_info'],
'egw_domain' => $GLOBALS['egw_domain'],
'EGW_SERVER_ROOT' => EGW_SERVER_ROOT,
'EGW_INCLUDE_ROOT' => EGW_INCLUDE_ROOT,
);
}
$ret = array(
'egw_info' => $GLOBALS['egw_info'],
'egw_domain' => $GLOBALS['egw_domain'],
'EGW_SERVER_ROOT' => EGW_SERVER_ROOT,
'EGW_INCLUDE_ROOT' => EGW_INCLUDE_ROOT,
);
$GLOBALS['egw_info'] = $egw_info_backup;
// restoring the db connection, seems to be necessary when we run via remote execution
$GLOBALS['egw']->db->disconnect();
$GLOBALS['egw']->db->connect();
return $ret;
}
@ -113,6 +137,10 @@ class setup_cmd_showheader extends setup_cmd
catch (Exception $e) {
$config['error'] = strip_tags($e->getMessage());
}
// restoring the db connection, seems to be necessary when we run via remote execution
$GLOBALS['egw']->db->disconnect();
$GLOBALS['egw']->db->connect();
error_reporting($err_rep);
ob_end_clean();