Fix some performance issues

rainloop/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php

@@ -2272,6 +2272,8 @@ class ImapClient extends \MailSo\Net\NetClient
 			$this->writeLog('Start Callback for '.$sParent.' / '.$sLiteralAtomUpperCase.
 				' - try to read '.$iLiteralLen.' bytes.', \MailSo\Log\Enumerations\Type::NOTE);
 
+			$this->bRunningCallback = true;
+
 			try
 			{
 				\call_user_func($this->aFetchCallbacks[$sFetchKey],
@@ -2330,6 +2332,8 @@ class ImapClient extends \MailSo\Net\NetClient
 			}
 
 			\MailSo\Base\Loader::IncStatistic('NetRead', $iLiteralLen);
+
+			$this->bRunningCallback = false;
 		}
 
 		return $bResult;

rainloop/v/0.0.0/app/libraries/MailSo/Net/NetClient.php

@@ -18,6 +18,11 @@ abstract class NetClient
 	 */
 	protected $bUnreadBuffer;
 
+	/**
+	 * @var bool
+	 */
+	protected $bRunningCallback;
+
 	/**
 	 * @var string
 	 */
@@ -63,6 +68,11 @@ abstract class NetClient
 	 */
 	protected $oLogger;
 
+	/**
+	 * @var bool
+	 */
+	public $__AUTOLOGOUT__;
+
 	/**
 	 * @access protected
 	 */
@@ -70,8 +80,11 @@ abstract class NetClient
 	{
 		$this->rConnect = null;
 		$this->bUnreadBuffer = false;
+		$this->bRunningCallback = false;
 		$this->oLogger = null;
 		
+		$this->__AUTOLOGOUT__ = true;
+
 		$this->sResponseBuffer = '';
 
 		$this->iSecurityType = \MailSo\Net\Enumerations\ConnectionSecurityType::NONE;
@@ -92,9 +105,16 @@ abstract class NetClient
 	public function __destruct()
 	{
 		try
+		{
+			if ($this->__AUTOLOGOUT__)
 			{
 				$this->LogoutAndDisconnect();
 			}
+			else
+			{
+				$this->Disconnect();
+			}
+		}
 		catch (\Exception $oException) {}
 	}
 
@@ -257,7 +277,7 @@ abstract class NetClient
 	 */
 	public function LogoutAndDisconnect()
 	{
-		if (\method_exists($this, 'Logout') && !$this->bUnreadBuffer)
+		if (\method_exists($this, 'Logout') && !$this->bUnreadBuffer && !$this->bRunningCallback)
 		{
 			$this->Logout();
 		}

rainloop/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php

@@ -407,6 +407,8 @@ class SmtpClient extends \MailSo\Net\NetClient
 
 		$this->writeLog('Message data.', \MailSo\Log\Enumerations\Type::NOTE);
 
+		$this->bRunningCallback = true;
+
 		while (!\feof($rDataStream))
 		{
 			$sBuffer = \fgets($rDataStream);
@@ -434,6 +436,8 @@ class SmtpClient extends \MailSo\Net\NetClient
 
 		$this->sendRequestWithCheck('.', 250);
 
+		$this->bRunningCallback = false;
+
 		$this->bData = true;
 
 		return $this;

rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php

@@ -270,6 +270,29 @@ class Actions
 		return $oResult;
 	}
 
+	/**
+	 * @return void
+	 */
+	public function BootStart()
+	{
+		if (defined('APP_INSTALLED_START') && defined('APP_INSTALLED_VERSION') &&
+			APP_INSTALLED_START && !APP_INSTALLED_VERSION)
+		{
+			$this->KeenIO('Install');
+		}
+	}
+
+	/**
+	 * @return void
+	 */
+	public function BootEnd()
+	{
+		if ($this->MailClient()->IsLoggined())
+		{
+			$this->MailClient()->LogoutAndDisconnect();
+		}
+	}
+
 	/**
 	 * @return string
 	 */

rainloop/v/0.0.0/app/libraries/RainLoop/Service.php

@@ -104,13 +104,9 @@ class Service
 			return $this;
 		}
 
-		$this->oActions->ParseQueryAuthString();
+		$this->oActions->BootStart();
 		
-		if (defined('APP_INSTALLED_START') && defined('APP_INSTALLED_VERSION') &&
+		$this->oActions->ParseQueryAuthString();
-			APP_INSTALLED_START && !APP_INSTALLED_VERSION)
-		{
-			$this->oActions->KeenIO('Install');
-		}
 
 		$bCached = false;
 		$sResult = '';
@@ -219,6 +215,7 @@ class Service
 		echo $sResult;
 		unset($sResult);
 
+		$this->oActions->BootEnd();
 		return $this;
 	}