space fixes, added timeout to connect(), general fixes

git-svn-id: svn://netflint.net/xmpphp@39 ef36c318-a008-4979-b6e8-6b496270793b
This commit is contained in:
temp
2008-05-05 21:14:43 +00:00
parent 1a4d1756c1
commit b5aa1b77b0
4 changed files with 576 additions and 571 deletions

View File

@@ -41,89 +41,89 @@ class XMPPHP_XMLObj {
*
* @var string
*/
public $name;
public $name;
/**
* Namespace
*
* @var string
*/
public $ns;
public $ns;
/**
* Attributes
*
* @var array
*/
public $attrs = array();
public $attrs = array();
/**
* Subs?
*
* @var array
*/
public $subs = array();
public $subs = array();
/**
* Node data
*
* @var string
*/
public $data = '';
public $data = '';
/**
* Constructor
*
* @param string $name
* @param string $ns
* @param array $attrs
* @param string $data
*/
public function __construct($name, $ns = '', $attrs = array(), $data = '') {
$this->name = strtolower($name);
$this->ns = $ns;
if(is_array($attrs) && count($attrs)) {
foreach($attrs as $key => $value) {
$this->attrs[strtolower($key)] = $value;
}
}
$this->data = $data;
}
/**
* Constructor
*
* @param string $name
* @param string $ns
* @param array $attrs
* @param string $data
*/
public function __construct($name, $ns = '', $attrs = array(), $data = '') {
$this->name = strtolower($name);
$this->ns = $ns;
if(is_array($attrs) && count($attrs)) {
foreach($attrs as $key => $value) {
$this->attrs[strtolower($key)] = $value;
}
}
$this->data = $data;
}
/**
* Dump this XML Object to output.
*
* @param integer $depth
*/
public function printObj($depth = 0) {
print str_repeat("\t", $depth) . $this->name . " " . $this->ns . ' ' . $this->data;
print "\n";
foreach($this->subs as $sub) {
$sub->printObj($depth + 1);
}
}
public function printObj($depth = 0) {
print str_repeat("\t", $depth) . $this->name . " " . $this->ns . ' ' . $this->data;
print "\n";
foreach($this->subs as $sub) {
$sub->printObj($depth + 1);
}
}
/**
* Return this XML Object in xml notation
*
* @param string $str
*/
public function toString($str = '') {
$str .= "<{$this->name} xmlns='{$this->ns}' ";
foreach($this->attrs as $key => $value) {
if($key != 'xmlns') {
$value = htmlspecialchars($value);
$str .= "$key='$value' ";
}
}
$str .= ">";
foreach($this->subs as $sub) {
$str .= $sub->toString();
}
$body = htmlspecialchars($this->data);
$str .= "$body</{$this->name}>";
return $str;
}
public function toString($str = '') {
$str .= "<{$this->name} xmlns='{$this->ns}' ";
foreach($this->attrs as $key => $value) {
if($key != 'xmlns') {
$value = htmlspecialchars($value);
$str .= "$key='$value' ";
}
}
$str .= ">";
foreach($this->subs as $sub) {
$str .= $sub->toString();
}
$body = htmlspecialchars($this->data);
$str .= "$body</{$this->name}>";
return $str;
}
/**
* Has this XML Object the given sub?
@@ -131,12 +131,12 @@ class XMPPHP_XMLObj {
* @param string $name
* @return boolean
*/
public function hasSub($name) {
foreach($this->subs as $sub) {
if($sub->name == $name) return true;
}
return false;
}
public function hasSub($name) {
foreach($this->subs as $sub) {
if($sub->name == $name) return true;
}
return false;
}
/**
* Return a sub
@@ -145,11 +145,11 @@ class XMPPHP_XMLObj {
* @param string $attrs
* @param string $ns
*/
public function sub($name, $attrs = null, $ns = null) {
foreach($this->subs as $sub) {
if($sub->name == $name) {
public function sub($name, $attrs = null, $ns = null) {
foreach($this->subs as $sub) {
if($sub->name == $name) {
return $sub;
}
}
}
}
}
}