holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

phpgw->egw

Browse Source
This commit is contained in:
Miles Lott 2005-11-26 14:25:39 +00:00
parent a828b3cf85
commit bcacc1ef46
8 changed files with 163 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

215
phpgwapi/inc/class.html.inc.php
View File

@ -1,16 +1,16 @@
<?php <?php
/**************************************************************************\ /**************************************************************************\
* eGroupWare - HTML creation class * * eGroupWare - HTML creation class *
* http://www.eGroupWare.org * * http://www.eGroupWare.org *
* Written and (c) by Ralf Becker <RalfBecker@outdoor-training.de> * * Written and (c) by Ralf Becker <RalfBecker@outdoor-training.de> *
* -------------------------------------------- * * -------------------------------------------- *
* This program is free software; you can redistribute it and/or modify it * * This program is free software; you can redistribute it and/or modify it *
* under the terms of the GNU General Public License as published by the * * under the terms of the GNU General Public License as published by the *
* Free Software Foundation; either version 2 of the License, or (at your * * Free Software Foundation; either version 2 of the License, or (at your *
* option) any later version. * * option) any later version. *
\**************************************************************************/ \**************************************************************************/
/* $Id$ */ /* $Id$ */
/** /**
* generates html with methods representing html-tags or higher widgets * generates html with methods representing html-tags or higher widgets
@ -38,7 +38,7 @@ class html
*/ */
var $prefered_img_title; var $prefered_img_title;
/** /**
* charset used by the page, as returned by $GLOBALS['phpgw']->translation->charset() * charset used by the page, as returned by $GLOBALS['egw']->translation->charset()
* @var string * @var string
*/ */
var $charset; var $charset;
@ -53,7 +53,6 @@ class html
*/ */
var $wz_tooltip_included = False; var $wz_tooltip_included = False;
/** /**
* Constructor: initialised the class-vars * Constructor: initialised the class-vars
*/ */
@ -67,16 +66,16 @@ class html
} }
list(,$this->user_agent,$this->ua_version) = $parts; list(,$this->user_agent,$this->ua_version) = $parts;
$this->user_agent = strtolower($this->user_agent); $this->user_agent = strtolower($this->user_agent);
$this->netscape4 = $this->user_agent == 'mozilla' && $this->ua_version < 5; $this->netscape4 = $this->user_agent == 'mozilla' && $this->ua_version < 5;
$this->prefered_img_title = $this->netscape4 ? 'alt' : 'title'; $this->prefered_img_title = $this->netscape4 ? 'alt' : 'title';
//echo "<p>HTTP_USER_AGENT='$_SERVER[HTTP_USER_AGENT]', UserAgent: '$this->user_agent', Version: '$this->ua_version', img_title: '$this->prefered_img_title'</p>\n"; //echo "<p>HTTP_USER_AGENT='$_SERVER[HTTP_USER_AGENT]', UserAgent: '$this->user_agent', Version: '$this->ua_version', img_title: '$this->prefered_img_title'</p>\n";
if ($GLOBALS['phpgw']->translation) if ($GLOBALS['egw']->translation)
{ {
$this->charset = $GLOBALS['phpgw']->translation->charset(); $this->charset = $GLOBALS['egw']->translation->charset();
} }
$this->phpgwapi_js_url = $GLOBALS['phpgw_info']['server']['webserver_url'].'/phpgwapi/js'; $this->phpgwapi_js_url = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js';
} }
/** /**
@ -97,7 +96,7 @@ class html
'<a href="#" onclick="'.$onclick.'">'. '<a href="#" onclick="'.$onclick.'">'.
'<img src="'.$this->phpgwapi_js_url.'/colorpicker/ed_color_bg.gif'.'"'.($title ? ' title="'.$this->htmlspecialchars($title).'"' : '')." /></a>"; '<img src="'.$this->phpgwapi_js_url.'/colorpicker/ed_color_bg.gif'.'"'.($title ? ' title="'.$this->htmlspecialchars($title).'"' : '')." /></a>";
} }
/** /**
* Handles tooltips via the wz_tooltip class from Walter Zorn * Handles tooltips via the wz_tooltip class from Walter Zorn
* *
@ -115,14 +114,14 @@ class html
{ {
if (!$this->wz_tooltip_included) if (!$this->wz_tooltip_included)
{ {
if (!strstr('wz_tooltip',$GLOBALS['phpgw_info']['flags']['need_footer'])) if (!strstr('wz_tooltip',$GLOBALS['egw_info']['flags']['need_footer']))
{ {
$GLOBALS['phpgw_info']['flags']['need_footer'] .= '<script language="JavaScript" type="text/javascript" src="'.$this->phpgwapi_js_url.'/wz_tooltip/wz_tooltip.js"></script>'."\n"; $GLOBALS['egw_info']['flags']['need_footer'] .= '<script language="JavaScript" type="text/javascript" src="'.$this->phpgwapi_js_url.'/wz_tooltip/wz_tooltip.js"></script>'."\n";
} }
$this->wz_tooltip_included = True; $this->wz_tooltip_included = True;
} }
if ($do_lang) $text = lang($text); if ($do_lang) $text = lang($text);
$opt_out = 'this.T_WIDTH = 200;'; $opt_out = 'this.T_WIDTH = 200;';
if (is_array($options)) if (is_array($options))
{ {
@ -133,10 +132,10 @@ class html
} }
} }
if ($text === False) return ' onmouseover="'.$opt_out.'return escape(this.innerHTML);"'; if ($text === False) return ' onmouseover="'.$opt_out.'return escape(this.innerHTML);"';
return ' onmouseover="'.$opt_out.'return escape(\''.str_replace(array("\n","\r","'",'"'),array('','',"\\'",'&quot;'),$text).'\')"'; return ' onmouseover="'.$opt_out.'return escape(\''.str_replace(array("\n","\r","'",'"'),array('','',"\\'",'&quot;'),$text).'\')"';
} }
/** /**
* activates URLs in a text, URLs get replaced by html-links * activates URLs in a text, URLs get replaced by html-links
* *
@ -147,34 +146,34 @@ class html
{ {
// Exclude everything which is already a link // Exclude everything which is already a link
$NotAnchor = '(?<!"|href=|href\s=\s|href=\s|href\s=)'; $NotAnchor = '(?<!"|href=|href\s=\s|href=\s|href\s=)';
// spamsaver emailaddress // spamsaver emailaddress
$result = preg_replace('/'.$NotAnchor.'mailto:([a-z0-9._-]+)@([a-z0-9_-]+)\.([a-z0-9._-]+)/i', $result = preg_replace('/'.$NotAnchor.'mailto:([a-z0-9._-]+)@([a-z0-9_-]+)\.([a-z0-9._-]+)/i',
'<a href="#" onclick="document.location=\'mai\'+\'lto:\\1\'+unescape(\'%40\')+\'\\2.\\3\'; return false;">\\1 AT \\2 DOT \\3</a>', '<a href="#" onclick="document.location=\'mai\'+\'lto:\\1\'+unescape(\'%40\')+\'\\2.\\3\'; return false;">\\1 AT \\2 DOT \\3</a>',
$content); $content);
// First match things beginning with http:// (or other protocols) // First match things beginning with http:// (or other protocols)
$Protocol = '(http|ftp|https):\/\/'; $Protocol = '(http|ftp|https):\/\/';
$Domain = '([\w]+.[\w]+)'; $Domain = '([\w]+.[\w]+)';
$Subdir = '([\w\-\.,@?^=%&;:\/~\+#]*[\w\-\@?^=%&\/~\+#])?'; $Subdir = '([\w\-\.,@?^=%&;:\/~\+#]*[\w\-\@?^=%&\/~\+#])?';
$Expr = '/' . $NotAnchor . $Protocol . $Domain . $Subdir . '/i'; $Expr = '/' . $NotAnchor . $Protocol . $Domain . $Subdir . '/i';
$result = preg_replace( $Expr, "<a href=\"$0\" target=\"_blank\">$2$3</a>", $result ); $result = preg_replace( $Expr, "<a href=\"$0\" target=\"_blank\">$2$3</a>", $result );
// Now match things beginning with www. // Now match things beginning with www.
$NotHTTP = '(?<!:\/\/)'; $NotHTTP = '(?<!:\/\/)';
$Domain = 'www(.[\w]+)'; $Domain = 'www(.[\w]+)';
$Subdir = '([\w\-\.,@?^=%&:\/~\+#]*[\w\-\@?^=%&\/~\+#])?'; $Subdir = '([\w\-\.,@?^=%&:\/~\+#]*[\w\-\@?^=%&\/~\+#])?';
$Expr = '/' . $NotAnchor . $NotHTTP . $Domain . $Subdir . '/i'; $Expr = '/' . $NotAnchor . $NotHTTP . $Domain . $Subdir . '/i';
return preg_replace( $Expr, "<a href=\"http://$0\" target=\"_blank\">$0</a>", $result ); return preg_replace( $Expr, "<a href=\"http://$0\" target=\"_blank\">$0</a>", $result );
} }
/** /**
* escapes chars with special meaning in html as entities * escapes chars with special meaning in html as entities
* *
* Allows to use and char in the html-output and prefents XSS attacks. * Allows to use and char in the html-output and prefents XSS attacks.
* Some entities are allowed and get NOT escaped: * Some entities are allowed and get NOT escaped:
* - &# some translations (AFAIK the arabic ones) need this * - &# some translations (AFAIK the arabic ones) need this
* - &nbsp; &lt; &gt; for convinience * - &nbsp; &lt; &gt; for convinience
* *
@ -185,13 +184,13 @@ class html
{ {
// add @ by lkneschke to supress warning about unknown charset // add @ by lkneschke to supress warning about unknown charset
$str = @htmlspecialchars($str,ENT_COMPAT,$this->charset); $str = @htmlspecialchars($str,ENT_COMPAT,$this->charset);
// we need '&#' unchanged, so we translate it back // we need '&#' unchanged, so we translate it back
$str = str_replace(array('&amp;#','&amp;nbsp;','&amp;lt;','&amp;gt;'),array('&#','&nbsp;','&lt;','&gt;'),$str); $str = str_replace(array('&amp;#','&amp;nbsp;','&amp;lt;','&amp;gt;'),array('&#','&nbsp;','&lt;','&gt;'),$str);
return $str; return $str;
} }
/** /**
* allows to show and select one item from an array * allows to show and select one item from an array
* *
@ -218,7 +217,7 @@ class html
} }
} }
$out = "<select name=\"$name\" $options>\n"; $out = "<select name=\"$name\" $options>\n";
if (!is_array($key)) if (!is_array($key))
{ {
// explode on ',' only if multiple values expected and the key contains just numbers and commas // explode on ',' only if multiple values expected and the key contains just numbers and commas
@ -234,7 +233,7 @@ class html
else else
{ {
$out .= '<optgroup label="'.$this->htmlspecialchars($no_lang || $k == '' ? $k : lang($k))."\">\n"; $out .= '<optgroup label="'.$this->htmlspecialchars($no_lang || $k == '' ? $k : lang($k))."\">\n";
foreach($data as $k => $label) foreach($data as $k => $label)
{ {
$out .= $this->select_option($k,is_array($label)?$label['label']:$label,$key,$no_lang, $out .= $this->select_option($k,is_array($label)?$label['label']:$label,$key,$no_lang,
@ -244,10 +243,10 @@ class html
} }
} }
$out .= "</select>\n"; $out .= "</select>\n";
return $out; return $out;
} }
/** /**
* emulating a multiselectbox using checkboxes * emulating a multiselectbox using checkboxes
* *
@ -276,7 +275,7 @@ class html
$name .= '[]'; $name .= '[]';
} }
$base_name = substr($name,0,-2); $base_name = substr($name,0,-2);
if (!is_array($key)) if (!is_array($key))
{ {
// explode on ',' only if multiple values expected and the key contains just numbers and commas // explode on ',' only if multiple values expected and the key contains just numbers and commas
@ -284,7 +283,7 @@ class html
} }
$html = ''; $html = '';
$options_no_id = preg_replace('/id="[^"]+"/i','',$options); $options_no_id = preg_replace('/id="[^"]+"/i','',$options);
if ($selected_first) if ($selected_first)
{ {
$selected = $not_selected = array(); $selected = $not_selected = array();
@ -314,18 +313,18 @@ class html
} }
if ($label && !$no_lang) $label = lang($label); if ($label && !$no_lang) $label = lang($label);
if ($title && !$no_lang) $title = lang($title); if ($title && !$no_lang) $title = lang($title);
if (strlen($label) > $max_len) $max_len = strlen($label); if (strlen($label) > $max_len) $max_len = strlen($label);
$html .= $this->label($this->checkbox($name,in_array($val,$key),$val,$options_no_id. $html .= $this->label($this->checkbox($name,in_array($val,$key),$val,$options_no_id.
' id="'.$base_name.'['.$val.']'.'" '.($title ? 'title="'.$this->htmlspecialchars($title).'" ':'')). ' id="'.$base_name.'['.$val.']'.'" '.($title ? 'title="'.$this->htmlspecialchars($title).'" ':'')).
$this->htmlspecialchars($label),$base_name.'['.$val.']')."<br />\n"; $this->htmlspecialchars($label),$base_name.'['.$val.']')."<br />\n";
} }
$style = 'height: '.(1.7*$multiple).'em; width: '.(4+$max_len*($max_len < 15 ? 0.65 : 0.50)).'em; background-color: white; overflow: auto; border: lightgray 2px inset;'; $style = 'height: '.(1.7*$multiple).'em; width: '.(4+$max_len*($max_len < 15 ? 0.65 : 0.50)).'em; background-color: white; overflow: auto; border: lightgray 2px inset;';
return $this->div($html,$options,'',$style); return $this->div($html,$options,'',$style);
} }
/** /**
* generates an option-tag for a selectbox * generates an option-tag for a selectbox
* *
@ -354,7 +353,7 @@ class html
($title ? ' title="'.$this->htmlspecialchars($no_lang ? $title : lang($title)).'"' : '') . '>'. ($title ? ' title="'.$this->htmlspecialchars($no_lang ? $title : lang($title)).'"' : '') . '>'.
$this->htmlspecialchars($no_lang || $label == '' ? $label : lang($label)) . "</option>\n"; $this->htmlspecialchars($no_lang || $label == '' ? $label : lang($label)) . "</option>\n";
} }
/** /**
* generates a div-tag * generates a div-tag
* *
@ -368,10 +367,10 @@ class html
{ {
if ($class) $options .= ' class="'.$class.'"'; if ($class) $options .= ' class="'.$class.'"';
if ($style) $options .= ' style="'.$style.'"'; if ($style) $options .= ' style="'.$style.'"';
return "<div $options>\n".($content ? "$content</div>\n" : ''); return "<div $options>\n".($content ? "$content</div>\n" : '');
} }
/** /**
* generate one or more hidden input tag(s) * generate one or more hidden input tag(s)
* *
@ -399,12 +398,12 @@ class html
} }
return $html; return $html;
} }
/** /**
* generate a textarea tag * generate a textarea tag
* *
* @param string $name name attr. of the tag * @param string $name name attr. of the tag
* @param string $value default * @param string $value default
* @param boolean $ignore_empty if true all empty, zero (!) or unset values, plus filer=none * @param boolean $ignore_empty if true all empty, zero (!) or unset values, plus filer=none
* @param string html * @param string html
*/ */
@ -412,7 +411,7 @@ class html
{ {
return "<textarea name=\"$name\" $options>".$this->htmlspecialchars($value)."</textarea>\n"; return "<textarea name=\"$name\" $options>".$this->htmlspecialchars($value)."</textarea>\n";
} }
/** /**
* Checks if HTMLarea (or an other richtext editor) is availible for the used browser * Checks if HTMLarea (or an other richtext editor) is availible for the used browser
* *
@ -430,7 +429,7 @@ class html
return False; return False;
} }
} }
/** /**
* compability function for former used htmlarea. Please use function tinymce now! * compability function for former used htmlarea. Please use function tinymce now!
* *
@ -450,17 +449,17 @@ class html
function init_tinymce() function init_tinymce()
{ {
/* do stuff once */ /* do stuff once */
if (!is_object($GLOBALS['phpgw']->js)) if (!is_object($GLOBALS['egw']->js))
{ {
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript'); $GLOBALS['egw']->js = CreateObject('phpgwapi.javascript');
} }
if (!strstr($GLOBALS['phpgw_info']['flags']['java_script'],'tinyMCE')) if (!strstr($GLOBALS['egw_info']['flags']['java_script'],'tinyMCE'))
{ {
$GLOBALS['phpgw']->js->validate_file('tinymce','jscripts/tiny_mce/tiny_mce'); $GLOBALS['egw']->js->validate_file('tinymce','jscripts/tiny_mce/tiny_mce');
} }
} }
/** /**
* creates a textarea inputfield for the tinymce js-widget (returns the necessary html and js) * creates a textarea inputfield for the tinymce js-widget (returns the necessary html and js)
* *
@ -468,7 +467,7 @@ class html
* *
* @param string $name name and id of the input-field * @param string $name name and id of the input-field
* @param string $content='' of the tinymce (will be run through htmlspecialchars !!!), default '' * @param string $content='' of the tinymce (will be run through htmlspecialchars !!!), default ''
* @param string $style='' initial css for the style attribute * @param string $style='' initial css for the style attribute
* @param string $init_options='', see http://tinymce.moxiecode.com/ for all init options. mode and elements are allready set. * @param string $init_options='', see http://tinymce.moxiecode.com/ for all init options. mode and elements are allready set.
* to make things more easy, you also can just provide a comma seperated list here with the options you need. * to make things more easy, you also can just provide a comma seperated list here with the options you need.
* Supportet are: 'TableOperations','ContextMenu','ColorChooser' * Supportet are: 'TableOperations','ContextMenu','ColorChooser'
@ -478,7 +477,7 @@ class html
*/ */
function tinymce($name,$content='',$style='',$init_options='',$base_href='') function tinymce($name,$content='',$style='',$init_options='',$base_href='')
{ {
if (!$style) if (!$style)
{ {
$style = 'width:100%; min-width:500px; height:300px;'; $style = 'width:100%; min-width:500px; height:300px;';
} }
@ -486,10 +485,10 @@ class html
{ {
return $this->textarea($name,$content,'style="'.$style.'"'); return $this->textarea($name,$content,'style="'.$style.'"');
} }
/* do stuff once */ /* do stuff once */
$this->init_tinymce(); $this->init_tinymce();
if(strpos($init_options,':') === false) if(strpos($init_options,':') === false)
{ {
$init = 'theme : "advanced", theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "left"'; $init = 'theme : "advanced", theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "left"';
@ -539,28 +538,28 @@ class html
{ {
$init .= ',document_base_url : "'. $base_href. '", relative_urls : true'; $init .= ',document_base_url : "'. $base_href. '", relative_urls : true';
} }
$init_options = $init. ','. $tab1a. '",'. $tab2a. '",'. $tab3a. '",'. $plugs. '",'. $eve. '"'; $init_options = $init. ','. $tab1a. '",'. $tab2a. '",'. $tab3a. '",'. $plugs. '",'. $eve. '"';
} }
/* do again and again */ /* do again and again */
return '<script language="javascript" type="text/javascript"> return '<script language="javascript" type="text/javascript">
tinyMCE.init({ tinyMCE.init({
mode : "exact", mode : "exact",
language: "'.$GLOBALS['egw_info']['user']['preferences']['common']['lang'].'", language: "'.$GLOBALS['egw_info']['user']['preferences']['common']['lang'].'",
plugin_insertdate_dateFormat : "'.str_replace(array('Y','m','M','d'),array('%Y','%m','%b','%d'),$GLOBALS['egw_info']['user']['preferences']['common']['dateformat']).' ", plugin_insertdate_dateFormat : "'.str_replace(array('Y','m','M','d'),array('%Y','%m','%b','%d'),$GLOBALS['egw_info']['user']['preferences']['common']['dateformat']).' ",
plugin_insertdate_timeFormat : "'.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? '%I:%M %p' : '%H:%M').' ", plugin_insertdate_timeFormat : "'.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? '%I:%M %p' : '%H:%M').' ",
elements : "'.$name.'", elements : "'.$name.'",
'.$init_options.' '.$init_options.'
}); });
</script> </script>
<textarea id="'.$name.'" name="'.$name.'" style="'.$style.'"> <textarea id="'.$name.'" name="'.$name.'" style="'.$style.'">
'.$this->htmlspecialchars($content).' '.$this->htmlspecialchars($content).'
</textarea> </textarea>
'; ';
} }
/** /**
* represents html's input tag * represents html's input tag
* *
@ -577,7 +576,7 @@ class html
} }
return "<input $type name=\"$name\" value=\"".$this->htmlspecialchars($value)."\" $options />\n"; return "<input $type name=\"$name\" value=\"".$this->htmlspecialchars($value)."\" $options />\n";
} }
/** /**
* represents html's button (input type submit or image) * represents html's button (input type submit or image)
* *
@ -600,8 +599,8 @@ class html
if ($image != '') if ($image != '')
{ {
$image = str_replace(array('.gif','.GIF','.png','.PNG'),'',$image); $image = str_replace(array('.gif','.GIF','.png','.PNG'),'',$image);
if (!($path = $GLOBALS['phpgw']->common->image($app,$image))) if (!($path = $GLOBALS['egw']->common->image($app,$image)))
{ {
$path = $image; // name may already contain absolut path $path = $image; // name may already contain absolut path
} }
@ -624,7 +623,7 @@ class html
$label_u = $label; $label_u = $label;
} }
if ($onClick) $options .= ' onclick="'.str_replace('"','\\"',$onClick).'"'; if ($onClick) $options .= ' onclick="'.str_replace('"','\\"',$onClick).'"';
// <button> is not working in all cases if ($this->user_agent == 'mozilla' && $this->ua_version < 5 || $image) // <button> is not working in all cases if ($this->user_agent == 'mozilla' && $this->ua_version < 5 || $image)
{ {
return $this->input($name,$label,$image != '' ? 'image' : 'submit',$options.$image); return $this->input($name,$label,$image != '' ? 'image' : 'submit',$options.$image);
@ -633,7 +632,7 @@ class html
($image != '' ? "<img$image $this->prefered_img_title=\"$label\"> " : ''). ($image != '' ? "<img$image $this->prefered_img_title=\"$label\"> " : '').
($image == '' || $accesskey ? $label_u : '').'</button>'; ($image == '' || $accesskey ? $label_u : '').'</button>';
} }
/** /**
* creates an absolut link + the query / get-variables * creates an absolut link + the query / get-variables
* *
@ -657,9 +656,9 @@ class html
parse_str($v,$v); parse_str($v,$v);
$vars += $v; $vars += $v;
} }
return $GLOBALS['phpgw']->link($url,$vars); return $GLOBALS['egw']->link($url,$vars);
} }
/** /**
* represents html checkbox * represents html checkbox
* *
@ -673,7 +672,7 @@ class html
{ {
return '<input type="checkbox" name="'.$name.'" value="'.$this->htmlspecialchars($value).'"' .($checked ? ' checked="1"' : '') . "$options />\n"; return '<input type="checkbox" name="'.$name.'" value="'.$this->htmlspecialchars($value).'"' .($checked ? ' checked="1"' : '') . "$options />\n";
} }
/** /**
* represents a html form * represents a html form
* *
@ -691,7 +690,7 @@ class html
$url = $url ? $this->link($url,$url_vars) : $_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING']; $url = $url ? $this->link($url,$url_vars) : $_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING'];
$html = "<form method=\"$method\" ".($name != '' ? "name=\"$name\" " : '')."action=\"$url\" $options>\n"; $html = "<form method=\"$method\" ".($name != '' ? "name=\"$name\" " : '')."action=\"$url\" $options>\n";
$html .= $this->input_hidden($hidden_vars); $html .= $this->input_hidden($hidden_vars);
if ($content) if ($content)
{ {
$html .= $content; $html .= $content;
@ -699,7 +698,7 @@ class html
} }
return $html; return $html;
} }
/** /**
* represents a html form with one button * represents a html form with one button
* *
@ -717,7 +716,7 @@ class html
{ {
return $this->form($this->submit_button($name,$label),$hidden_vars,$url,$url_vars,$form_name,'',$method); return $this->form($this->submit_button($name,$label),$hidden_vars,$url,$url_vars,$form_name,'',$method);
} }
/** /**
* creates table from array of rows * creates table from array of rows
* *
@ -738,7 +737,7 @@ class html
function table($rows,$options = '',$no_table_tr=False) function table($rows,$options = '',$no_table_tr=False)
{ {
$html = $no_table_tr ? '' : "<table $options>\n"; $html = $no_table_tr ? '' : "<table $options>\n";
foreach($rows as $key => $row) foreach($rows as $key => $row)
{ {
if (!is_array($row)) if (!is_array($row))
@ -746,7 +745,7 @@ class html
continue; // parameter continue; // parameter
} }
$html .= $no_table_tr && $key == 1 ? '' : "\t<tr ".$rows['.'.$key].">\n"; $html .= $no_table_tr && $key == 1 ? '' : "\t<tr ".$rows['.'.$key].">\n";
foreach($row as $key => $cell) foreach($row as $key => $cell)
{ {
if ($key[0] == '.') if ($key[0] == '.')
@ -771,14 +770,14 @@ class html
echo "<p>".function_backtrace()."</p>\n"; echo "<p>".function_backtrace()."</p>\n";
} }
$html .= "</table>\n"; $html .= "</table>\n";
if ($no_table_tr) if ($no_table_tr)
{ {
$html = substr($html,0,-16); $html = substr($html,0,-16);
} }
return $html; return $html;
} }
/** /**
* changes a selectbox to submit the form if it gets changed, to be used with the sbox-class * changes a selectbox to submit the form if it gets changed, to be used with the sbox-class
* *
@ -795,7 +794,7 @@ class html
} }
return $html; return $html;
} }
/** /**
* html-widget showing progessbar with a view div's (html4 only, textual percentage otherwise) * html-widget showing progessbar with a view div's (html4 only, textual percentage otherwise)
* *
@ -806,7 +805,7 @@ class html
* @param string $color color, default '#D00000' (dark red) * @param string $color color, default '#D00000' (dark red)
* @param string $height height, default 5px * @param string $height height, default 5px
* @return string html * @return string html
*/ */
function progressbar( $percent,$title='',$options='',$width='',$color='',$height='' ) function progressbar( $percent,$title='',$options='',$width='',$color='',$height='' )
{ {
$percent = (int) $percent; $percent = (int) $percent;
@ -814,7 +813,7 @@ class html
if (!$height)$height= '5px'; if (!$height)$height= '5px';
if (!$color) $color = '#D00000'; if (!$color) $color = '#D00000';
$title = $title ? $this->htmlspecialchars($title) : $percent.'%'; $title = $title ? $this->htmlspecialchars($title) : $percent.'%';
if ($this->netscape4) if ($this->netscape4)
{ {
return $title; return $title;
@ -824,7 +823,7 @@ class html
(stristr($options,'onclick="') ? ' cursor: pointer; cursor: hand;' : '').'">'."\n\t". (stristr($options,'onclick="') ? ' cursor: pointer; cursor: hand;' : '').'">'."\n\t".
'<div style="height: '.$height.'; width: '.$percent.'%; background: '.$color.';"></div>'."\n</div>\n"; '<div style="height: '.$height.'; width: '.$percent.'%; background: '.$color.';"></div>'."\n</div>\n";
} }
/** /**
* representates a html img tag, output a picture * representates a html img tag, output a picture
* *
@ -854,7 +853,7 @@ class html
} }
if (is_array($name)) // menuaction and other get-vars if (is_array($name)) // menuaction and other get-vars
{ {
$name = $GLOBALS['phpgw']->link('/index.php',$name); $name = $GLOBALS['egw']->link('/index.php',$name);
} }
if ($name[0] == '/' || substr($name,0,7) == 'http://' || substr($name,0,8) == 'https://') if ($name[0] == '/' || substr($name,0,7) == 'http://' || substr($name,0,8) == 'https://')
{ {
@ -863,16 +862,16 @@ class html
else // no URL, so try searching the image else // no URL, so try searching the image
{ {
$name = str_replace(array('.gif','.GIF','.png','.PNG'),'',$name); $name = str_replace(array('.gif','.GIF','.png','.PNG'),'',$name);
if (!($url = $GLOBALS['phpgw']->common->image($app,$name))) if (!($url = $GLOBALS['egw']->common->image($app,$name)))
{ {
$url = $name; // name may already contain absolut path $url = $name; // name may already contain absolut path
} }
if(!$GLOBALS['phpgw_info']['server']['webserver_url']) if(!$GLOBALS['egw_info']['server']['webserver_url'])
{ {
$base_path = "./"; $base_path = "./";
} }
if (!@is_readable($base_path . str_replace($GLOBALS['phpgw_info']['server']['webserver_url'],PHPGW_SERVER_ROOT,$url))) if (!@is_readable($base_path . str_replace($GLOBALS['egw_info']['server']['webserver_url'],PHPGW_SERVER_ROOT,$url)))
{ {
// if the image-name is a percentage, use a progressbar // if the image-name is a percentage, use a progressbar
if (substr($name,-1) == '%' && is_numeric($percent = substr($name,0,-1))) if (substr($name,-1) == '%' && is_numeric($percent = substr($name,0,-1)))
@ -888,7 +887,7 @@ class html
} }
return "<img src=\"$url\" $options />"; return "<img src=\"$url\" $options />";
} }
/** /**
* representates a html link * representates a html link
* *
@ -912,7 +911,7 @@ class html
//echo "<p>html::a_href('".htmlspecialchars($content)."','$url',".print_r($vars,True).") = ".$this->link($url,$vars)."</p>"; //echo "<p>html::a_href('".htmlspecialchars($content)."','$url',".print_r($vars,True).") = ".$this->link($url,$vars)."</p>";
return '<a href="'.$this->link($url,$vars).'" '.$options.'>'.$content.'</a>'; return '<a href="'.$this->link($url,$vars).'" '.$options.'>'.$content.'</a>';
} }
/** /**
* representates a b tab (bold) * representates a b tab (bold)
* *
@ -923,7 +922,7 @@ class html
{ {
return '<b>'.$content.'</b>'; return '<b>'.$content.'</b>';
} }
/** /**
* representates a i tab (bold) * representates a i tab (bold)
* *
@ -934,7 +933,7 @@ class html
{ {
return '<i>'.$content.'</i>'; return '<i>'.$content.'</i>';
} }
/** /**
* representates a hr tag (horizontal rule) * representates a hr tag (horizontal rule)
* *
@ -948,7 +947,7 @@ class html
return "<hr $options />\n"; return "<hr $options />\n";
} }
/** /**
* formats option-string for most of the above functions * formats option-string for most of the above functions
* *
@ -962,7 +961,7 @@ class html
{ {
if (!is_array($options)) $options = explode(',',$options); if (!is_array($options)) $options = explode(',',$options);
if (!is_array($names)) $names = explode(',',$names); if (!is_array($names)) $names = explode(',',$names);
foreach($options as $n => $val) foreach($options as $n => $val)
{ {
if ($val != '' && $names[$n] != '') if ($val != '' && $names[$n] != '')
@ -972,7 +971,7 @@ class html
} }
return $html; return $html;
} }
/** /**
* returns simple stylesheet (incl. <STYLE> tags) for nextmatch row-colors * returns simple stylesheet (incl. <STYLE> tags) for nextmatch row-colors
* *
@ -983,7 +982,7 @@ class html
{ {
return $this->style($this->theme2css()); return $this->style($this->theme2css());
} }
/** /**
* returns simple stylesheet for nextmatch row-colors * returns simple stylesheet for nextmatch row-colors
* *
@ -992,11 +991,11 @@ class html
*/ */
function theme2css() function theme2css()
{ {
return ".th { background: ".$GLOBALS['phpgw_info']['theme']['th_bg']."; }\n". return ".th { background: ".$GLOBALS['egw_info']['theme']['th_bg']."; }\n".
".row_on,.th_bright { background: ".$GLOBALS['phpgw_info']['theme']['row_on']."; }\n". ".row_on,.th_bright { background: ".$GLOBALS['egw_info']['theme']['row_on']."; }\n".
".row_off { background: ".$GLOBALS['phpgw_info']['theme']['row_off']."; }\n"; ".row_off { background: ".$GLOBALS['egw_info']['theme']['row_off']."; }\n";
} }
/** /**
* html style tag (incl. type) * html style tag (incl. type)
* *
@ -1007,7 +1006,7 @@ class html
{ {
return $styles ? "<style type=\"text/css\">\n<!--\n$styles\n-->\n</style>" : ''; return $styles ? "<style type=\"text/css\">\n<!--\n$styles\n-->\n</style>" : '';
} }
/** /**
* html label tag * html label tag
* *
@ -1016,7 +1015,7 @@ class html
* @param string $accesskey accesskey, default ''=none * @param string $accesskey accesskey, default ''=none
* @param string $options attributes for the tag, default ''=none * @param string $options attributes for the tag, default ''=none
* @return string the html * @return string the html
*/ */
function label($content,$id='',$accesskey='',$options='') function label($content,$id='',$accesskey='',$options='')
{ {
if ($id != '') if ($id != '')
@ -1029,7 +1028,7 @@ class html
} }
return "<label$id$accesskey $options>$content</label>"; return "<label$id$accesskey $options>$content</label>";
} }
/** /**
* html fieldset, eg. groups a group of radiobuttons * html fieldset, eg. groups a group of radiobuttons
* *
@ -1037,16 +1036,16 @@ class html
* @param string $legend legend / label of the fieldset, default ''=none * @param string $legend legend / label of the fieldset, default ''=none
* @param string $options attributes for the tag, default ''=none * @param string $options attributes for the tag, default ''=none
* @return string the html * @return string the html
*/ */
function fieldset($content,$legend='',$options='') function fieldset($content,$legend='',$options='')
{ {
$html = "<fieldset $options>".($legend ? '<legend>'.$this->htmlspecialchars($legend).'</legend>' : '')."\n"; $html = "<fieldset $options>".($legend ? '<legend>'.$this->htmlspecialchars($legend).'</legend>' : '')."\n";
if ($content) if ($content)
{ {
$html .= $content; $html .= $content;
$html .= "\n</fieldset>\n"; $html .= "\n</fieldset>\n";
} }
return $html; return $html;
} }
} }

