diff --git a/gulliver/system/class.soapNtlm.php b/gulliver/system/class.soapNtlm.php
old mode 100755
new mode 100644
index db8cce921..dfc850a0d
--- a/gulliver/system/class.soapNtlm.php
+++ b/gulliver/system/class.soapNtlm.php
@@ -1,308 +1,299 @@
-.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
+.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ *
+ */
/* SOAP NTLM
* This class is used to extend SoapClient native PHP
* to allow NTLM authentication throw soap connection
- */
-
-/**
- * @package gulliver.system
- */
-class soapNtlm {
-
- private $path;
- private $mode;
- private $options;
- private $opened_path;
- private $buffer;
- private $pos;
-
- public function getuser()
- {
- return "";
- }
-
- public function getpassword()
- {
- return "";
- }
-
- /**
- * Open the stream
- *
- * @param unknown_type $path
- * @param unknown_type $mode
- * @param unknown_type $options
- * @param unknown_type $opened_path
- * @return unknown
- */
- public function stream_open($path, $mode, $options, $opened_path) {
- //echo "[NTLMStream::stream_open] $path , mode=$mode
";
-//G::pr($options);
-
- $this->path = $path;
- $this->mode = $mode;
- $this->options = $options;
- $this->opened_path = $opened_path;
-
- $this->createBuffer($this->path);
-
- return true;
- }
-
- /**
- * Close the stream
- *
- */
- public function stream_close() {
- //echo "[NTLMStream::stream_close]
";
- curl_close($this->ch);
- }
-
- /**
- * Read the stream
- *
- * @param int $count number of bytes to read
- * @return content from pos to count
- */
- public function stream_read($count) {
- //echo "[NTLMStream::stream_read] $count
";
- if (strlen($this->buffer) == 0) {
- return false;
- }
-
- $read = substr($this->buffer, $this->pos, $count);
-
- $this->pos += $count;
-
- return $read;
- }
-
- /**
- * write the stream
- *
- * @param int $count number of bytes to read
- * @return content from pos to count
- */
- public function stream_write($data) {
- //echo "[NTLMStream::stream_write]
";
- if (strlen($this->buffer) == 0) {
- return false;
- }
- return true;
- }
-
- /**
- *
- * @return true if eof else false
- */
- public function stream_eof() {
- //echo "[NTLMStream::stream_eof] ";
- if ($this->pos > strlen($this->buffer)) {
- //echo "true
";
- return true;
- }
-
- //echo "false
";
- return false;
- }
-
- /**
- * @return int the position of the current read pointer
- */
- public function stream_tell() {
- //echo "[NTLMStream::stream_tell]
";
- return $this->pos;
- }
-
- /**
- * Flush stream data
- */
- public function stream_flush() {
- //echo "[NTLMStream::stream_flush]
";
- $this->buffer = null;
- $this->pos = null;
- }
-
- /**
- * Stat the file, return only the size of the buffer
- *
- * @return array stat information
- */
- public function stream_stat() {
- //echo "[NTLMStream::stream_stat]
";
-
- $this->createBuffer($this->path);
- $stat = array(
- 'size' => strlen($this->buffer),
- );
-
- return $stat;
- }
-
- /**
- * Stat the url, return only the size of the buffer
- *
- * @return array stat information
- */
- public function url_stat($path, $flags) {
- //G::pr($this->options);
- //echo "[NTLMStream::url_stat] -> $path
";
- $this->createBuffer($path);
- $stat = array(
- 'size' => strlen($this->buffer),
- );
-
- return $stat;
- }
-
- /**
- * Create the buffer by requesting the url through cURL
- *
- * @param unknown_type $path
- */
- private function createBuffer($path) {
- if ($this->buffer) {
- return;
- }
-
- //echo "[NTLMStream::createBuffer] create buffer from : $path
";
- $this->ch = curl_init($path);
- curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
- curl_setopt($this->ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
- curl_setopt($this->ch, CURLOPT_HTTPAUTH, CURLAUTH_NTLM);
- //curl_setopt($this->ch, CURLOPT_USERPWD, $this->options['auth']); // Hugo's code
- curl_setopt($this->ch, CURLOPT_USERPWD, $this->getuser().':'.$this->getpassword());// Ankit's code
-
- //Apply proxy settings
- if (class_exists('System')) {
- $sysConf = System::getSystemConfiguration();
- if ($sysConf['proxy_host'] != '') {
- curl_setopt($this->ch, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
- if ($sysConf['proxy_port'] != '') {
- curl_setopt($this->ch, CURLOPT_PROXYPORT, $sysConf['proxy_port']);
- }
- if ($sysConf['proxy_user'] != '') {
- curl_setopt($this->ch, CURLOPT_PROXYUSERPWD, $sysConf['proxy_user'] . ($sysConf['proxy_pass'] != '' ? ':' . $sysConf['proxy_pass'] : ''));
- }
- curl_setopt($this->ch, CURLOPT_HTTPHEADER, array('Expect:'));
- }
- }
-
- echo $this->buffer = curl_exec($this->ch);
-
- //echo "[NTLMStream::createBuffer] buffer size : " . strlen($this->buffer) . "bytes
";
- $this->pos = 0;
- }
-
-}
-
-class NTLMSoapClient extends SoapClient {
-
-
- function __doRequest($request, $location, $action, $version) {
- $headers = array(
- 'Method: POST',
- 'Connection: Keep-Alive',
- 'User-Agent: PHP-SOAP-CURL',
- 'Content-Type: text/xml; charset=utf-8',
- 'SOAPAction: "' . $action . '"',
- );
-
- $this->__last_request_headers = $headers;
- $ch = curl_init($location);
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
- curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
- curl_setopt($ch, CURLOPT_POST, true);
- curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
- curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
- curl_setopt($ch, CURLOPT_POSTFIELDS, $request);
- curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
- curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_NTLM);
- //curl_setopt($ch, CURLOPT_USERPWD, $this->options['auth']); //Hugo's Code
- curl_setopt($ch, CURLOPT_USERPWD, $this->user.':'.$this->password); //Ankit's Code
-
- //Apply proxy settings
- if (class_exists('System')) {
- $sysConf = System::getSystemConfiguration();
- if ($sysConf['proxy_host'] != '') {
- curl_setopt($ch, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
- if ($sysConf['proxy_port'] != '') {
- curl_setopt($ch, CURLOPT_PROXYPORT, $sysConf['proxy_port']);
- }
- if ($sysConf['proxy_user'] != '') {
- curl_setopt($ch, CURLOPT_PROXYUSERPWD, $sysConf['proxy_user'] . ($sysConf['proxy_pass'] != '' ? ':' . $sysConf['proxy_pass'] : ''));
- }
- curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:'));
- }
- }
-
- $response = curl_exec($ch);
-
- return $response;
- }
-
- function __getLastRequestHeaders() {
- return implode("\n", $this->__last_request_headers) . "\n";
- }
-
-}
-
-class PMServiceNTLMSoapClient extends NTLMSoapClient {
- protected $user;
- protected $password;
-
- function setAuthClient($auth){
- $authInfo=explode(":",$auth);
- $this->user=$authInfo[0];
- $this->password=$authInfo[1];
- }
-}
-
-class PMServiceProviderNTLMStream extends soapNtlm {
-
- protected static $user ;
- protected static $password;
-
-
- public function getuser()
- {
- return self::$user;
- }
-
- public function getpassword()
- {
- return self::$password;
- }
-
- static function setAuthStream($auth){
- $authInfo=explode(":",$auth);
- self::$user=$authInfo[0];
- self::$password=$authInfo[1];
- }
-
-}
\ No newline at end of file
+ */
+
+/**
+ *
+ * @package gulliver.system
+ */
+class soapNtlm
+{
+ private $path;
+ private $mode;
+ private $options;
+ private $opened_path;
+ private $buffer;
+ private $pos;
+
+ public function getuser ()
+ {
+ return "";
+ }
+
+ public function getpassword ()
+ {
+ return "";
+ }
+
+ /**
+ * Open the stream
+ *
+ * @param unknown_type $path
+ * @param unknown_type $mode
+ * @param unknown_type $options
+ * @param unknown_type $opened_path
+ * @return unknown
+ */
+ public function stream_open ($path, $mode, $options, $opened_path)
+ {
+ //echo "[NTLMStream::stream_open] $path , mode=$mode
";
+ //G::pr($options);
+ $this->path = $path;
+ $this->mode = $mode;
+ $this->options = $options;
+ $this->opened_path = $opened_path;
+ $this->createBuffer( $this->path );
+ return true;
+ }
+
+ /**
+ * Close the stream
+ */
+ public function stream_close ()
+ {
+ //echo "[NTLMStream::stream_close]
";
+ curl_close( $this->ch );
+ }
+
+ /**
+ * Read the stream
+ *
+ * @param int $count number of bytes to read
+ * @return content from pos to count
+ */
+ public function stream_read ($count)
+ {
+ //echo "[NTLMStream::stream_read] $count
";
+ if (strlen( $this->buffer ) == 0) {
+ return false;
+ }
+ $read = substr( $this->buffer, $this->pos, $count );
+ $this->pos += $count;
+ return $read;
+ }
+
+ /**
+ * write the stream
+ *
+ * @param int $count number of bytes to read
+ * @return content from pos to count
+ */
+ public function stream_write ($data)
+ {
+ //echo "[NTLMStream::stream_write]
";
+ if (strlen( $this->buffer ) == 0) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ *
+ * @return true if eof else false
+ */
+ public function stream_eof ()
+ {
+ //echo "[NTLMStream::stream_eof] ";
+ if ($this->pos > strlen( $this->buffer )) {
+ //echo "true
";
+ return true;
+ }
+ //echo "false
";
+ return false;
+ }
+
+ /**
+ *
+ * @return int the position of the current read pointer
+ */
+ public function stream_tell ()
+ {
+ //echo "[NTLMStream::stream_tell]
";
+ return $this->pos;
+ }
+
+ /**
+ * Flush stream data
+ */
+ public function stream_flush ()
+ {
+ //echo "[NTLMStream::stream_flush]
";
+ $this->buffer = null;
+ $this->pos = null;
+ }
+
+ /**
+ * Stat the file, return only the size of the buffer
+ *
+ * @return array stat information
+ */
+ public function stream_stat ()
+ {
+ //echo "[NTLMStream::stream_stat]
";
+ $this->createBuffer( $this->path );
+ $stat = array ('size' => strlen( $this->buffer ));
+ return $stat;
+ }
+
+ /**
+ * Stat the url, return only the size of the buffer
+ *
+ * @return array stat information
+ */
+ public function url_stat ($path, $flags)
+ {
+ //G::pr($this->options);
+ //echo "[NTLMStream::url_stat] -> $path
";
+ $this->createBuffer( $path );
+ $stat = array ('size' => strlen( $this->buffer ));
+ return $stat;
+ }
+
+ /**
+ * Create the buffer by requesting the url through cURL
+ *
+ * @param unknown_type $path
+ */
+ private function createBuffer ($path)
+ {
+ if ($this->buffer) {
+ return;
+ }
+
+ //echo "[NTLMStream::createBuffer] create buffer from : $path
";
+ $this->ch = curl_init( $path );
+ curl_setopt( $this->ch, CURLOPT_RETURNTRANSFER, true );
+ curl_setopt( $this->ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
+ curl_setopt( $this->ch, CURLOPT_HTTPAUTH, CURLAUTH_NTLM );
+ //curl_setopt($this->ch, CURLOPT_USERPWD, $this->options['auth']); // Hugo's code
+ curl_setopt( $this->ch, CURLOPT_USERPWD, $this->getuser() . ':' . $this->getpassword() ); // Ankit's code
+ //Apply proxy settings
+ if (class_exists( 'System' )) {
+ $sysConf = System::getSystemConfiguration();
+ if ($sysConf['proxy_host'] != '') {
+ curl_setopt( $this->ch, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : '') );
+ if ($sysConf['proxy_port'] != '') {
+ curl_setopt( $this->ch, CURLOPT_PROXYPORT, $sysConf['proxy_port'] );
+ }
+ if ($sysConf['proxy_user'] != '') {
+ curl_setopt( $this->ch, CURLOPT_PROXYUSERPWD, $sysConf['proxy_user'] . ($sysConf['proxy_pass'] != '' ? ':' . $sysConf['proxy_pass'] : '') );
+ }
+ curl_setopt( $this->ch, CURLOPT_HTTPHEADER, array ('Expect:') );
+ }
+ }
+ echo $this->buffer = curl_exec( $this->ch );
+ //echo "[NTLMStream::createBuffer] buffer size : " . strlen($this->buffer) . "bytes
";
+ $this->pos = 0;
+ }
+
+}
+
+class NTLMSoapClient extends SoapClient
+{
+ function __doRequest ($request, $location, $action, $version)
+ {
+ $headers = array ('Method: POST','Connection: Keep-Alive','User-Agent: PHP-SOAP-CURL','Content-Type: text/xml; charset=utf-8','SOAPAction: "' . $action . '"');
+
+ $this->__last_request_headers = $headers;
+ $ch = curl_init( $location );
+ curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
+ curl_setopt( $ch, CURLOPT_HTTPHEADER, $headers );
+ curl_setopt( $ch, CURLOPT_POST, true );
+ curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false );
+ curl_setopt( $ch, CURLOPT_SSL_VERIFYHOST, false );
+ curl_setopt( $ch, CURLOPT_POSTFIELDS, $request );
+ curl_setopt( $ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
+ curl_setopt( $ch, CURLOPT_HTTPAUTH, CURLAUTH_NTLM );
+ //curl_setopt($ch, CURLOPT_USERPWD, $this->options['auth']); //Hugo's Code
+ curl_setopt( $ch, CURLOPT_USERPWD, $this->user . ':' . $this->password ); //Ankit's Code
+
+ //Apply proxy settings
+ if (class_exists( 'System' )) {
+ $sysConf = System::getSystemConfiguration();
+ if ($sysConf['proxy_host'] != '') {
+ curl_setopt( $ch, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : '') );
+ if ($sysConf['proxy_port'] != '') {
+ curl_setopt( $ch, CURLOPT_PROXYPORT, $sysConf['proxy_port'] );
+ }
+ if ($sysConf['proxy_user'] != '') {
+ curl_setopt( $ch, CURLOPT_PROXYUSERPWD, $sysConf['proxy_user'] . ($sysConf['proxy_pass'] != '' ? ':' . $sysConf['proxy_pass'] : '') );
+ }
+ curl_setopt( $ch, CURLOPT_HTTPHEADER, array ('Expect:'
+ ) );
+ }
+ }
+ $response = curl_exec( $ch );
+ return $response;
+ }
+
+ function __getLastRequestHeaders ()
+ {
+ return implode( "\n", $this->__last_request_headers ) . "\n";
+ }
+
+}
+
+class PMServiceNTLMSoapClient extends NTLMSoapClient
+{
+ protected $user;
+ protected $password;
+
+ function setAuthClient ($auth)
+ {
+ $authInfo = explode( ":", $auth );
+ $this->user = $authInfo[0];
+ $this->password = $authInfo[1];
+ }
+}
+
+class PMServiceProviderNTLMStream extends soapNtlm
+{
+ protected static $user;
+ protected static $password;
+
+ public function getuser ()
+ {
+ return self::$user;
+ }
+
+ public function getpassword ()
+ {
+ return self::$password;
+ }
+
+ static function setAuthStream ($auth)
+ {
+ $authInfo = explode( ":", $auth );
+ self::$user = $authInfo[0];
+ self::$password = $authInfo[1];
+ }
+}
+