diff -Nurp ./qb.module ../qb/qb.module --- ./qb.module 2008-09-02 16:17:45.000000000 +0900 +++ ../qb/qb.module 2008-09-02 16:14:09.000000000 +0900 @@ -17,24 +17,62 @@ function qb_perm() { return array('administer quickbooks'); } -function qb_qbxml($root_entity, $elements) { - $qbxml = new DOMDocument('1.0'); - $xml = $qbxml->appendChild($qbxml->createElement($root_entity)); - foreach ($elements as $name => $value) { - _qb_qbxml_node($qbxml, $name, $value, $xml); +function qb_qbxml($elements, $root = array('QBXML')) { + $qbxml = $xml = new DOMDocument('1.0'); + + // Make sure the root is an array so _qb_qbxml_node can process it properly + if (!is_array($root)) { + $root = array($root => array()); } + + // Attach the base/common root of the document + $start = _qb_qbxml_node($qbxml, key($root), current($root), $xml); + + // Attach the rest of the document + foreach((array)$elements as $key => $element) { + _qb_qbxml_node($qbxml, $key, $element, $start); + } + return $qbxml->saveXML(); } function _qb_qbxml_node(&$doc, $name, $value, &$parent) { - if (is_string($value)) { + // Store the elements in the order they were added to the doc + static $added; + + if (is_scalar($value)) { $element = $doc->createElement($name, $value); + $parent->appendChild($element); } if (is_array($value)) { - $element = $doc->createElement($name); - foreach ($value as $k => $v) { - _qb_qbxml_node($doc, $k, $v, $element); + if (is_numeric(key($value))) { + for($k=0;$v=$value[$k];$k++) { + _qb_qbxml_node($doc, $name, $v, $parent); + } + } + else { + $element = $doc->createElement($name); + foreach ($value as $k => $v) { + // Denote attributes as starting with a _ + if (is_scalar($v) && strpos($k, '_') === 0) { + $k = substr($k, 1); + $attr = $doc->createAttribute($k); + $attr->appendChild($doc->createTextNode($v)); + $element->appendChild($attr); + } + // Denote processing instructions with a ? + else if (is_scalar($v) && strpos($k, '?') === 0) { + $k = substr($k, 1); + $doc->appendChild($doc->createProcessingInstruction($k, $v)); + } + else { + _qb_qbxml_node($doc, $k, $v, $element); + } + } + $added[] = $parent->appendChild($element); } } - $parent->appendChild($element); + + // Try and return the last added element (first in the array because of recursion) to help have a more complex "root" as specified in qb_qbxml + return reset($added); } diff -Nurp ./qbwc.inc ../qb/qbwc.inc --- ./qbwc.inc 2008-09-02 16:17:45.000000000 +0900 +++ ../qb/qbwc.inc 2008-09-02 16:12:41.000000000 +0900 @@ -1,30 +1,34 @@ close_ts) { - return false; + $uid = db_result(db_query('SELECT uid FROM {sessions} WHERE sid = "%s" AND hostname = "%s"', $ticket, $_SERVER['REMOTE_ADDR'])); + if ($uid && $ticket != session_id()) { + global $user; + $user = user_load(array('uid' => $user)); + + session_destroy(); + session_id($ticket); + // Pretend that cookies are enabled so we can get back our session + $_COOKIE[session_name()] = true; + session_set_save_handler('sess_open', 'sess_close', 'sess_read', 'sess_write', 'sess_destroy_sid', 'sess_gc'); + session_start(); + } + else if (!$uid) { + // Invalid session + exit; } - - // Switch to the Quickbooks user. - if ($user->uid == 0) $user = user_load(array('uid' => $session->uid)); - - return $session; ; } function authenticate($params) { $name = $params->strUserName; $pass = $params->strPassword; - $hostname = ip_address(); - // Generate a ticket to be used for all further communication - $ticket = md5(time() . $name); + // Use the current session id as the ticket + $ticket = session_id(); // Default result: "non-valid user credentials". $ret = 'nvu'; @@ -36,30 +40,35 @@ class qbwc { // Authenticate as the quickbooks drupal user if ($name && ($name == variable_get('qbwc_user', ''))) { if ($user = user_authenticate(array('name' => $name, 'pass' => $pass))) { + // Set nothing to do until a module decides it has something to do + $ret = 'none'; - // Return company file or empty, which means "currently open file". - $ret = variable_get('qb_company_file', ''); - - if ($theres_nothing_to_do) { // TODO - $ret = 'none'; + // Let modules return whether they have work to do or not + // If no modules return anything, assume no work + foreach(module_implements('qbwc_authenticate') as $module) { + if (module_invoke($module, 'qbwc_authenticate', $ticket, $user)) { + // Return company file or empty, which means "currently open file" when work has been set + $ret = variable_get('qb_company_file', ''); + } } } } - // Close the session immediately if the authentication failed. - $close_ts = ($ret == 'nvu' ) ? time() : 'NULL'; - db_query("INSERT INTO {qbwc_sessions} ( ticket, hostname, uid, open_ts, close_ts ) VALUES ( '%s', '%s', %d, %d, $close_ts )", $ticket, $hostname, $user->uid, time()); - $result = array($ticket, $ret, $next_update, $minimum_wait); return (object) array('authenticateResult' => $result); } function closeConnection($params) { $ticket = $params->ticket; + $this->_session($ticket); global $user; + + // Let modules know we are closing the session + module_invoke_all('qbwc_close', $ticket); // Close the session and log it just like user_logout() sans drupal_goto. - watchdog('user', 'Session closed for %name.', array('%name' => $user->name)); + watchdog('user', t('Session closed for %name.', array('%name' => $user->name))); + // Destroy the current session. session_destroy(); module_invoke_all('user', 'logout', NULL, $user); @@ -67,12 +76,12 @@ class qbwc { // Load the anonymous user. $user = drupal_anonymous_user(); - db_query("UPDATE {qbwc_sessions} SET close_ts = %d where ticket = '%s'", time(), $ticket); - return (object) array( 'closeConnectionResult' => t('Session closed')); } function connectionError($ticket, $hresult, $message) { + // Do not try to reconnect + return 'done'; } function getLastError($ticket) { @@ -84,62 +93,140 @@ class qbwc { } function sendRequestXML($params) { + static $requestId = 1; + $ticket = $params->ticket; $HCPResponse = $params->strHCPResponse; $company_file = $params->strCompanyFileName; $country = $params->qbXMLCountry; $major_version = $params->qbXMLMajorVers; $minor_version = $params->qbXMLMinorVers; - - $session = $this->_session($ticket); + + $this->_session($ticket); // Default: If the web service has no requests to send, use an empty string. $ret = ''; // Decide if we have anything to do and return qbxml. - if($requests = module_invoke_all('qbwc_request', $session)) { - foreach ( $requests as $r ) { - $ret .= qb_qbxml($r['name'], $r['request']); + $requests = array(); + $_SESSION['requestIds'] = $_SESSION['savedData'] = array(); + + foreach(module_implements('qbwc_request') as $module) { + $request = module_invoke($module, 'qbwc_request'); + + // Make sure we have an array of requests instead of just a request + if (is_array($request) && !is_numeric(key($request))) { + $request = array($request); + } + + foreach((array)$request as $r) { + // Set data that module response/request handlers would like to pass between them + // during calls to QB + if (isset($r['data'])) { + $_SESSION['savedData'][$requestId] = $r['data']; + } + + // Attach request ids so we know how to send responses back to the right modules + // If modules set it to their own, we'll have to leave it up to them to avoid conflicts for now' + if (!isset($r['_requestId'])) { + $r['request']['_requestID'] = $requestId; + $_SESSION['requestIds'][$requestId++] = $module; + } + + if ($r['name']) { + $requests[$r['name']][] = $r['request']; + } } } + // Formulate the common base XML for all QBWC requests, using QBXML v5.0 + $top = array( + 'QBXML' => array( + '?qbxml' => 'version="5.0"', // XML processing instruction + 'QBXMLMsgsRq' => array( + '_onError' => 'stopOnError' // XML attribute + ) + ) + ); + + $ret = qb_qbxml($requests, $top); + return (object) array( 'sendRequestXMLResult' => $ret ); } function receiveResponseXML($params) { $ticket = $params->ticket; - $response = $params->response; + $response = DOMDocument::loadXML($params->response); $hresult = $params->hresult; $message = $params->message; + $this->_session($ticket); + // Get the list of data stored for this response + $data = $_SESSION['savedData']; + + // Split out the response elements so they can be sent to the appropriate modules + $elements = array(); + if (is_object($response)) { + $top = $response->getElementsByTagName('QBXMLMsgsRs')->item(0); + for($i=0;$element = $top->childNodes->item($i); $i++) { + if ($element->nodeType == 3) { + // Skip #text node types + continue; + } + $requestId = $element->getAttribute('requestID'); + if ($module = $_SESSION['requestIds'][$requestId]) { + $elements[$module][] = $element; + + // Set the saved data for this modules requests + if ($data[$requestId]) { + $saved[$module][$requestId] = $data[$requestId]; + } + } + } + } - $session = $this->_session($ticket); - - /* A positive integer from 1-100 represents the percentage of work - completed, where value of 100 means there is no more work. A negative - value means an error has occurred and Web Connector calls getLastError. - */ - if($responses = module_invoke_all('qbwc_response', $session, $response, $hresult, $message)) { - $ret = 0; - foreach ($responses as $item) { - $ret += $item; + $done = 0; + $total = 0; + foreach(module_implements('qbwc_response') as $module) { + $ret = module_invoke($module, 'qbwc_response', $elements[$module], $hresult, $message, $saved[$module]); + // Only count returned values less than 100 + if (is_numeric($ret) && $ret <= 100) { + /* A positive integer from 1-100 represents the percentage of work + completed, where value of 100 means there is no more work. A negative + value means an error has occurred and Web Connector calls getLastError. + */ + $done += $ret; + $total++; } - $ret = $ret / count($responses); } - if (!isset($ret)) $ret = 100; + // Put the accumulation of returned percentages with the total into one total percentage + if ($total) { + $done = $done / $total; + } + else { + $done = 100; + } + + // If it runs this long, something is probably wrong... + if ($_SESSION['countTimes']++ == 30) { + $done = 100; + } - return (object) array( 'receiveResponseXMLResult' => $ret ); + return (object) array( 'receiveResponseXMLResult' => $done ); } - /* Unimplemented functions + // Unimplemented functions function getInteractiveURL($ticket, $session_id) { + $this->_session($ticket); } function interactiveDone($ticket) { + $this->_session($ticket); } function interactiveRejected($ticket, $reason) { + $this->_session($ticket); } @@ -147,6 +234,4 @@ class qbwc { // the client's version. It could be used to set a minimum version level. function clientVersion($version) { } - - */ } diff -Nurp ./qbwc.install ../qb/qbwc.install --- ./qbwc.install 2008-09-02 16:17:45.000000000 +0900 +++ ../qb/qbwc.install 2008-09-02 16:07:42.000000000 +0900 @@ -1,30 +1,16 @@ - array( - 'fields' => array( - 'ticket' => array('type' => 'varchar', 'length' => 64, 'not null' => TRUE), - 'uid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE), - 'hostname' => array('type' => 'varchar', 'length' => 15), - 'open_ts' => array('type' => 'int', 'not null' => TRUE), - 'close_ts' => array('type' => 'int', 'default' => 0), - ), - 'indexes' => array( - 'ticket' => array('ticket'), - ), - ), - ); -} + variable_get('qbwc_url', ''))); $qbwc->setClass('qbwc'); $qbwc->setPersistence(SOAP_PERSISTENCE_SESSION); diff -Nurp ./qbwc.wsdl ../qb/qbwc.wsdl --- ./qbwc.wsdl 1970-01-01 09:00:00.000000000 +0900 +++ ../qb/qbwc.wsdl 2008-09-02 16:07:42.000000000 +0900 @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file