extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-02 03:19:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

GNU Patch #492.

Browse Source
This commit is contained in:
skeeter 2002-09-01 13:37:10 +00:00
parent 306bd52803
commit 73bf8e96fa
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
phpgwapi/inc/class.network.inc.php
View File

@ -187,16 +187,27 @@
This allows for parsing of xml where the formatting was not ideal (elements This allows for parsing of xml where the formatting was not ideal (elements
opened and closed on a single line). opened and closed on a single line).
*/ */
function gethttpsocketfile($file,$string=False) function gethttpsocketfile($file,$string=False,$user='',$passwd='')
{ {
$server = str_replace('http://','',$file); $server = str_replace('http://','',$file);
$file = strstr($server,'/'); $file = strstr($server,'/');
$server = str_replace($file,'',$server); $server = str_replace($file,'',$server);
//allows for access to http-auth pages - added by Dave Hall <dave.hall@mbox.com.au>
if(!((empty($user))&&(empty($passwd))))
{
$auth = 'Authorization: Basic '.base64_encode("$user:$passwd")."\n";
}
else
{
$auth = '';
}
if($GLOBALS['phpgw_info']['server']['httpproxy_server']) if($GLOBALS['phpgw_info']['server']['httpproxy_server'])
{ {
if ($this->open_port($server,80, 15)) if ($this->open_port($server,80, 15))
{ {
if(!$this->write_port('GET http://' . $server . $file . ' HTTP/1.0'."\r\n\r\n")) if(!$this->write_port('GET http://' . $server . $file . ' HTTP/1.0'."\n".$auth."\r\n\r\n"))
{ {
return False; return False;
} }
@ -231,7 +242,7 @@
{ {
if($this->open_port($server, 80, 15)) if($this->open_port($server, 80, 15))
{ {
if(!$this->write_port('GET '.$file.' HTTP/1.0'."\n".'Host: '.$server."\r\n\r\n")) if(!$this->write_port('GET '.$file.' HTTP/1.0'."\n".'Host: '.$server."\n".$auth."\r\n\r\n"))
{ {
return 0; return 0;
} }