@@ -177,18 +177,18 @@ discard block |
||
| 177 | 177 | $this->setVersion($version); |
| 178 | 178 | } |
| 179 | 179 | |
| 180 | - public function authWithUserAndPass($username, $password) { |
|
| 180 | + public function authWithUserAndPass($username, $password) { |
|
| 181 | 181 | |
| 182 | 182 | $this->setUsername($username); |
| 183 | 183 | $this->setPassword($password); |
| 184 | 184 | |
| 185 | - } |
|
| 185 | + } |
|
| 186 | 186 | |
| 187 | - public function authWithOauth2($token) { |
|
| 187 | + public function authWithOauth2($token) { |
|
| 188 | 188 | |
| 189 | 189 | $this->setOath2Token($token); |
| 190 | 190 | |
| 191 | - } |
|
| 191 | + } |
|
| 192 | 192 | |
| 193 | 193 | /** |
| 194 | 194 | * Returns the SOAP Client that may be used to make calls against the server |
@@ -1634,24 +1634,24 @@ discard block |
||
| 1634 | 1634 | protected function initializeSoapClient() |
| 1635 | 1635 | { |
| 1636 | 1636 | |
| 1637 | - $authArray = array( |
|
| 1638 | - 'location' => 'https://' . $this->server . '/EWS/Exchange.asmx', |
|
| 1639 | - 'classmap' => $this->classMap(), |
|
| 1640 | - 'curlopts' => $this->curl_options, |
|
| 1641 | - 'features' => SOAP_SINGLE_ELEMENT_ARRAYS, |
|
| 1642 | - ); |
|
| 1637 | + $authArray = array( |
|
| 1638 | + 'location' => 'https://' . $this->server . '/EWS/Exchange.asmx', |
|
| 1639 | + 'classmap' => $this->classMap(), |
|
| 1640 | + 'curlopts' => $this->curl_options, |
|
| 1641 | + 'features' => SOAP_SINGLE_ELEMENT_ARRAYS, |
|
| 1642 | + ); |
|
| 1643 | 1643 | |
| 1644 | - if(!empty($this->token)) { |
|
| 1644 | + if(!empty($this->token)) { |
|
| 1645 | 1645 | |
| 1646 | - $authArray["oauth"] = $this->token; |
|
| 1646 | + $authArray["oauth"] = $this->token; |
|
| 1647 | 1647 | |
| 1648 | - } |
|
| 1649 | - else { |
|
| 1648 | + } |
|
| 1649 | + else { |
|
| 1650 | 1650 | |
| 1651 | - $authArray["user"] = $this->username; |
|
| 1652 | - $authArray["password"] = $this->password; |
|
| 1651 | + $authArray["user"] = $this->username; |
|
| 1652 | + $authArray["password"] = $this->password; |
|
| 1653 | 1653 | |
| 1654 | - } |
|
| 1654 | + } |
|
| 1655 | 1655 | |
| 1656 | 1656 | $this->soap = new SoapClient( |
| 1657 | 1657 | dirname(__FILE__) . '/assets/services.wsdl', |
@@ -1641,7 +1641,7 @@ |
||
| 1641 | 1641 | 'features' => SOAP_SINGLE_ELEMENT_ARRAYS, |
| 1642 | 1642 | ); |
| 1643 | 1643 | |
| 1644 | - if(!empty($this->token)) { |
|
| 1644 | + if (!empty($this->token)) { |
|
| 1645 | 1645 | |
| 1646 | 1646 | $authArray["oauth"] = $this->token; |
| 1647 | 1647 | |
@@ -1645,8 +1645,7 @@ |
||
| 1645 | 1645 | |
| 1646 | 1646 | $authArray["oauth"] = $this->token; |
| 1647 | 1647 | |
| 1648 | - } |
|
| 1649 | - else { |
|
| 1648 | + } else { |
|
| 1650 | 1649 | |
| 1651 | 1650 | $authArray["user"] = $this->username; |
| 1652 | 1651 | $authArray["password"] = $this->password; |