19
phpgwapi/inc/class.jscalendar.inc.php
View File

@ -29,15 +29,15 @@
*/ */
function jscalendar($do_header=True,$path='jscalendar') function jscalendar($do_header=True,$path='jscalendar')
{ {
$this->jscalendar_url = $GLOBALS['phpgw_info']['server']['webserver_url'].'/phpgwapi/js/'.$path; $this->jscalendar_url = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/'.$path;
$this->dateformat = $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']; $this->dateformat = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
if ($do_header && !strstr($GLOBALS['phpgw_info']['flags']['java_script'],'jscalendar')) if ($do_header && !strstr($GLOBALS['egw_info']['flags']['java_script'],'jscalendar'))
{ {
$GLOBALS['phpgw_info']['flags']['java_script'] .= $GLOBALS['egw_info']['flags']['java_script'] .=
'<link rel="stylesheet" type="text/css" media="all" href="'.$this->jscalendar_url.'/calendar-blue.css" title="blue" /> '<link rel="stylesheet" type="text/css" media="all" href="'.$this->jscalendar_url.'/calendar-blue.css" title="blue" />
<script type="text/javascript" src="'.$this->jscalendar_url.'/calendar.js"></script> <script type="text/javascript" src="'.$this->jscalendar_url.'/calendar.js"></script>
<script type="text/javascript" src="'.ereg_replace('[?&]*click_history=[0-9a-f]*','',$GLOBALS['phpgw']->link('/phpgwapi/inc/jscalendar-setup.php')).'"></script> <script type="text/javascript" src="'.ereg_replace('[?&]*click_history=[0-9a-f]*','',$GLOBALS['egw']->link('/phpgwapi/inc/jscalendar-setup.php')).'"></script>
'; ';
} }
} }
@ -81,21 +81,20 @@
$options .= " onFocus=\"self.status='".addslashes($helpmsg)."'; return true;\"" . $options .= " onFocus=\"self.status='".addslashes($helpmsg)."'; return true;\"" .
" onBlur=\"self.status=''; return true;\""; " onBlur=\"self.status=''; return true;\"";
} }
if ($jsreturn) if ($jsreturn)
{ {
$return_array = array( $return_array = array(
'html' => '<input type="text" id="'.$name.'" name="'.$name.'" size="10" value="'.$date.'"'.$options.'/><img id="'.$name.'-trigger" src="'.$GLOBALS['phpgw']->common->find_image('phpgwpai','datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;"/>', 'html' => '<input type="text" id="'.$name.'" name="'.$name.'" size="10" value="'.$date.'"'.$options.'/><img id="'.$name.'-trigger" src="'.$GLOBALS['egw']->common->find_image('phpgwpai','datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;"/>',
'js' => 'Calendar.setup({inputField : "'.$name.'",button: "'.$name.'-trigger" });' 'js' => 'Calendar.setup({inputField : "'.$name.'",button: "'.$name.'-trigger" });'
); );
return $return_array; return $return_array;
} }
return return
'<input type="text" id="'.$name.'" name="'.$name.'" size="10" value="'.$date.'"'.$options.'/> '<input type="text" id="'.$name.'" name="'.$name.'" size="10" value="'.$date.'"'.$options.'/>
<script type="text/javascript"> <script type="text/javascript">
document.writeln(\'<img id="'.$name.'-trigger" src="'.$GLOBALS['phpgw']->common->find_image('phpgwpai','datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;"/>\'); document.writeln(\'<img id="'.$name.'-trigger" src="'.$GLOBALS['egw']->common->find_image('phpgwpai','datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;"/>\');
Calendar.setup( Calendar.setup(
{ {
inputField : "'.$name.'", inputField : "'.$name.'",

10
phpgwapi/inc/class.mime_magic.inc.php
View File

@ -28,12 +28,12 @@
//map of file contents to mime type //map of file contents to mime type
var $mime_magic_file; var $mime_magic_file;
/** /**
* Wrapper to PHP5 Compatiable Constructor * Wrapper to PHP5 Compatible Constructor
* *
* @author skwashd * @author skwashd
function mime_magic() function mime_magic()
{ {
$this->__constructor() $this->__constructor()
@ -198,14 +198,14 @@
*/ */
function analyze_data($data) function analyze_data($data)
{ {
if(!is_writeable(@$GLOBALS['phpgw_info']['server']['temp_dir'])) if(!is_writeable(@$GLOBALS['egw_info']['server']['temp_dir']))
{ {
//nothing we can do but bail out //nothing we can do but bail out
return false; return false;
} }
mt_srand(time()); mt_srand(time());
$filename = $GLOBALS['phpgw_info']['server']['temp_dir'] . SEP $filename = $GLOBALS['egw_info']['server']['temp_dir'] . SEP
. md5( time() + mt_rand() ) . '.tmp'; . md5( time() + mt_rand() ) . '.tmp';
$fp = @fopen($filename, 'ab'); $fp = @fopen($filename, 'ab');

72
phpgwapi/inc/class.pdf.inc.php
View File

@ -6,33 +6,33 @@
* http://www.egroupware.org * * http://www.egroupware.org *
* Written by : Lars Kneschke [lkneschke@linux-at-work.de] * * Written by : Lars Kneschke [lkneschke@linux-at-work.de] *
* ------------------------------------------------- * * ------------------------------------------------- *
* Copyright (c) 2004, Lars Kneschke * * Copyright (c) 2004, Lars Kneschke *
* All rights reserved. * * All rights reserved. *
* * * *
* Redistribution and use in source and binary forms, with or without * * Redistribution and use in source and binary forms, with or without *
* modification, are permitted provided that the following conditions are * * modification, are permitted provided that the following conditions are *
* met: * * met: *
* * * *
* * Redistributions of source code must retain the above copyright * * * Redistributions of source code must retain the above copyright *
* notice, this list of conditions and the following disclaimer. * * notice, this list of conditions and the following disclaimer. *
* * Redistributions in binary form must reproduce the above copyright * * * Redistributions in binary form must reproduce the above copyright *
* notice, this list of conditions and the following disclaimer in the * * notice, this list of conditions and the following disclaimer in the *
* documentation and/or other materials provided with the distribution.* * documentation and/or other materials provided with the distribution. *
* * Neither the name of the FeLaMiMail organization nor the names of * * * Neither the name of the FeLaMiMail organization nor the names of *
* its contributors may be used to endorse or promote products derived * * its contributors may be used to endorse or promote products derived *
* from this software without specific prior written permission. * * from this software without specific prior written permission. *
* * * *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS *
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED *
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR* * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR*
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR * * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR *
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, *
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, *
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR *
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF * * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF *
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING *
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS *
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
\***************************************************************************/ \***************************************************************************/
/* $Id$ */ /* $Id$ */
@ -40,24 +40,24 @@
define('FPDF_FONTPATH',PHPGW_SERVER_ROOT.'/phpgwapi/inc/fpdf/font/'); define('FPDF_FONTPATH',PHPGW_SERVER_ROOT.'/phpgwapi/inc/fpdf/font/');
require(PHPGW_SERVER_ROOT.'/phpgwapi/inc/fpdf/fpdf.php'); require(PHPGW_SERVER_ROOT.'/phpgwapi/inc/fpdf/fpdf.php');
/** /**
* wrapper class for FPDF * wrapper class for FPDF
* *
* @package phpgwapi * @package phpgwapi
* @author Lars Kneschke * @author Lars Kneschke
* @version 1.35 * @version 1.35
* @copyright Lars Kneschke 2004 * @copyright Lars Kneschke 2004
* @license http://www.opensource.org/licenses/bsd-license.php BSD * @license http://www.opensource.org/licenses/bsd-license.php BSD
*/ */
class pdf extends FPDF class pdf extends FPDF
{ {
function pdf() function pdf()
{ {
parent::FPDF(); parent::FPDF();
$this->SetCreator('eGroupWare '.$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']); $this->SetCreator('eGroupWare '.$GLOBALS['egw_info']['server']['versions']['phpgwapi']);
$this->SetAuthor($GLOBALS['phpgw']->common->display_fullname()); $this->SetAuthor($GLOBALS['egw']->common->display_fullname());
} }
//Page footer //Page footer
function Footer() function Footer()
{ {
@ -69,4 +69,4 @@
$this->Cell(0,10,lang('Page').' '.$this->PageNo().'/{nb}',0,0,'C'); $this->Cell(0,10,lang('Page').' '.$this->PageNo().'/{nb}',0,0,'C');
} }
} }
?> ?>

2
phpgwapi/inc/class.service_contacts.inc.php
View File

@ -26,7 +26,7 @@
{ {
function service_contacts() function service_contacts()
{ {
$this->provider = $GLOBALS['phpgw_info']['contact_service'] ? $GLOBALS['phpgw_info']['contact_service'] : 'addressbook'; $this->provider = $GLOBALS['egw_info']['contact_service'] ? $GLOBALS['egw_info']['contact_service'] : 'addressbook';
$this->svc = $this->provider . '.bo' . $this->provider; $this->svc = $this->provider . '.bo' . $this->provider;
$type = $this->type ? $this->type : 'xmlrpc'; $type = $this->type ? $this->type : 'xmlrpc';
$this->function_map = ExecMethod($this->svc . '.list_methods',$type); $this->function_map = ExecMethod($this->svc . '.list_methods',$type);

2
phpgwapi/inc/class.service_schedule.inc.php
View File

@ -26,7 +26,7 @@
{ {
function service_schedule() function service_schedule()
{ {
$this->provider = $GLOBALS['phpgw_info']['schedule_service'] ? $GLOBALS['phpgw_info']['schedule_service'] : 'calendar'; $this->provider = $GLOBALS['egw_info']['schedule_service'] ? $GLOBALS['egw_info']['schedule_service'] : 'calendar';
$this->svc = $this->provider . '.bo' . $this->provider; $this->svc = $this->provider . '.bo' . $this->provider;
$type = $this->type ? $this->type : 'xmlrpc'; $type = $this->type ? $this->type : 'xmlrpc';
$this->function_map = ExecMethod($this->svc . '.list_methods',$type); $this->function_map = ExecMethod($this->svc . '.list_methods',$type);

4
phpgwapi/inc/class.soap_client.inc.php
View File

@ -140,7 +140,7 @@
. " HTTP/1.0\r\n" . " HTTP/1.0\r\n"
. 'User-Agent: eGroupware/' . $cliversion . '(PHP) ' . "\r\n" . 'User-Agent: eGroupware/' . $cliversion . '(PHP) ' . "\r\n"
. 'X-EGW-Server: ' . $this->server . "\r\n" . 'X-EGW-Server: ' . $this->server . "\r\n"
. 'X-EGW-Version: ' . $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'] . "\r\n" . 'X-EGW-Version: ' . $GLOBALS['egw_info']['server']['versions']['phpgwapi'] . "\r\n"
. 'Host: '.$this->server . "\r\n" . 'Host: '.$this->server . "\r\n"
. $credentials . $credentials
. "Content-Type: text/xml\r\nContent-Length: " . strlen($soap_data) . "\r\n" . "Content-Type: text/xml\r\nContent-Length: " . strlen($soap_data) . "\r\n"
@ -191,7 +191,7 @@
. " HTTP/1.0\r\n" . " HTTP/1.0\r\n"
. 'User-Agent: eGroupware/' . $cliversion . '(PHP) ' . "\r\n" . 'User-Agent: eGroupware/' . $cliversion . '(PHP) ' . "\r\n"
. 'X-EGW-Server: ' . $this->server . "\r\n" . 'X-EGW-Server: ' . $this->server . "\r\n"
. 'X-EGW-Version: ' . $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'] . "\r\n" . 'X-EGW-Version: ' . $GLOBALS['egw_info']['server']['versions']['phpgwapi'] . "\r\n"
. 'Host: ' . $this->server . "\r\n" . 'Host: ' . $this->server . "\r\n"
. $credentials . $credentials
. "Content-Type: text/xml\r\nContent-Length: " . strlen($soap_data) . "\r\n" . "Content-Type: text/xml\r\nContent-Length: " . strlen($soap_data) . "\r\n"

4
phpgwapi/inc/soaplib.soapinterop.php
View File

@ -3,7 +3,7 @@
* eGroupWare API - SOAP functions * * eGroupWare API - SOAP functions *
* This file written by dietrich@ganx4.com * * This file written by dietrich@ganx4.com *
* shared functions and vars for use with soap client/server * * shared functions and vars for use with soap client/server *
* -------------------------------------------------------------------------* * ------------------------------------------------------------------------ *
* This library is free software; you can redistribute it and/or modify it * * This library is free software; you can redistribute it and/or modify it *
* under the terms of the GNU Lesser General Public License as published by * * under the terms of the GNU Lesser General Public License as published by *
* the Free Software Foundation; either version 2.1 of the License, * * the Free Software Foundation; either version 2.1 of the License, *
@ -26,7 +26,7 @@
); );
function hello($serverid) function hello($serverid)
{ {
return CreateObject('soap.soapval','return','string',$GLOBALS['phpgw_info']['server']['site_title']); return CreateObject('soap.soapval','return','string',$GLOBALS['egw_info']['server']['site_title']);
} }
$GLOBALS['server']->add_to_map( $GLOBALS['server']->add_to_map(