Added Allow/Disallow multiple identities

rainloop/v/0.0.0/app/libraries/RainLoop/Model/Account.php

@@ -366,6 +366,26 @@ class Account extends \RainLoop\Account // for backward compatibility
 		));
 	}
 
+	/**
+	 * @return string
+	 */
+	public function GetAuthTokenQ()
+	{
+		return \RainLoop\Utils::EncodeKeyValuesQ(array(
+			'token',							// 0
+			$this->sEmail,						// 1
+			$this->sLogin,						// 2
+			$this->sPassword,					// 3
+			\RainLoop\Utils::Fingerprint(),		// 4
+			$this->sSignMeToken,				// 5
+			$this->sParentEmail,				// 6
+			\RainLoop\Utils::GetShortToken(),	// 7
+			$this->sProxyAuthUser,				// 8
+			$this->sProxyAuthPassword,			// 9
+			0									// 10 // timelife
+		));
+	}
+
 	/**
 	 * @param \RainLoop\Plugins\Manager $oPlugins
 	 * @param \MailSo\Mail\MailClient $oMailClient

rainloop/v/0.0.0/app/libraries/RainLoop/Model/Identity.php

@@ -75,11 +75,13 @@ class Identity
 	}
 
 	/**
+	 * @param bool $bFillOnEmpty = false
+	 *
 	 * @return string
 	 */
-	public function Id()
+	public function Id($bFillOnEmpty = false)
 	{
-		return $this->sId;
+		return $bFillOnEmpty ? ('' === $this->sId ? '---' : $this->sId) : $this->sId;
 	}
 
 	/**
@@ -192,4 +194,12 @@ class Identity
 	{
 		return !empty($this->sEmail);
 	}
+
+	/**
+	 * @return bool
+	 */
+	public function IsAccountIdentities()
+	{
+		return '' === $this->Id();
+	}
 }