Maintenance
- * @todo Figure out best aproximation for year and month conversion to
- * seconds
- */
+[Definition:] duration represents a duration of time. The value space of
+duration is a six-dimensional space where the coordinates designate the
+Gregorian year, month, day, hour, minute, and second components
+defined in 5.5.3.2 of [ISO 8601], respectively. These components are
+ordered in their significance by their order of appearance i.e. as year,
+month, day, hour, minute, and second.
+
+3.2.6.1 Lexical representation
+The lexical representation for duration is the [ISO 8601] extended
+format PnYn MnDTnH nMnS, where nY represents the number of
+years, nM the number of months, nD the number of days, 'T' is the
+date/time separator, nH the number of hours, nM the number of
+minutes and nS the number of seconds. The number of seconds
+can include decimal digits to arbitrary precision.
+
+The values of the Year, Month, Day, Hour and Minutes components
+are not restricted but allow an arbitrary integer. Similarly, the
+value of the Seconds component allows an arbitrary decimal.
+Thus, the lexical representation of duration does not follow the
+alternative format of 5.5.3.2.1 of [ISO 8601].
+
+An optional preceding minus sign ('-') is allowed, to indicate a
+negative duration. If the sign is omitted a positive duration is
+indicated. See also ISO 8601 Date and Time Formats (D).
+
+For example, to indicate a duration of 1 year, 2 months, 3 days,
+10 hours, and 30 minutes, one would write: P1Y2M3DT10H30M.
+One could also indicate a duration of minus 120 days as: -P120D.
+
+Reduced precision and truncated representations of this format
+are allowed provided they conform to the following:
+
+If the number of years, months, days, hours, minutes, or seconds
+in any expression equals zero, the number and its corresponding
+designator *may* be omitted. However, at least one number and
+its designator *must* be present.
+The seconds part *may* have a decimal fraction.
+The designator 'T' shall be absent if all of the time items are absent.
+The designator 'P' must always be present.
+For example, P1347Y, P1347M and P1Y2MT2H are all allowed; P0Y1347M
+and P0Y1347M0D are allowed. P-1347M is not allowed although -P1347M
+is allowed. P1Y2MT is not allowed.
+
+*/
+
+/* this is only an aproximation of duration, more work still to do.
+ see above schema url for more info on duration
+
+ TODO: figure out best aproximation for year and month conversion to seconds
+*/
+
+$ereg_duration = '(-)?P([0-9]+Y)?([0-9]+M)?([0-9]+D)?T?([0-9]+H)?([0-9]+M)?([0-9]+S)?';
class SOAP_Type_duration
{
// format PnYnMnDTnHnMnS
- function unix_to_duration($seconds)
- {
+ function unix_to_duration($seconds) {
return SOAP_Type_duration::getduration($seconds);
}
-
- function mod($a, $b, &$d, &$r)
- {
- $d = floor($a / $b);
+
+ function mod($a, $b, &$d, &$r) {
+ $d = floor( $a / $b );
$r = $a % $b;
}
-
- function getduration($seconds)
- {
+
+ function getduration($seconds) {
$neg = '';
if ($seconds < 0) {
@@ -98,5 +73,5 @@
$seconds = $seconds * -1;
}
-
+
$_mi = 60;
$_h = $_mi * 60;
@@ -111,5 +86,5 @@
SOAP_Type_duration::mod($seconds, $_h, $h, $seconds);
SOAP_Type_duration::mod($seconds, $_mi, $mi, $s);
-
+
$duration = $neg.'P';
if ($y) $duration .= $y.'Y';
@@ -121,10 +96,8 @@
if ($s) $duration .= $s.'S';
if ($duration == 'P' || $duration == '-P') $duration = 'PT0S';
-
return $duration;
}
-
- function mkduration($n, $Y, $Mo, $D, $H, $Mi, $S)
- {
+
+ function mkduration($n, $Y, $Mo, $D, $H, $Mi, $S) {
$_mi = 60;
$_h = $_mi * 60;
@@ -133,26 +106,24 @@
$_m = $_d * 30;
$_y = $_d * 365;
-
+
$sec = $Y * $_y + $Mo * $_m + $D * $_d + $H * $_h + $Mi * $_mi + $S;
if ($n == '-') $sec = $sec * -1;
-
return $sec;
}
-
- function duration_to_unix($duration)
- {
- if (ereg('(-)?P([0-9]+Y)?([0-9]+M)?([0-9]+D)?T?([0-9]+H)?([0-9]+M)?([0-9]+S)?', $duration, $regs)) {
+
+ function duration_to_unix($duration) {
+ global $ereg_duration;
+ if (ereg($ereg_duration,$duration,$regs)) {
return SOAP_Type_duration::mkduration($regs[1], $regs[2], $regs[3], $regs[4], $regs[5], $regs[6], $regs[7]);
}
- return false;
+ return FALSE;
}
-
- function is_duration($duration)
- {
- return ereg('(-)?P([0-9]+Y)?([0-9]+M)?([0-9]+D)?T?([0-9]+H)?([0-9]+M)?([0-9]+S)?', $duration, $regs);
+
+ function is_duration($duration) {
+ global $ereg_duration;
+ return ereg($ereg_duration,$duration,$regs);
}
-
- function _test($time)
- {
+
+ function _test($time) {
if (SOAP_Type_duration::is_duration($time)) {
$t = SOAP_Type_duration::duration_to_unix($time);
@@ -164,14 +135,12 @@
return $t;
}
-
- function add($d1, $d2)
- {
+
+ function add($d1, $d2) {
$s1 = SOAP_Type_duration::duration_to_unix($d1);
$s2 = SOAP_Type_duration::duration_to_unix($d2);
return SOAP_Type_duration::unix_to_duration($s1 + $s2);
}
-
- function subtract($d1, $d2)
- {
+
+ function subtract($d1, $d2) {
$s1 = SOAP_Type_duration::duration_to_unix($d1);
$s2 = SOAP_Type_duration::duration_to_unix($d2);
@@ -181,5 +150,6 @@
}
-/* Tests. */
+/* tests */
+
$t = SOAP_Type_duration::_test('P1Y2M3DT10H30M');
SOAP_Type_duration::_test($t);
@@ -187,8 +157,9 @@
SOAP_Type_duration::_test($t);
-/* Duration since 1970. */
+// duration since 1970
$t = SOAP_Type_duration::_test(time());
SOAP_Type_duration::_test($t);
-echo 'Add should be PT0S: ' . SOAP_Type_duration::add('-P120D','P4M') . "\n";
-echo 'Subtract should be PT0S: ' . SOAP_Type_duration::subtract('P120D','P4M') . "\n";
+print "Add should be PT0S: ".SOAP_Type_duration::add('-P120D','P4M')."\n";
+print "Subtract should be PT0S: ".SOAP_Type_duration::subtract('P120D','P4M')."\n";
+?>
Index: branches/version-2_11-dev/data/module/SOAP/Parser.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/Parser.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/Parser.php (revision 21410)
@@ -221,10 +221,12 @@
// Add current node's value.
- $nqn = new QName($this->message[$pos]['name'],
- $this->message[$pos]['namespace']);
- $tqn = new QName($this->message[$pos]['type'],
- $this->message[$pos]['type_namespace']);
if ($response) {
- $response = new SOAP_Value($nqn->fqn(), $tqn->fqn(), $response,
+ $nqn = new QName($this->message[$pos]['name'],
+ $this->message[$pos]['namespace']);
+ $tqn = new QName($this->message[$pos]['type'],
+ $this->message[$pos]['type_namespace']);
+ $response = new SOAP_Value($nqn->fqn(),
+ $tqn->fqn(),
+ $response,
$attrs);
if (isset($this->message[$pos]['arrayType'])) {
@@ -232,13 +234,17 @@
}
} else {
+ $nqn = new QName($this->message[$pos]['name'],
+ $this->message[$pos]['namespace']);
+ $tqn = new QName($this->message[$pos]['type'],
+ $this->message[$pos]['type_namespace']);
// Check if value is an empty array
if ($tqn->name == 'Array') {
- $response = new SOAP_Value($nqn->fqn(), $tqn->fqn(), array(),
- $attrs);
- //if ($pos == 4) var_dump($this->message[$pos], $response);
+ $response =& new SOAP_Value($nqn->fqn(), $tqn->fqn(),
+ array(), $attrs);
} else {
- $response = new SOAP_Value($nqn->fqn(), $tqn->fqn(),
- $this->message[$pos]['cdata'],
- $attrs);
+ $response = new SOAP_Value($nqn->fqn(),
+ $tqn->fqn(),
+ $this->message[$pos]['cdata'],
+ $attrs);
}
}
@@ -251,5 +257,4 @@
$response->mustunderstand = $this->message[$pos]['mustUnderstand'];
}
-
return $response;
}
Index: branches/version-2_11-dev/data/module/SOAP/Transport.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/Transport.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/Transport.php (revision 21410)
@@ -116,10 +116,11 @@
}
- function getTransport($url, $encoding = SOAP_DEFAULT_ENCODING)
+ function &getTransport($url, $encoding = SOAP_DEFAULT_ENCODING)
{
$urlparts = @parse_url($url);
if (!$urlparts['scheme']) {
- return SOAP_Base_Object::_raiseSoapFault("Invalid transport URI: $url");
+ $fault = SOAP_Base_Object::_raiseSoapFault("Invalid transport URI: $url");
+ return $fault;
}
@@ -132,15 +133,18 @@
$transport_type = strtoupper($urlparts['scheme']);
}
+ $transport_include = 'SOAP/Transport/' . basename($transport_type) . '.php';
+ $res = @include_once($transport_include);
+ if (!$res) {
+ $fault = SOAP_Base_Object::_raiseSoapFault("No Transport for {$urlparts['scheme']}");
+ return $fault;
+ }
$transport_class = "SOAP_Transport_$transport_type";
if (!class_exists($transport_class)) {
- if (!(@include_once('SOAP/Transport/' . basename($transport_type) . '.php'))) {
- return SOAP_Base_Object::_raiseSoapFault("No Transport for {$urlparts['scheme']}");
- }
+ $fault = SOAP_Base_Object::_raiseSoapFault("No Transport class $transport_class");
+ return $fault;
}
- if (!class_exists($transport_class)) {
- return SOAP_Base_Object::_raiseSoapFault("No Transport class $transport_class");
- }
+ $t =& new $transport_class($url, $encoding);
- return new $transport_class($url, $encoding);
+ return $t;
}
Index: branches/version-2_11-dev/data/module/SOAP/Value.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/Value.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/Value.php (revision 21410)
@@ -41,74 +41,37 @@
{
/**
- * The actual value.
- *
- * @var mixed
+ * @var string
*/
var $value = null;
/**
- * QName instance representing the value name.
- *
- * @var QName
- */
+ * @var string
+ */
+ var $name = '';
+
+ /**
+ * @var string
+ */
+ var $type = '';
+
+ /**
+ * Namespace
+ *
+ * @var string
+ */
+ var $namespace = '';
+ var $type_namespace = '';
+
+ var $attributes = array();
+
+ /**
+ * @var string
+ */
+ var $arrayType = '';
+
+ var $options = array();
+
var $nqn;
-
- /**
- * The value name, without namespace information.
- *
- * @var string
- */
- var $name = '';
-
- /**
- * The namespace of the value name.
- *
- * @var string
- */
- var $namespace = '';
-
- /**
- * QName instance representing the value type.
- *
- * @var QName
- */
var $tqn;
-
- /**
- * The value type, without namespace information.
- *
- * @var string
- */
- var $type = '';
-
- /**
- * The namespace of the value type.
- *
- * @var string
- */
- var $type_namespace = '';
-
- /**
- * The type of the array elements, if this value is an array.
- *
- * @var string
- */
- var $arrayType = '';
-
- /**
- * A hash of additional attributes.
- *
- * @see SOAP_Value()
- * @var array
- */
- var $attributes = array();
-
- /**
- * List of encoding and serialization options.
- *
- * @see SOAP_Value()
- * @var array
- */
- var $options = array();
/**
@@ -119,32 +82,19 @@
* automatically if not set.
* @param mixed $value Value to set.
- * @param array $attributes A has of additional XML attributes to be
- * added to the serialized value.
- * @param array $options A list of encoding and serialization options:
- * - 'attachment': array with information about
- * the attachment
- * - 'soap_encoding': defines encoding for SOAP
- * message part of a MIME encoded SOAP request
- * (default: base64)
- * - 'keep_arrays_flat': use the tag name
- * multiple times for each element when
- * passing in an array in literal mode
- * - 'no_type_prefix': supress adding of the
- * namespace prefix
+ * @param array $attributes Attributes.
*/
function SOAP_Value($name = '', $type = false, $value = null,
- $attributes = array(), $options = array())
- {
+ $attributes = array())
+ {
+ // Detect type if not passed.
$this->nqn = new QName($name);
$this->name = $this->nqn->name;
$this->namespace = $this->nqn->namespace;
- if ($type) {
- $this->tqn = new QName($type);
- $this->type = $this->tqn->name;
- $this->type_namespace = $this->tqn->namespace;
- }
+ $this->tqn = new QName($type);
+ $this->type = $this->tqn->name;
+ $this->type_prefix = $this->tqn->ns;
+ $this->type_namespace = $this->tqn->namespace;
$this->value = $value;
$this->attributes = $attributes;
- $this->options = $options;
}
@@ -160,6 +110,8 @@
{
return $serializer->_serializeValue($this->value,
- $this->nqn,
- $this->tqn,
+ $this->name,
+ $this->type,
+ $this->namespace,
+ $this->type_namespace,
$this->options,
$this->attributes,
@@ -205,9 +157,9 @@
if (isset($actor)) {
- $this->attributes[SOAP_BASE::SOAPENVPrefix().':actor'] = $actor;
- } elseif (!isset($this->attributes[SOAP_BASE::SOAPENVPrefix().':actor'])) {
- $this->attributes[SOAP_BASE::SOAPENVPrefix().':actor'] = 'http://schemas.xmlsoap.org/soap/actor/next';
- }
- $this->attributes[SOAP_BASE::SOAPENVPrefix().':mustUnderstand'] = (int)$mustunderstand;
+ $this->attributes['SOAP-ENV:actor'] = $actor;
+ } elseif (!isset($this->attributes['SOAP-ENV:actor'])) {
+ $this->attributes['SOAP-ENV:actor'] = 'http://schemas.xmlsoap.org/soap/actor/next';
+ }
+ $this->attributes['SOAP-ENV:mustUnderstand'] = (int)$mustunderstand;
}
@@ -232,12 +184,11 @@
* is provide.
* @param string $file The attachment data.
- * @param array $attributes Attributes.
*/
function SOAP_Attachment($name = '', $type = 'application/octet-stream',
- $filename, $file = null, $attributes = null)
+ $filename, $file = null)
{
parent::SOAP_Value($name, null, null);
- $filedata = $file === null ? $this->_file2str($filename) : $file;
+ $filedata = ($file === null) ? $this->_file2str($filename) : $file;
$filename = basename($filename);
if (PEAR::isError($filedata)) {
@@ -248,6 +199,5 @@
$cid = md5(uniqid(time()));
- $this->attributes = $attributes;
- $this->attributes['href'] = 'cid:' . $cid;
+ $this->attributes['href'] = 'cid:' . $cid;
$this->options['attachment'] = array('body' => $filedata,
Index: branches/version-2_11-dev/data/module/SOAP/Client.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/Client.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/Client.php (revision 21410)
@@ -23,5 +23,4 @@
*/
-/** SOAP_Value */
require_once 'SOAP/Value.php';
require_once 'SOAP/Base.php';
@@ -37,7 +36,4 @@
// these two are BC/FC handlers for call in PHP4/5
-/**
- * @package SOAP
- */
if (!class_exists('SOAP_Client_Overload')) {
if (substr(zend_version(), 0, 1) > 1) {
@@ -297,21 +293,13 @@
* placed in the options array. This is done to provide backwards
* compatibility with current clients, but may be removed in the future.
- * The currently supported values are:
- * - 'namespace'
- * - 'soapaction'
- * - 'timeout': HTTP socket timeout
- * - 'transfer-encoding': SMTP transport, Content-Transfer-Encoding: header
- * - 'from': SMTP transport, From: header
- * - 'subject': SMTP transport, Subject: header
- * - 'headers': SMTP transport, hash of extra SMTP headers
- * - 'attachments': what encoding to use for attachments (Mime, Dime)
- * - 'trace': whether to trace the SOAP communication
- * - 'style': 'document' or 'rpc'; when set to 'document' the parameters
- * are not wrapped inside a tag with the SOAP action name
- * - 'use': 'literal' for literal encoding, anything else for section 5
- * encoding; when set to 'literal' SOAP types will be omitted.
- * - 'keep_arrays_flat': use the tag name multiple times for each element
- * when passing in an array in literal mode
- * - 'no_type_prefix': supress adding of the namespace prefix
+ * The currently supported values are:
+ * namespace
+ * soapaction
+ * timeout (HTTP socket timeout)
+ * transfer-encoding (SMTP, Content-Transfer-Encoding: header)
+ * from (SMTP, From: header)
+ * subject (SMTP, Subject: header)
+ * headers (SMTP, hash of extra SMTP headers)
+ *
*
* @access public
@@ -319,12 +307,10 @@
* @param string $method The method to call.
* @param array $params The method parameters.
- * @param string|array $namespace Namespace or hash with options. Note:
- * most options need to be repeated for
- * SOAP_Value instances.
+ * @param string|array $namespace Namespace or hash with options.
* @param string $soapAction
*
* @return mixed The method result or a SOAP_Fault on error.
*/
- function call($method, $params, $namespace = false, $soapAction = false)
+ function &call($method, &$params, $namespace = false, $soapAction = false)
{
$this->headersIn = null;
@@ -347,8 +333,9 @@
if (!$this->_soap_transport ||
$this->_endpoint != $this->_soap_transport->url) {
- $this->_soap_transport = SOAP_Transport::getTransport($this->_endpoint);
+ $this->_soap_transport =& SOAP_Transport::getTransport($this->_endpoint);
if (PEAR::isError($this->_soap_transport)) {
- $fault = $this->_raiseSoapFault($this->_soap_transport);
+ $fault =& $this->_soap_transport;
$this->_soap_transport = null;
+ $fault = $this->_raiseSoapFault($fault);
return $fault;
}
@@ -379,6 +366,6 @@
$this->__result_encoding = $this->_soap_transport->result_encoding;
- $result = $this->parseResponse($this->xml, $this->__result_encoding,
- $this->_soap_transport->attachments);
+ $result = &$this->parseResponse($this->xml, $this->__result_encoding,
+ $this->_soap_transport->attachments);
return $result;
}
@@ -442,5 +429,5 @@
}
- $return_value = $this->call($method, $params);
+ $return_value =& $this->call($method, $params);
return true;
@@ -448,4 +435,13 @@
/**
+ * @deprecated Use getLastRequest().
+ */
+ function &__getlastrequest()
+ {
+ $request = $this->getLastRequest();
+ return $request;
+ }
+
+ /**
* Returns the XML content of the last SOAP request.
*
@@ -458,4 +454,13 @@
/**
+ * @deprecated Use getLastResponse().
+ */
+ function &__getlastresponse()
+ {
+ $response =& $this->getLastResponse;
+ return $response;
+ }
+
+ /**
* Returns the XML content of the last SOAP response.
*
@@ -468,8 +473,14 @@
/**
+ * @deprecated Use setUse().
+ */
+ function __use($use)
+ {
+ $this->setUse($use);
+ }
+
+ /**
* Sets the SOAP encoding.
*
- * The default encoding is section 5 encoded.
- *
* @param string $use Either 'literal' or 'encoded' (section 5).
*/
@@ -480,8 +491,14 @@
/**
+ * @deprecated Use setStyle().
+ */
+ function __style($style)
+ {
+ $this->setStyle($style);
+ }
+
+ /**
* Sets the SOAP encoding style.
*
- * The default style is rpc.
- *
* @param string $style Either 'document' or 'rpc'.
*/
@@ -492,4 +509,12 @@
/**
+ * @deprecated Use setTrace().
+ */
+ function __trace($level)
+ {
+ $this->setTrace($level);
+ }
+
+ /**
* Sets whether to trace the traffic on the transport level.
*
@@ -503,49 +528,30 @@
}
- /**
- * Generates the complete XML SOAP message for an RPC call.
- *
- * @see call()
- *
- * @param string $method The method to call.
- * @param array $params The method parameters.
- * @param string|array $namespace Namespace or hash with options. Note:
- * most options need to be repeated for
- * SOAP_Value instances.
- * @param string $soapAction
- *
- * @return string The SOAP message including envelope.
- */
- function _generate($method, $params, $namespace = false,
+ function _generate($method, &$params, $namespace = false,
$soapAction = false)
{
$this->fault = null;
- $this->_options['input'] = 'parse';
+ $this->_options['input'] = 'parse';
$this->_options['result'] = 'parse';
$this->_options['parameters'] = false;
- if ($params && !is_array($params)) {
+ if ($params && gettype($params) != 'array') {
$params = array($params);
}
- if (is_array($namespace)) {
- // Options passed as a hash.
+ if (gettype($namespace) == 'array') {
foreach ($namespace as $optname => $opt) {
$this->_options[strtolower($optname)] = $opt;
+ }
+ if (isset($this->_options['namespace'])) {
+ $namespace = $this->_options['namespace'];
+ } else {
+ $namespace = false;
}
} else {
// We'll place $soapAction into our array for usage in the
// transport.
- if ($soapAction) {
- $this->_options['soapaction'] = $soapAction;
- }
- if ($namespace) {
- $this->_options['namespace'] = $namespace;
- }
- }
- if (isset($this->_options['namespace'])) {
- $namespace = $this->_options['namespace'];
- } else {
- $namespace = false;
+ $this->_options['soapaction'] = $soapAction;
+ $this->_options['namespace'] = $namespace;
}
@@ -573,7 +579,7 @@
return $this->_raiseSoapFault($opData);
}
- $namespace = $opData['namespace'];
- $this->_options['style'] = $opData['style'];
- $this->_options['use'] = $opData['input']['use'];
+ $namespace = $opData['namespace'];
+ $this->_options['style'] = $opData['style'];
+ $this->_options['use'] = $opData['input']['use'];
$this->_options['soapaction'] = $opData['soapAction'];
@@ -643,6 +649,5 @@
$this->docparams = true;
$mqname = new QName($method, $namespace);
- $methodValue = new SOAP_Value($mqname->fqn(), 'Struct', $params,
- array(), $this->_options);
+ $methodValue = new SOAP_Value($mqname->fqn(), 'Struct', $params);
$soap_msg = $this->makeEnvelope($methodValue,
$this->headersOut,
@@ -652,5 +657,6 @@
if (!$params) {
$mqname = new QName($method, $namespace);
- $params = new SOAP_Value($mqname->fqn(), 'Struct', null);
+ $mynull = null;
+ $params = new SOAP_Value($mqname->fqn(), 'Struct', $mynull);
} elseif ($this->_options['input'] == 'parse') {
if (is_array($params)) {
@@ -680,5 +686,5 @@
$this->_options);
}
- $this->headersOut = null;
+ unset($this->headersOut);
if (PEAR::isError($soap_msg)) {
@@ -722,4 +728,12 @@
/**
+ * @deprecated Use parseResponse().
+ */
+ function &__parse(&$response, $encoding, &$attachments)
+ {
+ return $this->parseResponse($response, $encoding, $attachments);
+ }
+
+ /**
* Parses a SOAP response.
*
@@ -730,33 +744,32 @@
* @param array $attachments List of attachments.
*/
- function parseResponse($response, $encoding, $attachments)
+ function &parseResponse($response, $encoding, &$attachments)
{
// Parse the response.
- $response = new SOAP_Parser($response, $encoding, $attachments);
+ $response =& new SOAP_Parser($response, $encoding, $attachments);
if ($response->fault) {
- $fault = $this->_raiseSoapFault($response->fault);
+ $fault =& $this->_raiseSoapFault($response->fault);
return $fault;
}
// Return array of parameters.
- $return = $response->getResponse();
- $headers = $response->getHeaders();
+ $return =& $response->getResponse();
+ $headers =& $response->getHeaders();
if ($headers) {
- $this->headersIn = $this->_decodeResponse($headers, false);
- }
-
- $decoded = $this->_decodeResponse($return);
+ $this->headersIn =& $this->_decodeResponse($headers, false);
+ }
+
+ $decoded = &$this->_decodeResponse($return);
return $decoded;
}
/**
- * Converts a complex SOAP_Value into a PHP Array
- *
- * @param SOAP_Value $response Value object.
- * @param boolean $shift
- *
- * @return array
- */
- function _decodeResponse($response, $shift = true)
+ * Converts a complex SOAP_Value into a PHP Array
+ *
+ * @param SOAP_Value $response value object
+ * @param boolean $shift FIXME
+ * @return Array
+ */
+ function &_decodeResponse($response, $shift = true)
{
if (!$response) {
@@ -767,17 +780,17 @@
// Check for valid response.
if (PEAR::isError($response)) {
- $fault = $this->_raiseSoapFault($response);
+ $fault =& $this->_raiseSoapFault($response);
return $fault;
} elseif (!is_a($response, 'soap_value')) {
- $fault = $this->_raiseSoapFault("Didn't get SOAP_Value object back from client");
+ $fault =& $this->_raiseSoapFault("Didn't get SOAP_Value object back from client");
return $fault;
}
// Decode to native php datatype.
- $returnArray = $this->_decode($response);
+ $returnArray =& $this->_decode($response);
// Fault?
if (PEAR::isError($returnArray)) {
- $fault = $this->_raiseSoapFault($returnArray);
+ $fault =& $this->_raiseSoapFault($returnArray);
return $fault;
}
@@ -787,8 +800,7 @@
$returnArray = get_object_vars($returnArray);
}
-
if (is_array($returnArray)) {
if (isset($returnArray['faultcode']) ||
- isset($returnArray[SOAP_BASE::SOAPENVPrefix().':faultcode'])) {
+ isset($returnArray['SOAP-ENV:faultcode'])) {
$faultcode = $faultstring = $faultdetail = $faultactor = '';
foreach ($returnArray as $k => $v) {
@@ -798,6 +810,5 @@
if (stristr($k, 'faultactor')) $faultactor = $v;
}
- $fault = $this->_raiseSoapFault($faultstring, $faultdetail,
- $faultactor, $faultcode);
+ $fault =& $this->_raiseSoapFault($faultstring, $faultdetail, $faultactor, $faultcode);
return $fault;
}
@@ -809,6 +820,13 @@
return $returnArray;
}
-
return $returnArray;
+ }
+
+ /**
+ * @deprecated Use getWire().
+ */
+ function __get_wire()
+ {
+ return $this->getWire();
}
Index: branches/version-2_11-dev/data/module/SOAP/Server/Email.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/Server/Email.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/Server/Email.php (revision 21410)
@@ -20,5 +20,4 @@
*/
-/** SOAP_Server */
require_once 'SOAP/Server.php';
require_once 'SOAP/Client.php';
Index: branches/version-2_11-dev/data/module/SOAP/Server/Email_Gateway.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/Server/Email_Gateway.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/Server/Email_Gateway.php (revision 21410)
@@ -20,5 +20,4 @@
*/
-/** SOAP_Server_Email */
require_once 'SOAP/Server/Email.php';
require_once 'SOAP/Transport.php';
Index: branches/version-2_11-dev/data/module/SOAP/Disco.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/Disco.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/Disco.php (revision 21410)
@@ -23,10 +23,6 @@
*/
-/** SOAP_Base */
require_once 'SOAP/Base.php';
-/**
- * @package SOAP
- */
class SOAP_DISCO_Server extends SOAP_Base_Object {
@@ -95,5 +91,5 @@
$this->namespaces[$this->_service_ns] = 'tns';
$this->namespaces[$flipped['xsd']] = 'xsd';
- $this->namespaces[$flipped[SOAP_BASE::SOAPENCPrefix()]] = SOAP_BASE::SOAPENCPrefix();
+ $this->namespaces[$flipped['SOAP-ENC']] = 'SOAP-ENC';
}
@@ -213,8 +209,8 @@
} else {
$ctype['complexContent']['attr'] = '';
- $ctype['complexContent']['restriction']['attr']['base'] = SOAP_BASE::SOAPENCPrefix().':Array';
+ $ctype['complexContent']['restriction']['attr']['base'] = 'SOAP-ENC:Array';
foreach ($_vartype as $array_type) {
list($_vartypens, $_vartype) = $this->_getTypeNs($array_type);
- $ctype['complexContent']['restriction']['attribute']['attr']['ref'] = SOAP_BASE::SOAPENCPrefix().':arrayType';
+ $ctype['complexContent']['restriction']['attribute']['attr']['ref'] = 'SOAP-ENC:arrayType';
$ctype['complexContent']['restriction']['attribute']['attr']['wsdl:arrayType'] = $_vartypens . ':' . $_vartype . '[]';
}
Index: branches/version-2_11-dev/data/module/SOAP/example/stockquote.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/example/stockquote.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/example/stockquote.php (revision 21410)
@@ -1,52 +1,54 @@
Port to PEAR and more
- * @author Jan Schneider Maintenance
- * @copyright 2003-2007 The PHP Group
- * @license http://www.php.net/license/2_02.txt PHP License 2.02
- * @link http://pear.php.net/package/SOAP
- */
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 4 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license, |
+// | that is bundled with this package in the file LICENSE, and is |
+// | available at through the world-wide-web at |
+// | http://www.php.net/license/2_02.txt. |
+// | If you did not receive a copy of the PHP license and are unable to |
+// | obtain it through the world-wide-web, please send a note to |
+// | license@php.net so we can mail you a copy immediately. |
+// +----------------------------------------------------------------------+
+// | Authors: Shane Caraveo Port to PEAR and more |
+// | Authors: Dietrich Ayala Original Author |
+// +----------------------------------------------------------------------+
+//
+// $Id: stockquote.php,v 1.7 2005/03/10 23:16:40 yunosh Exp $
+//
+// include soap client class
+include("SOAP/Client.php");
-/* Include SOAP_Client class. */
-require_once 'SOAP/Client.php';
-
-echo '
wsdl:';
-$wsdl = new SOAP_WSDL('http://services.xmethods.net/soap/urn:xmethods-delayed-quotes.wsdl');
+print "
\nwsdl:";
+$wsdl = new SOAP_WSDL("http://services.xmethods.net/soap/urn:xmethods-delayed-quotes.wsdl");
$soapclient = $wsdl->getProxy();
-$ret = $soapclient->call('getQuote', array('symbol' => 'ibm'));
-print_r($ret);
+print_r($soapclient->getQuote("ibm"));
+print "\n\n";
if (extension_loaded('overload')) {
- echo '
overloaded:';
- $ret = $soapclient->getQuote('ibm');
+ print "\n
overloaded:";
+ $ret = $soapclient->getQuote("ibm");
print_r($ret);
+ print "\n\n";
}
+unset($soapclient);
-echo '
non wsdl:';
-$soapclient = new SOAP_Client('http://services.xmethods.net:80/soap');
-$namespace = 'urn:xmethods-delayed-quotes';
-/* Some SOAP servers require a Soapaction HTTP header. PEAR::SOAP does not
- * use them in any way, other to send them if you supply them. soapaction is
- * deprecated in later SOAP versions. */
-$soapaction = 'urn:xmethods-delayed-quotes#getQuote';
-$ret = $soapclient->call('getQuote',
- array('symbol' => 'ibm'),
- $namespace,
- $soapaction);
+print "\n
non wsdl:";
+$soapclient = new SOAP_Client("http://services.xmethods.net:80/soap");
+$namespace = "urn:xmethods-delayed-quotes";
+/**
+ * some soap servers require a Soapaction http header. PEAR::SOAP does
+ * not use them in any way, other to send them if you supply them.
+ * soapaction is deprecated in later SOAP versions.
+ */
+$soapaction = "urn:xmethods-delayed-quotes#getQuote";
+$ret = $soapclient->call("getQuote",array("symbol"=>"ibm"),$namespace,$soapaction);
print_r($ret);
+print "\n\n";
+unset($soapclient);
?>
Index: branches/version-2_11-dev/data/module/SOAP/example/server.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/example/server.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/example/server.php (revision 21410)
@@ -1,59 +1,49 @@
Port to PEAR and more
- * @author Jan Schneider Maintenance
- * @copyright 2003-2007 The PHP Group
- * @license http://www.php.net/license/2_02.txt PHP License 2.02
- * @link http://pear.php.net/package/SOAP
- */
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 4 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license, |
+// | that is bundled with this package in the file LICENSE, and is |
+// | available at through the world-wide-web at |
+// | http://www.php.net/license/2_02.txt. |
+// | If you did not receive a copy of the PHP license and are unable to |
+// | obtain it through the world-wide-web, please send a note to |
+// | license@php.net so we can mail you a copy immediately. |
+// +----------------------------------------------------------------------+
+// | Authors: Shane Caraveo |
+// +----------------------------------------------------------------------+
+//
+// $Id: server.php,v 1.10 2005/03/10 23:16:40 yunosh Exp $
+//
-/* If you want to implement Basic HTTP Authentication, uncomment the following
- * lines of code. */
-// if (!isset($_SERVER['PHP_AUTH_USER']) ||
-// !isset($_SERVER['PHP_AUTH_PW']) ||
-// $_SERVER['PHP_AUTH_USER'] !== 'username' ||
-// $_SERVER['PHP_AUTH_PW'] !== 'password') {
-// header('WWW-Authenticate: Basic realm="My Realm"');
-// header('HTTP/1.0 401 Unauthorized');
-// echo 'Not authorized!';
-// exit;
-// }
+// first, include the SOAP/Server class
+require_once 'SOAP/Server.php';
-/* First, include the SOAP_Server class. */
-require_once 'SOAP/Server.php';
$server = new SOAP_Server;
-
-/* Tell server to translate to classes we provide if possible. */
+/* tell server to translate to classes we provide if possible */
$server->_auto_translation = true;
-require_once dirname(__FILE__) . '/example_server.php';
+require_once 'example_server.php';
+
$soapclass = new SOAP_Example_Server();
-$server->addObjectMap($soapclass, 'urn:SOAP_Example_Server');
+$server->addObjectMap($soapclass,'urn:SOAP_Example_Server');
if (isset($_SERVER['REQUEST_METHOD']) &&
- $_SERVER['REQUEST_METHOD'] == 'POST') {
+ $_SERVER['REQUEST_METHOD']=='POST') {
$server->service($HTTP_RAW_POST_DATA);
} else {
require_once 'SOAP/Disco.php';
- $disco = new SOAP_DISCO_Server($server, 'ServerExample');
- header('Content-type: text/xml');
+ $disco = new SOAP_DISCO_Server($server,'ServerExample');
+ header("Content-type: text/xml");
if (isset($_SERVER['QUERY_STRING']) &&
- strpos($_SERVER['QUERY_STRING'], 'wsdl') !== false) {
+ strcasecmp($_SERVER['QUERY_STRING'],'wsdl')==0) {
echo $disco->getWSDL();
} else {
echo $disco->getDISCO();
}
+ exit;
}
+?>
Index: branches/version-2_11-dev/data/module/SOAP/example/wsdl_client.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/example/wsdl_client.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/example/wsdl_client.php (revision 21410)
@@ -1,79 +1,83 @@
|
+// +----------------------------------------------------------------------+
+//
+// $Id: wsdl_client.php,v 1.5 2007/01/22 11:33:27 yunosh Exp $
+//
+include("SOAP/Client.php");
+
/**
- * WSDL client.
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 2.02 of the PHP license,
- * that is bundled with this package in the file LICENSE, and is available at
- * through the world-wide-web at http://www.php.net/license/2_02.txt. If you
- * did not receive a copy of the PHP license and are unable to obtain it
- * through the world-wide-web, please send a note to license@php.net so we can
- * mail you a copy immediately.
- *
- * @category Web Services
- * @package SOAP
- * @author Shane Caraveo Port to PEAR and more
- * @author Jan Schneider Maintenance
- * @copyright 2003-2007 The PHP Group
- * @license http://www.php.net/license/2_02.txt PHP License 2.02
- * @link http://pear.php.net/package/SOAP
+ * this client runs against the example server in SOAP/example/server.php
+ * it does not use WSDL to run these requests, but that can be changed easily by simply
+ * adding '?wsdl' to the end of the url.
*/
-
-require_once 'SOAP/Client.php';
-
-/* This client runs against the example server in SOAP/example/server.php. It
- * does not use WSDL to run these requests, but that can be changed easily by
- * simply adding '?wsdl' to the end of the url. */
-$wsdl = new SOAP_WSDL('http://localhost/SOAP/example/server.php?wsdl');
+$wsdl = new SOAP_WSDL("http://localhost/SOAP/example/server.php?wsdl");
$soapclient = $wsdl->getProxy();
-$ret = $soapclient->echoStringSimple('this is a test string');
-// echo $soapclient->getWire();
-print_r($ret);
+$ret = $soapclient->echoStringSimple("this is a test string");
+//print $soapclient->getWire();
+print_r($ret);echo "
\n";
-$ret = $soapclient->echoString('this is a test string');
-print_r($ret);
+$ret = $soapclient->echoString("this is a test string");
+print_r($ret);echo "
\n";
-$ret = $soapclient->divide(22, 7);
-// echo $soapclient->getWire();
-if (is_a($ret, 'PEAR_Error')) {
- echo 'Error: ' . $ret->getMessage() . "\n";
-} else {
- echo 'Quotient is ' . $ret . "\n";
-}
+$ret = $soapclient->divide(22,7);
+// print $soapclient->getWire();
+if (PEAR::isError($ret))
+ print("Error: " . $ret->getMessage() . "
\n");
+else
+ print("Quotient is " . $ret . "
\n");
-$ret = $soapclient->divide(22, 0);
-if (is_a($ret, 'PEAR_Error')) {
- echo 'Error: ' . $ret->getMessage() . "\n";
-} else {
- echo 'Quotient is ' . $ret . "\n";
-}
+$ret = $soapclient->divide(22,0);
+if (PEAR::isError($ret))
+ print("Error: " . $ret->getMessage() . "
\n");
+else
+ print("Quotient is " . $ret . "
\n");
-/* SOAPStruct is defined in the following file. */
-require_once './example_types.php';
-$struct = new SOAPStruct('test string', 123, 123.123);
-/* Tell the client to translate to classes we provide if possible.
- * You can explicitly set the translation for a specific class.
+// SOAPStruct is defined in the following file
+require_once 'example_types.php';
+
+$struct = new SOAPStruct('test string',123,123.123);
+
+/* Send an object, get an object back.
+ * Tell the client to translate to classes we provide if possible. */
+$soapclient->_auto_translation = true;
+/* Or you can explicitly set the translation for a specific class.
* auto_translation works for all cases, but opens ANY class in the script to
- * be used as a data type, and may not be desireable. Both can be used on
+ * be used as a data type, and may not be desireable. both can be used on
* client or server. */
-$soapclient->_auto_translation = true;
-
$soapclient->setTypeTranslation('{http://soapinterop.org/xsd}SOAPStruct',
'SOAPStruct');
$ret = $soapclient->echoStruct($struct->__to_soap());
-// echo $soapclient->getWire();
+//print $soapclient->getWire();
print_r($ret);
-/* PHP doesn't support multiple OUT parameters in function calls, so we must
+/**
+ * PHP doesn't support multiple OUT parameters in function calls, so we must
* do a little work to make it happen here. This requires knowledge on the
- * developers part to figure out how they want to deal with it. */
+ * developers part to figure out how they want to deal with it.
+ */
$ret = $soapclient->echoStructAsSimpleTypes($struct->__to_soap());
-if (is_a($ret, 'PEAR_Error')) {
- echo 'Error: ' . $ret->getMessage() . "\n";
+if (PEAR::isError($ret)) {
+ print("Error: " . $ret->getMessage() . "
\n");
} else {
list($string, $int, $float) = array_values($ret);
}
-echo "varString: $string\nvarInt: $int\nvarFloat: $float\n";
+echo "varString: $string
\nvarInt: $int
\nvarFloat: $float
\n";
+
+?>
Index: branches/version-2_11-dev/data/module/SOAP/example/email_gateway.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/example/email_gateway.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/example/email_gateway.php (revision 21410)
@@ -1,46 +1,48 @@
- * | /usr/bin/php /path/to/email_server.php
- *
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 2.02 of the PHP license,
- * that is bundled with this package in the file LICENSE, and is available at
- * through the world-wide-web at http://www.php.net/license/2_02.txt. If you
- * did not receive a copy of the PHP license and are unable to obtain it
- * through the world-wide-web, please send a note to license@php.net so we can
- * mail you a copy immediately.
- *
- * @category Web Services
- * @package SOAP
- * @author Shane Caraveo Port to PEAR and more
- * @author Jan Schneider Maintenance
- * @copyright 2003-2007 The PHP Group
- * @license http://www.php.net/license/2_02.txt PHP License 2.02
- * @link http://pear.php.net/package/SOAP
- */
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 4 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license, |
+// | that is bundled with this package in the file LICENSE, and is |
+// | available at through the world-wide-web at |
+// | http://www.php.net/license/2_02.txt. |
+// | If you did not receive a copy of the PHP license and are unable to |
+// | obtain it through the world-wide-web, please send a note to |
+// | license@php.net so we can mail you a copy immediately. |
+// +----------------------------------------------------------------------+
+// | Authors: Shane Caraveo Port to PEAR and more |
+// +----------------------------------------------------------------------+
+//
+// $Id: email_gateway.php,v 1.5 2005/03/10 23:16:40 yunosh Exp $
+//
-/* SOAP_Server_Email_Gateway */
+/*
+This reads a message from stdin, and passes the request to
+a soap server residing on a web server, sends the response
+out as an email
+
+You can use this from qmail by creating a .qmail-soapgateway file with:
+ | /usr/bin/php /path/to/email_server.php
+*/
+
+# include the email server class
require_once 'SOAP/Server/Email_Gateway.php';
-/* Read stdin. */
-$fin = fopen('php://stdin', 'rb');
-if (!$fin) {
- exit(1);
-}
+# read stdin
+$fin = fopen('php://stdin','rb');
+if (!$fin) exit(0);
$email = '';
while (!feof($fin) && $data = fread($fin, 8096)) {
- $email .= $data;
+ $email .= $data;
}
fclose($fin);
-/* Do it! */
+# doit!
$server = new SOAP_Server_Email_Gateway();
$server->service($data, 'http://localhost/soap/example/server.php');
+?>
Index: branches/version-2_11-dev/data/module/SOAP/example/tcp_server.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/example/tcp_server.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/example/tcp_server.php (revision 21410)
@@ -1,34 +1,35 @@
Port to PEAR and more
- * @author Jan Schneider Maintenance
- * @copyright 2003-2007 The PHP Group
- * @license http://www.php.net/license/2_02.txt PHP License 2.02
- * @link http://pear.php.net/package/SOAP
- */
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 4 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license, |
+// | that is bundled with this package in the file LICENSE, and is |
+// | available at through the world-wide-web at |
+// | http://www.php.net/license/2_02.txt. |
+// | If you did not receive a copy of the PHP license and are unable to |
+// | obtain it through the world-wide-web, please send a note to |
+// | license@php.net so we can mail you a copy immediately. |
+// +----------------------------------------------------------------------+
+// | Authors: Shane Caraveo |
+// +----------------------------------------------------------------------+
+//
+// $Id: tcp_server.php,v 1.4 2005/03/10 23:16:40 yunosh Exp $
+//
-/* First, include the SOAP_Server_TCP class. */
+// first, include the SOAP/Server class
+require_once 'SOAP/Server/TCP.php';
set_time_limit(0);
-require_once 'SOAP/Server/TCP.php';
-$server = new SOAP_Server_TCP('127.0.0.1', 82);
-/* Tell the server to translate to classes we provide if possible. */
+$server = new SOAP_Server_TCP("127.0.0.1",82);
+/* tell server to translate to classes we provide if possible */
$server->_auto_translation = true;
-require_once dirname(__FILE__) . '/example_server.php';
+require_once 'example_server.php';
+
$soapclass = new SOAP_Example_Server();
-$server->addObjectMap($soapclass, 'urn:SOAP_Example_Server');
+$server->addObjectMap($soapclass,'urn:SOAP_Example_Server');
$server->run();
+?>
Index: branches/version-2_11-dev/data/module/SOAP/example/com_client.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/example/com_client.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/example/com_client.php (revision 21410)
@@ -1,28 +1,24 @@
Port to PEAR and more
- * @author Jan Schneider Maintenance
- * @copyright 2003-2007 The PHP Group
- * @license http://www.php.net/license/2_02.txt PHP License 2.02
- * @link http://pear.php.net/package/SOAP
- */
-
-/** SOAPStruct */
-require_once './example_types.php';
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 4 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license, |
+// | that is bundled with this package in the file LICENSE, and is |
+// | available at through the world-wide-web at |
+// | http://www.php.net/license/2_02.txt. |
+// | If you did not receive a copy of the PHP license and are unable to |
+// | obtain it through the world-wide-web, please send a note to |
+// | license@php.net so we can mail you a copy immediately. |
+// +----------------------------------------------------------------------+
+// | Authors: Shane Caraveo |
+// +----------------------------------------------------------------------+
+//
+// $Id: com_client.php,v 1.3 2005/03/10 23:16:40 yunosh Exp $
+//
+// SOAPStruct is defined in the following file
+require_once 'example_types.php';
/* just a simple example of using MS SOAP on win32 as a client
Index: branches/version-2_11-dev/data/module/SOAP/example/email_server.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/example/email_server.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/example/email_server.php (revision 21410)
@@ -1,53 +1,56 @@
- * | /usr/bin/php /path/to/email_server.php
- *
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 2.02 of the PHP license,
- * that is bundled with this package in the file LICENSE, and is available at
- * through the world-wide-web at http://www.php.net/license/2_02.txt. If you
- * did not receive a copy of the PHP license and are unable to obtain it
- * through the world-wide-web, please send a note to license@php.net so we can
- * mail you a copy immediately.
- *
- * @category Web Services
- * @package SOAP
- * @author Shane Caraveo Port to PEAR and more
- * @author Jan Schneider Maintenance
- * @copyright 2003-2007 The PHP Group
- * @license http://www.php.net/license/2_02.txt PHP License 2.02
- * @link http://pear.php.net/package/SOAP
- */
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 4 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license, |
+// | that is bundled with this package in the file LICENSE, and is |
+// | available at through the world-wide-web at |
+// | http://www.php.net/license/2_02.txt. |
+// | If you did not receive a copy of the PHP license and are unable to |
+// | obtain it through the world-wide-web, please send a note to |
+// | license@php.net so we can mail you a copy immediately. |
+// +----------------------------------------------------------------------+
+// | Authors: Shane Caraveo Port to PEAR and more |
+// +----------------------------------------------------------------------+
+//
+// $Id: email_server.php,v 1.5 2005/03/10 23:16:40 yunosh Exp $
+//
-/* SOAP_Server_Email */
+/*
+This reads a message from stdin, and calls the soap server defined
+
+You can use this from qmail by creating a .qmail-soaptest file with:
+ | /usr/bin/php /path/to/email_server.php
+*/
+
+# include the email server class
require_once 'SOAP/Server/Email.php';
+
$server = new SOAP_Server_Email;
-/* Tell the server to translate to classes we provide if possible. */
+/* tell server to translate to classes we provide if possible */
$server->_auto_translation = true;
-require_once './example_server.php';
+require_once 'example_server.php';
+
$soapclass = new SOAP_Example_Server();
$server->addObjectMap($soapclass,'urn:SOAP_Example_Server');
-/* Read stdin. */
-$fin = fopen('php://stdin', 'rb');
-if (!$fin) {
- exit(1);
-}
+# read stdin
+$fin = fopen('php://stdin','rb');
+if (!$fin) exit(0);
$email = '';
while (!feof($fin) && $data = fread($fin, 8096)) {
- $email .= $data;
+ $email .= $data;
}
fclose($fin);
-/* Do it! */
+# doit!
$server->service($email);
+
+?>
Index: branches/version-2_11-dev/data/module/SOAP/example/client.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/example/client.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/example/client.php (revision 21410)
@@ -16,77 +16,57 @@
* @package SOAP
* @author Shane Caraveo Port to PEAR and more
- * @author Jan Schneider Maintenance
- * @copyright 2003-2007 The PHP Group
+ * @copyright 2003-2005 The PHP Group
* @license http://www.php.net/license/2_02.txt PHP License 2.02
* @link http://pear.php.net/package/SOAP
*/
-/** SOAP_Client */
require 'SOAP/Client.php';
-/* This client runs against the example server in SOAP/example/server.php. It
+/**
+ * This client runs against the example server in SOAP/example/server.php. It
* does not use WSDL to run these requests, but that can be changed easily by
- * simply adding '?wsdl' to the end of the url. */
+ * simply adding '?wsdl' to the end of the url.
+ */
$soapclient = new SOAP_Client('http://localhost/SOAP/example/server.php');
+// This namespace is the same as declared in server.php.
+$options = array('namespace' => 'urn:SOAP_Example_Server',
+ 'trace' => true);
-/* Set a few options. */
-$options = array();
+$ret = $soapclient->call('echoStringSimple',
+ $params = array('inputStringSimple' => 'this is a test string'),
+ $options);
+// print $soapclient->getWire();
+print_r($ret);
+echo "
\n";
-/* This namespace is the same as declared in server.php. */
-$options['namespace'] = 'urn:SOAP_Example_Server';
+$ret = $soapclient->call('echoString',
+ $params = array('inputString' => 'this is a test string'),
+ $options);
+print_r($ret);
+echo "
\n";
-/* Trace the communication for debugging purposes, so we can later inspect the
- * data with getWire(). */
-$options['trace'] = true;
+$ret = $soapclient->call('divide',
+ $params = array('dividend' => 22, 'divisor' => 7),
+ $options);
+// print $soapclient->getWire();
+if (PEAR::isError($ret)) {
+ echo 'Error: ' . $ret->getMessage() . "
\n";
+} else {
+ echo 'Quotient is ' . $ret . "
\n";
+}
-/* Uncomment the following lines if you want to use Basic HTTP
- * Authentication. */
-// $options['user'] = 'username';
-// $options['pass'] = 'password';
+$ret = $soapclient->call('divide',
+ $params = array('dividend' => 22, 'divisor' => 0),
+ $options);
+if (PEAR::isError($ret)) {
+ echo 'Error: ' . $ret->getMessage() . "
\n";
+} else {
+ echo 'Quotient is ' . $ret . "
\n";
+}
-header('Content-Type: text/plain');
-/* Calling echoStringSimple. */
-$ret = $soapclient->call('echoStringSimple',
- array('inputStringSimple' => 'this is a test string'),
- $options);
-// echo $soapclient->getWire();
-print_r($ret);
-echo "\n";
+// SOAPStruct is defined in the following file.
+require_once 'example_types.php';
-/* Calling echoString. */
-$ret = $soapclient->call('echoString',
- array('inputString' => 'this is a test string'),
- $options);
-// echo $soapclient->getWire();
-print_r($ret);
-echo "\n";
-
-/* Calling divide with valid parameters. */
-$ret = $soapclient->call('divide',
- array('dividend' => 22, 'divisor' => 7),
- $options);
-// echo $soapclient->getWire();
-if (PEAR::isError($ret)) {
- echo 'Error: ' . $ret->getMessage();
-} else {
- echo 'Quotient is ' . $ret;
-}
-echo "\n";
-
-/* Calling divide with invalid parameters. */
-$ret = $soapclient->call('divide',
- array('dividend' => 22, 'divisor' => 0),
- $options);
-// echo $soapclient->getWire();
-if (PEAR::isError($ret)) {
- echo 'Error: ' . $ret->getMessage();
-} else {
- echo 'Quotient is ' . $ret;
-}
-echo "\n";
-
-/* The SOAPStruct class is defined in example_types.php. */
-require_once 'example_types.php';
$struct = new SOAPStruct('test string', 123, 123.123);
@@ -94,5 +74,4 @@
* we provide if possible. */
$soapclient->_auto_translation = true;
-
/* You can explicitly set the translation for a specific
* class. auto_translation works for all cases, but opens ANY class in the
@@ -101,37 +80,22 @@
$soapclient->setTypeTranslation('{http://soapinterop.org/xsd}SOAPStruct',
'SOAPStruct');
-
-/* Calling echoStruct. */
$ret = $soapclient->call('echoStruct',
- array('inputStruct' => $struct->__to_soap()),
+ $p = array('inputStruct' => $struct->__to_soap()),
$options);
-// echo $soapclient->getWire();
+// print $soapclient->getWire();
print_r($ret);
-/* Calling echoStructAsSimpleTypes.
- * PHP doesn't support multiple return values in function calls, so we must do
- * a little work to make it happen here, for example returning an array
- * instead. This requires knowledge on the developers part to figure out how
- * they want to deal with it. */
+/**
+ * PHP doesn't support multiple OUT parameters in function calls, so we must
+ * do a little work to make it happen here. This requires knowledge on the
+ * developers part to figure out how they want to deal with it.
+ */
$ret = $soapclient->call('echoStructAsSimpleTypes',
- array('inputStruct' => $struct->__to_soap()),
+ $p = array('inputStruct' => $struct->__to_soap()),
$options);
-// echo $soapclient->getWire();
if (PEAR::isError($ret)) {
- echo 'Error: ' . $ret->getMessage();
+ echo 'Error: ' . $ret->getMessage() . "
\n";
} else {
list($string, $int, $float) = array_values($ret);
- echo "varString: $string\nvarInt: $int\nvarFloat: $float";
+ echo "varString: $string
\nvarInt: $int
\nvarFloat: $float
\n";
}
-echo "\n";
-
-/* Calling echoMimeAttachment.
- * We want to use MIME encoding here, the default is to use DIME encoding. */
-$options['attachments'] = 'Mime';
-$attachment = new SOAP_Attachment('attachment', 'text/plain', null,
- 'This is a MIME attachment');
-$ret = $soapclient->call('echoMimeAttachment',
- array($attachment),
- $options);
-// echo $soapclient->getWire();
-print_r($ret);
Index: branches/version-2_11-dev/data/module/SOAP/example/example_types.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/example/example_types.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/example/example_types.php (revision 21410)
@@ -11,7 +11,4 @@
* it from your soap server class, echoStruct in the server class is an
* example of doing this.
- *
- * @category Web Services
- * @package SOAP
*/
class SOAPStruct
@@ -33,23 +30,15 @@
$actor = 'http://schemas.xmlsoap.org/soap/actor/next')
{
- $inner = array(
- new SOAP_Value('varString', 'string', $this->varString),
- new SOAP_Value('varInt', 'int', $this->varInt),
- new SOAP_Value('varFloat', 'float', $this->varFloat));
+ $inner[] = new SOAP_Value('varString', 'string', $this->varString);
+ $inner[] = new SOAP_Value('varInt', 'int', $this->varInt);
+ $inner[] = new SOAP_Value('varFloat', 'float', $this->varFloat);
if ($header) {
- $value = new SOAP_Header($name,
- '{http://soapinterop.org/xsd}SOAPStruct',
- $inner,
- $mustUnderstand,
- $actor);
+ $value = new SOAP_Header($name,'{http://soapinterop.org/xsd}SOAPStruct',$inner,$mustUnderstand,$actor);
} else {
- $value = new SOAP_Value($name,
- '{http://soapinterop.org/xsd}SOAPStruct',
- $inner);
+ $value = new SOAP_Value($name,'{http://soapinterop.org/xsd}SOAPStruct',$inner);
}
return $value;
}
-
}
Index: branches/version-2_11-dev/data/module/SOAP/example/example_server.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/example/example_server.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/example/example_server.php (revision 21410)
@@ -1,116 +1,123 @@
Port to PEAR and more
- * @author Jan Schneider Maintenance
- * @copyright 2003-2007 The PHP Group
- * @license http://www.php.net/license/2_02.txt PHP License 2.02
- * @link http://pear.php.net/package/SOAP
- */
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 4 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license, |
+// | that is bundled with this package in the file LICENSE, and is |
+// | available at through the world-wide-web at |
+// | http://www.php.net/license/2_02.txt. |
+// | If you did not receive a copy of the PHP license and are unable to |
+// | obtain it through the world-wide-web, please send a note to |
+// | license@php.net so we can mail you a copy immediately. |
+// +----------------------------------------------------------------------+
+// | Authors: Shane Caraveo |
+// +----------------------------------------------------------------------+
+//
+// $Id: example_server.php,v 1.6 2007/01/22 11:51:45 yunosh Exp $
+//
-/** SOAP_Value */
+// first, include the SOAP/Server class
require_once 'SOAP/Value.php';
require_once 'SOAP/Fault.php';
-/** SOAPStruct */
-require_once dirname(__FILE__) . '/example_types.php';
+// SOAPStruct is defined in the following file
+require_once 'example_types.php';
-/* Create a class for your SOAP functions. */
+// create a class for your soap functions
class SOAP_Example_Server {
- /* The dispatch map does not need to be used, but aids the server class in
- * knowing what parameters are used with the functions. This is the ONLY
- * way to have multiple OUT parameters. If you use a dispatch map, you
- * MUST add ALL functions you wish to allow be called. If you do not use
- * a dispatch map, then any public function can be called from SOAP. We
- * consider this to be any function in the class unless it starts with
- * underscore. If you do not define in/out parameters, the function can
- * be called with parameters, but no validation on parameters will
- * occur. */
+ /**
+ * The dispactch map does not need to be used, but aids
+ * the server class in knowing what parameters are used
+ * with the functions. This is the ONLY way to have
+ * multiple OUT parameters. If you use a dispatch map, you
+ * MUST add ALL functions you wish to allow be called. If
+ * you do not use a dispatch map, then any public function
+ * can be called from soap (in php4, we consider this to be
+ * any function in the class unless it starts with underscore,
+ * php5 support is not complete yet in this regard).
+ * if you do not define in/out parameters, the function can be
+ * called with parameters, but no validation on parameters will
+ * occure.
+ */
var $__dispatch_map = array();
function SOAP_Example_Server() {
- /* When generating WSDL for a server, you have to define any special
- * complex types that you use (ie classes). Using a namespace id
- * before the type will create an XML schema with the targetNamespace
- * for the type multiple types with the same namespace will appear in
- * the same schema section. Types with different namespaces will be
- * in seperate schema sections. The following SOAPStruct typedef
- * cooresponds to the SOAPStruct class above. */
- $this->__typedef['{http://soapinterop.org/xsd}SOAPStruct'] =
- array('varString' => 'string',
- 'varInt' => 'int',
- 'varFloat' => 'float');
+ /**
+ * when generating wsdl for a server, you have to define
+ * any special complex types that you use (ie classes).
+ * using a namespace id before the type will create an
+ * xml schema with the targetNamespace for the type
+ * multiple types with the same namespace will appear
+ * in the same schema section. types with different
+ * namespaces will be in seperate schema sections.
+ * the following SOAPStruct typedef cooresponds to the
+ * SOAPStruct class above.
+ */
+ $this->__typedef['{http://soapinterop.org/xsd}SOAPStruct'] =
+ array(
+ 'varString' => 'string',
+ 'varInt' => 'int',
+ 'varFloat' => 'float'
+ );
- /* An aliased function with multiple out parameters. */
- $this->__dispatch_map['echoStructAsSimpleTypes'] =
- array('in' => array('inputStruct' => '{http://soapinterop.org/xsd}SOAPStruct'),
- 'out' => array('outputString' => 'string',
- 'outputInteger' => 'int',
- 'outputFloat' => 'float'),
- 'alias' => 'myEchoStructAsSimpleTypes');
- $this->__dispatch_map['echoStringSimple'] =
- array('in' => array('inputStringSimple' => 'string'),
- 'out' => array('outputStringSimple' => 'string'));
- $this->__dispatch_map['echoString'] =
- array('in' => array('inputString' => 'string'),
- 'out' => array('outputString' => 'string'));
- $this->__dispatch_map['divide'] =
- array('in' => array('dividend' => 'int',
- 'divisor' => 'int'),
- 'out' => array('outputFloat' => 'float'));
- $this->__dispatch_map['echoStruct'] =
- array('in' => array('inputStruct' => '{http://soapinterop.org/xsd}SOAPStruct'),
- 'out' => array('outputStruct' => '{http://soapinterop.org/xsd}SOAPStruct'));
-
- $this->__dispatch_map['echoMimeAttachment'] =
- array('in' => array('stuff' => 'string'),
- 'out' => array('outputMime' => 'string'));
+ // an aliased function with multiple out parameters
+ $this->__dispatch_map['echoStructAsSimpleTypes'] =
+ array('in' => array('inputStruct' => '{http://soapinterop.org/xsd}SOAPStruct'),
+ 'out' => array('outputString' => 'string', 'outputInteger' => 'int', 'outputFloat' => 'float'),
+ 'alias' => 'myEchoStructAsSimpleTypes'
+ );
+ $this->__dispatch_map['echoStringSimple'] =
+ array('in' => array('inputStringSimple' => 'string'),
+ 'out' => array('outputStringSimple' => 'string'),
+ );
+ $this->__dispatch_map['echoString'] =
+ array('in' => array('inputString' => 'string'),
+ 'out' => array('outputString' => 'string'),
+ );
+ $this->__dispatch_map['divide'] =
+ array('in' => array('dividend' => 'int', 'divisor' => 'int'),
+ 'out' => array('outputFloat' => 'float'),
+ );
+ $this->__dispatch_map['echoStruct'] =
+ array('in' => array('inputStruct' => '{http://soapinterop.org/xsd}SOAPStruct'),
+ 'out' => array('outputStruct' => '{http://soapinterop.org/xsd}SOAPStruct'),
+ );
+
+ $this->__dispatch_map['echoMimeAttachment'] = array();
}
- /* This private function is called on by SOAP_Server to determine any
- * special dispatch information that might be necessary. This, for
- * example, can be used to set up a dispatch map for functions that return
- * multiple OUT parameters. */
- function __dispatch($methodname)
- {
- if (isset($this->__dispatch_map[$methodname])) {
+ /* this private function is called on by SOAP_Server to determine any
+ special dispatch information that might be necessary. This, for example,
+ can be used to set up a dispatch map for functions that return multiple
+ OUT parameters */
+ function __dispatch($methodname) {
+ if (isset($this->__dispatch_map[$methodname]))
return $this->__dispatch_map[$methodname];
- }
- return null;
+ return NULL;
}
- /* A simple echoString function. */
+ // a simple echoString function
function echoStringSimple($inputString)
{
- return $inputString;
+ return $inputString;
}
-
- /* An explicit echoString function. */
+
+ // an explicit echostring function
function echoString($inputString)
{
- return new SOAP_Value('outputString', 'string', $inputString);
+ return new SOAP_Value('outputString','string',$inputString);
}
function divide($dividend, $divisor)
{
- /* The SOAP server would normally catch errors like this and return a
- * fault, but this is how you do it yourself. */
- if ($divisor == 0) {
+ // the soap server would normally catch errors like this
+ // and return a fault, but this is how you do it yourself.
+ if ($divisor == 0)
return new SOAP_Fault('You cannot divide by zero', 'Client');
- } else {
+ else
return $dividend / $divisor;
- }
}
@@ -119,37 +126,36 @@
return $inputStruct->__to_soap('outputStruct');
}
-
+
/**
- * Takes a SOAPStruct as input, and returns each of its elements as OUT
- * parameters.
+ * echoStructAsSimpleTypes
+ * takes a SOAPStruct as input, and returns each of its elements
+ * as OUT parameters
*
- * This function is also aliased so you have to call it as
- * echoStructAsSimpleTypes.
+ * this function is also aliased so you have to call it with
+ * echoStructAsSimpleTypes
*
* SOAPStruct is defined as:
- *
+ *
* struct SOAPStruct:
* string varString
* integer varInt
* float varFloat
- *
+ *
*/
function myEchoStructAsSimpleTypes($struct)
{
- /* Convert a SOAPStruct to an array. */
- return array(
- new SOAP_Value('outputString', 'string', $struct->varString),
- new SOAP_Value('outputInteger', 'int', $struct->varInt),
- new SOAP_Value('outputFloat', 'float', $struct->varFloat)
+ # convert a SOAPStruct to an array
+ return array(
+ new SOAP_Value('outputString','string',$struct->varString),
+ new SOAP_Value('outputInteger','int',$struct->varInt),
+ new SOAP_Value('outputFloat','float',$struct->varFloat)
);
}
-
+
function echoMimeAttachment($stuff)
{
- return new SOAP_Attachment('return',
- 'application/octet-stream',
- null,
- $stuff);
- }
+ return new SOAP_Attachment('return','application/octet-stream',NULL,$stuff);
+ }
+}
-}
+?>
Index: branches/version-2_11-dev/data/module/SOAP/example/smtp.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/example/smtp.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/example/smtp.php (revision 21410)
@@ -1,40 +1,32 @@
Port to PEAR and more
- * @author Jan Schneider Maintenance
- * @copyright 2003-2007 The PHP Group
- * @license http://www.php.net/license/2_02.txt PHP License 2.02
- * @link http://pear.php.net/package/SOAP
- */
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 4 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license, |
+// | that is bundled with this package in the file LICENSE, and is |
+// | available at through the world-wide-web at |
+// | http://www.php.net/license/2_02.txt. |
+// | If you did not receive a copy of the PHP license and are unable to |
+// | obtain it through the world-wide-web, please send a note to |
+// | license@php.net so we can mail you a copy immediately. |
+// +----------------------------------------------------------------------+
+// | Authors: Shane Caraveo |
+// +----------------------------------------------------------------------+
+//
+// $Id: smtp.php,v 1.5 2005/03/10 23:16:40 yunosh Exp $
+//
+// include soap client class
+include("SOAP/Client.php");
-/* Include SOAP_Client class. */
-require_once 'SOAP/Client.php';
-$soapclient = new SOAP_Client('mailto:user@domain.com');
+$soapclient = new SOAP_Client("mailto:user@domain.com");
+$options = array('namespace'=>'http://soapinterop.org/','from'=>'user@domain.com','host'=>'localhost');
+$return = $soapclient->call("echoString",array("inputString"=>"this is a test"), $options);
+$return = $soapclient->call("echoStringArray",array('inputStringArray' => array('good','bad','ugly')), $options);
+// don't expect much of a result!
+print_r($return);
+print "
\n".$soapclient->wire;
+?>
-$options = array('namespace' => 'http://soapinterop.org/',
- 'from' => 'user@domain.com',
- 'host' => 'localhost');
-$return = $soapclient->call('echoString',
- array('inputString' => 'this is a test'),
- $options);
-$return = $soapclient->call('echoStringArray',
- array('inputStringArray' => array('good', 'bad', 'ugly')),
- $options);
-
-/* Don't expect much of a result! */
-print_r($return);
-echo $soapclient->wire;
-
Index: branches/version-2_11-dev/data/module/SOAP/example/tcp_client.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/example/tcp_client.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/example/tcp_client.php (revision 21410)
@@ -1,41 +1,42 @@
Port to PEAR and more
- * @author Jan Schneider Maintenance
- * @copyright 2003-2007 The PHP Group
- * @license http://www.php.net/license/2_02.txt PHP License 2.02
- * @link http://pear.php.net/package/SOAP
- */
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 4 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license, |
+// | that is bundled with this package in the file LICENSE, and is |
+// | available at through the world-wide-web at |
+// | http://www.php.net/license/2_02.txt. |
+// | If you did not receive a copy of the PHP license and are unable to |
+// | obtain it through the world-wide-web, please send a note to |
+// | license@php.net so we can mail you a copy immediately. |
+// +----------------------------------------------------------------------+
+// | Authors: Shane Hanna |
+// +----------------------------------------------------------------------+
+//
+// $Id: tcp_client.php,v 1.5 2007/01/22 11:33:27 yunosh Exp $
+//
-require_once 'SOAP/Client.php';
+require_once('SOAP/Client.php');
-/* Client. */
-$soapclient = new SOAP_Client('tcp://127.0.0.1:82');
+// client
+$soapclient = new SOAP_Client("tcp://127.0.0.1:82");
-/* Namespace. */
+// namespace
$options = array('namespace' => 'urn:SOAP_Example_Server', 'trace' => true);
-/* One. */
-$params = array('string' => 'this is string 1');
-$ret1 = $soapclient->call('echoString', $params, $options);
-echo "WIRE: \n" . $soapclient->getWire();
+// one
+$params = array("string" => "this is string 1");
+$ret1 = $soapclient->call("echoString", $params, $options);
+// echo "WIRE: \n".$soapclient->getWire();
print_r($ret1);
+echo "
\n";
-/* Two. */
-$params = array('string' => 'this is string 2');
-$ret2 = $soapclient->call('echoString', $params, $options);
-echo "WIRE: \n" . $soapclient->getWire();
+// two
+$params = array("string" => "this is string 2");
+$ret2 = $soapclient->call("echoString", $params, $options);
+// echo "WIRE: \n".$soapclient->getWire();
print_r($ret2);
+echo "
\n";
Index: branches/version-2_11-dev/data/module/SOAP/example/email_client.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/example/email_client.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/example/email_client.php (revision 21410)
@@ -1,46 +1,50 @@
- * | /usr/bin/php /path/to/email_server.php
- *
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 2.02 of the PHP license,
- * that is bundled with this package in the file LICENSE, and is available at
- * through the world-wide-web at http://www.php.net/license/2_02.txt. If you
- * did not receive a copy of the PHP license and are unable to obtain it
- * through the world-wide-web, please send a note to license@php.net so we can
- * mail you a copy immediately.
- *
- * @category Web Services
- * @package SOAP
- * @author Shane Caraveo Port to PEAR and more
- * @author Jan Schneider Maintenance
- * @copyright 2003-2007 The PHP Group
- * @license http://www.php.net/license/2_02.txt PHP License 2.02
- * @link http://pear.php.net/package/SOAP
- */
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 4 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license, |
+// | that is bundled with this package in the file LICENSE, and is |
+// | available at through the world-wide-web at |
+// | http://www.php.net/license/2_02.txt. |
+// | If you did not receive a copy of the PHP license and are unable to |
+// | obtain it through the world-wide-web, please send a note to |
+// | license@php.net so we can mail you a copy immediately. |
+// +----------------------------------------------------------------------+
+// | Authors: Shane Caraveo Port to PEAR and more |
+// +----------------------------------------------------------------------+
+//
+// $Id: email_client.php,v 1.4 2005/03/10 23:16:40 yunosh Exp $
+//
-/** SOAP_Server_Email */
+/*
+This reads a message from stdin, and calls the soap server defined
+
+You can use this from qmail by creating a .qmail-soaptest file with:
+ | /usr/bin/php /path/to/email_server.php
+*/
+
+# include the email server class
require_once 'SOAP/Server/Email.php';
+
$server = new SOAP_Server_Email;
-/* Read stdin. */
-$fin = fopen('php://stdin', 'rb');
-if (!$fin) {
- exit(1);
-}
+# read stdin
+$fin = fopen('php://stdin','rb');
+if (!$fin) exit(0);
$email = '';
while (!feof($fin) && $data = fread($fin, 8096)) {
- $email .= $data;
+ $email .= $data;
}
fclose($fin);
+
$response = $server->client($email);
print_r($response);
+
+?>
Index: branches/version-2_11-dev/data/module/SOAP/example/email_pop_gateway.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/example/email_pop_gateway.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/example/email_pop_gateway.php (revision 21410)
@@ -1,61 +1,70 @@
Port to PEAR and more
- * @author Jan Schneider Maintenance
- * @copyright 2003-2007 The PHP Group
- * @license http://www.php.net/license/2_02.txt PHP License 2.02
- * @link http://pear.php.net/package/SOAP
- */
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 4 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license, |
+// | that is bundled with this package in the file LICENSE, and is |
+// | available at through the world-wide-web at |
+// | http://www.php.net/license/2_02.txt. |
+// | If you did not receive a copy of the PHP license and are unable to |
+// | obtain it through the world-wide-web, please send a note to |
+// | license@php.net so we can mail you a copy immediately. |
+// +----------------------------------------------------------------------+
+// | Authors: Shane Caraveo Port to PEAR and more |
+// +----------------------------------------------------------------------+
+//
+// $Id: email_pop_gateway.php,v 1.6 2005/03/10 23:16:40 yunosh Exp $
+//
-/* SOAP_Server_Email_Gateway */
+/* include the Email server class, which knows how to
+ parse a standard email as a soap message */
+
require_once 'SOAP/Server/Email_Gateway.php';
-/* Include a class to access POP3. */
+/* include a class to access POP3 */
+
require_once 'Net/POP3.php';
-/* Create the SOAP Server object. */
+/* create the SOAP Server object */
+
$server = new SOAP_Server_Email_Gateway('http://localhost/soap_interop/server_round2.php');
-/* Tell the server to translate to classes we provide if possible. */
+/* tell server to translate to classes we provide if possible */
$server->_auto_translation = true;
-require_once './example_server.php';
+require_once 'example_server.php';
+
$soapclass = new SOAP_Example_Server();
$server->addObjectMap($soapclass,'urn:SOAP_Example_Server');
-/* Connect to a POP3 server and read the messages. */
-$pop3 = new Net_POP3();
+
+/* Connect to a POP3 server and read the messages */
+
+$pop3 =& new Net_POP3();
if ($pop3->connect('localhost', 110)) {
if ($pop3->login('username', 'password')) {
$listing = $pop3->getListing();
- /* Now loop through each message, and call the SOAP server with that
- * message. */
+ /* now loop through each message, and call the
+ SOAP server with that message */
+
foreach ($listing as $msg) {
+
$email = $pop3->getMsg($msg['msg_id']);
- /* This is where we actually handle the SOAP response. The
- * SOAP::Server::Email class we are using will send the SOAP
- * response to the sender via email. */
- if ($email) {
- $server->service($email);
- }
+ /* this is where we actually handle the SOAP
+ response. The SOAP::Server::Email class we
+ are using will send the SOAP response to
+ the sender via email. */
- // $pop3->deleteMsg($msg['msg_id']);
+ if ($email) $server->service($email);
+
+ #$pop3->deleteMsg($msg['msg_id']);
}
}
$pop3->disconnect();
}
+?>
Index: branches/version-2_11-dev/data/module/SOAP/example/disco_server.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/example/disco_server.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/example/disco_server.php (revision 21410)
@@ -1,204 +1,238 @@
Port to PEAR and more
- * @author Jan Schneider Maintenance
- * @copyright 2003-2007 The PHP Group
- * @license http://www.php.net/license/2_02.txt PHP License 2.02
- * @link http://pear.php.net/package/SOAP
- */
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 4 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license, |
+// | that is bundled with this package in the file LICENSE, and is |
+// | available at through the world-wide-web at |
+// | http://www.php.net/license/2_02.txt. |
+// | If you did not receive a copy of the PHP license and are unable to |
+// | obtain it through the world-wide-web, please send a note to |
+// | license@php.net so we can mail you a copy immediately. |
+// +----------------------------------------------------------------------+
+// | Author: Dmitri Vinogradov |
+// +----------------------------------------------------------------------+
+//
+// $Id: disco_server.php,v 1.6 2006/12/27 10:50:39 arnaud Exp $
+
+/*
+ This example shows how to mark up a server object so that
+ wsdl files may be dynamicaly generated by the soap
+ server. This also provides access to a generated DISCO document.
+ The fact that this example has an MP3 class is in no way
+ related to DISCO. ;)
+
+ DISCO: http://msdn.microsoft.com/msdnmag/issues/02/02/xml/default.aspx
+
+ A url accessing this server would look like:
+
+ http://localhost/disco_server.php?wsdl (generate WSDL file)
+ http://localhost/disco_server.php (GET request generates DISCO)
+ http://localhost/disco_server.php (POST for normal soap requests)
+*/
error_reporting(E_ALL);
-
-/** SOAP_Server */
require_once 'SOAP/Server.php';
-/**
- * MP3 database class.
- *
- * @package SOAP
- */
-class MP3DB_Class
-{
-
+class MP3DB_Class {
var $__dispatch_map = array();
- var $__typedef = array();
-
- function MP3DB_Class()
- {
- /* The only way to describe all methods in WSDL (messages,
- * PortType-operations and bindings) is to use __dispatch_map to
- * describe every method (even methods using simple data types in 'in'
- * and 'out' parameters...) */
+ var $__typedef = array();
+
+ function MP3DB_Class () {
+ /**
+ * the only way to describe all methods in WSDL (messages,
+ * PortType-operations and bindings) is to use __dispatch_map
+ * to describe every method (even methods using simple data
+ * types in 'in' and 'out' parameters...)
+ */
+
$this->__dispatch_map['SayHallo'] =
- array('in' => array('input' => 'string'),
- 'out' => array('return' => 'string'));
+ array(
+ 'in' => array('input' => 'string'),
+ 'out' => array('return' => 'string')
+ );
+
$this->__dispatch_map['SayThisNTimes'] =
- array('in' => array('SayThis'=>'string','NTimes' => 'int'),
- 'out' => array('return' => '{urn:MP3DB}ArrayOfStrings'));
+ array(
+ 'in' => array('SayThis'=>'string','NTimes' => 'int'),
+ 'out' => array('return' => '{urn:MP3DB}ArrayOfStrings')
+ );
+
$this->__dispatch_map['GetMP3Tracks'] =
- array('in' => array('query' => 'string'),
- 'out' => array('return' => '{urn:MP3DB}GetMP3TracksResult'));
+ array(
+ 'in' => array('query' => 'string'),
+ 'out' => array('return' => '{urn:MP3DB}GetMP3TracksResult')
+ );
+
$this->__dispatch_map['AddMP3Track'] =
- array('in' => array('MP3Track' => '{urn:MP3DB}MP3Track'),
- 'out' => array('return' => '{urn:MP3DB}AddMP3TrackResult'));
-
- /* Use __typedef to describe userdefined Types in WSDL. Structs and
- * one-dimensional arrays are supported.
- *
- * Struct example:
- * $this->__typedef['TypeName'] = array('VarName' => 'xsdType', ... );
- * or
- * $this->__typedef['TypeName'] = array('VarName' => '{namespace}SomeOtherType');
- *
- * Array example:
- * $this->__typedef['TypeName'] = array(array('item' => 'xsdType'));
- * or
- * $this->__typedef['TypeName'] = array(array('item' => '{namespace}SomeOtherType'));
- */
-
- /* Struct 'MP3Track'. */
- $this->__typedef['MP3Track'] =
- array('Title' => 'string',
- 'Artist' => 'string',
- 'Album' => 'string',
- 'Year' => 'int',
- 'Genre' => 'int',
- 'Comment' => 'string',
- 'Composer' => 'string',
- 'Orig_Artist' => 'string',
- 'URL' => 'string',
- 'Encoded_by' => 'string');
-
- /* MP3TracksArray - array of 'MP3Track' structs. */
- $this->__typedef['MP3TracksArray'] =
- array(array('item' => '{urn:MP3DB}MP3Track'));
-
- /* Struct 'MethodDebug'. */
- $this->__typedef['MethodDebug'] =
- array('rc' => 'boolean',
- 'ErrNo' => 'int',
- 'Error' => 'string');
-
- /* Return Struct of method GetMP3Tracks. */
- $this->__typedef['GetMP3TracksResult'] =
- array('MethodDebug' => '{urn:MP3DB}MethodDebug',
- 'MP3Tracks' => '{urn:MP3DB}MP3TracksArray');
-
- /* Return Struct of method AddMP3Track. */
- $this->__typedef['AddMP3TrackResult'] =
- array('MethodDebug' => '{urn:MP3DB}MethodDebug');
-
- /* Array of strings. */
- $this->__typedef['ArrayOfStrings'] =
- array(array('item'=>'string'));
- }
-
- function SayHallo($name)
- {
- return 'Hello, ' . $name;
- }
-
-
- function SayThisNTimes($SayThis, $NTimes)
- {
+ array(
+ 'in' => array('MP3Track' => '{urn:MP3DB}MP3Track'),
+ 'out' => array('return' => '{urn:MP3DB}AddMP3TrackResult')
+ );
+
+ /**
+ * I use __typedef to describe userdefined Types in WSDL.
+ * Structs and one-dimensional arrays are supported:
+ * Struct example: $this->__typedef['TypeName'] = array('VarName' => 'xsdType', ... );
+ * or $this->__typedef['TypeName'] = array('VarName' => '{namespace}SomeOtherType');
+ * Array example: $this->__typedef['TypeName'] = array(array('item' => 'xsdType'));
+ * or $this->__typedef['TypeName'] = array(array('item' => '{namespace}SomeOtherType'));
+ */
+
+ /**
+ * Struct 'MP3Track'
+ */
+ $this->__typedef['MP3Track'] =
+ array(
+ 'Title' => 'string',
+ 'Artist' => 'string',
+ 'Album' => 'string',
+ 'Year' => 'int',
+ 'Genre' => 'int',
+ 'Comment' => 'string',
+ 'Composer' => 'string',
+ 'Orig_Artist' => 'string',
+ 'URL' => 'string',
+ 'Encoded_by' => 'string'
+ );
+
+
+
+ /**
+ * MP3TracksArray - array of 'MP3Track' structs
+ */
+ $this->__typedef['MP3TracksArray'] =
+ array(
+ array(
+ 'item' => '{urn:MP3DB}MP3Track'
+ )
+ );
+
+ /**
+ * Struct 'MethodDebug'
+ */
+ $this->__typedef['MethodDebug'] =
+ array(
+ 'rc' => 'boolean',
+ 'ErrNo' => 'int',
+ 'Error' => 'string'
+ );
+
+ /**
+ * return Struct of method GetMP3Tracks
+ */
+ $this->__typedef['GetMP3TracksResult'] =
+ array(
+ 'MethodDebug' => '{urn:MP3DB}MethodDebug',
+ 'MP3Tracks' => '{urn:MP3DB}MP3TracksArray'
+ );
+
+ /**
+ * return Struct of method AddMP3Track
+ */
+ $this->__typedef['AddMP3TrackResult'] =
+ array(
+ 'MethodDebug' => '{urn:MP3DB}MethodDebug'
+ );
+
+ /**
+ * Array of strings
+ */
+ $this->__typedef['ArrayOfStrings'] =
+ array(
+ array('item'=>'string')
+ );
+
+ }
+
+
+ function SayHallo($name) {
+ return "Hallo, " . $name;
+ }
+
+
+ function SayThisNTimes($SayThis,$NTimes) {
for ($i = 0; $i < $NTimes; $i++) {
- $return[$i] = $SayThis . ' ' . $i;
+ $return[$i] = $SayThis . " $i";
}
- return new SOAP_Value('return', '{urn:MP3DB}ArrayOfStrings', $return);
- }
-
- function GetMP3Tracks($query = '')
- {
- for ($i = 0; $i < 5; $i++) {
+ return new SOAP_Value('return','{urn:MP3DB}ArrayOfStrings',$return);
+ }
+
+
+ function GetMP3Tracks($query = "") {
+ for($i = 0; $i < 5; $i++) {
$this->MP3Tracks[$i] = new SOAP_Value(
- 'item',
- '{urn:MP3DB}MP3Track',
- array('Title' => new SOAP_Value('Title', 'string', 'some track $i'),
- 'Artist' => new SOAP_Value('Artist', 'string', 'some artist $i'),
- 'Album' => new SOAP_Value('Album', 'string', 'some album $i'),
- 'Year' => new SOAP_Value('Year', 'int', 1999),
- 'Genre' => new SOAP_Value('Genre', 'int', 100),
- 'Comment' => new SOAP_Value('Comment', 'string', 'blabla $i'),
- 'Composer' => new SOAP_Value('Composer', 'string', ''),
- 'Orig_Artist' => new SOAP_Value('Orig_Artist', 'string', ''),
- 'URL' => new SOAP_Value('URL', 'string', ''),
- 'Encoded_by' => new SOAP_Value('Encoded_by', 'string', '')));
+ 'item',
+ '{urn:MP3DB}MP3Track',
+ array(
+ "Title" => new SOAP_Value("Title","string","some track $i"),
+ "Artist" => new SOAP_Value("Artist","string","some artist $i"),
+ "Album" => new SOAP_Value("Album","string","some album $i"),
+ "Year" => new SOAP_Value("Year","int",(integer)1999),
+ "Genre" => new SOAP_Value("Genre","int",(integer)100),
+ "Comment" => new SOAP_Value("Comment","string","blabla $i"),
+ "Composer" => new SOAP_Value("Composer","string",""),
+ "Orig_Artist" => new SOAP_Value("Orig_Artist","string",""),
+ "URL" => new SOAP_Value("URL","string",""),
+ "Encoded_by" => new SOAP_Value("Encoded_by","string","")
+ )
+ );
}
-
- $MethodDebug['rc'] = new SOAP_Value('rc', 'boolean', true);
- $MethodDebug['ErrNo'] = new SOAP_Value('ErrNo', 'int', 0);
- $MethodDebug['Error'] = new SOAP_Value('Error', 'string', '');
-
- return new SOAP_Value(
- 'return',
- '{urn:MP3DB}GetMP3TracksResult',
- array('MethodDebug' => new SOAP_Value('MethodDebug', '{urn:MP3DB}MethodDebug',$MethodDebug),
- 'MP3Tracks' => new SOAP_Value('MP3Tracks', '{urn:MP3DB}MP3TracksArray',$this->MP3Tracks)));
- }
-
- function AddMP3Track($MP3Track)
- {
- /* Well, let's imagine here some code for adding given mp3track to db
- * or whatever... */
- $MethodDebug['rc'] = new SOAP_Value('rc', 'boolean', true);
- $MethodDebug['ErrNo'] = new SOAP_Value('ErrNo', 'int', 0);
- $MethodDebug['Error'] = new SOAP_Value('Error', 'string', '');
-
- return new SOAP_Value(
- 'return',
- '{urn:MP3DB}AddMP3TrackResult',
- array('MethodDebug' => new SOAP_Value('MethodDebug', '{urn:MP3DB}MethodDebug', $MethodDebug)));
- }
-
- function __dispatch($methodname)
- {
- if (isset($this->__dispatch_map[$methodname])) {
+
+ $MethodDebug["rc"] = new SOAP_Value("rc","boolean",true);
+ $MethodDebug["ErrNo"] = new SOAP_Value("ErrNo","int",(integer)0);
+ $MethodDebug["Error"] = new SOAP_Value("Error","string","");
+
+ return new SOAP_Value('return','{urn:MP3DB}GetMP3TracksResult',array(
+ "MethodDebug" => new SOAP_Value('MethodDebug','{urn:MP3DB}MethodDebug',$MethodDebug),
+ "MP3Tracks" => new SOAP_Value('MP3Tracks','{urn:MP3DB}MP3TracksArray',$this->MP3Tracks)
+ )
+ );
+ }
+
+
+ function AddMP3Track($MP3Track) {
+ # well, lets imagine here some code for adding given mp3track to db or whatever...
+ $MethodDebug["rc"] = new SOAP_Value("rc","boolean",true);
+ $MethodDebug["ErrNo"] = new SOAP_Value("ErrNo","int",(integer)0);
+ $MethodDebug["Error"] = new SOAP_Value("Error","string","");
+
+ return new SOAP_Value('return','{urn:MP3DB}AddMP3TrackResult',array(
+ "MethodDebug" => new SOAP_Value('MethodDebug','{urn:MP3DB}MethodDebug',$MethodDebug)
+ )
+ );
+ }
+
+
+ function __dispatch($methodname) {
+ if (isset($this->__dispatch_map[$methodname]))
return $this->__dispatch_map[$methodname];
- }
- return null;
- }
-
+ return NULL;
+ }
}
-$server = new SOAP_Server();
+$server = new SOAP_Server;
$server->_auto_translation = true;
$MP3DB_Class = new MP3DB_Class();
-$server->addObjectMap($MP3DB_Class, 'urn:MP3DB');
+$server->addObjectMap($MP3DB_Class,'urn:MP3DB');
+
if (isset($_SERVER['REQUEST_METHOD']) &&
- $_SERVER['REQUEST_METHOD'] == 'POST') {
+ $_SERVER['REQUEST_METHOD']=='POST') {
$server->service($HTTP_RAW_POST_DATA);
} else {
require_once 'SOAP/Disco.php';
- $disco = new SOAP_DISCO_Server($server, 'MP3DB');
- header('Content-type: text/xml');
+ $disco = new SOAP_DISCO_Server($server,"MP3DB");
+ header("Content-type: text/xml");
if (isset($_SERVER['QUERY_STRING']) &&
- strpos($_SERVER['QUERY_STRING'], 'wsdl') !== false) {
+ strcasecmp($_SERVER['QUERY_STRING'],'wsdl')==0) {
echo $disco->getWSDL();
} else {
echo $disco->getDISCO();
}
+ exit;
}
+?>
Index: branches/version-2_11-dev/data/module/SOAP/example/attachment.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/example/attachment.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/example/attachment.php (revision 21410)
@@ -1,8 +1,3 @@
Port to PEAR and more
- * @author Jan Schneider Maintenance
- * @copyright 2003-2007 The PHP Group
- * @license http://www.php.net/license/2_02.txt PHP License 2.02
- * @link http://pear.php.net/package/SOAP
- */
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 4 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license, |
+// | that is bundled with this package in the file LICENSE, and is |
+// | available at through the world-wide-web at |
+// | http://www.php.net/license/2_02.txt. |
+// | If you did not receive a copy of the PHP license and are unable to |
+// | obtain it through the world-wide-web, please send a note to |
+// | license@php.net so we can mail you a copy immediately. |
+// +----------------------------------------------------------------------+
+// | Authors: Shane Caraveo |
+// +----------------------------------------------------------------------+
+//
+// $Id: server2.php,v 1.3 2005/03/10 23:16:40 yunosh Exp $
+//
-/* First, include the SOAP_Server class. */
+// first, include the SOAP/Server class
require_once 'SOAP/Server.php';
+
$server = new SOAP_Server;
-
-/* Tell server to translate to classes we provide if possible. */
+/* tell server to translate to classes we provide if possible */
$server->_auto_translation = true;
-/* This is a simple example of implementing a custom call handler. If you do
- * this, the SOAP server will ignore objects or functions added to it, and
- * will call your handler for **ALL** SOAP calls the server receives, whether
- * the call is defined in your WSDL or not. The handler receives two
- * arguments, the method name being called, and the arguments sent for that
- * call. */
+/* This is a simple example of implementing a custom
+ call handler. If you do this, the soap server will ignore
+ objects or functions added to it, and will call your handler
+ for **ALL** soap calls the server receives, wether the call
+ is defined in your WSDL or not. The handler receives two
+ arguments, the method name being called, and the arguments
+ sent for that call.
+*/
function myCallHandler($methodname, $args)
{
global $soapclass;
- return call_user_func_array(array($soapclass, $methodname), $args);
+ return @call_user_func_array(array($soapclass, $methodname),$args);
}
-$server->setCallHandler('myCallHandler', false);
+$server->setCallHandler('myCallHandler',false);
-require_once dirname(__FILE__) . '/example_server.php';
+require_once 'example_server.php';
+
$soapclass = new SOAP_Example_Server();
-$server->addObjectMap($soapclass, 'urn:SOAP_Example_Server');
+$server->addObjectMap($soapclass,'urn:SOAP_Example_Server');
if (isset($_SERVER['REQUEST_METHOD']) &&
- $_SERVER['REQUEST_METHOD'] == 'POST') {
+ $_SERVER['REQUEST_METHOD']=='POST') {
$server->service($HTTP_RAW_POST_DATA);
} else {
require_once 'SOAP/Disco.php';
- $disco = new SOAP_DISCO_Server($server, 'ServerExample');
- header('Content-type: text/xml');
+ $disco = new SOAP_DISCO_Server($server,'ServerExample');
+ header("Content-type: text/xml");
if (isset($_SERVER['QUERY_STRING']) &&
- strpos($_SERVER['QUERY_STRING'], 'wsdl') !== false) {
+ strcasecmp($_SERVER['QUERY_STRING'],'wsdl')==0) {
echo $disco->getWSDL();
} else {
echo $disco->getDISCO();
}
+ exit;
}
+?>
Index: branches/version-2_11-dev/data/module/SOAP/example/email_pop_server.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/example/email_pop_server.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/example/email_pop_server.php (revision 21410)
@@ -1,55 +1,67 @@
Port to PEAR and more
- * @author Jan Schneider Maintenance
- * @copyright 2003-2007 The PHP Group
- * @license http://www.php.net/license/2_02.txt PHP License 2.02
- * @link http://pear.php.net/package/SOAP
- */
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 4 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license, |
+// | that is bundled with this package in the file LICENSE, and is |
+// | available at through the world-wide-web at |
+// | http://www.php.net/license/2_02.txt. |
+// | If you did not receive a copy of the PHP license and are unable to |
+// | obtain it through the world-wide-web, please send a note to |
+// | license@php.net so we can mail you a copy immediately. |
+// +----------------------------------------------------------------------+
+// | Authors: Shane Caraveo Port to PEAR and more |
+// +----------------------------------------------------------------------+
+//
+// $Id: email_pop_server.php,v 1.6 2005/03/10 23:16:40 yunosh Exp $
+//
-/* SOAP_Server_Email */
+/* include the Email server class, which knows how to
+ parse a standard email as a soap message */
+
require_once 'SOAP/Server/Email.php';
-/* Include a class to access POP3. */
+/* include a class to access POP3 */
+
require_once 'Net/POP3.php';
-/* Create the SOAP Server object. */
+/* create the SOAP Server object */
+
$server = new SOAP_Server_Email;
-/* Tell the server to translate to classes we provide if possible. */
+/* tell server to translate to classes we provide if possible */
$server->_auto_translation = true;
-require_once './example_server.php';
+require_once 'example_server.php';
+
$soapclass = new SOAP_Example_Server();
$server->addObjectMap($soapclass,'urn:SOAP_Example_Server');
-/* Connect to a POP3 server and read the messages. */
-$pop3 = new Net_POP3();
+
+/* Connect to a POP3 server and read the messages */
+
+$pop3 =& new Net_POP3();
if ($pop3->connect('localhost', 110)) {
if ($pop3->login('username', 'password')) {
$listing = $pop3->getListing();
- /* Now loop through each message, and call the SOAP server with that
- * message. */
+ /* now loop through each message, and call the
+ SOAP server with that message */
+
foreach ($listing as $msg) {
+
$email = $pop3->getMsg($msg['msg_id']);
- /* This is where we actually handle the SOAP response. The
- * SOAP_Server_Email class we are using will send the SOAP
- * response to the sender via email. */
+
+ /* this is where we actually handle the SOAP
+ response. The SOAP::Server::Email class we
+ are using will send the SOAP response to
+ the sender via email. */
+
if ($email) {
$server->client($email);
+
$pop3->deleteMsg($msg['msg_id']);
}
@@ -58,2 +70,3 @@
$pop3->disconnect();
}
+?>
Index: branches/version-2_11-dev/data/module/SOAP/Server.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/Server.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/Server.php (revision 21410)
@@ -176,5 +176,5 @@
/* We'll try to build our endpoint. */
$this->endpoint = 'http://' . $_SERVER['SERVER_NAME'];
- if (isset($_SERVER['SERVER_PORT'])) {
+ if ($_SERVER['SERVER_PORT']) {
$this->endpoint .= ':' . $_SERVER['SERVER_PORT'];
}
@@ -186,5 +186,5 @@
if (isset($_SERVER['CONTENT_TYPE'])) {
if (strcasecmp($_SERVER['CONTENT_TYPE'], 'application/dime') == 0) {
- $this->_decodeDIMEMessage($data, $this->headers, $attachments);
+ $this->_decodeDIMEMessage($data, $headers, $attachments);
$useEncoding = 'DIME';
} elseif (stristr($_SERVER['CONTENT_TYPE'], 'multipart/related')) {
@@ -193,12 +193,12 @@
stripslashes($_SERVER['CONTENT_TYPE']) .
"\r\n\r\n" . $data;
- $this->_decodeMimeMessage($data, $this->headers, $attachments);
+ $this->_decodeMimeMessage($data, $headers, $attachments);
$useEncoding = 'Mime';
}
- if (!isset($this->headers['content-type'])) {
- $this->headers['content-type'] = stripslashes($_SERVER['CONTENT_TYPE']);
+ if (!isset($headers['content-type'])) {
+ $headers['content-type'] = stripslashes($_SERVER['CONTENT_TYPE']);
}
if (!$this->fault &&
- !$this->_getContentEncoding($this->headers['content-type'])) {
+ !$this->_getContentEncoding($headers['content-type'])) {
$this->xml_encoding = SOAP_DEFAULT_ENCODING;
/* Found encoding we don't understand; return a fault. */
@@ -210,12 +210,9 @@
* WSDL file. */
if (!$this->fault && !$test &&
- ((isset($_SERVER['REQUEST_METHOD']) &&
- $_SERVER['REQUEST_METHOD'] != 'POST') ||
- (isset($this->headers['content-type']) &&
- strncmp($this->headers['content-type'], 'text/xml', 8) != 0))) {
+ ($_SERVER['REQUEST_METHOD'] != 'POST' ||
+ strncmp($headers['content-type'], 'text/xml', 8) != 0)) {
/* This is not possibly a valid SOAP request, try to return a WSDL
* file. */
- $got = isset($this->headers['content-type']) ? $this->headers['content-type'] : 'Nothing!';
- $this->_raiseSoapFault('Invalid SOAP request, must be POST with content-type: text/xml, got: ' . $got, '', '', 'Server');
+ $this->_raiseSoapFault('Invalid SOAP request, must be POST with content-type: text/xml, got: ' . (isset($headers['content-type']) ? $headers['content-type'] : 'Nothing!'), '', '', 'Server');
}
@@ -383,14 +380,8 @@
{
/* Parse response, get SOAP_Parser object. */
- $parser = new SOAP_Parser($data, $this->xml_encoding, $attachments);
-
+ $parser =& new SOAP_Parser($data, $this->xml_encoding, $attachments);
+ /* If fault occurred during message parsing. */
if ($parser->fault) {
- /* Fault occurred during message parsing. */
$this->fault = $parser->fault;
- return null;
- }
- if (!count($parser->root_struct_name)) {
- /* No method specified. */
- $this->_raiseSoapFault('No method specified in request.');
return null;
}
@@ -553,5 +544,5 @@
if (is_array($requestArray)) {
if (isset($requestArray['faultcode']) ||
- isset($requestArray[SOAP_BASE::SOAPENVPrefix().':faultcode'])) {
+ isset($requestArray['SOAP-ENV:faultcode'])) {
$faultcode = $faultstring = $faultdetail = $faultactor = '';
foreach ($requestArray as $k => $v) {
@@ -809,5 +800,5 @@
* @return void
*/
- function addObjectWSDL($wsdl_obj, $targetNamespace, $service_name,
+ function addObjectWSDL(&$wsdl_obj, $targetNamespace, $service_name,
$service_desc = '')
{
Index: branches/version-2_11-dev/data/module/SOAP/Transport/HTTP.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/Transport/HTTP.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/Transport/HTTP.php (revision 21410)
@@ -25,5 +25,5 @@
*
* @package SOAP
- * @category Web Services
+ * @category Web_Services
*/
@@ -327,82 +327,78 @@
function _parseResponse()
{
- if (!preg_match("/^(.*?)\r?\n\r?\n(.*)/s",
+ if (preg_match("/^(.*?)\r?\n\r?\n(.*)/s",
$this->incoming_payload,
$match)) {
- $this->_raiseSoapFault('Invalid HTTP Response');
- return false;
- }
-
- $this->response = $match[2];
- // Find the response error, some servers response with 500 for
- // SOAP faults.
- $this->_parseHeaders($match[1]);
-
- list(, $code, $msg) = sscanf($this->result_headers[0], '%s %s %s');
- unset($this->result_headers[0]);
-
- switch($code) {
- case 100: // Continue
- $this->incoming_payload = $match[2];
- return $this->_parseResponse();
- case 200:
- case 202:
- $this->incoming_payload = trim($match[2]);
- if (!strlen($this->incoming_payload)) {
- /* Valid one-way message response. */
- return true;
+ $this->response = $match[2];
+ // Find the response error, some servers response with 500 for
+ // SOAP faults.
+ $this->_parseHeaders($match[1]);
+
+ list(, $code, $msg) = sscanf($this->result_headers[0], '%s %s %s');
+ unset($this->result_headers[0]);
+
+ switch($code) {
+ case 100: // Continue
+ $this->incoming_payload = $match[2];
+ return $this->_parseResponse();
+ case 400:
+ $this->_raiseSoapFault("HTTP Response $code Bad Request");
+ return false;
+ break;
+ case 401:
+ $this->_raiseSoapFault("HTTP Response $code Authentication Failed");
+ return false;
+ break;
+ case 403:
+ $this->_raiseSoapFault("HTTP Response $code Forbidden");
+ return false;
+ break;
+ case 404:
+ $this->_raiseSoapFault("HTTP Response $code Not Found");
+ return false;
+ break;
+ case 407:
+ $this->_raiseSoapFault("HTTP Response $code Proxy Authentication Required");
+ return false;
+ break;
+ case 408:
+ $this->_raiseSoapFault("HTTP Response $code Request Timeout");
+ return false;
+ break;
+ case 410:
+ $this->_raiseSoapFault("HTTP Response $code Gone");
+ return false;
+ break;
+ default:
+ if ($code >= 400 && $code < 500) {
+ $this->_raiseSoapFault("HTTP Response $code Not Found, Server message: $msg");
+ return false;
+ }
+ }
+
+ $this->_parseEncoding($match[1]);
+
+ if ($this->result_content_type == 'application/dime') {
+ // XXX quick hack insertion of DIME
+ if (PEAR::isError($this->_decodeDIMEMessage($this->response, $this->headers, $this->attachments))) {
+ // _decodeDIMEMessage already raised $this->fault
+ return false;
}
- break;
- case 400:
- $this->_raiseSoapFault("HTTP Response $code Bad Request");
+ $this->result_content_type = $this->headers['content-type'];
+ } elseif (stristr($this->result_content_type, 'multipart/related')) {
+ $this->response = $this->incoming_payload;
+ if (PEAR::isError($this->_decodeMimeMessage($this->response, $this->headers, $this->attachments))) {
+ // _decodeMimeMessage already raised $this->fault
+ return false;
+ }
+ } elseif ($this->result_content_type != 'text/xml') {
+ $this->_raiseSoapFault($this->response);
return false;
- case 401:
- $this->_raiseSoapFault("HTTP Response $code Authentication Failed");
- return false;
- case 403:
- $this->_raiseSoapFault("HTTP Response $code Forbidden");
- return false;
- case 404:
- $this->_raiseSoapFault("HTTP Response $code Not Found");
- return false;
- case 407:
- $this->_raiseSoapFault("HTTP Response $code Proxy Authentication Required");
- return false;
- case 408:
- $this->_raiseSoapFault("HTTP Response $code Request Timeout");
- return false;
- case 410:
- $this->_raiseSoapFault("HTTP Response $code Gone");
- return false;
- default:
- if ($code >= 400 && $code < 500) {
- $this->_raiseSoapFault("HTTP Response $code Not Found, Server message: $msg");
- return false;
- }
- break;
- }
-
- $this->_parseEncoding($match[1]);
-
- if ($this->result_content_type == 'application/dime') {
- // XXX quick hack insertion of DIME
- if (PEAR::isError($this->_decodeDIMEMessage($this->response, $this->headers, $this->attachments))) {
- // _decodeDIMEMessage already raised $this->fault
- return false;
- }
- $this->result_content_type = $this->headers['content-type'];
- } elseif (stristr($this->result_content_type, 'multipart/related')) {
- $this->response = $this->incoming_payload;
- if (PEAR::isError($this->_decodeMimeMessage($this->response, $this->headers, $this->attachments))) {
- // _decodeMimeMessage already raised $this->fault
- return false;
- }
- } elseif ($this->result_content_type != 'text/xml') {
- $this->_raiseSoapFault($this->response);
- return false;
- }
-
- // if no content, return false
- return strlen($this->response) > 0;
+ }
+ // if no content, return false
+ return strlen($this->response) > 0;
+ }
+ $this->_raiseSoapFault('Invalid HTTP Response');
+ return false;
}
@@ -562,16 +558,16 @@
}
- $headers = array();
- $action = isset($options['soapaction']) ? $options['soapaction'] : '';
- $headers['Content-Type'] = "text/xml; charset=$this->encoding";
- $headers['SOAPAction'] = '"' . $action . '"';
- if (isset($options['headers'])) {
- $headers = array_merge($headers, $options['headers']);
- }
- foreach ($headers as $header => $value) {
- $headers[$header] = $header . ': ' . $value;
- }
- curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
- curl_setopt($ch, CURLOPT_USERAGENT, $this->_userAgent);
+ if (!isset($options['soapaction'])) {
+ $options['soapaction'] = '';
+ }
+ if (!isset($options['headers']['Content-Type'])) {
+ $options['headers']['Content-Type'] = 'text/xml';
+ }
+ curl_setopt($ch, CURLOPT_HTTPHEADER,
+ array('Content-Type: ' . $options['headers']['Content-Type']
+ . ';charset=' . $this->encoding,
+ 'SOAPAction: "' . $options['soapaction'] . '"'));
+ curl_setopt($ch, CURLOPT_USERAGENT,
+ $this->_userAgent);
if ($this->timeout) {
Index: branches/version-2_11-dev/data/module/SOAP/Transport/SMTP.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/Transport/SMTP.php (revision 21318)
+++ branches/version-2_11-dev/data/module/SOAP/Transport/SMTP.php (revision 21410)
@@ -152,5 +152,5 @@
$val = new SOAP_Value('Message-ID', 'string', $headers['Message-ID']);
} else {
- $sval[] = new SOAP_Value('faultcode', 'QName', SOAP_BASE::SOAPENVPrefix().':Client');
+ $sval[] = new SOAP_Value('faultcode', 'QName', 'SOAP-ENV:Client');
$sval[] = new SOAP_Value('faultstring', 'string', "couldn't send SMTP message to {$this->urlparts['path']}");
$val = new SOAP_Value('Fault', 'Struct', $sval);
Index: branches/version-2_11-dev/data/module/SOAP/Transport/TEST.php
===================================================================
--- branches/version-2_11-dev/data/module/SOAP/Transport/TEST.php (revision 21318)
+++ (revision )
@@ -1,54 +1,0 @@
-
- * @copyright 2008 The PHP Group
- * @license http://www.php.net/license/2_02.txt PHP License 2.02
- * @link http://pear.php.net/package/SOAP
- */
-
-require_once 'SOAP/Transport.php';
-
-/**
- * Test transport for SOAP.
- *
- * @access public
- * @package SOAP
- * @author Jan Schneider
- */
-class SOAP_Transport_TEST extends SOAP_Transport
-{
- /**
- * Sends and receives SOAP data.
- *
- * @param string $msg Outgoing SOAP data.
- * @param array $options Options.
- *
- * @return string|SOAP_Fault
- */
- function send($msg, $options = array())
- {
- $_SERVER['REQUEST_METHOD'] = 'POST';
- $this->outgoing_payload = $msg;
- ob_start();
- $server = clone($options['server']);
- $server->service($msg);
- $this->incoming_payload = ob_get_contents();
- ob_end_clean();
- return $this->incoming_payload;
- }
-
-}
Index: branches/version-2_11-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php
===================================================================
--- branches/version-2_11-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php (revision 21403)
+++ branches/version-2_11-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php (revision 21410)
@@ -169,5 +169,5 @@
}
// 在庫無し商品の非表示
- if (NOSTOCK_HIDDEN) {
+ if (NOSTOCK_HIDDEN === true) {
$where .= ' AND (stock_max >= 1 OR stock_unlimited_max = 1)';
}
Index: branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
===================================================================
--- branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php (revision 21319)
+++ branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php (revision 21410)
@@ -583,5 +583,5 @@
// 在庫無し商品の非表示対応
- if (NOSTOCK_HIDDEN) {
+ if (NOSTOCK_HIDDEN === true) {
// 件数カウントバッチ実行
$objDb = new SC_Helper_DB_Ex();
Index: branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php
===================================================================
--- branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php (revision 21405)
+++ branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php (revision 21410)
@@ -48,5 +48,5 @@
parent::init();
$this->tpl_maintitle = '商品管理';
- $this->tpl_subtitle = 'カテゴリ登録';
+ $this->tpl_subtitle = 'カテゴリー登録';
$this->tpl_mainpage = 'products/category.tpl';
$this->tpl_mainno = 'products';
@@ -80,5 +80,5 @@
switch($this->getMode()) {
- // カテゴリ登録/編集実行
+ // カテゴリー登録/編集実行
case 'edit':
$category_id = $objFormParam->getValue('category_id');
@@ -296,5 +296,5 @@
* 下記の場合は, 登録を実行せず、エラーメッセージを表示する
*
- * - カテゴリ登録数の上限を超える場合
+ * - カテゴリー登録数の上限を超える場合
* - 階層登録数の上限を超える場合
* - カテゴリ名がすでに使用されている場合
@@ -341,5 +341,5 @@
}
- // カテゴリ登録
+ // カテゴリー登録
$this->registerCategory($objFormParam->getValue('parent_category_id'),
$objFormParam->getValue('category_name'),
Index: branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php
===================================================================
--- branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php (revision 21402)
+++ branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php (revision 21410)
@@ -27,5 +27,5 @@
/**
- * カテゴリ登録CSVのページクラス
+ * カテゴリー登録CSVのページクラス
*
* LC_Page_Admin_Products_UploadCSV をカスタマイズする場合はこのクラスを編集する.
@@ -73,5 +73,5 @@
$this->tpl_subno = 'upload_csv_category';
$this->tpl_maintitle = '商品管理';
- $this->tpl_subtitle = 'カテゴリ登録CSV';
+ $this->tpl_subtitle = 'カテゴリー登録CSV';
$this->csv_id = '5';
@@ -350,5 +350,5 @@
/**
- * カテゴリ登録を行う.
+ * カテゴリー登録を行う.
*
* FIXME: 登録の実処理自体は、LC_Page_Admin_Products_Categoryと共通化して欲しい。
Index: branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php
===================================================================
--- branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php (revision 21402)
+++ branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php (revision 21410)
@@ -414,5 +414,5 @@
}
- // カテゴリ登録
+ // カテゴリー登録
if($arrList['category_ids'] != "") {
$arrCategory_id = explode(',', $arrList['category_ids']);
Index: branches/version-2_11-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php
===================================================================
--- branches/version-2_11-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php (revision 21317)
+++ branches/version-2_11-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php (revision 21410)
@@ -65,5 +65,5 @@
switch ( SC_Display_Ex::detectDevice() ) {
case DEVICE_TYPE_MOBILE:
- // メインカテゴリの取得
+ // メインカテゴリーの取得
$this->arrCat = $this->lfGetMainCat(true);
break;
@@ -117,5 +117,5 @@
* @param array $arrParentCategoryId 親カテゴリの配列
* @param boolean $count_check 登録商品数をチェックする場合はtrue
- * @return array $arrRet カテゴリツリーの配列を返す
+ * @return array $arrRet カテゴリーツリーの配列を返す
*/
function lfGetCatTree($arrParentCategoryId, $count_check = false) {
@@ -166,8 +166,8 @@
/**
- * メインカテゴリの取得.
+ * メインカテゴリーの取得.
*
* @param boolean $count_check 登録商品数をチェックする場合はtrue
- * @return array $arrMainCat メインカテゴリの配列を返す
+ * @return array $arrMainCat メインカテゴリーの配列を返す
*/
function lfGetMainCat($count_check = false) {
@@ -175,5 +175,5 @@
$col = '*';
$from = 'dtb_category left join dtb_category_total_count using (category_id)';
- // メインカテゴリとその直下のカテゴリを取得する。
+ // メインカテゴリーとその直下のカテゴリーを取得する。
$where = 'level <= 2 AND del_flg = 0';
// 登録商品数のチェック
@@ -183,5 +183,5 @@
$objQuery->setOption('ORDER BY rank DESC');
$arrRet = $objQuery->select($col, $from, $where);
- // メインカテゴリを抽出する。
+ // メインカテゴリーを抽出する。
$arrMainCat = array();
foreach ($arrRet as $cat) {
@@ -189,5 +189,5 @@
continue;
}
- // 子カテゴリを持つかどうかを調べる。
+ // 子カテゴリーを持つかどうかを調べる。
$arrChildrenID = SC_Utils_Ex::sfGetUnderChildrenArray(
$arrRet,
Index: branches/version-2_11-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php
===================================================================
--- branches/version-2_11-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php (revision 21401)
+++ branches/version-2_11-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php (revision 21410)
@@ -107,5 +107,8 @@
}
// 取得
- $arrProductList = $objProduct->getListByProductIds($objQuery, $arrProductId);
+ $arrTmp = $objProduct->getListByProductIds($objQuery, $arrProductId);
+ foreach ($arrTmp as $key => $arrRow) {
+ $arrProductList[$arrRow['product_id']] = $arrRow;
+ }
// おすすめ商品情報にマージ
foreach (array_keys($arrBestProducts) as $key) {
Index: branches/version-2_11-dev/data/class/pages/LC_Page_Sitemap.php
===================================================================
--- branches/version-2_11-dev/data/class/pages/LC_Page_Sitemap.php (revision 21317)
+++ branches/version-2_11-dev/data/class/pages/LC_Page_Sitemap.php (revision 21410)
@@ -212,5 +212,5 @@
function getAllProducts() {
- // XXX: 商品登録の無いカテゴリは除外する方が良い気もする
+ // XXX: 商品登録の無いカテゴリーは除外する方が良い気もする
$objQuery = SC_Query_Ex::getSingletonInstance();
$sql = "SELECT category_id FROM dtb_category WHERE del_flg = 0";
Index: branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_List.php
===================================================================
--- branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_List.php (revision 21400)
+++ branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_List.php (revision 21410)
@@ -311,4 +311,14 @@
$arrProducts = $objProduct->getListByProductIds($objQuery, $arrProductId);
+ //取得している並び順で並び替え
+ $arrProducts2 = array();
+ foreach($arrProducts as $item) {
+ $arrProducts2[ $item['product_id'] ] = $item;
+ }
+ $arrProducts = array();
+ foreach($arrProductId as $product_id) {
+ $arrProducts[] = $arrProducts2[$product_id];
+ }
+
// 規格を設定
$objProduct->setProductsClassByProductIds($arrProductId);
@@ -373,5 +383,5 @@
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrSearch = array('category' => '指定なし', 'maker' => '指定なし', 'name' => '指定なし');
- // カテゴリ検索条件
+ // カテゴリー検索条件
if ($arrSearchData['category_id'] > 0) {
$arrSearch['category'] = $objQuery->get('category_name', 'dtb_category', 'category_id = ?', array($arrSearchData['category_id']));
@@ -398,5 +408,5 @@
// 検索結果対象となる商品の数を取得
$objQuery =& SC_Query_Ex::getSingletonInstance();
- $objQuery->setWhere($searchCondition['where_for_count']);
+ $objQuery->setWhere($searchCondition['where']);
$objProduct = new SC_Product_Ex();
return $objProduct->findProductCount($objQuery, $searchCondition['arrval']);
@@ -423,4 +433,9 @@
// 商品検索条件の作成（未削除、表示）
$searchCondition['where'] = "alldtl.del_flg = 0 AND alldtl.status = 1 ";
+
+ // 在庫無し商品の非表示
+ if (NOSTOCK_HIDDEN === true) {
+ $searchCondition['where'] .= ' AND (stock >= 1 OR stock_unlimited = 1)';
+ }
if (strlen($searchCondition["where_category"]) >= 1) {
@@ -450,13 +465,4 @@
$searchCondition['arrval'][] = $arrSearchData['maker_id'];
}
-
- $searchCondition['where_for_count'] = $searchCondition['where'];
-
- // 在庫無し商品の非表示
- if (NOSTOCK_HIDDEN) {
- $searchCondition['where'] .= ' AND (stock >= 1 OR stock_unlimited = 1)';
- $searchCondition['where_for_count'] .= ' AND EXISTS(SELECT * FROM dtb_products_class WHERE product_id = alldtl.product_id AND del_flg = 0 AND (stock >= 1 OR stock_unlimited = 1))';
- }
-
return $searchCondition;
}
Index: branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_Detail.php
===================================================================
--- branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_Detail.php (revision 21402)
+++ branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_Detail.php (revision 21410)
@@ -453,4 +453,5 @@
foreach($arrRecommendData as $recommend){
$arrRecommendProductId[] = $recommend["recommend_product_id"];
+ $arrRecommendData[$recommend["recommend_product_id"]] = $recommend['comment'];
}
@@ -458,10 +459,18 @@
$arrProducts = $objProduct->getListByProductIds($objQuery, $arrRecommendProductId);
+ //取得している並び順で並び替え
+ // FIXME SC_Productあたりにソート処理はもってくべき
+ $arrProducts2 = array();
+ foreach($arrProducts as $item) {
+ $arrProducts2[ $item['product_id'] ] = $item;
+ }
+
$arrRecommend = array();
- foreach ($arrRecommendData as $key => $arrRow) {
- $arrRecommendData[$key] = array_merge($arrRow, $arrProducts[$arrRow['recommend_product_id']]);
- }
-
- return $arrRecommendData;
+ foreach($arrRecommendProductId as $product_id) {
+ $arrProducts2[$product_id]['comment'] = $arrRecommendData[$product_id];
+ $arrRecommend[] = $arrProducts2[$product_id];
+ }
+
+ return $arrRecommend;
}
Index: branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_CategoryList.php
===================================================================
--- branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_CategoryList.php (revision 21317)
+++ branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_CategoryList.php (revision 21410)
@@ -65,5 +65,5 @@
$this->lfCheckCategoryId();
- // カテゴリ情報を取得する。
+ // カテゴリー情報を取得する。
$objFormParam = $this->lfInitParam($_REQUEST);
$arrCategoryData = $this->lfGetCategories($objFormParam->getValue('category_id'), true, $this);
@@ -91,14 +91,14 @@
/**
- * 選択されたカテゴリとその子カテゴリの情報を取得し、
+ * 選択されたカテゴリーとその子カテゴリーの情報を取得し、
* ページオブジェクトに格納する。
*
- * @param string $category_id カテゴリID
- * @param boolean $count_check 有効な商品がないカテゴリを除くかどうか
+ * @param string $category_id カテゴリーID
+ * @param boolean $count_check 有効な商品がないカテゴリーを除くかどうか
* @param object &$objPage ページオブジェクト
* @return void
*/
function lfGetCategories($category_id, $count_check = false, &$objPage) {
- // カテゴリの正しいIDを取得する。
+ // カテゴリーの正しいIDを取得する。
$category_id = $this->lfCheckCategoryId($category_id);
if ($category_id == 0) {
@@ -106,10 +106,10 @@
}
- $arrCategory = null; // 選択されたカテゴリ
- $arrChildren = array(); // 子カテゴリ
+ $arrCategory = null; // 選択されたカテゴリー
+ $arrChildren = array(); // 子カテゴリー
$arrAll = SC_Helper_DB_Ex::sfGetCatTree($category_id, $count_check);
foreach ($arrAll as $category) {
- // 選択されたカテゴリの場合
+ // 選択されたカテゴリーの場合
if ($category['category_id'] == $category_id) {
$arrCategory = $category;
@@ -117,10 +117,10 @@
}
- // 関係のないカテゴリはスキップする。
+ // 関係のないカテゴリーはスキップする。
if ($category['parent_category_id'] != $category_id) {
continue;
}
- // 子カテゴリの場合は、孫カテゴリが存在するかどうかを調べる。
+ // 子カテゴリーの場合は、孫カテゴリーが存在するかどうかを調べる。
$arrGrandchildrenID = SC_Utils_Ex::sfGetUnderChildrenArray($arrAll, 'parent_category_id', 'category_id', $category['category_id']);
$category['has_children'] = count($arrGrandchildrenID) > 0;
@@ -132,5 +132,5 @@
}
- // 子カテゴリの商品数を合計する。
+ // 子カテゴリーの商品数を合計する。
$children_product_count = 0;
foreach ($arrChildren as $category) {
@@ -138,7 +138,7 @@
}
- // 選択されたカテゴリに直属の商品がある場合は、子カテゴリの先頭に追加する。
+ // 選択されたカテゴリーに直属の商品がある場合は、子カテゴリーの先頭に追加する。
if ($arrCategory['product_count'] > $children_product_count) {
- $arrCategory['product_count'] -= $children_product_count; // 子カテゴリの商品数を除く。
+ $arrCategory['product_count'] -= $children_product_count; // 子カテゴリーの商品数を除く。
$arrCategory['has_children'] = false; // 商品一覧ページに遷移させるため。
array_unshift($arrChildren, $arrCategory);
Index: branches/version-2_11-dev/data/class/SC_CustomerList.php
===================================================================
--- branches/version-2_11-dev/data/class/SC_CustomerList.php (revision 21407)
+++ branches/version-2_11-dev/data/class/SC_CustomerList.php (revision 21410)
@@ -302,11 +302,11 @@
}
- // カテゴリを選択している場合のみ絞込検索を行う
+ // カテゴリーを選択している場合のみ絞込検索を行う
if (!isset($this->arrSql['search_category_id'])) $this->arrSql['search_category_id'] = "";
if ( strlen($this->arrSql['search_category_id']) > 0){
- // カテゴリで絞込検索を行うSQL文生成
+ // カテゴリーで絞込検索を行うSQL文生成
list($tmp_where, $tmp_arrval) = $objDb->sfGetCatWhere($this->arrSql['search_category_id']);
- // カテゴリで絞込みが可能の場合
+ // カテゴリーで絞込みが可能の場合
if($tmp_where != "") {
$this->setWhere( " customer_id IN (SELECT distinct customer_id FROM dtb_order WHERE order_id IN (SELECT distinct order_id FROM dtb_order_detail WHERE product_id IN (SELECT product_id FROM dtb_product_categories WHERE ".$tmp_where." ))) ");
Index: branches/version-2_11-dev/data/class/helper/SC_Helper_DB.php
===================================================================
--- branches/version-2_11-dev/data/class/helper/SC_Helper_DB.php (revision 21409)
+++ branches/version-2_11-dev/data/class/helper/SC_Helper_DB.php (revision 21410)
@@ -297,5 +297,5 @@
/**
- * カテゴリツリーの取得を複数カテゴリで行う.
+ * カテゴリツリーの取得を複数カテゴリーで行う.
*
* @param integer $product_id 商品ID
@@ -346,8 +346,8 @@
/**
- * 親カテゴリを連結した文字列を取得する.
+ * 親カテゴリーを連結した文字列を取得する.
*
* @param integer $category_id カテゴリID
- * @return string 親カテゴリを連結した文字列
+ * @return string 親カテゴリーを連結した文字列
*/
function sfGetCatCombName($category_id){
@@ -357,5 +357,5 @@
$ConbName = "";
- // カテゴリ名称を取得する
+ // カテゴリー名称を取得する
foreach($arrCatID as $key => $val){
$sql = "SELECT category_name FROM dtb_category WHERE category_id = ?";
@@ -371,13 +371,13 @@
/**
- * 指定したカテゴリIDのカテゴリを取得する.
+ * 指定したカテゴリーIDのカテゴリーを取得する.
*
* @param integer $category_id カテゴリID
- * @return array 指定したカテゴリIDのカテゴリ
+ * @return array 指定したカテゴリーIDのカテゴリー
*/
function sfGetCat($category_id){
$objQuery =& SC_Query_Ex::getSingletonInstance();
- // カテゴリを取得する
+ // カテゴリーを取得する
$arrVal = array($category_id);
$res = $objQuery->select('category_id AS id, category_name AS name', 'dtb_category', 'category_id = ?', $arrVal);
@@ -387,8 +387,8 @@
/**
- * 指定したカテゴリIDの大カテゴリを取得する.
+ * 指定したカテゴリーIDの大カテゴリーを取得する.
*
* @param integer $category_id カテゴリID
- * @return array 指定したカテゴリIDの大カテゴリ
+ * @return array 指定したカテゴリーIDの大カテゴリー
*/
function sfGetFirstCat($category_id){
@@ -399,5 +399,5 @@
$arrRet['id'] = $arrCatID[0];
- // カテゴリ名称を取得する
+ // カテゴリー名称を取得する
$sql = "SELECT category_name FROM dtb_category WHERE category_id = ?";
$arrVal = array($arrRet['id']);
@@ -448,5 +448,5 @@
/**
- * カテゴリツリーの取得を行う.
+ * カテゴリーツリーの取得を行う.
*
* 親カテゴリの Value=0 を対象とする
@@ -656,9 +656,9 @@
$sql_where = 'alldtl.del_flg = 0 AND alldtl.status = 1';
// 在庫無し商品の非表示
- if (NOSTOCK_HIDDEN) {
- $sql_where_dtl = '(stock >= 1 OR stock_unlimited = 1)';
+ if (NOSTOCK_HIDDEN === true) {
+ $sql_where_dtl = 'stock_max >= 1 OR stock_unlimited_max = 1';
$from = $objProduct->alldtlSQL($sql_where_dtl);
}else{
- $from = 'dtb_products as alldtl';
+ $from = " dtb_products as alldtl ";
}
@@ -773,10 +773,5 @@
$where = "($sql_where) AND ($sql_where_product_ids)";
- $where_products_class = '';
- if (NOSTOCK_HIDDEN) {
- $where_products_class .= '(stock >= 1 OR stock_unlimited = 1)';
- }
-
- $from = $objProduct->alldtlSQL($where_products_class);
+ $from = $objProduct->alldtlSQL($sql_where_product_ids);
$sql = "SELECT count(*) FROM $from WHERE $where ";
$arrUpdateData[ $category_id ] = $objQuery->getOne($sql, $arrval);
Index: branches/version-2_11-dev/data/class/SC_Product.php
===================================================================
--- branches/version-2_11-dev/data/class/SC_Product.php (revision 21409)
+++ branches/version-2_11-dev/data/class/SC_Product.php (revision 21410)
@@ -180,5 +180,5 @@
* @param SC_Query $objQuery SC_Query インスタンス
* @param array|int $arrProductId 商品ID
- * @return array 商品一覧の配列 (キー: 商品ID)
+ * @return array 商品一覧の配列
*/
function getListByProductIds(&$objQuery, $arrProductId = array()) {
@@ -191,25 +191,6 @@
$objQuery->setWhere($where, $arrProductId);
- $arrProducts = $this->lists($objQuery);
-
- // 配列のキーを商品IDに
- $arrTmp = array();
- foreach($arrProducts as $arrProduct) {
- $arrTmp[$arrProduct['product_id']] = $arrProduct;
- }
- $arrProducts =& $arrTmp;
- unset($arrTmp);
-
- // SC_Query::setOrder() の指定がない場合、$arrProductId で指定された商品IDの順に配列要素を並び替え
- if (strlen($objQuery->order) === 0) {
- $arrTmp = array();
- foreach ($arrProductId as $product_id) {
- $arrTmp[$product_id] = $arrProducts[$product_id];
- }
- $arrProducts =& $arrTmp;
- unset($arrTmp);
- }
-
- return $arrProducts;
+ $arrRet = $this->lists($objQuery);
+ return $arrRet;
}
@@ -683,11 +664,11 @@
* 商品詳細の SQL を取得する.
*
- * @param string $where_products_class 商品規格情報の WHERE 句
+ * @param string $where 商品詳細の WHERE 句
* @return string 商品詳細の SQL
*/
- function alldtlSQL($where_products_class = '') {
- $where_clause = '';
- if (!SC_Utils_Ex::isBlank($where_products_class)) {
- $where_clause = 'WHERE ' . $where_products_class;
+ function alldtlSQL($where = "") {
+ $where_clause = "";
+ if (!SC_Utils_Ex::isBlank($where)) {
+ $where_clause = " WHERE " . $where;
}
/*
Index: branches/version-2_11-dev/test/createEcCubeData-v25.php
===================================================================
--- branches/version-2_11-dev/test/createEcCubeData-v25.php (revision 21402)
+++ branches/version-2_11-dev/test/createEcCubeData-v25.php (revision 21410)
@@ -659,5 +659,5 @@
/**
- * 総カテゴリ数を計算し、dtb_categoryに代入するrankに使う
+ * 総カテゴリー数を計算し、dtb_categoryに代入するrankに使う
*/
function lfGetTotalCategoryrank(){
