_debug_array() fix; add check for enforce_ssl config - no config dialog yet

This commit is contained in:
Miles Lott 2002-01-02 14:46:00 +00:00
parent e9688a73ea
commit ab5fcad3eb

View File

@ -474,8 +474,8 @@
echo '<pre>'; print_r($array); echo '</pre>'; echo '<pre>'; print_r($array); echo '</pre>';
$contents = ob_get_contents(); $contents = ob_get_contents();
ob_end_clean(); ob_end_clean();
// echo $contents; echo $contents;
return $contents; // return $contents;
} }
else else
{ {
@ -650,6 +650,11 @@
$GLOBALS['phpgw_info']['server'][$GLOBALS['phpgw']->db->f('config_name')] = stripslashes($GLOBALS['phpgw']->db->f('config_value')); $GLOBALS['phpgw_info']['server'][$GLOBALS['phpgw']->db->f('config_name')] = stripslashes($GLOBALS['phpgw']->db->f('config_value'));
} }
if(@isset($GLOBALS['phpgw_info']['server']['enforce_ssl']) && !$HTTPS)
{
Header('Location: https://' . $GLOBALS['phpgw_info']['server']['hostname'] . $GLOBALS['phpgw_info']['server']['webserver_url'] . $REQUEST_URI);
}
if(@isset($GLOBALS['phpgw_info']['server']['cache_phpgw_info'])) if(@isset($GLOBALS['phpgw_info']['server']['cache_phpgw_info']))
{ {
if($server_info_cache) if($server_info_cache)